[Pkg-gnupg-commit] [gnupg2] 160/160: Imported Upstream version 2.1.14
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Jul 15 09:36:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch upstream
in repository gnupg2.
commit e676848f040959b0862e5dce2329203e272b0791
Merge: 8c42c9f 09c4482
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Fri Jul 15 01:31:23 2016 +0200
Imported Upstream version 2.1.14
AUTHORS | 9 +-
ChangeLog | 951 +++
NEWS | 64 +-
VERSION | 2 +-
acinclude.m4 | 10 +-
agent/command.c | 12 +-
agent/findkey.c | 20 +-
agent/protect.c | 23 +-
build-aux/config.guess | 22 +-
build-aux/config.sub | 14 +-
build-aux/speedo.mk | 4 +
build-aux/speedo/w32/pkg-copyright.txt | 36 +-
common/Makefile.am | 8 +-
common/argparse.c | 2 +
common/b64dec.c | 79 +-
common/b64enc.c | 20 +-
common/ccparray.c | 1 +
common/exechelp-posix.c | 1 +
common/exectool.c | 25 +-
common/gettime.c | 33 +
common/gettime.h | 1 +
common/init.c | 4 +
common/iobuf.c | 5 +-
common/{private-keys.c => name-value.c} | 183 +-
common/{private-keys.h => name-value.h} | 61 +-
common/openpgpdefs.h | 1 +
common/recsel.c | 571 ++
common/recsel.h | 43 +
common/simple-pwquery.c | 6 +-
common/stringhelp.c | 2 +
common/t-convert.c | 2 +
common/t-gettime.c | 6 +
common/t-iobuf.c | 15 +-
common/t-mbox-util.c | 2 +
common/{t-private-keys.c => t-name-value.c} | 230 +-
common/t-recsel.c | 405 +
common/t-stringhelp.c | 7 +
common/t-strlist.c | 2 +
common/util.h | 9 +-
common/zb32.c | 2 +-
configure.ac | 20 +-
dirmngr/http.c | 2 +-
dirmngr/ks-engine-hkp.c | 8 +-
dirmngr/ks-engine-http.c | 3 +-
dirmngr/server.c | 39 +-
dirmngr/t-ldap-parse-uri.c | 2 +
doc/HACKING | 2 +
doc/Makefile.am | 4 +-
doc/defsincdate | 2 +-
doc/gnupg.info | 338 +-
doc/gnupg.info-1 | 359 +-
doc/gnupg.info-2 | 475 +-
doc/gpg-agent.texi | 2 +-
doc/gpg.texi | 256 +-
doc/mkdefsinc.c | 42 +-
doc/tools.texi | 6 +-
doc/yat2m.c | 45 +-
g10/armor.c | 22 +-
g10/build-packet.c | 50 +-
g10/card-util.c | 24 +-
g10/compress.c | 4 +
g10/encrypt.c | 4 +-
g10/export.c | 934 ++-
g10/free-packet.c | 1 +
g10/getkey.c | 208 +-
g10/gpg.c | 158 +-
g10/gpgv.c | 24 +
g10/import.c | 507 +-
g10/kbnode.c | 4 +-
g10/keydb.c | 1 +
g10/keydb.h | 22 +-
g10/keyedit.c | 271 +-
g10/keygen.c | 23 +-
g10/keyid.c | 12 +-
g10/keylist.c | 170 +-
g10/keyserver.c | 6 +-
g10/main.h | 15 +-
g10/mainproc.c | 37 +-
g10/options.h | 12 +-
g10/packet.h | 5 +-
g10/parse-packet.c | 20 +-
g10/pkclist.c | 99 +-
g10/plaintext.c | 15 +-
g10/revoke.c | 10 +
g10/server.c | 6 +-
g10/sign.c | 16 +-
g10/t-keydb-get-keyblock.c | 2 +
g10/t-keydb.c | 25 +-
g10/t-stutter.c | 1 +
g10/tdbio.c | 8 +-
g10/test-stubs.c | 20 +
g10/textfilter.c | 1 +
g10/trustdb.c | 10 +-
g13/g13tuple.c | 2 +-
kbx/keybox-blob.c | 24 +-
m4/Makefile.am | 2 +-
m4/pkg.m4 | 214 +
po/ca.po | 1821 +++--
po/cs.po | 1819 +++--
po/da.po | 1819 +++--
po/de.po | 1813 +++--
po/el.po | 1819 +++--
po/en at boldquot.po | 1815 +++--
po/en at quot.po | 1815 +++--
po/eo.po | 1817 +++--
po/es.po | 1823 +++--
po/et.po | 1817 +++--
po/fi.po | 1817 +++--
po/fr.po | 1817 +++--
po/gl.po | 1817 +++--
po/gnupg2.pot | 1811 +++--
po/hu.po | 1817 +++--
po/id.po | 1817 +++--
po/it.po | 1817 +++--
po/ja.po | 1817 +++--
po/nb.po | 8505 ++++++++++----------
po/pl.po | 1819 +++--
po/pt.po | 1817 +++--
po/ro.po | 1823 +++--
po/ru.po | 1825 ++---
po/sk.po | 1817 +++--
po/sv.po | 1819 +++--
po/tr.po | 1819 +++--
po/uk.po | 1843 ++---
po/zh_CN.po | 1819 +++--
po/zh_TW.po | 1817 +++--
scd/ccid-driver.c | 2 +-
scd/scdaemon.c | 1 +
tests/Makefile.am | 10 +-
tests/gpgscm/LICENSE.TinySCHEME | 31 +
tests/gpgscm/Makefile.am | 59 +
tests/gpgscm/Manual.txt | 444 +
tests/gpgscm/ffi-private.h | 148 +
tests/gpgscm/ffi.c | 1287 +++
tests/gpgscm/ffi.h | 30 +
tests/gpgscm/ffi.scm | 44 +
tests/gpgscm/init.scm | 723 ++
tests/gpgscm/lib.scm | 159 +
tests/gpgscm/main.c | 288 +
tests/gpgscm/opdefines.h | 195 +
tests/gpgscm/private.h | 26 +
tests/gpgscm/repl.scm | 50 +
tests/gpgscm/scheme-config.h | 36 +
tests/gpgscm/scheme-private.h | 228 +
tests/gpgscm/scheme.c | 5169 ++++++++++++
tests/gpgscm/scheme.h | 266 +
tests/gpgscm/t-child.c | 66 +
tests/gpgscm/t-child.scm | 93 +
tests/gpgscm/tests.scm | 443 +
tests/migrations/Makefile.am | 56 +
tests/migrations/common.scm | 39 +
tests/migrations/extended-pkf.scm | 43 +
tests/migrations/extended-pkf.tar.asc | 220 +
tests/migrations/from-classic.scm | 61 +
tests/migrations/from-classic.tar.asc | 209 +
tests/openpgp/4gb-packet.scm | 27 +
tests/openpgp/4gb-packet.test | 14 -
tests/openpgp/Makefile.am | 95 +-
tests/openpgp/README | 161 +
tests/openpgp/armdetach.scm | 31 +
tests/openpgp/armdetach.test | 19 -
tests/openpgp/armdetachm.scm | 35 +
tests/openpgp/armdetachm.test | 17 -
tests/openpgp/armencrypt.scm | 30 +
tests/openpgp/armencrypt.test | 19 -
tests/openpgp/armencryptp.scm | 31 +
tests/openpgp/armencryptp.test | 20 -
tests/openpgp/{armor.test => armor.scm} | 101 +-
tests/openpgp/armsignencrypt.scm | 30 +
tests/openpgp/armsignencrypt.test | 21 -
tests/openpgp/armsigs.scm | 30 +
tests/openpgp/armsigs.test | 19 -
tests/openpgp/clearsig.scm | 107 +
tests/openpgp/clearsig.test | 99 -
tests/openpgp/conventional-mdc.scm | 65 +
tests/openpgp/conventional-mdc.test | 44 -
tests/openpgp/conventional.scm | 48 +
tests/openpgp/conventional.test | 34 -
tests/openpgp/decrypt-dsa.scm | 29 +
tests/openpgp/decrypt-dsa.test | 18 -
tests/openpgp/decrypt.scm | 29 +
tests/openpgp/decrypt.test | 18 -
tests/openpgp/default-key.scm | 76 +
tests/openpgp/default-key.test | 73 -
tests/openpgp/defs.scm | 134 +
tests/openpgp/detach.scm | 31 +
tests/openpgp/detach.test | 18 -
tests/openpgp/detachm.scm | 35 +
tests/openpgp/detachm.test | 17 -
tests/openpgp/ecc.scm | 249 +
tests/openpgp/ecc.test | 253 -
tests/openpgp/encrypt-dsa.scm | 45 +
tests/openpgp/encrypt-dsa.test | 30 -
tests/openpgp/encrypt.scm | 60 +
tests/openpgp/encrypt.test | 29 -
tests/openpgp/encryptp.scm | 31 +
tests/openpgp/encryptp.test | 18 -
tests/openpgp/export.scm | 99 +
tests/openpgp/export.test | 110 -
tests/openpgp/finish.scm | 23 +
tests/openpgp/finish.test | 17 -
tests/openpgp/genkey1024.scm | 52 +
tests/openpgp/genkey1024.test | 41 -
tests/openpgp/gpg-agent.conf.tmpl | 2 -
tests/openpgp/gpgtar.scm | 92 +
tests/openpgp/gpgtar.test | 126 -
tests/openpgp/import.scm | 60 +
tests/openpgp/import.test | 48 -
tests/openpgp/mds.scm | 68 +
tests/openpgp/mds.test | 89 -
tests/openpgp/{multisig.test => multisig.scm} | 144 +-
.../1E28F20E41B54C2D1234D896096495FF57E08D18.asc | 9 +
.../C6A6390E9388CDBAD71EAEA698233FE5E04F001E.asc | 27 +
.../D69102E0F5AC6B6DB8E4D16DA8E18CF46D88CAE3.asc | 27 +
.../EB33B687EB8581AB64D04852A54453E85F3DF62D.asc | 10 +
tests/openpgp/samplekeys/README | 19 +
.../samplekeys/ed25519-cv25519-sample-1.asc | 21 +
tests/openpgp/samplekeys/rsa-rsa-sample-1.asc | 38 +
tests/openpgp/samplekeys/silent-running.asc | 120 +
tests/openpgp/seat.scm | 30 +
tests/openpgp/seat.test | 19 -
tests/openpgp/setup.scm | 129 +
tests/openpgp/signencrypt-dsa.scm | 48 +
tests/openpgp/signencrypt-dsa.test | 37 -
tests/openpgp/signencrypt.scm | 39 +
tests/openpgp/signencrypt.test | 34 -
tests/openpgp/sigs-dsa.scm | 43 +
tests/openpgp/sigs-dsa.test | 36 -
tests/openpgp/sigs.scm | 50 +
tests/openpgp/sigs.test | 46 -
tests/openpgp/tofu.scm | 167 +
tests/openpgp/tofu.test | 245 -
tests/openpgp/use-exact-key.scm | 68 +
tests/openpgp/use-exact-key.test | 55 -
tests/openpgp/{verify.test => verify.scm} | 260 +-
tests/openpgp/version.scm | 24 +
tests/openpgp/version.test | 110 -
tools/Makefile.am | 38 +-
tools/call-dirmngr.c | 205 +
tools/call-dirmngr.h | 28 +
tools/gpg-connect-agent.c | 10 +
tools/gpg-wks-client.c | 758 ++
tools/gpg-wks-server.c | 1548 ++++
tools/gpg-wks.h | 61 +
tools/gpgconf.c | 96 +-
tools/gpgtar-extract.c | 2 +-
tools/gpgtar-list.c | 2 +-
tools/gpgtar.c | 25 +-
tools/mime-maker.c | 667 ++
tools/mime-maker.h | 43 +
tools/mime-parser.c | 772 ++
tools/mime-parser.h | 52 +
tools/rfc822parse.h | 2 +-
tools/send-mail.c | 129 +
tools/send-mail.h | 27 +
tools/wks-receive.c | 464 ++
tools/wks-util.c | 65 +
257 files changed, 54149 insertions(+), 33161 deletions(-)
diff --cc ChangeLog
index e72b169,8bd68a6..b65921c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11605 -1,16 +1,12556 @@@
-No more ChangeLog files
-========================
++2016-07-14 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.14.
+
++ po: Update the German translation.
+
++2016-07-14 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
++ dirmngr: fix handling of HTTP redirections.
++ * dirmngr/ks-engine-http.c (ks_http_fetch): Reinitialize HTTP session
++ when following a HTTP redirection.
++
++2016-07-14 Werner Koch <wk at gnupg.org>
++
++ gpg: Remove options --print-dane-records and --print-pka-records.
++ * g10/gpg.c (main): Remove options but print a dedicated warning.
++ * g10/options.h (struct opt): Remove fields 'print_dane_records' and
++ 'print_pka_records'.
++ * g10/keylist.c (list_keyblock): Do not call list_keyblock_pka.
++ (list_keyblock_pka): Remove.
++
++2016-07-14 Åka Sikrom <a4 at hush.com>
++
++ po: Complete update of the Norwegian translation.
++
++2016-07-14 Yuri Chornoivan <yurchor at ukr.net>
++
++ Update Ukrainian translation.
++
++2016-07-14 Ineiev <ineiev at gnu.org>
++
++ Update Russian translation.
++
++2016-07-14 Werner Koch <wk at gnupg.org>
++
++ gpg: Fix regression since 2.1 in --search-key with a fingerprint.
++ * dirmngr/ks-engine-hkp.c (ks_hkp_search): Prefix fingerprint with 0x.
++
++ gpgscm: Use kludge to avoid improper use of ffi_schemify_name.
++ * tests/gpgscm/ffi.c (ffi_schemify_name): Use xstrdup instead of
++ strdup for now.
++
++ build: Require latest released libraries.
++ * agent/protect.c (OCB_MODE_SUPPORTED): Remove macro.
++ (do_encryption): Always support OCB.
++ (do_decryption): Ditto.
++ (agent_unprotect): Ditto.
++ * dirmngr/server.c (is_tor_running): Unconditionally build this.
++
++2016-07-13 Werner Koch <wk at gnupg.org>
++
++ build: Update config.{guess,sub} to {2016-05-15,2016-06-20}.
++ * build-aux/config.guess: Update.
++ * build-aux/config.sub: Update.
++
++ gpg: Fix regression due to the new --mimemode options.
++ * g10/gpg.c (opts): Re-add oTextmodeShort.
++
++2016-07-13 Daiki Ueno <ueno at gnu.org>
++
++ gpg: Make --try-all-secrets work for hidden recipients.
++ * g10/getkey.c (enum_secret_keys): Really enumerate all secret
++ keys if --try-all-secrets is specified.
++
++2016-07-13 Werner Koch <wk at gnupg.org>
++
++ gpg: Do not print a the short keyid if the high word is zero.
++ * g10/keyid.c (format_keyid): Always returh long keyid ifor KF_LONG.
++
++ gpg: New option --mimemode.
++ * g10/gpg.c (oMimemode): New.
++ (opts): Add --mimemode.
++ (main): Use --mimemode only in rfc4880bis compliance mode.
++ * g10/options.h (struct opt): Add field "mimemode".
++ * g10/build-packet.c (do_plaintext): Allow for mode 'm'.
++ * g10/encrypt.c (encrypt_simple, encrypt_crypt): Use 'm' if requested.
++ * g10/plaintext.c (handle_plaintext): Handle 'm' mode.
++ * g10/sign.c (write_plaintext_packet): Handle 'm' mode.
++ (sign_file, sign_symencrypt_file): Use 'm' if requested.
++
++ wks: Use correct key for the confirmation.
++ * tools/gpg-wks-client.c (send_confirmation_response): Actually
++ encrypt to the recipient.
++
++ wks: New server command --list-domains.
++ * tools/gpg-wks-server.c (aListDomains): New.
++ (opts): Add --list-domains.
++ (parse_arguments): Implement.
++ (main): Ditto. Use only one final diagnostic message.
++ (command_list_domains): New.
++ (check_and_publish): Remove directory creation.
++ (get_domain_list): New.
++ (expire_pending_confirmations): Rewrite using a list of directories.
++ (command_cron): Get domain list and pass to
++ expire_pending_confirmations.
++
++2016-07-13 NIIBE Yutaka <gniibe at fsij.org>
++
++ agent: Fix envvars for UPDATESTARTUPTTY.
++ agent/command.c (cmd_updatestartuptty): Use session_env_list_stdenvnames
++ to get the list.
++
++2016-07-12 Werner Koch <wk at gnupg.org>
++
++ g13: Fix memleak.
++ * g13/g13tuple.c (create_tupledesc): Init refcount to 1.
++
++ wks: Add --cron command to gpg-wks-server.
++ * tools/gpg-wks-server.c (PENDING_TTL): New.
++ (expire_one_domain, expire_pending_confirmations): New.
++ (command_cron): New.
++ (main): Implement --cron.
++
++ wks: Try to send an encrypted confirmation back.
++ * tools/gpg-wks-client.c (encrypt_response_status_cb): New.
++ (encrypt_response): New.
++ (send_confirmation_response): Encrypt the response.
++
++ * tools/gpg-wks-server.c (send_confirmation_request): Use freeing of
++ BODY and BODYENC.
++
++ wks: Also create DANE record.
++ * tools/gpg-wks-server.c (copy_key_as_dane): New.
++ (check_and_publish): Also publish as DANE record.
++
++ gpg: Extend import-option import-export to print PKA or DANE.
++ * g10/export.c (do_export_stream): Move PKA and DANE printing helper
++ code to ...
++ (print_pka_or_dane_records): this fucntion.
++ (write_keyblock_to_output): Add arg OPTIOSN and call
++ print_pka_or_dane_records if requested.
++
++ gpg: Move a function from import.c to export.c.
++ * g10/import.c (write_keyblock_to_output): Move to ...
++ * g10/export.c (write_keyblock_to_output): here. Add arg WITH_ARMOR.
++ Also make sure never to export ring trust packets.
++
++2016-07-11 Werner Koch <wk at gnupg.org>
++
++ gpgconf: Enhance --list-dirs.
++ * tools/gpgconf.c (main) <aListDir>: Factor code out to ...
++ (list_dirs): new. Rewrite to use a table. Allow selection of a
++ items. Add "agent-ssh-socket".
++
++2016-07-09 NIIBE Yutaka <gniibe at fsij.org>
++
++ gpgv: Tweak default options for extra security.
++ * g10/gpgv.c (main): Set opt.no_sig _cache, so that it doesn't depend on
++ cached status. Similarly, set opt.flags.require_cross_cert for backsig
++ validation for subkey signature.
++
++2016-07-07 Werner Koch <wk at gnupg.org>
++
++ gpg: Add export options "export-pka" and "export-dane".
++ * g10/options.h (EXPORT_PKA_FORMAT): New.
++ * g10/keylist.c (list_keyblock_pka): Do not use DANE flag.
++ * g10/export.c: Include zb32.h.
++ (parse_export_options): Add options "export-pka" and "export-dane".
++ (do_export): Do not armor if either of these option is set.
++ (print_pka_or_dane_records): New.
++ (do_export_stream): Implement new options.
++
++ gpg: Split a too large export function.
++ * g10/export.c (do_export_stream): Factor some code out to ...
++ (do_export_one_keyblock): new.
++
++2016-07-07 Justus Winter <justus at g10code.com>
++
++ gpgscm: Capture output of spawned processes.
++ * tests/gpgscm/tests.scm (call-check): Capture stdout and stderr, and
++ return stdout if the child exited successfully, or include stderr in
++ the error.
++ * tests/openpgp/version.scm: Demonstrate this by checking the stdout.
++
++2016-07-06 Werner Koch <wk at gnupg.org>
++
++ doc: Escape file names in generated macros.
++ * doc/mkdefsinc.c (print_filename): New.
++ (main): Use it here.
++
++ wks: Let the server take the encrytion key from the file.
++ * tools/gpg-wks-server.c (encrypt_stream): Change arg 'fingerprint' to
++ 'keyfile'.
++ (store_key_as_pending): Add arg 'r_fname' to make of the keyfile.
++ (send_confirmation_request): Add arg 'keyfile'.
++ (process_new_key): Pass on the name of the keyfile.
++
++ gpg: New options --recipient-file and --hidden-recipient-file.
++ * g10/gpg.c (oRecipientFile, oHiddenRecipientFile): New.
++ (opts): Add options --recipient-file and --hidden-recipient-file.
++ (main): Implement them. Also remove duplicate code from similar
++ options.
++ * g10/keydb.h (PK_LIST_FROM_FILE): New.
++ (PK_LIST_SHIFT): Bump up.
++ * g10/pkclist.c (expand_group): Take care of PK_LIST_FROM_FILE.
++ (find_and_check_key): Add and implement arg FROM_FILE.
++ (build_pk_list): Pass new value for new arg.
++ * g10/getkey.c (get_pubkey_fromfile): New.
++ * g10/gpgv.c (read_key_from_file): New stub.
++ * g10/test-stubs.c (read_key_from_file): New stub.
++ * g10/server.c (cmd_recipient): Add flag --file.
++ * g10/import.c (read_key_from_file): New.
++
++ * tests/openpgp/defs.scm (key-file1): New.
++ (key-file2): New.
++ * tests/openpgp/setup.scm: Add their private keys and import the
++ key-file1.
++ * tests/openpgp/encrypt.scm: Add new test.
++
++ gpg: New option --no-keyring.
++ * g10/gpg.c (oNoKeyring): New.
++ (opts): Add "--no-keyring".
++ (main): Do not register any keyring if the option is used.
++
++ gpg: Document use of node flags in import.c and remove unused args.
++ * g10/import.c (NODE_GOOD_SELFSIG): New. Use instead of 1.
++ (NODE_BAD_SELFSIG): New. Use instead of 2.
++ (NODE_DELETION_MARK): New. Use instead of 4.
++ (NODE_FLAG_A): New. Use to mark new nodes in merge_blocks.
++ (chk_self_sigs): Remove unused args FNAME and PK.
++ (import_one): Adjust call. Simplify error return because
++ chk_self_sigs does not return an error code.
++ (append_uid, append_key, merge_sigs, merge_keysigs): Remove unsued
++ args FNAME and KEYID.
++ (merge_blocks, import_one, import_secret_one)
++ (import_revoke_cert): Remove unused arg FNAME.
++
++ gpg: Get rid of an unused arg in a function in getkey.c.
++ * g10/getkey.c (pk_from_block): Remove unused arg CTX. Change all
++ callers.
++
++ gpg: Change calling convention for a function in getkey.c.
++ * g10/getkey.c (merge_selfsigs): Remove arg CTX. Add args REQ_USAGE
++ and WANT_EXACT.
++ (finish_lookup): Adjust caller. Set LOOKUP_NOT_SELECTED here...
++ (lookup): and not here.
++
++2016-07-05 Werner Koch <wk at gnupg.org>
++
++ gpg: Fix possible out-of-bounds read in is_armored.
++ * g10/armor.c (check_input): Call is_armored only if LEN >= 2.
++ (unarmor_pump): Use a 2 byte buffer for is_armored.
++
++2016-07-05 Justus Winter <justus at g10code.com>
++
++ tests: Honor environment variable 'TMP'.
++ This fixes problems with long socket names, e.g. when doing distcheck.
++
++ * tests/gpgscm/tests.scm (path-join): New function.
++ (with-temporary-working-directory): Honor 'TMP'.
++ (make-temporary-file): Likewise.
++ * tests/migrations/Makefile.am (TMP): Default to '/tmp'.
++ (TESTS_ENVIRONMENT): Set 'TMP'.
++ * tests/openpgp/Makefile.am (TMP): Default to '/tmp'.
++ (TESTS_ENVIRONMENT): Set 'TMP'.
++
++ gpgscm: Improve robustness and compatibility.
++ * tests/gpgscm/ffi.c (do_getenv): Avoid gccism.
++ (do_mkdtemp): Handle errors.
++
++ tests/migrations: Fix distcheck.
++ * tests/migrations/Makefile.am (TESTS): Rename test.
++ (TEST_FILES): Update list.
++ (EXTRA_DIST): Add common.scm.
++ * tests/migrations/common.scm (GPGTAR): New variable.
++ (dearmor): Rename and untar archive.
++ * tests/migrations/extended-private-key-format.scm: Rename.
++ (setup): Update.
++ * tests/migrations/extended-pkf.tar.asc: New file.
++ * tests/migrations/extended-private-key-format.gpghome: Delete.
++ * tests/migrations/from-classic.gpghome: Likewise.
++ * tests/migrations/from-classic.scm (setup): Update.
++ * tests/migrations/from-classic.tar.asc: New file.
++
++ tools/gpgtar: Provide --create and --extract.
++ * tools/gpgtar.c (cmd_and_opt_values): New values.
++ (opts): New actions.
++ (parse_arguments): Handle new actions.
++ * tests/openpgp/gpgtar.scm: Test new interface.
++
++ g10: Fix out-of-bounds read.
++ * g10/armor.c (use_armor_filter): We need two bytes for 'is_armored'.
++
++2016-07-04 Werner Koch <wk at gnupg.org>
++
++ wks: Add command --read to gpg-wks-client.
++ * tools/gpg-wks-client.c (aRead): New.
++ (opts): Add command "--read".
++ (main): Implement that.
++
++ tests: Add a gettime test for sizeof (time_t) > 4.
++ * common/t-gettime.c (test_isotime2epoch): Add 4 more tests.
++
++2016-07-03 Werner Koch <wk at gnupg.org>
++
++ gpg: Avoid spurious failures on keyblocks with no or only deleted nodes.
++ * g10/import.c (write_keyblock_to_output): Clear ERR on success.
++
++ wks: Let the client only export the requested UID.
++ * tools/gpg-wks-client.c (get_key): Export only the requested uid.
++
++ tools: Call sendmail directly from the wks tools.
++ * tools/send-mail.c, tools/send-mail.h: New.
++ * tools/wks-util.c: New.
++ * tools/Makefile.am (gpg_wks_server_SOURCES): Add them.
++ (gpg_wks_client_SOURCES): Ditto.
++ * tools/gpg-wks.h (opt): Add fields use_sendmail and output.
++ * tools/gpg-wks-client.c: Add options --send and --output. Rename
++ command --send to --create.
++ (command_send, send_confirmation_response): Output via wks_send_mime.
++ * tools/gpg-wks-server.c: Add options --send and --output.
++ (send_confirmation_request): Output via wks_send_mime.
++ (check_and_publish): Add hack for name-value bug.
++
++2016-07-02 Werner Koch <wk at gnupg.org>
++
++ tools: Add options to gpg-wks-server.
++ * tools/gpg-wks.h (opt): Add 'default_from' and 'extra_headers'.
++ * tools/gpg-wks-server.c (oFrom, oHeader): New.
++ (parse_arguments): Set them and check args.
++ (get_submission_address): New.
++ (send_confirmation_request): Set correct From address. Add extra
++ headers.
++ (process_new_key): Return an error code.
++
++ tools: Extend mime-maker.c:mime_maker_add_header.
++ * tools/mime-maker.c (add_header): Check header name and allow
++ name-value syntax.
++ (mime_maker_add_header): Add mode for a syntax check.
++
++ doc: Describe filter expressions.
++ * doc/gpg.texi: Remove some superfluous .E.
++ (FILTER EXPRESSIONS): New.
++
++ yat2m: Fix table formatting.
++ * doc/yat2m.c (proc_texi_cmd): Use .TQ for @itemx. Print a .P at the
++ end of a level 0 table.
++
++2016-07-01 Werner Koch <wk at gnupg.org>
++
++ gpg: New option --export-filter.
++ * g10/gpg.c (oExportFilter): New.
++ (opts): Add --export-filter.
++ (main): Handle option.
++ * g10/export.c: Include recsel.h, init.h, and mbox-util.h.
++ (export_keep_uid): New global var.
++ (cleanup_export_globals): New.
++ (parse_and_set_export_filter): New.
++ (filter_getval): New.
++ (apply_keep_uid_filter): New.
++ (do_export_stream): Apply filter if set.
++
++ gpg: New option --import-filter.
++ * g10/gpg.c (oImportFilter): New.
++ (opts): Add --import-filter.
++ (main): Handle option.
++ * g10/import.c: Include recsel.h, init.h, and mbox-util.h.
++ (import_keep_uid): New global var.
++ (cleanup_import_globals): New.
++ (parse_and_set_import_filter): New.
++ (filter_getval): New.
++ (apply_keep_uid_filter): New.
++ (import_one): Apply filter if set.
++
++ gpg: Allow to cache the mbox in a user id struct.
++ * g10/packet.h (PKT_user_id): Add field 'mbox'.
++ * g10/free-packet.c (free_user_id): Free that.
++
++ gpg: Make sure a user ID packet has always a terminating Nul in memory.
++ * g10/keygen.c (write_uid): Avoid overflow.
++
++ common: Add function to select records etc.
++ * common/recsel.c, common/recsel.h: New.
++ * common/t-recsel.c: New.
++
++ common: Smart up register_mem_cleanup_func.
++ * common/init.c (register_mem_cleanup_func): Avoid double registration.
++
++2016-07-01 Justus Winter <justus at g10code.com>
++
++ common: Annotate semi-static allocation.
++ * common/argparse.c (optfile_parse): Allow string arguments to leak.
++
++ g10: Fix memory leak.
++ * g10/keyserver.c (parse_keyserver_uri): Free URI.
++
++ tools/gpgtar: Annotate semi-static allocation.
++ * tools/gpgtar.c (shell_parse_argv): Annotate argument vector as
++ leaked.
++
++ g10: Fix memory leak.
++ * g10/import.c (transfer_secret_keys): Release curve from the previous
++ iteration.
++
++ g10: Fix build with disabled kbnode cache.
++ * g10/kbnode.c (release_unused_nodes): Fix build with disabled kbnode
++ cache.
++
++ g10: Fix memory leak.
++ * g10/trustdb.c (tdb_get_validity_core): Fix kbnode leak.
++
++ g10: Fix memory leak.
++ * g10/keygen.c (keygen_set_std_prefs): Fix memory leak.
++
++ Fix trivial memory leaks in tests.
++ * dirmngr/t-ldap-parse-uri.c (check_ldap_escape_filter): Free result.
++ * g10/t-stutter.c (main): Free file name.
++
++2016-06-30 Justus Winter <justus at g10code.com>
++
++ tools: Fix trivial memory leak.
++ * tools/gpg-connect-agent.c (main): Fix trivial memory leak.
++
++ g10: Fix memory leak.
++ * g10/export.c (do_export_stream): Free secret parameters.
++
++ g10: Fix memory leak.
++ * g10/keygen.c (read_parameter_file): Free 'line'.
++
++ g10: Fix memory leak.
++ * g10/sign.c (mk_notation_policy_etc): Free 'mbox'.
++
++ common: Fix memory leak.
++ * g10/textfilter.c (copy_clearsig_text): Free buffer.
++
++ common: Fix memory leak.
++ * common/iobuf.c (iobuf_set_partial_body_length_mode): Only create
++ context if necessary.
++
++ common: Fix memory leak.
++ * common/simple-pwquery.c (agent_open): Free socket path.
++
++ g10: Fix keybox-related memory leaks.
++ * g10/keydb.c (keydb_release): Clear keyblock cache.
++ (keydb_get_keyblock): Revert previous change.
++ * kbx/keybox-blob.c (create_blob_finish): Free previous buffer, free
++ fixups after applying them.
++ (_keybox_release_blob): Free buffer. Currently, the buffer has been
++ extracted before the keybox is released, but this is the right thing
++ to do here.
++
++ Fixes-commit: c57501cc
++
++ g10: Fix memory leak.
++ * g10/compress.c (release_context): Free buffers.
++
++ g10: Fix memory leak.
++ * g10/sign.c (write_plaintext_packet): Free packet.
++
++ g10: Fix memory leak.
++ * g10/mainproc.c (release_list): Do not exit early if list is NULL,
++ there are other resources that must be released.
++
++ gpgscm: Fix reallocating string ports.
++ * tests/gpgscm/scheme.c (realloc_port_string): Use memcpy because
++ Scheme strings may contain 0s.
++
++ gpgscm: Free memory backing string ports.
++ * tests/gpgscm/scheme.c (finalize_cell): Free memory backing string
++ ports.
++
++ gpgscm: Use the allocator from libgcrypt.
++ * tests/gpgscm/main.c (main): Use the allocator from libgcrypt.
++
++ w32: Fix build.
++ * g10/keyedit.c (keyedit_quick_revuid): Fix call to
++ 'check_trustdb_stale'.
++
++ Fixes-commit: 55d112ee
++
++2016-06-30 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ g10: Implement gpg --quick-revuid.
++ * g10/revoke.c (get_default_uid_revocation_reason): New.
++ * g10/keyedit.c (menu_revuid): Break out creation of uid revocation
++ into new function core_revuid.
++ * g10/keyedit.c (keyedit_quick_revuid): New. Selects key and
++ uid, invokes core_revuid.
++ * g10/gpg.c (main): Handle --quick-revuid argument.
++ * doc/gpg.texi: Document --quick-revuid.
++
++2016-06-29 Werner Koch <wk at gnupg.org>
++
++ tools: Add gpg-wks-client and gpg-wks-server.
++ * configure.ac: Add option --enable-wks-tools
++ * tools/gpg-wks-client.c: New.
++ * tools/gpg-wks-server.c: New.
++ * tools/gpg-wks.h: new.
++ * tools/wks-receive.c: New.
++ * tools/call-dirmngr.c, tools/call-dirmngr.h: New.
++
++ build: Improve GNUPG_BUILD_PROGRAM macro.
++ * acinclude.m4 (GNUPG_BUILD_PROGRAM): Allow for dash in options.
++
++ tools: Add modules for MIME parsing and creating.
++ * tools/mime-maker.c: New.
++ * tools/mime-maker.h: New.
++ * tools/mime-parser.c: New.
++ * tools/mime-parser.h: New.
++
++2016-06-28 Justus Winter <justus at g10code.com>
++
++ gpgscm: Fix memory leaks.
++ * tests/gpgscm/ffi-private.h (ffi_schemify_name): Fix prototype.
++ (ffi_define_function_name): Free schemified name.
++ (ffi_define_function): Likewise.
++ (ffi_define_constant): Likewise.
++ (ffi_define_variable_pointer): Likewise.
++ * tests/gpgscm/ffi.c (do_wait_processes): Free arrays.
++ (ffi_schemify_name): Fix type.
++ * tests/gpgscm/main.c (main): Free 'sc'.
++
++ gpgscm: Free file names.
++ * tests/gpgscm/scheme.c (scheme_load_named_file): Free file name.
++
++ gpgscm: Fix buffer overflow.
++ * tests/gpgscm/scheme.c (store_string): Avoid writing past allocated
++ buffer.
++
++ g10: Fix memory leaks.
++ * g10/keydb.c (keydb_get_keyblock): Free 'sigstatus' and 'iobuf'.
++ * g10/t-keydb-get-keyblock.c: Fix trivial memory leaks.
++ * g10/t-keydb.c: Likewise.
++
++ common: Fix memory leaks.
++ * common/ccparray.c (ccparray_put): Free old array.
++ * common/stringhelp.c (do_make_filename): Free 'home'.
++ * common/t-convert.c: Fix trivial memory leaks.
++ * common/t-iobuf.c: Likewise.
++ * common/t-mbox-util.c: Likewise.
++ * common/t-name-value.c: Likewise.
++ * common/t-stringhelp.c: Likewise.
++ * common/t-strlist.c: Likewise.
++
++2016-06-28 Werner Koch <wk at gnupg.org>
++
++ dirmngr: add option to retrieve extra WKS info.
++ * dirmngr/server.c (cmd_wkd_get): Add option --submission-address.
++
++ gpg: Add hack to --quick-gen-key to create Curve25519 keys.
++ * g10/keygen.c (quick_generate_keypair): Add special algo string
++ "test-default".
++
++ common: New function rfctimestamp.
++ * common/gettime.c (rfctimestamp): New.
++
++ common: Add missing header file for clarity.
++ * common/zb32.c: Include zb32.h.
++
++2016-06-28 Justus Winter <justus at g10code.com>
++
++ tools/gpgtar: Fix handling of '-'.
++ * tools/gpgtar-extract.c (gpgtar_extract): Use stdin if file is '-'.
++ * tools/gpgtar-list.c (gpgtar_list): Likewise.
++
++ common: Close input stream.
++ * common/exechelp-posix.c (gnupg_spawn_process): Also close the input
++ stream in the child.
++
++ common: Fix copying data from the spawned child.
++ Fixes intermittent gpgtar failures.
++
++ * common/exectool.c (copy_buffer_do_copy): Initialize 'nwritten'.
++ (gnupg_exec_tool_stream): Loop until all data is copied.
++
++2016-06-28 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: Fix --list-packets.
++ * g10/gpg.c (main): Call set_packet_list_mode after assignment of
++ opt.list_packets.
++ * g10/mainproc.c (do_proc_packets): Don't stop processing with
++ --list-packets as the comment says.
++ * g10/options.h (list_packets): Fix the comment.
++ * g10/parse-packet.c: Fix the condition for opt.list_packets.
++
++2016-06-25 Werner Koch <wk at gnupg.org>
++
++ build: Add aclocal macro from pkg-config.
++ * m4/pkg.m4: New.
++
++ yat2m: Silence lint warnings and fix a printf format bug.
++ * doc/yat2m.c (ATTR_PRINTF, ATTR_NR_PRINTF, ATTR_MALLOC): New.
++ (die, err, inf, xmalloc, xcalloc): New prototypes with attributes.
++ (get_section_buffer): Take care of !N_SECTIONS.
++ (proc_texi_cmd): Cast precision format arg.
++ (proc_texi_buffer): Do not set IN_CMD when not used afterwards.
++
++2016-06-24 Werner Koch <wk at gnupg.org>
++
++ gpg: New import option "import-export".
++ * g10/import.c (parse_import_options): Add option "import-export".
++ (write_keyblock_to_output): New.
++ (import_one): Implement option.
++
++2016-06-23 Werner Koch <wk at gnupg.org>
++
++ gpg: New import option "import-show".
++ * g10/options.h (IMPORT_SHOW): New.
++ * g10/import.c (parse_import_options): Add "import-show".
++ (import_one): Implement that.
++
++ gpg: Do not print the validity after key generation.
++ * g10/keylist.c (struct keylist_context): Add field NO_VALIDITY.
++ (list_keyblock_print): Take care of it.
++ (list_keyblock_direct): Add arg NO_VALIDITY.
++ * g10/keygen.c (do_generate_keypair): Merge keyblock and print w/o
++ validity.
++
++ common: Fix possible small memory leak in b64dec.c.
++ * common/b64dec.c (b64dec_finish): Always release TITLE.
++
++2016-06-23 Justus Winter <justus at g10code.com>
++
++ tests/openpgp: Fake the system time for the tofu test.
++ The keys in the tofu test are set to expire on 2016-09-17. Fake the
++ system time for this test.
++
++ This commit includes changes to the old test as well, for those who
++ need to backport it.
++
++ * tests/openpgp/gpg-agent.conf.tmpl: Drop trailing newlines.
++ * tests/openpgp/tofu.scm: Fake system time.
++ * tests/openpgp/tofu.test: Likewise.
++
++ GnuPG-bug-id: 2393
++
++ gpgscm: Handle exceptions in the transformation monad.
++ * tests/gpgscm/tests.scm (pipe:do): Raise errors.
++ (tr:spawn): Catch and return errors.
++ (tr:call-with-content): Likewise.
++ (tr:{open,write-to,pipe-do,assert-identity,assert-weak-identity}):
++ Adapt.
++
++ tests/openpgp: Improve tests.
++ * tests/openpgp/multisig.scm: Simplify test.
++ * tests/openpgp/setup.scm (dearmor): Use pipe.
++
++ gpgscm: Add types for special objects.
++ * tests/gpgscm/scheme.c (enum scheme_types): Add types for boolean,
++ nil, eof, and the sink object.
++ (type_to_string): Handle new types.
++ (scheme_init_custom_alloc): Give special objects a type.
++
++ gpgscm: Fix Scheme initialization.
++ This potentially causes a crash if the garbage collector marks an eof
++ object.
++
++ * tests/gpgscm/scheme.c (scheme_init_custom_alloc): Initialize
++ 'EOF_OBJ'.
++
++2016-06-23 Werner Koch <wk at gnupg.org>
++
++ common: Add dedicated private key functions to name-value.c.
++ * common/name-value.c (struct name_value_container): Add field
++ 'private_key_mode'.
++ (my_error): New. Use instead of gpg_error.
++ (nvc_new_private_key): New.
++ (nve_release): Add arg 'private_key_mode'.
++ (nvc_release): Call nve_release with private_key_mode flag.
++ (nvc_delete): Ditto.
++ (_nvc_add): Do no special case "Key:" in non-private_key_mode.
++ (nvc_get_private_key): Return error in non-private_key_mode.
++ (nvc_set_private_key): Ditto.
++ (nvc_parse): Factor all code out to ...
++ (do_nvc_parse): new. Add arg 'for_private_key'.
++ (nvc_parse_private_key): New.
++ * agent/findkey.c (write_extended_private_key): Replace nvc_parse by
++ nvc_parse_private_key.
++ (read_key_file): Ditto.
++
++ * common/t-name-value.c (private_key_mode): New variable.
++ (my_nvc_new): New. Replace all callers.
++ (test_key_extraction): Take mode in account.
++ (run_tests): Ditto.
++ (run_modification_tests): Ditto.
++ (parse): Ditto.
++ (main): Add option --parse and rename --parse to --parse-key.
++
++ common: Rename external symbols in name-value.c.
++ * common/name-value.c, common/name-value.h: Rename symbol prefixes
++ from "pkc_" to "nvc_" and from "pke_" to "nve_". Change all callers.
++
++ common: Rename private-keys.c to name-value.c.
++ * common/private-keys.c: Rename to name-value.c.
++ * common/private-keys.h: Rename to name-value.h. Chage all users.
++ * common/t-private-keys.c: Rename to t-name-value.c.
++ * common/Makefile.am: Adjust accordingly.
++
++ common: Add PGP armor decoding to b64dec.
++ * common/b64dec.c (decoder_states): Add new states.
++ (b64dec_proc): Handle PGP armored format.
++
++2016-06-23 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: Fix regression of card-edit/fetch.
++ * g10/card-util.c (fetch_url): Call keyserver_fetch instead of
++ keyserver_import_fprint.
++
++2016-06-21 Justus Winter <justus at g10code.com>
++
++ tests/migrations: Convert to Scheme and re-enable.
++ * configure.ac: Re-enable.
++ * tests/Makefile.am: Likewise.
++ * tests/migrations/Makefile.am (TESTS): Use Scheme tests.
++ * tests/migrations/common.scm: New file.
++ * tests/migrations/extended-private-key-format.scm: Likewise.
++ * tests/migrations/from-classic.scm: Likewise.
++ * tests/migrations/extended-private-key-format.test: Drop file.
++ * tests/migrations/from-classic.test: Drop file.
++
++ gpgscm: Add more file handling functions.
++ * tests/gpgscm/ffi.c (do_glob): New function.
++ (ffi_init): Define new function.
++ * tests/gpgscm/tests.scm (basename-suffix): New function.x
++
++ tests/openpgp: Port the remaining tests to Scheme.
++ * tests/openpgp/Makefile.am (TESTS): Add new tests.
++ * tests/openpgp/defs.scm (gpg-with-colons): New function.
++ (get-config): Use new function.
++ * tests/openpgp/export.scm: New file.
++ * tests/openpgp/tofu.scm: Likewise.
++
++ gpgscm: Improve test framework.
++ * tests/gpgscm/lib.scm (echo): Move...
++ * tests/gpgscm/tests.scm (echo): ... here.
++ (info, error, skip): And use echo here.
++ (file-exists?): New function.
++ (tr:spawn): Check that source exists and if the sink has been created.
++ (tr:call-with-content): Hand in optional arguments.
++
++ gpgscm: Use native string searching functions.
++ * tests/gpgscm/ffi-private.h: Handle character arguments.
++ * tests/gpgscm/ffi.c (do_string_index): New function.
++ (do_string_rindex): Likewise.
++ (do_string_contains): Likewise.
++ (ffi_init): Define new functions.
++ * tests/gpgscm/ffi.scm (ffi-define): New macro.
++ * tests/gpgscm/lib.scm (string-index): Use native function,
++ demonstrate behavior.
++ (string-rindex): Likewise.
++ (string-contains?): Likewise.
++ Demonstrate behavior of various other functions.
++ (read-all): Rework so that it can handle large files.
++
++ gpgscm: Improve error reporting.
++ * tests/gpgscm/scheme.c (type_to_string): New function.
++ (Eval_Cycle): Include actual type in error message.
++
++ gpgscm: Make memory allocation failures fatal.
++ * tests/gpgscm/scheme.c (Eval_Cycle): Exit if we run out of memory.
++
++2016-06-21 Werner Koch <wk at gnupg.org>
++
++ sm: Do not install cacert and other root certificates.
++ * doc/Makefile.am (dist_pkgdata_DATA): Move qualified.txt and
++ com-certs.pem to ...
++ (EXTRA_DIST): here.
++
++2016-06-20 Werner Koch <wk at gnupg.org>
++
++ gpg: Add experimental support for an issuer fpr.
++ * common/openpgpdefs.h (SIGSUBPKT_ISSUER_FPR): New.
++ * g10/build-packet.c (build_sig_subpkt_from_sig): Add arg PKSK and
++ insert the issuer fpr if needed.
++ * g10/sign.c (write_signature_packets): Pass signing key.
++ (make_keysig_packet): Ditto.
++ (update_keysig_packet): Ditto.
++ * g10/parse-packet.c (dump_sig_subpkt): Print issuer fpr.
++ (parse_one_sig_subpkt): Detect issuer fpr.
++ (can_handle_critical): Add issuer fpr.
++ * g10/mainproc.c (check_sig_and_print): Try to get key via fingerprint.
++ * g10/gpgv.c (keyserver_import_fprint): New stub.
++ * g10/test-stubs.c (keyserver_import_fprint): New stub.
++
++ gpg: New option --rfc4880bis.
++ * g10/options.h (struct opt): Add field flags.rfc4880bis.
++ * g10/gpg.c (oRFC4880bis): new.
++ (opts): add --rfc4880bis.
++ (main): Implement that and print a warning.
++
++2016-06-19 Niibe Yutaka <gniibe at fsij.org>
++
++ scd: Reset nonnull_nad to zero for VENDOR_GEMPC.
++ * (parse_ccid_descriptor): nonnull_nad = 0 for all GEMPC device.
++
++2016-06-17 Werner Koch <wk at gnupg.org>
++
++ tests: Make make distcheck work again.
++ * Makefile.am (tests): Remove test code which would led to doubling
++ calls to for e.g. "make distclean".
++ * tests/Makefile.am: Typo fixes.
++ * tests/gpgscm/Makefile.am (EXTRA_DIST): Fix name of License file.
++ Add repl.scm.
++ (check): Replace by check-local because check is a standard automake
++ target.
++ * tests/openpgp/Makefile.am (TESTS_ENVIRONMENT): Replace gmake0sim by
++ automake generated macro.
++ (EXTRA_DIST): Add defs.scm
++
++ gpgscm: Silence compiler warnings.
++ * tests/gpgscm/scheme.c (mk_integer): Rename arg NUM to N.
++ (fill_vector): Ditto.
++ (mark): Rename var NUM to N.
++ (set_slot_in_env): Mark SC as unused.
++ (is_any): Mark P as unused.
++
++ Add license notices for TinySCHEME.
++ * tests/gpgscm/COPYING: Rename to ...
++ * tests/gpgscm/LICENSE.TinySCHEME: this.
++ * AUTHORS: Add a note about TinySCHEME.
++ * build-aux/speedo/w32/pkg-copyright.txt: Add TinySCHEME notice.
++
++2016-06-17 Justus Winter <justus at g10code.com>
++
++ tests/openpgp: Reimplement tests in Scheme.
++ * Makefile.am: Build the test infrastructure on Windows.
++ * tests/openpgp/Makefile.am (required_pgms): Add gpgscm.
++ (TESTS_ENVIRONMENT): Make sure gpgscm and the libraries are found.
++ (TESTS): Replace tests with the new Scheme implementations.
++ * tests/openpgp/4gb-packet.scm: New file.
++ * tests/openpgp/README: Likewise.
++ * tests/openpgp/armdetach.scm: Likewise.
++ * tests/openpgp/armdetachm.scm: Likewise.
++ * tests/openpgp/armencrypt.scm: Likewise.
++ * tests/openpgp/armencryptp.scm: Likewise.
++ * tests/openpgp/armor.scm: Likewise.
++ * tests/openpgp/armsignencrypt.scm: Likewise.
++ * tests/openpgp/armsigs.scm: Likewise.
++ * tests/openpgp/clearsig.scm: Likewise.
++ * tests/openpgp/conventional-mdc.scm: Likewise.
++ * tests/openpgp/conventional.scm: Likewise.
++ * tests/openpgp/decrypt-dsa.scm: Likewise.
++ * tests/openpgp/decrypt.scm: Likewise.
++ * tests/openpgp/default-key.scm: Likewise.
++ * tests/openpgp/defs.scm: Likewise.
++ * tests/openpgp/detach.scm: Likewise.
++ * tests/openpgp/detachm.scm: Likewise.
++ * tests/openpgp/ecc.scm: Likewise.
++ * tests/openpgp/encrypt-dsa.scm: Likewise.
++ * tests/openpgp/encrypt.scm: Likewise.
++ * tests/openpgp/encryptp.scm: Likewise.
++ * tests/openpgp/finish.scm: Likewise.
++ * tests/openpgp/genkey1024.scm: Likewise.
++ * tests/openpgp/gpgtar.scm: Likewise.
++ * tests/openpgp/import.scm: Likewise.
++ * tests/openpgp/mds.scm: Likewise.
++ * tests/openpgp/multisig.scm: Likewise.
++ * tests/openpgp/run-tests.scm: Likewise.
++ * tests/openpgp/seat.scm: Likewise.
++ * tests/openpgp/setup.scm: Likewise.
++ * tests/openpgp/signencrypt-dsa.scm: Likewise.
++ * tests/openpgp/signencrypt.scm: Likewise.
++ * tests/openpgp/sigs-dsa.scm: Likewise.
++ * tests/openpgp/sigs.scm: Likewise.
++ * tests/openpgp/use-exact-key.scm: Likewise.
++ * tests/openpgp/verify.scm: Likewise.
++ * tests/openpgp/version.scm: Likewise.
++
++ tests/gpgscm: Add a TinySCHEME-based test driver.
++ * configure.ac: Add new component.
++ * tests/Makefile.am: Likewise.
++ * tests/gpgscm/Makefile.am: New file.
++ * tests/gpgscm/ffi-private.h: Likewise.
++ * tests/gpgscm/ffi.c: Likewise.
++ * tests/gpgscm/ffi.h: Likewise.
++ * tests/gpgscm/ffi.scm: Likewise.
++ * tests/gpgscm/lib.scm: Likewise.
++ * tests/gpgscm/main.c: Likewise.
++ * tests/gpgscm/private.h: Likewise.
++ * tests/gpgscm/repl.scm: Likewise.
++ * tests/gpgscm/scheme-config.h: Likewise.
++ * tests/gpgscm/t-child.c: Likewise.
++ * tests/gpgscm/t-child.scm: Likewise.
++ * tests/gpgscm/tests.scm: Likewise.
++
++ tests/gpgscm: Foreign objects support for TinySCHEME.
++ * tests/gpgscm/scheme-private.h (struct cell): Add 'foreign_object'.
++ (is_foreign_object): New prototype.
++ (get_foreign_object_{vtable,data}): Likewise.
++ * tests/gpgscm/scheme.c (enum scheme_types): New type.
++ (is_foreign_object): New function.
++ (get_foreign_object_{vtable,data}): Likewise.
++ (mk_foreign_object): Likewise.
++ (finalize_cell): Free foreign objects.
++ (atom2str): Pretty-print foreign objects.
++ (vtbl): Add new functions.
++ * tests/gpgscm/scheme.h (struct foreign_object_vtable): New type.
++ (mk_foreign_object): New prototype.
++ (struct scheme_interface): Add new functions.
++
++ Patch from Thomas Munro,
++ https://sourceforge.net/p/tinyscheme/patches/13/
++
++ tests/gpgscm: Dynamically allocate string buffer.
++ * tests/gpgscm/scheme-config.h (strbuff{,_size}): Make buffer dynamic.
++ * tests/gpgscm/scheme.c (expand_strbuff): New function.
++ (putcharacter): Adapt length test.
++ (readstrexp): Expand buffer if necessary.
++ (scheme_init_custom_alloc): Initialize buffer.
++ (scheme_deinit): Free buffer.
++
++ Patch from Thomas Munro,
++ https://sourceforge.net/p/tinyscheme/patches/11/
++
++ tests/gpgscm: Make exception value available.
++ * tests/gpgscm/init.scm (throw): Hand exception value to the handler.
++ (catch): And bind it to *error*.
++
++ tests/gpgscm: Add package macro.
++ * tests/gpgscm/init.scm: Add package macro from manual.
++
++ tests/gpgscm: Expose function to open streams as Scheme ports.
++ * tests/gpgscm/scheme.c (vtbl): Add 'port_from_file' to the vtable.
++ * tests/gpgscm/scheme.h (struct scheme_interface): New field
++ 'mk_port_from_file'.
++
++ tests/gpgscm: Nicer error message.
++ * tests/gpgscm/scheme.c (opexe_0): Include the value that we tried to
++ evaluate as function-like in the error message.
++
++ tests/gpgscm: Fix error hook.
++ * tests/gpgscm/init.scm (*error-hook*): Fix error hook so that the
++ whole error message is displayed.
++
++ tests/gpgscm: Handle unhandled enumeration values.
++ * tests/gpgscm/scheme.c (opexe_{3,4}): Handle unhandled enumeration
++ values in the opcode dispatching code.
++
++ tests/gpgscm: Verbatim import of latest TinySCHEME.
++ Revision 110 from svn://svn.code.sf.net/p/tinyscheme/code/trunk
++
++ * tests/gpgscm/COPYING: New file.
++ * tests/gpgscm/Manual.txt: Likewise.
++ * tests/gpgscm/init.scm: Likewise.
++ * tests/gpgscm/opdefines.h: Likewise.
++ * tests/gpgscm/scheme-private.h: Likewise.
++ * tests/gpgscm/scheme.c: Likewise.
++ * tests/gpgscm/scheme.h: Likewise.
++
++2016-06-17 Werner Koch <wk at gnupg.org>
++
++ scd: Make option --homedir work.
++ * scd/scdaemon.c (opts): Add --homedir.
++
+2016-06-16 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.13.
+
+2016-06-16 Yuri Chornoivan <yurchor at ukr.net>
+
+ po: Update Ukrainian translation.
+
+2016-06-16 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+
+2016-06-16 Werner Koch <wk at gnupg.org>
+
+ po: Update German translation.
+
+ Add missing files so that make distcheck works again,
+ * tests/openpgp/Makefile.am (CLEANFILES): Add created file
+ "passphrases".
+ * tools/Makefile.am (EXTRA_DIST): Add no-libgcrypt.c.
+
+ tools: Fix typo in function name of symcryptrun.
+ * tools/symcryptrun.c (main): Fix typo.
+
++2016-06-15 Niibe Yutaka <gniibe at fsij.org>
++
++ g10: Fix another race condition for trustdb access.
++ * g10/tdbio.c (create_version_record): Call create_hashtable to always
++ make hashtable, together with the version record.
++ (get_trusthashrec): Remove call to create_hashtable.
++
+2016-06-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Print the subkey's curve and not the primary key curve.
+ * g10/keylist.c (list_keyblock_colon): Use PK2 for the subkey's curve.
+
+ ldap: Improve info output for v3 fallback.
+ * dirmngr/dirmngr_ldap.c (fetch_ldap): Do not use log_debug in an
+ unprotected section. Replace log_debug by log_info in verbose mode.
+
+2016-06-14 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Try ldap protocol V3 as fallback.
+ * dirmngr/dirmngr_ldap.c (fetch_ldap): Try V3 Protocol in case
+ default Protocol gives error.
+
+ dirmngr: Print ldap error if bind fails.
+ * dirmngr/dirmngr_ldap.c (fetch_ldap): Use ldap_err2string on bind
+ return.
+
+2016-06-14 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Allow ciphers AES192 and SERPENT256.
+ * sm/gpgsm.c (main): Add AES192 cipher. Allow SERPENT256.
+
+ doc: Add files and envvars to a new index.
+ * doc/gnupg.texi: Define new index "ef".
+ (Environment Index): New.
+
+ gpg: Avoid endless loop in a tofu error case.
+ * g10/tofu.c (get_trust): Do not jump to out.
+
+ gpg: Split tofu's get_trust function into several smaller ones.
+ * g10/tofu.c (get_trust): Factor code out to ...
+ (format_conflict_msg_part1): new and to ...
+ (ask_about_binding): new.
+
+2016-06-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Un-deprecate option --auto-key-retrieve.
+ * g10/gpg.c (main): Remove deprecation warning.
+
+ gpg: New option --disable-signer-uid, create Signer's UID sub-packet.
+ * g10/gpg.c (oDisableSignerUID): New.
+ (opts): New option '--disable-signer-uid'.
+ (main): Set option.
+ * g10/options.h (opt): Add field flags.disable_signer_uid.
+ * g10/sign.c: Include mbox-util.h.
+ (mk_notation_policy_etc): Embed the signer's uid.
+ * g10/mainproc.c (check_sig_and_print): Do not use WKD for auto key
+ retrieval if --disable-signer-uid is used.
+
+ gpg: Try Signer's User ID sub-packet with --auto-key-retrieve.
+ * g10/packet.h (PKT_signature): Add field 'signers_uid'.
+ * g10/parse-packet.c (parse_signature): Set this field.
+ * g10/free-packet.c (free_seckey_enc): Free field.
+ (copy_signature): Copy field.
+ * g10/mainproc.c (akl_has_wkd_method): New.
+ (check_sig_and_print): Extend NEWSIG status. If WKD is enabled try to
+ locate a missing key via the signature's Signer's User ID sub-packet.
+ Do this right before trying a keyserver lookup.
+
+2016-06-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove C-99ism, re-indent, and simplify one function.
+ * g10/call-agent.c (struct keyinfo_data): Rename to
+ keyinfo_data_parm_s.
+ (agent_get_keyinfo): Replace C-99 style init.
+ (keyinfo_status_cb): Use new fucntion split_fields.
+ * g10/export.c (match_curve_skey_pk): Add missings returns error
+ cases.
+ (cleartext_secret_key_to_openpgp): Better clear PK->PKEY first.
+
+ common: New function split_fields.
+ * common/stringhelp.c (split_fields): New.
+ * common/t-stringhelp.c: Include assert.h.
+ (test_split_fields): New.
+ (main): Call test.
+
+2016-06-11 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ g10: Export cleartext keys as cleartext.
+ * g10/export.c (do_export_stream): If a key is stored by the agent in
+ cleartext, then try to export it as cleartext.
+ * tests/openpgp/export.test: For secret keys that are stored in
+ cleartext, test should try to export without pinentry interaction.
+
+ g10: Allow receiving cleartext secret keys from agent.
+ * g10/export.c (match_curve_skey_pk): New function, testing whether an
+ OpenPGP public key and an S-expression use the same curve.
+ * g10/export.c (cleartext_secret_key_to_openpgp): New function,
+ filling in the secret key parameters of a PKT_public_key object from
+ a corresponding cleartext S-expression.
+ * g10/export.c, g10/main.h (receive_seckey_from_agent): Add cleartext
+ parameter, enabling retrieval of the secret key, unlocked.
+ * g10/export.c (do_export_stream): Send cleartext as 0, keeping current
+ behavior.
+ * g10/keygen.c (card_store_key_with_backup): Use cleartext=0 to ensure
+ that smartcard backups are all passphrase-locked.
+
+ g10: Add openpgp_protected flag to agent secret key export functions.
+ * g10/call-agent.c, g10/call-agent.h (agent_export_key): Add
+ openpgp_protected flag.
+ * g10/export.c (receive_seckey_from_agent): Request openpgp_protected
+ secret keys from agent.
+ * agent/command.c (hlp_export_key): EXPORT_KEY help text: add a
+ brief description of the effect of --openpgp.
+
+ g10: report whether key in agent is passphrase-protected or not.
+ * g10/call-agent.c, g10/call-agent.h (agent_get_keyinfo): add
+ r_cleartext parameter to report whether a key is stored without
+ passphrase protection.
+ * g10/gpgv.c, g10/test-stubs.c: augment dummy agent_get_keyinfo to
+ match new API.
+ * g10/export.c, g10/keyedit.c, g10/keygen.c, g10/keylist.c,
+ g10/sign.c: pass NULL to agent_get_keyinfo since we do not yet
+ need to know whether agent is passphrase-protected.
+
+2016-06-08 Werner Koch <wk at gnupg.org>
+
+ Explicitly restrict socket permissions.
+ * agent/gpg-agent.c (create_server_socket): Call chmod before listen.
+ * scd/scdaemon.c (create_server_socket): Ditto.
+ * dirmngr/dirmngr.c (main): Ditto.
+
+ w32: Fix recent build regression.
+ * common/homedir.c (_gnupg_socketdir_internal) [W32]: Add definition
+ for NAME.
+ * g10/gpg.c (main) [W32]: Fix use og gnupg_homedir.
+
+ * agent/gpg-agent.c (remove_socket): Remove unused var P.
+ * scd/scdaemon.c (cleanup): Ditto.
+
+ gpgconf: New commands --create-socketdir and --remove-socketdir.
+ * tools/gpgconf.c: Include unistd.h.
+ (aCreateSocketDir, aRemoveSocketDir): New.
+ (opts): Add --create-socketdir and --remove-socketdir.
+ (main): Implement them.
+
+ Implement /run/user/UID/gnupg based sockets.
+ * common/homedir.c: Include sys/stat.h and zb32.h.
+ (w32_portable_app, w32_bin_is_bin): Change type from int to byte.
+ (non_default_homedir): New.
+ (is_gnupg_default_homedir): New.
+ (default_homedir): Set non_default_homedir.
+ (gnupg_set_homedir): Set non_default_homedir and make
+ the_gnupg_homedir and absolute directory name.
+ (gnupg_homedir): Return an absolute directory name.
+ (_gnupg_socketdir_internal): New.
+ (gnupg_socketdir): Implement /run/user/ based sockets.
+ * tools/gpg-connect-agent.c (get_var_ext): Replace now obsolete
+ make_filename by xstrdup.
+ * tools/gpgconf.c (main): Sue gnupg_homedir for the "homedir:" output.
+
+ gpgconf: Add option --homedir.
+ * tools/gpgconf.c (opts): Add --homedir.
+ (main): Set homedir.
+
+ Do not use no-libgcrypt dummy for tools.
+ * tools/Makefile.am (gpgconf_SOURCES): Remove no-libgcrypt.c.
+ (gpgconf_LDADD): Add LIBGCRYPT_LIBS.
+ (gpg_connect_agent_LDADD): Ditto.
+ (gpgtar_LDADD): Ditto.
+ * dirmngr/Makefile.am (dirmngr_client_LDADD): Ditto.
+ (t_common_ldadd): Ditto. Remove no-libgcrypt.o.
+
+ Do not try to remove the enclosing directory of sockets.
+ * agent/gpg-agent.c (remove_socket): Do not remove the enclosing
+ directory.
+ * scd/scdaemon.c (cleanup): Ditto.
+
+2016-06-07 Werner Koch <wk at gnupg.org>
+
+ common: New function gnupg_socketdir.
+ * common/homedir.c (gnupg_socketdir): New.
+ * agent/gpg-agent.c (create_socket_name): Use new function instead of
+ gnupg_homedir.
+ (check_own_socket): Ditto.
+ (check_for_running_agent): Ditto.
+ * agent/preset-passphrase.c (main): Ditto.
+ * common/asshelp.c (start_new_gpg_agent): Ditto.
+ * scd/scdaemon.c (create_socket_name): Ditto.
+ * tools/gpgconf.c (main): Ditto.
+ * tools/symcryptrun.c (main): Ditto.
+
+ common: Remove homedir arg from start_new_{dirmngr,gpg_agent}.
+ * common/asshelp.c (start_new_gpg_agent): Remove arg 'homedir' in
+ favor of gnupg_homedir (). Change all callers.
+ (start_new_dirmngr): Ditto.
+ * common/get-passphrase.c (gnupg_prepare_get_passphrase): Remove arg
+ 'homedir'.
+
+ Replace use of opt.homedir by accessor functions.
+ * common/homedir.c (the_gnupg_homedir): New var.
+ (gnupg_set_homedir): New.
+ (gnupg_homedir): New.
+ * g10/options.h (struct opt): Remove 'homedir' and replace all users
+ by the new accessor functions.
+ * g13/g13-common.h (struct opt): Ditto.
+ * scd/scdaemon.h (struct opt): Ditto.
+ * sm/gpgsm.h (struct opt): Ditto.
+ * dirmngr/dirmngr.h (struct opt): Ditto.
+ * agent/preset-passphrase.c (opt_homedir): Ditto.
+ * agent/protect-tool.c (opt_homedir): Ditto.
+
+2016-06-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ gpg: Fix command line parsing of --quick-addkey and --quick-gen-key.
+ * g10/gpg.c (main): Compose a block by curly braces.
+
+2016-06-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Use --keyid-format=none by default.
+ * g10/gpg.c (main): Init keyid_format to KF_NONE.
+ * g10/keyid.c (format_keyid): Ditto.
+ (keystrlen): Ditto.
+
+ gpg: Add option --with-subkey-fingerprint.
+ * g10/gpg.c (oWithSubkeyFingerprint): New.
+ (opts): Add --with-subkey-fingerprint[s].
+ (main): Set that option.
+ * g10/options.h (struct opt): Add 'with_subkey_fingerprint'.
+ * g10/keylist.c (list_keyblock_print): Print subkey fingerprint.
+ (print_fingerprint): Tweak printing to use compact format if
+ desirable.
+
+ gpg: Implement --keyid-format=none.
+ * g10/gpg.c (main): Add option "none" to --keyid-format.
+ * g10/options.h (KF_NONE): New.
+ * g10/keyid.c (format_keyid): Implement that.
+ (keystr): Use format "long" is KF_NONE is in use.
+ (keystr_with_sub): Ditto.
+ * g10/keylist.c (list_keyblock_print): Adjust indentaion for KF_NONE.
+ Factor some code out to ...
+ (print_key_line): new.
+ (print_fingerprint): Add mode 20.
+ * g10/mainproc.c (list_node): Use print_key_line. Replace MAINKEY by
+ flags.primary in the PK. Fix putting a " revoked..." string into the
+ colons format.
+ * g10/pkclist.c (do_edit_ownertrust): Use print_key_line. This
+ slightly changes the putput format.
+ * g10/revoke.c (gen_standard_revoke): Use print_key_line. This may
+ also put "expires: " into the output.
+
+2016-06-04 Werner Koch <wk at gnupg.org>
+
+ w32: Require --enable-build-timestamp for the BUILD_HOSTNAME.
+ * configure.ac (BUILD_HOSTNAME): Set to "<anon>" bey default.
+ * build-aux/speedo.mk (speedo_pkg_gnupg_configure): Add
+ --enable-build-timestamp.
+
+2016-06-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Add the fingerprint to KEY_CREATED for subkeys.
+ * g10/keygen.c (print_status_key_created): Make more robust by
+ allowing a NULL for PK.
+ (generate_subkeypair): Use print_status_key_created.
+ (generate_card_subkeypair): Ditto.
+
+ gpg: Try to use the passphrase from the primary for --quick-addkey.
+ * agent/command.c (cmd_genkey): Add option --passwd-nonce.
+ (cmd_passwd): Return a PASSWD_NONCE in verify mode.
+ * g10/call-agent.c (agent_genkey): Add arg 'passwd_nonce_addr' and do
+ not send a RESET if given.
+ (agent_passwd): Add arg 'verify'.
+ * g10/keygen.c (common_gen): Add optional arg 'passwd_nonce_addr'.
+ (gen_elg, gen_dsa, gen_ecc, gen_rsa, do_create): Ditto.
+ (generate_subkeypair): Use sepeare hexgrip var for the to be created
+ for hexgrip feature. Verify primary key first. Make use of the
+ passwd nonce. Allow for a static passphrase.
+
+ gpg: Extend the --quick-gen-key command.
+ * g10/keygen.c (quickgen_set_para): Add arg 'use'.
+ (quick_generate_keypair): Add args 'algostr', 'usagestr', and
+ 'expirestr'. Implement primary only key mode.
+ (parse_algo_usage_expire): Set NBITS for the default algo.
+ * g10/gpg.c (main): Extend --quick-gen-key command.
+
+ gpg: Improve the new parse_subkey_algostr_usagestr fucntion.
+ * g10/keygen.c (parse_usagestr): Allow "cert".
+ (generate_subkeypair): Factor expire parsing out to ...
+ (parse_subkey_algostr_usagestr): here. Rename to ...
+ (parse_algo_usage_expire): this. Add arg 'for_subkey'. Set CERT for
+ primary key and check that it is not set for subkeys.
+
+ gpg: New command --quick-addkey.
+ * g10/keygen.c (DEFAULT_STD_SUBKEYUSE): New.
+ (ask_keysize): Factor code out to ...
+ (get_keysize_range, fixup_keysize): new.
+ (parse_parameter_usage): Factor parsing out to ...
+ (parse_usagestr): new. Allow use of "encr" as alias for "encrypt".
+ (parse_subkey_algostr_usagestr): New.
+ (generate_subkeypair): Add new args. Implement unattended mode.
+
+ * g10/keyedit.c (keyedit_quick_sign): Factor some code out to ...
+ (find_by_primary_fpr): new.
+ (keyedit_quick_addkey): New.
+ * g10/gpg.c (aQuickAddKey): New.
+ (opts): Add --quick-addkey.
+ (main): Implement.
+
+ gpg: Do not abort on certain invalid packets.
+ * g10/build-packet.c (write_fake_data): Check for non-opaque data.
+ * g10/seskey.c (do_encode_md): Return NULL instead of abort.
+
+ common: New function openpgp_is_curve_supported.
+ * common/openpgp-oid.c: Include openpgpdefs.h.
+ (oidtable): Add field pubkey_algo.
+ (openpgp_is_curve_supported): New.
+
+2016-06-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Allow User ID length >= 256.
+ * build-packet.c (do_user_id): Call write_header2 with HDRLEN not set.
+
+2016-05-31 Werner Koch <wk at gnupg.org>
+
+ gpg: New status code NOTATION_FLAGS.
+ * common/status.h (STATUS_NOTATION_FLAGS: New.
+ * g10/packet.h (struct notation): Add flags.human.
+ (notation_t): New typedef.
+ * g10/build-packet.c (sig_to_notation): Set flags.human.
+ * g10/keylist.c (show_notation): Write STATUS_NOTATION_FLAGS.
+
+2016-05-28 Werner Koch <wk at gnupg.org>
+
+ common: Add a status callback to gnupg_exec_tool_stream.
+ * common/exectool.h (exec_tool_status_cb_t): New.
+ * common/exectool.c: Include missing exectool.h.
+ (read_and_log_buffer_t): Replace array by pointer.
+ (gnupg_exec_tool_stream): Add args 'status_cb' and 'status_cb_value'.
+ Change all callers to pass NULL for them. Malloc buffer for
+ FDERRSTATE.
+ (read_and_log_stderr): Implement status_fd feature.
+
+2016-05-27 Werner Koch <wk at gnupg.org>
+
+ common: Allow a second input stream for gnupg_exec_tool_stream.
+ * common/exechelp-posix.c (do_exec): Add arg 'except' and pass to
+ close_all_fds.
+ (gnupg_spawn_process): Add arg 'except'. Change callers to pass NULL
+ for it.
+ * common/exechelp-w32.c (gnupg_spawn_process): Add dummy arg 'except'.
+ * common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
+ * common/exectool.c (copy_buffer_do_copy): Allow NULL for SINK.
+ (gnupg_exec_tool_stream): Add arg 'inextra'. Change callers to pass
+ NULL for it. Allow NULL for OUTPUT.
+
+ common: Simplify the fd closing patch 512c56a.
+ * common/exechelp-posix.c (get_max_fds): Use /proc/self.
+
+ common: Speedup closing fds before an exec.
+ * common/exechelp-posix.c [__linux__]: Include dirent.h.
+ (get_max_fds) [__linux__]: Return the actual used highest fd.
+
+ tools: Improve debug output of rfc822parse.
+ * tools/rfc822parse.c (show_event): Add missing events.
+
+ build: Remove obsolete tests for funopen and fopencookie.
+ * configure.ac (AC_CHECK_FUNCS): Remove tests for funopen.
+
+ common: Extend gnupg_create_inbound_pipe et al.
+ * common/exechelp-posix.c (gnupg_create_inbound_pipe): Add args 'r_fp'
+ and 'nonblock'.
+ (gnupg_create_outbound_pipe): Ditto.
+ * common/exechelp-w32.c (gnupg_create_inbound_pipe): Add non yet
+ functional args 'r_fp' and 'nonblock'.
+ (gnupg_create_outbound_pipe): Ditto.
+ * common/exechelp-w32ce.c (gnupg_create_inbound_pipe): Ditto.
+ (gnupg_create_outbound_pipe): Ditto.
+
+ common: Make use of default_errsource in exechelp.
+ * common/exechelp-posix.c (my_error_from_syserror, my_error): New.
+ Use them instead of gpg_error and gpg_error_from_syserror.
+ (create_pipe_and_estream): Remove arg ERRSOURCE and fix use of
+ OUTBOUND which has a wrong name. Adjust callers.
+ (gnupg_spawn_process): Remove arg ERRSOURCE and replace by use of
+ DEFAULT_ERRSOURCE.
+ * common/exechelp-w32.c (gnupg_spawn_process): Ditto.
+ * common/exechelp-w32ce.c (gnupg_spawn_process): Ditto.
+ * common/exectool.c (gnupg_exec_tool_stream): Do not pass
+ GPG_ERROR_FROM_SYSERROR.
+ * tools/gpgconf-comp.c (gc_component_check_options): Ditto.
+ (retrieve_options_from_program): Ditto.
+
+ gpg: Keep current and total of PROGESS status lines small enough.
+ * g10/progress.c (progress_filter): Factor status wrote out to...
+ (write_status_progress): New. Scale values down.
+
+2016-05-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ configure: Detection of libusb on FreeBSD.
+ * configure.ac (LIBUSB_LIBS): Use LIBUSB_NAME for AC_CHECK_LIB.
+
+2016-05-25 Werner Koch <wk at gnupg.org>
+
+ build: Switch to new URL for swdb.lst.
+
+2016-05-24 Werner Koch <wk at gnupg.org>
+
+ gpgtar: Simplify code by using ccparray.
+ * tools/gpgtar-create.c (gpgtar_create): Use ccparray functions.
+ * tools/gpgtar-extract.c (gpgtar_extract): Ditto.
+ * tools/gpgtar-list.c (gpgtar_list): Ditto.
+
+ common: Add simple dynamic array function.
+ * common/ccparray.c: New.
+ * common/ccparray.h: New.
+ * common/t-ccparray.c: New.
+ * common/Makefile.am (common_sources): Add files.
+ (module_tests): Add test file.
+ (t_ccparray_LDADD): New.
+
+2016-05-23 Justus Winter <justus at g10code.com>
+
+ tests: Test the pinentry interactions when exporting keys.
+ * tests/openpgp/export.test: Test pinentry interactions.
+
+ tests: Add support for a passphrase queue to fake pinentry.
+ * tests/openpgp/fake-pinentry.c (get_passphrase): New function.
+ (main): Add option --passphrasefile and read passphrases from it.
+
+ tests: Add logging to fake pinentry.
+ * tests/openpgp/fake-pinentry.c (log_stream): New variable.
+ (reply): New function.
+ (spacep,skip_options,option_value): Copy from common.
+ (main): Parse arguments, add --logfile option, write logfile.
+
+ tests: Add export test.
+ * tests/openpgp/Makefile.am (TESTS): Add new file.
+ * tests/openpgp/export.test: New file.
+
+2016-05-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Speed up key listing in Tofu mode.
+ * g10/tofu.c (get_trust): Add arg PK. Uses this instead of a an extra
+ lookup of the public key by fingerrpint.
+ (tofu_register): Pass PK to get_trust.
+ (tofu_get_validity): Ditto.
+
+ *g10/tofu.c (tofu_register): Remove unused FINGERPRINT_PP.
+
+ gpg: Avoid name spaces clash with future sqlite versions.
+ * g10/sqlite.c: Rename to gpgsql.c. Change function prefixes to
+ gpgsql_.
+ * g10/sqlite.h: Rename to gpgsql.h.
+ * g10/tofu.c: Adjust for changes.
+
+ gpg: Explicitly close a combined Tofu DB.
+ * g10/tofu.c (tofu_closedbs): Close combined DB.
+
+ gpg: Store the Tofu meta handle for databases in CTRL.
+ * g10/gpg.h (struct tofu_dbs_s, tofu_dbs_t): New declarations.
+ (struct server_control_s): Add field tofu.dbs.
+ * g10/tofu.c (struct dbs): Rename to tofu_dbs_s. Replace all users by
+ by tofu_dbs_t.
+ (opendbs): Add arg CTRL. Cache the DBS in CTRL.
+ (closedbs): Rename to tofu_closedbs and make global. Add arg CTRL.
+ (tofu_register): Add arg CTRL. Change all callers. Do not call
+ closedbs.
+ (tofu_get_validity): Ditto.
+ (tofu_set_policy): Ditto.
+ (tofu_get_policy): Ditto.
+ (tofu_set_policy_by_keyid): Add arg CTRL.
+ * g10/gpg.c (gpg_deinit_default_ctrl): Call tofu_closedbs.
+
+ gpg: Pass CTRL object down to the trust functions.
+
+ gpg: Fix the TOFU_STATS_LONG status.
+ * g10/tofu.c (show_statistics): Print TOFU STATS with formatting
+ characters.
+
+2016-05-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Print "[ never ]" instead of err for validity.
+ * g10/trust.c (uid_trust_string_fixed): Handle NEVER.
+
+2016-05-18 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Adjust the WKD lookup to specs version -01.
+ * dirmngr/server.c (cmd_wkd_get): Remove second occurrence of the
+ domain part.
+
+2016-05-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Emit new status line KEY_CONSIDERED.
+ * common/status.h (STATUS_KEY_CONSIDERED): New.
+ * g10/getkey.c: Include status.h.
+ (LOOKUP_NOT_SELECTED, LOOKUP_ALL_SUBKEYS_EXPIRED): New.
+ (finish_lookup): Add arg R_FLAGS. Count expired and revoked keys and
+ set flag. Check a requested usage before checking for expiraion or
+ revocation.
+ (print_status_key_considered): New.
+ (lookup): Print new status.
+
+2016-05-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix signature checking.
+ * g10/sig-check.c (check_signature_over_key_or_uid): Fix call to
+ walk_kbnode.
+
+2016-05-10 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow unattended deletion of secret keys.
+ * agent/command.c (cmd_delete_key): Make the --force option depend on
+ --disallow-loopback-passphrase.
+ * g10/call-agent.c (agent_delete_key): Add arg FORCE.
+ * g10/delkey.c (do_delete_key): Pass opt.answer_yes to
+ agent_delete_key.
+
+2016-05-09 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix buglet in the check_all_keysigs function.
+ * g10/keyedit.c (sig_comparison): Actually compare the pubkey
+ algorithms.
+
+ gpg: Request a "save" after cmd "check" fixed something.
+ * g10/keyedit.c (keyedit_menu) <cmdCHECK>: Set modified.
+
+2016-05-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2016-05-04 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.12.
+
+ speedo,w32: Remove the installation directory page.
+ * build-aux/speedo/w32/inst.nsi (MUI_PAGE_DIRECTORY): Remove.
+
+ gpg: Fix const char pointer mismatch with gettext.
+ * g10/tofu.c (get_trust): Use const char *.
+
+ speedo: Build sqlite with static-libgcc.
+ * build-aux/speedo/patches/sqlite.patch: New.
+ * Makefile.am (EXTRA_DIST): Add file.
+
+ speedo: Also try patch files w/o version number.
+ * build-aux/speedo.mk (SPKG_template): Try such a patch file.
+
+2016-05-04 Andre Heinecke <aheinecke at intevation.de>
+
+ speedo,w32: Install sqlite.
+ * build-aux/speedo/w32/inst.nsi (-sqlite, -un.sqlite): New.
+
+ speedo,w32: Fix uninstallation.
+ * build-aux/speedo/w32/inst.nsi (-un.gnupg): Delete distsigkey and
+ dirmngr-conf.skel
+
+ speedo,w32: Install localisation.
+ * build-aux/speedo/w32/inst.nsi (-libgpg-error, GnuPG): Install l10n.
+ (-un.libgpg-error, -un.gnupg): Uninstall l10n files.
+
+2016-05-04 Werner Koch <wk at gnupg.org>
+
+ tests: Disable the migrations tests.
+ * tests/Makefile.am (SUBDIRS): Remove migrations.
+ * configure.ac (AC_CONFIG_FILES): Remove migrations Makefile.
+
+2016-05-04 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+
+2016-05-04 Werner Koch <wk at gnupg.org>
+
+ po: Update German translation.
+
+ Some minor string changes and fixed a printf format.
+ * g10/build-packet.c (notation_value_to_human_readable_string): Use
+ %zu for size_t.
+
+ build: Update config.{guess,sub} to 2016-04-02 and 2016-03-30.
+ * build-aux/config.guess: Update.
+ * build-aux/config.sub: Update.
+
+ agent: Make --allow-loopback-pinentry the default.
+ * agent/gpg-agent.c (oNoAllowLoopbackPinentry): New.
+ (opts): Add --no-allow-loopback-pinentry. Hide
+ description of --allow-loopback-pinentry.
+ (parse_rereadable_options): Set opt.allow_loopback_pinentry by
+ default.
+ (main): Replace allow-loopback-pinentry by no-allow-loopback-pinentry
+ in the gpgconf list.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Ditto.
+
+2016-05-03 Werner Koch <wk at gnupg.org>
+
+ common: Print https URLs in help messages.
+ * common/argparse.c (strusage): Print https URLS.
+
+ tests: Silence output of some tests.
+ * common/t-exechelp.c (print_open_fds): Silence non-verbose output.
+ (test_close_all_fds): Ditto.
+ * common/t-session-env.c (show_stdnames): Indent output.
+ * g10/test.c (TEST): Silence non-verbose okay output.
+ (exit_tests): Ditto.
+ * tools/gpg-zip.in (tar_verbose_opt): Add option --quiet.
+ * tests/openpgp/gpgtar.test (GPGZIP): Pass option --quiet.
+ * tests/openpgp/mds.test: Indent MD5 notice.
+ * tests/openpgp/version.test: Indent --version output.
+
+ gpg: Emit status lines TOFU_STATS and TOFU_STATS_LONG.
+ * g10/tofu.c (NO_WARNING_THRESHOLD): Rename to BASIC_TRUST_THRESHOLD.
+ (FULL_TRUST_THRESHOLD): New.
+ (write_stats_status): New.
+ (show_statistics): Call new function. Print TOFU_STATS_LONG.
+
+2016-05-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Extend TRUST_foo status lines with the trust model.
+ * g10/trustdb.h (TRUST_FLAG_TOFU_BASED): New.
+ * g10/trustdb.c (trust_model_string): Lowercase the strings. Add arg
+ "model" and change callers to call with OPT.TRUST_MODEL.
+ * g10/tofu.c (tofu_wot_trust_combine): Set TRUST_FLAG_TOFU_BASED.
+ * g10/pkclist.c (write_trust_status): New.
+ (check_signatures_trust): Call new function.
+
+ gpg: Improve line wrapping for a tofu message.
+ * g10/tofu.c (time_ago_str): Mark non-breakable spaces.
+ (show_statistics): Remove marks.
+
+ gpg: Re-format some tofu messages.
+ * common/status.h (STATUS_TOFU_USER, STATUS_TOFU_STATS)
+ (STATUS_TOFU_STATS_SHORT, STATUS_TOFU_STATS_LONG): New.
+ * g10/tofu.c (NO_WARNING_THRESHOLD): New.
+ (record_binding, tofu_register): Take care of --dry-run.
+ (show_statistics): Print STATUS_TOFU_USER. Reformat some messages.
+ Fix the ngettext/strcmp thing. Use log_string instead of log_info.
+ Use NO_WARNING_THRESHOLD constant.
+ (get_trust): Use format_text and print a compact fingerprint.
+
+2016-05-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: More fix of error return path.
+ * scd/command.c (open_card): Return GPG_ERR_ENODEV on the failure of
+ apdu_connect.
+
+2016-04-29 Werner Koch <wk at gnupg.org>
+
+ common: Extend log_string to indent lines.
+ * common/logging.c (do_logv): Add indentation when called via
+ log_string.
+
+ gpg: Factor some code code out of tofu.c.
+ * g10/tofu.c (string_to_long): New.
+ (string_to_ulong): New.
+ (get_single_unsigned_long_cb): Replace strtol/strtoul by new function.
+ (get_single_long_cb): Ditto.
+ (signature_stats_collect_cb): Ditto.
+ (get_policy): Ditto.
+ (show_statistics): Ditto. Uese es_free instead of free.
+
+ gpg: Remove all assert.h and s/assert/log_assert/.
+
+ common: Improve log_assert.
+ * common/logging.c (bug_at): Do not i18n the string.
+ (_log_assert): New.
+ * common/logging.h (log_assert): Use new function and pass line
+ information.
+
+2016-04-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix error return path.
+ * scd/ccid-driver.c (bulk_in): Remove EAGAIN handling.
+ Handle LIBUSB_ERROR_NO_DEVICE to return CCID_DRIVER_ERR_NO_READER.
+
+2016-04-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix memory leaks.
+ * scd/ccid-driver.c (scan_or_find_usb_device): Return on
+ LIBUSB_ERROR_NO_MEM. Free CONFIG before return except on error.
+ (scan_or_find_devices): Free device list.
+
+2016-04-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Add experimental AKL method "wkd" and option --with-wkd-hash.
+ * g10/getkey.c (parse_auto_key_locate): Add method "wkd".
+ (get_pubkey_byname): Implement that method. Also rename a variable.
+ * g10/call-dirmngr.c (gpg_dirmngr_wkd_get): New.
+ * g10/keyserver.c (keyserver_import_wkd): New.
+ * g10/test-stubs.c (keyserver_import_wkd): Add stub.
+ * g10/gpgv.c (keyserver_import_wkd): Ditto.
+ * g10/options.h (opt): Add field 'with_wkd_hash'.
+ (AKL_WKD): New.
+
+ * g10/gpg.c (oWithWKDHash): New.
+ (opts): Add option --with-wkd-hash.
+ (main): Set that option.
+ * g10/keylist.c (list_keyblock_print): Implement that option.
+
+ dirmngr: Add experimental command WKD_GET.
+ * dirmngr/server.c (cmd_wkd_get): New.
+ (register_commands): Add command WKD_GET.
+
+ dirmngr: Use system provided root CAs with KS_FETCH.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Use HTTP_FLAG_TRUST_SYS.
+
+2016-04-26 Werner Koch <wk at gnupg.org>
+
+ http: Allow to request system defined CAs for TLS.
+ * dirmngr/http.h (HTTP_FLAG_TRUST_DEF, HTTP_FLAG_TRUST_SYS): New.
+ * dirmngr/http.c (http_session_new): Add arg "flags".
+ * dirmngr/ks-engine-hkp.c (send_request): Use new flag
+ HTTP_FLAG_TRUST_DEF for the new arg of http_session_new.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+ * dirmngr/t-http.c (main): Ditto.
+
+2016-04-25 Werner Koch <wk at gnupg.org>
+
+ common: Minor fixes for the new private-keys.c.
+ * common/private-keys.c (my_error_from_syserror): New. Use it in
+ place of gpg_error_from_syserror.
+ (_pkc_add, pkc_lookup, pke_next_value): Use ascii_strcasecmp.
+ (pkc_parse): Use xtrystrdup and append_to_strlist_try as intended.
+
+ (_pkc_add): Add braces around if-statement.
+
+ common: Use new function to print a failure of xtrymalloc.
+ * common/miscellaneous.c (xoutofcore): New.
+ * common/strlist.c (append_to_strlist): Use instead of abort.
+ (append_to_strlist_try): Use xtrymalloc instead of xmalloc.
+
+2016-04-21 Justus Winter <justus at g10code.com>
+
+ common: Add support for the new extended private key format.
+ * agent/findkey.c (write_extended_private_key): New function.
+ (agent_write_private_key): Detect if an existing file is in extended
+ format and update the key within if it is.
+ (read_key_file): Handle the new format.
+ * agent/keyformat.txt: Document the new format.
+ * common/Makefile.am: Add the new files.
+ * common/private-keys.c: New file.
+ * common/private-keys.h: Likewise.
+ * common/t-private-keys.c: Likewise.
+ * common/util.h (alphap, alnump): New macros.
+ * tests/migrations: Add test demonstrating that we can cope with the
+ new format.
+
+ common: Add 'free_strlist_wipe' which wipes memory.
+ * common/strlist.c (free_strlist_wipe): New function.
+ * common/strlist.h (free_strlist_wipe): New prototype.
+
+ common: Add 'append_to_strlist_try' which can fail.
+ * common/strlist.c (append_to_strlist): Use the new function.
+ (append_to_strlist_try): New function.
+ * common/strlist.h (append_to_strlist_try): New prototype.
+
+ agent: Convert key format document to org.
+ * agent/keyformat.txt: Convert to org mode.
+
+ tests: Make migration test more robust and silent.
+ * tests/migrations/from-classic.test: Fix in-tree build, silence test.
+
+ Fixes-commit: defbc70b
+
+2016-04-21 Werner Koch <wk at gnupg.org>
+
+ w32: Use --enable-gpg2-is-gpg by default.
+ * autogen.rc: Add option also for plain Windows.
+
+ w32: Replace libiconv DLL by iconv feature of libgpg-error.
+ * configure.ac: Do nor require libiconv for W32.
+ * common/utf8conv.c [W32]: Do not incluce iconv.h. Request
+ libgpg-error iconv macros.
+ (jnlib_iconv): Use ICONV_CONST macro.
+ * build-aux/speedo/w32/inst.nsi [!WITH_GUI]: Do not install libiconv.
+ * build-aux/speedo.mk (speedo_spkgs) [!WITH_GUI]: Likewise.
+
+2016-04-20 Justus Winter <justus at g10code.com>
+
+ agent: Sanitize permissions of the private key directory.
+ * agent/gpg-agent.c (create_private_keys_directory): Set permissions.
+ * common/sysutils.c (modestr_to_mode): New function.
+ (gnupg_mkdir): Use new function.
+ (gnupg_chmod): New function.
+ * common/sysutils.h (gnupg_chmod): New prototype.
+ * tests/migrations/from-classic.test: Test migration with existing
+ directory.
+
+ GnuPG-bug-id: 2312
+
+ tests: Test the migration from a classic GnuPG home directory.
+ * configure.ac: Add new directory.
+ * tests/Makefile.am (SUBDIRS): Likewise.
+ * tests/migrations/Makefile.am: New file.
+ * tests/migrations/from-classic.gpghome/pubring.gpg.asc: Likewise.
+ * tests/migrations/from-classic.gpghome/secring.gpg.asc: Likewise.
+ * tests/migrations/from-classic.gpghome/trustdb.gpg.asc: Likewise.
+ * tests/migrations/from-classic.test: Likewise.
+
+2016-04-20 Werner Koch <wk at gnupg.org>
+
+ speedo: Use swdb.lst to define the SQLite version.
+ * build-aux/speedo.mk: Change sqlite to use our mirror and the
+ swdb.lst file.
+ * build-aux/speedo/w32/inst.nsi: gpg is now build and installed as
+ gpg.
+
+2016-04-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve UID selction of --quick-sign-key.
+ * g10/keyedit.c (keyedit_quick_sign): Improve UID selection and print
+ error for non-found userids.
+
+ gpg: Avoid debug like output at start of --edit-key.
+ * g10/keyedit.c (check_all_keysigs): Print info only after something
+ has been modified.
+
+2016-04-15 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Fix https never reported in general help.
+ * dirmngr/ks-engine-http.c (ks_hkp_help): Also print https
+ when supported and no uri provided.
+
+ dirmngr: Fix https incorrectly reported in help.
+ * dirmngr/ks-engine-http.c (ks_hkp_help): Only print https if tls
+ is supported.
+
+2016-04-14 Werner Koch <wk at gnupg.org>
+
+ agent: Fix regression due to recent commit 4159567.
+ * agent/protect.c (do_encryption): Fix CBC hashing.
+
+ agent: Allow gpg-protect-tool to handle openpgp-native protection.
+ * agent/protect-tool.c (read_and_unprotect): Add arg ctrl and pass to
+ agent_unprotect.
+ (main): Allocate a simple CTRL object and pass it to
+ read_and_unprotect.
+ (convert_from_openpgp_native): Remove stub.
+ (agent_key_available, agent_get_cache): New stubs.
+ (agent_askpin): New emulation for the one in call-pinentry.c.
+ (agent_write_private_key): New to dump key.
+ * agent/Makefile.am (gpg_protect_tool_SOURCES): Add cvt-openpgp.c
+
+ tests: Set fake-pinentry's stdout and stdin to _IOLBF.
+ * tests/openpgp/fake-pinentry.c (main): Call setvbuf. Show passphrase
+ at startup. Increase buffer.
+
+2016-04-12 Werner Koch <wk at gnupg.org>
+
+ agent: Implement new protection mode openpgp-s2k3-ocb-aes.
+ * agent/protect.c (agent_protect): Add arg use_ocb. Change all caller
+ to pass -1 for default.
+ * agent/protect-tool.c: New option --debug-use-ocb.
+ (oDebugUseOCB): New.
+ (opt_debug_use_ocb): New.
+ (main): Set option.
+ (read_and_protect): Implement option.
+
+ * agent/protect.c (OCB_MODE_SUPPORTED): New macro.
+ (PROT_DEFAULT_TO_OCB): New macro.
+ (do_encryption): Add args use_ocb, hashbegin, hashlen, timestamp_exp,
+ and timestamp_exp_len. Implement OCB.
+ (agent_protect): Change to support OCB.
+ (do_decryption): Add new args is_ocb, aadhole_begin, and aadhole_len.
+ Implement OCB.
+ (merge_lists): Allow NULL for sha1hash.
+ (agent_unprotect): Change to support OCB.
+ (agent_private_key_type): Remove debug output.
+
+ indent: Help Emacs not to get confused by conditional compilation.
+ * agent/protect.c (calibrate_get_time) [W32]: Use separate function
+ calls for W32 and W32CE.
+
+2016-04-07 Justus Winter <justus at g10code.com>
+
+ g10: Fix exporting secret keys of certain sizes.
+ * g10/build-packet.c (do_key): Do not use the header length specified
+ by the public key packet from the keyring, but let 'write_header2'
+ compute the required length.
+
+2016-04-06 Justus Winter <justus at g10code.com>
+
+ Revert "g10: Support armored keyrings in gpgv."
+ This reverts commit abb352de51bc964c06007fce43ed6f6caea87c15.
+
+2016-04-05 Justus Winter <justus at g10code.com>
+
+ dirmngr: Autodetect PEM format in dirmngr-client.
+ * dirmngr/dirmngr-client.c (init_asctobin): New function.
+ (main): Move the initialization code to the new function.
+ (read_pem_certificate): Initialize base64 table.
+ (read_certificate): Try to decode certificates given in files as PEM
+ first.
+
+ GnuPG-bug-id: 1844
+
+2016-04-05 Werner Koch <wk at gnupg.org>
+
+ build: Fix for: Build gpgcompose only in maintainer mode.
+ * g10/Makefile.am (noinst_PROGRAMS): Always add module_tests.
+
+ doc: Install gpg and gpgv man pages under the correct name.
+ * doc/mkdefsinc.c (main): Add double include guard. Set variable
+ gpgtwohack. Define macros gpgname and gpgvname.
+ * doc/gpg.texi: Remove macro definition for gpgname. Use Texinfo var
+ gpgtwohack to prepare the man pages. Use @gpgname everywhere.
+ * doc/gpgv.texi: Likewise.
+ * doc/Makefile.am (myman_pages): Remove gpg2.1 and gpgv2.1 but add
+ them depending on USE_GPG2_HACK.
+
+ build: Build gpgcompose only in maintainer mode.
+ * g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose only in maintainer
+ mode.
+
+ gpg: Replace use of "gpg2" by GPG_NAME.
+
+2016-04-04 Werner Koch <wk at gnupg.org>
+
+ Now build "gpg" binary but install as "gpg2"
+ * configure.ac (USE_GPG2_HACK): New ac_define am_conditional.
+ * common/homedir.c (gnupg_module_name): Replace use of macro
+ NAME_OF_INSTALLED_GPG.
+ * g10/keygen.c (generate_keypair): Ditto.
+ * g10/Makefile.am (bin_PROGRAMS): Remove.
+ (noinst_PROGRAMS): Add gpg or gpg2 and gpgv or gpg2.
+ (gpg2_hack_list): New.
+ (use_gpg2_hack): New.
+ (gpg2_SOURCES): Rename to gpg_SOURCES.
+ (gpgv2_SOURCES): Rename to gpgv_SOURCES.
+ (gpg2_LDADD): Rename to gpg_LDADD.
+ (gpgv2_LDADD): Rename to gpgv_LDADD.
+ (gpg2_LDFLAGS): Rename to gpg_LDFLAGS.
+ (gpgv2_LDFLAGS): Rename to gpgv2_LDFLAGS.
+ (install-exec-hook): Remove WinCE specific rules and add new rules.
+ (uninstall-local): Uninstall gpg/gpg2 and gpgv/gpgv2.
+ * tests/openpgp/Makefile.am (required_pgms): s/gpg2/gpg/.
+ * tests/openpgp/defs.inc: Ditto.
+ * tests/openpgp/gpgtar.test: Ditto.
+ * tests/openpgp/mkdemodirs: Ditto.
+ * tests/openpgp/signdemokey: Ditto.
+
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Remove obsolete
+ --enable-mailto, add --enable-gpg2-is-gpg.
+
+ tests: Add missing file.
+ * tests/openpgp/Makefile.am (TEST_FILES): Add plain-largeo.asc.
+
+2016-04-04 Justus Winter <justus at g10code.com>
+
+ g10: Support armored keyrings in gpgv.
+ * doc/gpgv.texi: Document the feature.
+ * g10/Makefile.am (gpgv2_SOURCES): Add dearmor.c.
+ * g10/dearmor.c (dearmor_file): Add sink argument.
+ * g10/gpg.c (main): Adapt accordingly.
+ * g10/gpgv.c (make_temp_dir): New function.
+ (main): De-armor keyrings.
+ * g10/main.h (dearmor_file): Adapt prototype.
+
+ GnuPG-bug-id: 2290
+
+ tests: Fix default key test.
+ * tests/openpgp/default-key.test: Avoid using the option
+ '--trust-model' unconditionally.
+
+2016-04-01 Justus Winter <justus at g10code.com>
+
+ build: Check for conflicting trust model options.
+ * configure.ac: Disable TOFU if configured without trust models, and
+ check for conflicting options.
+
+ g10: Remove option --always-trust if compiled without trust models.
+ * g10/gpg.c (opts): Remove option --always-trust if compiled without
+ trust models.
+
+2016-03-31 Justus Winter <justus at g10code.com>
+
+ speedo,w32: Build libsqlite3.
+ * build-aux/speedo.mk (speedo_spkgs): Add libsqlite3 on w32.
+ (libsqlite3_ver): New variable.
+ (speedo_pkg_libsqlite3_tar): Likewise.
+
+ g10: Use gpg-error abstraction of sched_yield.
+ * g10/tofu.c (begin_transaction): Use 'gpgrt_yield'.
+
+2016-03-29 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix NULL-segv for missing tofu DB.
+ * g10/tofu.c (opendb): Guard call to timeout function.
+
+2016-03-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve message when asking for key capabilities.
+ * g10/keygen.c (ask_key_flags): Improve message.
+
+ gpg: Remove the extra prompt for Curve25519.
+ * g10/keygen.c (MY_USE_ECDSADH): New macro local to ask_curve.
+ (ask_curve): Use a fixed table of curve names and reserve a slot for
+ Curve448. Simplify CurveNNNN/EdNNNN switching.
+ (ask_curve): Remove the Curve25519 is non-standard prompt.
+
+2016-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence trustdb computation with --quiet.
+ * g10/trustdb.c (validate_keys): Do not print log_info stuff in quiet
+ mode.
+
+2016-03-17 Werner Koch <wk at gnupg.org>
+
+ sm: Always create a keybox header when creating a new keybox.
+ * sm/keydb.c (maybe_create_keybox): Create the header blob.
+
+2016-03-17 Neal H. Walfield <neal at g10code.com>
+
+ doc: Improve documentation of --enable-large-rsa.
+ * doc/gpg.texi (--enable-large-rsa): Improve text.
+
+2016-03-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: allow removal of the shadowed key.
+ * agent/findkey.c (agent_delete_key): Remove the key when asked.
+
+2016-03-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Add const qualifier.
+ * g10/gpgcompose.c (show_help): Those are strings not to be modified.
+
+2016-03-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not rely on a certain evaluation order.
+ * g10/keyedit.c (print_and_check_one_sig): Call check_key_signature
+ before derefing IS_SELFSIG.
+
+2016-03-14 Werner Koch <wk at gnupg.org>
+
+ scd: Add manufacturer id 0x000a.
+ * g10/card-util.c (get_manufacturer): Add it.
+
+2016-03-10 Kevin J. McCarthy <kevin at 8t8.us>
+
+ g10: Silence message if --quiet is given.
+ * g10/getkey.c (parse_def_secret_key): Silence message if --quiet is
+ given.
+
+2016-03-08 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Add a new test.
+ * g10/Makefile.am (EXTRA_DIST): Add t-stutter-data.asc.
+ (module_tests): Add t-stutter.
+ (t_stutter_SOURCES): New variable.
+ (t_stutter_LDADD): New variable.
+
+2016-03-07 Justus Winter <justus at g10code.com>
+
+ sm: Implement pinentry loopback and reading passphrases from fd.
+ * doc/gpgsm.texi: Document '--pinentry-mode' and '--passphrase-fd'.
+ * sm/Makefile.am (gpgsm_SOURCES): Add new files
+ * sm/call-agent.c (struct default_inq_parm_s): New definition.
+ (start_agent): Pass in the pinentry mode.
+ (default_inq_cb): Handle 'PASSPHRASE' and 'NEW_PASSPHRASE' inquiries.
+ Adapt all call sites to the new callback cookie.
+ * sm/gpgsm.c (cmd_and_opt_values): Add new values.
+ (opts): Add new options.
+ (main): Handle new options.
+ * sm/gpgsm.h (struct opt): Add field 'pinentry_mode'.
+ * sm/passphrase.c: New file.
+ * sm/passphrase.h: Likewise.
+
+ GnuPG-bug-id: 1970
+
+ sm: Remove unused argument '--fixed-passphrase'.
+ * doc/gpgsm.texi: Drop description.
+ * sm/gpgsm.c (cmd_and_opt_values): Drop enum value.
+ (opts): Drop argument.
+ (main): Drop argument handling.
+ * sm/gpgsm.h (struct opt): Drop field 'fixed_passphrase'.
+
+ kbx: Avoid undefined behavior.
+ * kbx/keybox-file.c (_keybox_read_blob2): Cast to unsigned int before
+ shifting.
+
+2016-03-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Bug fix for a device with multiple interfaces.
+ * scd/ccid-driver.c (scan_or_find_usb_device): Use IFC_NO when
+ accessing interface information.
+
+2016-03-04 Justus Winter <justus at g10code.com>
+
+ build: Make libusb a hard requirement if the ccid driver is requested.
+ * configure.ac: Print an error message and die if the internal ccid
+ driver is requested but no suitable libusb is found.
+
+ g10: Drop superfluous declaration.
+ * g10/main.h (disable_core_dumps): Drop declaration.
+
+ g10: Guard code against errors.
+ * g10/keygen.c (do_generate_keypair): Check for errors, in which case
+ 'pri_psk' is NULL.
+
+ Fixes-commit: bf9d1248
+
+2016-03-03 Justus Winter <justus at g10code.com>
+
+ dirmngr: Add more missing CFLAGS.
+ * dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
+ 'GCRYPT_CFLAGS'.
+ (t_dns_stuff_CFLAGS): Likewise.
+
+ GnuPG-bug-id: 2235
+
+ tests/openpgp: Skip gpgtar test if it has not been built.
+ * tests/openpgp/gpgtar.test: Check if executable exists.
+
+ GnuPG-bug-id: 2261
+
+2016-03-02 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Add new program gpgcompose.
+ * g10/packet.h: Include "util.h".
+ * g10/encrypt.c (encrypt_seskey): Don't mark as static.
+ * g10/gpgcompose.c: New file.
+ * g10/Makefile.am (noinst_PROGRAMS): Add gpgcompose.
+ (gpg2_SOURCES): Split everything but gpg.c into...
+ (gpg_sources): ... this new variable.
+ (gpgcompose_SOURCES): New variable.
+ (gpgcompose_LDADD): Likewise.
+ (gpgcompose_LDFLAGS): Likewise.
+
+ gpg: More robustly detect valid non-armored OpenPGP messages.
+ * g10/armor.c (is_armored): More robustly detect valid non-armored
+ OpenPGP messages.
+
+ common: Provide a function for mapping packet types to strings.
+ * common/openpgpdefs.h (pkttype_str): New function.
+
+ gpg: Rename pop_filter to iobuf_pop_filter and export it.
+ * common/iobuf.c (pop_filter): Rename from this...
+ (iobuf_pop_filter): ... to this. Don't mark it as static.
+
+ gpg: Split write_pubkey_enc_from_list.
+ * g10/encrypt.c (write_pubkey_enc_from_list): Split the body of this
+ function out into...
+ (write_pubkey_enc): ... this new function.
+
+ gpg: Allow the caller to write the contents of a plaintext packet.
+ * g10/build-packet.c (do_plaintext): Change the semantics such that if
+ PT->BUF is NULL, it is the caller's responsibility to write the
+ content (and disable partial body length mode, if appropriate).
+
+ gpg: Add a new function for creating binary notations.
+ * g10/build-packet.c (blob_to_notation): New function.
+
+ gpg: Refactor the printing of binary notations.
+ * g10/build-packet.c (sig_to_notation): Break printing of binary
+ notations into...
+ (notation_value_to_human_readable_string): ... this new function.
+ Provide a small preview of the binary data substituting non-printable
+ characters with '?'.
+
+2016-03-02 Uldis Anšmits <uldis.ansmits at tieto.com>
+
+ tests/openpgp: Make tests more portable.
+ * tests/openpgp/default-key.test: Avoid 'grep -q'.
+ * tests/openpgp/gpgtar.test: Avoid 'grep -qe' and 'diff -q'.
+ * tests/openpgp/use-exact-key.test: Avoid 'grep -q'.
+
+ GnuPG-bug-id: 2262
+
+2016-03-02 Justus Winter <justus at g10code.com>
+
+ common: Consolidate Assuan server argument handling.
+ * common/Makefile.am (common_sources): Add new files.
+ * common/server-help.c: New file.
+ * common/server-help.h: Likewise.
+ * agent/command.c: Drop argument handling primitives in favor of using
+ the consolidated ones.
+ * dirmngr/server.c: Likewise.
+ * g10/server.c: Likewise.
+ * g13/server.c: Likewise.
+ * scd/command.c: Likewise.
+ * sm/server.c: Likewise.
+
+2016-03-01 Justus Winter <justus at g10code.com>
+
+ dirmngr: Add missing CFLAGS.
+ * dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add
+ 'GPG_ERROR_CFLAGS'.
+ (t_dns_stuff_CFLAGS): Likewise.
+
+ tools: Drop superfluous include.
+ * tools/gpgtar.c: Do not include unused 'npth.h'.
+
+2016-02-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Prettify a 2 octet hex output.
+ * g10/sig-check.c (check_key_signature2): Wrap line and use %02x.
+
+2016-02-25 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Show debugging info if a sig with an unsupported sig class is used.
+ * g10/sig-check.c (check_key_signature2): If SIG->CLASS is
+ unsupported, show some debugging information. Don't use BUG to fail.
+ Just return GPG_ERR_BAD_SIGNATURE.
+
+ gpg: More carefully encode a packet's length.
+ * g10/build-packet.c (write_header2): Make sure the length bits are
+ cleared. Fail if HDRLEN is set and the specified length can't be
+ encoded in the available space.
+
+ gpg: Avoid directly twiddling bits.
+ * g10/build-packet.c (do_plaintext): Use ctb_new_format_p to check the
+ packet's format.
+ (write_header2): Likewise.
+
+ gpg: Add some asserts.
+ * g10/build-packet.c (ctb_new_format_p): New function.
+ (ctb_pkttype): New function.
+ (do_user_id): Add some asserts.
+ (do_key): Likewise.
+ (do_symkey_enc): Likewise.
+ (do_pubkey_enc): Likewise.
+ (do_plaintext): Likewise.
+ (do_encrypted): Likewise.
+ (do_encrypted_mdc): Likewise.
+ (do_compressed): Likewise.
+ (do_signature): Likewise.
+ (do_signature): Likewise.
+ (write_header2): Likewise.
+
+ gpg: Avoid an unnecessary copy.
+ * g10/build-packet.c (sig_to_notation): Avoid an unnecessary copy of
+ the data: the size of the packet is fixed.
+
+2016-02-23 Neal H. Walfield <neal at g10code.com>
+
+ common: Reduce buffer size.
+ * common/iobuf.c (iobuf_copy): Change buffer size from 1 MB to 32 KB.
+
+ common: Improve a function's documentation and comments.
+ * common/iobuf.c (iobuf_set_partial_body_length_mode): Fix
+ documentation and comment. Add an assert.
+
+ common: Add log_assert.
+ * common/logging.h (log_assert): New macro.
+
+ gpg: Use higher-level functions.
+ * g10/build-packet.c (do_symkey_enc): Use iobuf_write instead of
+ iobuf_put in a loop. Use iobuf_copy instead of iobuf_read and
+ iobuf_write in a loop. Move the memory wiping from here...
+ * common/iobuf.c (iobuf_copy): ... to here.
+
+ common: Check for an error before reading.
+ * common/iobuf.c (iobuf_copy): If DEST has a pending error, don't
+ start copying.
+
+ common: More accurately name function.
+ * common/iobuf.c (iobuf_set_partial_block_mode): Rename from this...
+ (iobuf_set_partial_body_length_mode): ... to this. Update callers.
+
+2016-02-23 Werner Koch <wk at gnupg.org>
+
+ g13: Add commands --suspend and --remove.
+ * g13/g13.c (aSuspend, aResume): New.
+ (opts): Add commands --suspend and --resume.
+ (main): Implement dummy command aUmount. Implement commands aResume
+ and aSuspend.
+ * g13/sh-cmd.c (cmd_suspend): New.
+ (cmd_resume): New.
+ (register_commands): Add commands RESUME and SUSPEND.
+ * g13/server.c (cmd_suspend): New.
+ (cmd_resume): New.
+ (register_commands): Add commands RESUME and SUSPEND.
+ * g13/be-dmcrypt.c (be_dmcrypt_suspend_container): New.
+ (be_dmcrypt_resume_container): New.
+ * g13/backend.c (be_suspend_container): New.
+ (be_resume_container): New.
+ * g13/suspend.c, g13/suspend.h: New.
+ * g13/mount.c (parse_header, read_keyblob_prefix, read_keyblob)
+ (decrypt_keyblob, g13_is_container): Move to ...
+ * g13/keyblob.c: new file.
+ (keyblob_read): Rename to g13_keyblob_read and make global.
+ (keyblob_decrypt): Rename to g13_keyblob_decrypt and make global.
+ * g13/sh-dmcrypt.c (check_blockdev): Add arg expect_busy.
+ (sh_dmcrypt_suspend_container): New.
+ (sh_dmcrypt_resume_container): New.
+ * g13/call-syshelp.c (call_syshelp_run_suspend): New.
+ (call_syshelp_run_resume): New.
+
+ g13: Run mount after dmsetup.
+ * g13/g13-syshelp.c (main): Reject userids with a slash.
+ * g13/sh-dmcrypt.c (sh_dmcrypt_mount_container): Run mount if a
+ mountpoint is known.
+
+2016-02-23 Justus Winter <justus at g10code.com>
+
+ tests/openpgp: Qualify executables with extension.
+ * tests/openpgp/Makefile.am (required_pgms): Qualify executables with
+ '$EXEEXT'.
+
+ tests/openpgp: Reimplement 'pinentry.sh' in c.
+ * tests/openpgp/Makefile.am: Build new program.
+ * tests/openpgp/defs.inc: Use the new program.
+ * tests/openpgp/fake-pinentry.c: New file.
+
+ tests/openpgp: Avoid dependency on source files.
+ * tests/openpgp/plain-largeo.asc: New file.
+ * tests/openpgp/version.test: Dearmor the new file instead of relying
+ on the source being present.
+
+ tests/openpgp: Fix file removal.
+ * tests/openpgp/version.test: Fix file removal.
+
+ common/exechelp: Provide a way to wait for multiple processes.
+ * common/exechelp-posix.c (gnupg_wait_process): Generalize to
+ 'gnupg_wait_processes'.
+ * common/exechelp-w32.c (gnupg_wait_process): Likewise.
+ * common/exechelp-w32ce.c (gnupg_wait_process): New function stub.
+ * common/exechelp.h (gnupg_wait_process): New prototype.
+
+ common/exechelp: Add general pipe function.
+ * common/exechelp-posix.c (gnupg_create_pipe): New function.
+ * common/exechelp-w32.c (INHERIT_{READ,WRITE,BOTH}): New macros.
+ (create_inheritable_pipe): Generalize so that both ends can be
+ inherited.
+ (do_create_pipe): Rename argument accordingly.
+ (gnupg_create_{in,out}bound_pipe): Use new flags.
+ (gnupg_create_pipe): New function.
+ (gnupg_spawn_process): Use new flags.
+ * common/exechelp-w32ce.c (gnupg_create_pipe): New stub.
+ * common/exechelp.h (gnupg_create_pipe): New prototype.
+
+ common/exechelp: Mute the Windows version.
+ * common/exechelp-w32.c (gnupg_wait_process): Do not print an error if
+ the exit code can be returned. This makes the Windows version behave
+ like the POSIX version.
+
+ common/exechelp: Avoid magic numbers.
+ * common/exechelp-w32.c (do_create_pipe): Use symbolic names.
+
+ common/exechelp: Disable debugging by default.
+ * common/exechelp-w32.c (DEBUG_W32_SPAWN): Set to 0.
+
+ common/exechelp: Fix handle leak.
+ * common/exechelp-w32.c (gnupg_spawn_process_detached): Close process
+ handle.
+
+ common/exechelp: Fix opening the 'nul' device.
+ * common/exechelp-w32.c (gnupg_spawn_process): Fix opening the 'nul'
+ device.
+
+ common/exechelp: Fix error handling.
+ * common/exechelp-w32.c (gnupg_spawn_process): Close the right handle.
+
+ common/exechelp: Fix pipe creation.
+ * common/exechelp-w32.c (gnupg_spawn_process): Fix the creation of the
+ input pipe.
+
+ tools/mk-tdata: Fix data generation on Windows.
+ * tools/mk-tdata.c (main): Set stdout to binary mode to avoid newline
+ conversion.
+
+2016-02-19 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Systematically detect and fix signatures that are out of order.
+ * g10/keyedit.c (sig_comparison): New function.
+ (fix_key_signature_order): Merge functionality into...
+ (check_all_keysigs): ... this function. Rewrite to eliminate
+ duplicates and use a systematic approach to detecting and moving
+ signatures that are out of order instead of a heuristic.
+ (fix_keyblock): Don't call fix_key_signature_order. Call
+ check_all_keysigs instead after collapsing the uids.
+
+ gpg: Split check_key_signature2.
+ * g10/sig-check.c (hash_uid_node): Rename from this...
+ (hash_uid_packet): ... to this. Take a PKT_user_id instead of a
+ KBNODE.
+ (check_key_signature2): Split the basic signature checking
+ functionality into...
+ (check_signature_over_key_or_uid): ... this new function.
+
+ gpg: Split print_and_check_one_sig.
+ * g10/keyedit.c (print_and_check_one_sig): Split the print
+ functionality into...
+ (print_one_sig): ... this new function.
+
+ gpg: Split the function check_signature_end.
+ * g10/sig-check.c (check_signature_end): Break the basic signature
+ check into...
+ (check_signature_end_simple): ... this new function.
+
+ gpg: Use format_keyid rather than manually formatting the keyid.
+ * g10/keyedit.c (menu_addrevoker): Use format_keyid rather than
+ manually formatting the keyid.
+ * g10/keygen.c (card_write_key_to_backup_file): Likewise.
+
+ gpg: Initialize the primary key when generating a key.
+ * g10/keygen.c (do_generate_keypair): Initialize
+ pri_psk->flags.primary, pri_psk->keyid and pri_psk->main_keyid.
+
+ gpg: Add accessor & utility functions for pk->keyid and pk->main_keyid.
+ * g10/keydb.h (keyid_cmp): New function.
+ * g10/keyid.c (pk_keyid): New function.
+ (pk_main_keyid): New function.
+ (keyid_copy): New function.
+ (pk_keyid_str): New function.
+ * g10/packet.h (PKT_public_key): Update comments for main_keyid and
+ keyid.
+
+2016-02-18 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpgparsemail: Allow weirdly-mixed pkcs7 signatures.
+ * tools/gpgparsemail.c: Add and check info->signing_protocol_2.
+
+ gpg: Clean up dangling agent_open and agent_closed declarations.
+ * g10/keydb.h: Remove agent_open, agent_close declarations/
+ * g10/migrate.c: #include <unistd.h> for access()
+
+2016-02-16 Werner Koch <wk at gnupg.org>
+
+ w32: Make scdaemon build again due to libusb problem.
+ * configure.ac: Add hack to disable libusb for Windows. Also use
+ $host instead of $target in the switch
+ --
+
+ The new test for libusb does not support cross-compiling. As a quick
+ workaround we disable libusb for Windows because we can't use it anyway.
+
+ w32: Do not error out if gpgconf is not installed.
+ * common/homedir.c (check_portable_app): Remove error message.
+
+2016-02-16 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Make ASCII armor decoding more robust to encoding errors.
+ * g10/armor.c (radix64_read): If the = is followed by the string "3D",
+ check if the following four characters are valid radix 64 and are
+ followed by a new line. If so, warn and ignore the '3D'.
+
+2016-02-16 Werner Koch <wk at gnupg.org>
+
+ doc: Add a gnupg-module-overview picture.
+ * doc/gnupg-module-overview.svg: New.
+ * doc/debugging.texi (Component interaction): New.
+ * doc/Makefile.am (EXTRA_DIST): Add PNG and PDF versions of
+ gnupg-module-overview.svg. Remove two eps files.
+ (BUILT_SOURCES): Add gnupg-module-overview.pdf and .png. Remove
+ gnupg-card-architecture.epsl
+ (gnupg_TEXINFOS): Add gnupg-module-overview.svg
+ (gnupg.dvi): New.
+ (DISTCLEANFILES): Remove build eps files.
+
+2016-02-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ common, g10: Fix indentation to silence GCC-6.
+ * common/iobuf.c (iobuf_ioctl): Fix.
+ * g10/encrypt.c (encrypt_filter): Likewise.
+ * g10/keyring.c (prepare_search): Likewise.
+
+ dirmngr: fix for memory alignment.
+ * dirmngr/dns-stuff.c (get_dns_cert): Cast through void *.
+ (getsrv, get_dns_cname): Make sure it's aligned for HEADER.
+
+2016-02-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Add hidden key-edit subcommand "change-usage".
+ * g10/keyedit.c (cmdCHANGEUSAGE): New.
+ (cmds): Add command "change-usage".
+ (keyedit_menu): Handle that command.
+ (menu_changeusage): New.
+ * g10/keygen.c (keygen_add_key_flags): New.
+ (ask_key_flags): Add optional arg current.
+
+2016-02-14 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Improve API documentation.
+ * g10/seskey.c (make_session_key): Improve documentation.
+ (encode_session_key): Improve documentation.
+ * g10/encrypt.c (encrypt_seskey): Remove gratuitous initialization.
+ * g10/dek.h (DEK): Improve documenation.
+
+ gpg: Fix calc_header_length when LEN is 0 and improve documentation.
+ * g10/build-packet.c (calc_header_length): Return the correct haeder
+ size when LEN is 0. Fix documentation.
+
+ gpg: Fix format_keyid when dynamically allocating the buffer.
+ * g10/keyid.c (format_keyid): Return a char *, not a const char *. If
+ BUFFER is NULL, then set LEN to the static buffer's size.
+
+ common: Fix comment.
+ * common/iobuf.c (iobuf_flush_temp): Fix comment.
+
+2016-02-13 Werner Koch <wk at gnupg.org>
+
+ g13: Require a confirmation before g13 is used for DM-Crypt.
+ * g13/g13-syshelp.c (g13_syshelp_i_know_what_i_am_doing):
+ * g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Call it.
+ (sh_dmcrypt_mount_container): Call it.
+
+ g13: Second chunk of code to support dm-crypt.
+ * g13/be-dmcrypt.c, g13/be-dmcrypt.h: New.
+ * g13/Makefile.am (g13_SOURCES): Add them.
+ * g13/backend.c: Include be-dmcrypt.h and call-syshelp.h.
+ (no_such_backend): Rename to _no_such_backend and provide replacement
+ macro.
+ (be_is_supported_conttype): Support DM-Crypt.
+ (be_take_lock_for_create): Call set_segvice for DM-Crypt.
+ (be_create_new_keys): Make it a dummy for DM-Crypt.
+ (be_create_container): Call be_dmcrypt_create_container.
+ (be_mount_container): call be_dmcrypt_mount_container.
+ * g13/g13-syshelp.c (main): Enable verbose mode.
+ * g13/g13tuple.c (get_tupledesc_data): New.
+ * g13/g13tuple.h (unref_tupledesc): New.
+ * g13/g13.h (server_control_): Add field "recipients".
+ * g13/g13.c (main): Fix setting of recipients via cmdline.
+ (g13_deinit_default_ctrl): Release recipients list.
+ (g13_request_shutdown): New. Replace all direct update of
+ shutdown_pending by calls this function.
+ * g13/server.c (server_local_s): Remove field recipients which is now
+ part of CTRL.
+ (reset_notify, cmd_recipient, cmd_create): Adjust for this change.
+ * g13/create.c (encrypt_keyblob): Rename to g13_encrypt_keyblob.
+ (g13_create_container): Support DM-Crypt.
+ * g13/mount.c (parse_header): Allow for meta data copies.
+ (g13_mount_container): Support DM-Crypt.
+ * g13/sh-cmd.c (cmd_create): Make it work.
+ (cmd_mount): New.
+ * g13/sh-dmcrypt.c (sh_dmcrypt_create_container): Make it work.
+ (sh_dmcrypt_mount_container): New.
+
+ g13: Improve dump_keyblob.
+ * g13/g13tuple.c: Include keyblob.h.
+ (find_tuple_uint): Factor code out to ...
+ (convert_uint): new.
+ (all_printable): New.
+ * g13/mount.c (dump_keyblob: Move and rename to ...
+ * g13/g13tuple.c (dump_tupledesc): here. Revamp and pretyy print uint
+ values.
+
+ g13: Define 3 new tags.
+ * g13/keyblob.h (KEYBLOB_TAG_CONT_NSEC): New.
+ (KEYBLOB_TAG_ENC_NSEC): New.
+ (KEYBLOB_TAG_ENC_OFF): New.
+
+ g13: Rename utils.c to g13tuple.c.
+ * g13/utils.c: Rename to g13tuple.c.
+ * g13/utils.h: Rename to g13tuple.h. Change all users.
+ * g13/Makefile.am: Adjust accordingly
+
+ g13: Add functions to handle uint in a keyblob.
+ * g13/utils.c (append_tuple_uint): New.
+ (find_tuple_uint): New.
+ * g13/t-utils.c: New.
+ * g13/Makefile.am (noinst_PROGRAMS, TESTS): New.
+ (module_tests, t_common_ldadd): New.
+ (t_utils_SOURCES, t_utils_LDADD): New.
+
+ g13: Re-factor high level create code.
+ * g13/create.c (g13_create_container): Factor some code out to ...
+ * g13/backend.c (be_take_lock_for_create): new.
+
+ g13: Return an error for non-existing device.
+ * g13/sh-cmd.c (cmd_device): Set ERR.
+
+ g13: Fix releasing of a syshelp context.
+ * g13/call-syshelp.c (call_syshelp_release): Allow a NULL arg.
+
+ g13: Switch over to common/exectool.c.
+ * g13/sh-exectool.c: Remove. It has been replaced by common/exectool.c.
+ * g13/Makefile.am (g13_syshelp_SOURCES): Remove sh-exectool.c
+ * g13/sh-blockdev.c: Include exectool.h. Change sh_exec_tool to
+ gnupg_exec-tool.
+ * g13/sh-dmcrypt.c: Ditto.
+
+ common: Make gnupg_exec_tool conform to spec.
+ * common/exectool.c (gnupg_exec_tool): Allocate extra byte. Allow
+ zero length read. Append hidden byte. Release memory on error.
+
+ g13: First chunk of code to support dm-crypt.
+ * g13/call-syshelp.c, g13/call-syshelp.h: New.
+ * g13/g13-syshelp.c, g13/g13-syshelp.h: New.
+ * g13/sh-cmd.c: New.
+ * g13/sh-blockdev.c: New.
+ * g13/sh-exectool.c: New.
+ * g13/sh-dmcrypt.c: New.
+ * g13/Makefile.am (sbin_PROGRAMS): Add g13-syshelp.c
+ (g13_syshelp_SOURCES): New.
+ (g13_syshelp_LDADD): New.
+
+ * g13/g13.c (opts): Add option --type.
+ (g13_deinit_default_ctrl): New.
+ (main): Implement that option. Call g13_deinit_default_ctrl.
+ * g13/g13.h (struct call_syshelp_s): New declaration.
+ (server_control_s): Add field syshelp_local.
+ * g13/keyblob.h (KEYBLOB_TAG_CREATED): New.
+ (KEYBLOB_TAG_ALGOSTR): New.
+ (KEYBLOB_TAG_HDRCOPY): New.
+ * g13/backend.c (be_parse_conttype_name): New.
+ (be_get_detached_name): Add CONTTYPE_DM_CRYPT.
+
+ tests: Remove some harmless warnings in regression tests.
+ * tests/openpgp/gpg-agent.conf.tmpl: Remove --use-standard-socket.
+
+2016-02-12 Neal H. Walfield <neal at g10code.com>
+
+ common: Change simple_query to ignore status messages.
+ * common/simple-pwquery.c (simple_query): Ignore status messages.
+
+2016-02-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Make sure to have the directory for trustdb.
+ * g10/tdbio.c (tdbio_set_dbname): Return earlier if !CREATE. Check
+ the directory and create it if none before calling take_write_lock.
+
+2016-02-02 Neal H. Walfield <neal at g10code.com>
+
+ doc: Note that rngd can also be used to quickly generate insecure keys.
+ * doc/gpg-agent.texi (Agent Options): Add comment to the description
+ of --debug-quick-random that rngd can also be used to quickly generate
+ key.
+
+2016-01-27 Werner Koch <wk at gnupg.org>
+
+ scd: Fix size_t/int mismatch in libusb.
+ * scd/ccid-driver.c (bulk_in, abort_cmd, ccid_poll): Change msglen to
+ int.
+
+ scd: Fix detection of libusb.
+ * configure.ac (HAVE_LIBUSB): Clear if no header file was found.
+ (LIBUSB_LIBS): Ditto.
+
+ dirmngr: Build fix for FreeBSD (EAI macros)
+ * dirmngr/dns-stuff.c (map_eai_to_gpg_error): Map EAI_NODATA and
+ EAI_ADDRFAMILY only if defined.
+
+2016-01-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Migrate to new API of libusb 1.0.
+ * configure.ac (LIBUSB_CPPFLAGS): New.
+ * scd/Makefile.am (AM_CPPFLAGS): Add LIBUSB_CPPFLAGS.
+ * scd/ccid-driver.c: Use libusb 1.0 API.
+
+2016-01-26 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.11.
+
+2016-01-26 Andre Heinecke <aheinecke at intevation.de>
+
+ gpgtar,w32: Fix gpgtar 8 bit encoding handling on W32.
+ * common/utf8conv.c (wchar_to_utf8): Factor code out to ...
+ (wchar_to_cp): new.
+ (utf8_to_wchar): Factor code out to ...
+ (cp_to_wchar): new.
+ (wchar_to_native): New.
+ (native_to_wchar): New.
+ * tools/gpgtar-create.c (fillup_entry_w32): Use native_to_wchar.
+ (scan_directory): Use wchar_to_native.
+
+2016-01-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix segfault on unsupported curve.
+ * g10/call-agent.c (learn_status_cb): Don't use NULL for strcmp.
+
+ sm: small fix for GCC 6.
+ * sm/export.c (insert_duptable): Use unsigned 0.
+
+2016-01-25 Werner Koch <wk at gnupg.org>
+ Daiki Ueno <ueno at gnu.org>
+
+ gpg: Print PROGRESS status lines during key generation.
+ * g10/call-agent.c (cache_nonce_status_cb): Rewrite by using
+ has_leading_keyword. Handle PROGRESS lines.
+
+2016-01-25 Werner Koch <wk at gnupg.org>
+
+ agent: Send PROGRESS status lines to the client.
+ * agent/gpg-agent.c (struct progress_dispatch_s): New.
+ (progress_dispatch_list): New.
+ (main): Register libgcrypt pogress handler.
+ (agent_libgcrypt_progress_cb): New.
+ (agent_set_progress_cb): New.
+ (unregister_progress_cb): New.
+ (agent_deinit_default_ctrl): Call unregister.
+ * agent/command.c (progress_cb): New.
+ (start_command_handler): Register progress callback.
+
+ speedo: Allow use of SHA-256 checksums.
+ * build-aux/getswdb.sh: Add option --find-sha256sum.
+ * build-aux/speedo.mk (libgpg_error_sha2): New var. Also for all
+ other packages.
+ (SHA2SUM): New.
+ (SETVARS, SETVARS_W64): Prefer sha256sum over sha1sum.
+ (installer-from-source): Create swdb fragment.
+
+2016-01-22 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Indicate that serial numbers are hexadecimal.
+ * dirmngr/misc.c (hexify_data): Add arg with_prefix. Adjust all
+ callers.
+ * dirmngr/crlcache.c (cache_isvalid): Print "0x" in front of the S/N.
+
+ dirmngr: Provide the keyserver pool name even if there is no CNAME.
+ * dirmngr/ks-engine-hkp.c (map_host): Fix setting of r_poolname.
+
+2016-01-22 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+ wk at gnupg.org
+
+ dirmngr: Use sks-keyservers CA by default for the hkps pool.
+ * dirmngr/Makefile.am (dist_pkgdata_DATA): Add sks-keyservers.netCA.pem.
+ * dirmngr/http.c (http_session_new): Add optional arg
+ intended_hostname and set a default cert.
+ * dirmngr/ks-engine-hkp.c (send_request): Pass httphost to
+ http_session_new.
+
+2016-01-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow new user ids with only the mail address.
+ * g10/keygen.c (ask_user_id): Allow empty name.
+
+2016-01-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve header text of the auto-created revocations.
+ * g10/revoke.c (gen_standard_revoke): Improve header text for the
+ file. Add info output.
+
+ gpg: Make --auto-key-retrieve work with dirmngr configured server.
+ * g10/call-dirmngr.c (gpg_dirmngr_ks_list): Make R_KEYSERVER optional.
+ * g10/keyserver.c (keyserver_any_configured): New.
+ (keyserver_put): Remove arg keyserver because this will always receive
+ opt.keyserver which is anyway used when connecting dirmngr. Do not
+ check opt.keyserver.
+ (keyserver_import_cert): Replace opt.keyserver by
+ keyserver_any_configured.
+ * g10/mainproc.c (check_sig_and_print): Ditto.
+ * g10/import.c (revocation_present): Ditto.
+ * g10/getkey.c (get_pubkey_byname): Ditto.
+ * g10/gpgv.c (keyserver_any_configured): Add stub.
+ * g10/test-stubs.c (keyserver_any_configured): Add stub.
+
+2016-01-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence message about ignoring revoked user ids.
+ * g10/trustdb.c (tdb_get_validity_core): Print message only in debug
+ mode.
+
+ agent: New option --pinentry-timeout.
+ * agent/gpg-agent.c (oPinentryTimeout): New.
+ (opts): Add new option.
+ (parse_rereadable_options): PArse that option.
+ (main): Tell gpgconf about this option.
+ * agent/call-pinentry.c (start_pinentry): Send option to Pinentry.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add Option.
+
+2016-01-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Streamline use of error messages in tofu.c.
+ * g10/tofu.c: Make use of print_further_info to reduce the number of
+ different error messages to be translated. Also streamline some
+ messages.
+
+ common: Add substitute code for libgpg-error < 1.22.
+ * common/util.h (GPG_ERR_DB_CORRUPTED): New.
+
+ gpg: Add function print_further_info.
+ * g10/misc.c (print_further_info): New.
+
+2016-01-18 Werner Koch <wk at gnupg.org>
+
+ g10: Improve strings printed by tofu.c.
+ * g10/tofu.c: Include ttyio.h. Change many strings to help
+ translating. Make use of ngettext wehere needed.
+ (CONTROL_L): New.
+ (TIME_AGO_UNIT_SMALL_NAME): Remove this and all similar *_NAME macros.
+ (time_ago_unit): Remove.
+ (get_trust): Use tty_prints and cpr_get only for the actual prompt.
+ Add Ctrl-L hack.
+ (show_statistics): Use two English strings for singular and plural.
+
+ * po/POTFILES.in: Add tofu.c.
+
+ gpg: Use "days" in "...newer than..." diagnostics.
+ * g10/sig-check.c (check_signature_metadata_validity): Use days if
+ useful.
+
+ Use ngettext for some strings.
+ * scd/app-openpgp.c (build_enter_admin_pin_prompt): Use ngettext for
+ some diagnostics.
+ (do_genkey): Ditto.
+ * g10/keyedit.c (check_all_keysigs, menu_delsig, menu_clean): Ditto.
+ * g10/keylist.c (print_signature_stats): Ditto.
+ * g10/keyserver.c (keyserver_refresh): Ditto.
+ * g10/sig-check.c (check_signature_metadata_validity): Ditto.
+ * g10/sign.c (do_sign): Ditto.
+ * g10/trustdb.c (reset_trust_records): Ditto.
+ (validate_keys): Use a table like diagnostic output.
+
+2016-01-15 Werner Koch <wk at gnupg.org>
+
+ kbx,w32: Use shorter retry intervals for keybox_file_rename.
+ * kbx/keybox-util.c (keybox_file_rename): Restart retry intervals
+ after 800ms.
+
+2016-01-14 Werner Koch <wk at gnupg.org>
+
+ w32: Fix deadlock introduced by keybox_file_rename.
+ * g10/keyring.c (keyring_lock) [W32]: Flush the close cache before
+ locking.
+ * kbx/keybox-init.c (keybox_lock) [W32]: Close the file before
+ locking.
+
+ gpg: Detect race between pubring.gpg and pubring.kbx use.
+ * g10/keydb.c (maybe_create_keyring_or_box): Detect race condition.
+
+ kbx: New function keybox_file_rename to replace rename.
+ * kbx/keybox-util.c: Include windows.h.
+ (keybox_file_rename): New.
+ * kbx/keybox-update.c (rename_tmp_file): Replace remove+rename by
+ keybox_file_rename.
+ * g10/keyring.c (rename_tmp_file): Ditto.
+
+ kbx: Add function keybox_tmp_names to avoid code duplication.
+ * kbx/keybox-update.c (create_tmp_file): Move some code to...
+ * kbx/keybox-util.c (keybox_tmp_names): new.
+ * g10/keyring.c: Include keybox.h.
+ (create_tmp_file): Replace parts by keybox_tmp_names.
+
+ gpg: Make --list-options show-usage the default.
+ * g10/gpg.c (main): Add LIST_SHOW_USAGE.
+
+2016-01-13 Werner Koch <wk at gnupg.org>
+
+ kbx: Change return type of search functions to gpg_error_t.
+ * kbx/keybox-search.c (keybox_search_reset): Change return type to
+ gpg_error_t.
+ (keybox_search): Ditto. Also handle GPG_ERR_EOF.
+ * sm/keydb.c (keydb_search_reset): Ditto.
+
+ gpg: Improve error code from lock_all.
+ * g10/keydb.c (lock_all): Do not clobber RC during failur cleanup.
+
+ kbx: Improve and fix keybox_lock.
+ * kbx/keybox-init.c (keybox_lock): Make sure ERR is initialized. Get
+ error codes from dotlock functions.
+
+ common: Make sure dotlock functions set a proper ERRNO.
+ * common/dotlock.c (map_w32_to_errno): New.
+ (read_lockfile): Return a proper ERRNO.
+ (dotlock_create_unix): Do not let log functions clobber ERRNO.
+ (dotlock_take_unix): Ditto.
+ (dotlock_release_unix): Ditto.
+ (dotlock_create_w32): Set proper ERRNO.
+ (dotlock_take_w32): Ditto.
+ (dotlock_release_w32): Ditto.
+
+ kbx: Implement keybox_lock for use by gpg.
+ * kbx/keybox-defs.h: Include dotlock.h and logging.h.
+ (CONST_KB_NAME): Remove. Replace usage by KB_NAME.
+ (struct keybox_name): Add field "lockhd".
+ * kbx/keybox-init.c (keybox_register_file): Init LOCKHD.
+ (keybox_lock): Chnage to return gpg_error_t. Implement locking.
+
+ gpg: Make sure to mark a duplicate registered keybox as primary.
+ * kbx/keybox-init.c (keybox_register_file): Change interface to return
+ the token even if the file has already been registered.
+ * g10/keydb.c (primary_keyring): Rename to primary_keydb.
+ (maybe_create_keyring_or_box): Change return type to gpg_error_t.
+ (keydb_add_resource): Ditto. s/rc/err/.
+ (keydb_add_resource): Mark an already registered as primary.
+ * sm/keydb.c (maybe_create_keybox): Change return type to gpg_error_t.
+ (keydb_add_resource): Ditto. s/rc/err/.
+ (keydb_add_resource): Adjust for changed keybox_register_file.
+
+2016-01-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ Fix to support git worktree.
+ * autogen.sh, Makefile.am, doc/Makefile.am: Use -e for testing .git.
+
+2016-01-12 Werner Koch <wk at gnupg.org>
+
+ ssh: Accept OpenSSH *cert-v01 key variants.
+ * agent/command-ssh.c (SPEC_FLAG_WITH_CERT): New.
+ (ssh_key_types): Add OpenSSH cert types.
+ (stream_read_string): Allow a dummy read.
+ (ssh_receive_mpint_list): Pass SPEC by reference.
+ (ssh_receive_mpint_list): New arg CERT and use it.
+ (ssh_receive_key): Read certificate into an estream object and modify
+ parser to make use of that object.
+
+2016-01-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: Fix iobuf API of filter function for alignment.
+ * common/iobuf.h: Fix comment.
+
+ common: Fix iobuf API of filter function for alignment.
+ * common/iobuf.h (IOBUFCTRL_DESC): Change the call semantics.
+ * common/iobuf.c (iobuf_desc): Add the second argument DESC.
+ (print_chain, iobuf_close, do_open, iobuf_sockopen, iobuf_ioctl)
+ (iobuf_push_filter2, pop_filter, iobuf_write_temp): Change calls
+ of iobuf_desc.
+ (file_filter, file_es_filter, sock_filter, block_filter): Fill the
+ description.
+ * common/t-iobuf.c (every_other_filter, double_filter): Likewise.
+ * g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
+ g10/decrypt-data.c, g10/encrypt.c, g10/mdfilter.c, g10/progress.c,
+ g10/textfilter.c: Likewise.
+
+2016-01-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix NULL de-ref for ambiguous key check in --export-ssh-keys.
+ * g10/getkey.c: Allow arg RET_KEYBLOCK to be NULL.
+
+2016-01-09 Werner Koch <wk at gnupg.org>
+
+ tools: Remove gpgkey2ssh.
+ * tools/gpgkey2ssh.c: Remove.
+ * tools/Makefile.am (bin_PROGRAMS): Ditto.
+
+2016-01-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Support ECDSA keys with --export-ssh-key.
+ * g10/export.c (key_to_sshblob): Add hack for ECDSA.
+
+ gpg: New command --export-ssh-key.
+ * g10/export.c: Include membuf.h and host2net.h.
+ (key_to_sshblob): New.
+ (export_ssh_key): New.
+ * g10/gpg.c (aExportSshKey): New.
+ (opts): Add command.
+ (main): Implement that command.
+
+ gpg: Add an exact search flag to the PK struct.
+ * g10/getkey.c (merge_selfsigs_subkey): Clear exact flag.
+ (finish_lookup): Set exact flag.
+ * g10/packet.h (PKT_public_key): Add field flags.exact.
+
+ Print warnings if old daemon versions are used.
+ * common/status.h (STATUS_WARNING): New.
+ * g10/call-agent.c (warn_version_mismatch): New.
+ (start_agent): Call warn function.
+ * g10/call-dirmngr.c: Include status.h.
+ (warn_version_mismatch): New.
+ (create_context): Call warn function.
+ * sm/call-agent.c (warn_version_mismatch): New.
+ (start_agent): Call warn function.
+ (gpgsm_agent_learn): Call warn function.
+ * sm/call-dirmngr.c (warn_version_mismatch): New.
+ (prepare_dirmngr): Call warn function.
+
+ common: New function compare_version_strings.
+ * common/stringhelp.c (parse_version_number): New.
+ (parse_version_string): New.
+ (compare_version_strings): New.
+ * common/t-stringhelp.c (test_compare_version_strings): New.
+ (main): Call test. Return ERRCOUNT instead of 0.
+
+ common: New function get_assuan_server_version.
+ * common/asshelp.c: Include membuf.h.
+ (get_assuan_server_version): New.
+ * g10/call-agent.c (agent_get_version): Use new function.
+
+ common: New put_membuf_cb to replace static membuf_data_cb.
+ * common/membuf.c (put_membuf_cb): New.
+ * agent/call-scd.c (membuf_data_cb): Remove. Change callers to use
+ put_membuf_cb.
+ * common/get-passphrase.c (membuf_data_cb): Ditto.
+ * g10/call-agent.c (membuf_data_cb): Ditto.
+ * sm/call-agent.c (membuf_data_cb): Ditto.
+
+2016-01-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Return an error code from keygrip_from_pk.
+ * g10/keyid.c (keygrip_from_pk): Return an error code.
+
+ gpg: Avoid warnings about possible NULL deref.
+ * g10/getkey.c (cache_public_key): Protect deref of CE which actually
+ can't happen.
+ * g10/keygen.c (quickgen_set_para): s/sprintf/snprintf/.
+ * g10/tofu.c (end_transaction, rollback_transaction): Allow NULL for
+ DB.
+ * g10/trustdb.c (update_min_ownertrust): Remove useless clearling of
+ ERR.
+
+ gpg: Fix warnings about useless assignments.
+ * g10/armor.c (parse_hash_header): Remove duplicate var assignment.
+ * g10/getkey.c (cache_user_id): Ditto.
+ * g10/keygen.c (ask_curve): Ditto. This also fixes a small memory
+ leak.
+
+ * g10/keygen.c (proc_parameter_file): Remove useless assignment or
+ pointer increment.
+ (generate_keypair): Ditto.
+ * g10/getkey.c (finish_lookup, lookup): Ditto.
+ * g10/card-util.c (change_pin): Ditto.
+ * g10/gpg.c (main) <aVerify>: Ditto.
+ * g10/import.c (import): Ditto.
+ (print_import_check): Ditto
+ * g10/keyring.c (do_copy): Ditto.
+ * g10/tdbio.c (tdbio_read_record): Ditto.
+ * g10/trustdb.c (tdb_update_ownertrust): Ditto.
+ (update_validity): Ditto.
+
+ * g10/server.c (cmd_passwd): Remove useless call to skip_options.
+
+ sm: Avoid warnings about useless assignments.
+ * sm/call-dirmngr.c (prepare_dirmngr): Remove setting of ERR.
+ (unhexify_fpr): Remove useless computation on N.
+ * sm/certchain.c (do_validate_chain): Remove clearing of RC. Remove
+ useless setting of RC.
+ * sm/fingerprint.c (gpgsm_get_keygrip): Remove setting of RC.
+ * sm/gpgsm.c (build_list): Replace final stpcpy by strcpy.
+ * sm/keydb.c (keydb_clear_some_cert_flags): Remove clearing of RC.
+ * sm/server.c (cmd_getauditlog): Comment unused skip_options.
+
+ kbx: Avoid warnings about useless assignments.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Remove setting of IN_RANGE
+ and the last increment of P.
+
+ gpg: Fix DNS cert lookup returning an URL.
+ * g10/call-dirmngr.c (dns_cert_status_cb): Store URL status in the URL
+ param. The old code was entirely buggy (c+p error).
+
+2016-01-06 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Fix keystrlen to work when OPT.KEYID_FORMAT is KF_DEFAULT.
+ * g10/keyid.c (keystrlen): If opt.keyid_format is KF_DEFAULT unset,
+ default to KF_SHORT.
+ (format_keyid): Default to KF_SHORT, not KF_0xLONG.
+
+2016-01-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence some regression tests.
+ * g10/test.c (TEST): Print diagnostics only in verbose mode.
+
+ gpg: Avoid using an uninitialized SALT on premature EOF.
+ * g10/parse-packet.c (parse_key): Check for premature end of salt.
+
+ gpg: Silence warnings found by static analyzer.
+ * g10/keyedit.c (change_passphrase): Remove useless init of ANY.
+ (keyedit_quick_adduid): Remove useless setting of ERR.
+ * g10/parse-packet.c (parse_key): Remove PKTLEN from condition because
+ it has been checked before the loop.
+ (parse_plaintext): Remove useless init of PKTLEN.
+
+ kbx: Avoid faulty fclose in an error case.
+ * kbx/keybox-update.c (blob_filecopy): Do not close an uninitialized
+ file pointer after a failure to create a temp file.
+ * kbx/keybox-openpgp.c (next_packet): Remove duplicate assignment of
+ PKTLEN.
+
+ dirmngr: Silence one regression test.
+ * dirmngr/t-dns-stuff.c (main): Do not print info during standard
+ "make check".
+
+ common: Avoid warnings about useless assignments.
+ * common/b64enc.c (b64enc_finish): Remove var assignment which is not
+ used later.
+ * common/iobuf.c (file_filter): Ditto.
+ * common/tlv.c (do_find_tlv): Ditto.
+ * common/userids.c (classify_user_id): Ditto.
+
+ tests: Use info and error instead of a plain echo.
+ * tests/openpgp/4gb-packet.test: Use error and info.
+
+ common: Do not deref vars in tests after a fail().
+ * common/t-convert.c (test_bin2hex): Turn if conditions into if-else
+ chains to avoid accessing unchecked data.
+ (test_bin2hexcolon): Ditto.
+ * common/t-mapstrings.c (test_map_static_macro_string): Ditto.
+ * common/t-stringhelp.c (test_percent_escape): Ditto.
+ (test_make_filename_try): Ditto.
+ (test_make_absfilename_try): Ditto.
+ * common/t-timestuff.c (test_timegm): Ditto.
+
+2016-01-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Align notes about minimal keysize with actual checks.
+ * g10/keygen.c (ask_keysize): Use 768 for the minimal value for DSA in
+ export mode. Improve readability.
+
+2016-01-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix RSA verification for card.
+ * agent/pksign.c (agent_pksign_do): Use S-exp of public key, instead
+ of shadowed key.
+
+2016-01-04 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix double free.
+ * g10/getkey.c (get_pubkeys): Fix double free.
+
+2015-12-24 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: IMPORT_KEY with --force option fix.
+ * agent/cvt-openpgp.c (convert_from_openpgp_main): Add an option not
+ to check existing key.
+ (convert_from_openpgp): Ditto.
+ (convert_from_openpgp_native): Call convert_from_openpgp_main with
+ dontcare_exist=0.
+ * agent/command.c (cmd_import_key): Call with dontcare_exist=force.
+
+ g10: Use --force when importing key for bkuptocard.
+ * g10/call-agent.c (agent_import_key): Add an argument FORCE.
+ * g10/import.c (transfer_secret_keys): Likewise.
+ (import_secret_one): Call transfer_secret_keys with FORCE=0.
+ * g10/keyedit.c (keyedit_menu): Call with FORCE=1.
+
+ g10: Remove subcommand checkbkupkey for --key-edit.
+ * g10/keyedit.c (keyedit_menu): Remove cmdCHECKBKUPKEY support.
+
+ g10: Allow relative path for specifying the file for bkuptocard.
+ * g10/keyedit.c (keyedit_menu): Assume the file is under GNUPGHOME.
+ Also support tilda expansion.
+
+ g10: fix regression of bkuptocard subcommand in --edit-key.
+ * g10/keyedit.c (keyedit_menu): Call transfer_secret_keys.
+ * g10/import.c (transfer_secret_keys): Make it global function.
+ Allow stats==NULL.
+
+ agent: Support --force option for IMPORT_KEY.
+ * agent/command.c (cmd_keywrap_key): New option --force.
+
+2015-12-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Rename struct pubkey to pukey_s and add pubkey_t.
+ * g10/keydb.h (struct pubkey): Rename to pubkey_s.
+ (pubkey_t): New. Change all struct pubkey_s to use this type.
+ * g10/getkey.c (get_pubkeys): Rename arg keys to r_keys.
+
+ gpg: Simplify status message code from commit b30c15bf.
+ * g10/keygen.c (card_write_key_to_backup_file): Simplify by using
+ hexfingerprint.
+
+ gpg: Add standard free() semantic to pubkey_free.
+ * g10/getkey.c (pubkey_free): Check for NULL arg.
+
+ gpg: Fix use of assert from commit dc417bf0.
+ * g10/keydb.c (keydb_update_keyblock): De-ref after the assert. Use
+ %zu for size_t.
+
+ gpg: Do not translate debug output.
+ * g10/getkey.c (parse_def_secret_key): Do not make strings passed to
+ log_debug translatable.
+
+2015-12-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix commit b30c15bf (again).
+ * g10/keygen.c (do_generate_keypair): Clear the variable S.
+
+2015-12-22 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix type.
+ * g10/keygen.c (card_write_key_to_backup_file): Change n to a size_t.
+
+ gpg: Fix error message.
+ * g10/getkey.c (parse_def_secret_key): Fix error message.
+
+ gpg: Don't check for ambiguous keys.
+ * g10/gpg.c (struct result): Move from here...
+ * g10/keydb.h (struct pubkey): ... to here. Update users.
+ * g10/gpg.c (check_user_ids): Move from here...
+ * g10/getkey.c (get_pubkeys): ... to here. Update users. Use
+ get_pubkey_byname to look up the keys (this also prunes invalid keys).
+ (pubkey_free): New function.
+ (pubkeys_free): New function.
+ * g10/gpg.c (main): Don't check for ambiguous key specifications.
+
+ gpg: Lazily evaluate --default-key.
+ * g10/gpg.c (main): If --encrypt-to-default-key is specified, don't
+ add --default-key's value to REMUSR here...
+ * g10/pkclist.c (build_pk_list): ... do it here.
+ * tests/openpgp/Makefile.am (TESTS): Add default-key.test.
+ * tests/openpgp/default-key.test: New file.
+
+ gpg: Remove unused parameter.
+ * g10/pkclist.c (build_pk_list): Remove parameter use, which is always
+ called set to PUBKEY_USAGE_ENC. Update callers.
+
+ gpg: Improve check for ambiguous keys.
+ * g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
+ encryption-only keys when a signing key is needed and vice-versa.
+
+ gpg: Fix TOCTTOU when updating keyblocks.
+ * g10/keydb.c (keydb_update_keyblock): Don't replace the record at the
+ current offset. After taking the lock, extract the fingerprint from
+ the keyblock, find it and then replace it.
+
+ Only add the user supplied CFLAGS after running any autoconf tests.
+ * configure.ac: Only add the user supplied CFLAGS after running any
+ autoconf tests.
+
+ gpg: Suppress a warning.
+ * dirmngr/dns-stuff.c (enable_dns_tormode): Reference new_circuit to
+ avoid a warning when ADNS is not available.
+
+ gpg: Remove dead code.
+ * kbx/keybox-defs.h (struct keybox_found_s): Remove unused fields
+ offset and n_packets.
+
+ gpg: Display the key that is invalid, not the search description.
+ * g10/getkey.c (parse_def_secret_key): Display the key that is
+ invalid, not the search description.
+
+ gpg: Mark more options as coming from the config file (when this holds)
+ * g10/gpg.c (main): When --default-key or --encrypt-to-default-key is
+ taken from the config file, note this.
+
+ gpg: Use enums instead of defines.
+ * g10/keydb.h (PK_LIST_ENCRYPT_TO): Change from a macro to an enum.
+ (PK_LIST_HIDDEN): Likewise.
+ (PK_LIST_CONFIG): Likewise.
+ (PK_LIST_SHIFT): Likewise.n
+
+2015-12-21 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ g10: clean up of headers for card.
+ * g10/main.h (save_unprotected_key_to_card): Remove.
+ * g10/options.h (ctapi_driver, pcsc_driver, disable_ccid): Remove.
+
+2015-12-21 Werner Koch <wk at gnupg.org>
+
+ common: New file fwddecl.h.
+ * common/util.h (server_control_s, ctrl_t): Move to ...
+ * common/fwddecl.h: New file.
+ * common/call-gpg.h: Replace typedef by fwddecl.h. Change include
+ protection macro name.
+ * common/Makefile.am (common_sources): Add fwddecl.h.
+
+2015-12-18 Werner Koch <wk at gnupg.org>
+
+ build: Add required macro for pkg-config.
+ * configure.ac (PKG_PROG_PKG_CONFIG): New.
+
+2015-12-18 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Remove deprecated internal functions.
+ * g10/keygen.c (do_ask_passphrase, generate_raw_key)
+ (gen_card_key_with_backup, save_unprotected_key_to_card): Remove.
+
+ g10: Fix a regression for generating card key with backup.
+ * g10/main.h (receive_seckey_from_agent): Declare.
+ * g10/keygen.c (card_write_key_to_backup_file): New.
+ (card_store_key_with_backup): New.
+ (do_generate_keypair): Create a key on host for encryption key when
+ backup is requested. Then, call card_store_key_with_backup.
+
+2015-12-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: factor out a function for secret key retrieval.
+ * g10/export.c (receive_seckey_from_agent): New.
+ (do_export_stream): Use it.
+
+2015-12-16 Neal H. Walfield <neal at g10code.com>
+
+ gpg: When checking for ambiguous keys, ignore invalid keys.
+ * g10/gpg.c (check_user_ids): When checking for ambiguous keys, ignore
+ disabled, revoked and expired keys (if appropriate for the provided
+ option).
+
+2015-12-15 Werner Koch <wk at gnupg.org>
+
+ common: Use default_errsource for call-gpg and exectool.
+ * common/call-gpg.c (my_error_from_syserror, my_error_from_errno): New.
+ Use these wrappers.
+ * common/exectool.c (my_error_from_syserror): New. Use these
+ wrappers.
+
+ gpg: Reduce number of strings to translate.
+ * g10/getkey.c (parse_def_secret_key): Do not make debug messages
+ translatable. Make use of print_reported_error.
+
+ gpg: New function to printed a detailed error code.
+ * g10/misc.c (print_reported_error): New.
+
+2015-12-15 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Improve the keyblock cache's transparency.
+ * kbx/keybox-search.c (keybox_seek): New function.
+ * g10/keydb.c (keydb_search): When reading from the cache, seek to
+ just after the cached record.
+
+ gpg: Improve the keyblock cache's transparency.
+ * kbx/keybox-search.c (keybox_offset): New function.
+ * g10/keydb.c (struct keyblock_cache): Add fields resource and offset.
+ (keyblock_cache_clear): Reset HD->KEYBLOCK_CACHE.RESOURCE and
+ HD->KEYBLOCK_CACHE.OFFSET.
+ (keydb_search): Don't use the cached result if it comes before the
+ current file position. When caching an entry, also record the
+ position at which it was found.
+
+ gpg: Use more descriptive names.
+ * g10/keyring.c (KR_NAME): Rename this...
+ (KR_RESOURCE): ... to this. Update users.
+ (struct keyring_name): Rename this...
+ (struct keyring_resource): ... to this. Update users.
+ (struct off_item): Rename this...
+ (struct key_present): ... to this. Update users.
+ (OffsetHashTable): Rename this...
+ (key_present_hash_t): ... to this. Update users.
+ (kr_offtbl): Rename this...
+ (key_present_hash): ... to this. Update users.
+ (kr_offtbl_ready): Rename this...
+ (key_present_hash_ready): ... to this. Update users.
+ (KEY_PRESENT_HASH_BUCKETS): New define. Replace use of literals
+ with this.
+ (new_offset_item): Rename this...
+ (key_present_value_new): ... to this. Update users.
+ (release_offset_items): Drop dead code.
+ (new_offset_hash_table): Rename this...
+ (key_present_hash_new): ... to this. Update users.
+ (release_offset_hash_table): Drop dead code.
+ (lookup_offset_hash_table): Rename this...
+ (key_present_hash_lookup): ... to this. Update users.
+ (update_offset_hash_table): Rename this...
+ (key_present_hash_update): ... to this. Drop unused parameter off.
+ Update users.
+ (update_offset_hash_table_from_kb): Rename this...
+ (key_present_hash_update_from_kb): ... to this. Drop unused parameter
+ off. Update users.
+
+2015-12-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ sm: Handle gcry_pk_encrypt return value.
+ * sm/encrypt.c (encrypt_dek): Don't ignore failure of gcry_pk_encrypt.
+
+2015-12-14 Werner Koch <wk at gnupg.org>
+
+ common: Change license of isascii.c to all-premissive,
+ * common/isascii.c: Change.
+
+ common: Change license of some modules to LGPLv3+/GPLv2+.
+ * common/status.c: Change from GPLv3 to LGPLv3+/GPLv2+.
+ * common/status.h: Ditto.
+ * common/yesno.c: Ditto.
+ * common/common-defs.h: Ditto.
+ * common/gettime.h: Ditto.
+ * common/keyserver.h: Ditto.
+
+ common: Change license for exectool to LGPLv3+/GPLv2+.
+ * common/exectool.c, common/exectool.h: Change license.
+
+ common: Rename sh-exectool to exectool.
+ * common/sh-exectool.c: Rename to exectool.c.
+ * common/sh-exectool.h: Rename to exectool.h.
+ * common/Makefile.am (common_sources): Adjust for rename.
+ * common/exectool.c (sh_exec_tool_stream): Rename to
+ gnupg_exec-tool-stream.
+ (sh_exec_tool): Rename to gnupg_exec_tool.
+ * tools/gpgtar-create.c (gpgtar_create): Adjust for changes.
+ * tools/gpgtar-extract.c: Adjust for changes.
+ * tools/gpgtar-list.c: Adjust for changes.
+
+2015-12-14 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ gpg: Print ownertrust in TOFU+PGP trust model.
+ * g10/keyedit.c: Print ownertrust in TOFU+PGP trust model.
+
+2015-12-14 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix --default-key checks.
+ * g10/getkey.c (parse_def_secret_key): Don't just check if a secret
+ key is available for the public key, also consider subkeys. Also
+ check that the key has the signing capability, is not revoked, is not
+ expired and is not disabled. Print a warning if there was a least one
+ value passed to --default-key and all were ignored.
+
+2015-12-14 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix regression for generating RSA keys on card.
+ * scd/app-openpgp.c (do_genkey): Strip leading zeros for fingerprint
+ computation.
+
+2015-12-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Use a regular type instead of a void* for import stats.
+ * g10/import.c (struct stats_s): Rename to import_stats_s. Change all
+ users.
+ * g10/main.h (import_stats_t): New. Change fucntions to use this
+ instead of a void pointer.
+
+ Remove replacements for libgpg-error < 1.21.
+ * common/util.h: Remove replacement macros for libgpg-error<1.21.
+ * common/types.h: Ditto.
+ * common/mischelp.h: Ditto.
+ * common/t-mapstrings.c: Include t-support.h before stringhelp.h
+ * common/t-stringhelp.c: Ditto.
+ * common/t-support.h: Always include gpg-error.h.
+ * kbx/keybox-search.c: Do not include stringhelp.h so that keybox-defs
+ comes first.
+
+2015-12-11 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix buffer overflow.
+ * g10/keydb.c (keydb_search_desc_dump): Fix buffer overflow.
+
+2015-12-11 Justus Winter <justus at g10code.com>
+
+ agent: Improve error handling.
+ * agent/pksign.c (agent_pksign_do): Improve error handling.
+
+ Fix required libgpg-error version.
+ * configure.ac (NEED_GPG_ERROR_VERSION): We need version 1.21 for the
+ poll interface.
+
+2015-12-11 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Don't error out if a key occurs multiple times in the keyring.
+ * g10/gpg.c (check_user_ids): Don't error out if a key occurs multiple
+ times in the keyring. Instead, print a warning. When printing out
+ fingerprint prints, use format_hexfingerprint to format them.
+
+2015-12-10 Daniel Hoffend <dh at dotlan.net>
+
+ scd: Fix removal of unplugged usb readers on Windows.
+ * scd/apdu.c (pcsc_error_to_sw): map PCSC_E_NO_SERVICE and
+ PCSC_E_SERVICE_STOPPED to the internal SW_HOST_NO_READER error code.
+
+2015-12-07 Justus Winter <justus at g10code.com>
+
+ tests: Add some more gpgtar tests.
+ * tests/openpgp/gpgtar.test: Add more tests.
+
+ dirmngr: Initialize http status code.
+ * dirmngr/ks-action.c (ks_action_search): Initialize 'http_status' as
+ it is unused if LDAP is used to search for keys.
+
+2015-12-04 Daiki Ueno <ueno at gnu.org>
+
+ gpg: Write ERROR status on delete-key cancellation.
+ * g10/delkey.c (do_delete_key): Write ERROR status code with the error
+ location "delete_key.secret", when the user cancelled the operation on
+ Pinentry.
+
+2015-12-04 Justus Winter <justus at g10code.com>
+
+ dirmngr: Stricter handling of http error codes.
+ * dirmngr/ks-action.c (ks_action_search): Only retry if the keyserver
+ responded with a '404 Not Found'.
+ * dirmngr/ks-engine-hkp.c (send_request): Return http status code.
+ (ks_hkp_search): Likewise.
+ (ks_hkp_{get,put}): Adapt call to 'send_request'.
+ * dirmngr/ks-engine.h (ks_hkp_search): Update prototype.
+
+ dirmngr: Really search all keyservers for patterns.
+ * dirmngr/ks-action.c (ks_action_search): Search all configured
+ keyservers for the given patterns.
+
+ GnuPG-bug-id: 1038
+
+ dirmngr: Handle http status '501 Not Implemented'.
+ * dirmngr/ks-engine-hkp.c (send_request): Handle status 501 and return
+ GPG_ERR_NOT_IMPLEMENTED.
+
+ GnuPG-bug-id: 1221
+
+ tools/gpgtar: Implement symmetric encryption.
+ * tests/openpgp/gpgtar.test: Add test case.
+ * tools/gpgtar-create.c (gpgtar_create): Pass '--symmetric' flag to
+ gpg.
+ * tools/gpgtar.c (parse_arguments): We do handle the argument now.
+
+ tools/gpgtar: Implement signing.
+ * tests/openpgp/gpgtar.test: Test signing.
+ * tools/gpgtar-create.c (gpgtar_create): Add 'sign' option, add the
+ appropriate gpg arguments to implement signing and selecting the local
+ user.
+ * tools/gpgtar.c (parse_options): We do handle '--local-user' now.
+ (main): Handle signing, encrypting, and doing both when creating an
+ archive.
+ * tools/gpgtar.h (gpgtar_create): Update prototype.
+
+ tools/gpgtar: Use the new exectool helper.
+ * tools/Makefile.am: gpgtar now requires neither npth nor libassuan.
+ * tools/gpgtar-create.c (gpgtar_create): Use the new 'sh-exectool'
+ helper.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (main): Set default gpg program. Drop the
+ initialization of npth and libassuan.
+
+ common: Add a stream interface to 'sh-exectool'.
+ * common/sh-exectool.c (struct copy_buffer): Add infrastructure for
+ copying between streams.
+ (copy_buffer_{init,shred,do_copy,flush}): New functions.
+ (sh_exec_tool_stream): Rework 'sh_exec_tool' to operate on streams.
+ (nop_free): New function.
+ (sh_exec_tool): Express this in terms of 'sh_exec_tool_stream'.
+ * common/sh-exectool.h (sh_exec_tool_stream): New prototype.
+
+ common: Add header file and build the new code.
+ * common/Makefile.am (common_sources): Add new files.
+ * common/sh-exectool.h: New file.
+
+2015-12-04 Werner Koch <wk at gnupg.org>
+
+ common: Add code to execute a helper.
+ * common/sh-exectool.c: New file.
+
+ Release 2.1.10.
+
+2015-12-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Japanese translation.
+
+2015-12-04 Werner Koch <wk at gnupg.org>
+
+ speedo,w32: Improve installer.
+ * build-aux/speedo/w32/inst.nsi (SEC_gnupg): Install dirmngr.conf and
+ distsigkey.gpg.
+ (un.gnupglast): Stop dirmngr.
+
+ gpg: Do not pre-check keys given on the command line.
+ * g10/keydb.h (PK_LIST_ENCRYPT_TO, PK_LIST_HIDDEN, PK_LIST_CONFIG)
+ (PK_LIST_SHIFT): New.
+ * g10/pkclist.c (build_pk_list): Use them here.
+ * g10/gpg.c (check_user_ids, main): Ditto.
+
+ * g10/gpg.c (main): Set PK_LIST_CONFIG for REMUSR and LOCUSR.
+ (check_user_ids): Skip check for command line specified options.
+
+ dirmngr: Add command to print the resolver version.
+ * dirmngr/server.c (cmd_getinfo): Add sub-command "dnsinfo".
+
+ gpg: Allow "help" as value for --tofu-policy.
+ * g10/gpg.c (parse_tofu_policy): Add keyword "help".
+ (parse_tofu_db_format): Ditto.
+
+ Do not translate messages printed with log_debug.
+ * common/asshelp.c (start_new_gpg_agent): Do not i18n string.
+ (start_new_dirmngr): Ditto.
+ * g10/mainproc.c (proc_encrypted): Ditto. Print only if debug is
+ enabled.
+
+2015-12-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix for removing the prefix.
+ * scd/app-openopg.c (do_decipher): Fix the condition.
+
+ scd: Simplify saving application context.
+ * scd/app.c (lock_table): Remove LAST_APP field.
+ (lock_reader, app_dump_state, application_notify_card_reset)
+ (release_application): Follow the change.
+ (check_conflict): New.
+ (check_application_conflict): Lock the slot and call check_conflict.
+ (select_application): Call check_conflict and not use LAST_APP.
+
+ scd: More fix for Curve25519 prefix handling.
+ * scd/app-openpgp.c (do_decipher): Handle trancated cipher text.
+ Also fix xfree bug introduced.
+
+2015-12-03 Werner Koch <wk at gnupg.org>
+
+ scd: Another fix for Curve25519 prefix handling.
+ * scd/app-openpgp.c (do_decipher): Check 0x02 also for 16+1 byte long
+ INDATA.
+ (do_decipher): Fix integer arithmetic in void pointer.
+ (do_decipher): Add missing memcpy.
+
+ build: Avoid dependecy problems in "make distcheck".
+ * doc/Makefile.am (gnupg.texi): Depend on defs.inc.
+
+ build: Change how caller provided CFLAGS are used by configure.
+ * configure.ac: Append instead of prepend caller provided CFLAGS.
+
+ gpg: Add variant of 'key "%s" not found: %s' error message.
+ * g10/gpg.c (check_user_ids): Change error message.
+ * g10/delkey.c (do_delete_key): Ditto.
+
+ gpg: Make keyidlist more robust in case of errors.
+ * g10/keyserver.c (keyidlist): Clear *KLIST on error.
+
+ gpg: Take care of keydb_new returning NULL.
+ * g10/keydb.c (keydb_new): Print an error message if needed. Also use
+ xtrycalloc because we return an error anyway.
+ * g10/delkey.c (do_delete_key): Handle error retruned by keydb_new.
+ * g10/export.c (do_export_stream): Ditto.
+ * g10/getkey.c (get_pubkey): Ditto.
+ (get_pubkey_fast): Ditto.
+ (get_pubkeyblock): Ditto.
+ (get_seckey): Ditto.
+ (key_byname): Ditto.
+ (get_pubkey_byfprint): Ditto.
+ (get_pubkey_byfprint_fast): Ditto.
+ (parse_def_secret_key): Ditto.
+ (have_secret_key_with_kid): Ditto.
+ * g10/import.c (import_one): Ditto.
+ (import_revoke_cert): Ditto.
+ * g10/keyedit.c (keyedit_quick_adduid): Ditto.
+ * g10/keygen.c (quick_generate_keypair): Ditto.
+ (do_generate_keypair): Ditto.
+ * g10/trustdb.c (validate_keys): Ditto.
+ * g10/keyserver.c (keyidlist): Ditto.
+ * g10/revoke.c (gen_desig_revoke): Ditto.
+ (gen_revoke): Ditto.
+ * g10/gpg.c (check_user_ids): Ditto.
+ (main): Do not print an error message for keydb_new error.
+ * g10/keylist.c (list_all): Use actual error code returned by
+ keydb_new.
+
+ * g10/t-keydb-get-keyblock.c (do_test): Abort on keydb_new error.
+ * g10/t-keydb.c (do_test): Ditto.
+
+ * g10/keyring.c (keyring_new): Actually return an error so that the
+ existing keydb_new error checking makes sense for a keyring resource.
+ (keyring_rebuild_cache): Take care of keyring_new returning an error.
+
+ gpg: Change some error messages.
+ * g10/getkey.c (parse_def_secret_key): Change error message. Replace
+ log_debug by log_info.
+ * g10/gpg.c (check_user_ids): Make function static. Change error
+ messages.
+ (main): Change error messages.
+ * g10/revoke.c (gen_revoke): Ditto.
+
+2015-12-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix "Conflicting usage" bug.
+ * scd/apdu.c (apdu_close_reader): Call CLOSE_READER method even if we
+ got an error from apdu_disconnect.
+ * scd/app-common.h (no_reuse): Remove.
+ * scd/app.c (application_notify_card_reset): Deallocate APP here.
+ (select_application, release_application): Don't use NO_REUSE.
+
+ scd: Fix for Curve25519 prefix handling.
+ * scd/app-openpgp.c (do_decipher): More condition for AES decipher.
+ Handle the prefix in cipher text. Always add the prefix in result.
+
+2015-12-03 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Use the matching key if the search description is exact.
+ * g10/gpg.c (check_user_ids): If the search description is for an
+ exact match (a keyid or fingerprint that ends in '!'), then use the
+ matching key, not the primary key.
+ * tests/openpgp/Makefile.am (TESTS): Add use-exact-key.test.
+ (priv_keys): Add privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc,
+ privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc,
+ privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc,
+ privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc and
+ privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc.
+ (sample_keys): Add
+ samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc.
+ * tests/openpgp/privkeys/00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc:
+ New file.
+ * tests/openpgp/privkeys/1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc:
+ New file.
+ * tests/openpgp/privkeys/A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc:
+ New file.
+ * tests/openpgp/privkeys/ADE710D74409777B7729A7653373D820F67892E0.asc:
+ New file.
+ * tests/openpgp/privkeys/CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc:
+ New file.
+ * tests/openpgp/samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc:
+ New file.
+ * tests/openpgp/use-exact-key.test: New file.
+ * tests/openpgp/version.test: Install the new private keys.
+
+2015-12-02 Werner Koch <wk at gnupg.org>
+
+ build: Require at least Libassuan 2.4.1.
+ * configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.4.1.
+ * agent/gpg-agent.c (create_server_socket): Remove check for
+ libassuan >= 2.3.0 and >= 2.1.4.
+ (main): Remove check for libassuan >= 2.1.4.
+ * scd/scdaemon.c (create_server_socket): Remove check for
+ libassuan >= 2.1.4.
+ * dirmngr/dirmngr.c (set_tor_mode): Remove check for
+ libassuan >= 2.3.0.
+ * dirmngr/http.c (http_raw_connect, send_request): Remove checks for
+ libassuan >= 2.3.0.
+
+2015-12-02 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Improve documentation.
+ * g10/tofu.c (initdb): Improve documentation.
+
+ gpg: Fix type mismatch resulting in a buffer overflow.
+ * g10/tofu.c (record_binding): Change policy_old's type from an enum
+ tofu_policy to a long: this variable is passed by reference and a long
+ is expected.
+
+2015-12-02 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Switch to an onion address if Tor is running.
+ * dirmngr/dirmngr.h (opt): Turn field 'keyserver' into an strlist.
+ * dirmngr/dirmngr.c (parse_rereadable_options): Allow multiple
+ --keyserver options.
+ * dirmngr/server.c (server_local_s): Add field 'tor_state'.
+ (release_uri_item_list): New.
+ (release_ctrl_keyservers): Use it.
+ (start_command_handler): Release list of keyservers.
+ (is_tor_running): New.
+ (cmd_getinfo): Re-implement "tor" subcommand using new fucntion.
+ (ensure_keyserver): Rewrite.
+ * g10/dirmngr-conf.skel: Add two keyserver options.
+
+ http: Enhance parser to detect .onion addresses.
+ * dirmngr/http.h (parsed_uri_s): Add flag 'onion'.
+ * dirmngr/http.c (do_parse_uri): Set that flag.
+ * dirmngr/t-http.c (main): Print flags.
+
+2015-12-02 Neal H. Walfield <neal at g10code.com>
+
+ common,gpg: Fix processing of search descriptions ending in '!'.
+ * g10/gpg.c (check_user_ids): If the search description describes a
+ keyid or fingerprint and ends in a '!', include the '!' in the
+ rewritten description.
+ * common/userids.c (classify_user_id): Accept keyids and fingerprints
+ ending in '!'.
+
+2015-12-01 Justus Winter <justus at g10code.com>
+
+ dirmngr: Improve error handling.
+ * dirmngr/dns-stuff.c (getsrv): Avoid looking at 'header' before
+ checking for errors, but silently ignore errors when looking up SRV
+ records.
+
+2015-12-01 Werner Koch <wk at gnupg.org>
+
+ build: Let configure show the the status of Tor support.
+ * configure.ac (show_tor_support): New
+
+2015-11-30 Werner Koch <wk at gnupg.org>
+
+ doc: Make make distcheck work again.
+ * doc/Makefile.am (DISTCLEANFILES): Add gpgkey2ssh.1
+
+ yat2m: Add keyword @url.
+ * doc/yat2m.c (proc_texi_cmd): Add keyword @url.
+
+ doc: Build man pages with the same date as the info files.
+ * doc/Makefile.am (yat2m-stamp): Use option --date.
+
+ yat2m: New option --date.
+ * doc/yat2m.c (opt_date): new.
+ (isodatestring): Use it if set.
+ (main): New option --date.
+
+2015-11-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid extra translation strings.
+ * g10/keyedit.c (menu_expire): Use only one prompt.
+
+ kbx: Include gpg-error prior to mischelp.h.
+ * kbx/keybox-init.c: Change order of includes.
+
+ gpg,w32: Fix a format string error.
+ * g10/keyring.c (keyring_search): Fix format string for off_t.
+
+ Silence compiler warnings related to not using assuan_fd_t.
+ * common/call-gpg.c (start_gpg): Use assuan_fd_t. Note that the
+ declaration was already fixed by a previous change.
+ * dirmngr/server.c (cmd_getinfo): Use assuan_fd_t.
+
+ Avoid incompatible pointer assignment warnings on Windows.
+ * common/logging.c (fun_writer): Use gpgrt_ssize_t instead of ssize_t.
+ * dirmngr/server.c (data_line_cookie_write): Ditto.
+ * sm/certdump.c (format_name_writer): Ditto.
+ * sm/server.c (data_line_cookie_write): Ditto.
+ * dirmngr/http.c (cookie_read, cookie_write): Ditto.
+
+ dirmngr: Avoid a declarations after statements.
+ * tools/gpgtar.c (parse_arguments): Use a block for a local varibale
+ definition.
+
+ dirmngr: Avoid casting away a const from an char**.
+ * dirmngr/ldap.c (start_cert_fetch_ldap): Do not use pointers from
+ global variables.
+
+ dirmngr: Allow testing for a running Tor via "getinfo tor".
+ * dirmngr/server.c (cmd_getinfo): Print an S line if Tor is not
+ running.
+
+2015-11-26 Werner Koch <wk at gnupg.org>
+
+ g13: Fix commit 1a045b13.
+ * g13/g13.c (main): Use existsing function.
+
+ common: Fix off-by-one access in the new format_text.
+ * common/stringhelp.c (format_text): Use existsing fucntion to trim
+ trailing spaces. Fix off-by-one access.
+
+ dirmngr: Improve output of "getinfo tor".
+ * dirmngr/server.c (cmd_getinfo): Print a message along with OK.
+
+ dirmngr: Let Libassuan employ nPth wrappers for connect.
+ * dirmngr/http.c (my_unprotect, my_protect): Remove.
+ (connect_server): Do not use these wrappers.
+
+2015-11-26 Justus Winter <justus at g10code.com>
+
+ tools/gpgtar: Add '--dry-run'.
+ * tools/gpgtar-extract.c (extract_{regular,directory}): Honor
+ '--dry-run'.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New value.
+ (opts): Add '--dry-run'.
+ (parse_arguments): Handle '--dry-run'.
+ * tools/gpgtar.h (opt): Add field 'dry_run'.
+
+ tools/gpgtar: Handle '--gpg-args'.
+ * tools/gpgtar-create.c (gpgtar_create): Use given arguments.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New value.
+ (opts): Add 'gpg-args'.
+ (parse_arguments): Handle arguments.
+ * tools/gpgtar.h (opt): Add field 'gpg_arguments'.
+ * tests/openpgp/gpgtar.test: Simplify accordingly.
+
+ common: Make the GPG arguments configurable in call-gpg.
+ * common/call-gpg.c (start_gpg): Add parameter 'gpg_arguments'.
+ (_gpg_encrypt, gpg_encrypt_blob, gpg_encrypt_stream): Likewise.
+ (_gpg_decrypt, gpg_decrypt_blob, gpg_decrypt_stream): Likewise.
+ * common/call-gpg.h: Adapt prototypes.
+ * g13/create.c (encrypt_keyblob): Adapt callsite.
+ * g13/g13-common.h (opt): Add field 'gpg_arguments'.
+ * g13/g13.c (main): Construct default arguments.
+ * g13/mount.c (decrypt_keyblob): Adapt callsite.
+ * tools/gpgtar-create.c (gpgtar_create): Likewise.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+
+ tools/gpgtar: Handle '--tar-args' for compatibility with gpg-zip.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New value.
+ (opts): Add new group for tar options, rearrange a little, add
+ '--tar-args'.
+ (tar_opts): New variable.
+ (shell_parse_stringlist): New function.
+ (shell_parse_argv): Likewise.
+ (parse_arguments): Add option argument, handle '--tar-args'.
+ (main): Fix invokation of 'parse_arguments'.
+ * tests/openpgp/gpgtar.test: Simplify decryption.
+
+ tools/gpgtar: Rework argument parsing.
+ * tools/gpgtar.c (main): Move argument parsing into its own function.
+
+2015-11-25 Justus Winter <justus at g10code.com>
+
+ tests: Add tests for gpgtar and gpg-zip.
+ * tests/openpgp/Makefile.am (TESTS): Add new file.
+ * tests/openpgp/gpgtar.test: New file.
+
+ tools/gpgtar: Handle '--directory' argument.
+ * tools/gpgtar-extract.c (gpgtar_extract): Only generate a directory
+ name if none is given via arguments.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New constant.
+ (opts): Add argument.
+ (main): Parse argument.
+ * tools/gpgtar.h (opt): New field 'directory'.
+
+ tools/gpgtar: Handle '--gpg' argument.
+ * tools/gpgtar-create.c (gpgtar_create): Use given gpg program.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (enum cmd_and_opt_values): New constant.
+ (opts): Add argument.
+ (main): Handle argument.
+ * tools/gpgtar.h (opt): Add field 'gpg_program'.
+
+ tools/gpgtar: Improve error handling.
+ * tools/gpgtar-create.c (gpgtar_create): Return an error code, fix
+ error handling.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+ * tools/gpgtar-list.c (read_header): Return an error code.
+ (gpgtar_list): Return an error code, fix error handling.
+ (gpgtar_read_header): Return an error code.
+ * tools/gpgtar.c: Add missing include.
+ (main): Print an generic error message if a command failed and no
+ error has been printed yet.
+ * tools/gpgtar.h (gpgtar_{create,extract,list,read_header}): Fix the
+ prototypes accordingly.
+
+ tools: Add encryption and decryption support to gpgtar.
+ * tools/Makefile.am: Amend CFLAGS and LDADD.
+ * tools/gpgtar-create.c (gpgtar_create): Add encrypt flag and encrypt
+ stream if requested.
+ * tools/gpgtar-extract.c (gpgtar_extract): Likewise for decryption.
+ * tools/gpgtar-list.c (gpgtar_list): Likewise.
+ * tools/gpgtar.c (main): Initialize npth and assuan. Parse recipient
+ and local user, and note which flags are currently ignored. Adapt
+ calls to gpgtar_list and friends.
+ (tar_and_encrypt): Drop stub function and prototype.
+ (decrypt_and_untar): Likewise.
+ (decrypt_and_list): Likewise.
+ * tools/gpgtar.h (gpgtar_{create,extract,list}): Add encryption or
+ decryption argument.
+
+ common: Add stream interface to call-pgp.
+ * common/call-gpg.c (struct writer_thread_parms): Add field 'stream'.
+ (writer_thread_main): Support reading from a stream.
+ (start_writer): Add stream argument.
+ (struct reader_thread_parms): Add field 'stream'.
+ (reader_thread_main): Support writing to a stream.
+ (start_reader): Add stream argument.
+ (_gpg_encrypt): Add stream api.
+ (gpg_encrypt_blob): Adapt accordingly.
+ (gpg_encrypt_stream): New function.
+ (_gpg_decrypt): Add stream api.
+ (gpg_decrypt_blob): Adapt accordingly.
+ (gpg_decrypt_stream): New function.
+ * common/call-gpg.h (gpg_encrypt_stream): New prototype.
+ (gpg_decrypt_stream): Likewise.
+
+ common: Refactor the call-gpg code.
+ * common/call-gpg.c (gpg_{en,de}crypt_blob): Move most of the code
+ into two new functions, _gpg_encrypt and _gpg_decrypt.
+
+ g13: Move 'call-gpg.c' to common.
+ * common/Makefile.am (common_sources): Add files.
+ * g13/call-gpg.c: Move to 'common' and adapt slightly. Add a
+ parameter to let callees override the gpg program to execute.
+ * g13/call-gpg.h: Likewise.
+ * g13/Makefile.am (g13_SOURCES): Drop files.
+ * g13/create.c (encrypt_keyblob): Hand in the gpg program to execute.
+ * g13/mount.c (decrypt_keyblob): Likewise.
+
+2015-11-24 Neal H. Walfield <neal at g10code.com>
+
+ gpg: When comparing keyids, use the keyid, not the fingerprint's suffix.
+ * g10/keyedit.c (menu_select_key): Use spacep and hexdigitp instead of
+ inline tests. Don't compare P to the suffix of the fingerprint. If P
+ appears to be a keyid, do an exact compare against the keyid. If it
+ appears to be a fingerprint, do an exact compare against the
+ fingerprint.
+
+2015-11-23 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Reflow long texts.
+ * common/stringhelp.c (format_text): New function.
+ * common/t-stringhelp.c (stresc): New function.
+ (test_format_text): New function. Test format_text.
+ * g10/tofu.c (get_trust): Use format_text to reflow long texts.
+ (show_statistics): Likewise.
+
+ common: Extend utf8_charcount to include the string's length.
+ * common/stringhelp.c (utf8_charcount): Take additional parameter,
+ len. Process at most LEN bytes.
+
+2015-11-23 Justus Winter <justus at g10code.com>
+
+ dirmngr: Fix http lookups when libadns is used.
+ * dirmngr/dns-stuff.c (resolve_name_adns): Fill in the port.
+
+ dirmngr: Fix SRV record lookups when using the system resolver.
+ * dirmngr/dns-stuff.c (getsrv): Fix error handling.
+
+ dirmngr: Honor ports specified in SRV records.
+ * dirmngr/ks-engine-hkp.c (struct hostinfo_s): New field 'port'.
+ (create_new_hostinfo): Initialize 'port'.
+ (add_host): Add host parameter and update the hosttable entry.
+ (map_host): Return port if known, adjust calls to 'add_host'.
+ (make_host_part): Let 'map_host' specify the port if known.
+
+ dirmngr: Support hkp server pools using SRV records.
+ * dirmngr/ks-engine-hkp.c (map_host): Handle SRV records.
+
+ dirmngr: Refactor 'map_host'.
+ * dirmngr/ks-engine-hkp.c (add_host): New function.
+ (map_host): Use the new function.
+
+ dirmngr: Fix pool detection.
+ * dirmngr/ks-engine-hkp (arecords_is_pool): Fix counting IP addresses.
+
+ dirmngr: Refactor 'map_host'.
+ * dirmngr/ks-engine-hkp.c (arecords_is_pool): New function.
+ (map_host): Use the new function.
+
+ dirmngr: Start dirmngr on demand.
+ * common/asshelp.h: Include 'util.h'.
+ * dirmngr/dirmngr-client.c (main): Use 'start_new_dirmngr' to connect
+ to the dirmngr.
+ (start_dirmngr): Drop now unused declaration and function.
+
+2015-11-23 Neal H. Walfield <neal at g10code.com>
+
+ gpg: If sqlite is not available, don't build things depending on it.
+ * configure.ac: Define the automake conditional SQLITE3.
+ * tests/openpgp/Makefile.am (TESTS): Move the sqlite3 dependent tests
+ to...
+ (sqlite3_dependent_tests): ... this new variable. If SQLITE3 is not
+ defined, then clear this variable.
+
+ gpg: Allow updating the expiration time of multiple subkeys at once.
+ * g10/keyedit.c (menu_expire): Allow updating the expiration time of
+ multiple subkeys at once.
+
+ gpg: Don't crash if key is not passed an argument.
+ * g10/keyedit.c (menu_select_key): Don't crash if P is NULL.
+
+2015-11-20 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fail if the search description passed to --gen-revoke is ambiguous.
+ * g10/revoke.c (gen_revoke): Error out if the search description is
+ ambiguous.
+
+ gpg: Refactor print_seckey_info.
+ * g10/keylist.c (print_seckey_info): Break formatting functionality
+ into...
+ (format_seckey_info): ... this new function.
+
+ gpg: Improve an error message.
+ * g10/revoke.c (gen_revoke): Provide a more descriptive error message
+ if searching for a key fails.
+
+2015-11-19 Justus Winter <justus at g10code.com>
+
+ dirmngr: Improve error handling.
+ * dirmngr/crlcache.c (crl_cache_cert_isvalid): Add missing break.
+
+ dirmngr: Fix memory leak.
+ * dirmngr/ldap.c (start_cert_fetch_ldap): Avoid leaking all malloc'ed
+ arguments.
+
+ agent: Improve error handling.
+ * agent/trustlist.c (istrusted_internal): Initialize 'err'.
+
+ common: Avoid undefined behavior.
+ * common/iobuf.c (iobuf_esopen): Initialize 'len' as 'file_es_filter'
+ will make use of it.
+
+ g10: Avoid undefined behavior.
+ * g10/trust.c (clean_one_uid): Avoid a computation involving an
+ uninitialized value.
+
+ scd: Improve error handling.
+ * scd/app-openpgp.c (get_public_key): Improve error handling.
+
+2015-11-18 Justus Winter <justus at g10code.com>
+
+ dirmngr: Gracefully handle premature termination of TLS streams.
+ * dirmngr/http.c (close_tls_session): New function.
+ (session_unref): Use the new function to close the TLS stream.
+ (cookie_read): If the stream terminated prematurely, close it and
+ return a short read.
+
+2015-11-17 Neal H. Walfield <neal at g10code.com>
+ Michael Mönch <michael.moench at marktjagd.de>
+
+ tools: Fix option parsing for gpg-zip.
+ * tools/gpg-zip.in: Correctly set GPG when --gpg is specified.
+ Correctly set TAR when --tar is specified. Pass TAR_ARGS to tar.
+
+2015-11-17 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Allow selecting subkeys using a keyid.
+ * g10/keyedit.c (menu_select_key): Take an additional argument, p.
+ Update callers. If P is a hex string, then assume that P is a key id
+ or fingerprint and select subkeys with matching key ids or
+ fingerprints.
+ * doc/gpg.texi: Update documentation for the key subcommand.
+
+2015-11-17 Justus Winter <justus at g10code.com>
+
+ dirmngr: Fix specifying keyservers by IP address.
+ * dirmngr/ks-engine-hkp.c (map_host): Update the original 'hosttable'
+ entry instead of creating another one.
+
+2015-11-17 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Change keydb_search to not return legacy keys.
+ * g10/keyring.c (keyring_search): Take new argument, ignore_legacy.
+ If set, skip any legacy keys. Update callers.
+ * g10/keydb.c (keydb_search): Skip any legacy keys.
+ (keydb_search_first): Don't skip legacy keys. Treat them
+ as an error.
+ (keydb_search_next): Likewise.
+ (keydb_search_fpr): Likewise.
+ * g10/export.c (do_export_stream): Likewise.
+ * g10/getkey.c (lookup): Likewise.
+ (have_secret_key_with_kid): Likewise.
+ * g10/keylist.c (list_all): Likewise.
+ (keyring_rebuild_cache): Likewise.
+ * g10/keyserver.c (keyidlist): Likewise.
+ * g10/trustdb.c (validate_key_list): Likewise.
+
+ gpg: Correctly handle an error.
+ * g10/keyring.c (keyring_search): If a compare function returns an
+ error, treat it as an error.
+
+ gpg: Correctly handle keyblocks followed by legacy keys.
+ * g10/keyring.c (keyring_get_keyblock): If we encounter a legacy
+ packet after already having some non-legacy packets, then treat the
+ legacy packet as a keyblock boundary, not as part of the keyblock.
+ * g10/t-keydb-get-keyblock.c: New file.
+ * g10/t-keydb-get-keyblock.gpg: New file.
+ * g10/Makefile.am (EXTRA_DIST): Add t-keydb-get-keyblock.gpg.
+ (module_tests): Add t-keydb-get-keyblock.
+ (t_keydb_get_keyblock_SOURCES): New variable.
+ (t_keydb_get_keyblock_LDADD): Likewise.
+
+ gpg: Make debugging search descriptors easier.
+ * g10/keydb.c (dump_search_desc): Rename from this...
+ (keydb_search_desc_dump): ... to this. Only process a single search
+ descriptor. Improve output. Don't mark as static. Update callers.
+
+ gpg: Add function format_keyid.
+ * g10/options.h (opt.keyid_format): Add new value KF_DEFAULT.
+ * g10/keyid.c (format_keyid): New function.
+ (keystr): Use it.
+
+ gpg: Use a more appropriate error code.
+ * g10/gpg.c (check_user_ids): Return a more appropriate error code if
+ a user id is ambiguous.
+
+2015-11-17 Justus Winter <justus at g10code.com>
+
+ Fix typos found using codespell.
+ * agent/cache.c: Fix typos.
+ * agent/call-pinentry.c: Likewise.
+ * agent/call-scd.c: Likewise.
+ * agent/command-ssh.c: Likewise.
+ * agent/command.c: Likewise.
+ * agent/divert-scd.c: Likewise.
+ * agent/findkey.c: Likewise.
+ * agent/gpg-agent.c: Likewise.
+ * agent/w32main.c: Likewise.
+ * common/argparse.c: Likewise.
+ * common/audit.c: Likewise.
+ * common/audit.h: Likewise.
+ * common/convert.c: Likewise.
+ * common/dotlock.c: Likewise.
+ * common/exechelp-posix.c: Likewise.
+ * common/exechelp-w32.c: Likewise.
+ * common/exechelp-w32ce.c: Likewise.
+ * common/exechelp.h: Likewise.
+ * common/helpfile.c: Likewise.
+ * common/i18n.h: Likewise.
+ * common/iobuf.c: Likewise.
+ * common/iobuf.h: Likewise.
+ * common/localename.c: Likewise.
+ * common/logging.c: Likewise.
+ * common/openpgp-oid.c: Likewise.
+ * common/session-env.c: Likewise.
+ * common/sexputil.c: Likewise.
+ * common/sysutils.c: Likewise.
+ * common/t-sexputil.c: Likewise.
+ * common/ttyio.c: Likewise.
+ * common/util.h: Likewise.
+ * dirmngr/cdblib.c: Likewise.
+ * dirmngr/certcache.c: Likewise.
+ * dirmngr/crlcache.c: Likewise.
+ * dirmngr/dirmngr-client.c: Likewise.
+ * dirmngr/dirmngr.c: Likewise.
+ * dirmngr/dirmngr_ldap.c: Likewise.
+ * dirmngr/dns-stuff.c: Likewise.
+ * dirmngr/http.c: Likewise.
+ * dirmngr/ks-engine-hkp.c: Likewise.
+ * dirmngr/ks-engine-ldap.c: Likewise.
+ * dirmngr/ldap-wrapper.c: Likewise.
+ * dirmngr/ldap.c: Likewise.
+ * dirmngr/misc.c: Likewise.
+ * dirmngr/ocsp.c: Likewise.
+ * dirmngr/validate.c: Likewise.
+ * g10/encrypt.c: Likewise.
+ * g10/getkey.c: Likewise.
+ * g10/gpg.c: Likewise.
+ * g10/gpgv.c: Likewise.
+ * g10/import.c: Likewise.
+ * g10/keydb.c: Likewise.
+ * g10/keydb.h: Likewise.
+ * g10/keygen.c: Likewise.
+ * g10/keyid.c: Likewise.
+ * g10/keylist.c: Likewise.
+ * g10/keyring.c: Likewise.
+ * g10/mainproc.c: Likewise.
+ * g10/misc.c: Likewise.
+ * g10/options.h: Likewise.
+ * g10/packet.h: Likewise.
+ * g10/parse-packet.c: Likewise.
+ * g10/pkclist.c: Likewise.
+ * g10/pkglue.c: Likewise.
+ * g10/plaintext.c: Likewise.
+ * g10/server.c: Likewise.
+ * g10/sig-check.c: Likewise.
+ * g10/sqlite.c: Likewise.
+ * g10/tdbio.c: Likewise.
+ * g10/test-stubs.c: Likewise.
+ * g10/tofu.c: Likewise.
+ * g10/trust.c: Likewise.
+ * g10/trustdb.c: Likewise.
+ * g13/create.c: Likewise.
+ * g13/mountinfo.c: Likewise.
+ * kbx/keybox-blob.c: Likewise.
+ * kbx/keybox-file.c: Likewise.
+ * kbx/keybox-init.c: Likewise.
+ * kbx/keybox-search-desc.h: Likewise.
+ * kbx/keybox-search.c: Likewise.
+ * kbx/keybox-update.c: Likewise.
+ * scd/apdu.c: Likewise.
+ * scd/app-openpgp.c: Likewise.
+ * scd/app-p15.c: Likewise.
+ * scd/app.c: Likewise.
+ * scd/ccid-driver.c: Likewise.
+ * scd/command.c: Likewise.
+ * scd/iso7816.c: Likewise.
+ * sm/base64.c: Likewise.
+ * sm/call-agent.c: Likewise.
+ * sm/call-dirmngr.c: Likewise.
+ * sm/certchain.c: Likewise.
+ * sm/gpgsm.c: Likewise.
+ * sm/import.c: Likewise.
+ * sm/keydb.c: Likewise.
+ * sm/minip12.c: Likewise.
+ * sm/qualified.c: Likewise.
+ * sm/server.c: Likewise.
+ * tools/gpg-check-pattern.c: Likewise.
+ * tools/gpgconf-comp.c: Likewise.
+ * tools/gpgkey2ssh.c: Likewise.
+ * tools/gpgparsemail.c: Likewise.
+ * tools/gpgtar.c: Likewise.
+ * tools/rfc822parse.c: Likewise.
+ * tools/symcryptrun.c: Likewise.
+
+2015-11-16 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix error checking and improve error reporting.
+ * g10/gpg.c (check_user_ids): Differentiate between a second result
+ and an error. If the key specification is ambiguous or an error
+ occurs, set RC appropriately.
+
+2015-11-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Use only one fingerprint formatting function.
+ * g10/gpg.h (MAX_FORMATTED_FINGERPRINT_LEN): New.
+ * g10/keyid.c (hexfingerprint): Add optional args BUFFER and BUFLEN.
+ Change all callers.
+ (format_hexfingerprint): New.
+ * g10/keylist.c (print_fingerprint): Change to use hexfingerprint.
+ * g10/tofu.c (fingerprint_format): Remove. Replace calls by
+ format_hexfingerprint.
+
+2015-11-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Simplify the tofu interface by using the public key packet.
+ * g10/tofu.c (fingerprint_str): Remove.
+ (tofu_register): Take a public key instead of a fingerprint as arg.
+ Use hexfingerprint() to get a fpr from the PK.
+ (tofu_get_validity): Ditto.
+ (tofu_set_policy, tofu_get_policy): Simplify by using hexfingerprint.
+ * g10/trustdb.c (tdb_get_validity_core): Pass the primary key PK to
+ instead of the fingerprint to the tofu functions.
+
+ gpg: Make trusted-key override for Tofu robust against swapped tofu.db.
+ * g10/tofu.c (get_trust): For the UTK check lookup the key by
+ fingerprint.
+
+ gpg: Fix regression in --locate-keys (in 2.1.9).
+ * g10/getkey.c (getkey_ctx_s): Add field "extra_list".
+ (get_pubkey_byname): Store strings in the context.
+ (getkey_end): Free EXTRA_LIST.
+
+2015-11-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Print a new EXPORTED status line.
+ * common/status.h (STATUS_EXPORTED): New.
+ * g10/export.c (print_status_exported): New.
+ (do_export_stream): Call that function.
+
+ gpg: Print export statistics to the status-fd.
+ * common/status.h (STATUS_EXPORT_RES): New.
+ * g10/main.h (export_stats_t): New.
+ * g10/export.c (export_stats_s): New.
+ (export_new_stats, export_release_stats): New.
+ (export_print_stats): New.
+ (export_pubkeys, export_seckeys, export_secsubkeys)
+ (export_pubkey_buffer, do_export): Add arg "stats".
+ (do_export_stream): Add arg stats and update it.
+ * g10/gpg.c (main) <aExport, aExportSecret, aExportSecretSub>: Create,
+ pass, and print a stats object to the export function calls.
+
+ * g10/export.c (export_pubkeys_stream): Remove unused function.
+
+ dirmngr: Do not block during ADNS calls.
+ * dirmngr/dns-stuff.c: Include npth.h
+ (my_unprotect, my_protect): New wrapper.
+ (resolve_name_adns): Put unprotect/protect around adns calls.
+ (get_dns_cert): Ditto.
+ (getsrv): Ditto.
+ (get_dns_cname): Ditto.
+
+ dirmngr: New option --nameserver.
+ * dirmngr/dirmngr.c (oNameServer): New.
+ (opts): Add --nameserver.
+ (parse_rereadable_options): Act upon oNameServer.
+ * dirmngr/dns-stuff.c (DEFAULT_NAMESERVER): New.
+ (tor_nameserver): New.
+ (set_dns_nameserver): New.
+ (my_adns_init): Make name server configurable.
+
+2015-11-11 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix cache consistency problem.
+ g10/keyring.c (keyring_search): Only mark the cache as completely
+ filled if we start the scan from the beginning of the keyring.
+
+2015-11-10 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Default to the the PGP trust model.
+ * g10/trustdb.c (init_trustdb): If we can't read the trust model from
+ the trust DB, default to TM_PGP, not TM_TOFU_PGP.
+
+ gpg: Default to the flat TOFU DB format.
+ * g10/tofu.c (opendbs): If the TOFU DB format is set to auto and there
+ is no TOFU DB, default to the flat format.
+
+2015-11-09 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Change to new ADNS Tor mode init scheme.
+ * dirmngr/dns-stuff.c (tor_credentials): New.
+ (enable_dns_tormode): Add arg new_circuit and update tor_credentials.
+ (my_adns_init): Rework to set Tor mode using a config file options and
+ always use credentials.
+ * dirmngr/server.c (cmd_dns_cert): Improve error message.
+ * dirmngr/t-dns-stuff.c (main): Add option --new-circuit.
+
+ dirmngr: Improve detection of ADNS.
+ * configure.ac (HAVE_ADNS_FREE): New ac_define.
+
+2015-11-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Add reder information to --card-status.
+ * g10/call-agent.h, g10/call-agent.c (agent_release_card_info)
+ g10/card-util.c (card_status): Add READER.
+ * scd/apdu.c (close_ccid_reader, open_ccid_reader): Handle RDRNAME.
+ (apdu_get_reader_name): New.
+ * scd/ccid-driver.c (ccid_open_reader): Add argument to RDRNAME_P.
+ * scd/command.c (cmd_learn): Return READER information.
+
+2015-11-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid new strings.
+ * g10/decrypt-data.c (decrypt_data): Use already translated strings.
+
+ common: Fix commit f99830b.
+ * common/userids.c (classify_user_id): Avoid underflow. Use spacep to
+ also trim tabs.
+
+2015-11-06 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix formatting string.
+ * g10/decrypt-data.c (decrypt_data): Fix formatting string.
+
+ gpg: Add new option --only-sign-text-ids.
+ * g10/options.h (opt): Add field only_sign_text_ids.
+ * g10/gpg.c (enum cmd_and_opt_values): Add value oOnlySignTextIDs.
+ (opts): Handle oOnlySignTextIDs.
+ (main): Likewise.
+ * g10/keyedit.c (sign_uids): If OPT.ONLY_SIGN_TEXT_IDS is set, don't
+ select non-text based IDs automatically.
+ (keyedit_menu): Adapt the prompt asking to sign all user ids according
+ to OPT.ONLY_SIGN_TEXT_IDS.
+ * doc/gpg.texi: Document the new option --only-sign-text-ids.
+
+ common: When classifying keyids and fingerprints, reject trailing junk.
+ * common/userids.c (classify_user_id): Trim any trailing whitespace.
+ Before assuming that a hexstring corresponds to a key id or
+ fingerprint, make sure that it is NUL terminated.
+
+ gpg: Check for ambiguous or non-matching key specs.
+ * g10/gpg.c (check_user_ids): New function.
+ (main): Check that any user id specifications passed to --local-user
+ and --remote-user correspond to exactly 1 user. Check that any user
+ id specifications passed to --default-key correspond to at most 1
+ user. Warn if any user id specifications passed to --local-user or
+ --default-user are possible ambiguous (are not specified by long keyid
+ or fingerprint).
+ * g10/getkey.c (parse_def_secret_key): Don't warn about possible
+ ambiguous key descriptions here.
+
+ common: Add new function strlist_rev.
+ * common/strlist.c (strlist_rev): New function.
+ * common/t-strlist.c: New file.
+ * common/Makefile.am (common_sources): Add strlist.c and strlist.h.
+ (module_tests): Add t-strlist.
+ (t_strlist_LDADD): New variable.
+
+ common: Include required, but not included headers in t-support.h.
+ * common/t-support.h: Include <stdlib.h> and <stdio.h>.
+
+2015-11-05 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Indicate which characters are invalid.
+ * g10/keygen.c (ask_user_id): Indicate which characters are invalid.
+
+ gpg: Add support for unwrapping the outer level of encryption.
+ * g10/decrypt-data.c (decrypt_data): If OPT.UNWRAP_ENCRYPTION is set,
+ copy the data to the output file instead of continuing to process it.
+ * g10/gpg.c (enum cmd_and_opt_values): Add new value oUnwrap.
+ (opts): Handle oUnwrap.
+ (main): Likewise.
+ * g10/options.h (opt): Add field unwrap_encryption.
+ * g10/plaintext.c (handle_plaintext): Break the output file selection
+ functionality into ...
+ (get_output_file): ... this new function.
+
+ common: Add a function for copying data from one iobuf to another.
+ * common/iobuf.c (iobuf_copy): New function.
+
+ doc: Note that gpgkey2ssh is deprecated.
+ * doc/tools.texi (gpgkey2ssh): Note that gpgkey2ssh is deprecated.
+
+ tools: Fix gpgkey2ssh's most gratuitous errors. Use gpg2, not gpg.
+ * tools/gpgkey2ssh.c (main): Add support for --help. Replace the most
+ gratuitous asserts with error messages. Invoke gpg2, not gpg.
+
+2015-11-05 Neal H. Walfield <neal at g10code.com>
+ Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ doc: Add documentation for gpgkey2ssh.
+ * doc/tools.texi: Add documentation for gpgkey2ssh.
+
+2015-11-04 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Print a better error message for --multifile --sign --encrypt.
+ * g10/gpg.c (main): Print a better error message for --multifile
+ --sign --encrypt.
+
+ gpg: Add --encrypt-to-default-key.
+ * g10/getkey.c (parse_def_secret_key): Drop the static qualifier and
+ export the function.
+ * g10/gpg.c (enum cmd_and_opt_values): Add value oEncryptToDefaultKey.
+ (opts): Handle oEncryptToDefaultKey.
+ (main): Likewise.
+ * g10/options.h (opt): Add field encrypt_to_default_key.
+
+ gpg: Allow multiple --default-key options. Take the last available key.
+ * g10/getkey.c (parse_def_secret_key): New function.
+ (get_seckey_default): Add parameter ctrl. Update callers. Use
+ parse_def_secret_key to get the default secret key, if any.
+ (getkey_byname): Likewise.
+ (enum_secret_keys): Likewise.
+ * g10/options.h (opt): Change def_secret_key's type from a char * to a
+ strlist_t.
+ * g10/gpg.c (main): When processing --default-key, add the key to
+ OPT.DEF_SECRET_KEY.
+ * g10/gpgv.c (get_session_key): Add parameter ctrl. Update callers.
+ * g10/mainproc.c (proc_pubkey_enc): Likewise.
+ (do_proc_packets): Likewise.
+ * g10/pkclist.c (default_recipient): Likewise.
+ * g10/pubkey-enc.c (get_session_key): Likewise.
+ * g10/sign.c (clearsign_file): Likewise.
+ (sign_symencrypt_file): Likewise.
+ * g10/skclist.c (build_sk_list): Likewise.
+ * g10/test-stubs.c (get_session_key): Likewise.
+
+2015-11-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix error handling with libusb-compat library.
+ * scd/ccid-driver.c (bulk_out): Use LIBUSB_ERRNO_NO_SUCH_DEVICE.
+
+ scd: fix change_keyattr.
+ * scd/app-openpgp.c (change_keyattr_from_string): Fix parsing.
+
+2015-11-03 Werner Koch <wk at gnupg.org>
+
+ gpg: Change out of core error message.
+ * g10/tofu.c (fingerprint_str): Die with the error code returned by
+ the failed function.
+ (time_ago_str): Ditto. Do not make a comma translatable.
+ (fingerprint_format): Use "%zu" for a size_t.
+
+ gpg: Make translation easier.
+ * g10/import.c (import_secret_one): Split info string for easier
+ translation.
+
+2015-11-03 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Also show when the most recently signed message was observed.
+ * g10/tofu.c (show_statistics): Also show when the most recently
+ signed message was observed.
+
+ gpg: Split a utility function out of a large function.
+ * g10/tofu.c (show_statistics): Break the time delta to string code
+ into...
+ (time_ago_str): ... this new function.
+
+ gpg: Fix message formatting.
+ * g10/tofu.c (get_trust): Fix message formatting.
+
+ gpg: Don't store formatting fingerprints in the TOFU DB.
+ * g10/tofu.c (fingerprint_pp): Split this function into...
+ (fingerprint_str): ... this function...
+ (fingerprint_format): ... and this function.
+ (record_binding): Store the unformatted fingerprint in the DB. Only
+ use the formatting fingerprint when displaying a message to the user.
+ (get_trust): Likewise.
+ (show_statistics): Likewise.
+ (tofu_register): Likewise.
+ (tofu_get_validity): Likewise.
+ (tofu_set_policy): Likewise.
+ (tofu_get_policy): Likewise.
+
+2015-11-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: notify a user when importing stub is skipped.
+ * g10/import.c (transfer_secret_keys): Return GPG_ERR_NOT_PROCESSED
+ when stub_key_skipped.
+ (import_secret_one): Notify a user, suggesting --card-status.
+
+2015-10-31 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Consider newlines to be whitespace in an SQL statement.
+ * g10/sqlite.c (sqlite3_stepx): When making sure that there is no
+ second SQL statement, ignore newlines.
+
+2015-10-30 Werner Koch <wk at gnupg.org>
+
+ common: Improve t-zb32 to be used for manual encoding.
+ * common/t-support.h (no_exit_on_fail, errcount): New.
+ (fail): Bump errcount.
+ * common/t-zb32.c (main): Add options to allow manual use.
+
+ common: Add separate header for zb32.c.
+ * common/util.h (zb32_encode): Move prototype to ...
+ * common/zb32.h: new. Include this for all callers of zb32_encode.
+
+2015-10-29 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Display the correct error message.
+ * g10/trustdb.c (validate_keys): If tdbio_update_version_record fails,
+ RC does not contain the error code. Save the error code in rc2 and
+ use that.
+
+ gpg: Eliminate a memory leak.
+ * g10/trustdb.c (validate_key_list): Don't leak the keyblocks on
+ failure.
+
+ gpg: Remove unused prototype.
+ g10/keyring.h (keyring_locate_writable): Remove unused prototype.
+
+ gpg: Eliminate a memory leak.
+ * g10/gpg.c (main): Don't leak OPT.DEF_RECIPIENT.
+
+ gpg: Fix keyring support.
+ * g10/keydb.c (keydb_rebuild_caches): Only mark the cached as prepared
+ if it is actually prepared, which it only is if the resource is a
+ keybox.
+
+ gpg: Change sqlite3_stepx to pass the sqlite3_stmt * to the callback.
+ * g10/sqlite.h (enum sqlite_arg_type): Add SQLITE_ARG_BLOB.
+ (sqlite3_stepx_callback): New declaration.
+ (sqlite3_stepx): Change the callback's type to sqlite3_stepx_callback,
+ which passes an additional parameter, the sqlite3_stmt *. Update
+ users.
+
+ gpg: Move sqlite helper functions into their own file.
+ * g10/tofu.c (sqlite3_exec_printf): Move from here...
+ * g10/sqlite.c (sqlite3_exec_printf): ... to this new file. Don't
+ mark as static.
+ * g10/tofu.c (sqlite3_stepx): Move from here...
+ * g10/sqlite.c (sqlite3_stepx): ... to this new file. Don't
+ mark as static.
+ * g10/tofu.c (enum sqlite_arg_type): Move from here...
+ * g10/sqlite.h (enum sqlite_arg_type): ... to this new file.
+
+2015-10-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ doc: Don't install gpg-zip.1.
+ * doc/Makefile.am (myman_pages): Remove gpg-zip.1.
+ (DISTCLEANFILES): Add gpg-zip.1.
+
+2015-10-28 Werner Koch <wk at gnupg.org>
+
+ sm: Allow combination of usage flags --gen-key.
+ * sm/certreqgen.c (create_request): Re-implement building of the
+ key-usage extension.
+
+2015-10-28 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ doc: Document some changed default options.
+ * doc/gpg.texi: Update the description of some options which are
+ now enabled by default.
+
+2015-10-28 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix NULL-deref while loading a CRL.
+ * dirmngr/crlcache.c (crl_parse_insert): Set error before leaping to
+ failure.
+
+ dirmngr: Minor cleanup of the SRV RR code.
+ * dirmngr/dns-stuff.c: Include unistd.h.
+ (getsrv): Run srand only once.
+ * dirmngr/t-dns-stuff.c (main): Allow passing another name for --srv
+ and change output format.
+
+ dirmngr: Add a getaddrinfo wrapper backend using ADNS.
+ * dirmngr/dns-stuff.c: Replace all use of default_errsource.
+ (my_adns_init): Move to top.
+ (resolve_name_adns): New.
+ (resolve_dns_name) [USE_ADNS]: Divert to new func.
+
+2015-10-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not call an extra get_validity if no-show-uid-validity is used.
+ * g10/mainproc.c (check_sig_and_print): Do not call the informational
+ get_validity if we are not going to use it.
+
+2015-10-26 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Ensure all weak digest rejection notices are shown.
+ * g10/main.h: Add rejection_shown flag to each weakhash struct
+ * g10/misc.c (print_digest_algo_note, additional_weak_digest): Do not
+ treat MD5 separately; (print_digest_rejected_note): Use
+ weakhash.rejection_shown instead of static shown.
+ * g10/options.h (opt): Change from additional_weak_digests to
+ weak_digests.
+ * g10/sig-check.c: Do not treat MD5 separately.
+ * g10/gpg.c (main): Explicitly set MD5 as weak.
+ * g10/gpgv.c (main): Explicitly set MD5 as weak.
+
+2015-10-26 Werner Koch <wk at gnupg.org>
+
+ w32: Make it build again if Tofu support is not available.
+ * g10/keylist.c (public_key_list) [!USE_TOFU]: Do not call tofu
+ functions.
+
+ dirmngr: Support Tor hidden services.
+ * dirmngr/dns-stuff.c (is_onion_address): New.
+ * dirmngr/ks-engine-hkp.c (hostinfo_s): Add field "onion".
+ (map_host): Special case onion addresses.
+ (ks_hkp_print_hosttable): Print an 'O' for an onion address.
+ * dirmngr/http.c (connect_server): Special case onion addresses.
+
+ dirmngr,w32: Remove gethostbyname hack and make it build again.
+ * dirmngr/http.c (connect_server) [W32]: Remove gethostbyname hack;
+ we require getaddrinfo anyway.
+ * dirmngr/dns-stuff.c (AI_ADDRCONFIG): Add replacement if not defined.
+ (map_eai_to_gpg_error) [W32]: Take care of unsupported codes.
+
+2015-10-26 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Make sure we only have a single SQL statement.
+ * g10/tofu.c (sqlite3_stepx): Make sure SQL only contains a single SQL
+ statement.
+
+ gpg: When the TOFU DB is in batch mode, periodically drop the locks.
+ * g10/tofu.c: Include <sched.h>.
+ (batch_update_started): New variable.
+ (begin_transaction): If we've been in batch mode for a while, then
+ commit any extant batch transactions.
+ (tofu_begin_batch_update): If we are not in batch mode, initialize
+ batch_update_started.
+
+2015-10-25 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Add workaround for broken getaddrinfo.
+ * dirmngr/dns-stuff.c (resolve_name_standard): On failure retry by
+ first resolving the CNAME.
+ (get_dns_cname): New.
+
+ * dirmngr/t-dns-stuff.c (main): Add option --cname.
+
+ dirmngr: Better handle systems without IPv6 or IPv4.
+ * dirmngr/dns-stuff.c (resolve_name_standard): Use AI_ADDRCONFIG.
+
+ dirmngr: Replace use of getnameinfo by resolve_dns_addr.
+ * dirmngr/ks-engine-hkp.c (my_getnameinfo): Remove.
+ (map_host): Use resolve_dns_addr.
+
+ dirmngr: Implement a getnameinfo wrapper.
+ * dirmngr/dns-stuff.h (DNS_NUMERICHOST): New.
+ (DNS_WITHBRACKET): New.
+ * dirmngr/dns-stuff.c (resolve_name_standard): Factor code out to...
+ (map_eai_to_gpg_error): new.
+ (resolve_addr_standard): New.
+ (resolve_dns_addr): New.
+
+ * dirmngr/ks-engine-hkp.c (is_ip_address): Move to ...
+ * dirmngr/dns-stuff.c (is_ip_address): here. Add support for non
+ bracketed v6 addresses.
+
+ * dirmngr/t-dns-stuff.c: Remove header netdb.h.
+ (main): Add option --bracket. Use resolve_dns_name instead of
+ getnameinfo.
+
+2015-10-23 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Provide an interface to patch TOFU updates.
+ * g10/tofu.c (struct db): Rename begin_transaction to savepoint_batch.
+ Rename end_transaction to savepoint_batch_commit. Update users.
+ Remove field rollback. Add fields savepoint_inner and
+ savepoint_inner_commit. Add field batch_update.
+ (dump_cache): New function.
+ (batch_update): New variable.
+ (begin_transaction). New function.
+ (end_transaction): New function.
+ (rollback_transaction): New function.
+ (tofu_begin_batch_update): New function.
+ (tofu_end_batch_update): New function.
+ (closedb): End any pending batch transaction.
+ (closedbs): Assert that none of the DBs have a started batch
+ transaction if we not in batch mode.
+ (record_binding): Use the begin_transaction, end_transaction and
+ rollback_transaction functions instead of including the SQL inline.
+ Also start a batch mode transaction if we are using the flat format.
+ (tofu_register): Use the begin_transaction, end_transaction and
+ rollback_transaction functions instead of including the SQL inline.
+ * g10/gpgv.c (tofu_begin_batch_update): New function.
+ (tofu_end_batch_update): New function.
+ * g10/test-stubs.c (tofu_begin_batch_update): New function.
+ (tofu_end_batch_update): New function.
+
+ gpg: Cache prepared SQL queries and open DB connections.
+ * g10/tofu.c: Include <stdarg.h>.
+ (prepares_saved) [DEBUG_TOFU_CACHE]: New variable.
+ (queries) [DEBUG_TOFU_CACHE]: New variable.
+ (struct db): Add fields prevp, begin_transaction, end_transaction,
+ rollback, record_binding_get_old_policy, record_binding_update,
+ record_binding_update2, get_policy_select_policy_and_conflict,
+ get_trust_bindings_with_this_email, get_trust_gather_other_user_ids,
+ get_trust_gather_other_keys, register_already_seen, and
+ register_insert.
+ [DEBUG_TOFU_CACHE]: Add field hits.
+ (STRINGIFY): New macro.
+ (STRINGIFY2): New macro.
+ (enum sqlite_arg_type): New enum.
+ (sqlite3_stepx): New function.
+ (combined_db): Remove variable.
+ (opendb): Don't cache the combined db.
+ (struct dbs): New struct. Update users to use this as the head of the
+ local DB list rather than overloading struct db.
+ (unlink_db): New function.
+ (link_db): New function.
+ (db_cache): New variable.
+ (db_cache_count): New variable.
+ (DB_CACHE_ENTRIES): Define.
+ (getdb): If the dbs specific cache doesn't include the DB, look at
+ DB_CACHE. Only if that also doesn't include the DB open the
+ corresponding DB.
+ (closedb): New function.
+ (opendbs): Don't open the combined DB. Just return an initialized
+ struct dbs.
+ (closedbs): Don't close the dbs specific dbs. Attach them to the
+ front of DB_CACHE. If DB_CACHE contains more than DB_CACHE_ENTRIES,
+ close enough dbs from the end of the DB_CACHE list such that DB_CACHE
+ only contains DB_CACHE_ENTRIES. Don't directly close the dbs, instead
+ use the new closedb function.
+ [DEBUG_TOFU_CACHE]: Print out some statistics.
+ (record_binding): Use sqlite3_stepx instead of sqlite3_exec or
+ sqlite3_exec_printf.
+ (get_policy): Likewise.
+ (get_trust): Likewise.
+ (tofu_register): Likewise.
+
+ gpg: Return the DBs meta-handle rather than the sqlite3 handle.
+ * g10/tofu.c (getdb): Return a struct db * instead of an sqlite *.
+ Update users.
+
+ gpg: Use the proper type.
+ * g10/options.h: Include "tofu.h".
+ (opt.tofu_default_policy): Change type to enum tofu_policy.
+ * g10/gpgv.c (enum tofu_policy): Don't redeclare.
+ * g10/test-stubs.c (enum tofu_policy): Likewise.
+
+2015-10-22 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Implement Tor mode for SRV RRs.
+ * dirmngr/dns-stuff.c (get_dns_cert): Factor adns init out to...
+ (my_adns_init): new.
+ (getsrv)[USE_ADNS]: Use my_adns_init.
+ (getsrv)[!USE_ADNS]: Return an error if Tor mode is active.
+
+ * dirmngr/t-dns-stuff.c: Add option --use-tor.
+
+ dirmngr: Do not use MAXDNAME.
+ * dirmngr/dns-stuff.c (getsrv): Replace MAXDNAME.
+ * dirmngr/dns-stuff.h (MAXDNAME): Remove.
+ (struct srventry): Use a fixed value instead of MAXDNAME.
+ * dirmngr/http.c (connect_server): Use DIMof instead of MAXDNAME.
+ Malloc a helper array.
+
+ Move SRV RR code from common/ to dirmngr/.
+ * common/srv.c: Merge into dirmngr/dns-stuff.c. Delete file.
+ * common/srv.h: Merge into dirmngr/dns-stuff.h. Delete file.
+ * common/Makefile.am (common_sources): Remove srv.c and srv.h.
+ * g10/keyserver.c: Do not include srv.h. The code using it is anyway
+ disabled.
+ * dirmngr/http.c: Remove header srv.h and stubs.
+ * dirmngr/t-dns-stuff.c: Add option --srv.
+
+2015-10-21 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Use the new DNS wrapper for the HTTP module.
+ * dirmngr/t-http.c (main): Init assuan sockets.
+ * dirmngr/http.c: Include dns-stuff.h.
+ (connect_server)[!HAVE_GETADDRINFO]: Remove all code.
+ (connect_server): Change to use resolve_dns_name.
+
+ dirmngr: Allow use of http.c if USE_NPTH is not defined.
+ * dirmngr/http.c (send_request): Always set the gnutls pull/push
+ functions.
+ (my_npth_read): Rename to ...
+ (my_gnutls_read) .. this. Use system read if !USE_NPTH.
+ (my_npth_write): Rename to ...
+ (my_gnutls_write) .. this. Use system write if !USE_NPTH.
+
+ dirmngr: Check that getaddrinfo is available.
+ * dirmngr/Makefile.am (t_http_SOURCES): Add dns-stuff.c.
+ (t_ldap_parse_uri_SOURCES): Ditto.
+ * dirmngr/dns-stuff.c: Bail out if neither ADNS nor getaddrinfo is
+ available.
+
+ dirmngr: Use the new DNS wrapper for the HKP engine.
+ * dirmngr/ks-engine-hkp.c (my_getnameinfo): Change arg type to
+ dns_addrinfo_t.
+ (map_host): Replace getaddrinfo by resolve_dns_name.
+
+ dirmngr: Implement a getaddrinfo wrapper.
+ * dirmngr/dns-stuff.h: Include some header files.
+ (dns_addinfo_t, dns_addrinfo_s): New.
+ * dirmngr/dns-stuff.c: Always include DNS related headers.
+ (free_dns_addrinfo): New.
+ (resolve_name_standard): New.
+ (resolve_dns_name): New.
+
+ * dirmngr/t-dns-stuff.c: Include netdb.h.
+ (main): Keep old default mode with no args but else print outout of
+ resolve_dns_name. Revamp option parser.
+
+ common: Add more replacement error codes.
+ * common/util.h (GPG_ERR_SERVER_FAILED): New.
+ (GPG_ERR_NO_KEY): New.
+ (GPG_ERR_NO_NAME): New.
+
+2015-10-21 Neal H. Walfield <neal at g10code.com>
+
+ gpg: If the saved trust model is unknown, default to tofu+pgp.
+ * g10/trustdb.c (init_trustdb): If the saved trust model is unknown,
+ default to tofu+pgp instead of pgp.
+
+ gpg: Don't accidentally free UTK_LIST.
+ * g10/trustdb.c (validate_keys): Don't free UTK_LIST.
+
+ gpg: When evaluating trust reg exps, treat tofu+pgp like pgp.
+ * g10/trustdb.c (validate_one_keyblock): When checking trust regular
+ expressions, treat the tofu+pgp trust model the same as the pgp trust
+ model.
+
+ gpg: If a key is ultimate trusted, return that in the tofu model.
+ * g10/tofu.c (get_trust): If the policy is auto or none, check if the
+ key is ultimately trusted. If so, return that.
+ (tofu_register): If the key is ultimately trusted, don't show any
+ statistics.
+ (tofu_get_validity): Likewise.
+
+ gpg: Keep the trust DB up to date for the tofu and tofu+pgp models.
+ * g10/trustdb.c (init_trustdb): Recognize tofu and tofu+pgp as
+ possibly saved trust models. Also register the ultimately trusted
+ keys if the trust model is tofu or tofu+pgp.
+ (check_trustdb): Don't skip if the trust model is tofu or tofu+pgp.
+ (update_trustdb): Likewise.
+ (tdb_check_trustdb_stale): Likewise.
+ (validate_keys): If the trust model is TOFU, just write out the
+ ultimately trusted keys.
+
+ gpg: Factor out code into a standalone function.
+ * g10/trustdb.c (tdb_keyid_is_utk): New function.
+ (add_utk): Use it.
+
+ dirmngr: Allow building with libassuan < 2.3.
+ * dirmngr/http.c (send_request): Use newer assuan function only if
+ available.
+
+2015-10-21 Neal H. Walfield <neal at g10code.com>
+ Andre Heinecke <aheinecke at intevation.de>
+
+ gpg: Make the tofu DB check and initialization atomic.
+ * g10/tofu.c (initdb): Make the version check and the database
+ initialization atomic.
+
+2015-10-21 Werner Koch <wk at gnupg.org>
+
+ build: Make --disable-g13 the default.
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-g13. Remove
+ --enable-gpgtar because that is enabled anyway.
+ * configure.ac: Do not build g13 by default.
+
+ dirmngr: Rename file dns-cert.c.
+ * dirmngr/dns-cert.c: Rename to dirmngr/dns-stuff.c.
+ * dirmngr/dns-cert.h: Rename to dirmngr/dns-stuff.h and change
+ includers.
+ * dirmngr/t-dns-cert.c: Rename to dirmngr/t-dns-stuff.c.
+ * dirmngr/Makefile.am: Adjust.
+
+ common: Add status code for use by g13.
+ * common/status.h (STATUS_PLAINTEXT_FOLLOWS): New.
+
+2015-10-20 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Prefer ADNS over system resolver.
+ * configure.ac (HAVE_ADNS_IF_TORMODE): New ac_define.
+ (USE_DNS_CERT): Prefer ADNS over the system resolver.
+ * dirmngr/dns-cert.c (tor_mode): New global var.
+ (enable_dns_tormode): New func.
+ (get_dns_cert): Use DNS resolver at 8.8.8.8 in tor-mode.
+ * dirmngr/server.c (cmd_dns_cert): If supported allow DNS requests.
+
+ w32: Allow building again.
+ * dirmngr/http.c (connect_server): Fix called function name.
+
+ build: Allow building without SQLlite support.
+ * configure.ac: Add option --dsiable-tofu and --disable-sqlite.
+ (NEED_SQLITE_VERSION): New var.
+ (USE_TOFU): New ac_define and am_conditional.
+ * autogen.sh (build-w32): Add PKG_CONFIG_LIBDIR to configure so that
+ pkg-config find the correct .pc file.
+
+ * g10/Makefile.am (tofu_source): New. Build only if enabled.
+ * g10/gpg.c (parse_trust_model)[!USE_TOFU]: Disable tofu models.
+ (parse_tofu_policy)[!USE_TOFU]: Disable all.
+ (parse_tofu_db_format)[!USE_TOFU]: Disable all.
+ (main) <aTOFUPolicy>[!USE_TOFU]: Skip.
+ * g10/keyedit.c (show_key_with_all_names_colon)[!USE_TOFU]: Do not
+ call tofu functions.
+ * g10/keylist.c (list_keyblock_colon)[!USE_TOFU]: Ditto.
+ * g10/trustdb.c (tdb_get_validity_core)[!USE_TOFU]: Skip tofu
+ processing.
+
+2015-10-20 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Don't die immediately if the TOFU DB is locked.
+ * g10/tofu.c (opendb): Don't die immediately if the DB is locked.
+
+ gpg: Improve output.
+ * g10/tofu.c (get_trust): Also show the binding when indicating a
+ conflict occurred.
+
+ gpg: Synchronize translation template.
+ * g10/tofu.c (show_statistics): Synchronize translation template.
+
+ gpg: When showing conflicts, also show bindings with no recorded sigs.
+ * g10/tofu.c (signature_stats_collect_cb): If the time_ago column is
+ NULL, then both time_ago and count should be 0.
+ (get_trust): Reverse the direction of the join so that we also get
+ statistics about bindings without any signatures.
+
+ gpg: Improve text.
+ * g10/tofu.c (show_statistics): Improve text.
+
+ gpg: Use the right variable to display the information.
+ * g10/tofu.c (get_trust): Use the right variable to display the
+ conflicting key.
+
+ gpg: Make failing to create a directory a soft error.
+ * g10/tofu.c (getdb): Don't exit if we can't create the directory.
+ Just return an error.
+
+ common: Make sure tilde expansion works for the mkdir functions.
+ * common/mkdir_p.c (gnupg_amkdir_p): Use make_filename_try on the
+ first directory component as well.
+
+ gpg: Remove unused prototype digest_algo_from_sig.
+ * g10/packet.h (digest_algo_from_sig): Remove prototype without a
+ corresponding implementation.
+
+2015-10-19 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow building with libassuan < 2.3.
+ * dirmngr/dirmngr.c (set_tor_mode): Use newer assuan function only if
+ available.
+ * dirmngr/http.c (http_raw_connect): Ditto.
+
+2015-10-19 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix --desig-revoke.
+ * g10/revoke.c (gen_desig_revoke): Add additional parameter ctrl.
+ Check that the secret key is available. If not, display an error
+ message.
+
+ gpg: Improve function documentation and some comments.
+ * g10/main.h: Improve function documentation.
+ * g10/packet.h.h: Improve function documentation.
+ * g10/sig-check.c: Improve function documentation and some comments.
+
+ gpg: Improve and regularize naming of signature checking functions.
+ * g10/packet.h (signature_check): Rename from this...
+ (check_signature): ... to this. Update users.
+ (signature_check2): Rename from this...
+ (check_signature2): ... to this. Update users.
+ * g10/sig-check.c (do_check): Rename from this...
+ (check_signature_end): ... to this. Update users.
+ (do_check_messages): Rename from this...
+ (check_signature_metadata_validity): ... to this. Update users.
+
+ gpg: Mark local function as static.
+ * g10/tdbio.c (put_record_into_cache): Mark as static.
+
+2015-10-19 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Print warning when rejecting weak digests.
+ * g10/misc.c (print_md5_rejected_note): Rename to ..
+ (print_digest_rejected_note): this. Parameterize function to take an
+ enum gcry_md_algos.
+ * g10/sig-check.c: Use print_digest_rejected_note() when rejecting
+ signatures.
+
+ gpg: Add option --weak-digest to gpg and gpgv.
+ * g10/options.h: Add additional_weak_digests linked list to opts.
+ * g10/main.h: Declare weakhash linked list struct and
+ additional_weak_digest() function to insert newly-declared weak
+ digests into opts.
+ * g10/misc.c: (additional_weak_digest): New function.
+ (print_digest_algo_note): Check for deprecated digests; use proper
+ gcry_md_algos type.
+ * g10/sig-check.c: (do_check): Reject weak digests in addition to MD5.
+ * g10/gpg.c: Add --weak-digest option to gpg.
+ * doc/gpg.texi: Document gpg --weak-digest option.
+ * g10/gpgv.c: Add --weak-digest option to gpgv.
+ * doc/gpgv.texi: Document gpgv --weak-digest option.
+
+2015-10-19 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Make --use-tor work - still leaks DNS.
+ * dirmngr/dirmngr.c (set_tor_mode): New.
+ (main, reread_configuration): Call it.
+ * dirmngr/http.c (http_raw_connect, send_request): Check whether TOR
+ mode is enabled if the FORCE_TOR flag is given.
+
+ dirmngr: Use Assuan socket wrappers for http.c.
+ * dirmngr/http.c: Include assuan.h. Changed all code taking a socket
+ descriptor from int to assuan_fd_t.
+ (my_unprotect, my_protect): New.
+ (my_connect): Remove.
+ (_my_socket_new, _my_socket_unref): use assuan_sock_close.
+ (connect_server): Use assuan_sock_connect, assuan_sock_new, and
+ assuan_sock_close.
+ * dirmngr/Makefile.am (t_common_ldadd): Add LIBASSUAN_LIBS.
+
+2015-10-19 Neal H. Walfield <neal at g10code.com>
+
+ gpg: Fix formatting.
+ * g10/tofu.c (get_trust): Fix formatting.
+
+ gpg: Don't forget to free some memory.
+ * g10/tofu.c (tofu_register): Free SIG_DIGEST before returning.
+
+ gpg: If a conflict occurs in batch mode, record that.
+ * g10/tofu.c (get_trust): If a conflict occurs when MAY_ASK is false,
+ set conflict to the key. When prompting the user, don't show the
+ conflicting key if the conflicting key is the current key.
+
+2015-10-18 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence two more warnings.
+ * g10/trustdb.c (tdb_get_validity_core): Silence a warning.
+ * g10/tofu.c (tofu_register): Move SIG_DIGEST computation to the top
+ so that it is not uninitialized in case of an early error.
+
+ gpg: Fix harmless compiler warnings.
+ * g10/tofu.h (_tofu_GET_POLICY_ERROR): New. This avoids warnings
+ about undefined enum values in a switch.
+ * g10/trustdb.h (_tofu_GET_TRUST_ERROR): New.
+ * g10/tofu.c (TIME_AGO_FUTURE_IGNORE): Move to the top.
+ (opendbs): Avoid compiler warning (use braces).
+ (GET_POLICY_ERROR): Replace define by enum _tofu_GET_POLICY_ERROR.
+ (get_policy): Remove assert.
+ (GET_TRUST_ERROR): Replace by _tofu_GET_TRUST_ERROR macro.
+ (show_statistics): Undef MIN_SECS et al. after use.
+
+ common: Avoid warning about const char ** assignment.
+ * common/mkdir_p.c (gnupg_amkdir_p): Also strdup first item. Return
+ an error on malloc failure.
+ (gnupg_mkdir_p): Fix type of dirs and tmp_dirs.
+
+ Move http module from common/ to dirmngr/.
+ * common/http.c: Move to ../dirmngr/.
+ * common/http.h: Move to ../dirmngr/.
+ * common/t-http.c: Move to ../dirmngr/.
+ * common/tls-ca.pem: Move to ../dirmngr/.
+ * common/Makefile.am: Do not build libcommontls.a libcommontlsnpth.a.
+ Remove http.c related stuff.
+ * po/POTFILES.in: Move http.c to dirmngr/.
+ * dirmngr/Makefile.am (EXTRA_DIST): Add tls-ca.pem.
+ (module_maint_tests): New.
+ (noinst_PROGRAMS): Add module_maint_tests.
+ (dirmngr_SOURCES): Add http.c and http.h.
+ (dirmngr_LDADD): Remove libcommontlsnpth.
+ (t_common_ldadd): Ditto.
+ (t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
+ (t_ldap_parse_uri_SOURCES): Add http.c.
+ (t_ldap_parse_uri_CFLAGS): Build without npth.
+ ($(PROGRAMS)): Do not require libcommontls.a libcommontlsnpth.a.
+ * dirmngr/dirmngr.h, dirmngr/ks-engine.h: Fix include of http.h.
+
+2015-10-18 Neal H. Walfield <neal at g10code.com>
+
+ g10: Fix assert.
+ * g10/tofu.c (get_trust): Fix assert.
+
+ g10: Add TOFU support.
+ * configure.ac: Check for sqlite3.
+ (SQLITE3_CFLAGS): AC_SUBST it.
+ (SQLITE3_LIBS): Likewise.
+ * g10/Makefile.am (AM_CFLAGS): Add $(SQLITE3_CFLAGS).
+ (gpg2_SOURCES): Add tofu.h and tofu.c.
+ (gpg2_LDADD): Add $(SQLITE3_LIBS).
+ * g10/tofu.c: New file.
+ * g10/tofu.h: New file.
+ * g10/options.h (trust_model): Define TM_TOFU and TM_TOFU_PGP.
+ (tofu_db_format): Define.
+ * g10/packet.h (PKT_signature): Add fields digest and digest_len.
+ * g10/gpg.c: Include "tofu.h".
+ (cmd_and_opt_values): Declare aTOFUPolicy, oTOFUDefaultPolicy,
+ oTOFUDBFormat.
+ (opts): Add them.
+ (parse_trust_model): Recognize the tofu and tofu+pgp trust models.
+ (parse_tofu_policy): New function.
+ (parse_tofu_db_format): New function.
+ (main): Initialize opt.tofu_default_policy and opt.tofu_db_format.
+ Handle aTOFUPolicy, oTOFUDefaultPolicy and oTOFUDBFormat.
+ * g10/mainproc.c (do_check_sig): If the signature is good, copy the
+ hash to SIG->DIGEST and set SIG->DIGEST_LEN appropriately.
+ * g10/trustdb.h (get_validity): Add arguments sig and may_ask. Update
+ callers.
+ (tdb_get_validity_core): Add arguments sig and may_ask. Update
+ callers.
+ * g10/trust.c (get_validity) Add arguments sig and may_ask. Pass them
+ to tdb_get_validity_core.
+ * g10/trustdb.c: Include "tofu.h".
+ (trust_model_string): Handle TM_TOFU and TM_TOFU_PGP.
+ (tdb_get_validity_core): Add arguments sig and may_ask. If
+ OPT.TRUST_MODEL is TM_TOFU or TM_TOFU_PGP, compute the TOFU trust
+ level. Combine it with the computed PGP trust level, if appropriate.
+ * g10/keyedit.c: Include "tofu.h".
+ (show_key_with_all_names_colon): If the trust mode is tofu or
+ tofu+pgp, then show the trust policy.
+ * g10/keylist.c: Include "tofu.h".
+ (public_key_list): Also show the PGP stats if the trust model is
+ TM_TOFU_PGP.
+ (list_keyblock_colon): If the trust mode is tofu or
+ tofu+pgp, then show the trust policy.
+ * g10/pkclist.c: Include "tofu.h".
+ * g10/gpgv.c (get_validity): Add arguments sig and may_ask.
+ (enum tofu_policy): Define.
+ (tofu_get_policy): New stub.
+ (tofu_policy_str): Likewise.
+ * g10/test-stubs.c (get_validity): Add arguments sig and may_ask.
+ (enum tofu_policy): Define.
+ (tofu_get_policy): New stub.
+ (tofu_policy_str): Likewise.
+ * doc/DETAILS: Describe the TOFU Policy field.
+ * doc/gpg.texi: Document --tofu-set-policy, --trust-model=tofu,
+ --trust-model=tofu+pgp, --tofu-default-policy and --tofu-db-format.
+ * tests/openpgp/Makefile.am (TESTS): Add tofu.test.
+ (TEST_FILES): Add tofu-keys.asc, tofu-keys-secret.asc,
+ tofu-2183839A-1.txt, tofu-BC15C85A-1.txt and tofu-EE37CF96-1.txt.
+ (CLEANFILES): Add tofu.db.
+ (clean-local): Add tofu.d.
+ * tests/openpgp/tofu.test: New file.
+ * tests/openpgp/tofu-2183839A-1.txt: New file.
+ * tests/openpgp/tofu-BC15C85A-1.txt: New file.
+ * tests/openpgp/tofu-EE37CF96-1.txt: New file.
+ * tests/openpgp/tofu-keys.asc: New file.
+ * tests/openpgp/tofu-keys-secret.asc: New file.
+
+2015-10-16 Neal H. Walfield <neal at g10code.com>
+
+ common: Prefix the mkdir functions with gnupg_. Make args const.
+ * common/mkdir_p.h (mkdir_p): Rename from this...
+ (gnupg_mkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+ (amkdir_p): Rename from this...
+ (gnupg_amkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+ * common/mkdir_p.c (mkdir_p): Rename from this...
+ (gnupg_mkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+ (amkdir_p): Rename from this...
+ (gnupg_amkdir_p): ... to this. Change directory_component's type from
+ char * to const char *.
+
+2015-10-14 NIIBE Yutaka <gniibe at fsij.org>
+
+ cleanup: Fix confusion between gpg_error_t and gpg_err_code_t.
+ * dirmngr/crlcache.c (hash_dbfile): Use gpg_error_t for ERR.
+ * kbx/keybox-update.c (keybox_set_flags): Call
+ gpg_err_code_from_syserror.
+
+2015-10-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2015-10-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Try hard to use MDC also for sign+symenc.
+ * g10/encrypt.c (use_mdc): Make it a global func.
+ * g10/sign.c (sign_symencrypt_file): Use that function to decide
+ whether to use an MDC.
+ * tests/openpgp/conventional-mdc.test: Add a simple test case.
+
+2015-10-09 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.9.
+
+2015-10-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: simplify agent_get_passphrase.
+ * agent/call-pinentry.c (agent_get_passphrase): Simplify.
+
+ agent: fix agent_askpin.
+ * agent/call-pinentry.c (agent_askpin): Fix off-by-one error.
+
+ agent: Fix function return type for check_cb and agent_askpin.
+ * agent/call-pinentry.c (unlock_pinentry): Return gpg_error_t.
+ (start_pinentry, setup_qualitybar): Likewise.
+ (agent_askpin): Fix return value check of check_cb.
+ * agent/command-ssh.c (reenter_compare_cb): Return gpg_error_t.
+ (ssh_identity_register): Fix return value check of agent_askpin.
+ * agent/cvt-openpgp.c (try_do_unprotect_cb): Return gpg_error_t.
+ * agent/findkey.c (try_unprotect_cb): Likewise.
+ * agent/genkey.c (reenter_compare_cb): Return gpg_error_t.
+ (agent_ask_new_passphrase): Fix return value check of agent_askpin.
+
+2015-10-08 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Default to http protocol for http-proxy.
+ * common/http.c (send_request): Fix handling for hostname:port string.
+
+2015-10-08 Werner Koch <wk at gnupg.org>
+
+ common: Allow building of mkdir_p.c for Windows.
+ * common/mkdir_p.c: Change license and comment debug statements.
+ (amkdir_p, mkdir_p): Fail on malloc error and use default_errsource to
+ build an error code. Change return value to gpg_error_t.
+ (amkdir_p): Use gnupg_mkdir.
+
+ * common/membuf.c: Include util.h first to avoid redefined macro
+ warnings.
+
+ gpg: Add option --print-dane-records.
+ * g10/options.h (opt): Add field "print_dane_records".
+ * g10/gpg.c (oPrintDANERecords): new.
+ (opts): Add --print-dane-records.
+ (main): Set that option.
+ * g10/export.c (do_export): Remove EXPORT_DANE_FORMAT handling.
+ (do_export_stream): Add EXPORT_DANE_FORMAT handling.
+ * g10/keylist.c (list_keyblock_pka): Implement DANE record printing.
+
+ * g10/gpgv.c (export_pubkey_buffer): New stub.
+ * g10/test-stubs.c (export_pubkey_buffer): New stub.
+
+ gpg: Pass CTRL parameter to all key listing functions.
+ * g10/keylist.c (public_key_list): Add arg CTRL.
+ (secret_key_list): Ditto.
+ (list_all, list_one): Ditto.
+ (locate_one): Ditto.
+ (list_keyblock_pka): Ditto.
+ (list_keyblock): Ditto.
+ (list_keyblock_direct): Ditto.
+ * g10/keygen.c (proc_parameter_file): Add arg CTRL.
+ (read_parameter_file): Ditto.
+ (quick_generate_keypair): Ditto.
+ (do_generate_keypair): Ditto.
+ (generate_keypair): Pass arg CTRL.
+ * g10/gpg.c (main): Pass arg CTRL to quick_generate_keypair.
+
+2015-10-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove unfinished experimental code to export as S-expressions.
+ * g10/options.h (EXPORT_SEXP_FORMAT): Remove.
+ (EXPORT_DANE_FORMAT): New.
+ * g10/export.c (parse_export_options): Remove "export-sexp-format".
+ (export_seckeys): Adjust for removed option.
+ (export_secsubkeys): Ditto.
+ (do_export): Prepare for DANE format.
+ (build_sexp, build_sexp_seckey): Remove.
+ (do_export_stream): Remove use of removed functions.
+
+2015-10-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Add new --auto-key-locate mechanism "dane".
+ * g10/call-dirmngr.c (gpg_dirmngr_dns_cert): Allow fetching via DANE.
+ * g10/keyserver.c (keyserver_import_cert): Add arg "dane_mode".
+ * g10/options.h (AKL_DANE): New.
+ * g10/getkey.c (get_pubkey_byname): Implement AKL_DANE.
+ (parse_auto_key_locate): Ditto.
+
+ dirmngr: Addlow fetching keys using OpenPGP DANE.
+ * dirmngr/server.c (cmd_dns_cert): Add option --dane.
+
+ dirmngr: Improve DNS code to retrieve arbitrary records.
+ * dirmngr/dns-cert.c (get_dns_cert): Add hack to retrieve arbitrary
+ resource records.
+ * dirmngr/dns-cert.h (DNS_CERTTYPE_RRBASE): New.
+ (DNS_CERTTYPE_RR61): New.
+
+ dirmngr: Change DNS code to make additions easier.
+ * dirmngr/dns-cert.c (get_dns_cert) [!USE_ADNS]: Change loop to allow
+ adding more resource types.
+
+ dirmngr: Make commands RELOADDIRMNGR and KILLDIRMNGR work properly.
+ * dirmngr/server.c (cmd_killdirmngr): Set assuan close flag.
+ (cmd_reloaddirmngr): Use check_owner_permission.
+
+ dirmngr: Do tilde expansion for --hkp-cacert.
+ * dirmngr/dirmngr.c (parse_rereadable_options): Do tilde expansion and
+ check for cert file existance in option --hkp-cacert.
+
+ gpg: Fail decryption for AES etc message w/o MDC.
+ * g10/mainproc.c (proc_encrypted): Fail for modern messages w/o MDC.
+
+2015-10-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix verification of signature for smartcard.
+ * agent/pksign.c (agent_pksign_do): Use public key smartcard.
+
+ agent: Fix non-allocation for pinentry_loopback.
+ * agent/call-pinentry.c (agent_get_passphrase): Don't allocate, it will
+ be allocated by pinentry_loopback.
+
+2015-10-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Install a dirmngr.conf file.
+ * g10/dirmngr-conf.skel: New.
+ * g10/Makefile.am (EXTRA_DIST): Add file.
+ (install-data-local, uninstall-local): Install that file.
+ * g10/openfile.c (copy_options_file): Add arg "name", return a value,
+ simplify with xstrconcat, and factor warning message out to:
+ (try_make_homedir): here. Also install dirmngr.conf.
+ * g10/options.skel: Remove --keyserver entry.
+
+ gpg: Deprecate the --keyserver option.
+ * g10/keyserver.c (keyserver_refresh): Change return type to
+ gpg_error_t. Use gpg_dirmngr_ks_list to print the name of the
+ keyserver to use.
+ (keyserver_search): Do not print the "no keyserver" error
+ message. The same error is anyway returned from dirmngr.
+ * g10/call-dirmngr.c (ks_status_parm_s): Add field "keyword".
+ (ks_status_cb): Handle other status keywords.
+ (gpg_dirmngr_ks_list): New.
+ * tools/gpgconf-comp.c (gc_options_gpg): Deprecate "keyserver".
+ (gc_options_dirmngr): Add "Keyserver" group and "keyserver".
+
+ dirmngr: Add option --keyserver.
+ * dirmngr/dirmngr.c (oKeyServer): New.
+ (opts): Add "keyserver".
+ (parse_rereadable_options): Parse that options
+ (main): Add option to the gpgconf list.
+ * dirmngr/dirmngr.h (opt): Add field "keyserver".
+ * dirmngr/server.c (ensure_keyserver): New.
+ (make_keyserver_item): New. Factored out from
+ (cmd_keyserver): here. Call ensure_keyserver.
+ (cmd_ks_search): Call ensure_keyserver.
+ (cmd_ks_get): Ditto.
+ (cmd_ks_fetch): Ditto.
+ (cmd_ks_put): Ditto.
+
+ dirmngr: Make clear that --use-tor is not yet ready for use.
+ * dirmngr/dirmngr.c (main): Print a warning if --use-tor has been
+ given.
+ * tools/gpgconf-comp.c (gc_options_dirmngr): Make --use-tor invisible.
+
+ gpgconf: Change displayed name of Dirmngr to "Key Acquirer".
+ * tools/gpgconf-comp.c (gc_component): Change printed name.
+
+2015-10-02 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix use-after-free due to a realloc shrinking.
+ * dirmngr/ks-engine-hkp.c (map_host): Do not use original pointer
+ after realloc.
+
+ agent: Fix alignment problem with the second passphrase struct.
+ * agent/genkey.c (agent_ask_new_passphrase): Use a separate malloc for
+ PI2. Check return value of the malloc function.
+ * agent/command-ssh.c (ssh_identity_register): Use a separate malloc
+ for PI2. Wipe PI2.
+
+2015-10-01 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix a practical hang after use of --faked-system-time.
+ * g10/sign.c (update_keysig_packet): Bail out if we would need to long
+ for a new timestamp.
+
+ gpg: Print more info with "check selfsig".
+ * g10/keyedit.c (print_and_check_one_sig): Print more Some sigsub
+ packets.
+
+ gpg: Add debug helper to --edit-keys's check sub-command.
+ * g10/keyedit.c (print_and_check_one_sig): Add arg "extended" and
+ print an asterisk for the chosen selfsig.
+ (check_all_keysigs): Add arg "only_selfsig"
+ (keyedit_menu) <cmdCHECK>: Add optional arg "selfsig".
+
+2015-10-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: Fix strsplit.
+ * common/stringhelp.c (strsplit): Fix arguments order.
+
+2015-09-30 Neal H. Walfield <neal at g10code.com>
+
+ common: Add mkdir_p.
+ * common/mkdir_p.c: New file.
+ * common/mkdir_p.h: New file.
+ * common/Makefile.am (common_sources): Add mkdir_p.c and mkdir_p.h.
+
+ common: Remove unused files.
+ * common/xmalloc.c: Remove file.
+ * common/xmalloc.h: Remove file.
+
+ common: Include <gpg-error.h>.
+ * common/logging.h: Include <gpg-error.h>.
+
+2015-09-29 Neal H. Walfield <neal at g10code.com>
+
+ g10: Remove unused struct cmp_help_context_s.
+ * g10/sig-check.c (struct cmp_help_context_s) Remove unused struct.
+
+ g10: Avoid an unnecessary copy.
+ * g10/sig-check.c (signature_check2): Avoid copying PK to RET_PK.
+ Instead, directly use the provided storage. If none is provided
+ allocate some.
+
+2015-09-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ ssh: Fix fingerprint computation for EdDSA key.
+ * common/ssh-utils.c (get_fingerprint): Handle the prefix of 0x40.
+ * common/t-ssh-utils.c (sample_keys): Add a new key.
+
+ agent: RSA signature verification by gpg-agent.
+ * g10/sign.c (do_sign): Let verify signature by gpg-agent.
+ * agent/pksign.c (agent_pksign_do): Call gcry_pk_verify for RSA.
+
+2015-09-28 Werner Koch <wk at gnupg.org>
+
+ common: Provide two new error code replacements.
+ * common/util.h (GPG_ERR_FALSE, GPG_ERR_TRUE): Rew replcements.
+
+ common: Change calling convention for gnupg_spawn_process.
+ * common/exechelp.h (GNUPG_SPAWN_NONBLOCK): New.
+ (GNUPG_SPAWN_RUN_ASFW, GNUPG_SPAWN_DETACHED): Macro to replace the
+ numbers.
+ * common/exechelp.h (gnupg_spawn_process): Change function to not take
+ an optional stream for stdin but to return one.
+ * common/exechelp-posix.c (gnupg_spawn_process): Implement change.
+ (create_pipe_and_estream): Add args outbound and nonblock.
+ * common/exechelp-w32.c (gnupg_spawn_process): Implement change.
+
+2015-09-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Handle error correctly.
+ * scd/apdu.c (apdu_connect): Initialize variables and check an error
+ of apdu_get_status_internal.
+
+2015-09-22 Werner Koch <wk at gnupg.org>
+
+ ssh: Add 256, 384 and 521 bit test keys for the fingerprint.
+ * common/t-ssh-utils.c (sample_keys): Add 3 new keys.
+
+ ssh: Fix fingerprint computation for 384 bit ECDSA keys.
+ * common/ssh-utils.c (get_fingerprint): Fix hashed string.
+
+2015-09-19 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix importing ECC key.
+ * agent/cvt-openpgp.c (convert_from_openpgp_main): Only encrypted
+ parameters are stored as opaque.
+ (apply_protection): ARRAY members are all normal, non-opaque MPI.
+ (extract_private_key): Get public key as normal, non-opaque MPI.
+ Remove support of ECC key with '(flags param)'.
+ Remove support of "ecdsa" and "ecdh" keys of our experiment.
+
+ scd: Fix KEYTOCARD handling for ECC key.
+ * scd/app-openpgp.c (ecc_writekey): Only public key can be native
+ format.
+
+2015-09-19 Neal H. Walfield <neal at g10code.com>
+
+ common: Add new function strlist_length.
+ * common/strlist.c (strlist_length): New function.
+
+2015-09-18 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Change displayed name of Dirmngr to "Network Manager".
+ * tools/gpgconf-comp.c (gc_component): Change printed name.
+
+ dirmngr: Add option --use-tor as a stub.
+ * dirmngr/dirmngr.h (opt): Add field "use_tor".
+ * dirmngr/dirmngr.c (oUseTor): New.
+ (opts): Add --use-tor.
+ (parse_rereadable_options): Set option.
+ (main): Tell gpgconf about that option.
+
+ * dirmngr/crlfetch.c (crl_fetch): Pass TOR flag to the http module and
+ return an error if LDAP is used in TOR mode.
+ (ca_cert_fetch): Return an error in TOR mode.
+ (start_cert_fetch): Ditto.
+ * dirmngr/ks-engine-finger.c (ks_finger_fetch): Pass TOR flag to the
+ http module.
+ * dirmngr/ks-engine-hkp.c (send_request): Ditto.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+ * dirmngr/ks-engine-ldap.c (ks_ldap_get): Return an error in TOR mode.
+ (ks_ldap_search): Ditto.
+ (ks_ldap_put): Ditto.
+ * dirmngr/ocsp.c (do_ocsp_request): Ditto. Also pass TOR flag to the
+ http module.
+
+ * dirmngr/server.c (option_handler): Add "honor-keyserver-url-used".
+ (cmd_dns_cert): Return an error in TOR mode.
+ (cmd_getinfo): Add subcommand "tor"
+ * tools/gpgconf-comp.c (gc_options_dirmngr): Add TOR group.
+
+ gpg: Report a conflict between honor-keyserver-url and TOR.
+ * g10/call-dirmngr.c (create_context): Send option and print a verbose
+ error.
+
+ http: Add flag to force use of TOR (part 1)
+ * common/http.h (HTTP_FLAG_FORCE_TOR): New.
+ * common/http.c (http_raw_connect, send_request): Detect flag and
+ return an error for now.
+
+2015-09-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ scd: Fix ccid-driver timeout for OpenPGPcard v2.1.
+ * scd/ccid-driver.c (CCID_CMD_TIMEOUT): New.
+ (ccid_transceive_apdu_level, ccid_transceive): Use.
+
+2015-09-16 Werner Koch <wk at gnupg.org>
+
+ agent: New option --pinentry-invisible-char.
+ * agent/gpg-agent.c (oPinentryInvisibleChar): New.
+ (opts): Add option.
+ (parse_rereadable_options): Set option.
+ * agent/agent.h (opt): Add field pinentry_invisible_char.
+ * agent/call-pinentry.c (start_pinentry): Pass option to pinentry.
+
+ g13: Move some code to a separate module.
+ * g13/g13-common.c, g13/g13-common.h: New.
+ * g13/Makefile.am (g13_SOURCES): Add new files.
+ * g13/g13.c (g13_errors_seen): Move to g13-common.c.
+ (cmdline_conttype): New.
+ (main): Use g13_init_signals and g13_install_emergency_cleanup.
+ (emergency_cleanup, g13_exit): Move to g13-common.c.
+ * g13/g13.h: Move OPT and some other code to g13-common.h.
+
+ gpg: Fix skip function dummy parameter.
+ * g10/trustdb.c (search_skipfnc): Fix dummy argument
+
+ gpg: Change last commit to avoid extra translations.
+ * g10/keyedit.c (keyedit_menu): Do not print usage hints in expert
+ mode.
+
+2015-09-16 Neal H. Walfield <neal at g10code.com>
+
+ g10: Improve error message.
+ * g10/keyedit.c (keyedit_menu): When complaining that a user ID or key
+ must be selected, indicate what command to use to do this.
+
+ g10: Be more careful when merging self-signed data.
+ * g10/getkey.c (merge_selfsigs_main): Stop looking for self-signed
+ data belonging to the public key when we encounter an attribute packet
+ or a subkey packet, not just a user id packet. When looking for
+ self-signed data belonging to a user id packet, stop when we see a
+ user attribute packet.
+
+ g10: Simplify some complicated boolean expressions.
+ * g10/getkey.c (finish_lookup): Simplify logic.
+
+ g10: Also mark revoked and expired keys as unusable.
+ * g10/getkey.c (skip_unusable): Also mark the key as unusable if it
+ has been revoked or has expired.
+
+ g10: Release resources when returning an error in get_seckey.
+ * g10/getkey.c (get_seckey): If the key doesn't have a secret key,
+ release *PK.
+
+ g10: Improve documentation and comments for getkey.c.
+ * g10/getkey.c: Improve documentation and comments for most
+ functions. Move documentation for public functions from here...
+ * g10/keydb.h: ... to here.
+
+ g10: Remove unused function have_any_secret_key.
+ * g10/getkey.c (have_any_secret_key): Remove function.
+
+ g10: Bring cache semantics closer to non-cache semantics.
+ * g10/getkey.c (get_pubkey_fast): When reading from the cache, only
+ consider primary keys.
+
+ g10: Break out of the loop earlier.
+ * g10/getkey.c (have_secret_key_with_kid): Once we find the relevent
+ key or subkey, stop searching.
+
+ g10: Don't skip legacy keys if the search mode is KEYDB_SEARCH_MODE_NEXT
+ * g10/getkey.c (lookup): Also don't skip legacy keys if the search
+ mode is KEYDB_SEARCH_MODE_NEXT.
+
+ g10: Remove unused function get_seckeyblock_byfprint.
+ * g10/keydb.h (get_seckeyblock_byfprint): Remove prototype.
+ * g10/getkey.c (get_seckeyblock_byfprint): Remove function.
+
+ g10: Remove unused function get_seckey_byfprint.
+ * g10/keydb.h (get_seckey_byfprint): Remove prototype.
+ * g10/getkey.c (get_seckey_byfprint): Remove function.
+
+ g10: Simplify get_seckey_byname: it was never called with NAME not NULL.
+ * g10/keydb.h (get_seckey_byname): Rename from this...
+ (get_seckey_default): ... to this. Drop the parameter name. Update
+ users.
+ * g10/getkey.c (get_seckey_byname): Rename from this...
+ (get_seckey_default): ... to this. Drop the parameter name. Drop the
+ code which assumed that NAME is not NULL.
+
+ g10: Eliminate the redundant function get_keyblock_byfprint.
+ * g10/keydb.h (get_keyblock_byfprint): Remove prototype. Replace use
+ of this function with get_pubkey_byfprint.
+ * g10/getkey.c (get_pubkey_byname): Remove function.
+
+ g10: Simplify semantics of get_pubkey_byname.
+ * g10/getkey.c (get_pubkey_byname): If R_KEYBLOCK is not NULL, return
+ the keyblock in R_KEYBLOCK independent of whether PK is set or not.
+
+ g10: Eliminate the redundant function get_pubkey_byname.
+ * g10/getkey.c (get_pubkey_byname): Remove function.
+ (lookup): Replace use of get_pubkey_byname by get_pubkey_byfprint.
+
+ g10: Eliminate the redundant function get_pubkey_end.
+ * g10/keydb.h (get_pubkey_end): Remove declaration. Replace use of
+ function with getkey_end.
+ * g10/getkey.c (get_pubkey_byname): Remove function.
+
+ g10: Eliminate the redundant function get_pubkey_next.
+ * g10/keydb.h (get_pubkey_next): Remove prototype.
+ * g10/getkey.c (get_pubkey_next): Remove function.
+ * g10/keylist.c (locate_one): Use getkey_next instead of
+ get_pubkey_next.
+
+ kbx: Change skipfnc's prototype so that we can provide all information.
+ * kbx/keybox-search-desc.h (struct keydb_search_desc.skipfnc): Change
+ third parameter to be the index of the user id packet in the keyblock
+ rather than the packet itself. Update users.
+
+ g10: Remove unused prototype (get_pubkey_byfpr).
+ * g10/keydb.h (get_pubkey_byfpr): Remove unused prototype.
+
+ g10: Remove unused function (get_pubkey_bynames).
+ * g10/keydb.h (get_pubkey_bynames): Remove prototype.
+ * g10/getkey.c (get_pubkey_bynames): Remove function.
+
+ g10: Simplify code. Turn struct getkey_ctx_s.found_key into an argument
+ * g10/getkey.c (struct getkey_ctx_s): Remove field found_key.
+ (lookup): Add argument ret_found_key. If not NULL, set it to the
+ found key. Update callers.
+ (pk_from_block): Add argument found_key. Use it instead of
+ CTX->FOUND_KEY. Update callers.
+ (finish_lookup): Return a KBNODE (the found key) instead of an int.
+ Don't set CTX->FOUND_KEY. Return the found key instead.
+
+ g10: Remove unused field struct getkey_ctx_s.kbpos.
+ * g10/getkey.c (struct getkey_ctx_s): Remove field kbpos.
+ (getkey_end): Don't clear CTX->KBPOS.
+
+ g10: Simplify code: remove field struct getkey_ctx_s.keyblock.
+ * g10/getkey.c (struct getkey_ctx_s): Remove field keyblock.
+ (finish_lookup): Add parameter keyblock. Update caller to pass this.
+ (lookup): Add new local variable keyblock. Use this instead of
+ ctx->keyblock for referencing the keyblock.
+
+2015-09-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix registering SSH Key of Ed25519.
+ * agent/command-ssh.c (stream_read_string): Add the prefix of 0x40.
+
+2015-09-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2015-09-10 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.8.
+
+ tests: Silence the 5gb-packet test.
+ * tests/openpgp/4gb-packet.test: Send output to /dev/null.
+
+ g10: Fix make distcheck problem.
+ * g10/test.c: Include string.h.
+ (prepend_srcdir): New. Taken from Libgcrypt.
+ (test_free): New.
+ * g10/t-keydb.c (do_test): Malloc the filename.
+ * g10/Makefile.am (AM_CPPFLAGS): Remove -DSOURCE_DIR
+ (EXTRA_DIST): Add t-keydb-keyring.kbx.
+
+ g10: Improve portability of the new test driver.
+ * g10/test.c: Include stdio.h and stdlib.h.
+ (verbose): New.
+ (print_results): Rename to exit_tests.
+ (main): Remove atexit and call exit_tests. Set verbose.
+ (ASSERT, ABORT): Call exit_tests instead of exit.
+
+2015-09-09 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow sending much larger keyblocks.
+ * dirmngr/server.c (MAX_CERT_LENGTH): Increase to 16k.
+ (MAX_KEYBLOCK_LENGTH): Increase to 20M.
+
+2015-09-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Force key attribute change for writekey.
+ * scd/app-openpgp.c (change_rsa_keyattr): New.
+ (change_keyattr_from_string): Use change_rsa_keyattr.
+ (rsa_writekey): Call change_rsa_keyattr when different size.
+ (ecc_writekey): Try to change key attribute.
+
+ scd: KEYNO cleanup.
+ * scd/app-openpgp.c (get_public_key, send_keypair_info, do_readkey)
+ (change_keyattr, change_keyattr_from_string, ecc_writekey, do_genkey)
+ (compare_fingerprint, check_against_given_fingerprint): KEYNO starts
+ from 0.
+
+2015-09-02 Neal H. Walfield <neal at g10code.com>
+
+ g10: Remove unused field req_algo.
+ * g10/packet.h (PKT_public_key): Remove unused field req_algo. Remove
+ users.
+ * g10/getkey.c (struct getkey_ctx_s): Remove unused field req_algo.
+ Remove users.
+
+ g10: Use a symbolic constant instead of a literal.
+ * g10/trustdb.c (KEY_HASH_TABLE_SIZE): Define.
+ (new_key_hash_table): Use KEY_HASH_TABLE_SIZE instead of a literal.
+ (release_key_hash_table): Likewise.
+ (test_key_hash_table): Likewise.
+ (add_key_hash_table): Likewise.
+
+ g10: Add test for keydb as well as new testing infrastructure.
+ * g10/Makefile.am (EXTRA_DIST): Add test.c.
+ (AM_CPPFLAGS): Add -DSOURCE_DIR="\"$(srcdir)\"".
+ (module_tests): Add t-keydb.
+ (t_keydb_SOURCES): New variable.
+ (t_keydb_LDADD): Likewise.
+ * g10/t-keydb.c: New file.
+ * g10/t-keydb-keyring.kbx: New file.
+ * g10/test-stubs.c: New file.
+ * g10/test.c: New file.
+
+ g10: Make the keyblock cache per-handle rather than global.
+ * g10/keydb.c (keyblock_cache): Don't declare this variable. Instead...
+ (struct keyblock_cache): ... turn its type into this first class
+ object...
+ (struct keydb_handle): ... and instantiate it once per database
+ handle. Update all users.
+ (keydb_rebuild_caches): Don't invalidate the keyblock cache.
+
+ g10: If iobuf_seek fails when reading from the cache, do a hard read.
+ * g10/keydb.c (keydb_get_keyblock): If the iobuf_seek fails when
+ reading from the cache, then simply clear the cache and try reading
+ from the database.
+
+ iobuf: Reduce verbosity of test.
+ * common/t-iobuf.c (main): Reduce verbosity.
+
+ iobuf: Add the IOBUF_INPUT_TEMP type to improve input temp handling.
+ * common/iobuf.h (enum iobuf_use): Add new member, IOBUF_INPUT_TEMP.
+ * common/iobuf.c (iobuf_temp_with_content): Create the iobuf as an
+ IOBUF_INPUT_TEMP, not an IOBUF_INPUT buffer. Assert that LENGTH ==
+ A->D.SIZE.
+ (iobuf_push_filter2): If A is an IOBUF_INPUT_TEMP, then make the new
+ filter an IOBUF_INPUT filter and set its buffer size to
+ IOBUF_BUFFER_SIZE.
+ (underflow): If A is an IOBUF_INPUT_TEMP, then just return EOF; don't
+ remove already read data.
+ (iobuf_seek): If A is an IOBUF_INPUT_TEMP, don't discard the buffered
+ data.
+ (iobuf_alloc): Allow USE == IOBUF_INPUT_TEMP.
+ (pop_filter): Allow USE == IOBUF_INPUT_TEMP.
+ (iobuf_peek): Allow USE == IOBUF_INPUT_TEMP.
+ (iobuf_writebyte): Fail if USE == IOBUF_INPUT_TEMP.
+ (iobuf_write): Fail if USE == IOBUF_INPUT_TEMP.
+ (iobuf_writestr): Fail if USE == IOBUF_INPUT_TEMP.
+ (iobuf_flush_temp): Fail if USE == IOBUF_INPUT_TEMP.
+
+ iobuf: Rename IOBUF_TEMP to IOBUF_OUTPUT_TEMP.
+ * common/iobuf.h (enum iobuf_use): Rename IOBUF_TEMP to
+ IOBUF_OUTPUT_TEMP. Update users.
+
+ iobuf: Use a first-class enum.
+ * common/iobuf.h (enum iobuf_use): Name the IOBUF_OUTPUT, etc. enum.
+ (struct iobuf_struct): Change the field use's type to it.
+
+ iobuf: Fix test.
+ * common/t-iobuf.c (content_filter): If there is nothing to read,
+ don't forget to set *LEN to 0.
+ (main): Fix checks.
+
+2015-09-01 Werner Koch <wk at gnupg.org>
+
+ agent: Protect commit 135b1e3 against misbehaving Libgcrypt.
+ * agent/command-ssh.c (ssh_key_to_blob): Check DATALEN.
+
+ gpg: Remove option --no-sig-create-check.
+ * g10/gpg.c (opts): Remove --no-sig-create-check.
+ * g10/options.h (struct opt): Remove field no_sig_create_check.
+ * g10/sign.c (do_sign): Always check unless it is RSA and we are using
+ Libgcrypt 1.7.
+
+ common: Assume an utf-8 locale on iconv errors.
+ * common/utf8conv.c (handle_iconv_error): Use utf-8 as fallback.
+
+ common: Fix regression in building argpase.c standalone.
+ * common/argparse.c (is_native_utf8) [GNUPG_MAJOR_VERSION]: New.
+
+2015-08-31 Neal H. Walfield <neal at g10code.com>
+
+ g10: Don't leak memory if we fail to initialize a new database handle.
+ * g10/keydb.c (keydb_new): If we fail to open a keyring or keybox
+ correctly release all resources.
+
+ g10: Improve interface documentation of the keydb API.
+ * g10/keydb.c: Improve code comments and documentation of internal
+ interfaces. Improve documentation of public APIs and move that to...
+ * g10/keydb.h: ... this file.
+
+ g10: Don't cache search results if the search didn't scan the whole DB.
+ * g10/keydb.c (struct keydb_handle): Add new field is_reset.
+ (keydb_new): Initialize hd->is_reset to 1.
+ (keydb_locate_writable): Set hd->is_reset to 1.
+ (keydb_search): Set hd->is_reset to 0. Don't cache a key not found if
+ the search started from the beginning of the database.
+
+ g10: Have keydb_search_first call keydb_search_reset before searching.
+ * g10/keydb.c (keydb_search_first): Reset the handle before starting
+ the search.
+
+ g10: Remove unused parameter.
+ * g10/keydb.h (keydb_locate_writable): Remove unused parameter
+ reserved. Update users.
+
+2015-08-31 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix SSH public key for EdDSA.
+ * agent/command-ssh.c (ssh_key_to_blob): Remove the prefix 0x40.
+
+2015-08-26 Neal H. Walfield <neal at g10code.com>
+
+ g10: Simplify cache. Only include data that is actually used.
+ * g10/keydb.c (struct kid_list_s): Rename from this...
+ (struct kid_not_found_cache_bucket): ... to this. Update users.
+ Remove field state.
+ (kid_list_t): Remove type.
+ (KID_NOT_FOUND_CACHE_BUCKETS): Define. Use this instead of a literal.
+ (kid_found_table): Rename from this...
+ (kid_not_found_cache_bucket): ... to this. Update users.
+ (kid_found_table_count): Rename from this...
+ (kid_not_found_cache_count): ... to this. Update users.
+ (kid_not_found_p): Only return whether a key with the specified key id
+ is definitely not in the database.
+ (kid_not_found_insert): Remove parameter found. Update callers.
+ (keydb_search): Only insert a key id in the not found cache if it is
+ not found. Rename local variable once_found to already_in_cache.
+
+2015-08-25 Werner Koch <wk at gnupg.org>
+
+ Add configure option --enable-build-timestamp.
+ * configure.ac (BUILD_TIMESTAMP): Set to "<none>" by default.
+
+ gpg: Emit ERROR status for key signing failures.
+ * g10/keyedit.c (sign_uids): Write an ERROR status for a signing
+ failure.
+ (menu_adduid, menu_addrevoker, menu_revsig): Ditto.
+ (menu_revuid, menu_revkey, menu_revsubkey): Ditto.
+
+ gpg: Print a new FAILURE status after most commands.
+ * common/status.h (STATUS_FAILURE): New.
+ * g10/cpr.c (write_status_failure): New.
+ * g10/gpg.c (main): Call write_status_failure for all commands which
+ print an error message here.
+ * g10/call-agent.c (start_agent): Print an STATUS_ERROR if we can't
+ set the pinentry mode.
+
+2015-08-24 Neal H. Walfield <neal at g10code.com>
+
+ agent: Raise the maximum password length. Don't hard code it.
+ * agent/agent.h (MAX_PASSPHRASE_LEN): Define.
+ * agent/command-ssh.c (ssh_identity_register): Use it instead of a
+ hard-coded literal.
+ * agent/cvt-openpgp.c (convert_from_openpgp_main): Likewise.
+ * agent/findkey.c (unprotect): Likewise.
+ * agent/genkey.c (agent_ask_new_passphrase): Likewise.
+
+2015-08-24 Werner Koch <wk at gnupg.org>
+
+ sm: Support secret key export via the Assuan interface.
+ * sm/server.c (cmd_export): Add options --secret, --raw, and --pkcs12.
+
+2015-08-23 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow sending of Zack's key.
+ * dirmngr/server.c (MAX_KEYBLOCK_LENGTH): Increase to 1 MiB.
+
+ gpg: Fix regression in packet parser from Aug 19.
+ * g10/parse-packet.c (parse): Use an int to compare to -1. Use
+ buf32_to_ulong.
+
+ gpg: Show not found keys with --locate-key --verbose.
+ * g10/keylist.c (locate_one): Print a diagnostic for a not-found key.
+
+2015-08-21 Neal H. Walfield <neal at g10code.com>
+
+ common: Don't incorrectly reject 4 GB - 1 sized packets.
+ * g10/parse-packet.c (parse): Don't reject 4 GB - 1 sized packets.
+ Add the constraint that the type must be 63.
+ * kbx/keybox-openpgp.c (next_packet): Likewise.
+ * tests/openpgp/4gb-packet.asc: New file.
+ * tests/openpgp/4gb-packet.test: New file.
+ * tests/openpgp/Makefile.am (TESTS): Add 4gb-packet.test.
+ (TEST_FILES): Add 4gb-packet.asc.
+
+ common: Don't assume on-disk layout matches in-memory layout.
+ * g10/packet.h (PKT_signature): Change revkey's type from a struct
+ revocation_key ** to a struct revocation_key *. Update users.
+
+ common: Don't incorrectly copy packets with partial lengths.
+ * g10/parse-packet.c (parse): We don't handle copying packets with a
+ partial body length to an output stream. If this occurs, log an error
+ and abort.
+
+ common: Check parameters more rigorously.
+ * g10/parse-packet.c (dbg_copy_all_packets): Check that OUT is not
+ NULL.
+ (copy_all_packets): Likewise.
+
+ common: Don't continuing processing on error.
+ * g10/parse-packet.c (dbg_parse_packet): Also return if parse returns
+ an error.
+ (parse_packet): Likewise.
+ (dbg_search_packet): Likewise.
+ (search_packet): Likewise.
+
+ common: Better respect the packet's length when reading it.
+ * g10/parse-packet.c (parse_signature): Make sure PKTLEN doesn't
+ underflow. Be more careful that a read doesn't read more data than
+ PKTLEN says is available.
+
+2015-08-20 Werner Koch <wk at gnupg.org>
+
+ po: Add lost translation of validity strings.
+ * po/POTFILES.in (trust.c): Add missing file.
+ * po/de.po: Changed German validity strings.
+ * doc/help.de.txt: Ditto.
+
+2015-08-20 Neal H. Walfield <neal at g10code.com>
+
+ g10/parse-packet.c:parse: Try harder to not ignore an EOF.
+ * g10/parse-packet.c (parse): Be more robust: make sure to process any
+ EOF.
+
+ g10/parse-packet.c: Replace literal with symbolic expression.
+ * g10/parse-packet.c (dump_hex_line): Use sizeof rather than the
+ buffer's size.
+
+ Add documentation for g10/parse-packet.c.
+ * g10/packet.h: Add documentation for functions defined in
+ parse-packet.c.
+ * g10/parse-packet.c: Improve comments for many functions.
+
+ g10/packet.h: Remove unused argument from enum_sig_subpkt.
+ * g10/packet.h (enum_sig_subpkt): Remove argument RET_N. Update
+ callers.
+ * g10/parse-packet.c (enum_sig_subpkt): Remove argument RET_N.
+
+ g10/parse-packet.c:mpi_read: Detect EOF and correct boundary conditions.
+ * g10/parse-packet.c (mpi_read): Improve documentation. Correctly
+ handle an EOF. On overflow, correctly return the number of bytes read
+ from the pipeline.
+
+ common/iobuf.c: Make control flow more obvious.
+ * common/iobuf.c (iobuf_read): Make control flow more obvious.
+ (iobuf_get_filelength): Likewise.
+ (iobuf_get_fd): Likewise.
+ (iobuf_seek): Likewise.
+
+ common/iobuf.c: Add some sanity checks to catch programmer bugs.
+ * common/iobuf.c (iobuf_alloc): Check that BUFSIZE is not 0.
+ (iobuf_readbyte): Check that A is an input filter. Check that the
+ amount of read data is at most the amount of buffered data.
+ (iobuf_read): Check that A is an input filter.
+ (iobuf_writebyte): Check that A is not an input filter.
+ (iobuf_writestr): Check that A is not an input filter.
+ (iobuf_flush_temp): Check that A is not an input filter.
+
+ common/iobuf.c:iobuf_write_temp: Elide redundant code.
+ * common/iobuf.c (iobuf_write_temp): Don't repeat iobuf_flush_temp.
+ Use it directly.
+
+ common/iobuf.c: Have iobuf_writestr use iobuf_write, not iobuf_writebyte
+ * common/iobuf.c (iobuf_write): Don't write a byte at a time. Use
+ iobuf_write.
+
+ common/iobuf: Improve documentation and code comments.
+ common/iobuf.h: Improve documentation and code comments.
+ common/iobuf.c: Likewise.
+
+ common/iobuf.c: Adjust buffer size of filters in front of temp filters.
+ * common/iobuf.c (iobuf_push_filter2): If the head filter is a temp
+ filter, use IOBUF_BUFFER_SIZE for the new filter.
+
+ common/iobuf.c: Buffered data should not be processed by new filters.
+ * common/iobuf.c (iobuf_push_filter2): If the pipeline is an output or
+ temp pipeline, the new filter shouldn't assume ownership of the old
+ head's internal buffer: the data was written before the filter was
+ added.
+ * common/t-iobuf.c (double_filter): New function.
+ (main): Add test cases for the above bug.
+
+ common/iobuf.c: Flush the pipeline in iobuf_temp_to_buffer.
+ * common/iobuf.c (iobuf_temp_to_buffer): Flush each filter in the
+ pipeline and copy the data from the last (not the first) filter's
+ internal buffer.
+
+ common/iobuf.c: Combine iobuf_open, iobuf_create and iobuf_openrw.
+ * common/iobuf.c (do_open): New function, which is a generalization of
+ iobuf_open, iobuf_Create, iobuf_openrw.
+ (iobuf_open): Call do_open.
+ (iobuf_create): Likewise.
+ (iobuf_openrw): Likewise.
+
+ common/iobuf.h: Remove iobuf_open_fd_or_name.
+ * common/iobuf.h (iobuf_open_fd_or_name): Remove prototype. Replace
+ use with either iobuf_open or iobuf_fdopen_nc, as appropriate.
+ * common/iobuf.c (iobuf_open): Remove function.
+
+ common/iobuf.c: Rename iobuf_flush and make it a static function.
+ * common/iobuf.h (iobuf_flush): Remove prototype.
+ * common/iobuf.c (filter_flush): New static prototype.
+ (iobuf_flush): Rename...
+ (filter_flush): ... to this. Make static. Simplify code. Update
+ callers.
+
+ common/iobuf.c: Don't abort freeing a pipeline if freeing a filter fails
+ * common/iobuf.c (iobuf_cancel): Don't abort freeing a pipeline if
+ freeing a filter fails. This needs to a memory leak. Instead, keep
+ freeing and return the error code of the first filter that fails.
+
+ common/iobuf.c: Improve iobuf_peek.
+ * common/iobuf.c (underflow): Take additional parameter
+ clear_pending_eof. If not set, don't clear a pending eof when
+ returning EOF. Update callers.
+ (iobuf_peek): Fill the internal buffer, if needed, to be able to
+ better satisfy any request.
+
+ common/iobuf.c: When requested, fill the buffer even if it is not empty.
+ * common/iobuf.c (underflow): Don't require that the buffer be empty.
+ When called, fill any available space.
+
+ common/t-iobuf.c: Add a test case for multiple EOFs.
+ common/t-iobuf.c (main): Add a test case for multiple EOFs in an INPUT
+ pipeline.
+
+ common/iobuf.c: Better respect boundary conditions in iobuf_read_line.
+ * common/iobuf.c (iobuf_read_line): Be more careful with boundary
+ conditions.
+ * common/iobuf.h: Include <gpg-error.h>.
+ * common/t-iobuf.c: New file.
+ * common/Makefile.am (module_tests): Add t-iobuf.
+ (t_mbox_util_LDADD): New variable.
+
+ common/iobuf.c: Fix filter type for iobuf_temp_with_content.
+ * common/iobuf.c (iobuf_temp_with_content): Set the filter type to
+ IOBUF_INPUT, not IOBUF_TEMP, which is only for output filters that
+ write into a dynamic buffer.
+
+ common/iobuf.h: Remove unimplemented prototypes.
+ * common/iobuf.h (iobuf_unread): Remove unimplemented prototype.
+ (iobuf_clear_eof): Likewise.
+ (iobuf_append): Likewise.
+
+ common/iobuf.c: Refactor code to not need the desc field.
+ * common/iobuf.h (struct iobuf_struct): Remove field desc.
+ * common/iobuf.c (iobuf_desc): New function. When a filter's
+ description is needed, use this instead of the filter's desc field.
+
+ common/iobuf.h: Clarify semantics of nofast. Simplify implementation.
+ * common/iobuf.h (struct iobuf_struct): Clarify semantics of nofast.
+ Simplify use of nofast to implement just these semantics.
+
+ common/iobuf.c: Remove dead code (directfp).
+ * common/iobuf.h (struct iobuf_struct): Remove field directfp. Remove
+ all uses of it.
+
+ common/iobuf.c: Remove dead code (opaque).
+ * common/iobuf.h (struct iobuf_struct): Remove field opaque. Remove
+ all uses of it.
+
+ common/iobuf.h: Replace further use of literals with symbolic constants.
+ * common/iobuf.c: Move BLOCK_FILTER_INPUT,
+ BLOCK_FILTER_OUTPUT_BLOCK_FILTER_TEMP from here...
+ * common/iobuf.h: ... to here and rename to IOBUF_INPUT, IOBUF_OUTPUT
+ and IOBUF_TEMP, respectively. Where appropriate, use these macros
+ instead of a literal.
+
+2015-08-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid linking to Libksba.
+ * kbx/keybox.h (KEYBOX_WITH_X509): Do not define.
+ * sm/Makefile.am (AM_CPPFLAGS): Define it here.
+ (common_libs): Change to libkeybox509.a
+ * g10/Makefile.am (AM_CFLAGS): remove KSBA_CFLAGS.
+ (gpg2_LDADD, gpgv2_LDADD): Remove KSBA_LIBS
+ * kbx/Makefile.am (noinst_LIBRARIES): Add libkeybox509.a.
+ (libkeybox509_a_SOURCES): New.
+ (libkeybox_a_CFLAGS): New.
+ (libkeybox509_a_CFLAGS): New.
+ (kbxutil_CFLAGS): New.
+ * kbx/keybox-search.c (has_keygrip) [!KEYBOX_WITH_X509]: Declare args
+ as unused.
+
+2015-08-16 Ben Kibbey <bjk at luxsci.net>
+
+ Fix pinentry loopback and passphrase contraints.
+ * agent/command.c (cmd_get_passphrase): Don't repeat passphrase for
+ pinentry loopback mode.
+ * agent/genkey.c (check_passphrase_constraints): Immediately return when
+ pinentry mode is loopback.
+
+ Fix sending INQUIRE_MAXLEN for symmetric data.
+ * g10/passphrase.c (passphrase_to_dek_ext): Write the status message.
+
+2015-08-15 Ben Kibbey <bjk at luxsci.net>
+
+ Inform a user about inquire length limit.
+ * common/status.h (INQUIRE_MAXLEN): New.
+ * g10/call-agent.c (default_inquire_cb): Send STATUS_INQUIRE_MAXLEN.
+ client when inquiring a passphrase over pinentry-loopback.
+
+ Allow --gen-key to inquire a passphrase.
+ * g10/gpg.c (main): test for --command-fd during --gen-key parse.
+
+ When --command-fd is set then imply --batch to let gpg inquire a
+ passphrase rather than requiring a pinentry.
+
+2015-08-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.7.
+
+2015-08-10 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: fix ECC key handling.
+ * agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
+ (convert_transfer_key): CURVE is the name of curve.
+
+2015-08-08 Neal H. Walfield <neal at g10code.com>
+
+ common/iobuf.c: Replace use of literals with symbolic constants.
+ * common/iobuf.c (BLOCK_FILTER_INPUT): Define. Where appropriate, use
+ this instead of a literal.
+ (BLOCK_FILTER_OUTPUT): Likewise.
+ (BLOCK_FILTER_TEMP): Likewise.
+
+2015-08-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow gpgv to work with a trustedkeys.kbx file.
+ * g10/keydb.h (KEYDB_RESOURCE_FLAG_GPGVDEF): New.
+ * g10/keydb.c (keydb_add_resource): Take care of new flag.
+ * g10/gpgv.c (main): Use new flag.
+
+ agent: Add option --force to the DELETE_KEY command.
+ * agent/findkey.c (agent_delete_key): Add arg "force".
+ * agent/command.c (cmd_delete_key): Add option --force.
+
+ common: Change alias for Curve25519 to "cv25519".
+ * common/openpgp-oid.c (oidtable): Change alias.
+
+2015-08-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove duplicated printing of the curve name in "sub" lines.
+ * g10/keylist.c (list_keyblock_print): Do not print extra curve name.
+
+ gpg: Add commands "fpr *" and "grip" to --edit-key.
+ * g10/keyedit.c (cmdGRIP): New.
+ (cmds): Add command "grip".
+ (keyedit_menu) <cmdFPR>: Print subkeys with argument "*".
+ (keyedit_menu) <cmdGRIP>: Print keygrip.
+ (show_key_and_fingerprint): Add arg "with_subkeys".
+ (show_key_and_grip): New.
+ * g10/keylist.c (print_fingerprint): Add mode 4.
+
+ gpg: Adjust UID line indentation for common key algos.
+ * g10/keylist.c (list_keyblock_print): Change UID line indentation
+ * g10/mainproc.c (list_node): Ditto.
+
+2015-08-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ Curve25519 support.
+ * agent/cvt-openpgp.c (get_keygrip): Handle Curve25519.
+ (convert_secret_key, convert_transfer_key): Ditto.
+ * common/openpgp-oid.c (oidtable): Add Curve25519.
+ (oid_crv25519, openpgp_oid_is_crv25519): New.
+ * common/util.h (openpgp_oid_is_crv25519): New.
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Handle the case
+ with Montgomery curve which uses x-only coordinate.
+ * g10/keygen.c (gen_ecc): Handle Curve25519.
+ (ask_curve): Change the API and second arg is to return subkey algo.
+ (generate_keypair, generate_subkeypair): Follow chage of ask_curve.
+ * g10/keyid.c (keygrip_from_pk): Handle Curve25519.
+ * g10/pkglue.c (pk_encrypt): Handle Curve25519.
+ * g10/pubkey-enc.c (get_it): Handle the case with Montgomery curve.
+ * scd/app-openpgp.c (ECC_FLAG_DJB_TWEAK): New.
+ (send_key_attr): Work with general ECC, Ed25519, and Curve25519.
+ (get_public_key): Likewise.
+ (ecc_writekey): Handle flag_djb_tweak.
+
+ common: extend API of openpgp_oid_to_curve for canonical name.
+ * common/openpgp-oid.c (openpgp_oid_to_curve): Add CANON argument.
+ * common/util.h: Update.
+ * g10/import.c (transfer_secret_keys): Follow the change.
+ * g10/keyid.c (pubkey_string): Likewise.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Likewise.
+ * parse-packet.c (parse_key): Likewise.
+ * scd/app-openpgp.c (send_key_attr, get_public_key): Likewise.
+
+2015-08-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix ecc_oid.
+ * scd/app-openpgp.c (ecc_oid): Call with OIDBUF.
+
+ scd: Fix ECC support.
+ * scd/app-openpgp.c (send_key_attr): Send KEYNO.
+ (get_public_key): Fix SEXP composing.
+ (ecc_writekey): Fix OID length calculation.
+ (ecc_oid): Prepend the length before query.
+ (parse_algorithm_attribute): Handle the case the curve is not available.
+
+2015-08-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix duplicate key import due to legacy key in keyring.
+ * g10/keydb.c (keydb_search_fpr): Skip legacy keys.
+
+ gpg: Properly handle legacy keys while looking for a secret key.
+ * g10/getkey.c (have_secret_key_with_kid): Skip legacy keys.
+
+2015-07-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix endless loop for expired keys given by fpr.
+ * g10/getkey.c (lookup): Disable keydb caching when continuing a
+ search.
+
+2015-07-29 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not return "Legacy Key" from lookup if a key is expired.
+ * g10/getkey.c (lookup): Map GPG_ERR_LEGACY_KEY.
+
+ gpg: Indicate secret keys and cards in a key-edit listing.
+ * g10/keyedit.c (sign_uids): Add arg "ctrl".
+ (show_key_with_all_names_colon): Ditto.
+ (show_key_with_all_names): Ditto.
+
+ * g10/keyedit.c (show_key_with_all_names): Print key record
+ indicators by checking with gpg-agent.
+ (show_key_with_all_names): Ditto. May now also print sec/sbb.
+
+2015-07-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove the edit-key toggle command.
+ * g10/keyedit.c (cmds): Remove helptext from "toggle".
+ (keyedit_menu): Remove "toggle" var and remove the sub/pub check
+ against toggle.
+
+ common,w32: Avoid unused var warning about msgcache.
+ * common/i18n.c (USE_MSGCACHE): New.
+ (msgcache) [!USE_MSGCACHE]: Do not define.
+ (i18n_localegettext): Repalce #if conditions by USE_MSGCACHE.
+
+ w32: Try more places to find an installed Pinentry.
+ * common/homedir.c (get_default_pinentry_name): Re-implement to
+ support several choices for Windows.
+
+2015-07-26 Werner Koch <wk at gnupg.org>
+
+ scd: Fix size_t/unsigned int mismatch.
+ * scd/app-openpgp.c (ecc_writekey): Use extra var n.
+
+ Replace GNUPG_GCC_A_ macros by GPGRT_ATTR_ macros.
+ * common/util.h: Provide replacement for GPGRT_ATTR_ macros when using
+ libgpg-error < 1.20.
+ * common/mischelp.h: Ditto.
+ * common/types.h: Ditto.
+
+2015-07-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: support any curves defined by libgcrypt.
+ * g10/call-agent.h (struct agent_card_info_s): Add curve field.
+ * g10/call-agent.c (learn_status_cb): Use curve name.
+ * g10/card-util.c (card_status): Show pubkey name.
+ * scd/app-openpgp.c (struct app_local_s): Record OID and flags.
+ (store_fpr): Use ALGO instead of key type.
+ (send_key_attr): Use curve name instead of OID.
+ (get_public_key): Clean up by OID to curve name.
+ (ecc_writekey): Support any curves in libgcrypt.
+ (do_genkey, do_auth, ): Follow the change.
+ (ecc_oid): New.
+ (parse_algorithm_attribute): Show OID here.
+
+2015-07-23 Peter Wu <peter at lekensteyn.nl>
+
+ build: ignore scissor line for the commit-msg hook.
+ * build-aux/git-hooks/commit-msg: Stop processing more lines when the
+ scissor line is encountered.
+
+2015-07-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Format change to specify "rsa2048" for KEY-ATTR.
+ * g10/card-util.c (do_change_keysize): Put "rsa".
+ * scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
+ Change the command format.
+ (rsa_writekey): Check key type.
+ (do_writekey): Remove "ecdh" and "ecdsa" support which was available
+ in experimental libgcrypt before 1.6.0.
+
+2015-07-22 Werner Koch <wk at gnupg.org>
+
+ Avoid a leading double slash in make_filename.
+ * common/stringhelp.c (do_make_filename): Special case leading '/'.
+
+2015-07-21 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: change_keyattr_from_string for ECC.
+ * scd/app-openpgp.c (change_keyattr, change_keyattr_from_string):
+ Support ECC.
+ (rsa_writekey): Don't change key attribute.
+
+2015-07-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Use openpgpdefs.h for constants.
+ * scd/app-openpgp.c: Include openpgpdefs.h.
+
+2015-07-16 Neal H. Walfield <neal at g10code.com>
+
+ Don't segfault if the first 'auto-key-locate' option is 'clear'.
+ * g10/getkey.c (free_akl): If AKL is NULL, just return.
+
+2015-07-10 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Support non-NLS build.
+ * agent/agent.h: Use ENABLE_NLS and define L_() macro.
+
+2015-07-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Remove unused files.
+ * scd/Makefile.am (sc_copykeys_*): Remove.
+ * scd/sc-copykeys.c: Remove.
+ * scd/pcsc-wrapper.c: Remove.
+ * scd/{card-common.h,card-dinsig.c,card-p15.c,card.c}: Remove.
+
+2015-07-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Use canonical name for curve.
+ * g10/import.c (transfer_secret_keys): Use canonical name.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Return NULL on error.
+ * g10/keyid.c (pubkey_string): Follow change of openpgp_curve_to_oid.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
+ * g10/parse-packet.c (parse_key): Ditto.
+
+2015-07-03 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ drop long-deprecated gpgsm-gencert.sh.
+ * tools/gpgsm-gencert.sh: remove deprecated script entirely. It is
+ fully replaced by gpgsm --gen-key
+ * doc/tools.texi: remove gpgsm-gencert.sh documentation
+ * .gitignore: no longer ignore gpgsm-gencert.sh manpage
+ * doc/Makefile.am: quit making the manpage
+ * tools/Makefile.am: quit distributing the script
+ * doc/howto-create-a-server-cert.texi: overhaul documentation to use
+ gpgsm --gen-key and tweak explanations
+
+2015-07-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+ scd: Support AES decryption for OpenPGPcard v3.0.
+ * scd/app-openpgp.c (do_decipher): Support AES decryption.
+
+2015-07-01 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.6.
+
+2015-07-01 Daiki Ueno <ueno at gnu.org>
+
+ agent: Unset INSIDE_EMACS on gpg-agent startup.
+ * agent/gpg-agent.c (main): Unset INSIDE_EMACS envvar.
+
+2015-07-01 Werner Koch <wk at gnupg.org>
+
+ common: Implement i18n_localegettext.
+ * common/i18n.c (msg_cache_s, msg_cache_head_s): New.
+ (msgcache): New.
+ (i18n_localegettext): Implement locale dependent lookup.
+
+2015-06-30 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Pass DBUS_SESSION_BUS_ADDRESS for gnome3.
+ * common/session-env.c (stdenvnames): Add DBUS_SESSION_BUS_ADDRESS.
+
+2015-06-30 Werner Koch <wk at gnupg.org>
+
+ Flag the L_() function with attribute format_arg.
+ * agent/agent.h (LunderscorePROTO): New.
+ * common/util.h (GNUPG_GCC_ATTR_FORMAT_ARG): New.
+ * common/i18n.h (GNUPG_GCC_ATTR_FORMAT_ARG): New. Use for
+ i18n_localegettext. Expand LunderscorePROTO.
+ * agent/genkey.c (check_passphrase_constraints): Use xtryasprintf
+ again to keep the old translations.
+
+ agent: Use different translation func for Pinentry strings.
+ * po/Makevars (XGETTEXT_OPTIONS): Add keyword "L_".
+ * common/i18n.c (i18n_localegettext): New stub.
+ * common/i18n.h: Expand the LunderscoreIMPL macro.
+ * agent/agent.h (L_): New.
+ (LunderscoreIMPL): New.
+ * agent/call-pinentry.c (setup_qualitybar): Add arg ctrl anc change
+ caller.
+ * agent/findkey.c (try_unprotect_cb): Add local var ctrl.
+ * agent/genkey.c (check_passphrase_constraints): Replace xtryasprintf
+ by xtrystrdup to avoid gcc warning. Unfortinately this changes the
+ string.
+ (agent_ask_new_passphrase): Cleanup the use of initial_errtext.
+
+ gpg: Make show-sig-subpackets work again.
+ * g10/gpg.c (parse_list_options): Fix offset for subpackets.
+
+2015-06-29 Werner Koch <wk at gnupg.org>
+
+ agent: Prepare for Libassuan with Cygwin support.
+ * agent/gpg-agent.c (create_server_socket): Add arg "cygwin". Call
+ assuan_sock_set_flag if Assuan version is recent enough.
+ (main): Create ssh server socket with Cygwin flag set.
+
+2015-06-29 Neal H. Walfield <neal at gnu.org>
+
+ Show passphrase constraints errors as password prompt errors.
+ * agent/agent.h (check_passphrase_constraints): Add parameter
+ failed_constraint and remove parameter silent. Update callers.
+ * agent/genkey.c (check_passphrase_constraints): Add parameter
+ failed_constraint and remove parameter silent. If FAILED_CONSTRAINT
+ is not NULL and OPT.ENFORCE_PASSPHRASE_CONSTRAINTS is FALSE, save the
+ error text in *FAILED_CONSTRAINT and don't call take_this_one_anyway
+ or take_this_one_anyway2. If FAILED_CONSTRAINT is NULL, act as if
+ SILENT was set.
+ (agent_ask_new_passphrase): Change initial_errtext's type from a const
+ char * to a char *. Pass it to check_passphrase_constraints. If it
+ contains malloc's memory, free it.
+
+2015-06-29 Neal H. Walfield <neal at g10code.com>
+
+ Improve documentation for default-cache-ttl and default-cache-ttl-ssh.
+ * doc/gpg-agent.texi (Agent Options): Improve documentation for
+ default-cache-ttl and default-cache-ttl-ssh.
+
+ Don't raise max-cache-ttl to default-cache-ttl.
+ * agent/gpg-agent.c (finalize_rereadable_options): Don't raise
+ max-cache-ttl to default-cache-ttl. Likewise for max-cache-ttl-ssh
+ and default-cache-ttl-ssh.
+
+ Improve the description of old packets with an indeterminate length.
+ * g10/parse-packet.c (parse): Make the description more accurate when
+ listing packets: old format packets don't support partial lengths,
+ only indeterminate lengths (RFC 4880, Section 4.2).
+
+2015-06-29 Werner Koch <wk at gnupg.org>
+
+ agent: Add --verify to the PASSWD command.
+ * agent/command.c (cmd_passwd): Add option --verify.
+
+ agent,w32: Do not create a useless socket with --enable-putty-support.
+ * agent/agent.h (opt): Remove field ssh_support.
+ * agent/gpg-agent.c (ssh_support): New. Replace all opt.ssh_support
+ by this.
+ (main): Do not set ssh_support along with setting putty_support.
+
+ gpgsm: Add command option "offline".
+ * sm/server.c (option_handler): Add "offline".
+ (cmd_getinfo): Ditto.
+ * sm/certchain.c (is_cert_still_valid):
+ (do_validate_chain):
+ * sm/gpgsm.c (gpgsm_init_default_ctrl): Default "offline" to the value
+ of --disable-dirmngr.
+ * sm/call-dirmngr.c (start_dirmngr_ext): Better also check for
+ ctrl->offline.
+
+2015-06-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Support button flag and AES key data for OpenPGPcard v3.0.
+ * scd/app-openpgp.c (do_getattr, show_caps, app_select_openpgp):
+ Support button and symmetric decryption.
+ (do_setattr): Support setting AESKEY.
+
+2015-06-25 Andre Heinecke <aheinecke at intevation.de>
+
+ sm: Fix cert storage for ephemeral certs.
+ * sm/keydb.c (keydb_store_cert): Clear ephemeral flag for
+ existing certs if store should not be ephemeral.
+
+2015-06-23 Werner Koch <wk at gnupg.org>
+
+ Allow use of debug flag names for all tools.
+ * g13/g13.c: Make use of debug_parse_flag.
+ * scd/scdaemon.c: Ditto.
+ * sm/gpgsm.c: Ditto
+ * agent/gpg-agent.c: Ditto. But do not terminate on "help"
+ * dirmngr/dirmngr.c: Ditto.
+
+ common: Improve fucntion parse_debug_flag.
+ * common/miscellaneous.c (parse_debug_flag): Add hack not to call
+ exit. Add "none" and "all" flags.
+
+2015-06-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: pinpad workaround for PC/SC implementations.
+ * scd/adpu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Bigger buffer
+ for TPDU card reader.
+
+2015-06-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow debug flag names for --debug.
+ * g10/gpg.c (opts): Change arg for oDebug to a string.
+ (debug_flags): New; factored out from set_debug.
+ (set_debug): Remove "--debug-level help". Use parse_debug_flag to
+ print the used flags.
+ (main): Use parse_debug_flag for oDebug.
+
+ common: Add function parse_debug_flag.
+ * common/miscellaneous.c (parse_debug_flag): New.
+ * common/util.h (struct debug_flags_s): New.
+
+ common: Add function strtokenize.
+ * common/stringhelp.c: Include assert.h.
+ (strtokenize): New.
+ * common/t-stringhelp.c (test_strtokenize): New.
+
+ gpg: Fix regression due to recent commit 6500f33.
+ * g10/keydb.c (kid_list_s): Keep a state in the table.
+ (kid_not_found_table): Rename to kid_found_table.
+ (n_kid_not_found_table): Rename to kid_found_table_count.
+ (kid_not_found_p): Return found state.
+ (kid_not_found_insert): Add arg found.
+ (keydb_search): Store found state in the table.
+
+2015-06-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix Cherry ST-2000 support for pinpad input.
+ * scd/apdu.c (pcsc_vendor_specific_init): Set pinmax to 15.
+ * scd/ccid-driver.c (ccid_transceive_secure): Add zero for the
+ template of APDU.
+
+2015-06-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Print number of good signatures with --check-sigs.
+ * g10/keylist.c (keylist_context): Add field good_sigs.
+ (list_keyblock_print): Updated good_sigs.
+ (print_signature_stats): Print number of good signatures and use
+ log_info instead of tty_printf.
+
+ gpg: Improve speed of --check-sigs and --lish-sigs.
+ * g10/keydb.c (kid_list_t): New.
+ (kid_not_found_table, n_kid_not_found_table): New.
+ (kid_not_found_p, kid_not_found_insert, kid_not_found_flush): New.
+ (keydb_insert_keyblock): Flush the new cache.
+ (keydb_delete_keyblock): Ditto.
+ (keydb_update_keyblock): Ditto.
+ (keydb_search): Use the new cache.
+ (keydb_dump_stats): New.
+ * g10/gpg.c (g10_exit): Dump keydb stats.
+
+2015-06-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Add more log_clock calls to keydb.c.
+ * g10/keydb.c (keydb_get_keyblock): Add log_clock calls.
+
+ gpg: Print available debug flags using "--debug-level help".
+ * g10/gpg.c (set_debug): Add "help" option and use a table for the
+ flags.
+
+ gpg: Fix export problem in case an old keyring has PGP-2 keys.
+ * g10/export.c (do_export_stream): Skip legacy keys.
+
+2015-06-18 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix the cleanup zombies fix (685b782).
+ * dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Do not close the
+ stdout reader after EOF from read_log_data.
+ * dirmngr/crlcache.c (crl_cache_reload_crl): Close the reader before
+ the next iteration.
+
+2015-06-17 Werner Koch <wk at gnupg.org>
+
+ agent: Print a warning for obsolete options.
+ * g10/misc.c (obsolete_scdaemon_option): Move to
+ * common/miscellaneous.c (obsolete_option): ... here.
+ * agent/gpg-agent.c (main): Use obsolete_option for the 3 obsolete
+ options.
+
+2015-06-16 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Cleanup zombies and fix hang on shutdown.
+ * dirmngr/ldap-wrapper.c (ldap_wrapper_thread): Move nfds computation
+ into the loop. Check the queue also on timeout. Close log_fd and
+ reader context on EOF or error.
+
+ dirmngr: Avoid accessing uninitialized memory in log callback.
+ * dirmngr/dirmngr.c (pid_suffix_callback): Clear int_and_ptr_u before
+ use.
+ (start_connection_thread): Ditto.
+ (handle_connections): Ditto.
+
+2015-06-16 Neal H. Walfield <neal at g10code.com>
+
+ Don't prompt for the password multiple times in pinentry loopback mode.
+ * g10/gpg.c (main): If OPT.PINENTRY_MODE is PINENTRY_MODE_LOOPBACK,
+ clear OPT.PASSPHRASE_REPEAT.
+
+2015-06-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese Translation.
+
+2015-06-15 Werner Koch <wk at gnupg.org>
+
+ doc: Add defs.inc to BUILT_SOURCES.
+
+2015-06-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.5.
+
+ agent: Fix --extra-socket on Windows.
+ * agent/gpg-agent.c (start_connection_thread): Rename to ...
+ (do_start_connection_thread): this. Factor nonce checking out to ...
+ (start_connection_thread_std): this,
+ (start_connection_thread_extra): this,
+ (start_connection_thread_browser): and this.
+
+ agent: Add experimental option --browser-socket.
+ * agent/agent.h (opt): Add field "browser_socket".
+ * agent/command.c (cmd_setkeydesc): Use a different message for
+ restricted==2.
+ * agent/gpg-agent.c (oBrowserSocket): New.
+ (opts): Add --browser-socket.
+ (socket_name_browser, redir_socket_name_browser): New.
+ (socket_nonce_browser): New.
+ (cleanup): Cleanup browser socket.
+ (main): Implement option.
+ (start_connection_thread_browser): New.
+ (handle_connections): Add arg listen_fd_browser and use it.
+
+2015-06-10 Daiki Ueno <ueno at gnu.org>
+
+ agent: Add option --allow-emacs-pinentry.
+ * agent/agent.h (opt): Add field allow_emacs_pinentry.
+ * agent/call-pinentry.c (start_pinentry): Act upon new var.
+ * agent/gpg-agent.c (oAllowEmacsPinentry): New.
+ (opts): Add option --allow-emacs-pinentry.
+ (parse_rereadable_options): Set this option.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add new option.
+
+2015-06-09 Werner Koch <wk at gnupg.org>
+
+ doc: Do not used fixed file names in the manuals.
+ * doc/mkdefsinc.c: New.
+ * doc/Makefile.am: Include cmacros.am.
+ (EXTRA_DIST): Add mkdefsinc.c defsincdate.
+ (BUILT_SOURCES): Add defsincdate
+ (CLEANFILES): Add mkdefsinc and defs.inc.
+ (mkdefsinc): New rule.
+ (yat2m-stamp): Depend on defs.inc.
+ ($(myman_pages) gnupg.7): Ditto.
+ (gnupg.texi): Remove rule to touch itself.
+ (dist-hook): New.
+ (defsincdate): New.
+ (defs.inc): New.
+ * doc/gnupg.texi: Remove inclusion of version.texi. Include defs.inc.
+ Also include defs.inc in all files used to build man files. Change
+ fixed directory names to those from defs.inc.
+
+ dirmngr: Avoid crash due to an empty crls.d/DIR.txt.
+ * dirmngr/crlcache.c (check_dir_version): Avoid segv.
+
+2015-06-08 Werner Koch <wk at gnupg.org>
+
+ doc: Change the manual source to be only for GnuPG 2.1.
+
+ Convey envvar INSIDE_EMACS to the pinentry.
+ * common/session-env.c (stdenvnames): Add it.
+
+ agent: Add command "getinfo std_env_names".
+ * agent/command.c (cmd_getinfo): Add new sub-command.
+
+2015-06-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: do_decipher change for OpenPGPcard v3.0.
+ * scd/app-openpgp.c (do_decipher): Add a header for ECDH.
+
+2015-06-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Replace -1 by GPG_ERR_NOT_FOUND in tdbio.c.
+ * g10/tdbio.c (lookup_hashtable): Return GPG_ERR_NOT_FOUND.
+ * g10/tdbdump.c (import_ownertrust): Test for GPG_ERR_NOT_FOUND.
+ * g10/trustdb.c (read_trust_record): Ditto.
+ (tdb_get_ownertrust, tdb_get_min_ownertrust): Ditto.
+ (tdb_update_ownertrust, update_min_ownertrust): Ditto.
+ (tdb_clear_ownertrusts, update_validity): Ditto.
+ (tdb_cache_disabled_value): Ditto.
+
+ gpg: Cleanup error code path in case of a bad trustdb.
+ * g10/tdbio.c (tdbio_read_record): Fix returning of the error.
+
+ gpg: Fix output in case of a corrupted trustdb.
+ * g10/tdbdump.c (list_trustdb): Add arg FP and change callers to pass
+ es_stdout.
+ * g10/tdbio.c (upd_hashtable): On a corrupted trustdb call
+ list_trustdb only in verbose > 1 mode and let it dump to stderr.
+
+2015-05-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix key template of ECC.
+ * scd/app-openpgp.c (build_ecc_privkey_template): Use correct value.
+
+2015-05-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix a race condition initially creating trustdb.
+ * g10/tdbio.c (take_write_lock, release_write_lock): New.
+ (put_record_into_cache, tdbio_sync, tdbio_end_transaction): Use
+ new lock functions.
+ (tdbio_set_dbname): Fix the race.
+ (open_db): Don't call dotlock_create.
+
+2015-05-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Remove g10/signal.c.
+ * g10/signal.c: Remove.
+ * g10/main.h: Remove old function API.
+ * g10/tdbio.c: Use new API, even in the dead code.
+
+2015-05-20 Werner Koch <wk at gnupg.org>
+
+ agent: Cleanup caching code for command GET_PASSPHRASE.
+ * agent/command.c (cmd_get_passphrase): Read from the user cache.
+
+2015-05-19 Neal H. Walfield <neal at g10code.com>
+
+ agent: When the password cache is cleared, also clear the ext. cache.
+ * agent/agent.h (agent_clear_passphrase): New declaration.
+ * agent/call-pinentry.c (agent_clear_passphrase): New function.
+ * agent/command.c (cmd_clear_passphrase): Call agent_clear_passphrase.
+
+ agent: Modify agent_clear_passphrase to support an ext. password cache.
+ * agent/agent.h (agent_get_passphrase): Add arguments keyinfo and
+ cache_mode. Update callers.
+ * agent/call-pinentry.c (agent_get_passphrase): Add arguments keyinfo
+ and cache_mode. If KEYINFO and CACHE_MODE describe a cachable key,
+ then send SETKEYINFO to the pinentry.
+
+2015-05-19 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: detects public key encryption packet error properly.
+ g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for
+ encryption.
+
+2015-05-15 Werner Koch <wk at gnupg.org>
+
+ build: Make --disable-gpgsm work.
+ * Makefile.am: Always build kbx/
+ * g10/Makefile.am (AM_CFLAGS): Include KSBA_CFLAGS.
+
+2015-05-12 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.4.
+
+ speedo: Add make option SELFCHECK=0 to build a new release.
+ * build-aux/getswdb.sh: Add option --skip-selfcheck.
+ * build-aux/speedo.mk: Add option SELFCHECK.
+
+2015-05-11 Werner Koch <wk at gnupg.org>
+
+ common: Cope with AIX problem on number of open files.
+ * common/exechelp-posix.c: Limit returned value for too hight values.
+
+ gpg-connect-agent: Fix quoting of internal percent+ function.
+ * tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also
+ escape '+'.
+
+ agent: Add option --no-allow-external-cache.
+ * agent/agent.h (opt): Add field allow_external_cache.
+ * agent/call-pinentry.c (start_pinentry): Act upon new var.
+ * agent/gpg-agent.c (oNoAllowExternalCache): New.
+ (opts): Add option --no-allow-external-cache.
+ (parse_rereadable_options): Set this option.
+
+ agent: Add strings for use by future Pinentry versions.
+ * agent/call-pinentry.c (start_pinentry): Add more strings.
+
+ agent: Add option --debug-pinentry.
+ * agent/gpg-agent.c (oDebugPinentry): New.
+ (opts): Add --debug-pinentry.
+ (parse_rereadable_options): Set that option.
+ * agent/call-pinentry.c (start_pinentry): Pass option to
+ assuan_set_flag.
+
+2015-05-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid cluttering stdout with trustdb info in verbose mode.
+ * g10/trustdb.c (validate_keys): Call dump_key_array only in debug
+ mode.
+
+ gpg: Fix wrong output in list mode.
+ * g10/parse-packet.c (parse_gpg_control): Replace puts by es_fputs to
+ LISTFP.
+
+ gpg: New command --quick-adduid.
+ * g10/keygen.c (ask_user_id): Factor some code out to ...
+ (uid_already_in_keyblock): new.
+ (generate_user_id): Add arg UIDSTR. Fix leaked P.
+ * g10/keyedit.c (menu_adduid): Add new arg uidstring. Adjust caller.
+ (keyedit_quick_adduid): New.
+ * g10/gpg.c (aQuickAddUid): New.
+ (opts): Add command --quick-adduid.
+ (main): Implement that.
+
+ gpg: Add push/pop found state feature to keydb.
+ * g10/keydb.c (keydb_handle): Add field saved_found.
+ (keydb_new): Init new field.
+ (keydb_push_found_state, keydb_pop_found_state): New.
+ * g10/keyring.c (kyring_handle): Add field saved_found.
+ (keyring_push_found_state, keyring_pop_found_state): New.
+
+ gpg: Minor code merging in keyedit.
+ * g10/keyedit.c (fix_keyblock): Rename to fix_key_signature_order.
+ (fix_keyblock): New. Call fix_key_signature_order and other fix
+ functions.
+ (keyedit_menu): Factor code out to new fix_keyblock.
+ (keyedit_quick_sign): Ditto. Check for primary fpr before calling
+ fix_keyblock.
+
+2015-05-07 Werner Koch <wk at gnupg.org>
+
+ agent: Minor change for 56b5c9f.
+ * agent/call-pinentry.c (agent_askpin): Move option setting to ...
+ (start_pinentry): here. Fix error code check.
+
+2015-05-07 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ dirmngr: Fix segfault in ldap engine.
+ (ks-engine-ldap.c) Fix segfault caused by missing check whether uri is
+ initialized
+
+2015-05-07 Neal H. Walfield <neal at g10code.com>
+
+ agent: Improve support for externally cached passwords.
+ * agent/call-pinentry.c (PINENTRY_STATUS_PASSWORD_FROM_CACHE): New
+ constant.
+ (pinentry_status_cb): Add it to *FLAGS if PASSWORD_FROM_CACHE was
+ provided.
+ (agent_askpin): Pass "OPTION allow-external-password-cache" to the
+ pinentry. Always pass SETKEYINFO to the pinentry. If there is no
+ stable identifier, then use "--clear". If the password is incorrect
+ and PINENTRY_STATUS_PASSWORD_FROM_CACHE is set in *PINENTRY_STATUS,
+ then decrement PININFO->FAILED_TRIES.
+
+ agent: Or in the value; don't overwrite the variable.
+ * agent/call-pinentry.c (pinentry_status_cb): Or in
+ PINENTRY_STATUS_CLOSE_BUTTON; don't overwrite *FLAG.
+
+ agent: Avoid magic numbers. Use more accurate names.
+ * agent/call-pinentry.c (PINENTRY_STATUS_CLOSE_BUTTON): New constant.
+ (PINENTRY_STATUS_PIN_REPEATED): Likewise.
+ (close_button_status_cb): Rename from this...
+ (pinentry_status_cb): ... to this. Use the constants.
+ (agent_askpin): Rename local variable from close_button to
+ pinentry_status. Use symbolic constants rather than magic numbers.
+
+2015-05-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve 'General key info' line of --card-status.
+ * g10/keylist.c (print_pubkey_info): Print either "pub" or "sub".
+
+ * g10/getkey.c (get_pubkey_byfprint): Add optional arg R_KEYBLOCK.
+ * g10/keyid.c (keyid_from_fingerprint): Adjust for change.
+ * g10/revoke.c (gen_desig_revoke): Adjust for change.
+ * g10/card-util.c (card_status): Simplify by using new arg. Align
+ card-no string.
+
+ * g10/card-util.c (card_status): Remove not used GnuPG-1 code.
+
+ gpg: Fix regression not displaying the card serial number.
+ * g10/call-agent.c (keyinfo_status_cb): Detect KEYINFO.
+
+2015-05-06 Werner Koch <wk at gnupg.org>
+
+ speedo,w32: Install a native pinentry.
+ * build-aux/speedo.mk: Always build pinentry for w32.
+ (speedo_pkg_pinentry_configure): Adjust to modern pinentry.
+ * build-aux/speedo/w32/inst.nsi: Install native pinentry under the
+ name pinentry-basic.exe.
+
+2015-05-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: fix cmp_public_key.
+ * g10/free-packet.c (cmp_public_keys): Compare opaque
+ data at the first entry of the array when it's unknown algo.
+
+2015-04-30 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC reader selection by partial string match.
+ * scd/apdu.c (open_pcsc_reader_direct): Partial string match.
+
+2015-04-24 Werner Koch <wk at gnupg.org>
+
+ common: Remove JNLIB from boiler plate (jnlib merge).
+ * common/README.jnlib: Remove.
+
+ common: Rename log and gcc attribute macros (jnlib merge).
+ * common/logging.h: Rename JNLIB_LOG_* to GPGRT_LOG_*.
+ * common/mischelp.h: Rename JNLIB_GCC_* to GPGRT_GCC_*.
+
+ common: Remove two JNLIB_ macros (jnlib merge).
+ * configure.ac: Merge seperate jnlib checks.
+ (HAVE_JNLIB_LOGGING): Remove.
+ * common/logging.c, common/simple-pwquery.c (JNLIB_NEED_AFLOCAL):
+ Rename to GNUPG_COMMON_NEED_AFLOCAL. Change all tests.
+
+ common: Remove libjnlib-config.h (jnlib merge).
+ * common/libjnlib-config.h: Remove.
+ * common/common-defs.h (getenv) [HAVE_GETENV]: New. From removed
+ header.
+ (getpid) [HAVE_W32CE_SYSTEM]: New. From removed header.
+ * common/argparse.c: Include util.h and common-defs.h. Replace
+ jnlib_ macro names for non-GNUPG builds by x* names.
+ * common/dotlock.c: Ditto.
+ * common/logging.c: Include util.h and common-defs.h. Replace jnlib_
+ symbol names by x* names.
+ * common/strlist.c: Ditto.
+ * common/utf8conv.c: Ditto.
+ * common/w32-reg.c: Ditto.
+ * common/mischelp.c: Ditto. Also remove _jnlib_free.
+ * common/stringhelp.c: Ditto.
+ (JNLIB_LOG_WITH_PREFIX): Do not depend on this macro.
+ * common/logging.h (JNLIB_LOG_WITH_PREFIX): Do not depend on this
+ macro.
+
+2015-04-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Move all DNS access to Dirmngr.
+ * common/dns-cert.h: Move to ../dirmngr/.
+ * common/dns-cert.c: Move to ../dirmngr/. Change args to return the
+ key as a buffer.
+ * common/t-dns-cert.c: Move to ../dirmngr/.
+ * common/pka.c, common/pka.h, common/t-pka.c: Remove.
+
+ * dirmngr/server.c (data_line_cookie_write): Factor code out to
+ data_line_write and make it a wrapper for that.
+ (data_line_write): New.
+ (cmd_dns_cert): New.
+ (register_commands): Register new command.
+
+ * g10/Makefile.am (LDADD): Remove DNSLIBS.
+ * g10/call-dirmngr.c (dns_cert_parm_s): New.
+ (dns_cert_data_cb, dns_cert_status_cb): New.
+ (gpg_dirmngr_dns_cert): New.
+ (gpg_dirmngr_get_pka): New.
+ * g10/gpgv.c (gpg_dirmngr_get_pka): New dummy function.
+ * g10/keyserver.c (keyserver_import_cert): Replace get_dns_cert by
+ gpg_dirmngr_dns_cert.
+ (keyserver_import_pka): Replace get_pka_info by gpg_dirmngr_get_pka.
+ * g10/mainproc.c: Include call-dirmngr.h.
+ (pka_uri_from_sig): Add CTX arg. Replace get_pka_info by
+ gpg_dirmngr_get_pka.
+
+ common: Minor change of hex2str to allow for embedded nul.
+ * common/convert.c (hex2str): Set ERRNO. Return adjusted COUNT.
+
+2015-04-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ common: removal of t-support.c from t_jnlib_src.
+ * common/Makefile.am (t_jnlib_src): Remove t-support.c.
+
+2015-04-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Make keyserver-option http_proxy work.
+ * g10/options.h (opt): Add field keyserver_options.http_proxy.
+ * g10/keyserver.c (warn_kshelper_option): Add arg noisy.
+ (parse_keyserver_options): Parse into new http_proxy field.
+ * g10/call-dirmngr.c (create_context): Send the http-proxy option.
+
+ common: Make proper use of http proxy parameter.
+ * common/http.c (is_hostname_port): New.
+ (send_request): Fix proxy name parsing.
+
+ dirmngr: Add http proxy support for keyservers.
+ * dirmngr/dirmngr.h (server_control_s): Add field http_proxy.
+ * dirmngr/dirmngr.c (dirmngr_init_default_ctrl): Copy http_proxy value
+ from OPT.
+ (dirmngr_deinit_default_ctrl): New.
+ (main): Call dirmngr_deinit_default_ctrl.
+ * dirmngr/server.c (start_command_handler): Ditto.
+ (option_handler): Add option "http-proxy".
+ * dirmngr/crlfetch.c (crl_fetch): Take http_proxy from CTRL.
+ * dirmngr/ocsp.c (do_ocsp_request): Ditto.
+ * dirmngr/ks-engine-hkp.c (send_request): Add proxy support.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+
+ gpg: Do not use honor-keyserver-url sub-option by default.
+
+ gpg: Make preferred keyservers work.
+ * g10/call-dirmngr.c (dirmngr_local_s): Add field set_keyservers_done.
+ (create_context): Move keyserver setting to ...
+ (open_context): here.
+ (clear_context_flags): New.
+ (gpg_dirmngr_ks_get): Add arg override_keyserver.
+ * g10/keyserver.c (keyserver_refresh): Improve diagnostics.
+ (keyserver_get_chunk): Ditto. Pass OVERRIDE_KEYSERVER to ks_get.
+
+ gpg: Update sub-options of --keyserver-options.
+ * g10/options.h (KEYSERVER_HTTP_PROXY): New.
+ (KEYSERVER_USE_TEMP_FILES, KEYSERVER_KEEP_TEMP_FILES): Remove.
+ (KEYSERVER_TIMEOUT): New.
+ * common/keyserver.h (KEYSERVER_TIMEOUT): Remove.
+ * g10/keyserver.c (keyserver_opts): Remove obsolete "use-temp-files"
+ and "keep-temp-files". Add "http-proxy" and "timeout".
+ (parse_keyserver_options): Remove 1.2 compatibility option
+ "honor-http_proxy". Remove "use-temp-files" and "keep-temp-files"
+ code.
+
+2015-04-14 Werner Koch <wk at gnupg.org>
+
+ agent: Send the new SETKEYINFO command to the Pinentry.
+ * agent/call-pinentry.c (agent_askpin): Add args keyinfo and
+ cache_mode. Change all callers to pass (NULL,0) for them. Send
+ SETKEYINFO command.
+ * agent/findkey.c (unprotect): Pass the keygrip and the cache_mode for
+ the new args.
+
+2015-04-14 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: better handling of extended APDU.
+ * scd/apdu.c (send_le): Bug fix for not append Z when lc<0&&le<0.
+ * scd/app-common.h (struct app_ctx_s): Use bit fields for flags.
+ * scd/ccid-driver.c (CCID_MAX_BUF): New. Only for OpenPGPcard.
+ (struct ccid_driver_s): New field of max_ccid_msglen.
+ Remove ifsd field.
+ (parse_ccid_descriptor): Initialize max_ccid_msglen.
+ (ccid_transceive_apdu_level): Implement sending extended APDU in
+ chain of CCID message.
+
+2015-04-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix NULL-segv due to invalid imported data.
+ * g10/free-packet.c (my_mpi_copy): New.
+ (copy_public_key, copy_signature): Use instead of mpi_copy.
+
+2015-04-13 Neal H. Walfield <neal at g10code.com>
+
+ dirmngr: If LDAP is not enable, don't build the LDAP bits.
+ * dirmngr/Makefile.am (dirmngr_SOURCES): Only include
+ ks-engine-ldap.c, ldap-parse-uri.c and ldap-parse-uri.h if USE_LDAP
+ is TRUE.
+ (module_tests): Only add t-ldap-parse-uri if USE_LDAP is TRUE.
+ * dirmngr/ks-action.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+ TRUE.
+ (ks_action_help): Don't invoke LDAP functionality if USE_LDAP is not
+ TRUE.
+ (ks_action_search): Likewise.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise.
+ * dirmngr/server.c: Only include "ldap-parse-uri.h" if USE_LDAP is
+ TRUE.
+ (cmd_keyserver): Don't invoke LDAP functionality if USE_LDAP is not
+ TRUE.
+
+2015-04-13 Werner Koch <wk at gnupg.org>
+
+ common: Do without nested fucntions to support non-gcc.
+ * common/t-stringhelp.c (test_strsplit): Remove nested function.
+
+2015-04-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.3.
+
+2015-04-11 Yuri Chornoivan <yurchor at ukr.net>
+
+ po: Update Ukrainian translation.
+
+2015-04-11 Ineiev <ineiev at gnu.org>
+
+ po: Update and review Russian translation.
+
+2015-04-10 Werner Koch <wk at gnupg.org>
+
+ dirmngr,w32: Make it build for Windows.
+ * dirmngr/Makefile.am (t_common_ldadd): Add missing libs.
+
+ Remove obsolete directories from AM_CPPFLAGS.
+
+ dirmngr,w32: Replace functions not available under Windows.
+ * dirmngr/ks-engine-ldap.c (extract_attributes): Replace isoptime and
+ gmtime_r.
+
+ common: Add new function gnupg_gmtime.
+ * common/gettime.c (gnupg_gmtime): New.
+ (gnupg_get_isotime): Use it. Also take care of an gmtime_t returning
+ an error.
+
+ common: Add new function isodate_human_to_tm.
+ * common/gettime.c (isotime_human_p): Add arg date_only.
+ (isodate_human_to_tm): New.
+ * common/t-gettime.c (test_isodate_human_to_tm): New.
+ (main): Call new test.
+
+ dirmngr,w32: Avoid name clash with existing function.
+ * dirmngr/ks-engine-ldap.c (ldap_connect): Rename to my_ldap_connect.
+
+ gpgparsemail: Fix last commit (3f2bdac)
+ * tools/rfc822parse.c (parse_field): Replace break by goto.
+
+2015-04-09 Werner Koch <wk at gnupg.org>
+
+ gpgparsemail: Fix case of zero length continuation lines.
+ * tools/rfc822parse.c (parse_field): Loop after continuation line.
+
+2015-04-08 Werner Koch <wk at gnupg.org>
+
+ sm: Fix certificate lookup in dirmngr cache.
+ * sm/call-dirmngr.c (get_cached_cert): Fix typo in LOOKUP command.
+
+2015-04-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Print the user id in --fast-list-mode.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Change.
+
+ gpg: Prepare to pass additional context to the list functions.
+ * g10/keylist.c (struct sig_stats): Rename to keylist_context and add
+ field check_sigs.
+ (keylist_context_release): New.
+ (list_all): Set listctx.check_sigs and call release func.
+ (list_one): Ditto.
+ (locate_one): Ditto.
+ (list_keyblock_print): Use .check_sigs field. Repalce arg opaque by
+ listctx.
+ (list_keyblock): Ditto. Make static.
+ (list_keyblock_direct): New.
+ * g10/keygen.c (do_generate_keypair): Replace list_keyblock by
+ list_keyblock_direct.
+
+ gpg: Merge duplicated code for get_user_id et al.
+ * g10/getkey.c (get_user_id_string): Add args mode and r_LEN.
+ (get_user_id_string_native): Add new args.
+ (get_long_user_id_string, get_user_id): Rewrite using
+ get_user_id_string.
+
+ gpg: Add new option --debug-iolbf.
+ * g10/gpg.c (oDebugIOLBF): new.
+ (opts): Add --debug-iolbf.
+ (main): Set option.
+
+ Rename DBG_ASSUAN to DBG_IPC and add separate DBG_EXTPROG.
+ * g10/options.h (DBG_EXTPROG_VALUE): Separate from DBG_IPC_VALUE.
+
+ Fix use of DBG_CACHE and DBG_LOOKUP.
+ * dirmngr/dirmngr.h (DBG_LOOKUP_VALUE): Change to 8192.
+ * g10/options.h (DBG_LOOKUP_VALUE, DBG_LOOKUP): New.
+ * g10/getkey.c: Use DBG_LOOKUP instead of DBG_CACHE at most places.
+
+ gpg: Rename a debug macro.
+ * g10/options.h (DBG_CIPHER_VALUE): Rename to DBG_CRYPTO_VALUE.
+ (DBG_CIPHER): Rename to DBG_CRYPTO.
+
+2015-04-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix DoS while parsing mangled secret key packets.
+ * g10/parse-packet.c (parse_key): Check PKTLEN before calling mpi_read
+ et al.
+
+2015-04-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix keytocard.
+ g10/call-agent.h (agent_scd_learn): Add FORCE option.
+ g10/call-agent.c (agent_scd_learn): Implement FORCE option.
+ g10/keygen.c (gen_card_key): Follow the change of option.
+ g10/card-util.c (change_pin, card_status, factory_reset): Likewise.
+ g10/keyedit.c (keyedit_menu): Update private key storage by
+ agent_scd_learn.
+
+ agent: Add --force option for LEARN.
+ * agent/command.c (cmd_learn): Handle --force option.
+ (cmd_keytocard): Don't update key storage file.
+ * agent/agent.h (agent_handle_learn): Add FORCE.
+ * agent/learncard.c (agent_handle_learn): Implement FORCE to update
+ key stroage file.
+
+2015-03-31 Neal H. Walfield <neal at g10code.com>
+
+ dirmngr: Don't use alloca.
+ * dirmngr/ks-engine-ldap.c (ks_ldap_put): Replace use of alloca with
+ xmalloc and xfree.
+
+ dirmngr: Simplify truncation of long strings in debug code.
+ * dirmngr/ks-engine-ldap.c (modlist_dump): Simplify truncation of long
+ strings.
+
+ dirmngr: Use a better error code.
+ * dirmngr/ldap-parse-uri.c (ldap_parse_uri): On error, return
+ GPG_ERR_GENERAL, not GPG_ERR_ASS_GENERAL.
+
+ dirmngr: Better encapsulate the keyservers variable.
+ * dirmngr/dirmngr.h (struct server_control_s): Move field keyservers
+ from here...
+ * dirmngr/server.c (struct server_local_s): ... to here. Update
+ users.
+ * dirmngr/ks-action.h (ks_action_resolve): Add argument keyservers.
+ (ks_action_search): Likewise.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise.
+ * dirmngr/ks-action.c (ks_action_resolve): Add argument keyservers.
+ Use it instead of ctrl->keyservers.
+ (ks_action_search): Likewise.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise.
+
+2015-03-28 Neal H. Walfield <neal at g10code.de>
+
+ gpg: Only use the last specified keyserver.
+ * g10/gpg.c (main): Only use the last specified keyserver.
+
+2015-03-25 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix resource leaks and check rare errors.
+ * dirmngr/ks-engine-ldap.c (keyspec_to_ldap_filter): Fix resource
+ leak.
+ (ks_ldap_search): Check error from es_fopenmem. Use LDAP_ERR where
+ required.
+ (modlist_dump): Check error from es_fopenmem.
+ (uncescape): s/int/size_t/. Use existing macros.
+ (extract_attributes): Use existing trim function.
+ (ks_ldap_put): Do not segv on error from modlist_dump.
+
+ dirmngr: Minor cleanups.
+ * dirmngr/ks-engine-ldap.c [__riscos__]: Remove doubled util.h.
+ (ldap_to_gpg_err): s/GPG_ERR_GENERAL/GPG_ERR_INTERNAL/.
+ (tm2ldaptime): Use snprintf.
+ (ldap_connect): Get error code prior to log_error and and use modern
+ function. Use xfree, xtrustrdup etc.
+ (modlist_lookup): Use GNUPG_GCC_A_USED.
+ (modlist_free): Use xfree.
+
+ common: Add macro GNUPG_GCC_A_USED.
+ * common/util.h (GNUPG_GCC_A_USED): New.
+
+ sm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption).
+ * sm/certreqgen.c (create_request): Change default hash algo.
+ * sm/gpgsm.c (DEFAULT_CIPHER_ALGO): Change default bulk cipher algo.
+
+2015-03-24 Werner Koch <wk at gnupg.org>
+
+ gpg,w32: Handle forward slash in --keyring option.
+ * g10/keydb.c (keydb_add_resource): Allow forward slash under Windows.
+
+2015-03-23 Neal H. Walfield <neal at g10code.de>
+
+ Improve documentation for ks_hkp_get.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Improvement documentation.
+
+ Improve documenation of http_parse_uri.
+ * common/http.c (http_parse_uri): Improve documentation.
+
+ Add support to talking to LDAP key servers.
+ * g10/call-dirmngr.c (record_output): New function.
+ (ks_put_inq_cb): Use it here to generate a --with-colons like output
+ instead of a custom format.
+ * dirmngr/ks-action.c: Include "ldap-parse-uri.h".
+ (ks_action_help): If the provided URI is an LDAP URI, then use
+ ldap_parse_uri to parse. Call ks_ldap_help.
+ (ks_action_search): If passed an LDAP URI, then call ks_ldap_search.
+ (ks_action_get): Likewise.
+ (ks_action_put): Likewise. Also, change data from a 'const void *' to
+ a 'void *' and add info and infolen parameters. Add note that
+ function may modify DATA.
+ * dirmngr/ks-action.h (ks_action_put): Update declaration accordingly.
+ * dirmngr/server.c: Include "ldap-parse-uri.h".
+ (cmd_keyserver): If ITEM->URI is an LDAP URI, parse it using
+ ldap_parse_uri.
+ (hlp_ks_put): Improve documentation.
+ (cmd_ks_put): Also pass info and infolen to ks_action_put. Improve
+ documentation.
+ * dirmngr/ks-engine.h (ks_ldap_help): New declaration.
+ (ks_ldap_search): Likewise.
+ (ks_ldap_get): Likewise.
+ (ks_ldap_put): Likewise.
+ * dirmngr/ks-engine-ldap.c: New file.
+ * dirmngr/Makefile.am (dirmngr_SOURCES): Add ks-engine-ldap.c,
+ ldap-parse-uri.c and ldap-parse-uri.h.
+ (dirmngr_LDADD) [USE_LDAP]: Add $(ldaplibs).
+
+ Import _gpgme_parse_timestamp from gpgme as parse_timestamp.
+ * common/gettime.h (parse_timestamp): New declaration.
+ * common/gettime.c (_win32_timegm): New function imported from
+ gpgme/src/conversion.c:_gpgme_timegm.
+ (parse_timestamp): New function imported from
+ gpgme/src/conversion.c:_gpgme_parse_timestamp.
+
+ Move copy_stream function to misc.c.
+ * dirmngr/ks-action.c (copy_stream): Move function from here...
+ * dirmngr/misc.c (copy_stream): ... to here and drop the static
+ qualifier.
+ * dirmngr/misc.h (copy_stream): Add declaration.
+
+ Move armor_data to misc.c.
+ * dirmngr/ks-engine-hkp.c (armor_data): Move function from here...
+ * dirmngr/misc.c (armor_data): ... to here and drop static qualifier.
+ * dirmngr/misc.h: New declaration.
+
+ Add new LDAP utility functions.
+ * dirmngr/Makefile.am (module_tests): New variable.
+ (noinst_PROGRAMS): New primary. Set it to $(module_tests).
+ (TESTS): New variable. Set it to $(module_tests).
+ (t_common_src): New variable.
+ (t_common_ldadd): Likewise.
+ (t_ldap_parse_uri_SOURCES): New primary.
+ (t_ldap_parse_uri_LDADD): Likewise.
+ * dirmngr/ldap-parse-uri.c: New file.
+ * dirmngr/ldap-parse-uri.h: Likewise.
+ * dirmngr/t-ldap-parse-uri.c: Likewise.
+ * dirmngr/t-support.h: Likewise.
+
+ Add new function uri_query_lookup.
+ * common/http.h (uri_query_lookup): New declaration.
+ * common/http.c (uri_query_lookup): The corresponding implementation.
+
+ Add new function strlist_find.
+ * common/strlist.h (strlist_find): New declaration.
+ * common/strlist.c (strlist_find): New function.
+
+ common: Add new helper function, strsplit.
+ * common/stringhelp.h (strsplit): New declaration.
+ * common/stringhelp.c (strsplit): New function.
+ * common/t-stringhelp.c (test_strsplit): New function.
+ (main): Call it here.
+
+2015-03-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Consider a mailbox only userid in mail search mode.
+ * kbx/keybox-search.c: Include mbox-util.h.
+ (blob_cmp_mail): Improve OpenPGP uid parsing.
+
+ common: Add function is_valid_mailbox_mem.
+ * common/mbox-util.c (mem_count_chr): New.
+ (my_memstr): New.
+ (has_invalid_email_chars): Change args to work on a buffer.
+ (is_valid_mailbox_mem): New.
+ (is_valid_mailbox): Rewrite to use is_valid_mailbox_mem.
+
+ gpg: Find keys using mail addresses with garbage after the '>'
+ * kbx/keybox-search.c (blob_cmp_mail): Stop comparing at the '>'.
+
+ common: Fix syntax error when building with gnutls.
+ * common/http.c (send_request): Add missing comma.
+
+2015-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Emit status line NEWSIG before signature verification starts.
+ * g10/mainproc.c (check_sig_and_print): Emit STATUS_NEWSIG.
+
+ agent: Compute correct MPI length header for protected ECC keys.
+ * agent/cvt-openpgp.c (apply_protection): Strip leading zeroes from
+ opaque MPIs to comply with the OpenPGP spec.
+
+ hkps: Fix host name verification when using pools.
+ * common/http.c (send_request): Set the requested for SNI.
+ * dirmngr/ks-engine-hkp.c (map_host): Return the poolname and not
+ the selecting a host.
+
+ Define replacement error codes from libgpg-error 1.19.
+ * common/util.h: Add GPG_ERR_LDAP codes for libgpg-error < 1.19.
+
+2015-03-17 Andre Heinecke <aheinecke at intevation.de>
+
+ gpgtar: Fix extracting files with !(size % 512)
+ * tools/gpgtar-extract.c (extract_regular): Handle size multiples
+ of RECORDSIZE.
+
+2015-03-17 Werner Koch <wk at gnupg.org>
+
+ common: Add feature to ease using argparse's usage().
+ * common/argparse.c (show_help): Take care of flag value
+ (usage): Ditto.
+
+ common: Allow standalone build of argparse.c.
+ * common/argparse.h: Remove types.h - not required.
+ * common/argparse.c: Change to allow standalone use.
+
+2015-03-16 Werner Koch <wk at gnupg.org>
+
+ gpg: Create all MPIs with RFC-4880 correct length headers.
+ * g10/build-packet.c (gpg_mpi_write): Strip leading zeroes.
+
+ gpg: Allow printing of MPI values in --list-mode.
+ * g10/parse-packet.c (set_packet_list_mode): Set mpi_print_mode.
+ * g10/misc.c (mpi_print): Do not print an extra leading zero.
+
+ gpg: Fix broken write of opaque MPI length header.
+ * g10/build-packet.c (gpg_mpi_write): Use a char array for the length.
+
+2015-03-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix possible dead code elimination.
+ * g10/encrypt.c: Change condition for detecting a real file.
+
+ g13: Fix pointer wrap check.
+ * g13/utils.c (find_tuple, next_tuple): Cast pointer to size_t before
+ doing an overflow check.
+
+ agent: Remove useless conditions in command.c.
+ * agent/command.c (cmd_setkeydesc): Remove NULL check.
+ (cmd_get_passphrase): Ditto.
+ (cmd_clear_passphrase): Ditto.
+ (cmd_get_confirmation): Ditto.
+ (cmd_getval): Ditto.
+ (cmd_putval): Ditto.
+
+ agent: Fix length test in sshcontrol parser.
+ * agent/command-ssh.c (ssh_search_control_file): Check S before
+ upcasing it.
+
+ agent: Remove useless conditions.
+ * agent/genkey.c (agent_ask_new_passphrase): Remove useless condition.
+ * agent/command-ssh.c (ssh_identity_register): Ditto.
+
+ gpg: Remove useless condition.
+ * g10/keylist.c (list_keyblock_colon): Remove useless condition (PK).
+ (list_keyblock_print): Likewise.
+
+ scd: Fix possible NULL deref in apdu.c.
+ * scd/apdu.c (control_pcsc_direct): Take care of BUFLEN being NULL.
+ (control_pcsc_wrapped): Ditto.
+
+ common: Make openpgp_oid_to_str more robust.
+ * common/openpgp-oid.c (openpgp_oid_to_str): Take care of
+ gcry_mpi_get_opaque returning NULL. Remove useless condition !BUF.
+
+2015-03-11 Werner Koch <wk at gnupg.org>
+
+ agent: Improve error reporting from Pinentry.
+ * agent/call-pinentry.c (unlock_pinentry): Add error logging. Map
+ error source of uncommon errors to Pinentry.
+
+2015-03-10 Werner Koch <wk at gnupg.org>
+
+ gpg: Change --print-pka-records into an option.
+ * g10/gpg.c (aPrintPKARecords): Rename to oPrintPKARecords and do not
+ use it as a command.
+ * g10/keylist.c (list_keyblock): List PKA rceords also for secret
+ keys.
+
+ gpg: Add --list-gcrypt-config and "curve" item for --list-config.
+ * common/openpgp-oid.c (curve_supported_p): New.
+ (openpgp_enum_curves): New.
+ * common/t-openpgp-oid.c (test_openpgp_enum_curves): New.
+ (main): Add option --verbose.
+ * g10/gpg.c (opts): Add --list-gcrypt-config.
+ (list_config): Add items "curve" and "curveoid". Remove unused code.
+
+2015-03-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: fix for 64-bit arch.
+ * agent/pksign.c (agent_pksign_do): Use int.
+ * scd/app-openpgp.c (get_public_key): Likewise.
+
+2015-03-04 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: avoid chatter about trustdb when --quiet.
+ * g10/trustdb.c (tdb_check_trustdb_stale): avoid log_info() when
+ opt.quiet
+
+2015-02-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Lowercase mailbox for PKA lookups.
+ * common/stringhelp.c (ascii_strlwr): New.
+ * common/mbox-util.c (mailbox_from_userid): Downcase result.
+
+ gpg: Fix memory leak due to PKA lookup.
+ * g10/keyserver.c (keyserver_import_pka): Move the xfree.
+
+2015-02-25 Werner Koch <wk at gnupg.org>
+
+ gpg: Switch to a hash and CERT record based PKA system.
+ * common/dns-cert.c (get_dns_cert): Make r_key optional.
+ * common/pka.c: Rewrite for the new hash based lookup.
+ * common/t-pka.c: New.
+ * configure.ac: Remove option --disable-dns-pka.
+ (USE_DNS_PKA): Remove ac_define.
+ * g10/getkey.c (parse_auto_key_locate): Always include PKA.
+
+ common: Allow requesting a specific certtype with get_dns_cert()
+ * common/dns-cert.c (get_dns_cert): Add arg want_certtype. Change all
+ callers.
+ (CERTTYPE_): Move constants to ...
+ * common/dns-cert.h: here as DNS_CERTTYPE_.
+
+ Move new mailbox.c source file to common/.
+ * g10/mailbox.c: Move to ...
+ * common/mbox-util.c: new file.
+ * common/mbox-util.h: New. Include where needed.
+ * g10/t-mailbox.c: Move to ...
+ * common/t-mbox-util.c: new file.
+
+2015-02-24 Werner Koch <wk at gnupg.org>
+
+ gpg: Add command --print-pka-records.
+ * g10/gpg.c (main): Add command --print-pka-records.
+ * g10/options.h (struct opt): Add field "print_pka_records".
+ * g10/keylist.c (list_keyblock_pka): New.
+ (list_keyblock): Call it if new option is set.
+ (print_fingerprint): Add mode 10.
+
+ gpg: Add function to extract the mailbox.
+ * g10/misc.c (has_invalid_email_chars, is_valid_mailbox)
+ (is_valid_user_id): Move to ...
+ * g10/mailbox.c: new file.
+ (string_has_ctrl_or_space, has_dotdot_after_at): New.
+ (has_invalid_email_chars): New.
+
+ * g10/t-mailbox.c: New.
+ * g10/Makefile.am (module_tests): Add t-mailbox.
+ (t_mailbox_SOURCES, t_mailbox_LDADD): New.
+
+2015-02-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Add option to print fingerprints in ICAO spelling.
+ * g10/gpg.c: Add option --with-icao-spelling.
+ * g10/options.h (struct opt): Add with_icao_spelling.
+ * g10/keylist.c (print_icao_hexdigit): New.
+ (print_fingerprint): Print ICAO spelling.
+
+ gpg: Skip legacy keys while searching keyrings.
+ * g10/getkey.c (search_modes_are_fingerprint): New.
+ (lookup): Skip over legacy keys.
+
+ common: Fix regression due to commit 2183683b.
+ * common/dns-cert.c (get_dns_cert): Remove cruft.
+
+2015-02-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Replace remaining uses of stdio by estream.
+ * g10/sign.c (sign_file): Use log_printf instead of stderr.
+ * g10/tdbdump.c (export_ownertrust): Use estream fucntions.
+ (import_ownertrust): Ditto.
+ * g10/tdbio.c (tdbio_dump_record): Ditto. Change arg to estream_t.
+
+ gpg: Fix segv due to NULL value stored as opaque MPI.
+ * g10/build-packet.c (gpg_mpi_write): Check for NULL return from
+ gcry_mpi_get_opaque.
+ (gpg_mpi_write_nohdr, do_key): Ditto.
+ * g10/keyid.c (hash_public_key): Ditto.
+
+2015-02-12 Werner Koch <wk at gnupg.org>
+
+ scd: Fix regression in 2.1.2 (due to commit 2183683)
+ * scd/apdu.c (pcsc_vendor_specific_init): Replace use of
+ bufNN_to_uint by direct code.
+
+2015-02-12 Andre Heinecke <aheinecke at intevation.de>
+
+ dirmngr: Initialize cache from sysconfig dir.
+ * dirmngr/certcache.c (cert_cache_init): Load certificates
+ from sysconfig dir instead of the homeidr.
+ * dirmngr/dirmngr.c (main): Removed parsing of obsolete
+ homedir_data option.
+ * dirmngr/dirmngr.h (opt): Removed homedir_data.
+ * doc/dirmngr.texi: Update and clarify certs directory doc.
+
+2015-02-11 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.2.
+
+ dirmngr: Avoid warning about unused function.
+ * dirmngr/dirmngr.c (my_gnutls_log): Build only if gnutls is used.
+
+ build: Update standard build-aux files.
+
+ Use inline functions to convert buffer data to scalars.
+ * common/host2net.h (buf16_to_ulong, buf16_to_uint): New.
+ (buf16_to_ushort, buf16_to_u16): New.
+ (buf32_to_size_t, buf32_to_ulong, buf32_to_uint, buf32_to_u32): New.
+
+2015-02-09 Werner Koch <wk at gnupg.org>
+
+ gpg: Prevent an invalid memory read using a garbled keyring.
+ * g10/keyring.c (keyring_get_keyblock): Whitelist allowed packet
+ types.
+ * g10/keydb.c (parse_keyblock_image): Ditto.
+
+ gpg: Fix a NULL-deref in export due to invalid packet lengths.
+ * g10/build-packet.c (write_fake_data): Take care of a NULL stored as
+ opaque MPI.
+
+ gpg: Fix a NULL-deref due to empty ring trust packets.
+ * g10/parse-packet.c (parse_trust): Always allocate a packet.
+
+2015-02-04 Werner Koch <wk at gnupg.org>
+
+ gpg-agent: Use "pinentry-basic" as fallback.
+ * common/homedir.c (get_default_pinentry_name): New.
+ (gnupg_module_name): Use that for the default pinentry.
+ (gnupg_module_name_flush_some): New.
+ * agent/gpg-agent.c (agent_sighup_action): Flush some module names.
+ * agent/call-pinentry.c (start_pinentry): Do not modify
+ opt.pinentry_program.
+
+ w32: Add manifest to gpg.
+ * g10/gpg.w32-manifest.in: New.
+ * g10/gpg-w32info.rc: Add manifest.
+ * g10/Makefile.am (EXTRA_DIST): Add manifest.
+ (gpg-w32info.o): Depend on manifest.
+ * configure.ac (BUILD_VERSION): New.
+ (AC_CONFIG_FILES): Add manifest.
+
+2015-02-03 Werner Koch <wk at gnupg.org>
+
+ Update copyright years.
+ * common/w32info-rc.h.in (W32INFO_COMPANYNAME): Change to "The GnuPG
+ Project".
+
+2015-02-02 Werner Koch <wk at gnupg.org>
+
+ w32: Change default Windows install dir and add bin to PATH.
+ * build-aux/speedo.mk (WITH_GUI): New macro. The Windows installer is
+ now build by default without any GUI stuff.
+ * build-aux/speedo/w32/inst.nsi: Change standard installation
+ directory.
+ (AddToPath, un.RemoveFromPath): New.
+ (gnupginst): Add bin directory to the PATH.
+
+2015-02-01 Werner Koch <wk at gnupg.org>
+
+ w32: Allow for Unicocde installation directory.
+ * common/homedir.c (w32_rootdir): Use Unicode fucntion not only for
+ WinCE.
+
+2015-01-30 Joshua Rogers <git at internot.info>
+
+ kbx: Fix resource leak.
+ * kbx/keybox-update.c (blob_filecopy): Fix resource leak. On error
+ return, 'fp' and 'newfp' was never closed.
+
+2015-01-29 Werner Koch <wk at gnupg.org>
+
+ agent: Fix use of imported but unprotected openpgp keys.
+ * agent/agent.h (PRIVATE_KEY_OPENPGP_NONE): New.
+ * agent/command.c (do_one_keyinfo): Implement it.
+ * agent/findkey.c (agent_key_from_file): Ditto.
+ (agent_key_info_from_file): Ditto.
+ (agent_delete_key): Ditto.
+ * agent/protect.c (agent_private_key_type): Add detection for openpgp
+ "none" method.
+
+2015-01-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese Translation.
+
+2015-01-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Limit the size of key packets to a sensible value.
+ * g10/parse-packet.c (MAX_KEY_PACKET_LENGTH): New.
+ (MAX_UID_PACKET_LENGTH): New.
+ (MAX_COMMENT_PACKET_LENGTH): New.
+ (MAX_ATTR_PACKET_LENGTH): New.
+ (parse_key): Limit the size of a key packet to 256k.
+ (parse_user_id): Use macro for the packet size limit.
+ (parse_attribute): Ditto.
+ (parse_comment): Ditto.
+
+ gpg: Fix buffering problem in --list-config.
+ * g10/gpg.c (list_config): Replace print_sanitized_string2 by
+ es_write_sanitized.
+
+ * common/stringhelp.c (print_sanitized_buffer2): Remove.
+ (print_sanitized_buffer, print_sanitized_utf8_buffer): Remove.
+ (print_sanitized_utf8_buffer, print_sanitized_utf8_string): Remove.
+ (print_sanitized_string): Remove.
+
+ * sm/certdump.c (print_dn_part, print_dn_parts): Remove arg FP.
+ (pretty_print_sexp, gpgsm_print_name2, gpgsm_print_name): Remove.
+
+ Add a hook to be called right after main.
+ * common/init.c (early_system_init): New stub function.
+
+ gpg: Allow predefined names as answer to the keygen.algo prompt.
+ * g10/keygen.c (ask_algo): Add list of strings.
+
+ agent: Add some extra robustness to extract_private_key.
+ * agent/cvt-openpgp.c (extract_private_key): Add arg "arraysize".
+ Make sure that R_FLAGS and R_CURVE are set to NULL.
+
+2015-01-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix varargs call for 64-bit arch on ECC keys.
+ * scd/app-openpgp.c (store_fpr): Remove CARD_VERSION from the
+ arguments.
+ (rsa_writekey): Follow the change.
+ (do_genkey): Likewise.
+ (ecc_writekey): Likewise. Cast to size_t.
+
+2015-01-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix segv introduced to commit 4d7c9b0.
+ * g10/keygen.c (get_parameter_passphrase): Take care of R == NULL.
+
+2015-01-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix agent_public_key_from_file for ECC.
+ * agent/cvt-openpgp.c (extract_private_key): New.
+ (convert_to_openpgp): Use extract_private_key.
+ * agent/findkey.c (agent_public_key_from_file): Use
+ extract_private_key.
+
+2015-01-26 Werner Koch <wk at gnupg.org>
+
+ sm: Simplify fix ed8383c6.
+ * sm/minip12.c (p12_build): Release PWBUF only at the end.
+
+2015-01-25 Joshua Rogers <git at internot.info>
+
+ ccid: Remove incorrect expression leading to errors.
+ * scd/ccid-driver.c (send_escape_cmd): Fix setting of 'rc'.
+
+2015-01-23 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Fix validity check for UINT32 values.
+ * tools/gpgconf-comp.c (option_check_validity): Enable check for
+ UINT32.
+
+2015-01-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve skipping of PGP-2 keys.
+ * g10/keydb.c (keydb_search_first, keydb_search_next): Skip legacy
+ keys.
+ * g10/keyring.c (keyring_get_keyblock): Handle GPG_ERR_LEGACY_KEY.
+ (prepare_search): Ditto.
+ (keyring_rebuild_cache): Skip legacy keys.
+ * g10/keyserver.c (keyidlist): Ditto.
+ * g10/trustdb.c (validate_key_list): Ditto.
+
+ gpg: Add dedicated error code for PGP-2 keys.
+ * g10/parse-packet.c (parse_key): Return GPG_ERR_LEGACY_KEY for PGP2
+ keys.
+ * g10/import.c (read_block): Simplify by checking GPG_ERR_LEGACY_KEY.
+ * g10/getkey.c (lookup): Silence error message for PGP-2 keys.
+
+ * common/util.h (GPG_ERR_LEGACY_KEY): Add replacement for older
+ libgpg-error.
+
+ gpg: Replace remaining old error code macros by GPG_ERR_.
+ * g10/gpg.h (g10_errstr): Remove macro and change all occurrences by
+ gpg_strerror.
+ (G10ERR_): Remove all macros and change all occurrences by their
+ GPG_ERR_ counterparts.
+
+ gpg: Remove an unused variable.
+ * g10/getkey.c (getkey_ctx_s): Remove last_rc.
+
+2015-01-21 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix TLS build problems.
+ * dirmngr/Makefile.am (AM_CFLAGS): Add flags for TLS libs.
+
+ gpg: Support --passphrase with --quick-gen-key.
+ * g10/keygen.c: Include shareddefs.h.
+ (quick_generate_keypair): Support static passphrase.
+ (get_parameter_passphrase): New.
+ (do_generate_keypair): Use it.
+
+ gpg: Re-enable the "Passphrase" parameter for batch key generation.
+ * agent/command.c (cmd_genkey): Add option --inq-passwd.
+ * agent/genkey.c (agent_genkey): Add new arg override_passphrase.
+ * g10/call-agent.c (inq_genkey_parms): Handle NEWPASSWD keyword.
+ (agent_genkey): Add arg optional arg "passphrase".
+ * g10/keygen.c (common_gen, gen_elg, gen_dsa, gen_ecc)
+ (gen_rsa, do_create): Add arg "passphrase" and pass it through.
+ (do_generate_keypair): Make use of pPASSPHRASE.
+ (release_parameter_list): Wipe out a passphrase parameter.
+
+2015-01-19 Werner Koch <wk at gnupg.org>
+
+ kbx: Minor cleanup for the previous fix.
+ * kbx/keybox-search.c (blob_get_keyid): Rename to
+ blob_get_first_keyid. Check number of keys and remove blob type check.
+
+2015-01-19 Damien Goutte-Gattat <dgouttegattat at incenp.org>
+
+ kbx: Call skipfnc callback to filter out keys.
+ * kbx/keybox-search.c (blob_get_keyid): New.
+ (keybox-search): Call skipfnc callback function.
+
+2015-01-13 Andreas Schwier <andreas.schwier at cardcontact.de>
+
+ scd: Allow for certificates > 1024 with PC/SC.
+ * scd/pcsc-wrapper.c (handle_transmit): Enlarge buffer to 4096 too
+ allow for larger certificates.
+
+2015-01-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ dirmngr: Fix error code path of map_host.
+ * dirmngr/ks-engine-hkp.c (map_host): Fix error return.
+
+2015-01-08 Joshua Rogers <git at internot.info>
+
+ scd: fix get_public_key for OpenPGPcard v1.0.
+ * scd/app-openpgp.c (get_public_key): correctly close 'fp' upon use.
+
+2015-01-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ dirmngr: fix LDAP query PATTERNS limit check.
+ * dirmngr/ldap.c (start_cert_fetch_ldap): fix ARGC limitation.
+
+ scd: fix merge failure.
+ * scd/apdu.c (pcsc_pinpad_verify): Remove wrong lines inserted by
+ merge.
+
+2015-01-05 Werner Koch <wk at gnupg.org>
+
+ sm,g13: Init local vars to avoid compiler warnings.
+ * sm/misc.c (transform_sigval): Init RSA_S_LEN.
+ * g13/mount.c (read_keyblob): Init HEADERLEN.
+
+ gpg: Remove unused args from a function.
+ * g10/keyserver.c (parse_keyserver_uri): Remove args configname and
+ configlineno. Change all callers.
+
+ gpg: Clear a possible rest of the KDF secret buffer.
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Fix order of args.
+
+ build: Require automake 1.14.
+ * configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
+
+2015-01-04 Werner Koch <wk at gnupg.org>
+
+ agent: Make --allow-loopback-pinentry gpgconf changeable.
+
+2014-12-22 Joshua Rogers <git at internot.info>
+
+ tools: Free variable before return.
+ * tools/gpgconf-comp.c: Free 'dest_filename' before it is returned
+ upon error.
+
+2014-12-22 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ sm: Avoid double-free on iconv failure.
+ * sm/minip12.c: (p12_build) if jnlib_iconv_open fails, avoid
+ double-free of pwbuf.
+
+ scd: Avoid double-free on error condition in scd.
+ * scd/command.c (cmd_readkey): avoid double-free of cert
+
+ avoid future chance of using uninitialized memory.
+ * common/iobuf.c: (iobuf_open): initialize len
+
+ avoid double-close in unusual dotlock situations.
+ * common/dotlock.c: (dotlock_create_unix) avoid double-close()
+ in unusual situations.
+
+ gpgkey2ssh: clean up varargs.
+ * tools/gpgkey2ssh.c (key_to_blob) : ensure that va_end is called.
+
+2014-12-22 Werner Koch <wk at gnupg.org>
+
+ doc: Fix memory leak in yat2m.
+ * doc/yat2m.c (write_th): Free NAME.
+
+ dirmngr: Fix memory leak.
+ * dirmngr/server.c (cmd_ks_search, cmd_ks_get): Fix memory leak.
+
+ * dirmngr/ks-engine-hkp.c (ks_hkp_mark_host): Remove double check.
+
+ dirmngr: Remove un-needed check.
+ * dirmngr/crlfetch.c (crl_fetch): Check that URL is not NULL.
+
+ dirmngr,gpgsm: Return NULL on fail.
+ * dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
+ * sm/gpgsm.c (parse_keyserver_line): Ditto.
+
+2014-12-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: ECDH Support.
+ * agent/divert-scd.c (divert_pkdecrypt): Support ECDH.
+ * scd/app-openpgp.c (get_algo_byte, store_fpr): Support ECDH.
+ (send_key_attr): Support ECDH. Fix EdDSA algorithm value.
+ (retrieve_key_material): Initialize fields.
+ (get_public_key, ecc_writekey, do_writekey): Support ECDH.
+ (ecdh_writekey): Remove.
+ (do_decipher): Support ECDH.
+ (parse_algorithm_attribute): Support ECDH. Fix EdDSA.
+
+2014-12-19 Werner Koch <wk at gnupg.org>
+
+ agent: Make sure --max-cache-ttl is >= --default-cache-ttl.
+ * agent/gpg-agent.c (finalize_rereadable_options): New.
+ (main, reread_configuration): Call it.
+
+ agent: Keep the session environment for restricted connections.
+ * agent/command-ssh.c (setup_ssh_env): Move code to ...
+ * agent/gpg-agent.c (agent_copy_startup_env): .. new function. Change
+ calllers.
+ * agent/command.c (start_command_handler): Call that fucntion for
+ restricted connections.
+
+ agent: Fix string prepended to remotely initiated prompts.
+ * agent/command.c (cmd_setkeydesc): Use %0A and not \n. Make
+ translatable.
+
+2014-12-18 Werner Koch <wk at gnupg.org>
+
+ build: Remove option to build without agent.
+ * configure.ac (build-agent): Set to yes.
+
+2014-12-17 Werner Koch <wk at gnupg.org>
+
+ gpgconf: Exit with failure if --launch fails.
+ * tools/gpgconf-comp.c (gc_component_launch): Return an error code.
+ * tools/gpgconf.c (main): Exit if launch failed.
+
+2014-12-16 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.1.
+
+ po: Update the German translation.
+
+2014-12-16 Petr Pisar <petr.pisar at atlas.cz>
+
+ po: Update Czech translation.
+
+2014-12-16 Werner Koch <wk at gnupg.org>
+
+ gpg: Show private DO information in the card status.
+ * g10/call-agent.c (agent_release_card_info): Free private_do.
+ (learn_status_cb): Parse PRIVATE-DO-n stati.
+
+2014-12-16 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+
+2014-12-16 Jedi <jedi at jedi.org>
+
+ po: Update zh_TW translation.
+
+2014-12-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Add sub-command "factory-reset" to --card-edit.
+ * common/util.h (GPG_ERR_OBJ_TERM_STATE): New.
+ * scd/iso7816.c (map_sw): Add this error code.
+ * scd/app-openpgp.c (do_getattr): Return the life cycle indicator.
+ * scd/app.c (select_application): Allow a return value of
+ GPG_ERR_OBJ_TERM_STATE.
+ * scd/scdaemon.c (set_debug): Print the DBG_READER value.
+ * g10/call-agent.c (start_agent): Print a status line for the
+ termination state.
+ (agent_scd_learn): Make arg "info" optional.
+ (agent_scd_apdu): New.
+ * g10/card-util.c (send_apdu): New.
+ (factory_reset): New.
+ (card_edit): Add command factory-reset.
+
+ gpg: Fix regression in notation data regression.
+ * g10/misc.c (pct_expando): Reorder conditions for clarity.
+ * g10/sign.c (write_signature_packets): Fix notation data creation.
+
+ gpg: Avoid extra LF in notaion data listing.
+ * g10/keylist.c (show_notation): Use log_printf.
+
+2014-12-12 Werner Koch <wk at gnupg.org>
+
+ scd: Fix possibly inhibited checkpin of the admin pin.
+ * scd/app-openpgp.c (do_check_pin): Do not check a byte of a released
+ buffer.
+
+ gpg: Let --card--status create a shadow key (card key stub).
+ * agent/command.c (cmd_learn): Add option --sendinfo.
+ * agent/learncard.c (agent_handle_learn): Add arg "send" andsend
+ certifciate only if that is set.
+ * g10/call-agent.c (agent_scd_learn): Use --sendinfo. Make INFO
+ optional.
+ (agent_learn): Remove.
+ * g10/keygen.c (gen_card_key): Replace agent_learn by agent_scd_learn.
+
+ gpg: Fix possible read of unallocated memory.
+ * g10/parse-packet.c (can_handle_critical): Check content length
+ before calling can_handle_critical_notation.
+
+2014-12-11 Werner Koch <wk at gnupg.org>
+
+ build: Replace deprecated autconf macro.
+ * m4/intl.m4: s/AM_PROG_MKDIR_P/AC_PROG_MKDIR_P/
+ * m4/po.m4: Ditto.
+
+2014-12-08 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Improve dead host detection.
+ * dirmngr/ks-engine-hkp.c (handle_send_request_error): Mark host dead
+ also for 2 other error messages.
+
+ http: Improve diagnostic messages.
+ * common/http.c (send_request): Print TLS alert info
+ (connect_server): Detect bogus DNS entry.
+
+ gpg: Obsolete some keyserver helper options.
+ * g10/options.h (opt): Remove keyserver_options.other.
+ * g10/gpg.c (main): Obsolete option --honor-http-proxt.
+ * g10/keyserver.c (add_canonical_option): Replace by ...
+ (warn_kshelper_option): New.
+ (parse_keyserver_uri): Obsolete "x-broken-http".
+
+ dirmngr: Return a proper error for all dead hosts.
+ * dirmngr/ks-engine-hkp.c (map_host): Change to return an gpg_error_t.
+ Return an error code for all dead hosts.
+ (make_host_part): Change to return an gpg_error_t. Change all
+ callers.
+
+ gpg: Write a status line for a failed --send-keys.
+ * g10/keyserver.c (keyserver_put): Write an status error.
+
+2014-12-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix for EdDSA.
+ * scd/app-openpgp.c (get_algo_byte): It catches 22.
+ (store_fpr): It's MPI usually, but it's opaque bytes for EdDSA.
+
+2014-12-05 Andre Heinecke <aheinecke at intevation.de>
+
+ Document no-allow-mark-trusted option.
+ doc: Document no-allow-mark-trusted for gpg-agent
+
+ * doc/gpg-agent.texi: Change allow-mark-trusted doc to
+ no-allow-mark-trusted.
+
+ --
+ Since rev. 78a56b14 allow-mark-trusted is the default option
+ and was replaced by no-allow-mark-trusted to disable the
+ interactive prompt.
+
+2014-12-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix for NIST P-256.
+ * g10/card-util.c (card_store_subkey): Error check.
+ * scd/app-opengpg.c (ecc_writekey): Support NIST P-256.
+ (do_writekey): Error check.
+
+2014-12-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Allow import of large keys.
+ * g10/import.c (import): Skip too large keys.
+ * kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 2MB to 5MB.
+
+2014-12-03 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove option aliases --[no-]throw-keyid and --notation-data.
+ * g10/gpg.c (opts): Remove them.
+ * g10/options.h (opt): s/throw_keyid/throw_keyids/ and change users.
+
+2014-12-02 Werner Koch <wk at gnupg.org>
+
+ agent: Replace some sprintf.
+ * agent/call-scd.c (agent_card_pksign): Replace sprintf by bin2hex.
+ * agent/command-ssh.c (ssh_identity_register): Ditto.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Replace sprintf by
+ put_membuf_printf.
+
+2014-12-01 Werner Koch <wk at gnupg.org>
+
+ tools: Improve watchgnupg portability.
+ * configure.ac (AC_CHECK_HEADERS): Check for sys.select.h
+ * tools/watchgnupg.c: Include it.
+
+ gpg: Fix export bug using exact search with only one key in the keybox.
+ * g10/export.c (do_export_stream): Disable caching.
+ * g10/keyserver.c (keyidlist): Ditto.
+
+ scd: Implement socket redirection.
+ * scd/scdaemon.c (ENAMETOOLONG): New.
+ (redir_socket_name): New.
+ (cleanup): Take care of a redirected socket.
+ (main): Pass redir_socket_name to create_server_socket.
+ (create_socket_name): Remove superfluous length check.
+ (create_server_socket): Add arg r_redir_name and implement
+ redirection. Replace assert for older Assuan by an error message.
+
+ dirmngr: Implement socket redirection.
+ * dirmngr/dirmngr.c (ENAMETOOLONG): new.
+ (redir_socket_name): New.
+ (main): Add Assuan socket redirection.
+ (cleanup): Adjust cleanup for redirection.
+
+2014-11-28 Werner Koch <wk at gnupg.org>
+
+ agent: Implement socket redirection.
+ * agent/gpg-agent.c (ENAMETOOLONG): New.
+ (redir_socket_name, redir_socket_name_extra)
+ (redir_socket_name_ssh): New.
+ (remove_socket): Take care of the redir names.
+ (main): Pass the redir names to create_server_socket.
+ (create_socket_name): Remove length check - that is anyway done later.
+ (create_server_socket): Add arg r_redir_name and implement redirection
+ if Libassuan is at least 2.14.
+
+ gpg: Change another BUG() call to a regular error message.
+ * g10/mainproc.c (proc_tree): Replace BUG by a proper error messages.
+
+ Add option --no-autostart.
+ * g10/gpg.c: Add option --no-autostart.
+ * sm/gpgsm.c: Ditto.
+ * g10/options.h (opt): Add field autostart.
+ * sm/gpgsm.h (opt): Ditto.
+ * g10/call-agent.c (start_agent): Print note if agent was not
+ autostarted.
+ * sm/call-agent.c (start_agent): Ditto.
+ * g10/call-dirmngr.c (create_context): Likewise.
+ * sm/call-dirmngr.c (start_dirmngr_ext): Ditto.
+
+2014-11-27 Мирослав Николић <wk at gnupg.org>
+
+ gpg-agent: Add restricted connection feature.
+ * agent/agent.h (opt): Add field extra_socket.
+ (server_control_s): Add field restricted.
+ * agent/command.c: Check restricted flag on many commands.
+ * agent/gpg-agent.c (oExtraSocket): New.
+ (opts): Add option --extra-socket.
+ (socket_name_extra): New.
+ (cleanup): Cleanup that socket name.
+ (main): Implement oExtraSocket.
+ (create_socket_name): Add arg homedir and change all callers.
+ (create_server_socket): Rename arg is_ssh to primary and change
+ callers.
+ (start_connection_thread): Take ctrl as arg.
+ (start_connection_thread_std): New.
+ (start_connection_thread_extra): New.
+ (handle_connections): Add arg listen_fd_extra and replace the
+ connection starting code by parameterized loop.
+ * common/asshelp.c (start_new_gpg_agent): Detect the use of the
+ restricted mode and don't fail on sending the pinentry environment.
+
+ * common/util.h (GPG_ERR_FORBIDDEN): New.
+
+ agent: Make auditing of the option list easier.
+ * agent/gpg-agent.c (opts): Use ARGPARSE_ macros.
+
+2014-11-26 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ dirmngr: Only report hkps scheme when available.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_help): Make use of TLS macros.
+
+2014-11-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Change a bug() call to a regular error message.
+ * g10/decrypt-data.c (decrypt_data): Return an error code instead of
+ calling BUG().
+
+2014-11-25 Werner Koch <wk at gnupg.org>
+
+ Fix buffer overflow in openpgp_oid_to_str.
+ * common/openpgp-oid.c (openpgp_oid_to_str): Fix unsigned underflow.
+
+ * common/t-openpgp-oid.c (BADOID): New.
+ (test_openpgp_oid_to_str): Add test cases.
+
+2014-11-24 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix use of uninit.value in listing sig subpkts.
+ * g10/parse-packet.c (dump_sig_subpkt): Print regex subpacket
+ sanitized.
+
+ gpg: Fix off-by-one read in the attribute subpacket parser.
+ * g10/parse-packet.c (parse_attribute_subpkts): Check that the
+ attribute packet is large enough for the subpacket type.
+
+ gpg: Fix batch generation of ECC keys.
+ * g10/keygen.c (get_parameter_algo): Map ECC algorithm strings
+ directly.
+
+2014-11-24 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Distinguish between ARGPARSE_AMBIGUOUS_{OPTION,COMMAND}
+ * common/argparse.c (initialize): Use correct value.
+
+ gpg: Refer to --throw-keyids instead of --throw-keyid.
+ * g10/encrypt.c: adjust error message
+
+2014-11-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Track number of skipped v3 keys on import.
+ * g10/import.c (stats_s): Add field v3keys.
+ (import): Update this field.
+ (import_print_stats): Print v3 key count.
+ (read_block): Skip v3 keys and return a count for them.
+
+ gpg: Fix regression in parse_key.
+ * g10/parse-packet.c (parse): Better return just the gpg_err_code.
+ (parse_key): Return the error code.
+
+ speedo: Add simple logos to the installer.
+ * build-aux/speedo/w32/README.txt: Include GnuPG Readme.
+ * build-aux/speedo/w32/gnupg-logo-150x57.bmp: New.
+ * build-aux/speedo/w32/gnupg-logo-164x314.bmp: New.
+ * build-aux/speedo/w32/inst.nsi: Add logos.
+ * build-aux/speedo.mk ($(bdir)/NEWS.tmp): Extract news items.
+
+2014-11-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix hash detection for ECDSA.
+ * g10/sign.c (sign_file): Use DSA or ECDSA and not DSA|EdDSA.
+
+ Fix linker problem on OS X.
+ * common/init.c (default_errsource): Move to the .data segmemt.
+
+2014-11-19 Werner Koch <wk at gnupg.org>
+
+ gpg-connect-agent: Add convenience option --uiserver.
+
+ Add "gpgconf --kill dirmngr" and avoid useless launch before a kill.
+ * common/asshelp.c (start_new_gpg_agent): Add arg autostart. Change
+ all callers to use 1 for it.
+ (start_new_dirmngr): Ditto.
+ * tools/gpg-connect-agent.c: Add option --no-autostart.
+ (main): Default autostart to 1.
+ (start_agent): Implement no-autostart.
+ * tools/gpgconf-comp.c (gpg_agent_runtime_change): Use --no-autostart.
+ (scdaemon_runtime_change): Ditto.
+ (dirmngr_runtime_change): New.
+
+ po: Copied missing translations from the 2.0 branch.
+ * po/LINGUAS: Add new translations.
+
+2014-11-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix a NULL-deref for invalid input data.
+ * g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
+ entry.
+
+2014-11-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Make the use of "--verify FILE" for detached sigs harder.
+ * g10/openfile.c (open_sigfile): Factor some code out to ...
+ (get_matching_datafile): new function.
+ * g10/plaintext.c (hash_datafiles): Do not try to find matching file
+ in batch mode.
+ * g10/mainproc.c (check_sig_and_print): Print a warning if a possibly
+ matching data file is not used by a standard signatures.
+
+ gpg: Fix a missing LF in debug output.
+ * g10/kbnode.c (dump_kbnode): Print a LF.
+
+ gpg: Remove PGP-2 related cruft.
+ * g10/armor.c (parse_hash_header,carmor_filter): Ignore MD5 in hash
+ header.
+ (fake_packet): Remove pgp-2 workaround for white space stripping.
+ * g10/filter.h (armor_filter_context_t): Remove field pgp2mode.
+ * g10/options.h (opt): Remove field pgp2_workarounds.
+ * g10/gpg.c (main): Do not set this field.
+ * g10/gpgv.c (main): Ditto.
+ * g10/mainproc.c (proc_encrypted): Use SHA-1 as fallback s2k hash
+ algo. Using MD5 here is useless.
+ (proc_plaintext): Remove PGP-2 related woraround
+ (proc_tree): Remove another workaround but keep the one for PGP-5.
+
+2014-11-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve perceived speed of secret key listings.
+ * g10/keylist.c (list_keyblock): Flush stdout for secret keys.
+
+ gpg: Fix regression in --refresh-keys.
+ * g10/keyserver.c (keyserver_get): Factor all code out to ...
+ (keyserver_get_chunk): new. Extimate line length.
+ (keyserver_get): Split up requests into chunks.
+
+ gpg: Add import options "keep-ownertrust".
+ * g10/options.h (IMPORT_KEEP_OWNERTTRUST): New.
+ * g10/import.c (parse_import_options): Add "keep-ownertrust".
+ (import_one): Act upon new option.
+
+2014-11-11 Werner Koch <wk at gnupg.org>
+
+ Remove use of gnulib (part 2)
+ * configure.ac (strpbrk): Add to AC_CHECK_FUNCS.
+ (gl_EARLY): Remove.
+ * common/stringhelp.c (strpbrk) [!HAVE_STRPBRK]: New.
+ * common/sysutils.c (gnupg_mkdtemp): New. Based on code from
+ glibc-2.6.
+ (gnupg_setenv): Rewrite.
+ (gnupg_unsetenv): Rewrite.
+ * g10/exec.c: Include sysutils.h and replace mkdtemp by gnupg_mkdtemp.
+ * g13/be-encfs.c: Ditto.
+ * g13/mount.c: Ditto.
+ * tools/symcryptrun.c (confucius_mktmpdir): Ditto.
+
+ Remove use of gnulib (part 1)
+ * gl/: Remove entire tree.
+ * configure.ac: Remove gnulib tests and the gl/ Makefile.
+ (setenv): Add to AC_CHECK_FUNCS.
+ * autogen.rc (extra_aclocal_flags): Set to empty.
+ * Makefile.am (ACLOCAL_AMFLAGS): Remove -I gl/m4
+ (SUBDIRS): Remove gl/.
+ * agent/Makefile.am (common_libs): Remove ../gl/gnulib.a
+ * common/Makefile.am (t_common_ldadd): Ditto.
+ * dirmngr/Makefile.am (dirmngr_LDADD): Ditto.
+ (dirmngr_ldap_LDADD, dirmngr_client_LDADD): Ditto.
+ * g10/Makefile.am (needed_libs): Ditto.
+ * g13/Makefile.am (g13_LDADD): Ditto.
+ * kbx/Makefile.am (kbxutil_LDADD): Ditto.
+ ($(PROGRAMS)): Ditto.
+ * scd/Makefile.am (scdaemon_LDADD): Ditto.
+ * sm/Makefile.am (common_libs): Ditto.
+ * tools/Makefile.am (common_libs, commonpth_libs): Ditto.
+
+ * agent/gpg-agent.c: Remove "mkdtemp.h"
+ * g10/exec.c: Ditto.
+ * scd/scdaemon.c: Ditto.
+ * tools/symcryptrun.c: Ditto.
+ * common/sysutils.c: Remove "setenv.h"
+
+ * common/t-timestuff.c: Use putenv if setenv is not available.
+
+2014-11-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove warning message for non-implemented search modes.
+ * kbx/keybox-search.c (keybox_search): Silently ignore.
+ * doc/specify-user-id.texi: Docuement '@", '+', and '.' search
+ prefixes.
+
+ w32: Fix http access module.
+ * common/http.c (write_server) [W32]: Rework to use send() instead of
+ write even when build with npth.
+ (cookie_read) [W32]: Rework to use recv() instead of read even when
+ build with npth.
+
+ build: Add method to use a custom swdb.lst and use adns with Windows.
+ * build-aux/getswdb.sh: Add option --skip-verify.
+ * build-aux/speedo.mk: Add config var CUSTOM_SWDB. Tage adns version
+ from swdb and build for Windows with adns.
+
+ build: Improve test for ADNS.
+ * configure.ac <adns>: Use adns_free as probe function for libadns.
+ (HAVE_ADNS_FREE): Remove bogus tests to set this and remove the macro.
+ (ADNSLIBS): Do not ac_subst - it is only used within configure.
+
+2014-11-05 Werner Koch <wk at gnupg.org>
+
+ speedo: Append the date to the Windows installer.
+ * build-aux/speedo.mk (BUILD_DATESTR): New.
+ (dist-source, installer): Use it.
+
+ Release 2.1.0.
+
+ Avoid sign extension when shifting the MSB.
+ * sm/fingerprint.c (gpgsm_get_short_fingerprint): Cast MSB before
+ shifting.
+ * g10/build-packet.c (delete_sig_subpkt): Ditto.
+
+2014-11-04 Werner Koch <wk at gnupg.org>
+
+ Remove all expired common CA certificates.
+ * doc/com-certs.pem: Remove certifciates.
+
+2014-11-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid extra pinentries for each subkey in --export-secret-keys.
+ * agent/command.c (cmd_export_key): Actually implement the cache_nonce
+ feature.
+ * g10/export.c (do_export_stream): Make use of a cache_nonce.
+
+ gpg: Fix endless loop in keylisting with fingerprint.
+ * g10/getkey.c (getkey_next): Disable cache.
+
+ gpg: Minor cleanup for key listing related code.
+ * g10/getkey.c (get_pubkey_next): Divert to getkey_next.
+ (get_pubkey_end): Move code to getkey_end.
+ * g10/keydb.c (keydb_search_reset): Add a debug statement.
+ (dump_search_desc): Add arg HD and print the handle.
+
+ gpg: Do not show an useless passphrase prompt in batch mode.
+ * g10/keygen.c: Remove unused PASSPHRASE related code.
+ (proc_parameter_file): Remove useless asking for a passphrase in batch
+ mode.
+
+2014-10-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove superfluous check for Libgcrypt >= 1.4.0.
+ * g10/gpg.c (main): Remove check.
+
+ kbx: Let keydb_search skip unwanted blobs.
+ * kbx/keybox.h (keybox_blobtype_t): New.
+ * kbx/keybox-defs.h (BLOBTYPE_*): Replace by KEYBOX_BLOBTYPE_*.
+ * kbx/keybox-search.c (keybox_search): Add arg want_blobtype and skip
+ non-matching blobs.
+ * sm/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_X509 to keybox_search.
+ * g10/keydb.c (keydb_search): Pass KEYBOX_BLOBTYPE_PGP to keybox_search.
+
+ gpg: Fix --rebuild-keydb-caches.
+ * g10/parse-packet.c (parse_key): Store even unsupported packet
+ versions.
+ * g10/keyring.c (keyring_rebuild_cache): Do not copy keys with
+ versions less than 4.
+
+ gpg: Fix testing for secret key availability.
+ * g10/getkey.c (have_secret_key_with_kid): Do not change the search
+ mode.
+
+ build: Avoid distributing backup files etc.
+ * Makefile.am (EXTRA_DIST): Do not include directories.
+
+2014-10-30 Werner Koch <wk at gnupg.org>
+
+ tests: Speed up the genkey1024.test by using not so strong random.
+ * agent/gpg-agent.c (oDebugQuickRandom): New.
+ (opts): New option --debug-quick-random.
+ (main): Use new option.
+ * common/asshelp.c (start_new_gpg_agent): Add hack to pass an
+ additional argument for the agent name.
+ * tests/openpgp/defs.inc: Pass --debug-quick-random to the gpg-agent
+ starting parameters.
+ * tests/openpgp/version.test: Ditto.
+
+2014-10-29 Werner Koch <wk at gnupg.org>
+
+ common: Check option arguments for a valid range.
+ * common/argparse.h (ARGPARSE_INVALID_ARG): New.
+ * common/argparse.c: Include limits h and errno.h.
+ (initialize): Add error strings for new error constant.
+ (set_opt_arg): Add range checking.
+
+ Fix stdint.h problem for Apple.
+ * gl/stdint_.h [__APPLE__]: Include hack.
+
+2014-10-27 Werner Koch <wk at gnupg.org>
+
+ speedo: Fixes for native build.
+ * build-aux/speedo.mk (TARGETOS): Init with empty string.
+ (speedo_pkg_gnupg_configure): Use --enable-gpg2-is-gpg only for w32.
+ (INST_VERSION, INST_PROD_VERSION): Create only for w32.
+
+2014-10-24 Werner Koch <wk at gnupg.org>
+
+ agent: Support pinentries with integrated repeat passphrase feature.
+ * agent/agent.h (struct pin_entry_info_s): Add fields repeat_okay and
+ with_repeat.
+ * agent/call-pinentry.c (close_button_status_cb): Rewrite and check
+ for PIN_REPEAT. Change users to check only the relevant bit.
+ (agent_askpin): Support repeat logic of new Pinentries.
+
+ * agent/command-ssh.c (ssh_identity_register): Use the new repeat
+ feature.
+ * agent/genkey.c (agent_ask_new_passphrase): Ditto.
+
+2014-10-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence "packet with obsolete versoin" warnings.
+ * g10/parse-packet.c (parse_key): Print warning only in very verbose
+ mode.
+
+ gpg: Make card key generation work again.
+ * g10/call-agent.c (agent_scd_learn): Rename from agent_learn.
+ (agent_learn): New.
+ * g10/keygen.c (gen_card_key): Call new agent-learn.
+
+2014-10-17 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Allow building without LDAP support.
+ * configure.ac: Add option --disable-ldap.
+ (USE_LDAP): New ac_define and am_conditional.
+ * dirmngr/Makefile.am: Take care of USE_LDAP.
+ * dirmngr/dirmngr.c (!USE_LDAP): Make all ldap options dummy options
+ and do not call any ldap function.
+ * dirmngr/server.c (!USE_LDAP): Do not call any ldap function.
+ * dirmngr/crlfetch.c (!USE_LDAP): Ditto.
+
+ w32: Set SYSROOT to help finding config scripts.
+ * autogen.sh <build-w32>: Set SYSROOT.
+
+ gpg: Remove all support for v3 keys and always create v4-signatures.
+ * g10/build-packet.c (do_key): Remove support for building v3 keys.
+ * g10/parse-packet.c (read_protected_v3_mpi): Remove.
+ (parse_key): Remove support for v3-keys. Add dedicated warnings for
+ v3-key packets.
+ * g10/keyid.c (hash_public_key): Remove v3-key support.
+ (keyid_from_pk): Ditto.
+ (fingerprint_from_pk): Ditto.
+
+ * g10/options.h (opt): Remove fields force_v3_sigs and force_v4_certs.
+ * g10/gpg.c (cmd_and_opt_values): Remove oForceV3Sigs, oNoForceV3Sigs,
+ oForceV4Certs, oNoForceV4Certs.
+ (opts): Turn --force-v3-sigs, --no-force-v3-sigs, --force-v4-certs,
+ --no-force-v4-certs int dummy options.
+ (main): Remove setting of the force_v3_sigs force_v4_certs flags.
+ * g10/revoke.c (gen_revoke, create_revocation): Always create v4 certs.
+ * g10/sign.c (hash_uid): Remove support for v3-signatures
+ (hash_sigversion_to_magic): Ditto.
+ (only_old_style): Remove this v3-key function.
+ (write_signature_packets): Remove support for creating v3-signatures.
+ (sign_file): Ditto.
+ (sign_symencrypt_file): Ditto.
+ (clearsign_file): Ditto. Remove code to emit no Hash armor line if
+ only v3-keys are used.
+ (make_keysig_packet): Remove arg SIGVERSION and force using
+ v4-signatures. Change all callers to not pass a value for this arg.
+ Remove all v3-key related code.
+ (update_keysig_packet): Remove v3-signature support.
+ * g10/keyedit.c (sign_uids): Always create v4-signatures.
+
+ * g10/textfilter.c (copy_clearsig_text): Remove arg pgp2mode and
+ change caller.
+
+2014-10-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove extra RSA import status line.
+ * g10/import.c (stats_s): Remove field "imported_rsa".
+ (import_print_stats): Do not print separate value for RSA.
+ (import_one): Remove the RSA counter.
+
+ gpg: Fix informative printing of user ids.
+ * g10/getkey.c (keyid_list): Add field "fpr".
+ (cache_user_id): Store fpr and check for dups only by fpr.
+ (get_pubkey_byfpr): New.
+ (get_user_id_string): Make static and use xasprintf.
+ (get_long_user_id_string): Use xasprintf.
+ (get_user_id_byfpr): New.
+ (get_user_id_byfpr_native): New.
+ * g10/keyid.c (fingerprint_from_pk): Make arg RET_LEN optional.
+ * g10/import.c (import_one): Use get_user_id_byfpr_native.
+
+ gpg: Allow importing keys with duplicated long key ids.
+ * g10/keydb.c (keydb_handle): Add field no_caching.
+ (keyblock_cache): Repalce field kid by fpr.
+ (keydb_disable_caching): New.
+ (keydb_search): Use the fingerprint as cache index.
+
+ * g10/import.c (import_one): Use the fingerprint and not the kid to
+ lookup the key. Call keydb_disable_caching beofre re-searching for
+ update.
+
+ * tests/openpgp/import.test: Add a test case.
+
+ tests: Speed up conventional encryption tests for gpg.
+ * tests/openpgp/conventional-mdc.test: Add an s2k-count option.
+ * tests/openpgp/conventional.test: Ditto.
+
+2014-10-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Minor change for better readability.
+ * g10/build-packet.c (write_version): Remove.
+ (do_pubkey_enc, do_onepass_sig): Write version directly.
+
+2014-10-10 Werner Koch <wk at gnupg.org>
+
+ doc: Fix a man page rendering problem.
+ * doc/gpg-agent.texi (Agent Configuration): Fix rendering of the
+ sshcontrol example.
+
+2014-10-10 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Add build and runtime support for larger RSA keys.
+ * configure.ac: Added --enable-large-secmem option.
+ * g10/options.h: Add opt.flags.large_rsa.
+ * g10/gpg.c: Contingent on configure option: adjust secmem size,
+ add gpg --enable-large-rsa, bound to opt.flags.large_rsa.
+ * g10/keygen.c: Adjust max RSA size based on opt.flags.large_rsa
+ * doc/gpg.texi: Document --enable-large-rsa.
+
+2014-10-09 Werner Koch <wk at gnupg.org>
+
+ gpg: Skip overlong keys and a print a warning.
+ * kbx/keybox-search.c (keybox_search): Add arg r_skipped and skip too
+ long blobs.
+ * sm/keydb.c (keydb_search): Call keybox_search with a dummy param.
+ * g10/keydb.c (struct keydb_handle): Add field skipped_long_blobs.
+ (keydb_search_reset): Reset that field.
+ (keydb_search): Update that field.
+ (keydb_get_skipped_counter): New.
+ * g10/keylist.c (list_all): Print count of skipped keys.
+
+ gpg: Sync keylist output and warning messages.
+ * g10/keylist.c (list_all): Flush stdout before logging.
+ * g10/misc.c (print_pubkey_algo_note): Ditto.
+ (print_cipher_algo_note): Ditto.
+ (print_digest_algo_note): Ditto.
+ (print_md5_rejected_note): Ditto.
+
+ kbx: Fix handling of overlong keys.
+ * kbx/keybox-file.c (IMAGELEN_LIMIT): Change limit from 10^6 to 2MiB.
+ (_keybox_read_blob2): Skip too long record records.
+ (_keybox_write_blob): Do not accept too long record.
+ * kbx/keybox-dump.c (file_stats_s): Add field skipped_long_blobs.
+ (_keybox_dump_file): Print new counter.
+ (_keybox_dump_file): Skip too long records.
+ ----
+
+ To test this feature you may set the limit back to 1MiB and use key
+ F7F0E70F307D56ED which is in my local copy close to 2MiB. Without
+ this patch it was possible to import the key but access to that key
+ and all keys stored after it was not possible.
+
+ gpg: Take care to use pubring.kbx if it has ever been used.
+ * kbx/keybox-defs.h (struct keybox_handle): Add field for_openpgp.
+ * kbx/keybox-file.c (_keybox_write_header_blob): Set openpgp header
+ flag.
+ * kbx/keybox-blob.c (_keybox_update_header_blob): Add arg for_openpgp
+ and set header flag.
+ * kbx/keybox-init.c (keybox_new): Rename to do_keybox_new, make static
+ and add arg for_openpgp.
+ (keybox_new_openpgp, keybox_new_x509): New. Use them instead of the
+ former keybox_new.
+ * kbx/keybox-update.c (blob_filecopy): Add arg for_openpgp and set the
+ openpgp header flags.
+
+ * g10/keydb.c (rt_from_file): New. Factored out and extended from
+ keydb_add_resource.
+ (keydb_add_resource): Switch to the kbx file if it has the openpgp
+ flag set.
+
+ * kbx/keybox-dump.c (dump_header_blob): Print header flags.
+
+2014-10-09 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Avoid unnecessary library linkage.
+ * dirmngr/Makefile.am: Avoid $(DNSLIBS) for dirmngr_ldap
+ * g10/Makefile.am: $(LIBREADLINE) is only for gpg2; gpgv2 does not
+ need $(LIBASSUAN_LIBS)
+ * sm/Makefile.am: gpgsm does not need $(ZLIBS)
+ * tools/Makefile.am: gpgconf does not need $(NPTH_LIBS)
+
+2014-10-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid error exit if keygrip computations fails in a key listing.
+ * g10/keyid.c (keygrip_from_pk): Use log_info and clear array on error.
+
+2014-10-03 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta864.
+
+ gpg: Allow creating a cert-only primary key.
+ * g10/keygen.c (ask_key_flags): Allow a 'c' in direct entry.
+
+ build: Add configure options --disable-{ntb,gnu}tls.
+ * configure.ac: Add --disable-ntbtls and --disable-gnutls.
+
+2014-10-03 Andre Heinecke <aheinecke at intevation.de>
+
+ gpg: Check gpg-agent version before 2.1 migration.
+ * g10/call-agent.c, g10/call-agent.h (agent_get_version): New.
+ * g10/migrate.c (migrate_secring): Abort migration if
+ agent_get_version returns not at least 2.1.0
+
+2014-10-03 Werner Koch <wk at gnupg.org>
+
+ po: Update German translation.
+
+ Remove support for the GPG_AGENT_INFO envvar.
+ * agent/agent.h (opt): Remove field use_standard_socket.
+ * agent/command.c (cmd_killagent): Always allow killing.
+ * agent/gpg-agent.c (main): Turn --{no,}use-standard-socket and
+ --write-env-file into dummy options. Always return true for
+ --use-standard-socket-p. Do not print the GPG_AGENT_INFO envvar
+ setting or set that envvar.
+ (create_socket_name): Simplify by removing non standard socket
+ support.
+ (check_for_running_agent): Ditto.
+ * common/asshelp.c (start_new_gpg_agent): Remove GPG_AGENT_INFO use.
+ * common/simple-pwquery.c (agent_open): Ditto.
+ * configure.ac (GPG_AGENT_INFO_NAME): Remove.
+ * g10/server.c (gpg_server): Do not print the AgentInfo comment.
+ * g13/server.c (g13_server): Ditto.
+ * sm/server.c (gpgsm_server): Ditto.
+ * tools/gpgconf.c (main): Simplify by removing non standard socket
+ support.
+
+2014-10-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix regression removing SHA256.
+ * g10/misc.c (map_md_openpgp_to_gcry): Always use SHA256.
+
+ First changes for future use of NTBTLS.
+ * configure.ac (NEED_NTBTLS_ABI, NEED_NTBTLS_VERSION): New.
+ (HTTP_USE_NTBTLS): New. Prefer over GNUTLS.
+ * m4/ntbtls.m4: New.
+ * m4/Makefile.am (EXTRA_DIST): Add new file.
+ * common/http.c: Add conditionals to eventually use NTBTLS.
+
+ build: Update m4 scripts.
+ * m4/gpg-error.m4: Update from Libgpg-error git master.
+ * m4/libgcrypt.m4: Update from Libgcrypt git master.
+ * configure.ac: Declare SYSROOT a precious variable. Add extra error
+ message for library configuration mismatches.
+
+2014-09-29 Werner Koch <wk at gnupg.org>
+
+ doc: Remove GnuPG-1 related parts from gpg.texi.
+ * doc/Makefile.am (YAT2M_OPTIONS): Add 2.1 to the source info.
+ * doc/gpg.texi: Remove gpg1 related texts.
+
+2014-09-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Default to SHA-256 for all signature types on RSA keys.
+ * g10/main.h (DEFAULT_DIGEST_ALGO): Use SHA256 in --gnupg and SHA1 in
+ strict RFC or PGP modes.
+ * g10/sign.c (make_keysig_packet): Use DEFAULT_DIGEST_ALGO also for
+ RSA key signatures.
+ * configure.ac: Do not allow to disable sha256.
+
+ gpg: Simplify command --gen-key and add --full-gen-key.
+ * g10/gpg.c (aFullKeygen): New.
+ (opts): Add command --full-key-gen.
+ (main): Implement it.
+ * g10/keygen.c (DEFAULT_STD_ALGO): Replace wrong GCRY_PK_RSA although
+ the value is identical.
+ (DEFAULT_STD_CURVE): New.
+ (DEFAULT_STD_SUBALGO): New.
+ (DEFAULT_STD_SUBKEYSIZE): New.
+ (DEFAULT_STD_SUBCURVE): New.
+ (quick_generate_keypair): Use new macros here.
+ (generate_keypair): Add arg "full" and fix call callers. Do not ask
+ for keysize in non-full node.
+ (ask_user_id): Add arg "full" and simplify for non-full mode.
+
+2014-09-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Add shortcut for setting key capabilities.
+ * g10/keygen.c (ask_key_flags): Add shortcut '='.
+ * doc/help.txt (gpg.keygen.flags): New.
+
+2014-09-25 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not always print dashes in obsolete_option.
+ * g10/gpg.c (main): Pass option names to obsolete_option without
+ double dash.
+ * g10/misc.c (obsolete_option, obsolete_scdaemon_option): Print double
+ dash only for command line options.
+
+2014-09-25 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Warn about (but don't fail) on scdaemon options in gpg.conf.
+ * g10/gpg.c: Add config options that should belong in scdaemon.conf
+ * g10/main.h, g10/misc.c (obsolete_scdaemon_option): New.
+
+2014-09-22 Werner Koch <wk at gnupg.org>
+
+ speedo: Check that wget and gpgv are installed.
+ * build-aux/getswdb.sh: Check for required tools.
+
+ speedo: Autodetect sha1sum tools.
+ * build-aux/getswdb.sh: Add option --find-sha1sum.
+ * build-aux/speedo.mk (check-tools): New phony target. Not yet used.
+ (SHA1SUM): New var. Use it instead of sha1sum.
+
+ gpg: Create default keyring with .kbx suffix.
+ * g10/keydb.c (maybe_create_keyring_or_box): Rename arg for clarity.
+ (keydb_add_resource): Fix order of args to maybe_create_keyring_or_box
+ and check and create .kbx.
+
+2014-09-20 Werner Koch <wk at gnupg.org>
+
+ gpg: --delete-secret-key - check that a secret key exists.
+ * g10/delkey.c (do_delete_key): Check availibility of a secret key.
+
+ gpg: Make algorithm selection prompt for ECC more clear.
+ * g10/keygen.c (ask_algo): Change 9 to "ECC and ECC".
+
+2014-09-18 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta834.
+
+ speedo: Distribute needed files.
+ * Makefile.am (EXTRA_DIST): Add speedo stuff.
+
+ build: Enable gpgtar by default.
+
+ common: Do not build maintainer modules in non-maintainer mode.
+ * common/Makefile.am (module_maint_tests): Use only in maintainer
+ mode.
+ (t_common_cflags): New.
+
+ common: Remove superfluous statements.
+ * common/exechelp-posix.c: Remove weak pragmas.
+ * common/sexputil.c (make_canon_sexp_from_rsa_pk): Remove double
+ const.
+
+ g13: Avoid segv after pipe creation failure.
+ * g13/call-gpg.c (gpg_encrypt_blob): Init some vars in case of an
+ early error.
+ (gpg_decrypt_blob): Ditto.
+
+ scd: Fix int/short mismatch in format string of app-p15.c.
+ * scd/app-p15.c (parse_certid): Use snprintf and cast value.
+ (send_certinfo): Ditto.
+ (send_keypairinfo): Ditto.
+ (do_getattr): Ditto.
+
+ agent: Init a local variable in the error case.
+ * agent/pksign.c (do_encode_md): Init HASH on error.
+
+ agent: Remove left over debug output.
+ * agent/command-ssh.c (ssh_signature_encoder_eddsa): Remove debug
+ output.
+
+ agent: Silence compiler warning for a debug message.
+ * agent/call-pinentry.c (agent_query_dump_state): Use %p for
+ POPUP_TID.
+
+ sm: Silence compiler warnings.
+ * sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Remove unused var I.
+ * sm/certreqgen.c (proc_parameters): Init PUBLIC to avoid compiler
+ warning.
+
+ gpg: Silence a compiler warning.
+ * g10/parse-packet.c (enum_sig_subpkt): Replace hack.
+
+ gpg: Replace a hash algo test function.
+ * g10/gpg.c (print_mds): Replace openpgp_md_test_algo.
+
+ speedo: Various fixes.
+ * build-aux/speedo.mk: Take zlib and bzip2 from ftp.gnupg.org. Minor
+ other fixes.
+
+2014-09-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Print a warning if the subkey expiration may not be what you want.
+ * g10/keyedit.c (subkey_expire_warning): New.
+ (keyedit_menu): Call it when needed.
+
+ gpg: Improve passphrase caching.
+ * agent/cache.c (last_stored_cache_key): New.
+ (agent_get_cache): Allow NULL for KEY.
+ (agent_store_cache_hit): New.
+ * agent/findkey.c (unprotect): Call new function and try to use the
+ last stored key.
+
+ * g10/revoke.c (create_revocation): Add arg CACHE_NONCE and pass to
+ make_keysig_packet.
+ (gen_standard_revoke): Add arg CACHE_NONCE and pass to
+ create_revocation.
+ * g10/keygen.c (do_generate_keypair): Call gen_standard_revoke with
+ cache nonce.
+
+2014-09-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Use algorithm id 22 for EdDSA.
+ * common/openpgpdefs.h (PUBKEY_ALGO_EDDSA): Change to 22.
+ * g10/keygen.c (ask_curve): Reword the Curve25519 warning note.
+
+2014-09-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Stop early on bogus old style comment packets.
+ * g10/parse-packet.c (parse_key): Take care of too short packets for
+ old style commet packets.
+
+2014-09-10 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Support https for KS_FETCH.
+ * dirmngr/ks-engine-hkp.c (cert_log_cb): Move to ...
+ * dirmngr/misc.c (cert_log_cb): here.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Support 307-redirection
+ and https.
+
+ dirmngr: Fix the ks_fetch command for the http scheme.
+ * common/http.c (http_session_ref): Allow for NULL arg.
+
+2014-09-08 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix memory leak in ECC encryption.
+ * g10/pkglue.c (pk_encrypt): Fix memory leak and streamline error
+ handling.
+
+2014-09-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix export of NIST ECC keys.
+ * common/openpgp-oid.c (struct oidtable): New.
+ (openpgp_curve_to_oid): Rewrite and allow OID as input.
+ (openpgp_oid_to_curve): Make use of the new table.
+
+ agent: Fix import of OpenPGP EdDSA keys.
+ * agent/cvt-openpgp.c (get_keygrip): Special case EdDSA.
+ (convert_secret_key): Ditto.
+ (convert_transfer_key): Ditto.
+ (apply_protection): Handle opaque MPIs.
+
+ (do_unprotect): Check FLAG_OPAQUE instead of FLAG_USER1 before
+ unpacking an opaque mpi.
+
+2014-09-01 Kyle Butt <kylebutt at gmail.com>
+
+ gpg: Fix export of ecc secret keys by adjusting check ordering.
+ * g10/export.c (transfer_format_to_openpgp): Move the check against
+ PUBKEY_MAX_NSKEY to after the ECC code adjusts the number of
+ parameters.
+
+2014-09-01 Werner Koch <wk at gnupg.org>
+
+ agent: Allow key unprotection using AES-256.
+ * agent/protect.c (PROT_CIPHER): Rename to GCRY_CIPHER_AES128 for
+ clarity.
+ (do_decryption): Add args prot_cipher and prot_cipher_keylen. USe
+ them instead of the hardwired values.
+ (agent_unprotect): Change to use a table of protection algorithms.
+ Add AES-256 variant.
+
+2014-08-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Do not show "MD5" and triplicated "RSA" in --version.
+ * g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
+ (build_list_md_test_algo): Ignore MD5.
+
+ gpg: Do not show "MD5" and triplicated "RSA" in --version.
+ * g10/gpg.c (build_list_pk_test_algo): Ignore RSA aliases
+ (build_list_md_test_algo): Ignore MD5.
+
+2014-08-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove CAST5 from the default prefs and order SHA-1 last.
+ * g10/keygen.c (keygen_set_std_prefs): Update prefs.
+
+ Switch to the libgpg-error provided estream.
+ * configure.ac (NEED_GPG_ERROR_VERSION): Reguire 1.14.
+ (GPGRT_ENABLE_ES_MACROS): Define.
+ (estream_INIT): Remove.
+ * m4/estream.m4: Remove.
+ * common/estream-printf.c, common/estream-printf.h: Remove.
+ * common/estream.c, common/estream.h: Remove.
+ * common/init.c (_init_common_subsystems): Call gpgrt initialization.
+
+ gpg: Allow for positional parameters in the passphrase prompt.
+ * g10/passphrase.c (passphrase_get): Replace sprintf by xasprintf.
+
+2014-08-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix "can't handle public key algorithm" warning.
+ * g10/parse-packet.c (unknown_pubkey_warning): Check for encr/sign
+ capabilities.
+
+2014-08-19 Werner Koch <wk at gnupg.org>
+
+ speedo: Get version numbers from online database.
+ * build-aux/getswdb.sh: New.
+ * build-aux/speedo.mk: Get release version numbers from swdb.lst.
+
+ build: Create VERSION file via autoconf.
+ * Makefile.am (dist-hook): Remove creation of VERSION.
+ (EXTRA_DIST): Add VERSION.
+ * configure.ac: Let autoconf create VERSION.
+
+2014-08-18 Werner Koch <wk at gnupg.org>
+
+ gpg: Install the current release signing pubkey.
+ * g10/distsigkey.gpg: New.
+
+ agent: Return NO_SECKEY instead of ENONET for PKSIGN and others.
+ * agent/pksign.c (agent_pksign_do): Replace ENONET by NO_SECKEY.
+ * agent/findkey.c (agent_key_from_file): No diagnostic for NO_SECKEY.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Replace checking for ENOENT.
+
+ kbx: Make user id and signature data optional for OpenPGP.
+ * kbx/keybox-blob.c (_keybox_create_openpgp_blob): Remove restriction.
+
+ gpg: Change default cipher for --symmetric from CAST5 to AES-128.
+ * g10/main.h (DEFAULT_CIPHER_ALGO): Chhange to AES or CAST5 or 3DES
+ depending on configure option.
+ * g10/gpg.c (main): Set opt.s2k_cipher_algo to DEFAULT_CIPHER_ALGO.
+
+ yat2m: Support @set and @value.
+ * doc/yat2m.c (variablelist): New.
+ (set_variable): New.
+ (macro_set_p): Also check the variables.
+ (proc_texi_cmd): Support the @value command.
+ (parse_file): Support the @set command.
+ (top_parse_file): Release variablelist.
+
+ yat2m: Support the $* command for man page rendering.
+
+2014-08-17 Werner Koch <wk at gnupg.org>
+
+ estream: Change license from GPL to LPGL.
+ * common/estream-printf.c, common/estream-printf.h: Change license.
+ * common/estream.c, common/estream.h: Ditto.
+
+2014-08-14 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta783.
+
+ po: Update the German (de) translation.
+
+ sm: Create homedir and lock empty keybox creation.
+ * sm/gpgsm.h (opt): Add field "no_homedir_creation".
+ * sm/gpgsm.c (main): Set it if --no-options is used.
+ * sm/keydb.c (try_make_homedir): New. Similar to the one from
+ g10/openfile.c.
+ (maybe_create_keybox): New. Similar to the one from g10/keydb.c.
+ (keydb_add_resource): Replace some code by maybe_create_keybox.
+
+ gpg: Screen keyserver responses.
+ * g10/main.h (import_screener_t): New.
+ * g10/import.c (import): Add screener callbacks to param list.
+ (import_one): Ditto.
+ (import_secret_one): Ditto.
+ (import_keys_internal): Ditto.
+ (import_keys_stream): Ditto.
+ * g10/keyserver.c (struct ks_retrieval_screener_arg_s): New.
+ (keyserver_retrieval_screener): New.
+ (keyserver_get): Pass screener to import_keys_es_stream().
+
+ scd: Minor changes to app-sc-hsm.
+ * scd/app-sc-hsm.c: Re-indendet some parts and set some vars to NULL
+ after xfree for improbed robustness.
+ (read_ef_prkd): Replace serial operator by blocks for better
+ readability.
+ (apply_PKCS_padding): Rewrite for easier auditing.
+ (strip_PKCS15_padding): Ditto. Add stricter check on SRCLEN.
+
+ gpg: Disable an MD5 workaround for pgp2 by default.
+ * g10/sig-check.c (do_check): Move some code to ...
+ * g10/misc.c (print_md5_rejected_note): new function.
+ * g10/mainproc.c (proc_tree, proc_plaintext): Enable MD5 workaround
+ only if option --allow-weak-digest-algos is used.
+
+ gpg: Remove options --pgp2 and --rfc1991.
+ * g10/gpg.c (oRFC1991, oPGP2): Remove
+ (opts): Remove --pgp2 and --rfc1991.
+ * g10/options.h (CO_PGP2, CO_RFC1991): Remove. Remove all users.
+ (RFC2440, PGP2): Remove. Remove all code only enabled by these
+ conditions.
+ * tests/openpgp/clearsig.test: Remove --rfc1991 test.
+
+ build: Fix autogen.sh base version hack.
+ * autogen.sh <find-version>: Fix.
+
+ gpg: Remove --compress-keys and --compress-sigs feature.
+ * g10/gpg.c (oCompressKeys, oCompressSigs): Remove.
+ (opts): Turn --compress-keys and --compress-signs in NOPs.
+ * g10/options.h (opt): Remove fields compress_keys and compress_sigs.
+ * g10/export.c (do_export): Remove compress_keys feature.
+ * g10/sign.c (sign_file): Remove compress_sigs feature.
+
+2014-08-13 Werner Koch <wk at gnupg.org>
+
+ gpg: Add list-option "show-usage".
+ * g10/gpg.c (parse_list_options): Add "show-usage".
+ * g10/options.h (LIST_SHOW_USAGE): New.
+ * g10/keyid.c (usagestr_from_pk): Add arg FILL. Change caller.
+ * g10/keylist.c (list_keyblock_print): Print usage info.
+
+2014-08-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Make --with-colons work again for --search-keys.
+ * g10/keyserver.c (search_line_handler): Replace log_debug by
+ es_printf.
+
+2014-08-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2014-07-25 Werner Koch <wk at gnupg.org>
+
+ scd: Minor and editorial changes to app-sc-hsm.c.
+ * scd/app-sc-hsm.c (select_and_read_binary): Use SW_ macro.
+ (parse_certid): Remove useless test.
+ (send_certinfo, send_keypairinfo): Shrink malloc to the needed size.
+ (do_getattr): Ditto.
+ (verify_pin): Use SW_ macro.
+ (do_decipher): Replace OFS variable and extend comment.
+
+ scd: Add a new status word code.
+ * scd/apdu.h (SW_REF_DATA_INV): New.
+ * scd/apdu.c (apdu_strerror): Add string.
+
+2014-07-25 Andreas Schwier <andreas.schwier at cardcontact.de>
+
+ scd: Support for SmartCard-HSM.
+ * scd/app-sc-hsm.c: New.
+ * scd/app.c (select_application, get_supported_applications): Register
+ new app.
+
+2014-07-25 Werner Koch <wk at gnupg.org>
+
+ gpg: Switch to an EdDSA format with prefix byte.
+ * g10/keygen.c (gen_ecc): USe "comp" for EdDSA.
+
+2014-07-23 Werner Koch <wk at gnupg.org>
+
+ agent: Show just one warning with all failed passphrase constraints.
+ * agent/genkey.c (check_passphrase_constraints): Build a final warning
+ after all checks.
+
+ agent: Only one confirmation prompt for an empty passphrase.
+ * agent/genkey.c (check_passphrase_constraints): Moev empty passphrase
+ check to the front.
+
+ gpg: Add command --quick-gen-key.
+ * g10/gpg.c (aQuickKeygen): New.
+ * g10/misc.c (is_valid_user_id): New stub.
+ * g10/keygen.c (quickgen_set_para): New.
+ (quick_generate_keypair): New.
+
+ common: Add cpr_get_answer_is_yes_def()
+ * g10/cpr.c (cpr_get_answer_is_yes): Factor code out to ....
+ (cpr_get_answer_is_yes_def): ...new.
+
+ gpg: Make --quick-sign-key promote local key signatures.
+ * g10/keyedit.c (sign_uids): Promote local sigs in quick mode.
+
+2014-07-22 Werner Koch <wk at gnupg.org>
+
+ scd: Do not use the pcsc-wrapper.
+ * scd/apdu.c (NEED_PCSC_WRAPPER): Do not define.
+ * scd/Makefile.am (libexec_PROGRAMS): Remove gnupg-pcsc-wrapper
+ (gnupg_pcsc_wrapper_SOURCES): Remove.
+ (gnupg_pcsc_wrapper_LDADD): Remove.
+ (gnupg_pcsc_wrapper_CFLAGS): Remove.
+
+2014-07-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve --list-packets output for faulty packets.
+ * g10/parse-packet.c: Add list_mode output for certain failures.
+
+ gpg: Cap size of attribute packets at 16MB.
+ * g10/parse-packet.c (parse_attribute): Avoid xmalloc failure and cap
+ size of packet.
+
+2014-07-03 Werner Koch <wk at gnupg.org>
+
+ Release 2.1.0-beta751.
+
+ gpg: Make show-uid-validity the default.
+
+ tests: Fix end-of-all-ticks test for Western locales.
+ * common/t-timestuff.c (test_timegm): Use timegm if available.
+ (main): Set TX to UTC if timegm is not available.
+
+2014-07-03 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ gpg: Spelling error.
+
+2014-06-30 Werner Koch <wk at gnupg.org>
+
+ gpg: Auto-create revocation certificates.
+ * configure.ac (GNUPG_OPENPGP_REVOC_DIR): New config define.
+ * g10/revoke.c (create_revocation): Add arg "leadin".
+ (gen_standard_revoke): New.
+ * g10/openfile.c (get_openpgp_revocdir): New.
+ (open_outfile): Add MODE value 3.
+ * g10/keyid.c (hexfingerprint): New.
+ * g10/keygen.c (do_generate_keypair): Call gen_standard_revoke.
+
+ estream: Fix minor glitch in "%.*s" format.
+ * common/estream-printf.c (pr_string): Take care of non-nul terminated
+ strings.
+
+ gpg: Rearrange code in gen_revoke.
+ * g10/revoke.c (gen_revoke): Factor some code out to ...
+ (create_revocation): new.
+
+ gpg: Create exported secret files and revocs with mode 700.
+ * common/iobuf.c (direct_open): Add arg MODE700.
+ (iobuf_create): Ditto.
+ * g10/openfile.c (open_outfile): Add arg RESTRICTEDPERM. Change call
+ callers to pass 0 for it.
+ * g10/revoke.c (gen_desig_revoke, gen_revoke): Here pass true for new
+ arg.
+ * g10/export.c (do_export): Pass true for new arg if SECRET is true.
+
+ common: Minor code cleanup for a legacy OS.
+ * common/iobuf.c (direct_open) [__riscos__]: Simply cpp conditionals.
+
+2014-06-27 Werner Koch <wk at gnupg.org>
+
+ speedo: Fix the w32 installer name.
+
+ po: Update some strings of the French (fr) translation.
+
+ po: Update the German (de) translation.
+
+ agent: Adjust for changed npth_eselect under W32.
+ * agent/gpg-agent.c (handle_connections) [W32]: Make events_set an
+ unsigned int to match the changed prototype.
+
+ dirmngr: Use the homedir based socket also under W32.
+ * common/homedir.c (dirmngr_user_socket_name): Use same code for all
+ platforms.
+
+2014-06-27 Yuri Chornoivan <yurchor at ukr.net>
+
+ po: Update and enable Ukrainian (uk) translation.
+
+ Fix typos in messages.
+
+2014-06-27 Werner Koch <wk at gnupg.org>
+
+ build: Remove unused options.
+ * configure.ac: Remove option --build-agent-only.
+ (FAKE_CURL, GPGKEYS_CURL): Remove check for cURL
+ (GPGKEYS_MAILTO): Remove ac_subst but keep the currently unused
+ SENDMAIL check.
+ (GPGKEYS_KDNS): Remove ac_subst.
+ * autogen.rc (final_info): Remove suggestion to use the removed option
+ --enable-mailto.
+
+2014-06-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Add pinpad support for REINER SCT cyberJack go.
+ * scd/ccid-driver.h (VENDOR_REINER, CYBERJACK_GO): New.
+ * scd/ccid-driver.c (ccid_transceive_secure): Handle the case for
+ VENDOR_REINER. Original work was by Alina Friedrichsen (tiny change).
+
+2014-06-27 Werner Koch <wk at gnupg.org>
+
+ scd: Support reader Gemalto IDBridge CT30.
+ * scd/ccid-driver.h (GEMPC_CT30): New product id.
+ * scd/ccid-driver.c (parse_ccid_descriptor): Add quirk for that
+ reader.
+
+2014-06-26 Werner Koch <wk at gnupg.org>
+
+ gpg: Limit keysize for unattended key generation to useful values.
+ * g10/keygen.c (gen_elg): Enforce keysize 1024 to 4096.
+ (gen_rsa): Enforce keysize 1024 to 4096.
+ (gen_dsa): Enforce keysize 768 to 3072.
+
+ Enable DNS SRV records again.
+ * configure.ac (GPGKEYS_HKP, GPGKEYS_FINGER): Remove ac_subst.
+ (use_dns_srv): Make test work.
+
+ agent: Fix export of RSA keys to OpenPGP.
+ * agent/cvt-openpgp.c (convert_transfer_key): Fix sexp build format
+ string.
+
+ gpg,gpgsm: Simplify wrong_args function.
+
+ speedo: "make clean-gnupg" may not remove the source.
+ * build-aux/speedo.mk (clean-$(1)): Take care of gnupg.
+
+ gpgsm: Fix default config name.
+
+2014-06-25 Werner Koch <wk at gnupg.org>
+
+ doc: Improve the rendering of the manual.
+
+ doc: Update for modern makeinfo.
+ * doc/texi.css: Remove.
+ * doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.
+
+ gpg: Allow key-to-card upload for cert-only keys.
+ * g10/card-util.c (card_store_subkey): Allo CERT usage for key 0.
+
+2014-06-24 Werner Koch <wk at gnupg.org>
+
+ doc: Add conditionals for GnuPG-1.
+
+2014-06-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Make export of ECC keys work again.
+ * agent/cvt-openpgp.c (convert_to_openpgp): Use the curve name instead
+ of the curve parameters.
+ * g10/export.c (canon_pubkey_algo): Rename to ...
+ (canon_pk_algo): this. Support ECC.
+ (transfer_format_to_openpgp): Expect curve name.
+
+ gpg: Avoid infinite loop in uncompressing garbled packets.
+ * g10/compress.c (do_uncompress): Limit the number of extra FF bytes.
+
+2014-06-17 Kristian Fiskerstrand <kf at sumptuouscapital.com>
+
+ gpg: Fix a couple of spelling errors.
+
+2014-06-17 Werner Koch <wk at gnupg.org>
+
+ speedo: Support building from dist-source generated tarball.
+
+2014-06-13 Werner Koch <wk at gnupg.org>
+
+ http: Print human readable GNUTLS status.
+ * common/http.c (send_gnutls_bye): Take care of EAGAIN et al.
+ (http_verify_server_credentials): Print a human readable status.
+
+2014-06-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Improve the output of --list-packets.
+ * g10/parse-packet.c (parse): Print packet meta info in list mode.
+
+2014-06-11 Werner Koch <wk at gnupg.org>
+
+ speedo: Improve building of the w32 installer.
+ * build-aux/speedo.mk: Change name of build directory to PLAY.
+ Improve the dist-source target.
+ * build-aux/speedo/w32/gdk-pixbuf-loaders.cache: Add a blank
+ line (plus comment).
+ * build-aux/speedo/w32/inst.nsi: Change name of file to gnupg-w32-*.
+ Install more tools.
+
+2014-06-10 Werner Koch <wk at gnupg.org>
+
+ speedo: Revamped speedo and include a w32 installer.
+ * build-aux/speedo/: New.
+ * build-aux/speedo/w32/: New.
+
+ build: Add more options to autogen.sh.
+ * autogen.sh: Add options --print-host and --print-build.
+
+ w32: Fix build problem with dirmngr.
+ * dirmngr/ks-engine-hkp.c (EAI_SYSTEM) [W32]: Add replacement
+ constant.
+
+ gpg: Use more specific reason codes for INV_RECP.
+ * g10/pkclist.c (find_and_check_key, build_pk_list): Use more specific
+ reasons codes for INV_RECP.
+
+2014-06-06 Werner Koch <wk at gnupg.org>
+
+ Improve the beta number generation.
+ * autogen.sh: Add option --find-version
+ * configure.ac: Rework the setting of the mym4_ variables.
+
+2014-06-05 Werner Koch <wk at gnupg.org>
+
+ Remove keyserver helper code.
+ * configure.ac: Remove keyserver helper related stuff.
+ * Makefile.am (SUBDIRS): Remove keyserver.
+ * keyserver/Makefile.am: Remove.
+
+ gpg: Require confirmation for --gen-key with experimental curves.
+ * g10/keygen.c (ask_curve): Add arg both. Require confirmation for
+ Curve25519.
+
+ gpg: Auto-migrate existing secring.gpg.
+ * g10/migrate.c: New.
+ * g10/import.c (import_old_secring): New.
+ (import_one): Add arg silent.
+ (transfer_secret_keys): Add arg batch.
+ (import_secret_one): Add args batch and for_migration.
+ * g10/gpg.c (main): Call migration function.
+
+2014-06-04 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Fix commit be07ed65.
+ * sm/server.c (option_handler): Use "with-secret".
+
+2014-06-03 Werner Koch <wk at gnupg.org>
+
+ Add new option --with-secret.
+ * g10/gpg.c: Add option --with-secret.
+ * g10/options.h (struct opt): Add field with_secret.
+ * g10/keylist.c (public_key_list): Pass opt.with_secret to list_all
+ and list_one.
+ (list_all, list_one): Add arg mark_secret.
+ (list_keyblock_colon): Add arg has_secret.
+ * sm/gpgsm.c: Add option --with-secret.
+ * sm/server.c (option_handler): Add option "with-secret".
+ * sm/gpgsm.h (server_control_s): Add field with_secret.
+ * sm/keylist.c (list_cert_colon): Take care of with_secret. Also move
+ the token string from the wrong field 14 to 15.
+
+ gpgsm: New commands --export-secret-key-{p8,raw}
+ * sm/gpgsm.c: Add new commands.
+ * sm/minip12.c (build_key_sequence): Add arg mode.
+ (p12_raw_build): New.
+ * sm/export.c (export_p12): Add arg rawmode. Call p12_raw_build.
+ (gpgsm_p12_export): Ditto.
+ (print_short_info): Print the keygrip.
+
+2014-06-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid NULL-deref in default key listing.
+ * g10/keyid.c (hash_public_key): Take care of NULL keys.
+ * g10/misc.c (pubkey_nbits): Ditto.
+
+ gpg: Simplify default key listing.
+ * g10/mainproc.c (list_node): Rework.
+
+ gpg: Graceful skip reading of corrupt MPIs.
+ * g10/parse-packet.c (mpi_read): Change error message on overflow.
+
+ gpgsm: Handle re-issued CA certificates in a better way.
+ * sm/certchain.c (find_up_search_by_keyid): Consider all matching
+ certificates.
+ (find_up): Add some debug messages.
+
+ gpgsm: Add a way to save a found state.
+ * kbx/keybox-defs.h (keybox_found_s): New.
+ (keybox_handle): Factor FOUND out to above. Add saved_found.
+ * kbx/keybox-init.c (keybox_release): Release saved_found.
+ (keybox_push_found_state, keybox_pop_found_state): New.
+
+ * sm/keydb.c (keydb_handle): Add field saved_found.
+ (keydb_new): Init it.
+ (keydb_push_found_state, keydb_pop_found_state): New.
+
+ gpg: Fix bug parsing a zero length user id.
+ * g10/getkey.c (get_user_id): Do not call xmalloc with 0.
+
+ * common/xmalloc.c (xmalloc, xcalloc): Take extra precaution not to
+ pass 0 to the arguments.
+
+2014-05-19 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Print certificates on failed TLS verification.
+ * dirmngr/ks-engine-hkp.c (cert_log_cb): New.
+ (send_request): Set callback.
+
+ http: Add callback to help logging of server certificates.
+ * common/http.c (http_session_s): Add field cert_log_cb.
+ (http_session_set_log_cb): New.
+ (http_verify_server_credentials): Call callback.
+
+2014-05-16 Werner Koch <wk at gnupg.org>
+
+ keyserver: Improve support for hkps pools.
+ * dirmngr/ks-engine-hkp.c (hostinfo_s): Add fields cname, v4addr, and
+ v6addr.
+ (create_new_hostinfo): Clear them.
+ (my_getnameinfo): Add args numeric and r_isnumeric.
+ (is_ip_address): New.
+ (map_host): Add arg r_host. Rewrite the code to handle pools in a
+ special way.
+ (ks_hkp_print_hosttable): Change format of help info output.
+ (make_host_part): Add arg optional r_httphost.
+ (send_request): Add arg httphost.
+ (ks_hkp_search, ks_hkp_get, ks_hkp_put): Get httphost and pass it to
+ send_request.
+
+ http: Allow overriding of the Host header.
+ * common/http.c (http_open): Add arg httphost.
+ (http_open_document): Pass NULL for httphost.
+ (send_request): Add arg httphost. If given, use HTTPHOST instead of
+ SERVER. Use https with a proxy if requested.
+ (http_verify_server_credentials): Do not stop at the first error
+ message.
+ * dirmngr/ocsp.c (do_ocsp_request): Adjust call to http_open.
+ * keyserver/curl-shim.c (curl_easy_perform): Ditto.
+ * dirmngr/ks-engine-http.c (ks_http_fetch): Ditto.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_help): Ditto.
+
+2014-05-14 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix uninitialized access to search descindex with gpg keyboxes.
+ * kbx/keybox-search.c (keybox_search): Add arg R_DESCINDEX. Chnage
+ both callers.
+ * g10/keydb.c (keydb_search): Always set DESCINDEX.
+
+ w32: Make make_absfilename work with drive letters.
+ * common/stringhelp.c (do_make_filename) [HAVE_DRIVE_LETTERS]: Fix.
+
+ gpg: Remove useless diagnostic in MDC verification.
+ * g10/decrypt-data.c (decrypt_data): Do not distinguish between a bad
+ MDC packer header and a bad MDC.
+
+ gpg: Fix glitch entering a full expiration time.
+ * g10/keygen.c (ask_expire_interval): Get the current time after the
+ prompt.
+
+2014-05-08 Werner Koch <wk at gnupg.org>
+
+ agent: Fix import of non-protected gpg keys.
+ * agent/cvt-openpgp.c (do_unprotect): Return an s-exp also for
+ non-protected keys.
+ (convert_from_openpgp_main): Do not call agent_askpin for a
+ non-protected key.
+
+ Make more use of *_NAME macros.
+ * configure.ac (GPG_DISP_NAME, GPGSM_DISP_NAME): New.
+ (GPG_AGENT_DISP_NAME, SCDAEMON_DISP_NAME): New.
+ (DIRMNGR_DISP_NAME, G13_DISP_NAME): New.
+ (GPGCONF_DISP_NAME): New.
+ (SCDAEMON_SOCK_NAME): New.
+ * common/argparse.c (show_help): Map description string.
+
+2014-05-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix auth key comment handling.
+ * agent/command-ssh.c (ssh_send_key_public): Handle the case with no
+ comment.
+
+2014-05-07 Werner Koch <wk at gnupg.org>
+
+ Make -jN work again.
+ * common/Makefile.am ($(PROGRAMS)): New rule
+ (t_http_LDADD): Use libcommontls.a without directory prefix.
+ * dirmngr/Makefile.am ($(PROGRAMS)): New rule.
+
+ gpg: Print the key algorithm/curve with signature info.
+ * g10/mainproc.c (check_sig_and_print): Print the name and curve.
+
+ gpg: Fix memleak in signature verification of bogus keys.
+ * g10/mainproc.c (check_sig_and_print): Factor common code out to ...
+ (print_good_bad_signature): here.
+
+ gpg: Mark experimental algorithms in the key listing.
+ * g10/keylist.c (list_keyblock_print): Remove duplicate curve name.
+ Print a note for experimental algorithms.
+ * g10/misc.c (print_pubkey_algo_note): Fix warning message.
+
+ gpg: Finish experimental support for Ed25519.
+ * agent/cvt-openpgp.c (try_do_unprotect_arg_s): Add field "curve".
+ (get_keygrip): Add and use arg CURVE.
+ (convert_secret_key): Ditto.
+ (convert_transfer_key): Ditto.
+ (get_npkey_nskey): New.
+ (prepare_unprotect): Replace gcrypt functions by
+ get_npkey_nskey. Allow opaque MPIs.
+ (do_unprotect): Use CURVE instead of parameters.
+ (convert_from_openpgp_main): Ditto.
+ (convert_to_openpgp): Simplify.
+ * g10/import.c (one_mpi_from_pkey): Remove.
+ (transfer_secret_keys): Rewrite to use the curve instead of the
+ parameters.
+ * g10/parse-packet.c (parse_key): Mark protected MPIs with USER1 flag.
+
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Allow the use of
+ "NIST P-256" et al.
+ * g10/keygen.c (ask_curve): Add arg ALGO.
+ (generate_keypair): Rewrite the ECC key logic.
+
+ * tests/openpgp/ecc.test: Provide the "ecc" passphrase.
+
+ kbx: Add experimental support for EDDSA.
+ * kbx/keybox-openpgp.c (parse_key): Use algo constants and add
+ experimental support for EdDSA.
+
+ agent: Remove greeting message.
+ * agent/gpg-agent.c (main): Remove greeting. Make --no-greeting a
+ dummy.
+
+2014-05-06 Werner Koch <wk at gnupg.org>
+
+ Use "samethread" mode keyword for some es_fopenmem.
+ * dirmngr/ks-engine-hkp.c (armor_data): Add mode keyword.
+ * g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
+ * scd/atr.c (atr_dump): Ditto.
+
+2014-05-05 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Add support for hkps keyservers.
+ * dirmngr/dirmngr.c: Include gnutls.h.
+ (opts): Add --gnutls-debug and --hkp-cacert.
+ (opt_gnutls_debug, my_gnutls_log): New.
+ (set_debug): Set gnutls log level.
+ (parse_rereadable_options): Register a CA file.
+ (main): Init GNUTLS.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_help): Support hkps.
+ (send_request): Ditto.
+
+ http: Add reference counting to the session object.
+ * common/http.c (http_session_t): Add field "refcount".
+ (_my_socket_new, _my_socket_ref, _my_socket_unref): Add debug code.
+ (send_request, my_npth_read, my_npth_write): Use SOCK object for the
+ transport ptr.
+ (http_session_release): Factor all code out to ...
+ (session_unref): here. Deref SOCK.
+ (http_session_new): Init refcount and transport ptr.
+ (http_session_ref): New. Ref and unref all assignments.
+
+2014-05-02 Werner Koch <wk at gnupg.org>
+
+ http: Add HTTP_FLAG_FORCE_TLS and http_get_tls_info.
+ * common/http.c (http_parse_uri): Factor code out to ...
+ (parse_uri): here. Add arg FORCE_TLS.
+ (do_parse_uri): Ditto. Implement flag.
+ (http_get_tls_info): New.
+ (http_register_tls_ca): Allow clearing of the list.
+ (send_request): Use a default verification function.
+ * common/http.h (HTTP_FLAG_FORCE_TLS): New.
+ * common/t-http.c (main): Add several command line options.
+
+ common: Fix test for openpgp_oid_is_ed25519.
+ * common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): Add correct
+ value.
+
+ http: Revamp TLS API.
+ * configure.ac (NEED_GNUTLS_VERSION): New.
+ (HTTP_USE_GNUTLS, LIBGNUTLS_CFLAGS, LIBGNUTLS_LIBS): New ac_subst.
+
+ * common/http.h (http_session_t): New.
+ * common/http.c: Remove compatibility for gnutls < 3.0.
+ (http_session_s): New.
+ (cookie_s): Replace gnutls_session_t by http_session_t.
+ (tls_callback, tls_ca_certlist): New variables.
+ (my_socket_unref): Add preclose args.
+ (my_npth_read, my_npth_write): New.
+ (make_header_line): Fix bug using int* instead of char*.
+ (http_register_tls_callback): New.
+ (http_register_tls_ca): New.
+ (http_session_new): New.
+ (http_session_release): New.
+ (http_get_header_names): New.
+ (escape_data): Add hack to escape in forms mode.
+ (send_request) [HTTP_USE_GNUTLS]: Support SNI.
+ (send_request) [HTTP_USE_GNUTLS]: Fix use of make_header_line.
+ (send_gnutls_bye): New.
+ (cookie_close): Make use of preclose feature.
+ (http_verify_server_credentials): New.
+ (main) [TEST]: Remove test code.
+ * common/t-http.c: New.
+ * common/tls-ca.pem: New.
+ * common/Makefile.am (tls_sources): New. Move http code to here.
+ (libcommontls_a_SOURCES): New.
+ (libcommontlsnpth_a_SOURCES): New.
+ (EXTRA_DIST): Add tls-ca.pem
+ (module_maint_tests): Add t-http.
+ (t_http_SOURCES, t_http_CFLAGS, t_http_LDADD): New.
+
+ * dirmngr/Makefile.am (dirmngr_LDADD): Add libcommontlsnpth.
+
+ common: Cleanup the use of USE_NPTH and HAVE_NPTH macros.
+ * configure.ac (HAVE_NPTH): New ac_define.
+ * common/estream.c: Use USE_NPTH instead of HAVE_NPTH.
+ * common/http.c: Ditto. Replace remaining calls to pth by npth calls.
+ (connect_server): Remove useless _().
+ * common/exechelp-posix.c, common/exechelp-w32.c
+ * common/exechelp-w32ce.c: Use HAVE_PTH to include npth.h.
+ * common/init.c (_init_common_subsystems): Remove call to pth_init.
+ * common/sysutils.c (gnupg_sleep): Use npth_sleep.
+ * scd/ccid-driver.c (my_sleep): Ditto.
+
+2014-04-30 Werner Koch <wk at gnupg.org>
+
+ estream: Implement "samethread" mode keyword.
+ * src/estream.c (estream_internal): Add field SAMETHREAD.
+ (init_stream_lock, lock_stream, trylock_stream, unlock_stream): Use it.
+ (parse_mode): Add arg SAMETHREAD and parse that keyword.
+ (es_initialize): Rename to ...
+ (init_stream_obj): this. Add arg SAMETHREAD.
+ (es_create): Add arg SAMETHREAD. Call init_stream_lock after
+ init_stream_obj.
+ (doreadline): Call es_create with samethread flag.
+ (es_fopen, es_mopen, es_fopenmem, es_fopencookie, do_fdopen)
+ (do_fpopen, do_w32open): Implement "samethread" keyword.
+ (es_freopen): Take samthread flag from old stream.
+ (es_tmpfile): Call es)_create w/o samethread.
+
+ estream: Fix deadlock in es_fileno.
+ * src/estream.c (es_fileno_unlocked): Call the unlocked functions.
+
+ estream: Add debug code to the lock functions.
+ * common/estream.c (dbg_lock_0, dbg_lock_1, dbg_lock_1): New.
+
+ estream: Replace locking macros by functions.
+ * common/estream.c: Replace most macros.
+
+2014-04-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ ECC Fixes.
+ * agent/cvt-openpgp.c (get_keygrip, convert_secret_key)
+ (convert_transfer_key): Follow newer (>= 1.6) libgcrypt API, which
+ does not distinguish the detail.
+ (do_unprotect, convert_from_openpgp_main): Don't call
+ map_pk_openpgp_to_gcry, as it's the value of libgcrypt API already and
+ not the value defined by OpenPGP.
+ (convert_to_openpgp): It's "ecc".
+ * agent/gpg-agent.c (map_pk_openpgp_to_gcry): Remove.
+ * g10/call-agent.c (agent_pkdecrypt): Fix off-by-one error.
+ * g10/pubkey-enc.c (get_it): Fix swapping the fields error.
+
+2014-04-22 Werner Koch <wk at gnupg.org>
+
+ gpg: Pass --homedir to gpg-agent.
+ * agent/gpg-agent.c (main): Make sure homedir is absolute.
+ * common/asshelp.c (lock_spawning): Create lock file with an absolute
+ name.
+ (start_new_gpg_agent): Use an absolute name for the socket and pass
+ option --homedir to the agent.
+ (start_new_dirmngr): Use an absolute name for the --homedir.
+
+ common: Add functions make_absfilename and make_absfilename_try.
+ * common/stringhelp.c (do_make_filename): Add modes 2 and 3.
+ (make_absfilename): New.
+ (make_absfilename_try): New.
+
+ common: Add function gnupg_getcwd.
+ * tools/gpg-connect-agent.c (gnu_getcwd): Move to ...
+ * common/sysutils.c (gnupg_getcwd): .. here.
+ * tools/gpg-connect-agent.c (get_var_ext): Use gnupg_getcwd.
+
+ gpg: Print a warning if GKR has hijacked gpg-agent.
+ * g10/call-agent.c (check_hijacking): New.
+ (start_agent): Call it.
+ (membuf_data_cb, default_inq_cb): Move more to the top.
+
+2014-04-17 Werner Koch <wk at gnupg.org>
+
+ gpg: New %U expando for the photo viewer.
+ * g10/photoid.c (show_photos): Set namehash.
+ * g10/misc.c (pct_expando): Add "%U" expando.
+
+ common: Add z-base-32 encoder.
+ * common/zb32.c: New.
+ * common/t-zb32.c: New.
+ * common/Makefile.am (common_sources): Add zb82.c
+ (module_tests): Add t-zb32.
+
+2014-04-16 Werner Koch <wk at gnupg.org>
+
+ Two minor code cleanups and one NULL deref on error fix.
+ * common/estream.c (es_freopen): Remove useless check for STREAM.
+ * kbx/keybox-blob.c (_keybox_create_x509_blob): Remove useless check
+ for BLOB.
+ * tools/sockprox.c (run_proxy): Do not fclose(NULL).
+
+2014-04-15 Werner Koch <wk at gnupg.org>
+
+ gpg: Re-enable secret key deletion.
+ * g10/call-agent.c (agent_delete_key): New.
+ * g10/keydb.h (FORMAT_KEYDESC_DELKEY): New.
+ * g10/passphrase.c (gpg_format_keydesc): Support new format.
+ * g10/delkey.c (do_delete_key): Add secret key deletion.
+
+ gpg: Re-indent a file.
+ * g10/delkey.c: Re-indent.
+ (do_delete_key, delete_keys): Change return type top gpg_error_t.
+
+ gpg: Fix regression in secret key export.
+ * agent/cvt-openpgp.c (convert_to_openpgp): Fix use
+ gcry_sexp_extract_param.
+ * g10/export.c (do_export_stream): Provide a proper prompt to the
+ agent.
+
+ gpg: Change pinentry prompt to talk about "secret key".
+ * g10/passphrase.c (gpg_format_keydesc): Add mode 2. Change strings.
+ * g10/keydb.h (FORMAT_KEYDESC_NORMAL, FORMAT_KEYDESC_IMPORT)
+ (FORMAT_KEYDESC_EXPORT): New. Use them for clarity.
+
+ agent: Add command DELETE_KEY.
+ * agent/command.c (cmd_delete_key): New.
+ * agent/findkey.c (modify_description): Add '%C' feature.
+ (remove_key_file): New.
+ (agent_delete_key): New.
+ * agent/command-ssh.c (search_control_file): Make arg R_DISABLE
+ optional.
+
+ * configure.ac: Require libgpg-error 1.13.
+
+2014-04-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: EdDSA support.
+ * scd/app-openpgp.c (KEY_TYPE_EDDSA, CURVE_ED25519): New.
+ (struct app_local_s): Add eddsa.
+ (get_algo_byte, store_fpr): Support KEY_TYPE_EDDSA.
+ (get_ecc_key_parameters, get_curve_name): Support CURVE_ED25519.
+ (send_key_attr, get_public_key): Support KEY_TYPE_EDDSA.
+ (build_ecc_privkey_template): Rename as it supports both of
+ ECDSA and EdDSA.
+ (ecc_writekey): Rename. Support CURVE_ED25519, too.
+ (do_writekey): Follow the change of ecc_writekey.
+ (do_auth): Support KEY_TYPE_EDDSA.
+ (parse_ecc_curve): Support CURVE_ED25519. Bug fix for other curves.
+ (parse_algorithm_attribute): Bug fix for ECDH. Support EdDSA.
+
+2014-04-08 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Fix compiler warning.
+ * common/mischelp.h (JNLIB_GCC_HAVE_PUSH_PRAGMA): New.
+ * dirmngr/dirmngr.c (handle_tick): Factor time check out to ...
+ (time_for_housekeeping_p): new.
+
+ gpgconf: Add command --launch.
+ * tools/gpgconf.c: Add command --launch.
+ * tools/gpgconf-comp.c (gc_component_launch): New.
+
+ scd: Silent compiler warnings about unused variables.
+ * scd/app-openpgp.c (build_ecdsa_privkey_template): Mark unused arg.
+ (ecdh_writekey): Mark unused args.
+
+2014-04-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Support EdDSA.
+ * agent/pksign.c (agent_pksign_do): Handle EdDSA signature.
+
+ g10: EdDSA support.
+ * g10/keyid.c (keygrip_from_pk): Compute keygrip of EdDSA key.
+ * g10/keygen.c (generate_subkeypair): Ed25519 is for EdDSA.
+ * common/openpgp-oid.c (oid_ed25519): Update.
+
+2014-04-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: EdDSA support for SSH.
+ * agent/command-ssh.c (ssh_signature_encoder_eddsa): Signature is
+ two 32-byte opaque data which should not be interpreted as number.
+
+2014-03-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Add commands --quick-sign-key and --quick-lsign-key.
+ * g10/gpg.c (main): Add commands --quick-sign-key and
+ --quick-lsign-key.
+ * g10/keyedit.c (sign_uids): Add args FP and QUICK.
+ (keyedit_quick_sign): New.
+ (show_key_with_all_names): Add arg NOWARN.
+
+ Change some keyedit functions to allow printing to arbitrary streams.
+ * common/ttyio.c (tty_print_string): Add optional arg FP. Change all
+ callers.
+ (tty_print_utf8_string2): Ditto.
+ * g10/keyedit.c (show_prefs): Ditto.
+ (show_key_with_all_names_colon): Ditto.
+ (show_names): Ditto.
+ * g10/keylist.c (print_revokers): Ditto.
+ (print_fingerprint): Ditto.
+
+2014-03-23 Werner Koch <wk at gnupg.org>
+
+ agent: Replace es_mopen by es_fopenmem for ssh.
+ * agent/command-ssh.c (ssh_read_key_public_from_blob): Use
+ es_fopenmem.
+ (ssh_handler_request_identities): Ditto.
+ (ssh_request_process): Ditto.
+
+2014-03-22 Werner Koch <wk at gnupg.org>
+
+ agent: Put ssh key type as comment into sshcontrol.
+ * agent/command-ssh.c (ssh_key_type_spec): Add field name.
+ (ssh_key_types): Add human readable names.
+ (add_control_entry): Add arg SPEC and print key type as comment.
+ (ssh_identity_register): Add arg SPEC.
+ (ssh_handler_add_identity): Add var SPEC and pass ssh_receive_key.
+
+ agent: Support the Ed25519 signature algorithm for ssh.
+ * agent/command-ssh.c (SPEC_FLAG_IS_EdDSA): New.
+ (ssh_key_types): Add entry for ssh-ed25519.
+ (ssh_identifier_from_curve_name): Move to the top.
+ (stream_read_skip): New.
+ (stream_read_blob): New.
+ (ssh_signature_encoder_rsa): Replace MPIS array by an s-exp and move
+ the s-exp parsing to here.
+ (ssh_signature_encoder_dsa): Ditto.
+ (ssh_signature_encoder_ecdsa): Ditto.
+ (ssh_signature_encoder_eddsa): New.
+ (sexp_key_construct): Rewrite.
+ (ssh_key_extract): Rename to ...
+ (ssh_key_to_blob): .. this and rewrite most of it.
+ (ssh_receive_key): Add case for EdDSA.
+ (ssh_convert_key_to_blob, key_secret_to_public): Remove.
+ (ssh_send_key_public): Rewrite.
+ (ssh_handler_request_identities): Simplify.
+ (data_sign): Add rename args. Add new args HASH and HASHLEN. Make
+ use of es_fopenmen and es_fclose_snatch. Remove parsing into MPIs
+ which is now doe in the sgnature encoder functions.
+ (ssh_handler_sign_request): Take care of Ed25519.
+ (ssh_key_extract_comment): Rewrite using gcry_sexp_nth_string.
+
+ agent: Cleanups to prepare implementation of Ed25519.
+ * agent/cvt-openpgp.c: Remove.
+ (convert_to_openpgp): Use gcry_sexp_extract_param.
+ * agent/findkey.c (is_eddsa): New.
+ (agent_is_dsa_key, agent_is_eddsa_key): Check whether ecc means EdDSA.
+ * agent/pksign.c (agent_pksign_do): Add args OVERRIDEDATA and
+ OVERRIDEDATALEN.
+
+ * common/ssh-utils.c (is_eddsa): New.
+ (get_fingerprint): Take care or EdDSA.
+
+2014-03-18 Werner Koch <wk at gnupg.org>
+
+ tools: Fix NULL deref in gpg-connect-agent.
+ * tools/gpg-connect-agent.c (handle_inquire): Do not pass NULL to
+ strlen.
+
+ dirmngr: Resurrect hosts in the HKP hosttable.
+ * dirmngr/dirmngr.c (HOUSEKEEPING_INTERVAL): New.
+ (housekeeping_thread): New.
+ (handle_tick): Call new function.
+ * dirmngr/ks-engine-hkp.c (RESURRECT_INTERVAL): New.
+ (struct hostinfo_s): Add field died_at and set it along with the dead
+ flag.
+ (ks_hkp_print_hosttable): Print that info.
+ (ks_hkp_housekeeping): New.
+
+ common: New function elapsed_time_string.
+ * common/gettime.c (elapsed_time_string): New.
+
+2014-03-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Reject signatures made with MD5.
+ * g10/gpg.c: Add option --allow-weak-digest-algos.
+ (main): Set option also in PGP2 mode.
+ * g10/options.h (struct opt): Add flags.allow_weak_digest_algos.
+ * g10/sig-check.c (do_check): Reject MD5 signatures.
+ * tests/openpgp/defs.inc: Add allow_weak_digest_algos to gpg.conf.
+
+ gpg: Make --auto-key-locate work again with keyservers.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Allow exact search mode.
+ * g10/keyserver.c (keyserver_import_name): Implement.
+ (keyserver_get): Use exact mode for name based import.
+ (keyserver_get): Add args R_FPR and R_FPRLEN. Change all callers.
+
+ gpg: New mechanism "clear" for --auto-key-locate.
+ * g10/getkey.c (parse_auto_key_locate): Implement "clear".
+
+2014-03-14 Werner Koch <wk at gnupg.org>
+
+ gpg-connect-agent: Make it easier to connect to the dirmngr.
+ * tools/gpg-connect-agent.c: Add options --dirmngr and
+ --dirmngr-program.
+
+ dirmngr: Make use of IPv4 and IPV6 more explicit.
+ * common/http.c (connect_server): Handle the new flags.
+ * common/http.h (HTTP_FLAG_IGNORE_IPv4, HTTP_FLAG_IGNORE_IPv4): New.
+ * dirmngr/ks-engine-hkp.c (map_host): Add arg r_httpflags.
+ (make_host_part): Ditto.
+ (send_request): Add arg httpflags.
+ (ks_hkp_search, ks_hkp_get, ks_hkp_put): Handle httpflags.
+
+ dirmngr: Do not use brackets around legacy IP addresses.
+ * dirmngr/ks-engine-hkp.c (my_getnameinfo): Change args to take a
+ complete addrinfo. Bracket only v6 addresses. Change caller.
+
+ gpg: Print the actual used keyserver address.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_search, ks_hkp_get): Print SOURCE
+ status lines.
+ * g10/call-dirmngr.c (ks_status_parm_s): New.
+ (ks_search_parm_s): Add field stparm.
+ (ks_status_cb): New.
+ (ks_search_data_cb): Send source to the data callback.
+ (gpg_dirmngr_ks_search): Change callback prototope to include the
+ SPECIAL arg. Adjust all users. Use ks_status_cb.
+ (gpg_dirmngr_ks_get): Add arg r_source and use ks_status_cb.
+ * g10/keyserver.c (search_line_handler): Adjust callback and print
+ "data source" disgnostic.
+ (keyserver_get): Print data source diagnostic.
+
+ dirmngr: Default to a user socket name and enable autostart.
+ * common/homedir.c (dirmngr_socket_name): Rename to
+ dirmngr_sys_socket_name.
+ (dirmngr_user_socket_name): New.
+ * common/asshelp.c (start_new_dirmngr): Handle sys and user dirmngr
+ socket.
+ * dirmngr/dirmngr.c (main): Ditto.
+ * dirmngr/server.c (cmd_getinfo): Ditto.
+ * sm/server.c (gpgsm_server): Ditto.
+ * dirmngr/dirmngr-client.c (start_dirmngr): Likewise.
+ * tools/gpgconf.c (main): Print "dirmngr-sys-socket" with --list-dirs.
+
+ * configure.ac (USE_DIRMNGR_AUTO_START): Set by default.
+
+2014-03-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Add option --dirmngr-program.
+ * g10/gpg.c: Add option --dirmngr-program.
+ * g10/options.h (struct opt): Add field dirmngr_program.
+ * g10/call-dirmngr.c (create_context): Use new var.
+
+ * dirmngr/dirmngr.c: Include gc-opt-flags.h.
+ (main): Remove GC_OPT_FLAG_*.
+ * tools/gpgconf-comp.c (GC_OPT_FLAG_NO_CHANGE): Move macro to ...
+ * common/gc-opt-flags.h: here.
+
+ dirmngr: Detect dead keyservers and try another one.
+ * dirmngr/ks-action.c (ks_action_resolve): Rename var for clarity.
+ (ks_action_search, ks_action_put): Ditto.
+ (ks_action_get): Consult only the first server which retruned some
+ data.
+
+ * dirmngr/ks-engine-hkp.c (SEND_REQUEST_RETRIES): New.
+ (map_host): Add arg CTRL and call dirmngr_tick.
+ (make_host_part): Add arg CTRL.
+ (mark_host_dead): Allow the use of an URL.
+ (handle_send_request_error): New.
+ (ks_hkp_search, ks_hkp_get, ks_hkp_put): Mark host dead and retry on
+ error.
+
+ http: Add a flag to the URL parser indicating a literal v6 address.
+ * common/http.h (struct parsed_uri_t): Add field v6lit.
+ * common/http.c (do_parse_uri): Set v6lit.
+
+2014-03-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: writekey support of ECC.
+ * scd/app-openpgp.c (CURVE_SEC_P256K1, get_algo_byte): New.
+ (store_fpr): Support ECC keys with varargs.
+ (get_ecc_key_parameters, get_curve_name): Support secp256k1.
+ (parse_ecc_curve): Likewise.
+ (build_ecdsa_privkey_template, rsa_writekey, ecdsa_writekey): New.
+ (ecdh_writekey): New. Not implemented yet.
+ (do_writekey): Call rsa_writekey, ecdsa_writekey, or ecdh_writekey.
+ (do_genkey): Follow the change of store_fpr.
+
+2014-03-11 Werner Koch <wk at gnupg.org>
+
+ dirmngr: Put brackets around IP addresses in the hosttable.
+ * dirmngr/ks-engine-hkp.c (EAI_OVERFLOW): Provide a substitute.
+ (my_getnameinfo): New.
+ (map_host): Use it.
+
+ dirmngr: Add command option to mark hosts as dead or alive.
+ * dirmngr/server.c (cmd_killdirmngr): Factor some code out to ...
+ (check_owner_permission): here.
+ (cmd_keyserver): Add options --dead and --alive.
+ * dirmngr/ks-engine-hkp.c (host_in_pool_p): New.
+ (ks_hkp_mark_host): New.
+
+ dirmngr: Make Assuan output of keyblocks easier readable.
+ * dirmngr/server.c (data_line_cookie_write): Print shorter data lines
+ in verbose mode.
+
+ dirmngr: Fix HKP host selection code.
+ * dirmngr/server.c (cmd_keyserver): Add option --resolve and change
+ --print-hosttable to --hosttable.
+ * dirmngr/ks-action.c (ks_printf_help): New.
+ (ks_action_resolve): New.
+ * dirmngr/ks-engine-hkp.c (select_random_host): Fix selection.
+ (ks_hkp_print_hosttable): Print to assuan stream.
+ (map_host): Remove debug code. Add arg FORCE_SELECT. Return numeric
+ IP addr if it can't be resolved.
+ (make_host_part): Add arg FORCE_SELECT; change callers to pass false.
+ (ks_hkp_resolve): New.
+
+ List readline support in configure summary.
+ * m4/readline.m4: Set gnupg_cv_have_readline.
+ * configure.ac: Add readline support to summary output.
+
+2014-03-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: API change of agent_key_from_file.
+ * agent/findkey.c (agent_key_from_file): Always return S-expression.
+ * agent/command.c (cmd_passwd): Distinguish by SHADOW_INFO.
+ (cmd_export_key): Likewise. Free SHADOW_INFO.
+ (cmd_keytocard): Likewise. Release S_SKEY.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Likewise.
+ * agent/pksign.c (agent_pksign_do): Likewise. Use the S-expression to
+ know the key type.
+
+2014-03-10 Werner Koch <wk at gnupg.org>
+
+ Backport useful code from fixes for bug 1447.
+ * configure.ac: Cehck for inet_ntop.
+ * m4/libcurl.m4: Provide a #define for the version of the curl
+ library.
+
+ scd: acquire lock in new_reader_slot.
+ * scd/apdu.c (new_reader_slot): Acquire lock.
+ (open_ct_reader, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
+ (open_ccid_reader, open_rapdu_reader): Release lock.
+ (lock_slot, trylock_slot, unlock_slot): Move more to the top.
+
+ Do not require libiconv for Android.
+ * configure.ac (require_iconv): New. Set to false for android.
+ (AM_ICONV): Run only if required.
+
+2014-03-07 Werner Koch <wk at gnupg.org>
+
+ dirmmgr: Use a portability wrapper for struct timeval.
+ * dirmngr/dirmngr_ldap.c [W32]: Include winber.h.
+ (my_ldap_timeval_t): New.
+
+ Silence more warnings about unused vars and args.
+ * dirmngr/cdblib.c (cdb_init) [W32]: Remove unused var.
+ * dirmngr/dirmngr-client.c (start_dirmngr): s/int/assuan_fd_t/.
+ * dirmngr/dirmngr.c (w32_service_control): Mark unused args.
+ (call_real_main): New.
+ (main) [W32]: Use new function to match prototype.
+ (real_main) [W32]: Mark unused vars.
+ (handle_signal) [W32]: Do not build the function at all.
+ (handle_connections) [W32]: Do not define signo.
+ * dirmngr/ldap-wrapper-ce.c (outstream_reader_cb): Remove used vars.
+ * g10/tdbio.c (ftruncate) [DOSISH]: Define only if not yet defined.
+
+ dirmngr: Simplify strtok macro.
+ * dirmngr/ldap-url.c (ldap_utf8_strtok): Remove unused r3d arg.
+ (ldap_str2charray): Remove lasts.
+
+ Use attribute __gnu_printf__ also in estream header files.
+ * common/estream-printf.h: Use attribute gnu_printf.
+ * common/estream.h: Ditto.
+
+ Use attribute __gnu_printf__ with our estream-printf functions.
+ * common/mischelp.h (JNLIB_GCC_A_PRINTF): Use __gnu_printf__
+ (JNLIB_GCC_A_NR_PRINTF): Ditto.
+
+ w32: Silence warnings about unused vars.
+ * agent/gpg-agent.c (main) [W32]: Mark unused vars.
+ * sm/gpgsm.c (run_protect_tool) [W32]: Ditto.
+ * g10/trustdb.c (check_regexp) [DISABLE_REGEX]: Ditto.
+ * scd/scdaemon.c (main) [W32]: Ditto.
+ (handle_connections) [W32]: Ditto.
+ (handle_signal) [W32]: Do not build the function at all.
+ * scd/apdu.c (pcsc_send_apdu_direct): Ditto.
+ (connect_pcsc_card): s/long/pcsc_dword_t/.
+ (open_pcsc_reader_direct): Remove var listlen.
+
+ w32: Fix a potential problem in gpgconf's gettext.
+ * tools/gpgconf-comp.c (my_dgettext) [USE_SIMPLE_GETTEXT]: Make sure
+ to return something even DOMAIN is not given.
+
+ Silence several warnings when building under Windows.
+ * agent/call-scd.c (start_scd): Replace int by assuan_fd_t.
+ (start_pinentry): Ditto.
+ * common/asshelp.c (start_new_gpg_agent): Replace int by assuan_fd_t.
+ * common/dotlock.c (GNUPG_MAJOR_VERSION): Include stringhelp.h for
+ prototypes on Windows and some other platforms.
+ * common/logging.c (fun_writer): Declare addrbuf only if needed.
+ * g10/decrypt.c (decrypt_message_fd) [W32]: Return not_implemented.
+ * g10/encrypt.c (encrypt_crypt) [W32]: Return error if used in server
+ mode.
+ * g10/dearmor.c (dearmor_file, enarmor_file): Replace GNUPG_INVALID_FD
+ by -1 as temporary hack for Windows.
+ * g10/export.c (do_export): Ditto.
+ * g10/revoke.c (gen_desig_revoke, gen_revoke): Ditto.
+ * g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Ditto.
+ * g10/server.c (cmd_verify, gpg_server) [W32]: Return an error.
+
+ w32: Include winsock2.h to silence warnings.
+
+ gl: Avoid warning about shadowing an arg.
+ * gl/setenv.c (KNOWN_VALUE): s/value/_v/.
+
+ common: Fix build problem with Sun Studio compiler.
+ * common/estream.c (ESTREAM_MUTEX_UNLOCK): Use int dummy dummy
+ functions.
+ (ESTREAM_MUTEX_INITIALIZE): Ditto.
+
+ gpg: Do not require a trustdb with --always-trust.
+ * g10/tdbio.c (tdbio_set_dbname): Add arg R_NOFILE.
+ * g10/trustdb.c (trustdb_args): Add field no_trustdb.
+ (init_trustdb): Set that field.
+ (revalidation_mark): Take care of a nonexistent trustdb file.
+ (read_trust_options): Ditto.
+ (tdb_get_ownertrust): Ditto.
+ (tdb_get_min_ownertrust): Ditto.
+ (tdb_update_ownertrust): Ditto.
+ (update_min_ownertrust): Ditto.
+ (tdb_clear_ownertrusts): Ditto.
+ (tdb_cache_disabled_value): Ditto.
+ (tdb_check_trustdb_stale): Ditto.
+ (tdb_get_validity_core): Ditto.
+ * g10/gpg.c (main): Do not create a trustdb with most commands for
+ trust-model always.
+
+ gpg: Print a "not found" message for an unknown key in --key-edit.
+ * g10/keyedit.c (keyedit_menu): Print message.
+
+ gpg: Protect against rogue keyservers sending secret keys.
+ * g10/options.h (IMPORT_NO_SECKEY): New.
+ * g10/keyserver.c (keyserver_spawn, keyserver_import_cert): Set new
+ flag.
+ * g10/import.c (import_secret_one): Deny import if flag is set.
+
+ agent: Fix UPDATESTARTUPTTY for ssh.
+ * agent/command-ssh.c (setup_ssh_env): Fix env setting.
+
+ gpgv: Init Libgcrypt to avoid syslog warning.
+ * g10/gpgv.c (main): Check libgcrypt version and disable secure
+ memory.
+
+ Improve libcurl detection.
+ * m4/libcurl.m4: Do not use AC_PATH_PROG if --with-libcurl as been
+ given. Suggested by John Marshall.
+
+ gpg: Remove legacy keyserver examples from the template conf file.
+ * g10/options.skel: Update.
+
+ (cherry picked from commit f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c)
+
+ w32: Define WINVER only if needed.
+ * common/sysutils.c (WINVER): Define only if less that 5.0.
+
+ w32: Remove unused code.
+ * jnlib/w32-reg.c (write_w32_registry_string): Remove.
+
+ agent: Make --allow-mark-trusted the default.
+ * agent/gpg-agent.c (opts, main): Add option --no-allow-mark-trusted.
+ Put this option into the gpgconf-list.
+ (main): Enable opt.allow_mark_trusted by default.
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Replace
+ allow-mark-trusted by no-allow-mark-trusted.
+
+ * agent/trustlist.c (agent_marktrusted): Always set the "relax" flag.
+
+ ssh: Add support for Putty.
+ * agent/gpg-agent.c [W32]: Include Several Windows header.
+ (opts): Change help text for enable-ssh-support.
+ (opts, main): Add option --enable-putty-support
+ (putty_support, PUTTY_IPC_MAGIC, PUTTY_IPC_MAXLEN): New for W32.
+ (agent_init_default_ctrl): Add and asssert call.
+ (putty_message_proc, putty_message_thread): New.
+ (handle_connections) [W32]: Start putty message thread.
+ * common/sysutils.c (w32_get_user_sid): New for W32 only
+ * tools/gpgconf-comp.c (gc_options_gpg_agent): Add
+ --enable-ssh-support and --enable-putty-support. Make the
+ configuration group visible at basic level.
+ * agent/command-ssh.c (serve_mmapped_ssh_request): New for W32 only.
+
+ agent: Fix binary vs. text mode problem in ssh.
+ * agent/command-ssh.c (file_to_buffer)
+ (ssh_handler_request_identities): Open streams in binary mode.
+ (start_command_handler_ssh): Factor some code out to ..
+ (setup_ssh_env): new function.
+
+ Fix syntax error for building on APPLE.
+ * scd/pcsc-wrapper.c [__APPLE__]: Fix syntax error.
+
+ Ignore obsolete option --disable-keypad.
+ * scd/scdaemon.c (opts): Ignore --disable-keypad.
+
+ Allow marking options as ignored.
+ * jnlib/argparse.h (ARGPARSE_OPT_IGNORE): New.
+ (ARGPARSE_TYPE_MASK): New, for internal use.
+ (ARGPARSE_ignore): New.
+ * jnlib/argparse.c (optfile_parse, arg_parse): Replace remaining
+ constants by macros.
+ (optfile_parse): Implement ARGPARSE_OPT_IGNORE.
+ (arg_parse): Exclide ignore options from --dump-options.
+
+2014-03-06 Werner Koch <wk at gnupg.org>
+
+ common: Fix recent commit 55656208.
+ * common/membuf.c (get_membuf_shrink): Fix use of LEN.
+
+2014-03-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ Fix g10/trust.c.
+ * g10/trust.c (register_trusted_keyid, register_trusted_key)
+ (update_ownertrust): Call functions with tdb_.
+
+2014-02-26 Werner Koch <wk at gnupg.org>
+
+ common: Replace all macros in strusage() returned strings.
+ * common/argparse.c (writechar): Remove.
+ (writestrings): Simplify.
+ (strusage): Use map_static_macro_string.
+
+ common: New function map_static_macro_string.
+ * common/mapstrings.c: New.
+ * common/t-mapstrings.c: New.
+ * common/t-support.h (DIM, DIMof): Define if not defined.
+ * common/Makefile.am: Add new files.
+
+ common: New function get_membuf_shrink.
+ * common/membuf.c (get_membuf_shrink): New.
+
+ agent: Fixed unresolved symbol under Windows.
+ * agent/gpg-agent.c (main): s/ttyname/gnupg_ttyname/.
+
+ common: Require an installed libiconv.
+ * common/utf8conv.c: Remove dynload.h.
+ (load_libiconv): Remove. Remove all calls to it.
+
+2014-02-10 Werner Koch <wk at gnupg.org>
+
+ gpg: Silent more compiler warnings due to some configure options.
+ * g10/keygen.c (generate_keypair, gen_card_key)
+ (gen_card_key_with_backup) [!ENABLE_CARD_SUPPORT]: Mark unused args.
+
+ tests: Avoid segv if dns cert lookup is not configured.
+ * common/dns-cert.c (get_dns_cert) [!USE_DNS_CERT]: Reset return args.
+
+ gpg: Cleanup compiler warnings due to some configure options.
+ * g10/photoid.c (show_photos) [DISABLE_PHOTO_VIEWER]: Mark args as
+ unused.
+ * tools/gpgconf-comp.c (my_dgettext): Mark DOMAIN as unused if NLS is
+ not configured.
+
+ gpg: Allow building without any trust model support.
+ * configure.ac: Add option --disable-trust-models
+ (NO_TRUST_MODELS): New ac_define and am_conditional.
+ * g10/Makefile.am (trust_source): New.
+ (gpg2_SOURCES): Factor some files out to above. Add trust.c.
+ * g10/gpg.c [NO_TRUST_MODELS]: Disable options --export-ownertrust,
+ --import-ownertrust, --update-trustdb, --check-trustdb, --fix-trustdb,
+ --list-trustdb, --trustdb-name, --auto-check-trustdb,
+ --no-auto-check-trustdb, and --force-ownertrust.
+ (parse_trust_model) [NO_TRUST_MODELS]: Do not build.
+ (main) [NO_TRUST_MODELS]: Set trust_model to always and exclude all
+ trustdb related option code.
+ * g10/keyedit.c (cmds) [NO_TRUST_MODELS]: Remove menu items "trust",
+ "enable", and "disable".
+ * g10/keylist.c (public_key_list) [NO_TRUST_MODELS]: Do not print
+ "tru" record.
+
+ * g10/trust.c: New.
+ * g10/trustdb.c (struct key_item): Move to trustdb.h.
+ (register_trusted_keyid): Rename to tdb_register_trusted_keyid.
+ (register_trusted_key): Rename to tdb_register_trusted_key.
+ (trust_letter, uid_trust_string_fixed, trust_value_to_string)
+ (string_to_trust_value, get_ownertrust_with_min, get_ownertrust_info)
+ (get_ownertrust_string, get_validity_info, get_validity_string)
+ (clean_sigs_from_uid, clean_uid_from_key, clean_key): Move to trust.c.
+ (mark_usable_uid_certs): Move to trust.c and make global.
+ (is_in_klist): Move as inline to trustdb.h.
+ (trustdb_check_or_update): Rename to tdb_check_or_update
+ (revalidation_mark): Rename to tdb_revalidation_mark.
+ (get_ownertrust): Rename to tdb_get_ownertrust.
+ (get_min_ownertrust): Rename to tdb_get_min_ownertrust.
+ (update_ownertrust): Rename to tdb_update_ownertrust.
+ (clear_ownertrusts): Rename to tdb_clear_ownertrusts.
+ (cache_disabled_value): Rename to tdb_cache_disabled_value.
+ (check_trustdb_stale): Rename to tdb_check_trustdb_stale.
+ (get_validity): Rename to tdb_get_validity_core, add arg MAIN_PK and
+ factor some code out to ...
+ * trust.c (get_validity): ...new.
+ (check_or_update_trustdb): New wrapper.
+ (revalidation_mark): New wrapper.
+ (get_ownertrust): New wrapper.
+ (get_ownertrust_with_min): New wrapper.
+ (update_ownertrust): New wrapper.
+ (clear_ownertrusts): New wrapper.
+ (cache_disabled_value): New wrapper.
+ (check_trustdb_stale): New wrapper.
+
+ * tests/openpgp/defs.inc (opt_always): New. Use in all tests instead
+ of --always-trust.
+
+ tests: Handle disabled algorithms.
+ * tests/openpgp/mds.test: Skip disabled algorithms.
+ * tests/openpgp/signencrypt-dsa.test: Ditto.
+ * tests/openpgp/sigs-dsa.test: Ditto.
+
+2014-02-07 Werner Koch <wk at gnupg.org>
+
+ Silence annoying ABI change warning.
+ * configure.ac [GCC]: Pass -Wno-psabi for gcc >= 4.6. Avoid some gcc
+ option tests for gcc >= 4.6
+
+ Allow disabling of card support.
+ * configure.ac: Add option --disable-card-support. Also add
+ am_conditional and do not build scd if card support is enabled.
+
+ gpg: List only available algos in --gen-key.
+ * g10/keygen.c (ask_algo, ask_curve): Take care of GPG_USE_<algo>.
+
+ gpg: Change --print-mds to output enabled OpenPGP algos.
+ * g10/gpg.c (print_mds): Use opengpg_md_test_algo. Test also for MD5
+ availibility.
+
+ gpg: Avoid compiler warnings for disabled algos.
+ * g10/misc.c (map_cipher_openpgp_to_gcry): Add case for disabled algo.
+ (openpgp_pk_test_algo2): Ditto.
+ (map_md_openpgp_to_gcry): Ditto.
+
+2014-02-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Change format for the key size in --list-key and --edit-key.
+ * g10/gpg.c (oLegacyListMode, opts, main): Add --legacy-list-mode.
+ * g10/options.h (struct opt): Add field legacy_list_mode.
+ * g10/keydb.h (PUBKEY_STRING_SIZE): New.
+ * g10/keyid.c (pubkey_string): New.
+ * g10/import.c (import_one, import_secret_one): Use pubkey_string.
+ * g10/keylist.c (print_seckey_info): Ditto.
+ (print_pubkey_info, print_card_key_info): Ditto.
+ (list_keyblock_print): Ditto.
+ * g10/mainproc.c (list_node): Ditto.
+ * g10/pkclist.c (do_edit_ownertrust, build_pk_list): Ditto.
+ * g10/keyedit.c (show_key_with_all_names): Ditto. Also change the
+ format.
+ (show_basic_key_info): Ditto.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Also allow "ed25519".
+ (openpgp_oid_to_curve): Downcase "ed25519"
+
+2014-01-31 Werner Koch <wk at gnupg.org>
+
+ gpg: Add configure options to disable algorithms.
+ * acinclude.m4 (GNUPG_GPG_DISABLE_ALGO): New.
+ * configure.ac: Add --enable-gpg-* options to disable non MUS
+ algorithms.
+ * g10/misc.c (map_cipher_openpgp_to_gcry): Implement these options.
+ (openpgp_pk_test_algo2): Ditto.
+ (map_md_openpgp_to_gcry): Ditto.
+ (openpgp_cipher_test_algo, openpgp_md_test_algo): Simplify.
+
+ gpg: Improve --version algo info output.
+ * g10/misc.c (openpgp_pk_algo_name): Return a different string for
+ each ECC algorithm.
+ * g10/gpg.c (build_list_pk_test_algo): New wrapper to cope with the
+ different algo type enums.
+ (build_list_pk_algo_name): Ditto.
+ (build_list_cipher_test_algo): Ditto.
+ (build_list_cipher_algo_name): Ditto.
+ (build_list_md_test_algo): Ditto.
+ (build_list_md_algo_name): Ditto.
+ (my_strusage): Use them.
+ (list_config): Ditto. Add "pubkeyname".
+ (build_list): Add letter==1 hack.
+
+ gpg: Start using OpenPGP digest algo ids.
+ * g10/misc.c (print_pubkey_algo_note): Use enum typedef for the arg.
+ (print_cipher_algo_note): Ditto.
+ (print_digest_algo_note): Ditto.
+ (map_md_openpgp_to_gcry): New.
+ (openpgp_md_test_algo): Rewrite.
+ (openpgp_md_algo_name): Rewrite to do without Libgcrypt.
+ * g10/cpr.c (write_status_begin_signing): Remove hardwired list of
+ algo ranges.
+
+ gpg: Use only OpenPGP cipher algo ids.
+ * g10/misc.c (map_cipher_openpgp_to_gcry): Use explicit mapping and
+ use enums for the arg and return value.
+ (map_cipher_gcry_to_openpgp): Ditto.
+ (openpgp_cipher_blocklen): Use constant macros.
+ (openpgp_cipher_test_algo): Use mapping function and prepare to
+ disable algorithms.
+ (openpgp_cipher_algo_name): Do not use Libgcrypt.
+
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Replace
+ CGRY_CIPHER_* by CIPHER_ALGO_*.
+
+ * common/openpgpdefs.h (cipher_algo_t): Remove unused
+ CIPHER_ALGO_DUMMY.
+
+2014-01-30 Werner Koch <wk at gnupg.org>
+
+ gpg: Use only OpenPGP public key algo ids and add the EdDSA algo id.
+ * common/sexputil.c (get_pk_algo_from_canon_sexp): Change to return a
+ string.
+ * g10/keygen.c (check_keygrip): Adjust for change.
+ * sm/certreqgen-ui.c (check_keygrip): Likewise.
+
+ * agent/pksign.c (do_encode_dsa): Remove bogus map_pk_openpgp_to_gcry.
+
+ * g10/misc.c (map_pk_openpgp_to_gcry): Remove.
+ (openpgp_pk_test_algo): Change to a wrapper for openpgp_pk_test_algo2.
+ (openpgp_pk_test_algo2): Rewrite.
+ (openpgp_pk_algo_usage, pubkey_nbits): Add support for EdDSA.
+ (openpgp_pk_algo_name): Rewrite to remove need for gcry calls.
+ (pubkey_get_npkey, pubkey_get_nskey): Ditto.
+ (pubkey_get_nsig, pubkey_get_nenc): Ditto.
+ * g10/keygen.c(do_create_from_keygrip): Support EdDSA.
+ (common_gen, gen_ecc, ask_keysize, generate_keypair): Ditto.
+ * g10/build-packet.c (do_key): Ditto.
+ * g10/export.c (transfer_format_to_openpgp): Ditto.
+ * g10/getkey.c (cache_public_key): Ditto.
+ * g10/import.c (transfer_secret_keys): Ditto.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Ditto.
+ * g10/mainproc.c (proc_pubkey_enc): Ditto.
+ * g10/parse-packet.c (parse_key): Ditto,
+ * g10/sign.c (hash_for, sign_file, make_keysig_packet): Ditto.
+ * g10/keyserver.c (print_keyrec): Use openpgp_pk_algo_name.
+ * g10/pkglue.c (pk_verify, pk_encrypt, pk_check_secret_key): Use only
+ OpenPGP algo ids and support EdDSA.
+ * g10/pubkey-enc.c (get_it): Use only OpenPGP algo ids.
+ * g10/seskey.c (encode_md_value): Ditto.
+
+2014-01-29 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove cipher.h and put algo ids into a common file.
+ * common/openpgpdefs.h (cipher_algo_t, pubkey_algo_t, digest_algo_t)
+ (compress_algo_t): New.
+ * agent/gpg-agent.c: Remove ../g10/cipher.h. Add openpgpdefs.h.
+ * g10/cipher.h (DEK): Move to ...
+ * g10/dek.h: new file.
+ * g10/cipher.h (is_RSA, is_ELGAMAL, is_DSA)
+ (PUBKEY_MAX_NPKEY, PUBKEY_MAX_NSKEY, PUBKEY_MAX_NSIG, PUBKEY_MAX_NENC)
+ (PUBKEY_USAGE_SIG, PUBKEY_USAGE_ENC, PUBKEY_USAGE_CERT)
+ (PUBKEY_USAGE_AUTH, PUBKEY_USAGE_NONE): Move to
+ * g10/packet.h: here.
+ * g10/cipher.h: Remove. Remove from all files.
+ * g10/filter.h, g10/packet.h: Include dek.h.
+ * g10/Makefile.am (common_source): Remove cipher.h. Add dek.h.
+
+ include: Remove this directory.
+ * include/cipher.h: Move to ...
+ * g10/cipher.h: here.
+ * agent/gpg-agent.c: Adjust header file name.
+
+ * include/host2net.h: Move to ...
+ * common/host2net.h: here. Change license to LGPLv3/GPLv2. Adjust
+ notices to reflect that only me worked on that file.
+
+ * include/types.h: Remove.
+ * common/types.h: Include inttypes.h. Add byte typedef and comments
+ for __riscos__.
+ * common/iobuf.h: Adjust header file name.
+
+ * include/_regex.h: Remove this unused file.
+
+ * include/Makefile.am: Remove.
+ * Makefile.am (SUBDIRS): Remove "include".
+ * configure.ac (AC_CONFIG_FILES): Remove include/Makefile.
+ * include/ChangeLog-2011: Move to ...
+ * common/ChangeLog-2011.include: here.
+ * common/Makefile.am (EXTRA_DIST): Add file.
+
+ * include/zlib-riscos.h: Move this repo only file to ...
+ * g10/zlib-riscos.h: here.
+
+ * include/: Remove.
+
+2014-01-17 Werner Koch <wk at gnupg.org>
+
+ Remove unused u64 type definitions.
+ * configure.ac: Remove check for uint64 and UINT64_C.
+ * include/types.h: Remove u64 stuff.
+ * common/types.h: Ditto.
+
+2014-01-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Not remove SSH socket when already running.
+ * agent/gpg-agent.c (main): Defer setting of socket_name_ssh to avoid
+ removal of the socket when it will die in create_server_socket for
+ socket_name.
+
+ agent: Fix agent_is_eddsa_key.
+ * agent/findkey.c (agent_is_eddsa_key): Implemented.
+
+2014-01-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ Add secp256k1.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Add secp256k1.
+ (openpgp_oid_to_curve): Likewise.
+
+ * g10/keygen.c (ask_curve): Add secp256k1.
+
+2014-01-10 Werner Koch <wk at gnupg.org>
+
+ autogen.sh: Add rule for 64 bit windows.
+
+ Turn autogen.sh into a generic script.
+ * autogen.sh: Revamp.
+ * autogen.rc: New.
+ * Makefile.am (EXTRA_DIST): Add autogen.rc.
+
+ Rename scripts/ to build-aux/
+ * scripts/: Rename to build-aux/
+ * Makefile.am: Adjust accordingly.
+ * configure.ac (AC_CONFIG_AUX_DIR): Change to build-aux.
+
+2014-01-09 Werner Koch <wk at gnupg.org>
+
+ Improve the speedo make script.
+ * scripts/gpg-w32-dev/README: Remove
+ * scripts/gpg-w32-dev/GNUmakefile, scripts/gpg-w32-dev/speedo.mk:
+ Merge into ..
+ * scripts/speedo.mk: this.
+
+ gpgsplit: Allow building without zlib support.
+ * tools/gpgsplit.c [!HAVE_ZLIB]: Do not include zlib.h.
+ (handle_zlib): Build only if HAVE_ZLIB is defined.
+ (write_part): Support zlib and zip only if HAVE_ZLIB is defined.
+
+ w32: Fix backslash quoting in registry name.
+ * configure.ac (GNUPG_REGISTRY_DIR): Double backslashes.
+
+ Fix test for zlib.
+ * configure.ac (HAVE_ZLIB): Define only if found.
+
+ Add --enable-silent-rules stuff.
+ * configure.ac: Add AM_SILENT_RULES.
+
+2014-01-08 Werner Koch <wk at gnupg.org>
+
+ w32: Add macro for the registry key.
+ * configure.ac (GNUPG_REGISTRY_DIR) [W32]: New ac-define.
+ * common/homedir.c (default_homedir): Use it.
+ * common/logging.c (do_logv): Use it.
+
+2013-12-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Change --show-session-key to print the session key earlier.
+ * g10/cpr.c (write_status_strings): New.
+ (write_status_text): Replace code by a call to write_status_strings.
+ * g10/mainproc.c (proc_encrypted): Remove show_session_key code.
+ * g10/decrypt-data.c (decrypt_data): Add new show_session_key code.
+
+2013-12-05 Werner Koch <wk at gnupg.org>
+
+ gpg: Change OID of Ed25519 and add Brainpool oids.
+ * common/openpgp-oid.c (openpgp_curve_to_oid): Change OID for
+ Ed25519. Add brainpool OIDs.
+ (openpgp_oid_to_curve): Ditto.
+
+2013-11-29 Werner Koch <wk at gnupg.org>
+
+ common: Add put_membuf_printf.
+ * common/membuf.c (put_membuf_printf): New.
+
+2013-11-27 Werner Koch <wk at gnupg.org>
+
+ gpg: Change armor Version header to emit only the major version.
+ * g10/options.h (opt): Rename field no_version to emit_version.
+ * g10/gpg.c (main): Init opt.emit_vesion to 1. Change --emit-version
+ to bump up opt.emit_version.
+ * g10/armor.c (armor_filter): Implement different --emit-version
+ values.
+
+2013-11-18 Werner Koch <wk at gnupg.org>
+
+ Make use of the *_NAME etc macros.
+ Replace hardwired strings at many places with new macros from config.h
+ and use the new strusage macro replacement feature.
+
+ * common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn
+ sentinels.
+ * agent/command.c (cmd_import_key): Use asprintf to create the prompt.
+
+ Add strusage macro replacement feature.
+ * common/argparse.c (writechar): New.
+ (writestrings): Add macro replacement feature.
+ (show_help): Remove specialized @EMAIL@ replacement.
+ * configure.ac (GNUPG_NAME, GPG_NAME, GPGSM_NAME): Define.
+ (GPG_AGENT_NAME, DIRMNGR_NAME, G13_NAME, GPGCONF_NAME): Define.
+ (GPGTAR_NAME, GPG_AGENT_INFO_NAME, GPG_AGENT_SOCK_NAME): Define.
+ (GPG_AGENT_SSH_SOCK_NAME, DIRMNGR_INFO_NAME): Define.
+ (DIRMNGR_SOCK_NAME): Define.
+
+2013-11-15 Werner Koch <wk at gnupg.org>
+
+ kbx: Implement update operation for OpenPGP keyblocks.
+ * kbx/keybox-update.c (keybox_update_keyblock): Implement.
+ * kbx/keybox-search.c (get_blob_flags): Move to ...
+ * kbx/keybox-defs.h (blob_get_type): here.
+ * kbx/keybox-file.c (_keybox_read_blob2): Fix calling without R_BLOB.
+ * g10/keydb.c (build_keyblock_image): Allow calling without
+ R_SIGSTATUS.
+ (keydb_update_keyblock): Implement for keybox.
+
+ * kbx/keybox-dump.c (_keybox_dump_blob): Fix printing of the unhashed
+ size. Print "does not expire" also on 64 bit platforms.
+
+ gpg: Rework ECC support and add experimental support for Ed25519.
+ * agent/findkey.c (key_parms_from_sexp): Add algo name "ecc".
+ (agent_is_dsa_key): Ditto.
+ (agent_is_eddsa_key): New. Not finished, though.
+ * agent/pksign.c (do_encode_eddsa): New.
+ (agent_pksign_do): Use gcry_log_debug functions.
+ * agent/protect.c (agent_protect): Parse a flags parameter.
+ * g10/keygen.c (gpg_curve_to_oid): Move to ...
+ * common/openpgp-oid.c (openpgp_curve_to_oid): here and rename.
+ (oid_ed25519): New.
+ (openpgp_oid_is_ed25519): New.
+ (openpgp_oid_to_curve): New.
+ * common/t-openpgp-oid.c (test_openpgp_oid_is_ed25519): New.
+ * g10/build-packet.c (gpg_mpi_write): Write the length header also for
+ opaque MPIs.
+ (gpg_mpi_write_nohdr): New.
+ (do_key): Use gpg_mpi_write_nohdr depending on algorithm.
+ (do_pubkey_enc): Ditto.
+ * g10/ecdh.c (pk_ecdh_encrypt_with_shared_point): Use
+ gpg_mpi_write_nohdr.
+ * g10/export.c (transfer_format_to_openpgp):
+ * g10/keygen.c (ecckey_from_sexp): Return the error.
+ (gen_ecc): Repalce arg NBITS by CURVE.
+ (read_parameter_file): Add keywords "Key-Curve" and "Subkey-Curve".
+ (ask_curve): New.
+ (generate_keypair, generate_subkeypair): Use ask_curve.
+ (do_generate_keypair): Also pass curve name.
+ * g10/keylist.c (list_keyblock_print, list_keyblock_colon): Print
+ curve name.
+ * g10/parse-packet.c (mpi_read): Remove workaround for
+ Libcgrypt < 1.5.
+ (parse_key): Fix ECC case. Print the curve name.
+ * g10/pkglue.c (mpi_from_sexp): Rename to get_mpi_from_sexp.
+ (pk_verify, pk_check_secret_key): Add special case for Ed25519.
+ * g10/seskey.c (encode_md_value): Ditto.
+ * g10/sign.c (do_sign, hash_for, sign_file): Ditto.
+
+ kbx: Fix possible segv in kbxdump.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Check length before get32.
+
+ Require Libgcrypt 1.6.
+ * agent/pksign.c (do_encode_dsa): Remove Libgcrypt version check
+
+2013-11-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: more pinpad input fix for PC/SC.
+ * scd/apdu.c (check_pcsc_pinpad): Set default values here.
+ (pcsc_pinpad_verify, pcsc_pinpad_modify): Remove setting default
+ values, as it's too late.
+
+2013-11-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: more pinpad fix.
+ * scd/apdu.c (check_pcsc_pinpad): Set ->minlen and ->maxlen only when
+ those are specified.
+ (pcsc_pinpad_modify): Remove old check code.
+
+2013-10-29 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: pinpad fix for PC/SC on Windows.
+ * scd/apdu.c (SCARD_CTL_CODE): Fix for Windows.
+
+2013-10-28 Werner Koch <wk at gnupg.org>
+
+ doc: Change yat2m to allow arbitrary condition names.
+ * doc/yat2m.c (MAX_CONDITION_NESTING): New.
+ (gpgone_defined): Remove.
+ (condition_s, condition_stack, condition_stack_idx): New.
+ (cond_is_active, cond_in_verbatim): New.
+ (add_predefined_macro, set_macro, macro_set_p): New.
+ (evaluate_conditions, push_condition, pop_condition): New.
+ (parse_file): Rewrite to use the condition stack.
+ (top_parse_file): Set prefined macros.
+ (main): Change -D to define arbitrary macros.
+
+2013-10-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: fix pinpad input on Windows.
+ * scd/apdu.c (open_pcsc_reader_direct): Don't call
+ pcsc_vendor_specific_init here, but...
+ (connect_pcsc_card): Call it here.
+
+2013-10-23 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2013-10-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: add pinpad readers information for PC/SC service.
+ * scd/apdu.c (pcsc_vendor_specific_init): Add information for Cherry
+ ST-2xxx, Reiner cyberJack, Vasco DIGIPASS, FSIJ Gnuk Token, and KAAN
+ Advance.
+
+2013-10-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: remove pin length check.
+ * scd/apdu.c (pcsc_pinpad_verify): Remove old check code for pin
+ length.
+
+2013-10-04 Werner Koch <wk at gnupg.org>
+
+ gpg: Limit the nesting level of I/O filters.
+ * common/iobuf.c (MAX_NESTING_FILTER): New.
+ (iobuf_push_filter2): Limit the nesting level.
+
+ * g10/mainproc.c (mainproc_context): New field ANY. Change HAVE_DATA
+ and ANY_SIG_SIGN to bit fields of ANY. Add bit field
+ UNCOMPRESS_FAILED.
+ (proc_compressed): Avoid printing multiple Bad Data messages.
+ (check_nesting): Return GPG_ERR_BAD_DATA instead of UNEXPECTED_DATA.
+
+2013-10-02 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix bug with deeply nested compressed packets.
+ * g10/mainproc.c (MAX_NESTING_DEPTH): New.
+ (proc_compressed): Return an error code.
+ (check_nesting): New.
+ (do_proc_packets): Check packet nesting depth. Handle errors from
+ check_compressed.
+
+2013-09-08 Werner Koch <wk at gnupg.org>
+
+ Switch to deterministic DSA.
+ * agent/pksign.c (rfc6979_hash_algo_string): New.
+ (do_encode_dsa) [Libgcrypt >= 1.6]: Make use of RFC-6979.
+
+2013-08-30 Werner Koch <wk at gnupg.org>
+
+ scd: Suppress gcc warning about possible uninitialized use.
+ * scd/app-nks.c (parse_pwidstr): Always init r_pwid.
+
+ gpg: Use 2048 as the default keysize in batch mode.
+ * g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
+ 2048.
+
+ gpgtar: Fix building for systems with a separate libintl.
+ * tools/Makefile.am (gpgtar_LDADD): Add LIBINTL and LIBICONV.
+
+ scd: Use vendor and product id macros also in apdu.c.
+ * scd/ccid-driver.c: Move vendor and product ids to ...
+ * scd/ccid-driver.h: here.
+ * scd/apdu.c (CCID_DRIVER_INCLUDE_USB_IDS): Define to include ids.
+ (pcsc_vendor_specific_init): Use vendor and product id macros.
+
+2013-08-30 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC pinpad input improvement.
+ * scd/apdu.c (struct reader_table_s): Add members: PINMIN, PINMAX, and
+ PINPAD_VERLEN_SUPPORTED.
+ (CM_IOCTL_VENDOR_IFD_EXCHANGE, FEATURE_GET_TLV_PROPERTIES,
+ PCSCv2_PART10_PROPERTY_*): New.
+ (new_reader_slot): Initialize pinpad_varlen_supported, pinmin, pinmax.
+ (pcsc_vendor_specific_init): New.
+ (open_pcsc_reader_direct, open_pcsc_reader_wrapped): Call
+ pcsc_vendor_specific_init.
+ (check_pcsc_pinpad): Not detect here but use the result of
+ pcsc_vendor_specific_init.
+ (pcsc_pinpad_verify, pcsc_pinpad_modify): Specify bNumberMessage.
+
+2013-08-29 Jonas Borgström <jonas at borgstrom.se>
+
+ scd: add support for RSA_CRT and RSA_CRT_N key import.
+ * scd/app-openpgp.c (do_writekey): Added RSA_CRT and RSA_CRT_N support.
+
+2013-08-29 Werner Koch <wk at gnupg.org>
+
+ kbx: Add a few macros for easier readability.
+ * kbx/keybox-update.c (FILECOPY_INSERT)
+ (FILECOPY_DELETE, FILECOPY_UPDATE): New macros. Replace numbers by
+ them.
+
+2013-08-28 Werner Koch <wk at gnupg.org>
+
+ Fix commit 04e2c83f.
+ * agent/command-ssh.c (stream_read_string): Do not assign to a NULL
+ ptr.
+
+ gpg: Make decryption with the OpenPGP card work.
+ * scd/app-common.h (APP_DECIPHER_INFO_NOPAD): New.
+ * scd/app-openpgp.c (do_decipher): Add arg R_INFO.
+ * scd/app-nks.c (do_decipher): Add arg R_INFO as a dummy.
+ * scd/app.c (app_decipher): Add arg R_INFO.
+ * scd/command.c (cmd_pkdecrypt): Print status line "PADDING".
+ * agent/call-scd.c (padding_info_cb): New.
+ (agent_card_pkdecrypt): Add arg R_PADDING.
+ * agent/divert-scd.c (divert_pkdecrypt): Ditto.
+ * agent/pkdecrypt.c (agent_pkdecrypt): Ditto.
+ * agent/command.c (cmd_pkdecrypt): Print status line "PADDING".
+ * g10/call-agent.c (padding_info_cb): New.
+ (agent_pkdecrypt): Add arg R_PADDING.
+ * g10/pubkey-enc.c (get_it): Use padding info.
+
+ agent: Fix two compiler warnings.
+ * agent/command.c (cmd_preset_passphrase, pinentry_loopback): Use %zu
+ in format string.
+ * scd/ccid-driver.c (ccid_get_atr): Ditto.
+ * agent/command-ssh.c (stream_read_string): Init arg STRING_SIZE to
+ avoid maybe_unitialized warning.
+
+2013-08-27 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: fix parsing login-data DO.
+ * scd/app-openpgp.c (parse_login_data): Release RELPTR. Fix parsing.
+
+ scd: fix Vega for Alpha reader.
+ * scd/ccid-driver.c (ccid_vendor_specific_init): Fix error handling
+ and size of command.
+
+2013-08-21 Werner Koch <wk at gnupg.org>
+
+ scd: Make SPRx32 pinpad work with PC/SC on Windows.
+ * scd/apdu.c (CM_IOCTL_GET_FEATURE_REQUEST): Use SCARD_CTL_CODE.
+ (SCARD_CTL_CODE): Define if not defined.
+ (reader_table_s): Add is_spr532.
+ (new_reader_slot): Clear it.
+ (check_pcsc_pinpad): Set it.
+ (pcsc_pinpad_verify, pcsc_pinpad_modify): Add fix for SPR532.
+
+ scd: Improve --enable-pinpad-varlen.
+ * tools/gpgconf-comp.c (gc_options_scdaemon): Add
+ enable-pinpad-varlen.
+ * scd/apdu.c (check_pcsc_pinpad): Detect SPRx32 reader.
+
+2013-08-08 Werner Koch <wk at gnupg.org>
+
+ agent: Extend cmd KEYINFO to return data from sshcontrol.
+ * agent/command-ssh.c (struct control_file_s): Rename to
+ ssh_control_file_s.
+ (ssh_open_control_file, ssh_close_control_file)
+ (ssh_read_control_file, ssh_search_control_file): New.
+ (control_file_t): Rename and move to ...
+ * agent/agent.h (ssh_control_file_t): here.
+ * agent/command.c (do_one_keyinfo): Add args is_ssh, ttl, disabled,
+ and confirm. Rename unknown keytype indicator from '-' to 'X'. Extend
+ output.
+ (cmd_keyinfo): Add options --ssh-list and --with-ssh.
+
+2013-08-02 Werner Koch <wk at gnupg.org>
+
+ gpg: No need to create a trustdb when encrypting with --always-trust.
+ * g10/gpg.c (main): Special case setup_trustdb for --encrypt.
+
+2013-08-01 Werner Koch <wk at gnupg.org>
+
+ w32: Fix recent patch 9ff72e4.
+ * common/homedir.c (check_portable_app): Fix the name of the control
+ file.
+
+ agent: Include missing prototype.
+ * agent/protect.c: Include cvt-openpgp.h.
+
+ w32: Add code to support a portable use of GnuPG.
+ * common/homedir.c (w32_bin_is_bin, w32_portable_app) [W32]: New.
+ (check_portable_app) [W32]: New.
+ (standard_homedir, default_homedir) [W32]: Support the portable flag.
+ (w32_rootdir, w32_commondir) [W32]: Ditto.
+ (gnupg_bindir, gnupg_cachedir, dirmngr_socket_name) [W32]: Ditto.
+ * common/logging.h (JNLIB_LOG_NO_REGISTRY): New.
+ * common/logging.c (no_registry): New variable.
+ (log_set_prefix, log_get_prefix): Set/get that variable.
+ (do_logv): Do not check the registry if that variable is set.
+
+ Silence compiler warning about deprecated Libgcrypt symbols.
+ * configure.ac (AH_BOTTOM): Define GCRYPT_NO_DEPRECATED.
+
+ dirmngr: Define missing LDAP constant.
+ * dirmngr/ldap-url.c (LDAP_SCOPE_DEFAULT): Define if missing.
+
+ scd: Fix a syntax error for Apple and Windows.
+ * scd/apdu.c (pcsc_dword_t) [W32]: Fix syntax error.
+
+ common: Fix a build error when using adns.
+ * common/dns-cert.c (get_dns_cert) [USE_ADNS]: Fix synatx error.
+
+2013-07-31 Werner Koch <wk at gnupg.org>
+
+ common: Comment out unused code.
+ * common/w32-reg.c (write_w32_registry_string): Comment out.
+
+ dirmngr: Remove unused file.
+ * dirmngr/get-path.c: Remove.
+
+2013-06-27 Werner Koch <wk at gnupg.org>
+
+ sm: Remove cruft from source files.
+ * sm/keydb.c, sm/keydb.h: Remove disabled code parts.
+
+ Prepare for newer automake versions.
+ * configure.ac (AM_INIT_AUTOMAKE): Replace 2 argument form by the
+ option form. Add options from the top Makefile.
+ (AM_CONFIG_HEADER): Rename to AC_CONFIG_HEADER.
+ * Makefile.am (AUTOMAKE_OPTIONS): Remove.
+
+ * kbx/Makefile.am: Remove INCLUDES. Include cmacros.am. FActor some
+ AM_CPPFLAGS options to AM_CFLAGS.
+
+2013-06-26 Werner Koch <wk at gnupg.org>
+
+ Fix Makefile regression.
+ * agent/Makefile.am (gpg_agent_DEPENDENCIES): Remove cruft from wrong
+ resolve conflict 2013-04-25.
+ (gpg_agent_DEPENDENCIES): Remove obsolete gpg_agent_res_deps
+ (gpg_agent_LDFLAGS): Remove obsolete gpg_agent_res_ldflags.
+
+2013-05-22 Werner Koch <wk at gnupg.org>
+
+ Implement unattended OpenPGP secret key import.
+ * agent/command.c (cmd_import_key): Add option --unattended.
+ * agent/cvt-openpgp.c (convert_transfer_key): New.
+ (do_unprotect): Factor some code out to ...
+ (prepare_unprotect): new function.
+ (convert_from_openpgp): Factor all code out to ...
+ (convert_from_openpgp_main): this. Add arg 'passphrase'. Implement
+ openpgp-native protection modes.
+ (convert_from_openpgp_native): New.
+ * agent/t-protect.c (convert_from_openpgp_native): New dummy fucntion
+ * agent/protect-tool.c (convert_from_openpgp_native): Ditto.
+ * agent/protect.c (agent_unprotect): Add arg CTRL. Adjust all
+ callers. Support openpgp-native protection.
+ * g10/call-agent.c (agent_import_key): Add arg 'unattended'.
+ * g10/import.c (transfer_secret_keys): Use unattended in batch mode.
+
+ New debug functions log_printcanon and log_printsexp.
+ * common/sexputil.c (sexp_to_string, canon_sexp_to_string): New.
+ (log_printcanon, log_printsexp): New.
+
+ agent: Fix length detection of canonical formatted openpgp keys.
+ * agent/command.c (cmd_import_key): Pass 0 instead of KEYLEN to
+ gcry_sexp_canon_len.
+
+ agent: New option --disable-check-own-socket.
+ * agent/gpg-agent.c (oDisableCheckOwnSocket): New.
+ (disable_check_own_socket): New.
+ (parse_rereadable_options): Set new option.
+ (check_own_socket): Implement new option.
+
+2013-05-07 Werner Koch <wk at gnupg.org>
+
+ w32: Add icons and version information.
+ * common/gnupg.ico: New. Take from artwork/gnupg-favicon-1.ico.
+ * agent/gpg-agent-w32info.rc: New.
+ * g10/gpg-w32info.rc: New.
+ * scd/scdaemon-w32info.rc: New.
+ * sm/gpgsm-w32info.rc: New.
+ * tools/gpg-connect-agent-w32info.rc: New.
+ * common/w32info-rc.h.in: New.
+ * configure.ac (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP)
+ (BUILD_HOSTNAME): New.
+ (AC_CONFIG_FILES): Add w32info-rc.h.
+ * am/cmacros.am (.rc.o): New rule.
+ * agent/Makefile.am, common/Makefile.am, g10/Makefile.am
+ * scd/Makefile.am, sm/Makefile.am, tools/Makefile.am: Add stuff to
+ build resource files.
+
+2013-05-07 Ian Abbott <abbotti at mev.co.uk>
+
+ doc: fix some Texinfo warnings.
+ * doc/gpg.texi: Fix syntax and add missing menu entries.
+ * doc/gpgsm.texi: Fix subsectioning.
+
+2013-04-22 Werner Koch <wk at gnupg.org>
+
+ Fix potential heap corruption in "gpg -v --version".
+ * g10/gpg.c (build_list): Rewrite to cope with buffer overflow in
+ certain locales.
+
+2013-04-19 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Remove non-implemented commands from --help.
+ * sm/gpgsm.c (opts): Removed commands --clearsign, --symmetric,
+ --send-keys, and --recv-keys.
+
+2013-04-19 Daiki Ueno <ueno at gnu.org>
+
+ Make sure to call fflush if estream_t is backed with stdio.
+ * common/estream.c (es_func_fp_write): Call fflush after fwrite.
+
+2013-04-19 Werner Koch <wk at gnupg.org>
+
+ doc: Formatting fixes.
+ * doc/Makefile.am (.fig.jpg): Correct to use -L jpeg.
+ * doc/gpg.texi: Fix cross reference for --options.
+ * doc/gpgsm.texi: Likewise.
+ * doc/gpl.texi: Fix enumerate and re-indent examples.
+
+2013-04-01 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: move SCDaemon to libexecdir.
+ * common/homedir.c (gnupg_module_name): It's now libexecdir.
+ * scd/Makefile.am (libexec_PROGRAMS): Add scdaemon
+ (bin_PROGRAMS): Remove scdaemon.
+
+2013-03-29 Werner Koch <wk at gnupg.org>
+
+ copyright assignments are not anymore required.
+
+2013-03-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC status fix.
+ * scd/apdu.c (pcsc_get_status_direct): Check PCSC_STATE_MUTE only when
+ PCSC_STATE_PRESENT.
+
+ * scd/pcsc-wrapper.c (handle_status): Ditto.
+
+ scd: PC/SC cleanup (more).
+ * scd/apdu.c (control_pcsc_direct, control_pcsc_wrapped, control_pcsc)
+ (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify): Use
+ pcsc_dword_t.
+
+ scd: call update_card_removed only when detecting removal.
+ * scd/command.c (update_reader_status_file): Add condition
+ vr->status == 0.
+
+2013-03-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: PC/SC cleanup.
+ * scd/apdu.c (pcsc_dword_t): New. It was named as DWORD (double-word)
+ when a word was 16-bit.
+ (struct reader_table_s): Fixes for types.
+ (struct pcsc_readerstate_s) [__APPLE__]: Enable #pragma pack(1).
+ Throughout: Fixes for types.
+
+ * scd/pcsc-wrapper.c: Likewise.
+
+2013-03-21 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Enable ja.po.
+ * po/LINGUAS: Enable ja.po.
+
+ scd: change default value of pinpad maxlen.
+ * scd/apdu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Default value
+ of maxlen for pinpad input is now 15 (was: 25).
+
+ * scd/ccid-driver.c (ccid_transceive_secure): Likewise.
+
+2013-03-20 Werner Koch <wk at gnupg.org>
+
+ Add code to allow for late memory cleanup.
+ * common/init.c (mem_cleanup_item_t): New.
+ (run_mem_cleanup): New.
+ (_init_common_subsystems): Add an atexit for it.
+ (register_mem_cleanup_func): New.
+
+ * g10/kbnode.c (cleanup_registered): New.
+ (release_unused_nodes): New.
+ (alloc_node): Call register_mem_cleanup_func.
+
+ kbx: Remove unused macro.
+ * kbx/keybox.h (KEYBOX_WITH_OPENPGP): Remove unused macro.
+
+2013-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Print indicator for unknown key capability.
+ * g10/keylist.c (print_capabilities): Print '?' for unknown usage.
+
+2013-03-19 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Allow setting of all zero key flags.
+ * g10/keygen.c (do_add_key_flags): Do not check for empty key flags.
+
+2013-03-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Distinguish between missing and cleared key flags.
+ * include/cipher.h (PUBKEY_USAGE_NONE): New.
+ * g10/getkey.c (parse_key_usage): Set new flag.
+
+2013-03-15 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: ccid-driver supporting larger APDU.
+ * scd/ccid-driver.c (ccid_transceive_apdu_level): Support larger
+ APDU.
+
+ scd: fix missing close paren.
+ * scd/app-openpgp.c (du_auth): Fix.
+
+2013-03-09 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: support ECDSA signing.
+ * scd/app-openpgp.c (do_sign): Only prepend message digest block
+ for RSA or do_auth.
+ (do_auth): Remove message digest block for ECDSA.
+
+2013-03-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: support ECDSA public key.
+ * scd/app-openpgp.c (key_type_t): New.
+ (CURVE_NIST_P256, CURVE_NIST_P384, CURVE_NIST_P521): New.
+ (struct app_local_s): Change keyattr to have key_type and union.
+ (get_ecc_key_parameters, get_curve_name): New.
+ (send_key_attr, get_public_key): Support ECDSA.
+ (build_privkey_template, do_writekey, do_genkey): Follow the change
+ of the member KEY_ATTR.
+ (parse_historical): New.
+ (parse_algorithm_attribute): Support ECDSA.
+
+2013-03-05 Werner Koch <wk at gnupg.org>
+
+ Require libgpg-error 1.11.
+ * configure.ac: Require libgpg-error 1.11.
+ * common/util.h (GPG_ERR_NO_KEYSERVER, GPG_ERR_INV_CURVE)
+ (GPG_ERR_UNKNOWN_CURVE): Remove fallback definitions.
+
+2013-02-28 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: pksign result conversion to sexp to upper layer.
+ * agent/agent.h (divert_pksign): Add R_SIGLEN argument.
+ * agent/divert-scd.c (divert_pksign): Return length at R_SIGLEN.
+ * agent/call-scd.c (agent_card_pksign): Move composition of
+ S-expression to...
+ * agent/pksign.c (agent_pksign_do): ... here.
+
+2013-02-22 Werner Koch <wk at gnupg.org>
+
+ Use has_leading_keyword in the assuan callbacks.
+ * agent/call-pinentry.c (inq_quality): Use has_leading_keyword.
+ * agent/call-scd.c (inq_needpin, inq_writekey_parms): Ditto.
+ * g10/call-agent.c (inq_writecert_parms, keyinfo_status_cb): Ditto.
+ (inq_genkey_parms, inq_ciphertext_cb, inq_import_key_parms): Ditto.
+ * g10/call-dirmngr.c (ks_put_inq_cb): Ditto.
+ * sm/call-agent.c (default_inq_cb, inq_ciphertext_cb): Ditto.
+ (inq_genkey_parms, istrusted_status_cb, learn_status_cb): Ditto.
+ (keyinfo_status_cb, inq_import_key_parms): Ditto.
+ * sm/call-dirmngr.c (inq_certificate, isvalid_status_cb): Ditto.
+ (lookup_status_cb, run_command_inq_cb, run_command_status_cb): Ditto.
+
+ Remove some unused variables.
+ * tools/gpgconf-comp.c (gc_process_gpgconf_conf): Remove unused
+ used_components.
+ * agent/command-ssh.c (ssh_signature_encoder_ecdsa): Mark unused arg.
+ * g13/g13.c (main): Comment variable of yet unimplemented options.
+
+ gpg: Fix a memory leak in batch key generation.
+ * g10/keygen.c (append_to_parameter): New.
+ (proc_parameter_file): Use new func to extend the parameter list.
+
+ * g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
+ gcry_kdf_derive failed.
+ * g10/keygen.c (proc_parameter_file): Print a diagnostic if
+ passphrase_to_dek failed.
+
+ gpg: Handle the agent's NEW_PASSPHRASE inquiry.
+ * g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
+
+ common: Add func has_leading_keyword.
+ * common/stringhelp.c (has_leading_keyword): New.
+
+ Remove build hacks for FreeBSD.
+ * configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
+ LDFLAGS.
+
+2013-02-22 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: fix two bugs.
+ * agent/command.c (cmd_keytocard): Decrement KEYDATALEN.
+ * agent/findkey.c (agent_public_key_from_file): Increment for ELEMS.
+
+ gpg: fix keytocard and support ECC card for key attribute.
+ * g10/call-agent.c (agent_keytocard): Supply PARM arg.
+ * g10/card-util.c (card_status): Support ECC.
+ (card_store_subkey): Don't assume RSA.
+
+2013-02-21 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix a memory leak in batch key generation.
+ * g10/keygen.c (append_to_parameter): New.
+ (proc_parameter_file): Use new func to extend the parameter list.
+
+ * g10/passphrase.c (passphrase_to_dek_ext): Print a diagnostic of
+ gcry_kdf_derive failed.
+ * g10/keygen.c (proc_parameter_file): Print a diagnostic if
+ passphrase_to_dek failed.
+
+ gpg: Handle the agent's NEW_PASSPHRASE inquiry.
+ * g10/call-agent.c (default_inq_cb): Take care of NEW_PASSPHRASE.
+
+ common: Add func has_leading_keyword.
+ * common/stringhelp.c (has_leading_keyword): New.
+
+2013-02-20 Werner Koch <wk at gnupg.org>
+
+ Remove build hacks for FreeBSD.
+ * configure.ac [freebsd]: Do not add /usr/local to CPPFLAGS and
+ LDFLAGS.
+
+2013-02-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ gpg: Implement card_store_subkey again.
+ * g10/call-agent.h (agent_keytocard): New.
+ * g10/call-agent.c (agent_keytocard): New.
+ * g10/card-util.c (replace_existing_key_p): Returns 1 when replace.
+ (card_generate_subkey): Check return value of replace_existing_key_p.
+ (card_store_subkey): Implement again using agent_keytocard.
+
+ agent: Add KEYTOCARD command.
+ * agent/agent.h (divert_writekey, agent_card_writekey): New.
+ * agent/call-scd.c (inq_writekey_parms, agent_card_writekey): New.
+ * agent/command.c (cmd_keytocard, hlp_keytocard): New.
+ (register_commands): Add cmd_keytocard.
+ * agent/divert-scd.c (divert_writekey): New.
+
+ Japanese: update po and doc.
+ * doc/help.ja.txt, po/ja.po: Updated.
+
+2013-02-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Rename 'keypad' to 'pinpad'.
+ * NEWS: Mention scd changes.
+
+ * agent/divert-scd.c (getpin_cb): Change message.
+
+ * agent/call-scd.c (inq_needpin): Change the protocol to
+ POPUPPINPADPROMPT and DISMISSPINPADPROMPT.
+ * scd/command.c (pin_cb): Likewise.
+
+ * scd/apdu.c (struct reader_table_s): Rename member functions.
+ (check_pcsc_pinpad, pcsc_pinpad_verify, pcsc_pinpad_modify,
+ check_ccid_pinpad, ccid_pinpad_operation, apdu_check_pinpad
+ apdu_pinpad_verify, apdu_pinpad_modify): Rename.
+
+ * scd/apdu.h (SW_HOST_NO_PINPAD, apdu_check_pinpad)
+ (apdu_pinpad_verify, apdu_pinpad_modify): Rename.
+
+ * scd/iso7816.h (iso7816_check_pinpad): Rename.
+
+ * scd/iso7816.c (map_sw): Use SW_HOST_NO_PINPAD.
+ (iso7816_check_pinpad): Rename.
+ (iso7816_verify_kp, iso7816_change_reference_data_kp): Follow
+ the change.
+
+ * scd/ccid-driver.h (CCID_DRIVER_ERR_NO_PINPAD): Rename.
+ * scd/ccid-driver.c (ccid_transceive_secure): Use it.
+
+ * scd/app-dinsig.c (verify_pin): Follow the change.
+ * scd/app-nks.c (verify_pin): Follow the change.
+
+ * scd/app-openpgp.c (check_pinpad_request): Rename.
+ (parse_login_data, verify_a_chv, verify_chv3, do_change_pin): Follow
+ the change.
+
+ * scd/scdaemon.c (oDisablePinpad, oEnablePinpadVarlen): Rename.
+
+ * scd/scdaemon.h (opt): Rename to disable_pinpad,
+ enable_pinpad_varlen.
+
+ * tools/gpgconf-comp.c (gc_options_scdaemon): Rename to
+ disable-pinpad.
+
+2013-02-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Add pinentry-mode feature.
+ * g10/gpg.c: Include shareddefs.h.
+ (main): Add option --pinentry-mode.
+ * g10/options.h (struct opt): Add field pinentry_mode.
+ * g10/passphrase.c: Include shareddefs.h.
+ (have_static_passphrase): Take care of loopback pinentry_mode.
+ (read_passphrase_from_fd): Ditto.
+ (get_static_passphrase): New.
+ (passphrase_to_dek_ext): Factor some code out to ...
+ (emit_status_need_passphrase): new.
+ * g10/call-agent.c (start_agent): Send the pinentry mode.
+ (default_inq_cb): Take care of the PASSPHRASE inquiry. Return a
+ proper error code.
+ (agent_pksign): Add args keyid, mainkeyid and pubkey_algo.
+ (agent_pkdecrypt): Ditto.
+ * g10/pubkey-enc.c (get_it): Pass new args.
+ * g10/sign.c (do_sign): Pass new args.
+
+ * g10/call-agent.c (struct default_inq_parm_s): New. Change all
+ similar structs to reference this one. Change all users and inquire
+ callback to use this struct, instead of NULL or some undefined but not
+ used structs. This change will help to eventually get rid of global
+ variables.
+
+2013-02-06 Werner Koch <wk at gnupg.org>
+
+ agent: Move a typedef to common and provide parse_pinentry_mode.
+ * common/agent-opt.c: New.
+ * common/shareddefs.h: New.
+ * common/Makefile.am: Add new files.
+ * agent/agent.h: Include shareddefs.h.
+ (pinentry_mode_t): Factor out to shareddefs.h.
+ * agent/command.c (option_handler): Use parse_pinentry_mode.
+
+ agent: Return a better error code if no passphrase was given.
+ * agent/protect.c (hash_passphrase): Handle an empty passphrase.
+
+2013-02-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: Fix check_keypad_request.
+ * scd/app-openpgp.c (check_keypad_request): 0 means not to use pinpad.
+
+ SCD: Add vendor specific initalization.
+ * scd/ccid-driver.c (ccid_vendor_specific_init): New.
+ (ccid_open_reader): Call ccid_vendor_specific_init.
+
+ SCD: Support P=N format for login data.
+ * scd/app-openpgp.c (parse_login_data): Support P=N format.
+
+ SCD: Better interoperability.
+ * scd/apdu.c: Fill bTeoPrologue[2] field.
+
+ SCD: Defaults to use pinpad if the reader has the capability.
+ * scd/app-openpgp.c (struct app_local_s): Remove VARLEN.
+ (parse_login_data): "P=0" means to disable pinpad.
+ (check_keypad_request): Default is to use pinpad if available.
+
+ SCD: handle keypad request on the card.
+ * scd/app-openpgp.c: Add 2013.
+ (struct app_local_s): Add keypad structure.
+ (parse_login_data): Add parsing keypad request on the card.
+ (check_keypad_request): New.
+ (verify_a_chv, verify_chv3, do_change_pin): Call check_keypad_request
+ to determine use of keypad.
+
+ SCD: Minor fix of ccid-driver.
+ * scd/ccid-driver.c (VENDOR_VEGA): Fix typo.
+
+ SCD: Add support of Covadis VEGA_ALPHA reader.
+ * scd/ccid-driver.c: Add 2013.
+ (VENDER_VEGA, VEGA_ALPHA):New.
+ (ccid_transceive_secure): VEGA_ALPHA is same firmware as GEMPC_PINPAD.
+ Change bNumberMessage to 0x01, as it works better (was: 0xff).
+
+ SCD: Support fixed length PIN input for keypad (PC/SC).
+ * scd/apdu.c (pcsc_keypad_verify): SUpport fixed length PIN input for
+ keypad.
+ (pcsc_keypad_modify): Likewise.
+ * scd/ccid-driver.c (ccid_transceive_secure): Clean up.
+
+ SCD: Support fixed length PIN input for keypad.
+ * scd/iso7816.h (struct pininfo_s): Remove MODE and add FIXEDLEN.
+ * scd/app-dinsig.c (verify_pin): Initialize FIXEDLEN to unknown.
+ * scd/app-nks.c (verify_pin): Likewise.
+ * scd/app-openpgp.c (verify_a_chv, verify_chv3, do_change_pin):
+ Likewise.
+ * scd/apdu.c (check_pcsc_keypad): Add comment.
+ (pcsc_keypad_verify, pcsc_keypad_modify): PC/SC driver only support
+ readers with the feature of variable length input (yet).
+ (apdu_check_keypad): Set FIXEDLEN.
+ * scd/ccid-driver.c (ccid_transceive_secure): Add GEMPC_PINPAD
+ specific settings.
+ Support fixed length PIN input for keypad.
+
+ SCD: API cleanup for keypad handling.
+ * scd/iso7816.h (struct pininfo_s): Rename from iso7816_pininfo_s.
+ Change meaning of MODE.
+ (pininfo_t): Rename from iso7816_pininfo_t.
+ * scd/sc-copykeys.c: Include "iso7816.h".
+ * scd/scdaemon.c, scd/command.c: Likewise.
+ * scd/ccid-driver.c: Include "scdaemon.h" and "iso7816.h".
+ (ccid_transceive_secure): Follow the change of PININFO_T.
+ * scd/app.c: Include "apdu.h" after "iso7816.h".
+ * scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
+ (iso7816_change_reference_data_kp): Follow the change of API.
+ * scd/apdu.c (struct reader_table_s): Change API of CHECK_KEYPAD,
+ KEYPAD_VERIFY, KEYPAD_MODIFY to have arg of PININFO_T.
+ (check_pcsc_keypad, check_ccid_keypad): Likewise.
+ (apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify): Likewise.
+ (pcsc_keypad_verify, pcsc_keypad_modify, ct_send_apdu)
+ (pcsc_send_apdu_direct, pcsc_send_apdu_wrapped, pcsc_send_apdu)
+ (send_apdu_ccid, ccid_keypad_operation, my_rapdu_send_apdu, send_apdu)
+ (send_le): Follow the change of API.
+ * scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
+ (apdu_keypad_modify): Change the API.
+ * scd/app-dinsig.c, scd/app-nks.c, scd/app-openpgp.c: Follow the
+ change.
+
+ SCD: Clean up. Remove PADLEN for keypad input.
+ * scd/apdu.c (struct pininfo_s): Use iso7816_pininfo_s.
+ (struct reader_table_s): Remove last arg from check_keypad method.
+ (check_pcsc_keypad, check_pcsc_keypad): Remove PIN_PADLEN.
+ (pcsc_keypad_verify, pcsc_keypad_modify): Don't check PIN_PADLEN.
+ (send_apdu_ccid, ccid_keypad_operation): Remove PIN_PADLEN.
+ (apdu_check_keypad, apdu_keypad_verify, apdu_keypad_modify):
+ Likewise.
+
+ * scd/apdu.h (apdu_check_keypad, apdu_keypad_verify)
+ (apdu_keypad_modify): Remove PIN_PADLEN.
+
+ * scd/ccid-driver.c (ccid_transceive_secure): Remove PIN_PADLEN.
+
+ * scd/ccid-driver.h (ccid_transceive_secure): Remove PIN_PADLEN.
+
+ * scd/iso7816.c (iso7816_check_keypad, iso7816_verify_kp)
+ (iso7816_change_reference_data_kp): Remove PADLEN.
+
+ * scd/iso7816.h (struct iso7816_pininfo_s): Remove PADLEN, PADCHAR.
+
+ SCD: Add option enable-keypad-varlen and support for GEMPC_PINPAD.
+ * scd/scdaemon.h (opt): Add enable_keypad_varlen.
+ * scd/scdaemon.c (cmd_and_opt_values): Add oEnableKeypadVarlen.
+ (opts, main): Add oEnableKeypadVarlen.
+ * scd/ccid-driver.c (GEMPC_PINPAD): New.
+ (ccid_transceive_secure): Add enable_varlen handling.
+ Enable GEMPC_PINPAD.
+
+2013-01-30 Werner Koch <wk at gnupg.org>
+
+ Remove unused status codes.
+ * common/status.h (STATUS_BEGIN_STREAM, STATUS_END_STREAM)
+ (STATUS_SIEXPIRED): Remove unused codes.
+
+ gpg: Add status line PINENTRY_LAUNCHED.
+ * common/status.h (STATUS_PINENTRY_LAUNCHED): New.
+ * g10/server.c (server_local_s): Add field allow_pinentry_notify.
+ (option_handler): Add option "allow-pinentry-notify".
+ (gpg_proxy_pinentry_notify): New.
+ * g10/call-agent.c (default_inq_cb): Factor code out to the new
+ function.
+
+2013-01-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix a bug of handling return code from npth_join.
+ * agent/call-pinentry.c (agent_popup_message_stop): Fix npth_join
+ return code.
+
+2013-01-11 Christian Aistleitner <christian at quelltextlich.at>
+
+ gpg: Fix honoring --cert-digest-algo when recreating a cert.
+ * g10/sign.c (update_keysig_packet): Override original signature's
+ digest algo in hashed data and for hash computation.
+
+2013-01-11 Werner Koch <wk at gnupg.org>
+
+ Fix spurious cruft from configure summary output.
+ * configure.ac (build_scdaemon_extra): Remove $tmp cruft.
+
+2013-01-11 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Hold lock for pinpad input.
+ * scd/apdu.c (apdu_check_keypad, apdu_keypad_verify)
+ (apdu_keypad_modify): Hold lock to serialize communication.
+
+2013-01-08 Werner Koch <wk at gnupg.org>
+
+ kbx: Switch from MD5 to SHA-1 for the checksum.
+ * kbx/keybox-blob.c (put_membuf): Use a NULL buf to store zero bytes.
+ (create_blob_finish): Write just the needed space.
+ (create_blob_finish): Switch to SHA-1.
+ * kbx/keybox-dump.c (print_checksum): New.
+ (_keybox_dump_blob): Print the checksum and the verification status.
+
+ gpg: Cache keybox searches.
+ * common/iobuf.c (iobuf_seek): Fix for temp streams.
+ * g10/pubkey-enc.c (get_session_key, get_it): Add some log_clock calls.
+ * g10/keydb.c (dump_search_desc): New.
+ (enum_keyblock_states, struct keyblock_cache): New.
+ (keyblock_cache_clear): New.
+ (keydb_get_keyblock, keydb_search): Implement a keyblock cache.
+ (keydb_update_keyblock, keydb_insert_keyblock, keydb_delete_keyblock)
+ (keydb_rebuild_caches, keydb_search_reset): Clear the cache.
+
+ Make log_clock easier to read.
+ * common/logging.c (log_clock): Print in microseconds.
+
+ gpg: Remove a function wrapper.
+ * g10/keydb.h (keydb_search): Remove macro.
+ * g10/keydb.c (keydb_search2): Rename to keydb_search. Change all
+ callers.
+
+2013-01-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Support not-so-smart card readers.
+ * scd/ccid-driver.c (struct ccid_driver_s): Add auto_voltage,
+ auto_param, and auto_pps.
+ (parse_ccid_descriptor): Set auto_voltage, auto_param, and auto_pps.
+ Support non-autoconf readers.
+ (update_param_by_atr): New.
+ (ccid_get_atr): Use 5V for PowerOn when auto_voltage is not supported.
+ Use 0x10 when nonnull_nad for SetParameters.
+ Call update_param_by_atr for parsing ATR, and use param for
+ SetParameters.
+ Send PPS if reader requires it and card is negotiable.
+ When bNadValue in the return values of SetParameters == 0,
+ clear handle->nonnull_nad flag.
+
+2013-01-07 Werner Koch <wk at gnupg.org>
+
+ gpg: Set the node flags while retrieving a keyblock.
+ * g10/keydb.c (parse_keyblock_image): Add args PK_NO and UID_NO and
+ set the note flags accordingly.
+ (keydb_get_keyblock): Transfer PK_NO and UID_NO to parse_keyblock_image.
+ * kbx/keybox-search.c (blob_cmp_fpr, blob_cmp_fpr_part)
+ (blob_cmp_name, blob_cmp_mail): Return the key/user number.
+ (keybox_search): Set the key and user number into the found struct.
+ (keybox_get_keyblock): Add args R_PK_NO and R_UID_NO and set them from
+ the found struct.
+
+ New function log_clock.
+ * common/logging.c (log_clock): New.
+ * g10/gpg.c (set_debug): Print clock debug flag.
+ * g10/options.h (DBG_CLOCK_VALUE, DBG_CLOCK): New.
+
+ gpg: Allow searching for user ids in a keybox.
+ * kbx/keybox-search.c (blob_cmp_name): Add arg X509 and adjust for PGP
+ use. Change callers.
+ (blob_cmp_mail): Add arg X509 and find the mailbox offset for PGP.
+ Chnage callers.
+ (has_subject_or_alt): Rename to has_username.
+ (has_username): Allow blobtype PGP.
+ (has_mail): Ditto.
+
+ gpg: Allow generation of more than 4096 keys in one run.
+ * g10/getkey.c (cache_public_key): Make room in the cache if needed.
+
+2013-01-07 NIIBE Yutaka <gniibe at fsij.org>
+
+ Update Japanese Translation.
+ * po/ja.po: Fix wrong translations for designated revocation.
+ Reported by Hideki Saito.
+
+ Conflicts:
+ po/ja.po
+
+2013-01-05 NIIBE Yutaka <gniibe at fsij.org>
+
+ Update Japanese Translation.
+ * po/ja.po: Fix fuzzy translations.
+
+2013-01-03 NIIBE Yutaka <gniibe at fsij.org>
+
+ Update Japanese Translation.
+ * po/ja.po: Update with POT.
+
+ Update Japanese Translation.
+ * po/ja.po: Start from the new one of 2.0.
+
+2012-12-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Add signature cache support to the keybox.
+ * g10/keydb.c (parse_keyblock_image): Add arg SIGSTATUS.
+ (keydb_get_keyblock): Handle it.
+ (build_keyblock_image): Add arg SIGSTATUS.
+ (keydb_insert_keyblock): Handle it.
+ * kbx/keybox-blob.c (pgp_create_sig_part): Add arg SIGSTATUS.
+ (_keybox_create_openpgp_blob): Ditto.
+ * kbx/kbxutil.c (import_openpgp): Adjust for above change.
+ * kbx/keybox.h (KEYBOX_FLAG_SIG_INFO): New.
+ * kbx/keybox-search.c (_keybox_get_flag_location): Handle new flag.
+ (keybox_get_keyblock): Add arg R_SIGSTATUS.
+ * kbx/keybox-update.c (keybox_insert_keyblock): Add arg SIGSTATUS.
+
+ kbxutil: Improve format of the Sig-Expire lines.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Print the expirate timestamp.
+
+ gpg: First working support for keyboxes.
+ * g10/getkey.c (get_pubkey_fast): Improve the assertion.
+ * kbx/keybox.h: Include iobuf.h.
+ * kbx/keybox-blob.c (keyboxblob_uid): Add field OFF.
+ (KEYBOX_WITH_OPENPGP): Remove use of this macro.
+ (pgp_create_key_part_single): New.
+ (pgp_temp_store_kid): Change to use the keybox-openpgp parser.
+ (pgp_create_key_part): Ditto.
+ (pgp_create_uid_part): Ditto.
+ (pgp_create_sig_part): Ditto.
+ (pgp_create_blob_keyblock): Ditto.
+ (_keybox_create_openpgp_blob): Ditto.
+ * kbx/keybox-search.c (keybox_get_keyblock): New.
+ * kbx/keybox-update.c (keybox_insert_keyblock): New.
+ * g10/keydb.c (parse_keyblock_image):
+ (keydb_get_keyblock): Support keybox.
+ (build_keyblock_image): New.
+ (keydb_insert_keyblock): Support keybox.
+
+ * kbx/kbxutil.c (import_openpgp, main): Add option --dry-run and print
+ a kbx file to stdout.
+
+ * kbx/keybox-file.c (_keybox_read_blob2): Allow keyblocks up to 10^6
+ bytes.
+
+ kbxutil: Print algo number and fold similar lines.
+ * kbx/keybox-defs.h (_keybox_openpgp_key_info): Add field ALGO.
+ * kbx/keybox-openpgp.c (parse_key): Store algo.
+ * kbx/kbxutil.c (dump_openpgp_key): Print algo number.
+ * kbx/keybox-dump.c (_keybox_dump_blob): Print identical Sig-Expire
+ value lines with a range of indices.
+
+2012-12-27 Werner Koch <wk at gnupg.org>
+
+ gpg: First patches to support a keybox storage backend.
+ * kbx/keybox-defs.h (_keybox_write_header_blob): Move prototype to ..
+ * kbx/keybox.h: here.
+ * kbx/keybox-init.c (keybox_lock): Add dummy function
+ * g10/keydb.c: Include keybox.h.
+ (KeydbResourceType): Add KEYDB_RESOURCE_TYPE_KEYBOX.
+ (struct resource_item): Add field kb.
+ (maybe_create_keyring_or_box): Add error descriptions to diagnostics.
+ Add arg IS_BOX. Write a header for a new keybox file.
+ (keydb_add_resource): No more need for the force flag. Rename the
+ local variable "force" to "create". Add URL scheme "gnupg-kbx". Add
+ magic test to detect a keybox file. Add basic support for keybox.
+ (keydb_new, keydb_get_resource_name, keydb_delete_keyblock)
+ (keydb_locate_writable, keydb_search_reset, keydb_search2): Add
+ support for keybox.
+ (lock_all, unlock_all): Ditto.
+ * g10/Makefile.am (needed_libs): Add libkeybox.a.
+ (gpg2_LDADD, gpgv2_LDADD): Add KSBA_LIBS as a workaround.
+
+ * g10/keydb.h (KEYDB_RESOURCE_FLAG_PRIMARY)
+ KEYDB_RESOURCE_FLAG_DEFAULT, KEYDB_RESOURCE_FLAG_READONLY): New.
+ * g10/gpg.c, g10/gpgv.c (main): Use new constants.
+
+2012-12-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Import only packets which are allowed in a keyblock.
+ * g10/import.c (valid_keyblock_packet): New.
+ (read_block): Store only valid packets.
+
+2012-12-19 Werner Koch <wk at gnupg.org>
+
+ gpg: Make commit 2b3cb2ee actually work.
+ * g10/sign.c (update_keysig_packet): Use digest_algo.
+
+ (cherry-picked from commit d23ec86095714d388acac14b515445fe69f019e9)
+
+ gpg: Suppress "public key already present" in quiet mode.
+ * g10/pkclist.c (find_and_check_key, build_pk_list): Print a
+ diagnostic only in non-quiet mode.
+
+2012-12-18 Werner Koch <wk at gnupg.org>
+
+ common: Add meta option ignore-invalid-option.
+ * common/argparse.c (iio_item_def_s, IIO_ITEM_DEF): New.
+ (initialize): Init field IIO_LIST.
+ (ignore_invalid_option_p): New.
+ (ignore_invalid_option_add): New.
+ (ignore_invalid_option_clear): New.
+ (optfile_parse): Implement meta option.
+
+2012-12-13 Werner Koch <wk at gnupg.org>
+ Hans of Guardian <hans at guardianproject.info>
+
+ utf8conv.c: Add hacks for Android.
+ * common/utf8conv.c [HAVE_ANDROID_SYSTEM]: Do not include iconv.h.
+ (iconv_open, iconv_close, load_libiconv) [HAVE_ANDROID_SYSTEM]: New
+ dummy functions.
+ (set_native_charset) [HAVE_ANDROID_SYSTEM]: Force use of "utf-8".
+ (jnlib_iconv_open) [HAVE_ANDROID_SYSTEM]: Act the same as under W32.
+ (jnlib_iconv) [HAVE_ANDROID_SYSTEM]: Ditto.
+ (jnlib_iconv_close) [HAVE_ANDROID_SYSTEM]: Ditto.
+
+2012-12-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Fix the process of writing key or generating key.
+ * scd/app-openpgp.c (store_fpr): Flush KEY-FPR and KEY-TIME.
+
+2012-12-12 Werner Koch <wk at gnupg.org>
+
+ ssh: Support ECDSA keys.
+ * agent/command-ssh.c (SPEC_FLAG_IS_ECDSA): New.
+ (struct ssh_key_type_spec): Add fields CURVE_NAME and HASH_ALGO.
+ (ssh_key_types): Add types ecdsa-sha2-nistp{256,384,521}.
+ (ssh_signature_encoder_t): Add arg spec and adjust all callers.
+ (ssh_signature_encoder_ecdsa): New.
+ (sexp_key_construct, sexp_key_extract, ssh_receive_key)
+ (ssh_convert_key_to_blob): Support ecdsa.
+ (ssh_identifier_from_curve_name): New.
+ (ssh_send_key_public): Retrieve and pass the curve_name.
+ (key_secret_to_public): Ditto.
+ (data_sign): Add arg SPEC and change callers to pass it.
+ (ssh_handler_sign_request): Get the hash algo from SPEC.
+ * common/ssh-utils.c (get_fingerprint): Support ecdsa.
+
+ * agent/protect.c (protect_info): Add flag ECC_HACK.
+ (agent_protect): Allow the use of the "curve" parameter.
+ * agent/t-protect.c (test_agent_protect): Add a test case for ecdsa.
+
+ * agent/command-ssh.c (ssh_key_grip): Print a better error code.
+
+2012-12-11 Werner Koch <wk at gnupg.org>
+
+ ssh: Rewrite a function for better maintainability.
+ * agent/command-ssh.c (ssh_signature_encoder_dsa): Rewrite.
+
+2012-12-10 Werner Koch <wk at gnupg.org>
+
+ ssh: Improve key lookup for many keys.
+ * agent/command-ssh.c: Remove dirent.h.
+ (control_file_s): Add struct item.
+ (rewind_control_file): New.
+ (search_control_file): Factor code out to ...
+ (read_control_file_item): New.
+ (ssh_handler_request_identities): Change to iterate over entries in
+ sshcontrol.
+
+ ssh: Cleanup sshcontrol file access code.
+ * agent/command-ssh.c (SSH_CONTROL_FILE_NAME): New macro to replace
+ the direct use of the string.
+ (struct control_file_s, control_file_t): New.
+ (open_control_file, close_control_file): New. Use them instead of
+ using fopen/fclose directly.
+
+ agent: Add envvar "gnupg_SSH_AUTH_SOCK_by"
+ * agent/gpg-agent.c (main): Pass new envar gnupg_SSH_AUTH_SOCK_by to
+ an invoked process.
+
+ config: Update npth.m4.
+ * m4/npth.m4: Take from current npth master.
+
+2012-12-04 NIIBE Yutaka <gniibe at fsij.org>
+
+ Revert SCD changes of 2010-05-03.
+ * scd/apdu.c (pcsc_no_service): Remove.
+ (open_pcsc_reader_direct, open_pcsc_reader_wrapped): Remove
+ pcsc_no_service support.
+ (apdu_open_reader): Remove R_NO_SERVICE.
+ * scd/apdu.h (apdu_open_reader): Remove R_NO_SERVICE.
+ * scd/command.c (reader_disabled): Remove.
+ (get_current_reader): Follow the change of R_NO_SERVICE.
+ (open_card, cmd_serialno, scd_command_handler): Remove reader_disabled
+ support.
+ * scd/sc-copykeys.c (main): Follow the change of R_NO_SERVICE.
+
+ Don't keep opening unavailable card reader.
+ * scd/command.c (update_reader_status_file): Don't call
+ get_current_reader.
+
+2012-11-30 David Shaw <dshaw at jabberwocky.com>
+
+ Refresh sample keys.
+
+ Adjust awk to not add trailing whitespace.
+ * mksamplekeys: Tweak awk script to not add trailing whitespace to
+ blank lines (makes git pre-commit hook unhappy)
+
+2012-11-29 David Shaw <dshaw at jabberwocky.com>
+
+ The keyserver search menu should honor --keyid-format.
+ * keyserver.c (print_keyrec): Honor --keyid-format when getting back
+ full fingerprints from the keyserver (the comment in the code was
+ correct, the code was not).
+
+2012-11-27 Werner Koch <wk at gnupg.org>
+
+ Fix printing of ECC algo names in hkp keyserver listings.
+ * g10/keyserver.c (print_keyrec): Map OpenPGP algorithm ids.
+
+2012-11-26 Ben Kibbey <bjk at luxsci.net>
+
+ Check for inet_addr() in -lnsl.
+ * configure.ac: Check for inet_addr() in libnsl.
+
+2012-11-20 Werner Koch <wk at gnupg.org>
+
+ Do not use a broken ttyname.
+ * configure.ac (HAVE_BROKEN_TTYNAME): New ac_define set for Android
+ systems.
+ * common/util.h (gnupg_ttyname): New macro. Change all callers of
+ ttyname to use this macro instead.
+ (ttyname) [W32]: Rename to _gnupg_ttyname and use also if
+ HAVE_BROKEN_TTYNAME is defined.
+ * common/simple-pwquery.c (agent_send_all_options): Keep on using
+ ttyname unless HAVE_BROKEN_TTYNAME is set. This is because this file
+ may be used standalone.
+
+2012-11-16 Werner Koch <wk at gnupg.org>
+
+ Fix non-portable use of chmod in autogen.sh.
+ * autogen.sh: Remove option -c from chmod.
+
+ Improve parsing of the GIT revision number.
+ * configure.ac (mmm4_revision): Use git rev-parse.
+
+ Add an OpenPGP card vendor.
+ * g10/card-util.c (get_manufacturer): Add Yubico.
+
+2012-11-06 Werner Koch <wk at gnupg.org>
+
+ agent: Use wipememory instead of memset in one place.
+ * agent/command.c (clear_outbuf): Use wipememory. Suggested by Ben
+ Kibbey.
+
+ Allow decryption with card keys > 3072 bits.
+ * scd/command.c (MAXLEN_SETDATA): New.
+ (cmd_setdata): Add option --append.
+ * agent/call-scd.c (agent_card_pkdecrypt): Use new option for long
+ data.
+
+ * scd/app-openpgp.c (struct app_local_s): Add field manufacturer.
+ (app_select_openpgp): Store manufacturer.
+ (do_decipher): Print a note for broken cards.
+
+2012-11-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ agent: Fix wrong use of gcry_sexp_build_array.
+ * findkey.c (agent_public_key_from_file): Fix use of
+ gcry_sexp_build_array.
+
+2012-10-31 NIIBE Yutaka <gniibe at fsij.org>
+
+ SCD: Upon error, open_pcsc_reader_wrapped does same as _direct.
+ * scd/apdu.c (PCSC_E_NO_SERVICE): New.
+ (open_pcsc_reader_direct): Use PCSC_E_NO_SERVICE.
+ (open_pcsc_reader_wrapped): Set pcsc_no_service.
+
+2012-08-24 Werner Koch <wk at gnupg.org>
+
+ Update and enable French translation.
+ * po/fr.po: Update.
+ * po/LINGUAS: Enable fr.
+
+2012-08-24 David Prévot <taffit at debian.org>
+
+ Fix typos spotted during translations.
+ * agent/genkey.c: s/to to/to/
+ * sm/*.c: s/failed to allocated/failed to allocate/
+ * sm/certlist.c, ./dirmngr/validate.c: s/should have not/should not have/
+ * g10/seskey.c: missing closing parenthesis
+ * dirmngr/crlcache.c: s/may has/may have/
+
+ Consistency fix:
+
+ * g10/gpg.c, kbx/kbxutil.c, sm/gpgsm.c: uppercase after Syntax
+ * dirmngr/dirmngr_ldap: no period in Syntax
+ * dirmngr/dirmngr-client.c: infinitive for option description:
+ s/certificates are expected/expect certificates/
+
+ Keep previous msgids of translated messages.
+ * po/Makefile.in.in: Use --previous with msgmerge.
+
+2012-08-24 Hans-Christoph Steiner <hans at eds.org>
+
+ Fix build system for Android by disabling tests since its x-compiled.
+ * configure.ac (HAVE_ANDROID_SYSTEM, RUN_TESTS): New.
+ (AH_BOTTOM) [__ANDROID__]: Do not re-define ttyname.
+ * Makefile.am: Depend tests on new RUN_TESTS conditional.
+
+2012-08-24 Werner Koch <wk at gnupg.org>
+
+ Fix left over use of jnlib on some platforms.
+ * tools/watchgnupg.c: Take mischelp.h from common/ and not jnlib/.
+
+2012-06-25 NIIBE Yutaka <gniibe at fsij.org>
+
+ scd: handle reader/token removal.
+ * scd/apdu.c (pcsc_error_to_sw): PCSC_E_UNKNOWN_READER means
+ SW_HOST_NO_READER.
+
+2012-06-05 Werner Koch <wk at gnupg.org>
+
+ Change all quotes in strings and comments to the new GNU standard.
+ The asymmetric quotes used by GNU in the past (`...') don't render
+ nicely on modern systems. We now use two \x27 characters ('...').
+
+ The proper solution would be to use the correct Unicode symmetric
+ quotes here. However this has the disadvantage that the system
+ requires Unicode support. We don't want that today. If Unicode is
+ available a generated po file can be used to output proper quotes. A
+ simple sed script like the one used for en at quote is sufficient to
+ change them.
+
+ The changes have been done by applying
+
+ sed -i "s/\`\([^'\`]*\)'/'\1'/g"
+
+ to most files and fixing obvious problems by hand. The msgid strings in
+ the po files were fixed with a similar command.
+
+2012-05-24 Werner Koch <wk at gnupg.org>
+
+ Print the hash algorithm in colon mode key listing.
+ * g10/keylist.c (list_keyblock_colon): Print digest_algo.
+
+ Fix type conflict warning.
+ * g10/keylist.c: Change min_cert_level to a byte.
+
+2012-05-11 Werner Koch <wk at gnupg.org>
+
+ Switch to the new automagic beta numbering scheme.
+ * configure.ac: Add all the require m4 magic.
+
+2012-05-08 Werner Koch <wk at gnupg.org>
+
+ Add tweaks for the not anymore patented IDEA algorithm.
+ * g10/keygen.c (keygen_set_std_prefs): Include IDEA only in PGP2
+ compatibility mode.
+ * g10/misc.c (idea_cipher_warn): Remove. Also remove all callers.
+ * common/status.h (STATUS_RSA_OR_IDEA): Remove. Do not emit this
+ status anymore.
+
+ po: Update de.po.
+ * po/de.po: Update.
+
+ common: Remove generated files only during maintainer-clean.
+ * common/Makefile.am (CLEANFILES): Rename to MAINTAINERCLEANFILES.
+
+2012-04-30 Werner Koch <wk at gnupg.org>
+
+ agent: Fix deadlock in trustlist due to the switch to npth.
+ * agent/trustlist.c (clear_trusttable): New.
+ (agent_reload_trustlist): Use new function.
+ (read_trustfiles): Require to be called with lock held.
+ (agent_istrusted): Factor all code out to ...
+ (istrusted_internal): new. Add ALREADY_LOCKED arg. Make sure the
+ table islocked. Do not print TRUSTLISTFLAG stati if called internally.
+ (agent_marktrusted): Replace calls to agent_reload_trustlist by
+ explicit code.
+
+2012-04-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ make DNS and URI fields work in gpgsm --gen-key.
+ * sm/certreqgen-ui.c (gpgsm_gencertreq_tty): Actually set mb_uri and
+ mb_dns.avoid buffer strncpy-induced buffer overrun
+
+2012-04-26 Jim Meyering <jim at meyering.net>
+
+ avoid buffer strncpy-induced buffer overrun.
+ * dirmngr/crlcache.c (open_dir): Ensure that both this_update
+ and next_update member strings are NUL-terminated.
+
+ remove doubled words in a comment.
+
+2012-04-20 Werner Koch <wk at gnupg.org>
+
+ Change license for some files in common to LGPLv3+/GPLv2+.
+ Having the LGPL on the common GnuPG code helps to share code
+ between GnuPG and related projects (like GPGME and Libassuan). This
+ is good for interoperability and to reduces bugs.
+
+ * common/asshelp.c, common/asshelp.h, common/asshelp2.c, common/b64dec.c
+ * common/b64enc.c, common/convert.c, common/dns-cert.c
+ * common/dns-cert.h common/exechelp-posix.c, common/exechelp-w32.c
+ * common/exechelp-w32ce.c, common/exechelp.h, common/get-passphrase.c
+ * common/get-passphrase.h, common/gettime.c, common/gpgrlhelp.c
+ * common/helpfile.c, common/homedir.c, common/http.c, common/http.h
+ * common/i18n.c, common/init.c, common/init.h, common/iobuf.c
+ * common/iobuf.h, common/localename.c, common/membuf.c, common/membuf.h
+ * common/miscellaneous.c, common/openpgp-oid.c, common/openpgpdefs.h
+ * common/percent.c, common/pka.c, common/pka.h, common/session-env.c
+ * common/session-env.h, common/sexp-parse.h, common/sexputil.c
+ * common/signal.c, common/srv.c, common/srv.h, common/ssh-utils.c
+ * common/ssh-utils.h, common/sysutils.c, common/sysutils.h
+ * common/tlv.c, common/tlv.h, common/ttyio.c, common/ttyio.h
+ * common/userids.c, common/userids.h, common/xasprintf.c: Change
+ license to LGPLv3+/GPLv2+/
+
+2012-04-10 Ben Kibbey <bjk at luxsci.net>
+
+ Fix killing PID -1.
+ When the KILLSCD command had been sent a race condition would occur
+ causing PID -1 getting killed, which on Linux seems to terminate all
+ applications for the current user.
+
+2012-04-05 Werner Koch <wk at gnupg.org>
+
+ Do not mix test result with progress lines.
+ This makes parsing of the results easier. Fixes bug#1400.
+
+ * tests/openpgp/defs.inc (progress_cancel, progress_end)
+ (progress_new): New.
+ * tests/openpgp/conventional-mdc.test: Use progress functions
+ * tests/openpgp/conventional.test: Ditto.
+ * tests/openpgp/encrypt-dsa.test: Ditto.
+ * tests/openpgp/encrypt.test: Ditto.
+ * tests/openpgp/sigs.test: Ditto.
+
+2012-04-04 Ben Kibbey <bjk at luxsci.net>
+
+ Mention status messages in the documentation.
+ Note INQUIRE_MAXLEN.
+
+ Document PASSWD --preset.
+
+ Document GENKEY options.
+
+ Document PRESET_PASSPHRASE.
+
+ Document CLEAR_PASSPHRASE.
+ And describe the --mode=normal option.
+
+2012-03-27 Werner Koch <wk at gnupg.org>
+
+ Fix timegm regression test.
+ * common/t-timestuff.c (test_timegm): Change test to use January and
+ not February or December+1. Bug spotted by Daniel Kahn Gillmor.
+
+ Print warning for arguments not considered an option.
+ GnuPG requires that options are given before other arguments. This
+ can sometimes be confusing. We now print a warning if we found an
+ argument looking alike a long option without being preceded by the
+ stop option. This is bug#1343.
+
+ * common/argparse.h (ARGPARSE_FLAG_STOP_SEEN): New.
+ * common/argparse.c (arg_parse): Set new flag.
+ * g10/gpg.c (main): Print the warning.
+ * agent/gpg-agent.c (main): Ditto.
+ * dirmngr/dirmngr.c (main): Ditto.
+ * g13/g13.c (main): Ditto.
+ * scd/scdaemon.c (main): Ditto.
+ * sm/gpgsm.c (main): Ditto.
+ * tools/gpg-connect-agent.c (main): Ditto.
+ * tools/gpgconf.c (main): Ditto.
+
+2012-03-26 Werner Koch <wk at gnupg.org>
+
+ Allow compress algorithm 0.
+ * g10/mainproc.c (proc_compressed): Remove superfluous check for
+ compress algorithm 0. Reported by pfandrade. This is bug#1326.
+
+ Add mksamplekeys script.
+ * doc/mksamplekeys: New.
+
+2012-02-28 Marcus Brinkmann <mb at g10code.com>
+
+ Replace npth_yield in busy wait by npth_usleep.
+ * dirmngr/ldap-wrapper.c (ldap_wrapper_wait_connections): Call
+ npth_usleep instead of npth_yield.
+
+2012-02-16 Marcus Brinkmann <mb at g10code.com>
+
+ Check for lber and link dirmngr_ldap to it.
+ * configure.ac (LBER_LIBS, HAVE_LBER): New variables, check for lber.
+ * dirmngr/Makefile.am (dirmngr_lda_LDADD): Add $(LBER_LIBS).
+
+2012-02-07 Werner Koch <wk at gnupg.org>
+
+ agent: Add pin length field to the shadowed private key format.
+ This is not yet fully implemented. It will eventually allow to
+ support pinpad equipped readers which do not support variable length
+ pin lengths.
+ * agent/protect.c (parse_shadow_info): Add optional arg R_PINLEN and
+ parse pinlen info. Change all callers to pass NULL for it.
+
+ Use new status printing functions.
+ * agent/command.c (cmd_geteventcounter): Get rid of static buffers.
+ * scd/command.c (cmd_serialno, cmd_learn): Simplify by using
+ print_assuan_status.
+
+ agent: New function agent_print_status.
+ * common/asshelp2.c (vprint_assuan_status): New.
+ (print_assuan_status): Re-implement using above func.
+ * agent/command.c (agent_print_status): New.
+
+ po: Add Ukrainian translation.
+ * po/uk.po: New.
+
+ common: Replace macro based function calls by using DEFAULT_ERRSOURCE.
+ * common/dns-cert.h (get_dns_cert): Remove macro.
+ * common/dns-cert.c (_get_dns_cert): Rename to get_dns_cert. Replace
+ arg ERRSOURCE by global DEFAULT_ERRSOURCE.
+ * common/http.h (http_parse_uri, http_raw_connect, http_open)
+ (http_open_document, http_wait_response): Remove macros.
+ * common/http.c (_http_parse_uri, _http_raw_connect, _http_open)
+ (_http_open_document, _http_wait_response): Remove underscore from
+ symbols. Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
+ * common/ssh-utils.h (ssh_get_fingerprint)
+ (ssh_get_fingerprint_string): Remove macros.
+ * common/ssh-utils.h (_ssh_get_fingerprint)
+ (_ssh_get_fingerprint_string): Remove underscore from symbols.
+ Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
+ * common/tlv.h (parse_ber_header, parse_sexp): Remove macros.
+ * common/tlv.c: Include util.h.
+ (_parse_ber_header, _parse_sexp): Remove underscore from symbols.
+ Replace args ERRSOURCE by global DEFAULT_ERRSOURCE.
+
+2012-02-06 Werner Koch <wk at gnupg.org>
+
+ Add replacement hack for Android's broken ttyname.
+ * configure.ac (HAVE_TTYNAME) [__ANDROID__]: Add hack.
+
+ agent: Simplify printing of INQUIRE_MAXLEN.
+ * agent/command.c: Include asshelp.h.
+ (cmd_pkdecrypt, cmd_genkey, cmd_preset_passphrase)
+ (pinentry_loopback): Use print_assuan_status for INQUIRE_MAXLEN.
+
+ common: Add function print_assuan_status.
+ * common/asshelp2.c: New.
+ (print_assuan_status): New function.
+ * common/Makefile.am (common_sources): Add asshelp2.c.
+
+ common: Add a global variable to for the default error source.
+ For the shared code parts it is cumbersome to pass an error sourse
+ variable to each function. Its value is always a constant for a given
+ binary and thus a global variable makes things a lot easier than the
+ former macro stuff.
+ * common/init.c (default_errsource): New global var.
+ (init_common_subsystems): Rename to _init_common_subsystems. Set
+ DEFAULT_ERRSOURCE.
+ * common/init.h: Assert value of GPG_ERR_SOURCE_DEFAULT.
+ (init_common_subsystems): New macro.
+ * common/util.h (default_errsource): Add declaration.
+ * kbx/keybox-defs.h: Add some GPG_ERR_SOURCE_DEFAULT trickery.
+
+2012-02-03 Ben Kibbey <bjk at luxsci.net>
+
+ Also let GENKEY and PKDECRYPT send the INQUIRE_MAXLEN status message.
+ * agent/command.c (cmd_pkdecrypt): Send the INQUIRE_MAXLEN status
+ message before doing the inquire.
+ (cmd_genkey): Ditto.
+
+2012-02-02 Ben Kibbey <bjk at luxsci.net>
+
+ Inform the client of the preset passphrase length.
+ * agent/command.c (cmd_preset_passphrase): Send the INQUIRE_MAXLEN
+ status message before inquiring the passphrase.
+
+2012-02-01 David Shaw <dshaw at jabberwocky.com>
+
+ Honor --cert-digest-algo when recreating a cert.
+ * g10/sign.c (update_keysig_packet): Honor --cert-digest-algo when
+ recreating a cert.
+
+ This is used by various things in --edit-key like setpref, primary,
+ etc. Suggested by Christian Aistleitner.
+
+2012-01-27 Werner Koch <wk at gnupg.org>
+
+ gl: Add support for Android to stdint.h replacement.
+ * gl/stdint_.h: When included from Bionic <sys/types.h>, just include
+ the system's <stdint.h>.
+
+ gpg-connect-tool: Take the string "true" as a true condition.
+ * tools/gpg-connect-agent.c (main): Handle strings "true" and "yes" in
+ conditions as expected.
+
+2012-01-26 Ben Kibbey <bjk at luxsci.net>
+
+ Return GPG_ERR_CARD_NOT_PRESENT when pinentry-mode=loopback.
+ Since there isn't a way to prompt the user to insert the smartcard when
+ pinentry-mode=loopback, return GPG_ERR_CARD_NOT_PRESENT instead of
+ GPG_ERR_NO_PIN_ENTRY.
+
+ * agent/divert-scd.c (ask_for_card): Return GPG_ERR_CARD_NOT_PRESENT
+ when pinentry-mode=loopback.
+
+ Also check for GPG_ERR_ASS_CANCELED during an inquire.
+ Fix pinentry-mode=loopback when cancelling an inquire from scdaemon.
+ This is similar to commit 4f21f8d but for both protocol command
+ cancellation and pinentry cancellation.
+
+ * agent/call-scd.c (agent_card_pkdecrypt): Check for
+ GPG_ERR_ASS_CANCELED.
+ (agent_card_pksign): Ditto.
+
+2012-01-25 Werner Koch <wk at gnupg.org>
+
+ nPth is now a hard requirement for GnuPG.
+ * configure.ac: Remove cruft to allow building without npth.
+
+ Require libassuan 2.1.0.
+ * configure.ac (NEED_LIBASSUAN_VERSION): Set to 2.1.0. This is due to
+ the npth changes.
+
+ Fix strerror vs. gpg_strerror usage.
+ This bug was introduced by the migration to npth.
+ * agent/gpg-agent.c (handle_connections): Use strerror.
+
+ Add missing variable.
+ * agent/gpg-agent.c (handle_connections) [!W32]: Add missing variable.
+
+2012-01-25 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Port LDAP wrapper to NPTH.
+ * agent/gpg-agent.c (handle_connections): Handle error.
+ * dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c: Port to NPTH.
+
+ Port Windows code to NPTH.
+ * agent/gpg-agent.c (get_agent_ssh_socket_name): Use
+ INVALID_HANDLE_VALUE instead of 0.
+ (handle_signal) [!HAVE_W32_SYSTEM]: Don't define.
+ (handle_connections): Port Windows code to NPTH.
+ * dirmngr/dirmngr.c (handle_connections): Port Windows code to NPTH.
+ * g13/g13.c (handle_connections): Port Windows code to NPTH.
+ * scd/scdaemon.c (handle_connections): Port Windows code to NPTH.
+
+ Port to npth.
+ * configure.ac: Don't check for PTH but for NPTH.
+ (AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
+ (have_pth): Rename to ...
+ (have_npth): ... this.
+ (USE_GNU_NPTH): Rename to ...
+ (USE_GNU_PTH): ... this.
+ * m4/npth.m4: New file.
+ * agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
+ agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
+ agent/trustlist.c, common/Makefile.am, common/estream.c,
+ common/exechelp-posix.c, common/exechelp-w32.c,
+ common/exechelp-w32ce.c, common/http.c, common/init.c,
+ common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
+ dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
+ dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
+ g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
+ scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
+ scd/scdaemon.c, tools/Makefile.am: Port to npth.
+
+2012-01-25 Werner Koch <wk at gnupg.org>
+
+ Require gitlog-to-changelog to be installed.
+ * Makefile.am (GITLOG_TO_CHANGELOG): New.
+ (gen-ChangeLog): Use installed version of gitlog-to-changelog.
+
+2012-01-20 David Shaw <dshaw at jabberwocky.com>
+
+ Changes to --min-cert-level should cause a trustdb rebuild (issue 1366)
+ * g10/gpgv.c, g10/trustdb.c (read_trust_options): Add min_cert_level
+
+ * g10/trustdb.c (check_trustdb_stale): Request a rebuild if
+ pending_check_trustdb is true (set when we detect a trustdb
+ parameter has changed).
+
+ * g10/keylist.c (public_key_list): Use 'l' in the "tru" with-colons
+ listing for min_cert_level not matching.
+
+ * g10/tdbio.c (tdbio_update_version_record, create_version_record,
+ tdbio_db_matches_options, tdbio_dump_record, tdbio_read_record,
+ tdbio_write_record): Add a byte for min_cert_level in the tdbio
+ version record.
+
+2012-01-20 Werner Koch <wk at gnupg.org>
+
+ estream: Fix unclean usage of realloc.
+ * common/estream-printf.c (_ESTREAM_PRINTF_MALLOC): Remove.
+ (_ESTREAM_PRINTF_FREE): Remove.
+ (_ESTREAM_PRINTF_REALLOC): New.
+ (fixed_realloc) [!_ESTREAM_PRINTF_REALLOC]): New.
+ (estream_vasprintf): Use my_printf_realloc instead of my_printf_malloc
+ and my_printf_free.
+ (dynamic_buffer_out): Use my_printf_realloc instead of realloc.
+
+ Do not copy default merge commit log entries into the ChangeLog.
+ * scripts/gitlog-to-changelog: Skip merge commits.
+
+2012-01-18 Ben Kibbey <bjk at luxsci.net>
+
+ Add the INQUIRE_MAXLEN status message.
+ This status message is used to inform the client of the maximum length
+ of an inquired passphrase and is used in pinentry-mode=loopback.
+
+ * agent/command.c (pinentry_loopback): Send the INQUIRE_MAXLEN status
+ message before doing the inquire.
+
+2012-01-16 Jim Meyering <meyering at redhat.com>
+
+ yat2m: don't dereference pointer to freed memory.
+ * doc/yat2m.c (top_parse_file): Correct macrolist-freeing loop.
+
+ gpg-agent: fix lc-messages handling not to change Xauthority setting.
+ * agent/gpg-agent.c (main): Supply omitted "break" statement for
+ lc-messages option. Otherwise, control would fall through to the
+ following oXauthority case and use the same value there.
+
+2012-01-15 Werner Koch <wk at gnupg.org>
+
+ Fix indentation.
+
+2012-01-14 Ben Kibbey <bjk at luxsci.net>
+
+ Fix scdaemon pinentry inquire cancelation.
+ Similar to commit 29af488 but also fixes PKDECRYPT and PKSIGN.
+
+ * agent/call-scd.c (agent_card_pkdecrypt): Check for GPG_ERR_CANCELED
+ when returning from the PKDECRYPT operation of scdaemon and cancel the
+ inquire.
+ (agent_card_pksign): Ditto.
+ (cancel_inquire): New.
+
+2012-01-11 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix segv with RSA_S keys.
+ * g10/misc.c (pubkey_get_npkey, pubkey_get_nskey)
+ (pubkey_get_nsig, pubkey_get_nenc): Map all RSA algo ids to
+ GCRY_PK_RSA.
+
+ estream: Avoid printing leading zeroes by %p on 32 bit systems.
+ * common/estream-printf.c (pr_pointer): Synchronize definition of
+ AULONG with its use.
+
+2012-01-11 David Shaw <dshaw at jabberwocky.com>
+
+ Refresh sample keys.
+
+2012-01-10 David Shaw <dshaw at jabberwocky.com>
+
+ Adapt HKP fix for fingerprint/long keyid retrievals for dirmngr.
+ * dirmngr/ks-engine-hkp.c (ks_hkp_get): Use the longest valid keyid form
+
+2012-01-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Make the double space in the middle of a fingerprint optional.
+ This change might help to c+p a fingerprint from an HTML page without
+ being enclosed in a "pre" tag.
+ * common/userids.c (classify_user_id): Skip a second blank in the
+ middle of a fingerprint.
+
+ gpg: Allow use of a standard space separated fingerprint.
+ * common/userids.c (classify_user_id): Check for space separated GPG
+ fingerprint.
+
+2012-01-06 NIIBE Yutaka <gniibe at fsij.org>
+
+ Merge ccid_driver_improvement branch.
+ * scd/apdu.c (ccid_keypad_operation): Rename from ccid_keypad_verify.
+ (open_ccid_reader): Use ccid_keypad_operation for verify and modify.
+
+ * scd/ccid-driver.c (VENDOR_VASCO, VASCO_920): New.
+ (ccid_transceive_apdu_level): Permit sending packet where
+ apdulen <= 289. Support receiving packets in a chain.
+ (ccid_transceive_secure): Maximum is 15 for VASCO DIGIPASS 920.
+ Support keypad_modify method such as CHANGE_REFERENCE_DATA: 0x24.
+
+2012-01-03 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Silence gcc warning.
+ * sm/call-dirmngr.c (get_cached_cert): Make sure buflen is initialized.
+
+ Revert last change, add comment about link() return values.
+ * common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Do not check
+ return value of link().
+
+ Fix compiler warnings.
+ * common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Check return
+ value of link().
+ * g13/g13.c: Make sure err is initialized.
+ * scd/scdaemon.c (main) [!USE_GCRY_THREAD_CBS]: Do not define ERR.
+
+ Fix last change: Only set gcrypt thread callback for older versions.
+ * dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to
+ USE_GCRY_THREAD_CBS.
+
+2012-01-03 Werner Koch <wk at gnupg.org>
+
+ Terminate csh commands with a semicolon also for dirmngr.
+ * dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.
+
+ Terminate csh commands with a semicolon.
+ Fixes bug#1386.
+
+ * agent/gpg-agent.c (main): Terminate csh style output with a semicolon.
+ * scd/scdaemon.c: Ditto.
+
+2012-01-02 Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+
+ Only set gcrypt thread callback for older version of gcrypt.
+ * agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c
+ (USE_GCRY_THREAD_CBS): New macro, defined if
+ GCRY_THREAD_OPTION_VERSION is 0.
+ (fixed_gcry_pth_init) [!USE_GCRY_THREAD_CBS]: Don't define.
+ (main) [!USE_GCRY_THREAD_CBS]: Do not install thread callbacks.
+
+2011-12-28 David Shaw <dshaw at jabberwocky.com>
+
+ Use the longest key ID available when talking to a HKP server.
+ This is issue 1340. Now that PKSD is dead, and SKS supports long key
+ IDs, this is safe to do. Patch from Daniel Kahn Gillmor
+ <dkg at fifthhorseman.net>.
+
+2011-12-20 Werner Koch <wk at gnupg.org>
+
+ Post-release version number update.
+
+ Release 2.1.0beta3.
+
+ Prepare for the beta3 release.
+
+ po: Update the German translation.
+
+ Add the STEED Self-Signing Nonthority certificate.
+ * doc/com-certs.pem: Install it when creating a keybox.
+
+ faq: Add section on US export restrictions.
+
+ Require Libassuan 2.0.3.
+ * configure.ac: Require Libassuan 2.0.3.
+ * agent/call-scd.c (ASSUAN_CONVEY_COMMENTS): Remove macro replacement.
+ * agent/command.c (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Remove
+ dependency.
+ (cmd_killagent) [ASSUAN_FORCE_CLOSE]: Ditto.
+ * scd/command.c (cmd_killscd) [ASSUAN_FORCE_CLOSE]: Ditto.
+
+2011-12-20 NIIBE Yutaka <gniibe at fsij.org>
+
+ Add error log and debug log for pcsc_keypad_verify and pcsc_keypad_modify.
+ * scd/apdu.c (pcsc_keypad_verify): Add debug log and error log.
+ (pcsc_keypad_modify): Likewise.
+
+2011-12-19 Werner Koch <wk at gnupg.org>
+ Ben Kibbey <bjk at luxsci.net>
+
+ scd: Fix for card change returning GPG_ERR_CARD_RESET.
+ * scd/apdu.c (apdu_connect): Do not test for zero atrlen.
+
+2011-12-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ Don't kill pinentry by SIGKILL but let it quit by SIGINT.
+ * agent/call-pinentry.c (agent_popup_message_stop): To pinentry, send
+ SIGINT (was: SIGKILL).
+
+2011-12-15 David Shaw <dshaw at jabberwocky.com>
+
+ Merge fix for issue 1331 from 1.4.
+ * photoid.c (generate_photo_id): Check for the JPEG magic numbers
+ instead of JFIF since some programs generate an EXIF header first.
+
+2011-12-15 Werner Koch <wk at gnupg.org>
+
+ scd: Prefer application Geldkarte over DINSIG.
+ * scd/app.c (select_application): Reorder application tests.
+
+ scd: Add option --dump-atr to command APDU.
+ * scd/atr.c: Rewrite.
+ * scd/Makefile.am (scdaemon_SOURCES): Add atr.c and atr.h.
+ * scd/command.c (cmd_apdu): Add option --dump-atr.
+
+ estream: New function es_fclose_snatch.
+ * common/estream.c (cookie_ioctl_function_t): New type.
+ (es_fclose_snatch): New function.
+ (COOKIE_IOCTL_SNATCH_BUFFER): New constant.
+ (struct estream_internal): Add field FUNC_IOCTL.
+ (es_initialize): Clear FUNC_IOCTL.
+ (es_func_mem_ioctl): New function.
+ (es_fopenmem, es_fopenmem_init): Init FUNC_IOCTL.
+
+2011-12-14 Werner Koch <wk at gnupg.org>
+
+ scd: Skip S/N reading for the "undefined" application.
+ * scd/app.c (select_application): Skip serial number reading.
+
+ scd: Add more status word values for documentation.
+
+ scd: Add the "undefined" stub application.
+ * scd/app.c (select_application): Implement the "undefined"
+ application.
+
+ agent: Pass comment lines from scd verbatim thru gpg-agent.
+ * agent/call-scd.c (pass_status_thru): Pass comment lines verbatim.
+ * tools/gpg-connect-agent.c (help_cmd_p): New.
+ (main): Treat an "SCD HELP" the same as "HELP".
+
+ scd: Fix resetting and closing of the reader.
+ * scd/command.c (update_card_removed): Do no act on an invalid VRDR.
+ (do_reset): Ignore apdu_reset error codes for no and inactive card.
+ Close the reader before setting the slot to -1.
+ (update_reader_status_file): Notify the application before closing the
+ reader.
+
+ scd: Add debug option for reader function calls.
+ * scd/scdaemon.h (DBG_READER_VALUE, DBG_READER): New.
+ * scd/apdu.c (apdu_open_reader, apdu_close_reader)
+ (apdu_shutdown_reader, apdu_connect, apdu_disconnect)
+ (apdu_reset, apdu_get_atr, apdu_get_status): Add debug code.
+ (apdu_activate): Remove this unused function.
+
+2011-12-13 Werner Koch <wk at gnupg.org>
+
+ scd: New option --debug-assuan-log-cats.
+ * scd/scdaemon.c (oDebugAssuanLogCats): New.
+ (opts): Add option --debug-assuan-log-cats.
+ (main): Implement option.
+ * common/asshelp.c (set_libassuan_log_cats): New.
+
+ scd: Introduce a virtual reader table.
+ The vreader table makes the code more clear by explicitly talking
+ about APDU slots and reader indices. It also accommodates for future
+ extensions.
+
+ * scd/scdaemon.h (server_control_s): Remove READER_SLOT.
+ * scd/scdaemon.c (scd_init_default_ctrl): Do not init READER_SLOT.
+ * scd/app.c (check_application_conflict): Add arg SLOT.
+ * scd/command.c (slot_status_s): Rename to vreader_s.
+ (server_local_s): Add field VREADER_IDX as replacement for
+ the READER_SLOT in server_control_s. Change all users.
+ (slot_table): Rename to vreader_table. Change all users.
+ (vreader_slot): New.
+ (do_reset, cmd_apdu): Map vreader to apdu slot.
+ (get_reader_slot): Rename to get_current_reader. Return -1 on error.
+ (open_card): Map vreader toapdu slot. Pass slot to
+ check_application_conflict.
+ (scd_command_handler): Init VREADER_IDX.
+ (update_reader_status_file): Reset SLOT field on error.
+
+2011-12-12 Werner Koch <wk at gnupg.org>
+
+ scd: Retry command SERIALNO for an inactive card.
+ * scd/command.c (cmd_serialno): Retry once for an inactive card.
+
+ Fix detection of card removal and insertion.
+ * scd/apdu.c (apdu_connect): Return status codes for no card available
+ and inactive card.
+ * scd/command.c (TEST_CARD_REMOVAL): Also test for GPG_ERR_CARD_RESET.
+ (open_card): Map apdu_connect status to GPG_ERR_CARD_RESET.
+
+ gitlog-to-changelog: New option --tear-off.
+ * scripts/gitlog-to-changelog: Add option --tear-off.
+ * Makefile.am (gen-ChangeLog): Use that option.
+
+2011-12-07 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Add new validation model "steed".
+ * sm/gpgsm.h (VALIDATE_FLAG_STEED): New.
+ * sm/gpgsm.c (gpgsm_parse_validation_model): Add model "steed".
+ * sm/server.c (option_handler): Allow validation model "steed".
+ * sm/certlist.c (gpgsm_cert_has_well_known_private_key): New.
+ * sm/certchain.c (do_validate_chain): Handle the
+ well-known-private-key attribute. Support the "steed" model.
+ (gpgsm_validate_chain): Ditto.
+ * sm/verify.c (gpgsm_verify): Return "steed" in the trust status line.
+ * sm/keylist.c (list_cert_colon): Print the new 'w' flag.
+
+ Correct punctuation in the ChangeLog summary line.
+ * Makefile.am (gen-ChangeLog): Supply --append-dot.
+
+ Allow comments which will not show up in the ChangeLog.
+ * scripts/gitlog-to-changelog: Ignore lines after a "--" line.
+
+2011-12-06 Werner Koch <wk at gnupg.org>
+
+ gpgsm: Allow specification of an AuthorityKeyIdentifier.
+ * sm/certreqgen.c (pAUTHKEYID): New.
+ (read_parameters): Add keyword Authority-Key-Id.
+ (proc_parameters): Check its value.
+ (create_request): Insert an Authority-Key-Id.
+
+ gpgsm: Allow arbitrary extensions for cert creation.
+ * sm/certreqgen.c (pSUBJKEYID, pEXTENSION): New.
+ (read_parameters): Add new keywords.
+ (proc_parameters): Check values of new keywords.
+ (create_request): Add SubjectKeyId and extensions.
+ (parse_parameter_usage): Support "cert" and the encrypt alias "encr".
+
+ gpgsm: Fix storing of the serial number.
+ * sm/certreqgen.c (create_request): Fix hex-bin conversion.
+
+2011-12-05 Werner Koch <wk at gnupg.org>
+
+ Fix last change.
+ * agent/command.c (start_command_handler): Remove use of removed var.
+
+ Amend the agent code with more comments.
+ * agent/command.c (server_local_s): Remove unused field MESSAGE_FD.
+
+2011-12-02 Werner Koch <wk at gnupg.org>
+
+ Support the Cherry ST-2000 card reader.
+ * scd/ccid-driver.c (SCM_SCR331, SCM_SCR331DI, SCM_SCR335)
+ (SCM_SCR3320, SCM_SPR532, CHERRY_ST2000): New constants.
+ (parse_ccid_descriptor): Use them.
+ (scan_or_find_usb_device, ccid_transceive_secure): Handle Cherry
+ ST-2000. Suggested by Matthias-Christian Ott.
+
+ Avoid possible double free in export.c.
+ * g10/export.c (transfer_format_to_openpgp): Avoid possible double
+ free of LIST. Reported by NIIBE Yutaka.
+
+2011-12-02 NIIBE Yutaka <gniibe at fsij.org>
+
+ Fix pinpad input support for passphrase modification.
+ * apdu.c (pcsc_keypad_verify): Have dummy Lc field with value 0.
+ (pcsc_keypad_modify): Likewise.
+ (pcsc_keypad_modify): It's only for ISO7816_CHANGE_REFERENCE_DATA.
+ bConfirmPIN value is determined by the parameter p0.
+
+ * app-openpgp.c (do_change_pin): The flag use_keypad should be 0 when
+ reset_mode is on, or resetcode is on. use_keypad only makes sense for
+ iso7816_change_reference_data_kp.
+
+ * iso7816.h (iso7816_put_data_kp): Remove.
+ (iso7816_reset_retry_counter_kp): Remove.
+ (iso7816_reset_retry_counter_with_rc_kp): Remove.
+ (iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
+
+ * iso7816.c (iso7816_put_data_kp): Remove.
+ (iso7816_reset_retry_counter_kp): Remove.
+ (iso7816_reset_retry_counter_with_rc_kp): Remove.
+ (iso7816_change_reference_data_kp): Add an argument: IS_EXCHANGE.
+
+2011-12-01 Werner Koch <wk at gnupg.org>
+
+ Add hook to check the commit log syntax.
+ * autogen.sh: Install commit-msg hook for git.
+
+ Generate the ChangeLog from commit logs.
+ * scripts/gitlog-to-changelog: New script. Taken from gnulib.
+ * scripts/git-log-fix: New file.
+ * scripts/git-log-footer: New file.
+ * doc/HACKING: Describe the ChangeLog policy
+ * ChangeLog: New file.
+ * Makefile.am (EXTRA_DIST): Add new files.
+ (gen-ChangeLog): New.
+ (dist-hook): Run gen-ChangeLog.
+
+ Rename all ChangeLog files to ChangeLog-2011.
+
+2011-12-01 Werner Koch <wk at gnupg.org>
+
+ NB: Changes done before December 1st, 2011 are described in
+ per directory files named ChangeLog-2011. See doc/HACKING for
+ details.
+
+ -----
+ Copyright (C) 2011 Free Software Foundation, Inc.
+
+ Copying and distribution of this file and/or the original GIT
+ commit log messages, with or without modification, are
+ permitted provided the copyright notice and this notice are
+ preserved.
diff --cc VERSION
index ea4bd0f,0000000..1b5105d
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 2.1.13
++2.1.14
diff --cc doc/defsincdate
index b534310,0000000..c4d69df
mode 100644,000000..100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@@ -1,1 -1,0 +1,1 @@@
- 1465909080
++1468502376
diff --cc doc/gnupg.info
index 08e4652,0000000..27fdb77
mode 100644,000000..100644
--- a/doc/gnupg.info
+++ b/doc/gnupg.info
@@@ -1,214 -1,0 +1,214 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.13, June 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.14, July 2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+INFO-DIR-SECTION GNU Utilities
+START-INFO-DIR-ENTRY
+* gpg2: (gnupg). OpenPGP encryption and signing tool.
+* gpgsm: (gnupg). S/MIME encryption and signing tool.
+* gpg-agent: (gnupg). The secret key daemon.
+* dirmngr: (gnupg). X.509 CRL and OCSP server.
+* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+END-INFO-DIR-ENTRY
+
+
+Indirect:
+gnupg.info-1: 969
- gnupg.info-2: 301685
++gnupg.info-2: 301435
+
+Tag Table:
+(Indirect)
+Node: Top969
+Node: Installation2764
+Node: Invoking GPG-AGENT5113
+Node: Agent Commands6756
+Node: Agent Options7917
+Ref: option --options8074
+Ref: option --homedir8343
+Ref: option --log-file13269
+Ref: option --no-allow-mark-trusted13603
+Ref: option --allow-preset-passphrase13807
+Ref: option --no-allow-loopback-pinentry13960
+Ref: option --extra-socket21033
+Ref: option --enable-ssh-support21517
+Node: Agent Configuration23869
+Node: Agent Signals29271
+Node: Agent Examples30720
- Node: Agent Protocol31278
- Node: Agent PKDECRYPT33432
- Node: Agent PKSIGN35345
- Node: Agent GENKEY37646
- Node: Agent IMPORT39545
- Node: Agent EXPORT39987
- Node: Agent ISTRUSTED40202
- Node: Agent GET_PASSPHRASE42576
- Node: Agent CLEAR_PASSPHRASE45017
- Node: Agent PRESET_PASSPHRASE45408
- Node: Agent GET_CONFIRMATION46246
- Node: Agent HAVEKEY46918
- Node: Agent LEARN47550
- Node: Agent PASSWD47845
- Node: Agent UPDATESTARTUPTTY48311
- Node: Agent GETEVENTCOUNTER48789
- Node: Agent GETINFO49595
- Node: Agent OPTION50299
- Node: Invoking DIRMNGR52660
- Node: Dirmngr Commands53754
- Node: Dirmngr Options55865
- Ref: Dirmngr Options-Footnote-167631
- Node: Dirmngr Configuration67765
- Node: Dirmngr Signals70978
- Node: Dirmngr Examples72009
- Node: Dirmngr Protocol72691
- Node: Dirmngr LOOKUP73341
- Node: Dirmngr ISVALID74712
- Node: Dirmngr CHECKCRL77282
- Node: Dirmngr CHECKOCSP78338
- Node: Dirmngr CACHECERT79643
- Node: Dirmngr VALIDATE80481
- Node: Invoking GPG81049
- Node: GPG Commands82042
- Node: General GPG Commands82872
- Node: Operational GPG Commands83503
- Ref: option --export-ownertrust98430
- Node: OpenPGP Key Management100530
- Node: GPG Options117964
- Node: GPG Configuration Options119295
- Ref: gpg-option --options131602
- Ref: trust-model-tofu136032
- Node: GPG Key related Options154919
- Node: GPG Input and Output159260
- Node: OpenPGP Options166548
- Node: Compliance Options171017
- Node: GPG Esoteric Options173419
- Ref: GPG Esoteric Options-Footnote-1196847
- Node: Deprecated Options197001
- Node: GPG Configuration198469
- Node: GPG Examples202420
- Node: Unattended Usage of GPG206762
- Node: Unattended GPG key generation207201
- Node: Invoking GPGSM215917
- Node: GPGSM Commands216786
- Node: General GPGSM Commands217224
- Node: Operational GPGSM Commands217912
- Node: Certificate Management219946
- Node: GPGSM Options224884
- Node: Configuration Options225458
- Ref: gpgsm-option --options225727
- Node: Certificate Options228705
- Ref: gpgsm-option --validation-model231612
- Node: Input and Output232592
- Ref: option --p12-charset233175
- Ref: gpgsm-option --with-key-data234419
- Ref: gpgsm-option --with-validation234667
- Node: CMS Options235539
- Node: Esoteric Options236561
- Node: GPGSM Configuration241577
- Node: GPGSM Examples247242
- Node: Unattended Usage247439
- Node: Automated signature checking248030
- Node: CSR and certificate creation249861
- Node: GPGSM Protocol254801
- Node: GPGSM ENCRYPT256059
- Node: GPGSM DECRYPT258729
- Node: GPGSM SIGN259565
- Node: GPGSM VERIFY261012
- Node: GPGSM GENKEY261527
- Node: GPGSM LISTKEYS262542
- Ref: gpgsm-cmd listkeys262701
- Node: GPGSM EXPORT263463
- Node: GPGSM IMPORT264421
- Node: GPGSM DELETE265162
- Node: GPGSM GETAUDITLOG265669
- Ref: gpgsm-cmd getauditlog265840
- Node: GPGSM GETINFO266181
- Node: GPGSM OPTION267030
- Node: Invoking SCDAEMON270377
- Node: Scdaemon Commands271051
- Node: Scdaemon Options272171
- Node: Card applications281022
- Node: OpenPGP Card281687
- Node: NKS Card282160
- Node: DINSIG Card282486
- Node: PKCS#15 Card282862
- Node: Geldkarte Card283132
- Node: SmartCard-HSM283523
- Node: Undefined Card284118
- Node: Scdaemon Configuration284531
- Node: Scdaemon Examples285569
- Node: Scdaemon Protocol285752
- Node: Scdaemon SERIALNO287270
- Node: Scdaemon LEARN288200
- Node: Scdaemon READCERT289056
- Node: Scdaemon READKEY289457
- Node: Scdaemon PKSIGN289743
- Node: Scdaemon PKDECRYPT290469
- Node: Scdaemon GETATTR291218
- Node: Scdaemon SETATTR291422
- Node: Scdaemon WRITEKEY291629
- Node: Scdaemon GENKEY292333
- Node: Scdaemon RANDOM292538
- Node: Scdaemon PASSWD292761
- Node: Scdaemon CHECKPIN293154
- Node: Scdaemon RESTART294159
- Node: Scdaemon APDU294694
- Node: Specify a User ID295669
- Ref: how-to-specify-a-user-id295827
- Node: Helper Tools301685
- Node: watchgnupg302521
- Ref: option watchgnupg --tcp303249
- Node: gpgv304579
- Node: addgnupghome309007
- Node: gpgconf309705
- Ref: gpgconf-Footnote-1311841
- Node: Invoking gpgconf312139
- Node: Format conventions315877
- Node: Listing components321208
- Node: Checking programs323299
- Node: Listing options326046
- Node: Changing options333550
- Node: Listing global options335252
- Node: Files used by gpgconf337028
- Node: applygnupgdefaults337374
- Node: gpg-preset-passphrase338119
- Node: Invoking gpg-preset-passphrase339080
- Node: gpg-connect-agent340350
- Node: Invoking gpg-connect-agent341065
- Node: Controlling gpg-connect-agent344612
- Node: dirmngr-client351085
- Node: gpgparsemail354435
- Node: symcryptrun354753
- Node: Invoking symcryptrun355652
- Node: gpg-zip358164
- Node: Howtos359990
- Node: Howto Create a Server Cert360257
- Node: System Notes368688
- Node: W32 Notes369901
- Node: Debugging370323
- Node: Debugging Tools371152
- Node: kbxutil371432
- Ref: kbxutil-Footnote-1373003
- Node: Debugging Hints373099
- Node: Common Problems374236
- Node: Architecture Details379462
- Node: Component interaction379774
- Ref: fig:moduleoverview379962
- Node: GnuPG-1 and GnuPG-2380069
- Ref: fig:cardarchitecture380361
- Node: Copying380476
- Node: Contributors417996
- Node: Glossary424237
- Node: Option Index426755
- Node: Environment Index497148
- Node: Index502720
++Node: Agent Protocol31287
++Node: Agent PKDECRYPT33441
++Node: Agent PKSIGN35354
++Node: Agent GENKEY37655
++Node: Agent IMPORT39554
++Node: Agent EXPORT39996
++Node: Agent ISTRUSTED40211
++Node: Agent GET_PASSPHRASE42585
++Node: Agent CLEAR_PASSPHRASE45026
++Node: Agent PRESET_PASSPHRASE45417
++Node: Agent GET_CONFIRMATION46255
++Node: Agent HAVEKEY46927
++Node: Agent LEARN47559
++Node: Agent PASSWD47854
++Node: Agent UPDATESTARTUPTTY48320
++Node: Agent GETEVENTCOUNTER48798
++Node: Agent GETINFO49604
++Node: Agent OPTION50308
++Node: Invoking DIRMNGR52669
++Node: Dirmngr Commands53763
++Node: Dirmngr Options55874
++Ref: Dirmngr Options-Footnote-167640
++Node: Dirmngr Configuration67774
++Node: Dirmngr Signals70987
++Node: Dirmngr Examples72018
++Node: Dirmngr Protocol72700
++Node: Dirmngr LOOKUP73350
++Node: Dirmngr ISVALID74721
++Node: Dirmngr CHECKCRL77291
++Node: Dirmngr CHECKOCSP78347
++Node: Dirmngr CACHECERT79652
++Node: Dirmngr VALIDATE80490
++Node: Invoking GPG81058
++Node: GPG Commands82051
++Node: General GPG Commands82881
++Node: Operational GPG Commands83512
++Ref: option --export-ownertrust98548
++Node: OpenPGP Key Management100648
++Node: GPG Options118520
++Node: GPG Configuration Options119851
++Ref: gpg-option --options132249
++Ref: trust-model-tofu136679
++Node: GPG Key related Options155566
++Node: GPG Input and Output160329
++Node: OpenPGP Options169247
++Node: Compliance Options173716
++Node: GPG Esoteric Options176420
++Ref: GPG Esoteric Options-Footnote-1199927
++Node: Deprecated Options200081
++Node: GPG Configuration201549
++Node: GPG Examples205500
++Node: Unattended Usage of GPG212534
++Node: Unattended GPG key generation212973
++Node: Invoking GPGSM221689
++Node: GPGSM Commands222558
++Node: General GPGSM Commands222996
++Node: Operational GPGSM Commands223684
++Node: Certificate Management225718
++Node: GPGSM Options230656
++Node: Configuration Options231230
++Ref: gpgsm-option --options231499
++Node: Certificate Options234477
++Ref: gpgsm-option --validation-model237384
++Node: Input and Output238364
++Ref: option --p12-charset238947
++Ref: gpgsm-option --with-key-data240191
++Ref: gpgsm-option --with-validation240439
++Node: CMS Options241311
++Node: Esoteric Options242333
++Node: GPGSM Configuration247349
++Node: GPGSM Examples253014
++Node: Unattended Usage253211
++Node: Automated signature checking253802
++Node: CSR and certificate creation255633
++Node: GPGSM Protocol260573
++Node: GPGSM ENCRYPT261831
++Node: GPGSM DECRYPT264501
++Node: GPGSM SIGN265337
++Node: GPGSM VERIFY266784
++Node: GPGSM GENKEY267299
++Node: GPGSM LISTKEYS268314
++Ref: gpgsm-cmd listkeys268473
++Node: GPGSM EXPORT269235
++Node: GPGSM IMPORT270193
++Node: GPGSM DELETE270934
++Node: GPGSM GETAUDITLOG271441
++Ref: gpgsm-cmd getauditlog271612
++Node: GPGSM GETINFO271953
++Node: GPGSM OPTION272802
++Node: Invoking SCDAEMON276149
++Node: Scdaemon Commands276823
++Node: Scdaemon Options277943
++Node: Card applications286794
++Node: OpenPGP Card287459
++Node: NKS Card287932
++Node: DINSIG Card288258
++Node: PKCS#15 Card288634
++Node: Geldkarte Card288904
++Node: SmartCard-HSM289295
++Node: Undefined Card289890
++Node: Scdaemon Configuration290303
++Node: Scdaemon Examples291341
++Node: Scdaemon Protocol291524
++Node: Scdaemon SERIALNO293042
++Node: Scdaemon LEARN293972
++Node: Scdaemon READCERT294828
++Node: Scdaemon READKEY295229
++Node: Scdaemon PKSIGN295515
++Node: Scdaemon PKDECRYPT296241
++Node: Scdaemon GETATTR296990
++Node: Scdaemon SETATTR297194
++Node: Scdaemon WRITEKEY297401
++Node: Scdaemon GENKEY298105
++Node: Scdaemon RANDOM298310
++Node: Scdaemon PASSWD298533
++Node: Scdaemon CHECKPIN298926
++Node: Scdaemon RESTART299931
++Node: Scdaemon APDU301435
++Node: Specify a User ID302410
++Ref: how-to-specify-a-user-id302568
++Node: Helper Tools307457
++Node: watchgnupg308293
++Ref: option watchgnupg --tcp309021
++Node: gpgv310351
++Node: addgnupghome314779
++Node: gpgconf315477
++Ref: gpgconf-Footnote-1317613
++Node: Invoking gpgconf317911
++Node: Format conventions321784
++Node: Listing components327115
++Node: Checking programs329206
++Node: Listing options331953
++Node: Changing options339457
++Node: Listing global options341159
++Node: Files used by gpgconf342935
++Node: applygnupgdefaults343281
++Node: gpg-preset-passphrase344026
++Node: Invoking gpg-preset-passphrase344987
++Node: gpg-connect-agent346257
++Node: Invoking gpg-connect-agent346972
++Node: Controlling gpg-connect-agent350519
++Node: dirmngr-client356992
++Node: gpgparsemail360342
++Node: symcryptrun360660
++Node: Invoking symcryptrun361559
++Node: gpg-zip364071
++Node: Howtos365897
++Node: Howto Create a Server Cert366164
++Node: System Notes374595
++Node: W32 Notes375808
++Node: Debugging376230
++Node: Debugging Tools377059
++Node: kbxutil377339
++Ref: kbxutil-Footnote-1378910
++Node: Debugging Hints379006
++Node: Common Problems380143
++Node: Architecture Details385369
++Node: Component interaction385681
++Ref: fig:moduleoverview385869
++Node: GnuPG-1 and GnuPG-2385976
++Ref: fig:cardarchitecture386268
++Node: Copying386383
++Node: Contributors423903
++Node: Glossary430144
++Node: Option Index432662
++Node: Environment Index503541
++Node: Index509113
+
+End Tag Table
diff --cc doc/gnupg.info-1
index bac4fcc,0000000..c2748c1
mode 100644,000000..100644
--- a/doc/gnupg.info-1
+++ b/doc/gnupg.info-1
@@@ -1,7350 -1,0 +1,7369 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.13, June 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.14, July 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.13, June 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.14, July 2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+
+ This manual documents how to use the GNU Privacy Guard system as well
+as the administration and the architecture.
+
+* Menu:
+
+* Installation:: A short installation guide.
+
+* Invoking GPG-AGENT:: How to launch the secret key daemon.
+* Invoking DIRMNGR:: How to launch the CRL and OCSP daemon.
+* Invoking GPG:: Using the OpenPGP protocol.
+* Invoking GPGSM:: Using the S/MIME protocol.
+* Invoking SCDAEMON:: How to handle Smartcards.
+* Specify a User ID:: How to Specify a User Id.
+
+* Helper Tools:: Description of small helper tools
+
+* Howtos:: How to do certain things.
+* System Notes:: Notes pertaining to certain OSes.
+* Debugging:: How to solve problems
+
+* Copying:: GNU General Public License says
+ how you can copy and share GnuPG
+* Contributors:: People who have contributed to GnuPG.
+
+* Glossary:: Short description of terms used.
+* Option Index:: Index to command line options.
+* Environment Index:: Index to environment variables and files.
+* Index:: Index of concepts and symbol names.
+
+
+File: gnupg.info, Node: Installation, Next: Invoking GPG-AGENT, Prev: Top, Up: Top
+
+1 A short installation guide.
+*****************************
+
+Unfortunately the installation guide has not been finished in time.
+Instead of delaying the release of GnuPG 2.0 even further, I decided to
+release without that guide. The chapter on gpg-agent and gpgsm do
+include brief information on how to set up the whole thing. Please
+watch the GnuPG website for updates of the documentation. In the
+meantime you may search the GnuPG mailing list archives or ask on the
+gnupg-users mailing listsfor advise on how to solve problems or how to
+get that whole thing up and running.
+
+ ** Building the software
+
+ Building the software is decribed in the file 'INSTALL'. Given that
+you are already reading this documentation we can only give some extra
+hints
+
+ To comply with the rules on GNU systems you should have build time
+configured 'gnupg' using:
+
+ ./configure --sysconfdir=/etc --localstatedir=/var
+
+ This is to make sure that system wide configuration files are
+searched in the directory '/etc' and variable data below '/var'; the
+default would be to also install them below '/usr/local' where the
+binaries get installed. If you selected to use the '--prefix=/' you
+obviously don't need those option as they are the default then.
+
+ ** Notes on setting a root CA key to trusted
+
+ X.509 is based on a hierarchical key infrastructure. At the root of
+the tree a trusted anchor (root certificate) is required. There are
+usually no other means of verifying whether this root certificate is
+trustworthy than looking it up in a list. GnuPG uses a file
+('trustlist.txt') to keep track of all root certificates it knows about.
+There are 3 ways to get certificates into this list:
+
+ * Use the list which comes with GnuPG. However this list only
+ contains a few root certificates. Most installations will need
+ more.
+
+ * Let 'gpgsm' ask you whether you want to insert a new root
+ certificate. This feature is enabled by default; you may disable
+ it using the option 'no-allow-mark-trusted' into 'gpg-agent.conf'.
+
+ * Manually maintain the list of trusted root certificates. For a
+ multi user installation this can be done once for all users on a
+ machine. Specific changes on a per-user base are also possible.
+
+
+File: gnupg.info, Node: Invoking GPG-AGENT, Next: Invoking DIRMNGR, Prev: Installation, Up: Top
+
+2 Invoking GPG-AGENT
+********************
+
+'gpg-agent' is a daemon to manage secret (private) keys independently
+from any protocol. It is used as a backend for 'gpg' and 'gpgsm' as
+well as for a couple of other utilities.
+
+ The agent is automatically started on demand by 'gpg', 'gpgsm',
+'gpgconf', or 'gpg-connect-agent'. Thus there is no reason to start it
+manually. In case you want to use the included Secure Shell Agent you
+may start the agent using:
+
+ gpg-connect-agent /bye
+
+You should always add the following lines to your '.bashrc' or whatever
+initialization file is used for all shell invocations:
+
+ GPG_TTY=$(tty)
+ export GPG_TTY
+
+It is important that this environment variable always reflects the
+output of the 'tty' command. For W32 systems this option is not
+required.
+
+ Please make sure that a proper pinentry program has been installed
+under the default filename (which is system dependent) or use the option
+'pinentry-program' to specify the full name of that program. It is
+often useful to install a symbolic link from the actual used pinentry
+(e.g. '/usr/local/bin/pinentry-gtk') to the expected one (e.g.
+'/usr/local/bin/pinentry').
+
+*Note Option Index::,for an index to 'GPG-AGENT''s commands and options.
+
+* Menu:
+
+* Agent Commands:: List of all commands.
+* Agent Options:: List of all options.
+* Agent Configuration:: Configuration files.
+* Agent Signals:: Use of some signals.
+* Agent Examples:: Some usage examples.
+* Agent Protocol:: The protocol the agent uses.
+
+
+File: gnupg.info, Node: Agent Commands, Next: Agent Options, Up: Invoking GPG-AGENT
+
+2.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help'
+'-h'
+ Print a usage message summarizing the most useful command-line
+ options. Note that you cannot abbreviate this command.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+'--server'
+ Run in server mode and wait for commands on the 'stdin'. The
+ default mode is to create a socket and listen for commands there.
+
+'--daemon [COMMAND LINE]'
+ Start the gpg-agent as a daemon; that is, detach it from the
+ console and run it in the background.
+
+ As an alternative you may create a new process as a child of
+ gpg-agent: 'gpg-agent --daemon /bin/sh'. This way you get a new
+ shell with the environment setup properly; after you exit from this
+ shell, gpg-agent terminates within a few seconds.
+
+
+File: gnupg.info, Node: Agent Options, Next: Agent Configuration, Prev: Agent Commands, Up: Invoking GPG-AGENT
+
+2.2 Option Summary
+==================
+
+'--options FILE'
+ Reads configuration from FILE instead of from the default per-user
+ configuration file. The default configuration file is named
+ 'gpg-agent.conf' and expected in the '.gnupg' directory directly
+ below the home directory of the user.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to 'gpgsm', such as
+ '-vv'.
+
+'-q'
+'--quiet'
+ Try to be as quiet as possible.
+
+'--batch'
+ Don't invoke a pinentry or do any other thing requiring human
+ interaction.
+
+'--faked-system-time EPOCH'
+ This option is only useful for testing; it sets the system time
+ back or forth to EPOCH which is the number of seconds elapsed since
+ the year 1970.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ This option is only useful for debugging and the behaviour may
+ change at any time without notice. FLAGS are bit encoded and may
+ be given in usual C-Syntax. The currently defined bits are:
+
+ '0 (1)'
+ X.509 or OpenPGP protocol related data
+ '1 (2)'
+ values of big number integers
+ '2 (4)'
+ low level crypto operations
+ '5 (32)'
+ memory allocation
+ '6 (64)'
+ caching
+ '7 (128)'
+ show memory statistics.
+ '9 (512)'
+ write hashed data to files named 'dbgmd-000*'
+ '10 (1024)'
+ trace Assuan protocol
+ '12 (4096)'
+ bypass all certificate validation
+
+'--debug-all'
+ Same as '--debug=0xffffffff'
+
+'--debug-wait N'
+ When running in server mode, wait N seconds before entering the
+ actual processing loop and print the pid. This gives time to
+ attach a debugger.
+
+'--debug-quick-random'
+ This option inhibits the use of the very secure random quality
+ level (Libgcrypt’s 'GCRY_VERY_STRONG_RANDOM') and degrades all
+ request down to standard random quality. It is only used for
+ testing and should not be used for any production quality keys.
+ This option is only effective when given on the command line.
+
+ On GNU/Linux, another way to quickly generate insecure keys is to
+ use 'rngd' to fill the kernel's entropy pool with lower quality
+ random data. 'rngd' is typically provided by the 'rng-tools'
+ package. It can be run as follows: 'sudo rngd -f -r /dev/urandom'.
+
+'--debug-pinentry'
+ This option enables extra debug information pertaining to the
+ Pinentry. As of now it is only useful when used along with
+ '--debug 1024'.
+
+'--no-detach'
+ Don't detach the process from the console. This is mainly useful
+ for debugging.
+
+'-s'
+'--sh'
+'-c'
+'--csh'
+ Format the info output in daemon mode for use with the standard
+ Bourne shell or the C-shell respectively. The default is to guess
+ it based on the environment variable 'SHELL' which is correct in
+ almost all cases.
+
+'--no-grab'
+ Tell the pinentry not to grab the keyboard and mouse. This option
+ should in general not be used to avoid X-sniffing attacks.
+
+'--log-file FILE'
+ Append all logging output to FILE. This is very helpful in seeing
+ what the agent actually does. If neither a log file nor a log file
+ descriptor has been set on a Windows platform, the Registry entry
+ 'HKCU\Software\GNU\GnuPG:DefaultLogFile', if set, is used to
+ specify the logging output.
+
+'--no-allow-mark-trusted'
+ Do not allow clients to mark keys as trusted, i.e. put them into
+ the 'trustlist.txt' file. This makes it harder for users to
+ inadvertently accept Root-CA keys.
+
+'--allow-preset-passphrase'
+ This option allows the use of 'gpg-preset-passphrase' to seed the
+ internal cache of 'gpg-agent' with passphrases.
+
+'--no-allow-loopback-pinentry'
+'--allow-loopback-pinentry'
+ Disallow or allow clients to use the loopback pinentry features;
+ see the option 'pinentry-mode' for details. Allow is the default.
+
+ The '--force' option of the Assuan command 'DELETE_KEY' is also
+ controlled by this option: The option is ignored if a loopback
+ pinentry is disallowed.
+
+'--no-allow-external-cache'
+ Tell Pinentry not to enable features which use an external cache
+ for passphrases.
+
+ Some desktop environments prefer to unlock all credentials with one
+ master password and may have installed a Pinentry which employs an
+ additional external cache to implement such a policy. By using
+ this option the Pinentry is advised not to make use of such a cache
+ and instead always ask the user for the requested passphrase.
+
+'--allow-emacs-pinentry'
+ Tell Pinentry to allow features to divert the passphrase entry to a
+ running Emacs instance. How this is exactly handled depends on the
+ version of the used Pinentry.
+
+'--ignore-cache-for-signing'
+ This option will let 'gpg-agent' bypass the passphrase cache for
+ all signing operation. Note that there is also a per-session
+ option to control this behaviour but this command line option takes
+ precedence.
+
+'--default-cache-ttl N'
+ Set the time a cache entry is valid to N seconds. The default is
+ 600 seconds. Each time a cache entry is accessed, the entry's
+ timer is reset. To set an entry's maximum lifetime, use
+ 'max-cache-ttl'.
+
+'--default-cache-ttl-ssh N'
+ Set the time a cache entry used for SSH keys is valid to N seconds.
+ The default is 1800 seconds. Each time a cache entry is accessed,
+ the entry's timer is reset. To set an entry's maximum lifetime,
+ use 'max-cache-ttl-ssh'.
+
+'--max-cache-ttl N'
+ Set the maximum time a cache entry is valid to N seconds. After
+ this time a cache entry will be expired even if it has been
+ accessed recently or has been set using 'gpg-preset-passphrase'.
+ The default is 2 hours (7200 seconds).
+
+'--max-cache-ttl-ssh N'
+ Set the maximum time a cache entry used for SSH keys is valid to N
+ seconds. After this time a cache entry will be expired even if it
+ has been accessed recently or has been set using
+ 'gpg-preset-passphrase'. The default is 2 hours (7200 seconds).
+
+'--enforce-passphrase-constraints'
+ Enforce the passphrase constraints by not allowing the user to
+ bypass them using the "Take it anyway" button.
+
+'--min-passphrase-len N'
+ Set the minimal length of a passphrase. When entering a new
+ passphrase shorter than this value a warning will be displayed.
+ Defaults to 8.
+
+'--min-passphrase-nonalpha N'
+ Set the minimal number of digits or special characters required in
+ a passphrase. When entering a new passphrase with less than this
+ number of digits or special characters a warning will be displayed.
+ Defaults to 1.
+
+'--check-passphrase-pattern FILE'
+ Check the passphrase against the pattern given in FILE. When
+ entering a new passphrase matching one of these pattern a warning
+ will be displayed. FILE should be an absolute filename. The
+ default is not to use any pattern file.
+
+ Security note: It is known that checking a passphrase against a
+ list of pattern or even against a complete dictionary is not very
+ effective to enforce good passphrases. Users will soon figure up
+ ways to bypass such a policy. A better policy is to educate users
+ on good security behavior and optionally to run a passphrase
+ cracker regularly on all users passphrases to catch the very simple
+ ones.
+
+'--max-passphrase-days N'
+ Ask the user to change the passphrase if N days have passed since
+ the last change. With '--enforce-passphrase-constraints' set the
+ user may not bypass this check.
+
+'--enable-passphrase-history'
+ This option does nothing yet.
+
+'--pinentry-invisible-char CHAR'
+ This option asks the Pinentry to use CHAR for displaying hidden
+ characters. CHAR must be one character UTF-8 string. A Pinentry
+ may or may not honor this request.
+
+'--pinentry-timeout N'
+ This option asks the Pinentry to timeout after N seconds with no
+ user input. The default value of 0 does not ask the pinentry to
+ timeout, however a Pinentry may use its own default timeout value
+ in this case. A Pinentry may or may not honor this request.
+
+'--pinentry-program FILENAME'
+ Use program FILENAME as the PIN entry. The default is installation
+ dependent. With the default configuration the name of the default
+ pinentry is 'pinentry'; if that file does not exist but a
+ 'pinentry-basic' exist the latter is used.
+
+ On a Windows platform the default is to use the first existing
+ program from this list: 'bin\pinentry.exe',
+ '..\Gpg4win\bin\pinentry.exe', '..\Gpg4win\pinentry.exe',
+ '..\GNU\GnuPG\pinentry.exe', '..\GNU\bin\pinentry.exe',
+ 'bin\pinentry-basic.exe' where the file names are relative to the
+ GnuPG installation directory.
+
+'--pinentry-touch-file FILENAME'
+ By default the filename of the socket gpg-agent is listening for
+ requests is passed to Pinentry, so that it can touch that file
+ before exiting (it does this only in curses mode). This option
+ changes the file passed to Pinentry to FILENAME. The special name
+ '/dev/null' may be used to completely disable this feature. Note
+ that Pinentry will not create that file, it will only change the
+ modification and access time.
+
+'--scdaemon-program FILENAME'
+ Use program FILENAME as the Smartcard daemon. The default is
+ installation dependent and can be shown with the 'gpgconf' command.
+
+'--disable-scdaemon'
+ Do not make use of the scdaemon tool. This option has the effect
+ of disabling the ability to do smartcard operations. Note, that
+ enabling this option at runtime does not kill an already forked
+ scdaemon.
+
+'--disable-check-own-socket'
+ 'gpg-agent' employs a periodic self-test to detect a stolen socket.
+ This usually means a second instance of 'gpg-agent' has taken over
+ the socket and 'gpg-agent' will then terminate itself. This option
+ may be used to disable this self-test for debugging purposes.
+
+'--use-standard-socket'
+'--no-use-standard-socket'
+'--use-standard-socket-p'
+ Since GnuPG 2.1 the standard socket is always used. These options
+ have no more effect. The command 'gpg-agent
+ --use-standard-socket-p' will thus always return success.
+
+'--display STRING'
+'--ttyname STRING'
+'--ttytype STRING'
+'--lc-ctype STRING'
+'--lc-messages STRING'
+'--xauthority STRING'
+ These options are used with the server mode to pass localization
+ information.
+
+'--keep-tty'
+'--keep-display'
+ Ignore requests to change the current 'tty' or X window system's
+ 'DISPLAY' variable respectively. This is useful to lock the
+ pinentry to pop up at the 'tty' or display you started the agent.
+
+'--extra-socket NAME'
+ Also listen on native gpg-agent connections on the given socket.
+ The intended use for this extra socket is to setup a Unix domain
+ socket forwarding from a remote machine to this socket on the local
+ machine. A 'gpg' running on the remote machine may then connect to
+ the local gpg-agent and use its private keys. This allows to
+ decrypt or sign data on a remote machine without exposing the
+ 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 environment variable 'GPG_TTY' in your login
+shell, for example in the '~/.bashrc' init script:
+
+ export GPG_TTY=$(tty)
+
+ If you enabled the Ssh Agent Support, you also need to tell ssh about
+it by adding this to your init script:
+
+ unset SSH_AGENT_PID
+ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
- export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh"
++ export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+ fi
+
+
+File: gnupg.info, Node: Agent Protocol, Prev: Agent Examples, Up: Invoking GPG-AGENT
+
+2.6 Agent's Assuan Protocol
+===========================
+
+Note: this section does only document the protocol, which is used by
+GnuPG components; it does not deal with the ssh-agent protocol. To see
+the full specification of each command, use
+
+ gpg-connect-agent 'help COMMAND' /bye
+
+or just 'help' to list all available commands.
+
+The 'gpg-agent' daemon is started on demand by the GnuPG components.
+
+ To identify a key we use a thing called keygrip which is the SHA-1
+hash of an canonical encoded S-Expression of the public key as used in
+Libgcrypt. For the purpose of this interface the keygrip is given as a
+hex string. The advantage of using this and not the hash of a
+certificate is that it will be possible to use the same keypair for
+different protocols, thereby saving space on the token used to keep the
+secret keys.
+
+ The 'gpg-agent' may send status messages during a command or when
+returning from a command to inform a client about the progress or result
+of an operation. For example, the INQUIRE_MAXLEN status message may be
+sent during a server inquire to inform the client of the maximum usable
+length of the inquired data (which should not be exceeded).
+
+* Menu:
+
+* Agent PKDECRYPT:: Decrypting a session key
+* Agent PKSIGN:: Signing a Hash
+* Agent GENKEY:: Generating a Key
+* Agent IMPORT:: Importing a Secret Key
+* Agent EXPORT:: Exporting a Secret Key
+* Agent ISTRUSTED:: Importing a Root Certificate
+* Agent GET_PASSPHRASE:: Ask for a passphrase
+* Agent CLEAR_PASSPHRASE:: Expire a cached passphrase
+* Agent PRESET_PASSPHRASE:: Set a passphrase for a keygrip
+* Agent GET_CONFIRMATION:: Ask for confirmation
+* Agent HAVEKEY:: Check whether a key is available
+* Agent LEARN:: Register a smartcard
+* Agent PASSWD:: Change a Passphrase
+* Agent UPDATESTARTUPTTY:: Change the Standard Display
+* Agent GETEVENTCOUNTER:: Get the Event Counters
+* Agent GETINFO:: Return information about the process
+* Agent OPTION:: Set options for the session
+
+
+File: gnupg.info, Node: Agent PKDECRYPT, Next: Agent PKSIGN, Up: Agent Protocol
+
+2.6.1 Decrypting a session key
+------------------------------
+
+The client asks the server to decrypt a session key. The encrypted
+session key should have all information needed to select the appropriate
+secret key or to delegate it to a smartcard.
+
+ SETKEY <keyGrip>
+
+ Tell the server about the key to be used for decryption. If this is
+not used, 'gpg-agent' may try to figure out the key by trying to decrypt
+the message with each key available.
+
+ PKDECRYPT
+
+ The agent checks whether this command is allowed and then does an
+INQUIRY to get the ciphertext the client should then send the cipher
+text.
+
+ S: INQUIRE CIPHERTEXT
+ C: D (xxxxxx
+ C: D xxxx)
+ C: END
+
+ Please note that the server may send status info lines while reading
+the data lines from the client. The data send is a SPKI like S-Exp with
+this structure:
+
+ (enc-val
+ (<algo>
+ (<param_name1> <mpi>)
+ ...
+ (<param_namen> <mpi>)))
+
+ Where algo is a string with the name of the algorithm; see the
+libgcrypt documentation for a list of valid algorithms. The number and
+names of the parameters depend on the algorithm. The agent does return
+an error if there is an inconsistency.
+
+ If the decryption was successful the decrypted data is returned by
+means of "D" lines.
+
+ Here is an example session:
+ C: PKDECRYPT
+ S: INQUIRE CIPHERTEXT
+ C: D (enc-val elg (a 349324324)
+ C: D (b 3F444677CA)))
+ C: END
+ S: # session key follows
+ S: S PADDING 0
+ S: D (value 1234567890ABCDEF0)
+ S: OK descryption successful
+
+ The “PADDING” status line is only send if gpg-agent can tell what
+kind of padding is used. As of now only the value 0 is used to indicate
+that the padding has been removed.
+
+
+File: gnupg.info, Node: Agent PKSIGN, Next: Agent GENKEY, Prev: Agent PKDECRYPT, Up: Agent Protocol
+
+2.6.2 Signing a Hash
+--------------------
+
+The client ask the agent to sign a given hash value. A default key will
+be chosen if no key has been set. To set a key a client first uses:
+
+ SIGKEY <keyGrip>
+
+ This can be used multiple times to create multiple signature, the
+list of keys is reset with the next PKSIGN command or a RESET. The
+server test whether the key is a valid key to sign something and
+responds with okay.
+
+ SETHASH --hash=<name>|<algo> <hexstring>
+
+ The client can use this command to tell the server about the data
+<hexstring> (which usually is a hash) to be signed. <algo> is the
+decimal encoded hash algorithm number as used by Libgcrypt. Either
+<algo> or -hash=<name> must be given. Valid names for <name> are:
+
+'sha1'
+ The SHA-1 hash algorithm
+'sha256'
+ The SHA-256 hash algorithm
+'rmd160'
+ The RIPE-MD160 hash algorithm
+'md5'
+ The old and broken MD5 hash algorithm
+'tls-md5sha1'
+ A combined hash algorithm as used by the TLS protocol.
+
+The actual signing is done using
+
+ PKSIGN <options>
+
+ Options are not yet defined, but my later be used to choose among
+different algorithms. The agent does then some checks, asks for the
+passphrase and as a result the server returns the signature as an SPKI
+like S-expression in "D" lines:
+
+ (sig-val
+ (<algo>
+ (<param_name1> <mpi>)
+ ...
+ (<param_namen> <mpi>)))
+
+ The operation is affected by the option
+
+ OPTION use-cache-for-signing=0|1
+
+ The default of '1' uses the cache. Setting this option to '0' will
+lead 'gpg-agent' to ignore the passphrase cache. Note, that there is
+also a global command line option for 'gpg-agent' to globally disable
+the caching.
+
+ Here is an example session:
+ C: SIGKEY <keyGrip>
+ S: OK key available
+ C: SIGKEY <keyGrip>
+ S: OK key available
+ C: PKSIGN
+ S: # I did ask the user whether he really wants to sign
+ S: # I did ask the user for the passphrase
+ S: INQUIRE HASHVAL
+ C: D ABCDEF012345678901234
+ C: END
+ S: # signature follows
+ S: D (sig-val rsa (s 45435453654612121212))
+ S: OK
+
+
+File: gnupg.info, Node: Agent GENKEY, Next: Agent IMPORT, Prev: Agent PKSIGN, Up: Agent Protocol
+
+2.6.3 Generating a Key
+----------------------
+
+This is used to create a new keypair and store the secret key inside the
+active PSE -- which is in most cases a Soft-PSE. An not yet defined
+option allows to choose the storage location. To get the secret key out
+of the PSE, a special export tool has to be used.
+
+ GENKEY [--no-protection] [--preset] [<cache_nonce>]
+
+ Invokes the key generation process and the server will then inquire
+on the generation parameters, like:
+
+ S: INQUIRE KEYPARM
+ C: D (genkey (rsa (nbits 1024)))
+ C: END
+
+ The format of the key parameters which depends on the algorithm is of
+the form:
+
+ (genkey
+ (algo
+ (parameter_name_1 ....)
+ ....
+ (parameter_name_n ....)))
+
+ If everything succeeds, the server returns the *public key* in a SPKI
+like S-Expression like this:
+
+ (public-key
+ (rsa
+ (n <mpi>)
+ (e <mpi>)))
+
+ Here is an example session:
+ C: GENKEY
+ S: INQUIRE KEYPARM
+ C: D (genkey (rsa (nbits 1024)))
+ C: END
+ S: D (public-key
+ S: D (rsa (n 326487324683264) (e 10001)))
+ S OK key created
+
+ The '--no-protection' option may be used to prevent prompting for a
+passphrase to protect the secret key while leaving the secret key
+unprotected. The '--preset' option may be used to add the passphrase to
+the cache using the default cache parameters.
+
+ The '--inq-passwd' option may be used to create the key with a
+supplied passphrase. When used the agent does an inquiry with the
+keyword 'NEWPASSWD' to retrieve that passphrase. This option takes
+precedence over '--no-protection'; however if the client sends a empty
+(zero-length) passphrase, this is identical to '--no-protection'.
+
+
+File: gnupg.info, Node: Agent IMPORT, Next: Agent EXPORT, Prev: Agent GENKEY, Up: Agent Protocol
+
+2.6.4 Importing a Secret Key
+----------------------------
+
+This operation is not yet supported by GpgAgent. Specialized tools are
+to be used for this.
+
+ There is no actual need because we can expect that secret keys
+created by a 3rd party are stored on a smartcard. If we have generated
+the key ourself, we do not need to import it.
+
+
+File: gnupg.info, Node: Agent EXPORT, Next: Agent ISTRUSTED, Prev: Agent IMPORT, Up: Agent Protocol
+
+2.6.5 Export a Secret Key
+-------------------------
+
+Not implemented.
+
+ Should be done by an extra tool.
+
+
+File: gnupg.info, Node: Agent ISTRUSTED, Next: Agent GET_PASSPHRASE, Prev: Agent EXPORT, Up: Agent Protocol
+
+2.6.6 Importing a Root Certificate
+----------------------------------
+
+Actually we do not import a Root Cert but provide a way to validate any
+piece of data by storing its Hash along with a description and an
+identifier in the PSE. Here is the interface description:
+
+ ISTRUSTED <fingerprint>
+
+ Check whether the OpenPGP primary key or the X.509 certificate with
+the given fingerprint is an ultimately trusted key or a trusted Root CA
+certificate. The fingerprint should be given as a hexstring (without
+any blanks or colons or whatever in between) and may be left padded with
+00 in case of an MD5 fingerprint. GPGAgent will answer with:
+
+ OK
+
+ The key is in the table of trusted keys.
+
+ ERR 304 (Not Trusted)
+
+ The key is not in this table.
+
+ Gpg needs the entire list of trusted keys to maintain the web of
+trust; the following command is therefore quite helpful:
+
+ LISTTRUSTED
+
+ GpgAgent returns a list of trusted keys line by line:
+
+ S: D 000000001234454556565656677878AF2F1ECCFF P
+ S: D 340387563485634856435645634856438576457A P
+ S: D FEDC6532453745367FD83474357495743757435D S
+ S: OK
+
+ The first item on a line is the hexified fingerprint where MD5
+fingerprints are '00' padded to the left and the second item is a flag
+to indicate the type of key (so that gpg is able to only take care of
+PGP keys). P = OpenPGP, S = S/MIME. A client should ignore the rest of
+the line, so that we can extend the format in the future.
+
+ Finally a client should be able to mark a key as trusted:
+
+ MARKTRUSTED FINGERPRINT "P"|"S"
+
+ The server will then pop up a window to ask the user whether she
+really trusts this key. For this it will probably ask for a text to be
+displayed like this:
+
+ S: INQUIRE TRUSTDESC
+ C: D Do you trust the key with the fingerprint @FPR@
+ C: D bla fasel blurb.
+ C: END
+ S: OK
+
+ Known sequences with the pattern @foo@ are replaced according to this
+table:
+
+'@FPR16@'
+ Format the fingerprint according to gpg rules for a v3 keys.
+'@FPR20@'
+ Format the fingerprint according to gpg rules for a v4 keys.
+'@FPR@'
+ Choose an appropriate format to format the fingerprint.
+'@@'
+ Replaced by a single '@'
+
+
+File: gnupg.info, Node: Agent GET_PASSPHRASE, Next: Agent CLEAR_PASSPHRASE, Prev: Agent ISTRUSTED, Up: Agent Protocol
+
+2.6.7 Ask for a passphrase
+--------------------------
+
+This function is usually used to ask for a passphrase to be used for
+symmetric encryption, but may also be used by programs which need
+special handling of passphrases. This command uses a syntax which helps
+clients to use the agent with minimum effort.
+
+ GET_PASSPHRASE [--data] [--check] [--no-ask] [--repeat[=N]] \
+ [--qualitybar] CACHE_ID \
+ [ERROR_MESSAGE PROMPT DESCRIPTION]
+
+ CACHE_ID is expected to be a string used to identify a cached
+passphrase. Use a 'X' to bypass the cache. With no other arguments the
+agent returns a cached passphrase or an error. By convention either the
+hexified fingerprint of the key shall be used for CACHE_ID or an
+arbitrary string prefixed with the name of the calling application and a
+colon: Like 'gpg:somestring'.
+
+ ERROR_MESSAGE is either a single 'X' for no error message or a string
+to be shown as an error message like (e.g. "invalid passphrase").
+Blanks must be percent escaped or replaced by '+''.
+
+ PROMPT is either a single 'X' for a default prompt or the text to be
+shown as the prompt. Blanks must be percent escaped or replaced by '+'.
+
+ DESCRIPTION is a text shown above the entry field. Blanks must be
+percent escaped or replaced by '+'.
+
+ The agent either returns with an error or with a OK followed by the
+hex encoded passphrase. Note that the length of the strings is
+implicitly limited by the maximum length of a command. If the option
+'--data' is used, the passphrase is not returned on the OK line but by
+regular data lines; this is the preferred method.
+
+ If the option '--check' is used, the standard passphrase constraints
+checks are applied. A check is not done if the passphrase has been
+found in the cache.
+
+ If the option '--no-ask' is used and the passphrase is not in the
+cache the user will not be asked to enter a passphrase but the error
+code 'GPG_ERR_NO_DATA' is returned.
+
+ If the option '--qualitybar' is used and a minimum passphrase length
+has been configured, a visual indication of the entered passphrase
+quality is shown.
+
+ CLEAR_PASSPHRASE CACHE_ID
+
+ may be used to invalidate the cache entry for a passphrase. The
+function returns with OK even when there is no cached passphrase.
+
+
+File: gnupg.info, Node: Agent CLEAR_PASSPHRASE, Next: Agent PRESET_PASSPHRASE, Prev: Agent GET_PASSPHRASE, Up: Agent Protocol
+
+2.6.8 Remove a cached passphrase
+--------------------------------
+
+Use this command to remove a cached passphrase.
+
+ CLEAR_PASSPHRASE [--mode=normal] <cache_id>
+
+ The '--mode=normal' option can be used to clear a CACHE_ID that was
+set by gpg-agent.
+
+
+File: gnupg.info, Node: Agent PRESET_PASSPHRASE, Next: Agent GET_CONFIRMATION, Prev: Agent CLEAR_PASSPHRASE, Up: Agent Protocol
+
+2.6.9 Set a passphrase for a keygrip
+------------------------------------
+
+This command adds a passphrase to the cache for the specified KEYGRIP.
+
+ PRESET_PASSPHRASE [--inquire] <string_or_keygrip> <timeout> [<hexstring>]
+
+ The passphrase is a hexidecimal string when specified. When not
+specified, the passphrase will be retrieved from the pinentry module
+unless the '--inquire' option was specified in which case the passphrase
+will be retrieved from the client.
+
+ The TIMEOUT parameter keeps the passphrase cached for the specified
+number of seconds. A value of '-1' means infinate while '0' means the
+default (currently only a timeout of -1 is allowed, which means to never
+expire it).
+
+
+File: gnupg.info, Node: Agent GET_CONFIRMATION, Next: Agent HAVEKEY, Prev: Agent PRESET_PASSPHRASE, Up: Agent Protocol
+
+2.6.10 Ask for confirmation
+---------------------------
+
+This command may be used to ask for a simple confirmation by presenting
+a text and 2 buttons: Okay and Cancel.
+
+ GET_CONFIRMATION DESCRIPTION
+
+ DESCRIPTIONis displayed along with a Okay and Cancel button. Blanks
+must be percent escaped or replaced by '+'. A 'X' may be used to
+display confirmation dialog with a default text.
+
+ The agent either returns with an error or with a OK. Note, that the
+length of DESCRIPTION is implicitly limited by the maximum length of a
+command.
+
+
+File: gnupg.info, Node: Agent HAVEKEY, Next: Agent LEARN, Prev: Agent GET_CONFIRMATION, Up: Agent Protocol
+
+2.6.11 Check whether a key is available
+---------------------------------------
+
+This can be used to see whether a secret key is available. It does not
+return any information on whether the key is somehow protected.
+
+ HAVEKEY KEYGRIPS
+
+ The agent answers either with OK or 'No_Secret_Key' (208). The
+caller may want to check for other error codes as well. More than one
+keygrip may be given. In this case the command returns success if at
+least one of the keygrips corresponds to an available secret key.
+
+
+File: gnupg.info, Node: Agent LEARN, Next: Agent PASSWD, Prev: Agent HAVEKEY, Up: Agent Protocol
+
+2.6.12 Register a smartcard
+---------------------------
+
+ LEARN [--send]
+
+ This command is used to register a smartcard. With the -send option
+given the certificates are send back.
+
+
+File: gnupg.info, Node: Agent PASSWD, Next: Agent UPDATESTARTUPTTY, Prev: Agent LEARN, Up: Agent Protocol
+
+2.6.13 Change a Passphrase
+--------------------------
+
+ PASSWD [--cache-nonce=<c>] [--passwd-nonce=<s>] [--preset] KEYGRIP
+
+ This command is used to interactively change the passphrase of the
+key identified by the hex string KEYGRIP. The '--preset' option may be
+used to add the new passphrase to the cache using the default cache
+parameters.
+
+
+File: gnupg.info, Node: Agent UPDATESTARTUPTTY, Next: Agent GETEVENTCOUNTER, Prev: Agent PASSWD, Up: Agent Protocol
+
+2.6.14 Change the standard display
+----------------------------------
+
+ UPDATESTARTUPTTY
+
+ Set the startup TTY and X-DISPLAY variables to the values of this
+session. This command is useful to direct future pinentry invocations
+to another screen. It is only required because there is no way in the
+ssh-agent protocol to convey this information.
+
+
+File: gnupg.info, Node: Agent GETEVENTCOUNTER, Next: Agent GETINFO, Prev: Agent UPDATESTARTUPTTY, Up: Agent Protocol
+
+2.6.15 Get the Event Counters
+-----------------------------
+
+ GETEVENTCOUNTER
+
+ This function return one status line with the current values of the
+event counters. The event counters are useful to avoid polling by
+delaying a poll until something has changed. The values are decimal
+numbers in the range '0' to 'UINT_MAX' and wrapping around to 0. The
+actual values should not be relied upon; they shall only be used to
+detect a change.
+
+ The currently defined counters are are:
+'ANY'
+ Incremented with any change of any of the other counters.
+'KEY'
+ Incremented for added or removed private keys.
+'CARD'
+ Incremented for changes of the card readers stati.
+
+
+File: gnupg.info, Node: Agent GETINFO, Next: Agent OPTION, Prev: Agent GETEVENTCOUNTER, Up: Agent Protocol
+
+2.6.16 Return information about the process
+-------------------------------------------
+
+This is a multipurpose function to return a variety of information.
+
+ GETINFO WHAT
+
+ The value of WHAT specifies the kind of information returned:
+'version'
+ Return the version of the program.
+'pid'
+ Return the process id of the process.
+'socket_name'
+ Return the name of the socket used to connect the agent.
+'ssh_socket_name'
+ Return the name of the socket used for SSH connections. If SSH
+ support has not been enabled the error 'GPG_ERR_NO_DATA' will be
+ returned.
+
+
+File: gnupg.info, Node: Agent OPTION, Prev: Agent GETINFO, Up: Agent Protocol
+
+2.6.17 Set options for the session
+----------------------------------
+
+Here is a list of session options which are not yet described with other
+commands. The general syntax for an Assuan option is:
+
+ OPTION KEY=VALUE
+
+Supported KEYs are:
+
+'agent-awareness'
+ This may be used to tell gpg-agent of which gpg-agent version the
+ client is aware of. gpg-agent uses this information to enable
+ features which might break older clients.
+
+'putenv'
+ Change the session's environment to be used for the Pinentry.
+ Valid values are:
+
+ 'NAME'
+ Delete envvar NAME
+ 'NAME='
+ Set envvar NAME to the empty string
+ 'NAME=VALUE'
+ Set envvar NAME to the string VALUE.
+
+'use-cache-for-signing'
+ See Assuan command 'PKSIGN'.
+
+'allow-pinentry-notify'
+ This does not need any value. It is used to enable the
+ PINENTRY_LAUNCHED inquiry.
+
+'pinentry-mode'
+ This option is used to change the operation mode of the pinentry.
+ The following values are defined:
+
+ 'ask'
+ This is the default mode which pops up a pinentry as needed.
+
+ 'cancel'
+ Instead of popping up a pinentry, return the error code
+ 'GPG_ERR_CANCELED'.
+
+ 'error'
+ Instead of popping up a pinentry, return the error code
+ 'GPG_ERR_NO_PIN_ENTRY'.
+
+ 'loopback'
+ Use a loopback pinentry. This fakes a pinentry by using
+ inquiries back to the caller to ask for a passphrase. This
+ option may only be set if the agent has been configured for
+ that. To disable this feature use *Note option
+ --no-allow-loopback-pinentry::.
+
+'cache-ttl-opt-preset'
+ This option sets the cache TTL for new entries created by GENKEY
+ and PASSWD commands when using the '--preset' option. It it is not
+ used a default value is used.
+
+'s2k-count'
+ Instead of using the standard S2K count (which is computed on the
+ fly), the given S2K count is used for new keys or when changing the
+ passphrase of a key. Values below 65536 are considered to be 0.
+ This option is valid for the entire session or until reset to 0.
+ This option is useful if the key is later used on boxes which are
+ either much slower or faster than the actual box.
+
+
+File: gnupg.info, Node: Invoking DIRMNGR, Next: Invoking GPG, Prev: Invoking GPG-AGENT, Up: Top
+
+3 Invoking DIRMNGR
+******************
+
+Since version 2.1 of GnuPG, 'dirmngr' takes care of accessing the
+OpenPGP keyservers. As with previous versions it is also used as a
+server for managing and downloading certificate revocation lists (CRLs)
+for X.509 certificates, downloading X.509 certificates, and providing
+access to OCSP providers. Dirmngr is invoked internally by 'gpg',
+'gpgsm', or via the 'gpg-connect-agent' tool.
+
+ For historical reasons it is also possible to start 'dirmngr' in a
+system daemon mode which uses a different directory layout. However,
+this mode is deprecated and may eventually be removed.
+
+*Note Option Index::,for an index to 'DIRMNGR''s commands and options.
+
+* Menu:
+
+* Dirmngr Commands:: List of all commands.
+* Dirmngr Options:: List of all options.
+* Dirmngr Configuration:: Configuration files.
+* Dirmngr Signals:: Use of signals.
+* Dirmngr Examples:: Some usage examples.
+* Dirmngr Protocol:: The protocol dirmngr uses.
+
+
+File: gnupg.info, Node: Dirmngr Commands, Next: Dirmngr Options, Up: Invoking DIRMNGR
+
+3.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help, -h'
+ Print a usage message summarizing the most useful command-line
+ options. Not that you cannot abbreviate this command.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+'--server'
+ Run in server mode and wait for commands on the 'stdin'. The
+ default mode is to create a socket and listen for commands there.
+ This is only used for testing.
+
+'--daemon'
+ Run in background daemon mode and listen for commands on a socket.
+ Note that this also changes the default home directory and enables
+ the internal certificate validation code. This mode is deprecated.
+
+'--list-crls'
+ List the contents of the CRL cache on 'stdout'. This is probably
+ only useful for debugging purposes.
+
+'--load-crl FILE'
+ This command requires a filename as additional argument, and it
+ will make Dirmngr try to import the CRL in FILE into it's cache.
+ Note, that this is only possible if Dirmngr is able to retrieve the
+ CA's certificate directly by its own means. In general it is
+ better to use 'gpgsm''s '--call-dirmngr loadcrl filename' command
+ so that 'gpgsm' can help dirmngr.
+
+'--fetch-crl URL'
+ This command requires an URL as additional argument, and it will
+ make dirmngr try to retrieve an import the CRL from that URL into
+ it's cache. This is mainly useful for debugging purposes. The
+ 'dirmngr-client' provides the same feature for a running dirmngr.
+
+'--shutdown'
+ This commands shuts down an running instance of Dirmngr. This
+ command has currently no effect.
+
+'--flush'
+ This command removes all CRLs from Dirmngr's cache. Client
+ requests will thus trigger reading of fresh CRLs.
+
+
+File: gnupg.info, Node: Dirmngr Options, Next: Dirmngr Configuration, Prev: Dirmngr Commands, Up: Invoking DIRMNGR
+
+3.2 Option Summary
+==================
+
+'--options FILE'
+ Reads configuration from FILE instead of from the default per-user
+ configuration file. The default configuration file is named
+ 'dirmngr.conf' and expected in the home directory.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. This option is only
+ effective when used on the command line. The default depends on
+ the running mode:
+
+ With '--daemon' given on the commandline
+ the directory named '/etc/gnupg' is used for configuration
+ files and '/usr/local/var/cache/gnupg' for cached CRLs.
+
+ Without '--daemon' given on the commandline
+ the directory named '.gnupg' directly below the home directory
+ of the user unless the environment variable 'GNUPGHOME' has
+ been set in which case its value will be used. All kind of
+ data is stored below this directory.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to DIRMNGR, such as
+ '-vv'.
+
+'--log-file FILE'
+ Append all logging output to FILE. This is very helpful in seeing
+ what the agent actually does.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or by a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ This option is only useful for debugging and the behaviour may
+ change at any time without notice. FLAGS are bit encoded and may
+ be given in usual C-Syntax.
+
+'--debug-all'
+ Same as '--debug=0xffffffff'
+
+'--gnutls-debug LEVEL'
+ Enable debugging of GNUTLS at LEVEL.
+
+'--debug-wait N'
+ When running in server mode, wait N seconds before entering the
+ actual processing loop and print the pid. This gives time to
+ attach a debugger.
+
+'-s'
+'--sh'
+'-c'
+'--csh'
+ Format the info output in daemon mode for use with the standard
+ Bourne shell respective the C-shell . The default ist to guess it
+ based on the environment variable 'SHELL' which is in almost all
+ cases sufficient.
+
+'--force'
+ Enabling this option forces loading of expired CRLs; this is only
+ useful for debugging.
+
+'--use-tor'
+ This option switches Dirmngr and thus GnuPG into "Tor mode" to
+ route all network access via Tor (an anonymity network). WARNING:
+ As of now this still leaks the DNS queries; e.g. to lookup the
+ hosts in a keyserver pool. Certain other features are disabled if
+ this mode is active.
+
+'--keyserver NAME'
+ Use NAME as your keyserver. This is the server that 'gpg'
+ communicates with to receive keys, send keys, and search for keys.
+ The format of the NAME is a URI: 'scheme:[//]keyservername[:port]'
+ The scheme is the type of keyserver: "hkp" for the HTTP (or
+ compatible) keyservers, "ldap" for the LDAP keyservers, or "mailto"
+ for the Graff email keyserver. Note that your particular
+ installation of GnuPG may have other keyserver types available as
+ well. Keyserver schemes are case-insensitive. After the keyserver
+ name, optional keyserver configuration options may be provided.
+ These are the same as the '--keyserver-options' of 'gpg', but apply
+ only to this particular keyserver.
+
+ Most keyservers synchronize with each other, so there is generally
+ no need to send keys to more than one server. The keyserver
+ 'hkp://keys.gnupg.net' uses round robin DNS to give a different
+ keyserver each time you use it.
+
+ If exactly two keyservers are configured and only one is a Tor
+ hidden service (.onion), Dirmngr selects the keyserver to use
+ depending on whether Tor is locally running or not. The check for
+ a running Tor is done for each new connection.
+
+'--nameserver IPADDR'
+ In "Tor mode" Dirmngr uses a public resolver via Tor to resolve DNS
+ names. If the default public resolver, which is '8.8.8.8', shall
+ not be used a different one can be given using this option. Note
+ that a numerical IP address must be given (IPv6 or IPv4) and that
+ no error checking is done for IPADDR. DNS queries in Tor mode do
+ only work if GnuPG as been build with ADNS support.
+
+'--disable-ldap'
+ Entirely disables the use of LDAP.
+
+'--disable-http'
+ Entirely disables the use of HTTP.
+
+'--ignore-http-dp'
+ When looking for the location of a CRL, the to be tested
+ certificate usually contains so called "CRL Distribution Point"
+ (DP) entries which are URLs describing the way to access the CRL.
+ The first found DP entry is used. With this option all entries
+ using the HTTP scheme are ignored when looking for a suitable DP.
+
+'--ignore-ldap-dp'
+ This is similar to '--ignore-http-dp' but ignores entries using the
+ LDAP scheme. Both options may be combined resulting in ignoring
+ DPs entirely.
+
+'--ignore-ocsp-service-url'
+ Ignore all OCSP URLs contained in the certificate. The effect is
+ to force the use of the default responder.
+
+'--honor-http-proxy'
+ If the environment variable 'http_proxy' has been set, use its
+ value to access HTTP servers.
+
+'--http-proxy HOST[:PORT]'
+ Use HOST and PORT to access HTTP servers. The use of this option
+ overrides the environment variable 'http_proxy' regardless whether
+ '--honor-http-proxy' has been set.
+
+'--ldap-proxy HOST[:PORT]'
+ Use HOST and PORT to connect to LDAP servers. If PORT is ommitted,
+ 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
+**************
+
+'gpg' is the OpenPGP part of the GNU Privacy Guard (GnuPG). It is a tool
+to provide digital encryption and signing services using the OpenPGP
+standard. 'gpg' features complete key management and all bells and
+whistles you can expect from a decent OpenPGP implementation.
+
+ Note that this version of GnuPG features all modern algorithms and
+should thus be preferred over older GnuPG versions. If you are looking
+for version 1 of GnuPG, you may find that version installed under the
+name 'gpg1'.
+
+ *Note Option Index::, for an index to 'gpg''s commands and options.
+
+* Menu:
+
+* GPG Commands:: List of all commands.
+* GPG Options:: List of all options.
+* GPG Configuration:: Configuration files.
+* GPG Examples:: Some usage examples.
+
+Developer information:
+* Unattended Usage of GPG:: Using 'gpg' from other programs.
+
+
+File: gnupg.info, Node: GPG Commands, Next: GPG Options, Up: Invoking GPG
+
+4.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+ 'gpg' may be run with no commands, in which case it will perform a
+reasonable action depending on the type of file it is given as input (an
+encrypted message is decrypted, a signature is verified, a file
+containing keys is listed).
+
+ Please remember that option as well as command parsing stops as soon
+as a non-option is encountered, you can explicitly stop parsing by using
+the special option '--'.
+
+* Menu:
+
+* General GPG Commands:: Commands not specific to the functionality.
+* Operational GPG Commands:: Commands to select the type of operation.
+* OpenPGP Key Management:: How to manage your keys.
+
+
+File: gnupg.info, Node: General GPG Commands, Next: Operational GPG Commands, Up: GPG Commands
+
+4.1.1 Commands not specific to the function
+-------------------------------------------
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help'
+'-h'
+ Print a usage message summarizing the most useful command line
+ options. Note that you cannot abbreviate this command.
+
+'--warranty'
+ Print warranty information.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+
+File: gnupg.info, Node: Operational GPG Commands, Next: OpenPGP Key Management, Prev: General GPG Commands, Up: GPG Commands
+
+4.1.2 Commands to select the type of operation
+----------------------------------------------
+
+'--sign'
+'-s'
+ Make a signature. This command may be combined with '--encrypt'
+ (for a signed and encrypted message), '--symmetric' (for a signed
+ and symmetrically encrypted message), or '--encrypt' and
+ '--symmetric' together (for a signed message that may be decrypted
+ via a secret key or a passphrase). The key to be used for signing
+ is chosen by default or can be set with the '--local-user' and
+ '--default-key' options.
+
+'--clearsign'
+ Make a clear text signature. The content in a clear text signature
+ is readable without any special software. OpenPGP software is only
+ needed to verify the signature. Clear text signatures may modify
+ end-of-line whitespace for platform independence and are not
+ intended to be reversible. The key to be used for signing is
+ chosen by default or can be set with the '--local-user' and
+ '--default-key' options.
+
+'--detach-sign'
+'-b'
+ Make a detached signature.
+
+'--encrypt'
+'-e'
+ Encrypt data. This option may be combined with '--sign' (for a
+ signed and encrypted message), '--symmetric' (for a message that
+ may be decrypted via a secret key or a passphrase), or '--sign' and
+ '--symmetric' together (for a signed message that may be decrypted
+ via a secret key or a passphrase).
+
+'--symmetric'
+'-c'
+ Encrypt with a symmetric cipher using a passphrase. The default
+ symmetric cipher used is AES-128, but may be chosen with the
+ '--cipher-algo' option. This option may be combined with '--sign'
+ (for a signed and symmetrically encrypted message), '--encrypt'
+ (for a message that may be decrypted via a secret key or a
+ passphrase), or '--sign' and '--encrypt' together (for a signed
+ message that may be decrypted via a secret key or a passphrase).
+
+'--store'
+ Store only (make a simple literal data packet).
+
+'--decrypt'
+'-d'
+ Decrypt the file given on the command line (or STDIN if no file is
+ specified) and write it to STDOUT (or the file specified with
+ '--output'). If the decrypted file is signed, the signature is
+ also verified. This command differs from the default operation, as
+ it never writes to the filename which is included in the file and
+ it rejects files which don't begin with an encrypted message.
+
+'--verify'
+ Assume that the first argument is a signed file and verify it
+ without generating any output. With no arguments, the signature
+ packet is read from STDIN. If only a one argument is given, it is
+ expected to be a complete signature.
+
+ With more than 1 argument, the first should be a detached signature
- and the remaining files ake up the the signed data. To read the
++ and the remaining files make up the the signed data. To read the
+ signed data from STDIN, use '-' as the second filename. For
+ security reasons a detached signature cannot read the signed
+ material from STDIN without denoting it in the above way.
+
+ Note: If the option '--batch' is not used, 'gpg' may assume that a
+ single argument is a file with a detached signature and it will try
+ to find a matching data file by stripping certain suffixes. Using
+ this historical feature to verify a detached signature is strongly
+ discouraged; always specify the data file too.
+
+ Note: When verifying a cleartext signature, 'gpg' verifies only
+ what makes up the cleartext signed data and not any extra data
+ outside of the cleartext signature or header lines following
+ directly the dash marker line. The option '--output' may be used
+ to write out the actual signed data; but there are other pitfalls
+ with this format as well. It is suggested to avoid cleartext
+ signatures in favor of detached signatures.
+
+'--multifile'
+ This modifies certain other commands to accept multiple files for
+ processing on the command line or read from STDIN with each
+ filename on a separate line. This allows for many files to be
+ processed at once. '--multifile' may currently be used along with
+ '--verify', '--encrypt', and '--decrypt'. Note that '--multifile
+ --verify' may not be used with detached signatures.
+
+'--verify-files'
+ Identical to '--multifile --verify'.
+
+'--encrypt-files'
+ Identical to '--multifile --encrypt'.
+
+'--decrypt-files'
+ Identical to '--multifile --decrypt'.
+
+'--list-keys'
+'-k'
+'--list-public-keys'
+ List all keys from the public keyrings, or just the keys given on
+ the command line.
+
+ Avoid using the output of this command in scripts or other programs
+ as it is likely to change as GnuPG changes. See '--with-colons'
+ for a machine-parseable key listing command that is appropriate for
- use in scripts and other programs.
++ use in scripts and other programs. Never use the regular output
++ for scripts - it is only for human consumption.
+
+'--list-secret-keys'
+'-K'
+ List all keys from the secret keyrings, or just the ones given on
+ the command line. A '#' after the letters 'sec' means that the
+ secret key is not usable (for example, if it was created via
- '--export-secret-subkeys').
++ '--export-secret-subkeys'). See also '--list-keys'.
+
+'--list-sigs'
+ Same as '--list-keys', but the signatures are listed too. This
+ command has the same effect as using '--list-keys' with
+ '--with-sig-list'.
+
+ For each signature listed, there are several flags in between the
+ "sig" tag and keyid. These flags give additional information about
+ each signature. From left to right, they are the numbers 1-3 for
+ certificate check level (see '--ask-cert-level'), "L" for a local
+ or non-exportable signature (see '--lsign-key'), "R" for a
+ nonRevocable signature (see the '--edit-key' command "nrsign"), "P"
+ for a signature that contains a policy URL (see
+ '--cert-policy-url'), "N" for a signature that contains a notation
+ (see '--cert-notation'), "X" for an eXpired signature (see
+ '--ask-cert-expire'), and the numbers 1-9 or "T" for 10 and above
+ to indicate trust signature levels (see the '--edit-key' command
+ "tsign").
+
+'--check-sigs'
+ Same as '--list-sigs', but the signatures are verified. Note that
+ for performance reasons the revocation status of a signing key is
+ not shown. This command has the same effect as using '--list-keys'
+ with '--with-sig-check'.
+
+ The status of the verification is indicated by a flag directly
+ following the "sig" tag (and thus before the flags described above
+ for '--list-sigs'). A "!" indicates that the signature has been
+ successfully verified, a "-" denotes a bad signature and a "%" is
+ used if an error occurred while checking the signature (e.g. a non
+ supported algorithm).
+
+'--locate-keys'
+ Locate the keys given as arguments. This command basically uses
+ the same algorithm as used when locating keys for encryption or
+ signing and may thus be used to see what keys 'gpg' might use. In
+ particular external methods as defined by '--auto-key-locate' may
+ be used to locate a key. Only public keys are listed.
+
+'--fingerprint'
+ List all keys (or the specified ones) along with their
+ fingerprints. This is the same output as '--list-keys' but with
+ the additional output of a line with the fingerprint. May also be
+ combined with '--list-sigs' or '--check-sigs'. If this command is
+ given twice, the fingerprints of all secondary keys are listed too.
+ This command also forces pretty printing of fingerprints if the
+ keyid format has been set to "none".
+
+'--list-packets'
+ List only the sequence of packets. This is mainly useful for
+ 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'
+ gRemove key from the secret keyring. In batch mode the key must be
+ specified by fingerprint. The option '--yes' can be used to advice
+ gpg-agent not to request a confirmation. This extra pre-caution is
+ done because 'gpg' can't be sure that the secret key (as controlled
+ by gpg-agent) is only used for the given OpenPGP public key.
+
+'--delete-secret-and-public-key name'
+ Same as '--delete-key', but if a secret key exists, it will be
+ removed first. In batch mode the key must be specified by
+ fingerprint. The option '--yes' can be used to advice gpg-agent
+ not to request a confirmation.
+
+'--export'
+ Either export all keys from all keyrings (default keyrings and
+ those registered via option '--keyring'), or if at least one name
+ is given, those of the given name. The exported keys are written
+ to STDOUT or to the file given with option '--output'. Use
+ together with '--armor' to mail those keys.
+
+'--send-keys key IDs'
+ Similar to '--export' but sends the keys to a keyserver.
+ Fingerprints may be used instead of key IDs. Option '--keyserver'
+ must be used to give the name of this keyserver. Don't send your
+ complete keyring to a keyserver -- select only those keys which are
+ new or changed by you. If no key IDs are given, 'gpg' does
+ nothing.
+
+'--export-secret-keys'
+'--export-secret-subkeys'
+ Same as '--export', but exports the secret keys instead. The
+ exported keys are written to STDOUT or to the file given with
+ option '--output'. This command is often used along with the
+ option '--armor' to allow easy printing of the key for paper
+ backup; however the external tool 'paperkey' does a better job for
+ creating backups on paper. Note that exporting a secret key can be
+ a security risk if the exported keys are send over an insecure
+ channel.
+
+ The second form of the command has the special property to render
+ the secret part of the primary key useless; this is a GNU extension
+ to OpenPGP and other implementations can not be expected to
+ successfully import such a key. Its intended use is to generated a
+ full key with an additional signing subkey on a dedicated machine
+ and then using this command to export the key without the primary
+ key to the main machine.
+
+ GnuPG may ask you to enter the passphrase for the key. This is
+ required because the internal protection method of the secret key
+ is different from the one specified by the OpenPGP protocol.
+
+'--export-ssh-key'
+ This command is used to export a key in the OpenSSH public key
+ format. It requires the specification of one key by the usual
+ means and exports the latest valid subkey which has an
+ authentication capability to STDOUT or to the file given with
+ option '--output'. That output can directly be added to ssh's
+ 'authorized_key' file.
+
+ By specifying the key to export using a key ID or a fingerprint
+ suffixed with an exclamation mark (!), a specific subkey or the
+ primary key can be exported. This does not even require that the
+ key has the authentication capability flag set.
+
+'--import'
+'--fast-import'
+ Import/merge keys. This adds the given keys to the keyring. The
+ fast version is currently just a synonym.
+
+ There are a few other options which control how this command works.
+ Most notable here is the '--import-options merge-only' option which
+ does not insert new keys but does only the merging of new
+ signatures, user-IDs and subkeys.
+
+'--recv-keys key IDs'
+ Import the keys with the given key IDs from a keyserver. Option
+ '--keyserver' must be used to give the name of this keyserver.
+
+'--refresh-keys'
+ Request updates from a keyserver for keys that already exist on the
+ local keyring. This is useful for updating a key with the latest
+ signatures, user IDs, etc. Calling this with no arguments will
+ refresh the entire keyring. Option '--keyserver' must be used to
+ give the name of the keyserver for all keys that do not have
+ preferred keyservers set (see '--keyserver-options
+ honor-keyserver-url').
+
+'--search-keys names'
+ Search the keyserver for the given names. Multiple names given
+ here will be joined together to create the search string for the
+ keyserver. Option '--keyserver' must be used to give the name of
+ this keyserver. Keyservers that support different search methods
+ allow using the syntax specified in "How to specify a user ID"
+ below. Note that different keyserver types support different
+ search methods. Currently only LDAP supports them all.
+
+'--fetch-keys URIs'
+ Retrieve keys located at the specified URIs. Note that different
+ installations of GnuPG may support different protocols (HTTP, FTP,
+ LDAP, etc.). When using HTTPS the system provided root
+ certificates are used by this command.
+
+'--update-trustdb'
+ Do trust database maintenance. This command iterates over all keys
+ and builds the Web of Trust. This is an interactive command
+ because it may have to ask for the "ownertrust" values for keys.
+ The user has to give an estimation of how far she trusts the owner
+ of the displayed key to correctly certify (sign) other keys. GnuPG
+ only asks for the ownertrust value if it has not yet been assigned
+ to a key. Using the '--edit-key' menu, the assigned value can be
+ changed at any time.
+
+'--check-trustdb'
+ Do trust database maintenance without user interaction. From time
+ to time the trust database must be updated so that expired keys or
+ signatures and the resulting changes in the Web of Trust can be
+ tracked. Normally, GnuPG will calculate when this is required and
+ do it automatically unless '--no-auto-check-trustdb' is set. This
+ command can be used to force a trust database check at any time.
+ The processing is identical to that of '--update-trustdb' but it
+ skips keys with a not yet defined "ownertrust".
+
+ For use with cron jobs, this command can be used together with
+ '--batch' in which case the trust database check is done only if a
+ check is needed. To force a run even in batch mode add the option
+ '--yes'.
+
+'--export-ownertrust'
+ Send the ownertrust values to STDOUT. This is useful for backup
+ purposes as these values are the only ones which can't be
+ re-created from a corrupted trustdb. Example:
+ gpg --export-ownertrust > otrust.txt
+
+'--import-ownertrust'
+ Update the trustdb with the ownertrust values stored in 'files' (or
+ STDIN if not given); existing values will be overwritten. In case
+ of a severely damaged trustdb and if you have a recent backup of
+ the ownertrust values (e.g. in the file 'otrust.txt', you may
+ re-create the trustdb using these commands:
+ cd ~/.gnupg
+ rm trustdb.gpg
+ gpg --import-ownertrust < otrust.txt
+
+'--rebuild-keydb-caches'
+ When updating from version 1.0.6 to 1.0.7 this command should be
+ used to create signature caches in the keyring. It might be handy
+ in other situations too.
+
+'--print-md algo'
+'--print-mds'
+ Print message digest of algorithm ALGO for all given files or
+ STDIN. With the second form (or a deprecated "*" as algo) digests
+ for all available algorithms are printed.
+
+'--gen-random 0|1|2 count'
+ Emit COUNT random bytes of the given quality level 0, 1 or 2. If
+ COUNT is not given or zero, an endless sequence of random bytes
+ will be emitted. If used with '--armor' the output will be base64
+ encoded. PLEASE, don't use this command unless you know what you
+ are doing; it may remove precious entropy from the system!
+
+'--gen-prime mode bits'
+ Use the source, Luke :-). The output format is still subject to
+ change.
+
+'--enarmor'
+'--dearmor'
+ Pack or unpack an arbitrary input into/from an OpenPGP ASCII armor.
+ This is a GnuPG extension to OpenPGP and in general not very
+ useful.
+
+'--tofu-policy auto|good|unknown|bad|ask key...'
+ Set the TOFU policy for all the bindings associated with the
+ specified keys. For more information about the meaning of the
+ policies, *note trust-model-tofu::. The keys may be specified
+ either by their fingerprint (preferred) or their keyid.
+
+
+File: gnupg.info, Node: OpenPGP Key Management, Prev: Operational GPG Commands, Up: GPG Commands
+
+4.1.3 How to manage your keys
+-----------------------------
+
+This section explains the main commands for key management
+
+'--quick-gen-key user-id [algo [usage [expire]]]'
+ This is a simple command to generate a standard key with one user
+ id. In contrast to '--gen-key' the key is generated directly
+ without the need to answer a bunch of prompts. Unless the option
+ '--yes' is given, the key creation will be canceled if the given
+ user id already exists in the key ring.
+
+ If invoked directly on the console without any special options an
+ answer to a "Continue?" style confirmation prompt is required. In
+ case the user id already exists in the key ring a second prompt to
+ force the creation of the key will show up.
+
+ If any of the optional arguments are given, only the primary key is
+ created and no prompts are shown. For a description of these
+ optional arguments see the command '--quick-addkey'. The 'usage'
+ accepts also the value "cert" which can be used to create a
+ certification only primary key; the default is to a create
+ certification and signing key.
+
+ If this command is used with '--batch', '--pinentry-mode' has been
+ set to 'loopback', and one of the passphrase options
+ ('--passphrase', '--passphrase-fd', or 'passphrase-file') is used,
+ the supplied passphrase is used for the new key and the agent does
+ not ask for it. To create a key without any protection
+ '--passphrase ''' may be used.
+
+'--quick-addkey fpr [algo [usage [expire]]]'
+ Directly add a subkey to the key identified by the fingerprint
+ 'fpr'. Without the optional arguments an encryption subkey is
+ added. If any of the arguments are given a more specific subkey is
+ added.
+
+ 'algo' may be any of the supported algorithms or curve names given
+ in the format as used by key listings. To use the default
+ algorithm the string "default" or "-" can be used. Supported
+ algorithms are "rsa", "dsa", "elg", "ed25519", "cv25519", and other
+ ECC curves. For example the string "rsa" adds an RSA key with the
+ default key length; a string "rsa4096" requests that the key length
+ is 4096 bits.
+
+ Depending on the given 'algo' the subkey may either be an
+ encryption subkey or a signing subkey. If an algorithm is capable
+ of signing and encryption and such a subkey is desired, a 'usage'
+ string must be given. This string is either "default" or "-" to
+ keep the default or a comma delimited list of keywords: "sign" for
+ a signing subkey, "auth" for an authentication subkey, and "encr"
+ for an encryption subkey ("encrypt" can be used as alias for
+ "encr"). The valid combinations depend on the algorithm.
+
+ The 'expire' argument can be used to specify an expiration date for
+ the subkey. Several formats are supported; commonly the ISO
+ YYYY-MM-DD format is used. The values "never", "none", or "-" can
+ be used for no expiration date.
+
+'--gen-key'
+ Generate a new key pair using the current default parameters. This
+ is the standard command to create a new key. In addition to the
+ key a revocation certificate is created and stored in the
+ 'openpgp-revocs.d' directory below the GnuPG home directory.
+
+'--full-gen-key'
+ Generate a new key pair with dialogs for all options. This is an
+ extended version of '--gen-key'.
+
+ There is also a feature which allows you to create keys in batch
+ mode. See the manual section "Unattended key generation" on how to
+ use this.
+
+'--gen-revoke name'
+ Generate a revocation certificate for the complete key. To only
+ revoke a subkey or a key signature, use the '--edit' command.
+
+ This command merely creates the revocation certificate so that it
+ can be used to revoke the key if that is ever needed. To actually
+ revoke a key the created revocation certificate needs to be merged
+ with the key to revoke. This is done by importing the revocation
+ certificate using the '--import' command. Then the revoked key
+ needs to be published, which is best done by sending the key to a
+ keyserver (command '--send-key') and by exporting ('--export') it
+ to a file which is then send to frequent communication partners.
+
+'--desig-revoke name'
+ Generate a designated revocation certificate for a key. This
+ allows a user (with the permission of the keyholder) to revoke
+ someone else's key.
+
+'--edit-key'
+ Present a menu which enables you to do most of the key management
+ related tasks. It expects the specification of a key on the
+ command line.
+
+ uid 'n'
+ Toggle selection of user ID or photographic user ID with index
+ 'n'. Use '*' to select all and '0' to deselect all.
+
+ key 'n'
+ Toggle selection of subkey with index 'n' or key ID 'n'. Use
+ '*' to select all and '0' to deselect all.
+
+ sign
+ Make a signature on key of user 'name' If the key is not yet
+ signed by the default user (or the users given with -u), the
+ program displays the information of the key again, together
+ with its fingerprint and asks whether it should be signed.
+ This question is repeated for all users specified with -u.
+
+ lsign
+ Same as "sign" but the signature is marked as non-exportable
+ and will therefore never be used by others. This may be used
+ to make keys valid only in the local environment.
+
+ nrsign
+ Same as "sign" but the signature is marked as non-revocable
+ and can therefore never be revoked.
+
+ tsign
+ Make a trust signature. This is a signature that combines the
+ notions of certification (like a regular signature), and trust
+ (like the "trust" command). It is generally only useful in
+ distinct communities or groups. For more information please
+ read the sections "Trust Signature" and "Regular Expression"
+ in RFC-4880.
+
+ Note that "l" (for local / non-exportable), "nr" (for
+ non-revocable, and "t" (for trust) may be freely mixed and prefixed
+ to "sign" to create a signature of any type desired.
+
+ If the option '--only-sign-text-ids' is specified, then any
+ non-text based user ids (e.g., photo IDs) will not be selected for
+ signing.
+
+ delsig
+ Delete a signature. Note that it is not possible to retract a
+ signature, once it has been send to the public (i.e. to a
+ keyserver). In that case you better use 'revsig'.
+
+ revsig
+ Revoke a signature. For every signature which has been
+ generated by one of the secret keys, GnuPG asks whether a
+ revocation certificate should be generated.
+
+ check
+ Check the signatures on all selected user IDs. With the extra
+ option 'selfsig' only self-signatures are shown.
+
+ adduid
+ Create an additional user ID.
+
+ addphoto
+ Create a photographic user ID. This will prompt for a JPEG
+ file that will be embedded into the user ID. Note that a very
+ large JPEG will make for a very large key. Also note that
+ some programs will display your JPEG unchanged (GnuPG), and
+ some programs will scale it to fit in a dialog box (PGP).
+
+ showphoto
+ Display the selected photographic user ID.
+
+ deluid
+ Delete a user ID or photographic user ID. Note that it is not
+ possible to retract a user id, once it has been send to the
+ public (i.e. to a keyserver). In that case you better use
+ 'revuid'.
+
+ revuid
+ Revoke a user ID or photographic user ID.
+
+ primary
+ Flag the current user id as the primary one, removes the
+ primary user id flag from all other user ids and sets the
+ timestamp of all affected self-signatures one second ahead.
+ Note that setting a photo user ID as primary makes it primary
+ over other photo user IDs, and setting a regular user ID as
+ primary makes it primary over other regular user IDs.
+
+ keyserver
+ Set a preferred keyserver for the specified user ID(s). This
+ allows other users to know where you prefer they get your key
+ from. See '--keyserver-options honor-keyserver-url' for more
+ on how this works. Setting a value of "none" removes an
+ existing preferred keyserver.
+
+ notation
+ Set a name=value notation for the specified user ID(s). See
+ '--cert-notation' for more on how this works. Setting a value
+ of "none" removes all notations, setting a notation prefixed
+ with a minus sign (-) removes that notation, and setting a
+ notation name (without the =value) prefixed with a minus sign
+ removes all notations with that name.
+
+ pref
+ List preferences from the selected user ID. This shows the
+ actual preferences, without including any implied preferences.
+
+ showpref
+ More verbose preferences listing for the selected user ID.
+ This shows the preferences in effect by including the implied
+ preferences of 3DES (cipher), SHA-1 (digest), and Uncompressed
+ (compression) if they are not already included in the
+ preference list. In addition, the preferred keyserver and
+ signature notations (if any) are shown.
+
+ setpref 'string'
+ Set the list of user ID preferences to 'string' for all (or
+ just the selected) user IDs. Calling setpref with no
+ arguments sets the preference list to the default (either
+ built-in or set via '--default-preference-list'), and calling
+ setpref with "none" as the argument sets an empty preference
+ list. Use 'gpg --version' to get a list of available
+ algorithms. Note that while you can change the preferences on
+ an attribute user ID (aka "photo ID"), GnuPG does not select
+ keys via attribute user IDs so these preferences will not be
+ used by GnuPG.
+
+ When setting preferences, you should list the algorithms in
+ the order which you'd like to see them used by someone else
+ when encrypting a message to your key. If you don't include
+ 3DES, it will be automatically added at the end. Note that
+ there are many factors that go into choosing an algorithm (for
+ example, your key may not be the only recipient), and so the
+ remote OpenPGP application being used to send to you may or
+ may not follow your exact chosen order for a given message.
+ It will, however, only choose an algorithm that is present on
+ the preference list of every recipient key. See also the
+ INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS section below.
+
+ addkey
+ Add a subkey to this key.
+
+ addcardkey
+ Generate a subkey on a card and add it to this key.
+
+ keytocard
+ Transfer the selected secret subkey (or the primary key if no
+ subkey has been selected) to a smartcard. The secret key in
+ the keyring will be replaced by a stub if the key could be
+ stored successfully on the card and you use the save command
+ later. Only certain key types may be transferred to the card.
+ A sub menu allows you to select on what card to store the key.
+ Note that it is not possible to get that key back from the
+ card - if the card gets broken your secret key will be lost
+ unless you have a backup somewhere.
+
+ bkuptocard 'file'
+ Restore the given file to a card. This command may be used to
+ restore a backup key (as generated during card initialization)
+ to a new card. In almost all cases this will be the
+ encryption key. You should use this command only with the
+ corresponding public key and make sure that the file given as
+ argument is indeed the backup to restore. You should then
+ select 2 to restore as encryption key. You will first be
+ asked to enter the passphrase of the backup key and then for
+ the Admin PIN of the card.
+
+ delkey
+ Remove a subkey (secondary key). Note that it is not possible
+ to retract a subkey, once it has been send to the public (i.e.
+ to a keyserver). In that case you better use 'revkey'.
+
+ revkey
+ Revoke a subkey.
+
+ expire
+ Change the key or subkey expiration time. If a subkey is
+ selected, the expiration time of this subkey will be changed.
+ With no selection, the key expiration of the primary key is
+ changed.
+
+ trust
+ Change the owner trust value for the key. This updates the
+ trust-db immediately and no save is required.
+
+ disable
+ enable
+ Disable or enable an entire key. A disabled key can not
+ normally be used for encryption.
+
+ addrevoker
+ Add a designated revoker to the key. This takes one optional
+ argument: "sensitive". If a designated revoker is marked as
+ sensitive, it will not be exported by default (see
+ export-options).
+
+ passwd
+ Change the passphrase of the secret key.
+
+ toggle
+ This is dummy command which exists only for backward
+ compatibility.
+
+ clean
+ Compact (by removing all signatures except the selfsig) any
+ user ID that is no longer usable (e.g. revoked, or expired).
+ Then, remove any signatures that are not usable by the trust
+ calculations. Specifically, this removes any signature that
+ does not validate, any signature that is superseded by a later
+ signature, revoked signatures, and signatures issued by keys
+ that are not present on the keyring.
+
+ minimize
+ Make the key as small as possible. This removes all
+ signatures from each user ID except for the most recent
+ self-signature.
+
+ cross-certify
+ Add cross-certification signatures to signing subkeys that may
+ not currently have them. Cross-certification signatures
+ protect against a subtle attack against signing subkeys. See
+ '--require-cross-certification'. All new keys generated have
+ this signature by default, so this option is only useful to
+ bring older keys up to date.
+
+ save
+ Save all changes to the key rings and quit.
+
+ quit
+ Quit the program without updating the key rings.
+
+ The listing shows you the key with its secondary keys and all user
+ ids. The primary user id is indicated by a dot, and selected keys
+ or user ids are indicated by an asterisk. The trust value is
+ displayed with the primary key: the first is the assigned owner
+ trust and the second is the calculated trust value. Letters are
+ used for the values:
+
+ -
+ No ownertrust assigned / not yet calculated.
+
+ e
+ Trust calculation has failed; probably due to an expired key.
+
+ q
+ Not enough information for calculation.
+
+ n
+ Never trust this key.
+
+ m
+ Marginally trusted.
+
+ f
+ Fully trusted.
+
+ u
+ Ultimately trusted.
+
+'--sign-key name'
+ Signs a public key with your secret key. This is a shortcut
+ version of the subcommand "sign" from '--edit'.
+
+'--lsign-key name'
+ Signs a public key with your secret key but marks it as
+ non-exportable. This is a shortcut version of the subcommand
+ "lsign" from '--edit-key'.
+
+'--quick-sign-key fpr [names]'
+'--quick-lsign-key fpr [names]'
+ Directly sign a key from the passphrase without any further user
+ interaction. The 'fpr' must be the verified primary fingerprint of
+ a key in the local keyring. If no 'names' are given, all useful
+ user ids are signed; with given ['names'] only useful user ids
+ matching one of theses names are signed. By default, or if a name
+ is prefixed with a '*', a case insensitive substring match is used.
+ If a name is prefixed with a '=' a case sensitive exact match is
+ done.
+
+ The command '--quick-lsign-key' marks the signatures as
+ non-exportable. If such a non-exportable signature already exists
+ the '--quick-sign-key' turns it into a exportable signature.
+
+ This command uses reasonable defaults and thus does not provide the
+ full flexibility of the "sign" subcommand from '--edit-key'. Its
+ intended use is to help unattended key signing by utilizing a list
+ of verified fingerprints.
+
+'--quick-adduid USER-ID NEW-USER-ID'
+ This command adds a new user id to an existing key. In contrast to
+ the interactive sub-command 'adduid' of '--edit-key' the
+ NEW-USER-ID is added verbatim with only leading and trailing white
+ space removed, it is expected to be UTF-8 encoded, and no checks on
+ its form are applied.
+
++'--quick-revuid USER-ID USER-ID-TO-REVOKE'
++ This command revokes a User ID on an existing key. It cannot be
++ used to revoke the last User ID on key (some non-revoked User ID
++ must remain), with revocation reason "User ID is no longer valid".
++ If you want to specify a different revocation reason, or to supply
++ supplementary revocation text, you should use the interactive
++ sub-command 'revuid' of '--edit-key'.
++
+'--passwd USER_ID'
+ Change the passphrase of the secret key belonging to the
+ certificate specified as USER_ID. This is a shortcut for the
+ sub-command 'passwd' of the edit key menu.
+
+
+File: gnupg.info, Node: GPG Options, Next: GPG Configuration, Prev: GPG Commands, Up: Invoking GPG
+
+4.2 Option Summary
+==================
+
+'gpg' features a bunch of options to control the exact behaviour and to
+change the default configuration.
+
+* Menu:
+
+* GPG Configuration Options:: How to change the configuration.
+* GPG Key related Options:: Key related options.
+* GPG Input and Output:: Input and Output.
+* OpenPGP Options:: OpenPGP protocol specific options.
+* Compliance Options:: Compliance options.
+* GPG Esoteric Options:: Doing things one usually don't want to do.
+* Deprecated Options:: Deprecated options.
+
+ Long options can be put in an options file (default
+"~/.gnupg/gpg.conf"). Short option names will not work - for example,
+"armor" is a valid option for the options file, while "a" is not. Do
+not write the 2 dashes, but simply the name of the option and any
+required arguments. Lines with a hash ('#') as the first
+non-white-space character are ignored. Commands may be put in this file
+too, but that is not generally useful as the command will execute
+automatically with every execution of gpg.
+
+ Please remember that option parsing stops as soon as a non-option is
+encountered, you can explicitly stop parsing by using the special option
+'--'.
+
+
+File: gnupg.info, Node: GPG Configuration Options, Next: GPG Key related Options, Up: GPG Options
+
+4.2.1 How to change the configuration
+-------------------------------------
+
+These options are used to change the configuration and are usually found
+in the option file.
+
+'--default-key NAME'
+ Use NAME as the default key to sign with. If this option is not
+ used, the default key is the first key found in the secret keyring.
+ Note that '-u' or '--local-user' overrides this option. This
+ option may be given multiple times. In this case, the last key for
+ which a secret key is available is used. If there is no secret key
+ available for any of the specified values, GnuPG will not emit an
+ error message but continue as if this option wasn't given.
+
+'--default-recipient NAME'
+ Use NAME as default recipient if option '--recipient' is not used
+ and don't ask if this is a valid one. NAME must be non-empty.
+
+'--default-recipient-self'
+ Use the default key as default recipient if option '--recipient' is
+ not used and don't ask if this is a valid one. The default key is
+ the first one from the secret keyring or the one set with
+ '--default-key'.
+
+'--no-default-recipient'
+ Reset '--default-recipient' and '--default-recipient-self'.
+
+'-v, --verbose'
+ Give more information during processing. If used twice, the input
+ data is listed in detail.
+
+'--no-verbose'
+ Reset verbose level to 0.
+
+'-q, --quiet'
+ Try to be as quiet as possible.
+
+'--batch'
+'--no-batch'
+ Use batch mode. Never ask, do not allow interactive commands.
+ '--no-batch' disables this option. Note that even with a filename
+ given on the command line, gpg might still need to read from STDIN
+ (in particular if gpg figures that the input is a detached
+ signature and no data file has been specified). Thus if you do not
+ want to feed data via STDIN, you should connect STDIN to
+ '/dev/null'.
+
+'--no-tty'
+ Make sure that the TTY (terminal) is never used for any output.
+ This option is needed in some cases because GnuPG sometimes prints
+ warnings to the TTY even if '--batch' is used.
+
+'--yes'
+ Assume "yes" on most questions.
+
+'--no'
+ Assume "no" on most questions.
+
+'--list-options parameters'
+ This is a space or comma delimited string that gives options used
+ when listing keys and signatures (that is, '--list-keys',
+ '--list-sigs', '--list-public-keys', '--list-secret-keys', and the
+ '--edit-key' functions). Options can be prepended with a 'no-'
+ (after the two dashes) to give the opposite meaning. The options
+ are:
+
+ show-photos
+ Causes '--list-keys', '--list-sigs', '--list-public-keys', and
+ '--list-secret-keys' to display any photo IDs attached to the
+ key. Defaults to no. See also '--photo-viewer'. Does not
+ work with '--with-colons': see '--attribute-fd' for the
+ appropriate way to get photo data for scripts and other
+ frontends.
+
+ show-usage
+ Show usage information for keys and subkeys in the standard
+ key listing. This is a list of letters indicating the allowed
+ usage for a key ('E'=encryption, 'S'=signing,
+ 'C'=certification, 'A'=authentication). Defaults to yes.
+
+ show-policy-urls
+ Show policy URLs in the '--list-sigs' or '--check-sigs'
+ listings. Defaults to no.
+
+ show-notations
+ show-std-notations
+ show-user-notations
+ Show all, IETF standard, or user-defined signature notations
+ in the '--list-sigs' or '--check-sigs' listings. Defaults to
+ no.
+
+ show-keyserver-urls
+ Show any preferred keyserver URL in the '--list-sigs' or
+ '--check-sigs' listings. Defaults to no.
+
+ show-uid-validity
+ Display the calculated validity of user IDs during key
+ listings. Defaults to yes.
+
+ show-unusable-uids
+ Show revoked and expired user IDs in key listings. Defaults
+ to no.
+
+ show-unusable-subkeys
+ Show revoked and expired subkeys in key listings. Defaults to
+ no.
+
+ show-keyring
+ Display the keyring name at the head of key listings to show
+ which keyring a given key resides on. Defaults to no.
+
+ show-sig-expire
+ Show signature expiration dates (if any) during '--list-sigs'
+ or '--check-sigs' listings. Defaults to no.
+
+ show-sig-subpackets
+ Include signature subpackets in the key listing. This option
+ can take an optional argument list of the subpackets to list.
+ If no argument is passed, list all subpackets. Defaults to
+ no. This option is only meaningful when using '--with-colons'
+ along with '--list-sigs' or '--check-sigs'.
+
+'--verify-options parameters'
+ This is a space or comma delimited string that gives options used
+ when verifying signatures. Options can be prepended with a 'no-'
+ to give the opposite meaning. The options are:
+
+ show-photos
+ Display any photo IDs present on the key that issued the
+ signature. Defaults to no. See also '--photo-viewer'.
+
+ show-policy-urls
+ Show policy URLs in the signature being verified. Defaults to
+ yes.
+
+ show-notations
+ show-std-notations
+ show-user-notations
+ Show all, IETF standard, or user-defined signature notations
+ in the signature being verified. Defaults to IETF standard.
+
+ show-keyserver-urls
+ Show any preferred keyserver URL in the signature being
+ verified. Defaults to yes.
+
+ show-uid-validity
+ Display the calculated validity of the user IDs on the key
+ that issued the signature. Defaults to yes.
+
+ show-unusable-uids
+ Show revoked and expired user IDs during signature
+ verification. Defaults to no.
+
+ show-primary-uid-only
+ Show only the primary user ID during signature verification.
+ That is all the AKA lines as well as photo Ids are not shown
+ with the signature verification status.
+
+ pka-lookups
+ Enable PKA lookups to verify sender addresses. Note that PKA
+ is based on DNS, and so enabling this option may disclose
+ information on when and what signatures are verified or to
+ whom data is encrypted. This is similar to the "web bug"
+ described for the '--auto-key-retrieve' option.
+
+ pka-trust-increase
+ Raise the trust in a signature to full if the signature passes
+ PKA validation. This option is only meaningful if pka-lookups
+ is set.
+
+'--enable-large-rsa'
+'--disable-large-rsa'
+ With -gen-key and -batch, enable the creation of RSA secret keys as
+ large as 8192 bit. Note: 8192 bit is more than is generally
+ recommended. These large keys don't significantly improve
+ security, but they are more expensive to use, and their signatures
+ and certifications are larger. This option is only available if
+ the binary was build with large-secmem support.
+
+'--enable-dsa2'
+'--disable-dsa2'
+ Enable hash truncation for all DSA keys even for old DSA Keys up to
+ 1024 bit. This is also the default with '--openpgp'. Note that
+ older versions of GnuPG also required this flag to allow the
+ generation of DSA larger than 1024 bit.
+
+'--photo-viewer string'
+ This is the command line that should be run to view a photo ID.
+ "%i" will be expanded to a filename containing the photo. "%I"
+ does the same, except the file will not be deleted once the viewer
+ exits. Other flags are "%k" for the key ID, "%K" for the long key
+ ID, "%f" for the key fingerprint, "%t" for the extension of the
+ image type (e.g. "jpg"), "%T" for the MIME type of the image (e.g.
+ "image/jpeg"), "%v" for the single-character calculated validity of
+ the image being viewed (e.g. "f"), "%V" for the calculated
+ validity as a string (e.g. "full"), "%U" for a base32 encoded hash
+ of the user ID, and "%%" for an actual percent sign. If neither %i
+ or %I are present, then the photo will be supplied to the viewer on
+ standard input.
+
+ The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k'
+ STDIN". Note that if your image viewer program is not secure, then
+ executing it from GnuPG does not make it secure.
+
+'--exec-path string'
+ Sets a list of directories to search for photo viewers and
+ keyserver helpers. If not provided, keyserver helpers use the
+ compiled-in default directory, and photo viewers use the 'PATH'
+ environment variable. Note, that on W32 system this value is
+ ignored when searching for keyserver helpers.
+
+'--keyring file'
+ Add 'file' to the current list of keyrings. If 'file' begins with
+ a tilde and a slash, these are replaced by the $HOME directory. If
+ the filename does not contain a slash, it is assumed to be in the
+ GnuPG home directory ("~/.gnupg" if '--homedir' or $GNUPGHOME is
+ not used).
+
+ Note that this adds a keyring to the current list. If the intent
+ is to use the specified keyring alone, use '--keyring' along with
+ '--no-default-keyring'.
+
++ If the the option '--no-keyring' has been used no keyrings will be
++ used at all.
++
+'--secret-keyring file'
+ This is an obsolete option and ignored. All secret keys are stored
+ in the 'private-keys-v1.d' directory below the GnuPG home
+ directory.
+
+'--primary-keyring file'
+ Designate 'file' as the primary public keyring. This means that
+ newly imported keys (via '--import' or keyserver '--recv-from')
+ will go to this keyring.
+
+'--trustdb-name file'
+ Use 'file' instead of the default trustdb. If 'file' begins with a
+ tilde and a slash, these are replaced by the $HOME directory. If
+ the filename does not contain a slash, it is assumed to be in the
+ GnuPG home directory ('~/.gnupg' if '--homedir' or $GNUPGHOME is
+ not used).
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'--display-charset name'
+ Set the name of the native character set. This is used to convert
+ some informational strings like user IDs to the proper UTF-8
+ encoding. Note that this has nothing to do with the character set
+ of data to be encrypted or signed; GnuPG does not recode
+ user-supplied data. If this option is not used, the default
+ character set is determined from the current locale. A verbosity
+ level of 3 shows the chosen set. Valid values for 'name' are:
+
+ iso-8859-1
+ This is the Latin 1 set.
+
+ iso-8859-2
+ The Latin 2 set.
+
+ iso-8859-15
+ This is currently an alias for the Latin 1 set.
+
+ koi8-r
+ The usual Russian set (rfc1489).
+
+ utf-8
+ Bypass all translations and assume that the OS uses native
+ UTF-8 encoding.
+
+'--utf8-strings'
+'--no-utf8-strings'
+ Assume that command line arguments are given as UTF8 strings. The
+ default ('--no-utf8-strings') is to assume that arguments are
+ encoded in the character set as specified by '--display-charset'.
+ These options affect all following arguments. Both options may be
+ used multiple times.
+
+'--options file'
+ Read options from 'file' and do not try to read them from the
+ default options file in the homedir (see '--homedir'). This option
+ is ignored if used in an options file.
+
+'--no-options'
+ Shortcut for '--options /dev/null'. This option is detected before
+ an attempt to open an option file. Using this option will also
+ prevent the creation of a '~/.gnupg' homedir.
+
+'-z n'
+'--compress-level n'
+'--bzip2-compress-level n'
+ Set compression level to 'n' for the ZIP and ZLIB compression
+ algorithms. The default is to use the default compression level of
+ zlib (normally 6). '--bzip2-compress-level' sets the compression
+ level for the BZIP2 compression algorithm (defaulting to 6 as
+ well). This is a different option from '--compress-level' since
+ BZIP2 uses a significant amount of memory for each additional
+ compression level. '-z' sets both. A value of 0 for 'n' disables
+ compression.
+
+'--bzip2-decompress-lowmem'
+ Use a different decompression method for BZIP2 compressed files.
+ This alternate method uses a bit more than half the memory, but
+ also runs at half the speed. This is useful under extreme low
+ memory circumstances when the file was originally compressed at a
+ high '--bzip2-compress-level'.
+
+'--mangle-dos-filenames'
+'--no-mangle-dos-filenames'
+ Older version of Windows cannot handle filenames with more than one
+ dot. '--mangle-dos-filenames' causes GnuPG to replace (rather than
+ add to) the extension of an output filename to avoid this problem.
+ This option is off by default and has no effect on non-Windows
+ platforms.
+
+'--ask-cert-level'
+'--no-ask-cert-level'
+ When making a key signature, prompt for a certification level. If
+ this option is not specified, the certification level used is set
+ via '--default-cert-level'. See '--default-cert-level' for
+ information on the specific levels and how they are used.
+ '--no-ask-cert-level' disables this option. This option defaults
+ to no.
+
+'--default-cert-level n'
+ The default to use for the check level when signing a key.
+
+ 0 means you make no particular claim as to how carefully you
+ verified the key.
+
+ 1 means you believe the key is owned by the person who claims to
+ own it but you could not, or did not verify the key at all. This
+ is useful for a "persona" verification, where you sign the key of a
+ pseudonymous user.
+
+ 2 means you did casual verification of the key. For example, this
+ could mean that you verified the key fingerprint and checked the
+ user ID on the key against a photo ID.
+
+ 3 means you did extensive verification of the key. For example,
+ this could mean that you verified the key fingerprint with the
+ owner of the key in person, and that you checked, by means of a
+ hard to forge document with a photo ID (such as a passport) that
+ the name of the key owner matches the name in the user ID on the
+ key, and finally that you verified (by exchange of email) that the
+ email address on the key belongs to the key owner.
+
+ Note that the examples given above for levels 2 and 3 are just
+ that: examples. In the end, it is up to you to decide just what
+ "casual" and "extensive" mean to you.
+
+ This option defaults to 0 (no particular claim).
+
+'--min-cert-level'
+ When building the trust database, treat any signatures with a
+ certification level below this as invalid. Defaults to 2, which
+ disregards level 1 signatures. Note that level 0 "no particular
+ claim" signatures are always accepted.
+
+'--trusted-key long key ID'
+ Assume that the specified key (which must be given as a full 8 byte
+ key ID) is as trustworthy as one of your own secret keys. This
+ option is useful if you don't want to keep your secret keys (or one
+ of them) online but still want to be able to check the validity of
+ a given recipient's or signator's key.
+
+'--trust-model pgp|classic|tofu|tofu+pgp|direct|always|auto'
+ Set what trust model GnuPG should follow. The models are:
+
+ pgp
+ This is the Web of Trust combined with trust signatures as
+ used in PGP 5.x and later. This is the default trust model
+ when creating a new trust database.
+
+ classic
+ This is the standard Web of Trust as introduced by PGP 2.
+
+ tofu
+ TOFU stands for Trust On First Use. In this trust model, the
+ first time a key is seen, it is memorized. If later another
+ key is seen with a user id with the same email address, a
+ warning is displayed indicating that there is a conflict and
+ that the key might be a forgery and an attempt at a
+ man-in-the-middle attack.
+
+ Because a potential attacker is able to control the email
+ address and thereby circumvent the conflict detection
+ algorithm by using an email address that is similar in
+ appearance to a trusted email address, whenever a message is
+ verified, statistics about the number of messages signed with
+ the key are shown. In this way, a user can easily identify
+ attacks using fake keys for regular correspondents.
+
+ When compared with the Web of Trust, TOFU offers significantly
+ weaker security guarantees. In particular, TOFU only helps
+ ensure consistency (that is, that the binding between a key
+ and email address doesn't change). A major advantage of TOFU
+ is that it requires little maintenance to use correctly. To
+ use the web of trust properly, you need to actively sign keys
+ and mark users as trusted introducers. This is a
+ time-consuming process and anecdotal evidence suggests that
+ even security-conscious users rarely take the time to do this
+ thoroughly and instead rely on an ad-hoc TOFU process.
+
+ In the TOFU model, policies are associated with bindings
+ between keys and email addresses (which are extracted from
+ user ids and normalized). There are five policies, which can
+ be set manually using the '--tofu-policy' option. The default
+ policy can be set using the '--tofu-default-policy' policy.
+
+ The TOFU policies are: 'auto', 'good', 'unknown', 'bad' and
+ 'ask'. The 'auto' policy is used by default (unless
+ overridden by '--tofu-default-policy') and marks a binding as
+ marginally trusted. The 'good', 'unknown' and 'bad' policies
+ mark a binding as fully trusted, as having unknown trust or as
+ having trust never, respectively. The 'unknown' policy is
+ useful for just using TOFU to detect conflicts, but to never
+ assign positive trust to a binding. The final policy, 'ask'
+ prompts the user to indicate the binding's trust. If batch
+ mode is enabled (or input is inappropriate in the context),
+ then the user is not prompted and the 'undefined' trust level
+ is returned.
+
+ tofu+pgp
+ This trust model combines TOFU with the Web of Trust. This is
+ done by computing the trust level for each model and then
+ taking the maximum trust level where the trust levels are
+ ordered as follows: 'unknown < undefined < marginal < fully <
+ ultimate < expired < never'.
+
+ By setting '--tofu-default-policy=unknown', this model can be
+ used to implement the web of trust with TOFU's conflict
+ detection algorithm, but without its assignment of positive
+ trust values, which some security-conscious users don't like.
+
+ direct
+ Key validity is set directly by the user and not calculated
+ via the Web of Trust.
+
+ always
+ Skip key validation and assume that used keys are always fully
+ valid. You generally won't use this unless you are using some
+ external validation scheme. This option also suppresses the
+ "[uncertain]" tag printed with signature checks when there is
+ no evidence that the user ID is bound to the key. Note that
+ this trust model still does not allow the use of expired,
+ revoked, or disabled keys.
+
+ auto
+ Select the trust model depending on whatever the internal
+ trust database says. This is the default model if such a
+ database already exists.
+
+'--auto-key-locate parameters'
+'--no-auto-key-locate'
+ GnuPG can automatically locate and retrieve keys as needed using
+ this option. This happens when encrypting to an email address (in
+ the "user at example.com" form), and there are no user at example.com
+ keys on the local keyring. This option takes any number of the
+ following mechanisms, in the order they are to be tried:
+
+ cert
+ Locate a key using DNS CERT, as specified in rfc4398.
+
+ pka
+ Locate a key using DNS PKA.
+
+ dane
+ Locate a key using DANE, as specified in
+ draft-ietf-dane-openpgpkey-05.txt.
+
+ wkd
+ Locate a key using the Web Key Directory protocol. This is an
+ experimental method and semantics may change.
+
+ ldap
+ Using DNS Service Discovery, check the domain in question for
+ any LDAP keyservers to use. If this fails, attempt to locate
+ the key using the PGP Universal method of checking
+ 'ldap://keys.(thedomain)'.
+
+ keyserver
+ Locate a key using whatever keyserver is defined using the
+ '--keyserver' option.
+
+ keyserver-URL
+ In addition, a keyserver URL as used in the '--keyserver'
+ option may be used here to query that particular keyserver.
+
+ local
+ Locate the key using the local keyrings. This mechanism
+ allows to select the order a local key lookup is done. Thus
+ using '--auto-key-locate local' is identical to
+ '--no-auto-key-locate'.
+
+ nodefault
+ This flag disables the standard local key lookup, done before
+ any of the mechanisms defined by the '--auto-key-locate' are
+ tried. The position of this mechanism in the list does not
+ matter. It is not required if 'local' is also used.
+
+ clear
+ Clear all defined mechanisms. This is useful to override
+ mechanisms given in a config file.
+
+'--auto-key-retrieve'
+'--no-auto-key-retrieve'
+ This option enables the automatic retrieving of keys from a
+ keyserver when verifying signatures made by keys that are not on
+ the local keyring.
+
+ If the method "wkd" is included in the list of methods given to
+ 'auto-key-locate', the Signer's User ID is part of the signature,
+ and the option '--disable-signer-uid' is not used, the "wkd" method
+ may also be used to retrieve a key.
+
+ Note that this option makes a "web bug" like behavior possible.
+ Keyserver or Web Key Directory operators can see which keys you
+ request, so by sending you a message signed by a brand new key
+ (which you naturally will not have on your local keyring), the
+ operator can tell both your IP address and the time when you
+ verified the signature.
+
+'--keyid-format none|short|0xshort|long|0xlong'
+ Select how to display key IDs. "none" does not show the key ID at
+ all but shows the fingerprint in a separate line. "short" is the
+ traditional 8-character key ID. "long" is the more accurate (but
+ less convenient) 16-character key ID. Add an "0x" to either to
+ include an "0x" at the beginning of the key ID, as in 0x99242560.
+ Note that this option is ignored if the option '--with-colons' is
+ used.
+
+'--keyserver name'
+ This option is deprecated - please use the '--keyserver' in
+ 'dirmngr.conf' instead.
+
+ Use 'name' as your keyserver. This is the server that
+ '--recv-keys', '--send-keys', and '--search-keys' will communicate
+ with to receive keys from, send keys to, and search for keys on.
+ The format of the 'name' is a URI:
+ 'scheme:[//]keyservername[:port]' The scheme is the type of
+ keyserver: "hkp" for the HTTP (or compatible) keyservers, "ldap"
+ for the LDAP keyservers, or "mailto" for the Graff email keyserver.
+ Note that your particular installation of GnuPG may have other
+ keyserver types available as well. Keyserver schemes are
+ case-insensitive. After the keyserver name, optional keyserver
+ configuration options may be provided. These are the same as the
+ global '--keyserver-options' from below, but apply only to this
+ particular keyserver.
+
+ Most keyservers synchronize with each other, so there is generally
+ no need to send keys to more than one server. The keyserver
+ 'hkp://keys.gnupg.net' uses round robin DNS to give a different
+ keyserver each time you use it.
+
+'--keyserver-options name=value'
+ This is a space or comma delimited string that gives options for
+ the keyserver. Options can be prefixed with a 'no-' to give the
+ opposite meaning. Valid import-options or export-options may be
+ used here as well to apply to importing ('--recv-key') or exporting
+ ('--send-key') a key from a keyserver. While not all options are
+ available for all keyserver types, some common options are:
+
+ include-revoked
+ When searching for a key with '--search-keys', include keys
+ that are marked on the keyserver as revoked. Note that not
+ all keyservers differentiate between revoked and unrevoked
+ keys, and for such keyservers this option is meaningless.
+ Note also that most keyservers do not have cryptographic
+ verification of key revocations, and so turning this option
+ off may result in skipping keys that are incorrectly marked as
+ revoked.
+
+ include-disabled
+ When searching for a key with '--search-keys', include keys
+ that are marked on the keyserver as disabled. Note that this
+ option is not used with HKP keyservers.
+
+ auto-key-retrieve
+ This is the same as the option 'auto-key-retrieve'.
+
+ honor-keyserver-url
+ When using '--refresh-keys', if the key in question has a
+ preferred keyserver URL, then use that preferred keyserver to
+ refresh the key from. In addition, if auto-key-retrieve is
+ set, and the signature being verified has a preferred
+ keyserver URL, then use that preferred keyserver to fetch the
+ key from. Note that this option introduces a "web bug": The
+ creator of the key can see when the keys is refreshed. Thus
+ this option is not enabled by default.
+
+ honor-pka-record
+ If '--auto-key-retrieve' is used, and the signature being
+ verified has a PKA record, then use the PKA information to
+ fetch the key. Defaults to "yes".
+
+ include-subkeys
+ When receiving a key, include subkeys as potential targets.
+ Note that this option is not used with HKP keyservers, as they
+ do not support retrieving keys by subkey id.
+
+ timeout
+ Tell the keyserver helper program how long (in seconds) to try
+ and perform a keyserver action before giving up. Note that
+ performing multiple actions at the same time uses this timeout
+ value per action. For example, when retrieving multiple keys
+ via '--recv-keys', the timeout applies separately to each key
+ retrieval, and not to the '--recv-keys' command as a whole.
+ Defaults to 30 seconds.
+
+ http-proxy='value'
+ This options is deprecated. Set the proxy to use for HTTP and
+ HKP keyservers. This overrides any proxy defined in
+ 'dirmngr.conf'.
+
+ verbose
+ This option has no more function since GnuPG 2.1. Use the
+ 'dirmngr' configuration options instead.
+
+ debug
+ This option has no more function since GnuPG 2.1. Use the
+ 'dirmngr' configuration options instead.
+
+ check-cert
+ This option has no more function since GnuPG 2.1. Use the
+ 'dirmngr' configuration options instead.
+
+ ca-cert-file
+ This option has no more function since GnuPG 2.1. Use the
+ 'dirmngr' configuration options instead.
+
+'--completes-needed n'
+ Number of completely trusted users to introduce a new key signer
+ (defaults to 1).
+
+'--marginals-needed n'
+ Number of marginally trusted users to introduce a new key signer
+ (defaults to 3)
+
+'--tofu-default-policy auto|good|unknown|bad|ask'
+ The default TOFU policy (defaults to 'auto'). For more information
+ about the meaning of this option, *Note trust-model-tofu::.
+
+'--tofu-db-format auto|split|flat'
+ The format for the TOFU DB.
+
+ The split file format splits the data across many DBs under the
+ 'tofu.d' directory (one per email address and one per key). This
+ makes it easier to automatically synchronize the data using a tool
+ such as Unison (<https://www.cis.upenn.edu/~bcpierce/unison/>),
+ since the individual files change rarely.
+
+ The flat file format keeps all of the data in the single file
+ 'tofu.db'. This format results in better performance.
+
+ If set to auto (which is the default), GnuPG will first check for
+ the existence of 'tofu.d' and 'tofu.db'. If one of these exists,
+ the corresponding format is used. If neither or both of these
+ exist, then GnuPG defaults to the 'split' format. In the latter
+ case, a warning is emitted.
+
+'--max-cert-depth n'
+ Maximum depth of a certification chain (default is 5).
+
+'--no-sig-cache'
+ Do not cache the verification status of key signatures. Caching
+ gives a much better performance in key listings. However, if you
+ suspect that your public keyring is not save against write
+ modifications, you can use this option to disable the caching. It
+ probably does not make sense to disable it because all kind of
+ damage can be done if someone else has write access to your public
+ keyring.
+
+'--auto-check-trustdb'
+'--no-auto-check-trustdb'
+ If GnuPG feels that its information about the Web of Trust has to
+ be updated, it automatically runs the '--check-trustdb' command
+ internally. This may be a time consuming process.
+ '--no-auto-check-trustdb' disables this option.
+
+'--use-agent'
+'--no-use-agent'
+ This is dummy option. 'gpg' always requires the agent.
+
+'--gpg-agent-info'
+ This is dummy option. It has no effect when used with 'gpg'.
+
+'--agent-program FILE'
+ Specify an agent program to be used for secret key operations. The
+ default value is determined by running 'gpgconf' with the option
+ '--list-dirs'. Note that the pipe symbol ('|') is used for a
+ regression test suite hack and may thus not be used in the file
+ name.
+
+'--dirmngr-program FILE'
+ Specify a dirmngr program to be used for keyserver access. The
+ default value is '/usr/local/bin/dirmngr'.
+
+'--no-autostart'
+ Do not start the gpg-agent or the dirmngr if it has not yet been
+ started and its service is required. This option is mostly useful
+ on machines where the connection to gpg-agent has been redirected
+ to another machines. If dirmngr is required on the remote machine,
+ it may be started manually using 'gpgconf --launch dirmngr'.
+
+'--lock-once'
+ Lock the databases the first time a lock is requested and do not
+ release the lock until the process terminates.
+
+'--lock-multiple'
+ Release the locks every time a lock is no longer needed. Use this
+ to override a previous '--lock-once' from a config file.
+
+'--lock-never'
+ Disable locking entirely. This option should be used only in very
+ special environments, where it can be assured that only one process
+ is accessing those files. A bootable floppy with a stand-alone
+ encryption system will probably use this. Improper usage of this
+ option may lead to data and key corruption.
+
+'--exit-on-status-write-error'
+ This option will cause write errors on the status FD to immediately
+ terminate the process. That should in fact be the default but it
+ never worked this way and thus we need an option to enable this, so
+ that the change won't break applications which close their end of a
+ status fd connected pipe too early. Using this option along with
+ '--enable-progress-filter' may be used to cleanly cancel long
+ running gpg operations.
+
+'--limit-card-insert-tries n'
+ With 'n' greater than 0 the number of prompts asking to insert a
+ smartcard gets limited to N-1. Thus with a value of 1 gpg won't at
+ all ask to insert a card if none has been inserted at startup.
+ This option is useful in the configuration file in case an
+ application does not know about the smartcard support and waits ad
+ infinitum for an inserted card.
+
+'--no-random-seed-file'
+ GnuPG uses a file to store its internal random pool over
+ invocations. This makes random generation faster; however
+ sometimes write operations are not desired. This option can be
+ used to achieve that with the cost of slower random generation.
+
+'--no-greeting'
+ Suppress the initial copyright message.
+
+'--no-secmem-warning'
+ Suppress the warning about "using insecure memory".
+
+'--no-permission-warning'
+ Suppress the warning about unsafe file and home directory
+ ('--homedir') permissions. Note that the permission checks that
+ GnuPG performs are not intended to be authoritative, but rather
+ they simply warn about certain common permission problems. Do not
+ assume that the lack of a warning means that your system is secure.
+
+ Note that the warning for unsafe '--homedir' permissions cannot be
+ suppressed in the gpg.conf file, as this would allow an attacker to
+ place an unsafe gpg.conf file in place, and use this file to
+ suppress warnings about itself. The '--homedir' permissions
+ warning may only be suppressed on the command line.
+
+'--no-mdc-warning'
+ Suppress the warning about missing MDC integrity protection.
+
+'--require-secmem'
+'--no-require-secmem'
+ Refuse to run if GnuPG cannot get secure memory. Defaults to no
+ (i.e. run, but give a warning).
+
+'--require-cross-certification'
+'--no-require-cross-certification'
+ When verifying a signature made from a subkey, ensure that the
+ cross certification "back signature" on the subkey is present and
+ valid. This protects against a subtle attack against subkeys that
+ can sign. Defaults to '--require-cross-certification' for 'gpg'.
+
+'--expert'
+'--no-expert'
+ Allow the user to do certain nonsensical or "silly" things like
+ signing an expired or revoked key, or certain potentially
+ incompatible things like generating unusual key types. This also
+ disables certain warning messages about potentially incompatible
+ actions. As the name implies, this option is for experts only. If
+ you don't fully understand the implications of what it allows you
+ to do, leave this off. '--no-expert' disables this option.
+
+
+File: gnupg.info, Node: GPG Key related Options, Next: GPG Input and Output, Prev: GPG Configuration Options, Up: GPG Options
+
+4.2.2 Key related options
+-------------------------
+
+'--recipient NAME'
+'-r'
+ Encrypt for user id NAME. If this option or '--hidden-recipient'
+ is not specified, GnuPG asks for the user-id unless
+ '--default-recipient' is given.
+
+'--hidden-recipient NAME'
+'-R'
+ Encrypt for user ID NAME, but hide the key ID of this user's key.
+ This option helps to hide the receiver of the message and is a
+ limited countermeasure against traffic analysis. If this option or
+ '--recipient' is not specified, GnuPG asks for the user ID unless
+ '--default-recipient' is given.
+
++'--recipient-file FILE'
++'-f'
++ This option is similar to '--recipient' except that it encrypts to
++ a key stored in the given file. FILE must be the name of a file
++ containing exactly one key. 'gpg' assumes that the key in this
++ file is fully valid.
++
++'--hidden-recipient-file FILE'
++'-F'
++ This option is similar to '--hidden-recipient' except that it
++ encrypts to a key stored in the given file. FILE must be the name
++ of a file containing exactly one key. 'gpg' assumes that the key
++ in this file is fully valid.
++
+'--encrypt-to name'
+ Same as '--recipient' but this one is intended for use in the
+ options file and may be used with your own user-id as an
+ "encrypt-to-self". These keys are only used when there are other
+ recipients given either by use of '--recipient' or by the asked
+ user id. No trust checking is performed for these user ids and
+ even disabled keys can be used.
+
+'--hidden-encrypt-to name'
+ Same as '--hidden-recipient' but this one is intended for use in
+ the options file and may be used with your own user-id as a hidden
+ "encrypt-to-self". These keys are only used when there are other
+ recipients given either by use of '--recipient' or by the asked
+ user id. No trust checking is performed for these user ids and
+ even disabled keys can be used.
+
- '--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'.
+
++ import-show
++ Show a listing of the key as imported right before it is
++ stored. This can be combined with the option '--dry-run' to
++ only look at keys.
++
++ import-export
++ Run the entire import code but instead of storing the key to
++ the local keyring write it to the output. The export options
++ 'export-pka' and 'export-dane' affect the output. This option
++ can be used to remove all invalid parts from a key without the
++ need to store it.
++
+ merge-only
+ During import, allow key updates to existing keys, but do not
+ allow any new keys to be imported. Defaults to no.
+
+ import-clean
+ After import, compact (remove all signatures except the
+ self-signature) any user IDs from the new key that are not
+ usable. Then, remove any signatures from the new key that are
+ not usable. This includes signatures that were issued by keys
+ that are not present on the keyring. This option is the same
+ as running the '--edit-key' command "clean" after import.
+ Defaults to no.
+
+ import-minimal
+ Import the smallest key possible. This removes all signatures
+ except the most recent self-signature on each user ID. This
+ option is the same as running the '--edit-key' command
+ "minimize" after import. Defaults to no.
+
++'--import-filter NAME=EXPR'
++'--export-filter NAME=EXPR'
++ These options define an import/export filter which are applied to
++ the imported/exported keyblock right before it will be
++ stored/written. NAME defines the type of filter to use, EXPR the
++ expression to evaluate. The option can be used several times which
++ then appends more expression to the same NAME.
++
++ The available filter types are:
++
++ keep-uid
++ This filter will keep a user id packet and its dependent
++ packets in the keyblock if the expression evaluates to true.
++
++ For the syntax of the expression see the chapter "FILTER
++ EXPRESSIONS". The property names for the expressions depend on the
++ actual filter type and are indicated in the following table.
++
++ The available properties are:
++
++ uid
++ A string with the user id. (keep-uid)
++
++ mbox
++ The addr-spec part of a user id with mailbox or the empty
++ string. (keep-uid)
++
++ primary
++ Boolean indicating whether the user id is the primary one.
++ (keep-uid)
++
+'--export-options parameters'
+ This is a space or comma delimited string that gives options for
+ exporting keys. Options can be prepended with a 'no-' to give the
+ opposite meaning. The options are:
+
+ export-local-sigs
+ Allow exporting key signatures marked as "local". This is not
+ generally useful unless a shared keyring scheme is being used.
+ Defaults to no.
+
+ export-attributes
+ Include attribute user IDs (photo IDs) while exporting. This
+ is useful to export keys if they are going to be used by an
+ OpenPGP program that does not accept attribute user IDs.
+ Defaults to yes.
+
+ export-sensitive-revkeys
+ Include designated revoker information that was marked as
+ "sensitive". Defaults to no.
+
+ export-clean
+ Compact (remove all signatures from) user IDs on the key being
+ exported if the user IDs are not usable. Also, do not export
+ any signatures that are not usable. This includes signatures
+ that were issued by keys that are not present on the keyring.
+ This option is the same as running the '--edit-key' command
+ "clean" before export except that the local copy of the key is
+ not modified. Defaults to no.
+
+ export-minimal
+ Export the smallest key possible. This removes all signatures
+ except the most recent self-signature on each user ID. This
+ option is the same as running the '--edit-key' command
+ "minimize" before export except that the local copy of the key
+ is not modified. Defaults to no.
+
++ export-pka
++ Instead of outputting the key material output PKA records
++ suitable to put into DNS zone files. An ORIGIN line is
++ printed before each record to allow diverting the records to
++ the corresponding zone file.
++
++ export-dane
++ Instead of outputting the key material output OpenPGP DANE
++ records suitable to put into DNS zone files. An ORIGIN line
++ is printed before each record to allow diverting the records
++ to the corresponding zone file.
++
+'--with-colons'
+ Print key listings delimited by colons. Note that the output will
+ be encoded in UTF-8 regardless of any '--display-charset' setting.
+ This format is useful when GnuPG is called from scripts and other
+ programs as it is easily machine parsed. The details of this
+ format are documented in the file 'doc/DETAILS', which is included
+ in the GnuPG source distribution.
+
- '--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-subkey-fingerprint'
+ If a fingerprint is printed for the primary key, this option forces
+ printing of the fingerprint for all subkeys. This could also be
+ achieved by using the '--with-fingerprint' twice but by using this
+ option along with keyid-format "none" a compact fingerprint is
+ printed.
+
+'--with-icao-spelling'
+ Print the ICAO spelling of the fingerprint in addition to the hex
+ digits.
+
+'--with-keygrip'
+ Include the keygrip in the key listings.
+
+'--with-wkd-hash'
+ Print a Web Key Directory indentifier along with each user ID in
+ key listings. This is an experimental feature and semantics may
+ change.
+
+'--with-secret'
+ Include info about the presence of a secret key in public key
+ listings done with '--with-colons'.
+
+
+File: gnupg.info, Node: OpenPGP Options, Next: Compliance Options, Prev: GPG Input and Output, Up: GPG Options
+
+4.2.4 OpenPGP protocol specific options.
+----------------------------------------
+
+'-t, --textmode'
+'--no-textmode'
+ Treat input files as text and store them in the OpenPGP canonical
+ text form with standard "CRLF" line endings. This also sets the
+ necessary flags to inform the recipient that the encrypted or
+ signed data is text and may need its line endings converted back to
+ whatever the local system uses. This option is useful when
+ communicating between two platforms that have different line ending
+ conventions (UNIX-like to Mac, Mac to Windows, etc).
+ '--no-textmode' disables this option, and is the default.
+
+'--force-v3-sigs'
+'--no-force-v3-sigs'
+'--force-v4-certs'
+'--no-force-v4-certs'
+ These options are obsolete and have no effect since GnuPG 2.1.
+
+'--force-mdc'
+ Force the use of encryption with a modification detection code.
+ This is always used with the newer ciphers (those with a blocksize
+ greater than 64 bits), or if all of the recipient keys indicate MDC
+ support in their feature flags.
+
+'--disable-mdc'
+ Disable the use of the modification detection code. Note that by
+ using this option, the encrypted message becomes vulnerable to a
+ message modification attack.
+
+'--disable-signer-uid'
+ By default the user ID of the signing key is embedded in the data
+ signature. As of now this is only done if the signing key has been
+ specified with 'local-user' using a mail address. This information
+ can be helpful for verifier to locate the key; see option
+ '--auto-key-retrieve'.
+
+'--personal-cipher-preferences string'
+ Set the list of personal cipher preferences to 'string'. Use 'gpg
+ --version' to get a list of available algorithms, and use 'none' to
+ set no preference at all. This allows the user to safely override
+ the algorithm chosen by the recipient key preferences, as GPG will
+ only select an algorithm that is usable by all recipients. The
+ most highly ranked cipher in this list is also used for the
+ '--symmetric' encryption command.
+
+'--personal-digest-preferences string'
+ Set the list of personal digest preferences to 'string'. Use 'gpg
+ --version' to get a list of available algorithms, and use 'none' to
+ set no preference at all. This allows the user to safely override
+ the algorithm chosen by the recipient key preferences, as GPG will
+ only select an algorithm that is usable by all recipients. The
+ most highly ranked digest algorithm in this list is also used when
+ signing without encryption (e.g. '--clearsign' or '--sign').
+
+'--personal-compress-preferences string'
+ Set the list of personal compression preferences to 'string'. Use
+ 'gpg --version' to get a list of available algorithms, and use
+ 'none' to set no preference at all. This allows the user to safely
+ override the algorithm chosen by the recipient key preferences, as
+ GPG will only select an algorithm that is usable by all recipients.
+ The most highly ranked compression algorithm in this list is also
+ used when there are no recipient keys to consider (e.g.
+ '--symmetric').
+
+'--s2k-cipher-algo name'
+ Use 'name' as the cipher algorithm for symmetric encryption with a
+ passphrase if '--personal-cipher-preferences' and '--cipher-algo'
+ are not given. The default is AES-128.
+
+'--s2k-digest-algo name'
+ Use 'name' as the digest algorithm used to mangle the passphrases
+ for symmetric encryption. The default is SHA-1.
+
+'--s2k-mode n'
+ Selects how passphrases for symmetric encryption are mangled. If
+ 'n' is 0 a plain passphrase (which is in general not recommended)
+ will be used, a 1 adds a salt (which should not be used) to the
+ passphrase and a 3 (the default) iterates the whole process a
+ number of times (see '--s2k-count').
+
+'--s2k-count n'
+ Specify how many times the passphrases mangling for symmetric
+ encryption is repeated. This value may range between 1024 and
+ 65011712 inclusive. The default is inquired from gpg-agent. Note
+ that not all values in the 1024-65011712 range are legal and if an
+ illegal value is selected, GnuPG will round up to the nearest legal
+ value. This option is only meaningful if '--s2k-mode' is set to
+ the default of 3.
+
+
+File: gnupg.info, Node: Compliance Options, Next: GPG Esoteric Options, Prev: OpenPGP Options, Up: GPG Options
+
+4.2.5 Compliance options
+------------------------
+
+These options control what GnuPG is compliant to. Only one of these
+options may be active at a time. Note that the default setting of this
+is nearly always the correct one. See the INTEROPERABILITY WITH OTHER
+OPENPGP PROGRAMS section below before using one of these options.
+
+'--gnupg'
+ Use standard GnuPG behavior. This is essentially OpenPGP behavior
+ (see '--openpgp'), but with some additional workarounds for common
+ compatibility problems in different versions of PGP. This is the
+ default option, so it is not generally needed, but it may be useful
+ to override a different compliance option in the gpg.conf file.
+
+'--openpgp'
+ Reset all packet, cipher and digest options to strict OpenPGP
+ behavior. Use this option to reset all previous options like
+ '--s2k-*', '--cipher-algo', '--digest-algo' and '--compress-algo'
+ to OpenPGP compliant values. All PGP workarounds are disabled.
+
+'--rfc4880'
+ Reset all packet, cipher and digest options to strict RFC-4880
+ behavior. Note that this is currently the same thing as
+ '--openpgp'.
+
++'--rfc4880bis'
++ Enable experimental features from proposed updates to RFC-4880.
++ This option can be used in addition to the other compliance
++ options. Warning: The behavior may change with any GnuPG release
++ and created keys or data may not be usable with future GnuPG
++ versions.
++
+'--rfc2440'
+ Reset all packet, cipher and digest options to strict RFC-2440
+ behavior.
+
+'--pgp6'
+ Set up all options to be as PGP 6 compliant as possible. This
+ restricts you to the ciphers IDEA (if the IDEA plugin is
+ installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160,
+ and the compression algorithms none and ZIP. This also disables
+ -throw-keyids, and making signatures with signing subkeys as PGP 6
+ does not understand signatures made by signing subkeys.
+
+ This option implies '--disable-mdc --escape-from-lines'.
+
+'--pgp7'
+ Set up all options to be as PGP 7 compliant as possible. This is
+ identical to '--pgp6' except that MDCs are not disabled, and the
+ list of allowable ciphers is expanded to add AES128, AES192,
+ AES256, and TWOFISH.
+
+'--pgp8'
+ Set up all options to be as PGP 8 compliant as possible. PGP 8 is
+ a lot closer to the OpenPGP standard than previous versions of PGP,
+ so all this does is disable '--throw-keyids' and set
+ '--escape-from-lines'. All algorithms are allowed except for the
+ SHA224, SHA384, and SHA512 digests.
+
+
+File: gnupg.info, Node: GPG Esoteric Options, Next: Deprecated Options, Prev: Compliance Options, Up: GPG Options
+
+4.2.6 Doing things one usually doesn't want to do.
+--------------------------------------------------
+
+'-n'
+'--dry-run'
+ Don't make any changes (this is not completely implemented).
+
+'--list-only'
+ Changes the behaviour of some commands. This is like '--dry-run'
+ but different in some cases. The semantic of this command may be
+ extended in the future. Currently it only skips the actual
+ decryption pass and therefore enables a fast listing of the
+ encryption keys.
+
+'-i'
+'--interactive'
+ Prompt before overwriting any files.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or by a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ Set debugging flags. All flags are or-ed and FLAGS may be given in
+ C syntax (e.g. 0x0042) or as a comma separated list of flag names.
+ To get a list of all supported flags the single word "help" can be
+ used.
+
+'--debug-all'
+ Set all useful debugging flags.
+
+'--debug-iolbf'
+ Set stdout into line buffered mode. This option is only honored
+ when given on the command line.
+
+'--faked-system-time EPOCH'
+ This option is only useful for testing; it sets the system time
+ back or forth to EPOCH which is the number of seconds elapsed since
+ the year 1970. Alternatively EPOCH may be given as a full ISO time
+ string (e.g. "20070924T154812").
+
+'--enable-progress-filter'
+ Enable certain PROGRESS status outputs. This option allows
+ frontends to display a progress indicator while gpg is processing
+ larger files. There is a slight performance overhead using it.
+
+'--status-fd n'
+ Write special status strings to the file descriptor 'n'. See the
+ file DETAILS in the documentation for a listing of them.
+
+'--status-file file'
+ Same as '--status-fd', except the status data is written to file
+ 'file'.
+
+'--logger-fd n'
+ Write log output to file descriptor 'n' and not to STDERR.
+
+'--log-file file'
+'--logger-file file'
+ Same as '--logger-fd', except the logger data is written to file
+ 'file'. Note that '--log-file' is only implemented for GnuPG-2.
+
+'--attribute-fd n'
+ Write attribute subpackets to the file descriptor 'n'. This is
+ most useful for use with '--status-fd', since the status messages
+ are needed to separate out the various subpackets from the stream
+ delivered to the file descriptor.
+
+'--attribute-file file'
+ Same as '--attribute-fd', except the attribute data is written to
+ file 'file'.
+
+'--comment string'
+'--no-comments'
+ Use 'string' as a comment string in clear text signatures and ASCII
+ armored messages or keys (see '--armor'). The default behavior is
+ not to use a comment string. '--comment' may be repeated multiple
+ times to get multiple comment strings. '--no-comments' removes all
+ comments. It is a good idea to keep the length of a single comment
+ below 60 characters to avoid problems with mail programs wrapping
+ such lines. Note that comment lines, like all other header lines,
+ are not protected by the signature.
+
+'--emit-version'
+'--no-emit-version'
+ Force inclusion of the version string in ASCII armored output. If
+ given once only the name of the program and the major number is
+ emitted (default), given twice the minor is also emitted, given
+ triple the micro is added, and given quad an operating system
+ identification is also emitted. '--no-emit-version' disables the
+ 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 'gpg' will request a new passphrase be
+ repeated. This is useful for helping memorize a passphrase.
+ Defaults to 1 repetition.
+
+'--passphrase-fd n'
+ Read the passphrase from file descriptor 'n'. Only the first line
+ will be read from file descriptor 'n'. If you use 0 for 'n', the
+ passphrase will be read from STDIN. This can only be used if only
+ one passphrase is supplied.
+
+ Note that this passphrase is only used if the option '--batch' has
+ also been given. This is different from GnuPG version 1.x.
+
+'--passphrase-file file'
+ Read the passphrase from file 'file'. Only the first line will be
+ read from file 'file'. This can only be used if only one
+ passphrase is supplied. Obviously, a passphrase stored in a file
+ is of questionable security if other users can read this file.
+ Don't use this option if you can avoid it. Note that this
+ passphrase is only used if the option '--batch' has also been
+ given. This is different from GnuPG version 1.x.
+
+'--passphrase string'
+ Use 'string' as the passphrase. This can only be used if only one
+ passphrase is supplied. Obviously, this is of very questionable
+ security on a multi-user system. Don't use this option if you can
+ avoid it. Note that this passphrase is only used if the option
+ '--batch' has also been given. This is different from GnuPG
+ version 1.x.
+
+'--pinentry-mode mode'
+ Set the pinentry mode to 'mode'. Allowed values for 'mode' are:
+ default
+ Use the default of the agent, which is 'ask'.
+ ask
+ Force the use of the Pinentry.
+ cancel
+ Emulate use of Pinentry's cancel button.
+ error
+ Return a Pinentry error ("No Pinentry").
+ loopback
+ Redirect Pinentry queries to the caller. Note that in
+ contrast to Pinentry the user is not prompted again if he
+ enters a bad password.
+
+'--command-fd n'
+ This is a replacement for the deprecated shared-memory IPC mode.
+ If this option is enabled, user input on questions is not expected
+ from the TTY but from the given file descriptor. It should be used
+ together with '--status-fd'. See the file doc/DETAILS in the
+ source distribution for details on how to use it.
+
+'--command-file file'
+ Same as '--command-fd', except the commands are read out of file
+ 'file'
+
+'--allow-non-selfsigned-uid'
+'--no-allow-non-selfsigned-uid'
+ Allow the import and use of keys with user IDs which are not
+ self-signed. This is not recommended, as a non self-signed user ID
+ is trivial to forge. '--no-allow-non-selfsigned-uid' disables.
+
+'--allow-freeform-uid'
+ Disable all checks on the form of the user ID while generating a
+ new one. This option should only be used in very special
+ environments as it does not ensure the de-facto standard format of
+ user IDs.
+
+'--ignore-time-conflict'
+ GnuPG normally checks that the timestamps associated with keys and
+ signatures have plausible values. However, sometimes a signature
+ seems to be older than the key due to clock problems. This option
+ makes these checks just a warning. See also '--ignore-valid-from'
+ for timestamp issues on subkeys.
+
+'--ignore-valid-from'
+ GnuPG normally does not select and use subkeys created in the
+ future. This option allows the use of such keys and thus exhibits
+ the pre-1.0.7 behaviour. You should not use this option unless
+ there is some clock problem. See also '--ignore-time-conflict' for
+ timestamp issues with signatures.
+
+'--ignore-crc-error'
+ The ASCII armor used by OpenPGP is protected by a CRC checksum
+ against transmission errors. Occasionally the CRC gets mangled
+ somewhere on the transmission channel but the actual content (which
+ is protected by the OpenPGP protocol anyway) is still okay. This
+ option allows GnuPG to ignore CRC errors.
+
+'--ignore-mdc-error'
+ This option changes a MDC integrity protection failure into a
+ warning. This can be useful if a message is partially corrupt, but
+ it is necessary to get as much data as possible out of the corrupt
+ message. However, be aware that a MDC protection failure may also
+ mean that the message was tampered with intentionally by an
+ attacker.
+
+'--allow-weak-digest-algos'
+ Signatures made with known-weak digest algorithms are normally
+ rejected with an "invalid digest algorithm" message. This option
+ allows the verification of signatures made with such weak
+ algorithms. MD5 is the only digest algorithm considered weak by
+ default. See also '--weak-digest' to reject other digest
+ algorithms.
+
+'--weak-digest name'
+ Treat the specified digest algorithm as weak. Signatures made over
+ weak digests algorithms are normally rejected. This option can be
+ supplied multiple times if multiple algorithms should be considered
+ weak. See also '--allow-weak-digest-algos' to disable rejection of
+ weak digests. MD5 is always considered weak, and does not need to
+ be listed explicitly.
+
+'--no-default-keyring'
+ Do not add the default keyrings to the list of keyrings. Note that
+ GnuPG will not operate without any keyrings, so if you use this
+ option and do not provide alternate keyrings via '--keyring' or
+ '--secret-keyring', then GnuPG will still use the default public or
+ secret keyrings.
+
++'--no-keyring'
++ Do not add use any keyrings even if specified as options.
++
+'--skip-verify'
+ Skip the signature verification step. This may be used to make the
+ decryption faster if the signature verification is not needed.
+
+'--with-key-data'
+ Print key listings delimited by colons (like '--with-colons') and
+ print the public key data.
+
+'--fast-list-mode'
+ Changes the output of the list commands to work faster; this is
+ achieved by leaving some parts empty. Some applications don't need
+ the user ID and the trust information given in the listings. By
+ using this options they can get a faster listing. The exact
+ behaviour of this option may change in future versions. If you are
+ missing some information, don't use this option.
+
+'--no-literal'
+ This is not for normal use. Use the source to see for what it
+ might be useful.
+
+'--set-filesize'
+ This is not for normal use. Use the source to see for what it
+ might be useful.
+
+'--show-session-key'
+ Display the session key used for one message. See
+ '--override-session-key' for the counterpart of this option.
+
+ We think that Key Escrow is a Bad Thing; however the user should
+ have the freedom to decide whether to go to prison or to reveal the
+ content of one specific message without compromising all messages
+ ever encrypted for one secret key.
+
+ You can also use this option if you receive an encrypted message
+ which is abusive or offensive, to prove to the administrators of
+ the messaging system that the ciphertext transmitted corresponds to
+ an inappropriate plaintext so they can take action against the
+ offending user.
+
+'--override-session-key string'
+ Don't use the public key but the session key 'string'. The format
+ of this string is the same as the one printed by
+ '--show-session-key'. This option is normally not used but comes
+ handy in case someone forces you to reveal the content of an
+ encrypted message; using this option you can do this without
+ handing out the secret key.
+
+'--ask-sig-expire'
+'--no-ask-sig-expire'
+ When making a data signature, prompt for an expiration time. If
+ this option is not specified, the expiration time set via
+ '--default-sig-expire' is used. '--no-ask-sig-expire' disables
+ this option.
+
+'--default-sig-expire'
+ The default expiration time to use for signature expiration. Valid
+ values are "0" for no expiration, a number followed by the letter d
+ (for days), w (for weeks), m (for months), or y (for years) (for
+ example "2m" for two months, or "5y" for five years), or an
+ absolute date in the form YYYY-MM-DD. Defaults to "0".
+
+'--ask-cert-expire'
+'--no-ask-cert-expire'
+ When making a key signature, prompt for an expiration time. If
+ this option is not specified, the expiration time set via
+ '--default-cert-expire' is used. '--no-ask-cert-expire' disables
+ this option.
+
+'--default-cert-expire'
+ The default expiration time to use for key signature expiration.
+ Valid values are "0" for no expiration, a number followed by the
+ letter d (for days), w (for weeks), m (for months), or y (for
+ years) (for example "2m" for two months, or "5y" for five years),
+ or an absolute date in the form YYYY-MM-DD. Defaults to "0".
+
+'--allow-secret-key-import'
+ This is an obsolete option and is not used anywhere.
+
+'--allow-multiple-messages'
+'--no-allow-multiple-messages'
+ Allow processing of multiple OpenPGP messages contained in a single
+ file or stream. Some programs that call GPG are not prepared to
+ deal with multiple messages being processed together, so this
+ option defaults to no. Note that versions of GPG prior to 1.4.7
+ always allowed multiple messages.
+
+ Warning: Do not use this option unless you need it as a temporary
+ workaround!
+
+'--enable-special-filenames'
+ This options enables a mode in which filenames of the form '-&n',
+ where n is a non-negative decimal number, refer to the file
+ descriptor n and not to a file with that name.
+
+'--no-expensive-trust-checks'
+ Experimental use only.
+
+'--preserve-permissions'
+ Don't change the permissions of a secret keyring back to user
+ read/write only. Use this option only if you really know what you
+ are doing.
+
+'--default-preference-list string'
+ Set the list of default preferences to 'string'. This preference
+ list is used for new keys and becomes the default for "setpref" in
+ the edit menu.
+
+'--default-keyserver-url name'
+ Set the default keyserver URL to 'name'. This keyserver will be
+ used as the keyserver URL when writing a new self-signature on a
+ key, which includes key generation and changing preferences.
+
+'--list-config'
+ Display various internal configuration parameters of GnuPG. This
+ option is intended for external programs that call GnuPG to perform
+ tasks, and is thus not generally useful. See the file
+ 'doc/DETAILS' in the source distribution for the details of which
+ configuration items may be listed. '--list-config' is only usable
+ with '--with-colons' set.
+
+'--list-gcrypt-config'
+ Display various internal configuration parameters of Libgcrypt.
+
+'--gpgconf-list'
+ This command is similar to '--list-config' but in general only
+ internally used by the 'gpgconf' tool.
+
+'--gpgconf-test'
+ This is more or less dummy action. However it parses the
+ configuration file and returns with failure if the configuration
+ file would prevent 'gpg' from startup. Thus it may be used to run
+ a syntax check on the configuration file.
+
+ ---------- Footnotes ----------
+
+ (1) Using a little social engineering anyone who is able to decrypt
+the message can check whether one of the other recipients is the one he
+suspects.
+
+
+File: gnupg.info, Node: Deprecated Options, Prev: GPG Esoteric Options, Up: GPG Options
+
+4.2.7 Deprecated options
+------------------------
+
+'--show-photos'
+'--no-show-photos'
+ Causes '--list-keys', '--list-sigs', '--list-public-keys',
+ '--list-secret-keys', and verifying a signature to also display the
+ photo ID attached to the key, if any. See also '--photo-viewer'.
+ These options are deprecated. Use '--list-options
+ [no-]show-photos' and/or '--verify-options [no-]show-photos'
+ instead.
+
+'--show-keyring'
+ Display the keyring name at the head of key listings to show which
+ keyring a given key resides on. This option is deprecated: use
+ '--list-options [no-]show-keyring' instead.
+
+'--always-trust'
+ Identical to '--trust-model always'. This option is deprecated.
+
+'--show-notation'
+'--no-show-notation'
+ Show signature notations in the '--list-sigs' or '--check-sigs'
+ listings as well as when verifying a signature with a notation in
+ it. These options are deprecated. Use '--list-options
+ [no-]show-notation' and/or '--verify-options [no-]show-notation'
+ instead.
+
+'--show-policy-url'
+'--no-show-policy-url'
+ Show policy URLs in the '--list-sigs' or '--check-sigs' listings as
+ well as when verifying a signature with a policy URL in it. These
+ options are deprecated. Use '--list-options [no-]show-policy-url'
+ and/or '--verify-options [no-]show-policy-url' instead.
+
+
+File: gnupg.info, Node: GPG Configuration, Next: GPG Examples, Prev: GPG Options, Up: Invoking GPG
+
+4.3 Configuration files
+=======================
+
+There are a few configuration files to control certain aspects of
+'gpg''s operation. Unless noted, they are expected in the current home
+directory (*note option --homedir::).
+
+'gpg.conf'
+ This is the standard configuration file read by 'gpg' on startup.
+ It may contain any valid long option; the leading two dashes may
+ not be entered and the option may not be abbreviated. This default
+ name may be changed on the command line (*note gpg-option
+ --options::). You should backup this file.
+
+ Note that on larger installations, it is useful to put predefined
+files into the directory '/etc/skel/.gnupg' so that newly created users
+start up with a working configuration. For existing users a small
+helper script is provided to create these files (*note addgnupghome::).
+
+ For internal purposes 'gpg' creates and maintains a few other files;
+They all live in in the current home directory (*note option
+--homedir::). Only the 'gpg' program may modify these files.
+
+'~/.gnupg'
+ This is the default home directory which is used if neither the
+ environment variable 'GNUPGHOME' nor the option '--homedir' is
+ given.
+
+'~/.gnupg/pubring.gpg'
+ The public keyring. You should backup this file.
+
+'~/.gnupg/pubring.gpg.lock'
+ The lock file for the public keyring.
+
+'~/.gnupg/pubring.kbx'
+ The public keyring using a different format. This file is sharred
+ with 'gpgsm'. You should backup this file.
+
+'~/.gnupg/pubring.kbx.lock'
+ The lock file for 'pubring.kbx'.
+
+'~/.gnupg/secring.gpg'
+ A secret keyring as used by GnuPG versions before 2.1. It is not
+ used by GnuPG 2.1 and later.
+
+'~/.gnupg/secring.gpg.lock'
+ The lock file for the secret keyring.
+
+'~/.gnupg/.gpg-v21-migrated'
+ File indicating that a migration to GnuPG 2.1 has been done.
+
+'~/.gnupg/trustdb.gpg'
+ The trust database. There is no need to backup this file; it is
+ better to backup the ownertrust values (*note option
+ --export-ownertrust::).
+
+'~/.gnupg/trustdb.gpg.lock'
+ The lock file for the trust database.
+
+'~/.gnupg/random_seed'
+ A file used to preserve the state of the internal random pool.
+
+'~/.gnupg/openpgp-revocs.d/'
+ This is the directory where gpg stores pre-generated revocation
+ certificates. The file name corresponds to the OpenPGP fingerprint
+ of the respective key. It is suggested to backup those
+ certificates and if the primary private key is not stored on the
+ disk to move them to an external storage device. Anyone who can
+ access theses files is able to revoke the corresponding key. You
+ may want to print them out. You should backup all files in this
+ directory and take care to keep this backup closed away.
+
+'/usr/local/share/gnupg/options.skel'
+ The skeleton options file.
+
+ Operation is further controlled by a few environment variables:
+
+HOME
+ Used to locate the default home directory.
+
+GNUPGHOME
+ If set directory used instead of "~/.gnupg".
+
+GPG_AGENT_INFO
+ This variable is obsolete; it was used by GnuPG versions before
+ 2.1.
+
+PINENTRY_USER_DATA
+ This value is passed via gpg-agent to pinentry. It is useful to
+ convey extra information to a custom pinentry.
+
+COLUMNS
+LINES
+ Used to size some displays to the full size of the screen.
+
+LANGUAGE
+ Apart from its use by GNU, it is used in the W32 version to
+ override the language selection done through the Registry. If used
+ and set to a valid and available language name (LANGID), the file
+ with the translation is loaded from
+
+ 'GPGDIR/gnupg.nls/LANGID.mo'. Here GPGDIR is the directory out of
+ which the gpg binary has been loaded. If it can't be loaded the
+ Registry is tried and as last resort the native Windows locale
+ system is used.
+
+
+File: gnupg.info, Node: GPG Examples, Next: Unattended Usage of GPG, Prev: GPG Configuration, Up: Invoking GPG
+
+4.4 Examples
+============
+
+gpg -se -r 'Bob' 'file'
+ sign and encrypt for user Bob
+
+gpg -clearsign 'file'
+ make a clear text signature
+
+gpg -sb 'file'
+ make a detached signature
+
+gpg -u 0x12345678 -sb 'file'
+ make a detached signature with the key 0x12345678
+
+gpg -list-keys 'user_ID'
+ show keys
+
+gpg -fingerprint 'user_ID'
+ show fingerprint
+
+gpg -verify 'pgpfile'
+gpg -verify 'sigfile'
+ Verify the signature of the file but do not output the data. The
+ second form is used for detached signatures, where 'sigfile' is the
+ detached signature (either ASCII armored or binary) and are the
+ signed data; if this is not given, the name of the file holding the
+ signed data is constructed by cutting off the extension (".asc" or
+ ".sig") of 'sigfile' or by asking the user for the filename.
+
++FILTER EXPRESSIONS
++******************
++
++The options '--import-filter' and '--export-filter' use expressions with
++this syntax (square brackets indicate an optional part and curly braces
++a repetition, white space between the elements are allowed):
++
++ [lc] {[{flag}] PROPNAME op VALUE [lc]}
++
++ The name of a property (PROPNAME) may only consist of letters, digits
++and underscores. The description for the filter type describes which
++properties are defined. If an undefined property is used it evaluates
++to the empty string. Unless otherwise noted, the VALUE must always be
++given and may not be the empty string. No quoting is defined for the
++value, thus the value may not contain the strings '&&' or '||', which
++are used as logical connection operators. The flag '--' can be used to
++remove this restriction.
++
++ Numerical values are computed as long int; standard C notation
++applies. LC is the logical connection operator; either '&&' for a
++conjunction or '||' for a disjunction. A conjunction is assumed at the
++begin of an expression. Conjunctions have higher precedence than
++disjunctions. If VALUE starts with one of the characters used in any OP
++a space after the OP is required.
++
++The supported operators (OP) are:
++
++=~
++ Substring must match.
++
++!~
++ Substring must not match.
++
++=
++ The full string must match.
++
++<>
++ The full string must not match.
++
++==
++ The numerical value must match.
++
++!=
++ The numerical value must not match.
++
++<=
++ The numerical value of the field must be LE than the value.
++
++<
++ The numerical value of the field must be LT than the value.
++
++>=
++ The numerical value of the field must be GT than the value.
++
++>=
++ The numerical value of the field must be GE than the value.
++
++-n
++ True if value is not empty (no value allowed).
++
++-z
++ True if value is empty (no value allowed).
++
++-t
++ Alias for "PROPNAME != 0" (no value allowed).
++
++-f
++ Alias for "PROPNAME == 0" (no value allowed).
++
++Values for FLAG must be space separated. The supported flags are:
++
++-
++ VALUE spans to the end of the expression.
++-c
++ The string match in this part is done case-sensitive.
++
++ The filter options concatenate several specifications for a filter of
++the same type. For example the four options in this example:
++
++ --import-option keep-uid="uid =~ Alfa"
++ --import-option keep-uid="&& uid !~ Test"
++ --import-option keep-uid="|| uid =~ Alpha"
++ --import-option keep-uid="uid !~ Test"
++
++which is equivalent to
++
++ --import-option \
++ keep-uid="uid =~ Alfa" && uid !~ Test" || uid =~ Alpha" && "uid !~ Test"
++
++ imports only the user ids of a key containing the strings "Alfa" or
++"Alpha" but not the string "test".
++
+RETURN VALUE
+************
+
+The program returns 0 if everything was fine, 1 if at least a signature
+was bad, and other error codes for fatal errors.
+
+WARNINGS
+********
+
+Use a *good* password for your user account and a *good* passphrase to
+protect your secret key. This passphrase is the weakest part of the
+whole system. Programs to do dictionary attacks on your secret keyring
+are very easy to write and so you should protect your "~/.gnupg/"
+directory very well.
+
+ Keep in mind that, if this program is used over a network (telnet),
+it is *very* easy to spy out your passphrase!
+
+ If you are going to verify detached signatures, make sure that the
+program knows about it; either give both filenames on the command line
+or use '-' to specify STDIN.
+
+INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS
+********************************************
+
+GnuPG tries to be a very flexible implementation of the OpenPGP
+standard. In particular, GnuPG implements many of the optional parts of
+the standard, such as the SHA-512 hash, and the ZLIB and BZIP2
+compression algorithms. It is important to be aware that not all
+OpenPGP programs implement these optional algorithms and that by forcing
+their use via the '--cipher-algo', '--digest-algo',
+'--cert-digest-algo', or '--compress-algo' options in GnuPG, it is
+possible to create a perfectly valid OpenPGP message, but one that
+cannot be read by the intended recipient.
+
+ There are dozens of variations of OpenPGP programs available, and
+each supports a slightly different subset of these optional algorithms.
+For example, until recently, no (unhacked) version of PGP supported the
+BLOWFISH cipher algorithm. A message using BLOWFISH simply could not be
+read by a PGP user. By default, GnuPG uses the standard OpenPGP
+preferences system that will always do the right thing and create
+messages that are usable by all recipients, regardless of which OpenPGP
+program they use. Only override this safe default if you really know
+what you are doing.
+
+ If you absolutely must override the safe default, or if the
+preferences on a given key are invalid for some reason, you are far
+better off using the '--pgp6', '--pgp7', or '--pgp8' options. These
+options are safe as they do not force any particular algorithms in
+violation of OpenPGP, but rather reduce the available algorithms to a
+"PGP-safe" list.
+
+BUGS
+****
+
+On older systems this program should be installed as setuid(root). This
+is necessary to lock memory pages. Locking memory pages prevents the
+operating system from writing memory pages (which may contain
+passphrases or other sensitive material) to disk. If you get no warning
+message about insecure memory your operating system supports locking
+without being root. The program drops root privileges as soon as locked
+memory is allocated.
+
+ Note also that some systems (especially laptops) have the ability to
+"suspend to disk" (also known as "safe sleep" or "hibernate"). This
+writes all memory to disk before going into a low power or even powered
+off mode. Unless measures are taken in the operating system to protect
+the saved memory, passphrases or other sensitive material may be
+recoverable from it later.
+
+ Before you report a bug you should first search the mailing list
+archives for similar problems and second check whether such a bug has
+already been reported to our bug tracker at http://bugs.gnupg.org .
+
+
+File: gnupg.info, Node: Unattended Usage of GPG, Prev: GPG Examples, Up: Invoking GPG
+
+4.5 Unattended Usage
+====================
+
+'gpg' is often used as a backend engine by other software. To help with
+this a machine interface has been defined to have an unambiguous way to
+do this. The options '--status-fd' and '--batch' are almost always
+required for this.
+
+* Menu:
+
+* Unattended GPG key generation:: Unattended key generation
+
+
+File: gnupg.info, Node: Unattended GPG key generation, Up: Unattended Usage of GPG
+
+4.5.1 Unattended key generation
+-------------------------------
+
+The command '--gen-key' may be used along with the option '--batch' for
+unattended key generation. The parameters are either read from stdin or
+given as a file on the command line. The format of the parameter file
+is as follows:
+
+ * Text only, line length is limited to about 1000 characters.
+ * UTF-8 encoding must be used to specify non-ASCII characters.
+ * Empty lines are ignored.
+ * Leading and trailing while space is ignored.
+ * A hash sign as the first non white space character indicates a
+ comment line.
+ * Control statements are indicated by a leading percent sign, the
+ arguments are separated by white space from the keyword.
+ * Parameters are specified by a keyword, followed by a colon.
+ Arguments are separated by white space.
+ * The first parameter must be 'Key-Type'; control statements may be
+ placed anywhere.
+ * The order of the parameters does not matter except for 'Key-Type'
+ which must be the first parameter. The parameters are only used
+ for the generated keyblock (primary and subkeys); parameters from
+ previous sets are not used. Some syntactically checks may be
+ performed.
+ * Key generation takes place when either the end of the parameter
+ file is reached, the next 'Key-Type' parameter is encountered or at
+ the control statement '%commit' is encountered.
+
+Control statements:
+
+%echo TEXT
+ Print TEXT as diagnostic.
+
+%dry-run
+ Suppress actual key generation (useful for syntax checking).
+
+%commit
+ Perform the key generation. Note that an implicit commit is done
+ at the next Key-Type parameter.
+
+%pubring FILENAME
+%secring FILENAME
+ Do not write the key to the default or commandline given keyring
+ but to FILENAME. This must be given before the first commit to
+ take place, duplicate specification of the same filename is
+ ignored, the last filename before a commit is used. The filename
+ is used until a new filename is used (at commit points) and all
+ keys are written to that file. If a new filename is given, this
+ file is created (and overwrites an existing one). For GnuPG
+ versions prior to 2.1, both control statements must be given. For
+ GnuPG 2.1 and later '%secring' is a no-op.
+
+%ask-passphrase
+%no-ask-passphrase
+ This option is a no-op for GnuPG 2.1 and later.
+
+%no-protection
+ Using this option allows the creation of keys without any
+ passphrase protection. This option is mainly intended for
+ regression tests.
+
+%transient-key
+ If given the keys are created using a faster and a somewhat less
+ secure random number generator. This option may be used for keys
+ which are only used for a short time and do not require full
+ cryptographic strength. It takes only effect if used together with
+ the control statement '%no-protection'.
+
+General Parameters:
+
+Key-Type: ALGO
+ Starts a new parameter block by giving the type of the primary key.
+ The algorithm must be capable of signing. This is a required
+ parameter. ALGO may either be an OpenPGP algorithm number or a
+ string with the algorithm name. The special value 'default' may be
+ used for ALGO to create the default key type; in this case a
+ 'Key-Usage' shall not be given and 'default' also be used for
+ 'Subkey-Type'.
+
+Key-Length: NBITS
+ The requested length of the generated key in bits. The default is
+ returned by running the command 'gpg --gpgconf-list'.
+
+Key-Grip: HEXSTRING
+ This is optional and used to generate a CSR or certificate for an
+ already existing key. Key-Length will be ignored when given.
+
+Key-Usage: USAGE-LIST
+ Space or comma delimited list of key usages. Allowed values are
+ 'encrypt', 'sign', and 'auth'. This is used to generate the key
+ flags. Please make sure that the algorithm is capable of this
+ usage. Note that OpenPGP requires that all primary keys are
+ capable of certification, so no matter what usage is given here,
+ the 'cert' flag will be on. If no 'Key-Usage' is specified and the
+ 'Key-Type' is not 'default', all allowed usages for that particular
+ algorithm are used; if it is not given but 'default' is used the
+ usage will be 'sign'.
+
+Subkey-Type: ALGO
+ This generates a secondary key (subkey). Currently only one subkey
+ can be handled. See also 'Key-Type' above.
+
+Subkey-Length: NBITS
+ Length of the secondary key (subkey) in bits. The default is
+ returned by running the command 'gpg --gpgconf-list'".
+
+Subkey-Usage: USAGE-LIST
+ Key usage lists for a subkey; similar to 'Key-Usage'.
+
+Passphrase: STRING
+ If you want to specify a passphrase for the secret key, enter it
+ here. Default is to use the Pinentry dialog to ask for a
+ passphrase.
+
+Name-Real: NAME
+Name-Comment: COMMENT
+Name-Email: EMAIL
+ The three parts of a user name. Remember to use UTF-8 encoding
+ here. If you don't give any of them, no user ID is created.
+
+Expire-Date: ISO-DATE|(NUMBER[d|w|m|y])
+ Set the expiration date for the key (and the subkey). It may
+ either be entered in ISO date format (e.g. "20000815T145012") or
+ as number of days, weeks, month or years after the creation date.
+ The special notation "seconds=N" is also allowed to specify a
+ number of seconds since creation. Without a letter days are
+ assumed. Note that there is no check done on the overflow of the
+ type used by OpenPGP for timestamps. Thus you better make sure
+ that the given value make sense. Although OpenPGP works with time
+ intervals, GnuPG uses an absolute value internally and thus the
+ last year we can represent is 2105.
+
+Creation-Date: ISO-DATE
+ Set the creation date of the key as stored in the key information
+ and which is also part of the fingerprint calculation. Either a
+ date like "1986-04-26" or a full timestamp like "19860426T042640"
+ may be used. The time is considered to be UTC. The special
+ notation "seconds=N" may be used to directly specify a the number
+ of seconds since Epoch (Unix time). If it is not given the current
+ time is used.
+
+Preferences: STRING
+ Set the cipher, hash, and compression preference values for this
+ key. This expects the same type of string as the sub-command
+ 'setpref' in the '--edit-key' menu.
+
+Revoker: ALGO:FPR [sensitive]
+ Add a designated revoker to the generated key. Algo is the public
+ key algorithm of the designated revoker (i.e. RSA=1, DSA=17, etc.)
+ FPR is the fingerprint of the designated revoker. The optional
+ 'sensitive' flag marks the designated revoker as sensitive
+ information. Only v4 keys may be designated revokers.
+
+Keyserver: STRING
+ This is an optional parameter that specifies the preferred
+ keyserver URL for the key.
+
+Handle: STRING
+ This is an optional parameter only used with the status lines
+ KEY_CREATED and KEY_NOT_CREATED. STRING may be up to 100 characters
+ and should not contain spaces. It is useful for batch key
+ generation to associate a key parameter block with a status line.
+
+Here is an example on how to create a key:
+ $ cat >foo <<EOF
+ %echo Generating a basic OpenPGP key
+ Key-Type: DSA
+ Key-Length: 1024
+ Subkey-Type: ELG-E
+ Subkey-Length: 1024
+ Name-Real: Joe Tester
+ Name-Comment: with stupid passphrase
+ Name-Email: joe at foo.bar
+ Expire-Date: 0
+ Passphrase: abc
+ %pubring foo.pub
+ %secring foo.sec
+ # Do a commit here, so that we can later print "done" :-)
+ %commit
+ %echo done
+ EOF
+ $ gpg --batch --gen-key foo
+ [...]
+ $ gpg --no-default-keyring --secret-keyring ./foo.sec \
+ --keyring ./foo.pub --list-secret-keys
+ /home/wk/work/gnupg-stable/scratch/foo.sec
+ ------------------------------------------
+ sec 1024D/915A878D 2000-03-09 Joe Tester (with stupid passphrase) <joe at foo.bar>
+ ssb 1024g/8F70E2C0 2000-03-09
+
+If you want to create a key with the default algorithms you would use
+these parameters:
+ %echo Generating a default key
+ Key-Type: default
+ Subkey-Type: default
+ Name-Real: Joe Tester
+ Name-Comment: with stupid passphrase
+ Name-Email: joe at foo.bar
+ Expire-Date: 0
+ Passphrase: abc
+ %pubring foo.pub
+ %secring foo.sec
+ # Do a commit here, so that we can later print "done" :-)
+ %commit
+ %echo done
+
+
+File: gnupg.info, Node: Invoking GPGSM, Next: Invoking SCDAEMON, Prev: Invoking GPG, Up: Top
+
+5 Invoking GPGSM
+****************
+
+'gpgsm' is a tool similar to 'gpg' to provide digital encryption and
+signing services on X.509 certificates and the CMS protocol. It is
+mainly used as a backend for S/MIME mail processing. 'gpgsm' includes a
+full featured certificate management and complies with all rules defined
+for the German Sphinx project.
+
+ *Note Option Index::, for an index to 'GPGSM''s commands and options.
+
+* Menu:
+
+* GPGSM Commands:: List of all commands.
+* GPGSM Options:: List of all options.
+* GPGSM Configuration:: Configuration files.
+* GPGSM Examples:: Some usage examples.
+
+Developer information:
+* Unattended Usage:: Using 'gpgsm' from other programs.
+* GPGSM Protocol:: The protocol the server mode uses.
+
+
+File: gnupg.info, Node: GPGSM Commands, Next: GPGSM Options, Up: Invoking GPGSM
+
+5.1 Commands
+============
+
+Commands are not distinguished from options except for the fact that
+only one command is allowed.
+
+* Menu:
+
+* General GPGSM Commands:: Commands not specific to the functionality.
+* Operational GPGSM Commands:: Commands to select the type of operation.
+* Certificate Management:: How to manage certificates.
+
+
+File: gnupg.info, Node: General GPGSM Commands, Next: Operational GPGSM Commands, Up: GPGSM Commands
+
+5.1.1 Commands not specific to the function
+-------------------------------------------
+
+'--version'
+ Print the program version and licensing information. Note that you
+ cannot abbreviate this command.
+
+'--help, -h'
+ Print a usage message summarizing the most useful command-line
+ options. Note that you cannot abbreviate this command.
+
+'--warranty'
+ Print warranty information. Note that you cannot abbreviate this
+ command.
+
+'--dump-options'
+ Print a list of all available options and commands. Note that you
+ cannot abbreviate this command.
+
+
+File: gnupg.info, Node: Operational GPGSM Commands, Next: Certificate Management, Prev: General GPGSM Commands, Up: GPGSM Commands
+
+5.1.2 Commands to select the type of operation
+----------------------------------------------
+
+'--encrypt'
+ Perform an encryption. The keys the data is encrypted too must be
+ set using the option '--recipient'.
+
+'--decrypt'
+ Perform a decryption; the type of input is automatically
+ determined. It may either be in binary form or PEM encoded;
+ automatic determination of base-64 encoding is not done.
+
+'--sign'
+ Create a digital signature. The key used is either the fist one
+ found in the keybox or those set with the '--local-user' option.
+
+'--verify'
+ Check a signature file for validity. Depending on the arguments a
+ detached signature may also be checked.
+
+'--server'
+ Run in server mode and wait for commands on the 'stdin'.
+
+'--call-dirmngr COMMAND [ARGS]'
+ Behave as a Dirmngr client issuing the request COMMAND with the
+ optional list of ARGS. The output of the Dirmngr is printed
+ stdout. Please note that file names given as arguments should have
+ an absolute file name (i.e. commencing with '/' because they are
+ passed verbatim to the Dirmngr and the working directory of the
+ Dirmngr might not be the same as the one of this client. Currently
+ it is not possible to pass data via stdin to the Dirmngr. COMMAND
+ should not contain spaces.
+
+ This is command is required for certain maintaining tasks of the
+ dirmngr where a dirmngr must be able to call back to 'gpgsm'. See
+ the Dirmngr manual for details.
+
+'--call-protect-tool ARGUMENTS'
+ Certain maintenance operations are done by an external program call
+ 'gpg-protect-tool'; this is usually not installed in a directory
+ listed in the PATH variable. This command provides a simple
+ wrapper to access this tool. ARGUMENTS are passed verbatim to this
+ command; use '--help' to get a list of supported operations.
+
+
+File: gnupg.info, Node: Certificate Management, Prev: Operational GPGSM Commands, Up: GPGSM Commands
+
+5.1.3 How to manage the certificates and keys
+---------------------------------------------
+
+'--gen-key'
+ This command allows the creation of a certificate signing request
+ or a self-signed certificate. It is commonly used along with the
+ '--output' option to save the created CSR or certificate into a
+ file. If used with the '--batch' a parameter file is used to
+ create the CSR or certificate and it is further possible to create
+ non-self-signed certificates.
+
+'--list-keys'
+'-k'
+ List all available certificates stored in the local key database.
+ Note that the displayed data might be reformatted for better human
+ readability and illegal characters are replaced by safe
+ substitutes.
+
+'--list-secret-keys'
+'-K'
+ List all available certificates for which a corresponding a secret
+ key is available.
+
+'--list-external-keys PATTERN'
+ List certificates matching PATTERN using an external server. This
+ utilizes the 'dirmngr' service.
+
+'--list-chain'
+ Same as '--list-keys' but also prints all keys making up the chain.
+
+'--dump-cert'
+'--dump-keys'
+ List all available certificates stored in the local key database
+ using a format useful mainly for debugging.
+
+'--dump-chain'
+ Same as '--dump-keys' but also prints all keys making up the chain.
+
+'--dump-secret-keys'
+ List all available certificates for which a corresponding a secret
+ key is available using a format useful mainly for debugging.
+
+'--dump-external-keys PATTERN'
+ List certificates matching PATTERN using an external server. This
+ utilizes the 'dirmngr' service. It uses a format useful mainly for
+ debugging.
+
+'--keydb-clear-some-cert-flags'
+ This is a debugging aid to reset certain flags in the key database
+ which are used to cache certain certificate stati. It is
+ especially useful if a bad CRL or a weird running OCSP responder
+ did accidentally revoke certificate. There is no security issue
+ with this command because 'gpgsm' always make sure that the
+ validity of a certificate is checked right before it is used.
+
+'--delete-keys PATTERN'
+ Delete the keys matching PATTERN. Note that there is no command to
+ delete the secret part of the key directly. In case you need to do
+ this, you should run the command 'gpgsm --dump-secret-keys KEYID'
+ before you delete the key, copy the string of hex-digits in the
+ "keygrip" line and delete the file consisting of these hex-digits
+ and the suffix '.key' from the 'private-keys-v1.d' directory below
+ our GnuPG home directory (usually '~/.gnupg').
+
+'--export [PATTERN]'
+ Export all certificates stored in the Keybox or those specified by
+ the optional PATTERN. Those pattern consist of a list of user ids
+ (*note how-to-specify-a-user-id::). When used along with the
+ '--armor' option a few informational lines are prepended before
+ each block. There is one limitation: As there is no commonly
+ agreed upon way to pack more than one certificate into an ASN.1
+ structure, the binary export (i.e. without using 'armor') works
+ only for the export of one certificate. Thus it is required to
+ specify a PATTERN which yields exactly one certificate. Ephemeral
+ certificate are only exported if all PATTERN are given as
+ fingerprints or keygrips.
+
+'--export-secret-key-p12 KEY-ID'
+ Export the private key and the certificate identified by KEY-ID in
+ a PKCS#12 format. When used with the '--armor' option a few
+ informational lines are prepended to the output. Note, that the
+ PKCS#12 format is not very secure and this command is only provided
+ if there is no other way to exchange the private key. (*note
+ option --p12-charset::)
+
+'--export-secret-key-p8 KEY-ID'
+'--export-secret-key-raw KEY-ID'
+ Export the private key of the certificate identified by KEY-ID with
+ any encryption stripped. The '...-raw' command exports in PKCS#1
+ format; the '...-p8' command exports in PKCS#8 format. When used
+ with the '--armor' option a few informational lines are prepended
+ to the output. These commands are useful to prepare a key for use
+ on a TLS server.
+
+'--import [FILES]'
+ Import the certificates from the PEM or binary encoded files as
+ well as from signed-only messages. This command may also be used
+ to import a secret key from a PKCS#12 file.
+
+'--learn-card'
+ Read information about the private keys from the smartcard and
+ import the certificates from there. This command utilizes the
+ 'gpg-agent' and in turn the 'scdaemon'.
+
+'--passwd USER_ID'
+ Change the passphrase of the private key belonging to the
+ certificate specified as USER_ID. Note, that changing the
+ passphrase/PIN of a smartcard is not yet supported.
+
+
+File: gnupg.info, Node: GPGSM Options, Next: GPGSM Configuration, Prev: GPGSM Commands, Up: Invoking GPGSM
+
+5.2 Option Summary
+==================
+
+'GPGSM' features a bunch of options to control the exact behaviour and
+to change the default configuration.
+
+* Menu:
+
+* Configuration Options:: How to change the configuration.
+* Certificate Options:: Certificate related options.
+* Input and Output:: Input and Output.
+* CMS Options:: How to change how the CMS is created.
+* Esoteric Options:: Doing things one usually do not want to do.
+
+
+File: gnupg.info, Node: Configuration Options, Next: Certificate Options, Up: GPGSM Options
+
+5.2.1 How to change the configuration
+-------------------------------------
+
+These options are used to change the configuration and are usually found
+in the option file.
+
+'--options FILE'
+ Reads configuration from FILE instead of from the default per-user
+ configuration file. The default configuration file is named
+ 'gpgsm.conf' and expected in the '.gnupg' directory directly below
+ the home directory of the user.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. You can increase the
+ verbosity by giving several verbose commands to 'gpgsm', such as
+ '-vv'.
+
+'--policy-file FILENAME'
+ Change the default name of the policy file to FILENAME.
+
+'--agent-program FILE'
+ Specify an agent program to be used for secret key operations. The
+ default value is determined by running the command 'gpgconf'. Note
+ that the pipe symbol ('|') is used for a regression test suite hack
+ and may thus not be used in the file name.
+
+'--dirmngr-program FILE'
+ Specify a dirmngr program to be used for CRL checks. The default
+ value is '/usr/local/bin/dirmngr'.
+
+'--prefer-system-dirmngr'
+ If a system wide 'dirmngr' is running in daemon mode, first try to
+ connect to this one. Fallback to a pipe based server if this does
+ not work. Under Windows this option is ignored because the system
+ dirmngr is always used.
+
+'--disable-dirmngr'
+ Entirely disable the use of the Dirmngr.
+
+'--no-autostart'
+ Do not start the gpg-agent or the dirmngr if it has not yet been
+ started and its service is required. This option is mostly useful
+ on machines where the connection to gpg-agent has been redirected
+ to another machines. If dirmngr is required on the remote machine,
+ it may be started manually using 'gpgconf --launch dirmngr'.
+
+'--no-secmem-warning'
+ Do not print a warning when the so called "secure memory" cannot be
+ used.
+
+'--log-file FILE'
+ When running in server mode, append all logging output to FILE.
+
+
+File: gnupg.info, Node: Certificate Options, Next: Input and Output, Prev: Configuration Options, Up: GPGSM Options
+
+5.2.2 Certificate related options
+---------------------------------
+
+'--enable-policy-checks'
+'--disable-policy-checks'
+ By default policy checks are enabled. These options may be used to
+ change it.
+
+'--enable-crl-checks'
+'--disable-crl-checks'
+ By default the CRL checks are enabled and the DirMngr is used to
+ check for revoked certificates. The disable option is most useful
+ with an off-line network connection to suppress this check.
+
+'--enable-trusted-cert-crl-check'
+'--disable-trusted-cert-crl-check'
+ By default the CRL for trusted root certificates are checked like
+ for any other certificates. This allows a CA to revoke its own
+ certificates voluntary without the need of putting all ever issued
+ certificates into a CRL. The disable option may be used to switch
+ this extra check off. Due to the caching done by the Dirmngr,
+ there will not be any noticeable performance gain. Note, that this
+ also disables possible OCSP checks for trusted root certificates.
+ A more specific way of disabling this check is by adding the
+ "relax" keyword to the root CA line of the 'trustlist.txt'
+
+'--force-crl-refresh'
+ Tell the dirmngr to reload the CRL for each request. For better
+ performance, the dirmngr will actually optimize this by suppressing
+ the loading for short time intervals (e.g. 30 minutes). This
+ option is useful to make sure that a fresh CRL is available for
+ certificates hold in the keybox. The suggested way of doing this
+ is by using it along with the option '--with-validation' for a key
+ listing command. This option should not be used in a configuration
+ file.
+
+'--enable-ocsp'
+'--disable-ocsp'
+ By default OCSP checks are disabled. The enable option may be used
+ to enable OCSP checks via Dirmngr. If CRL checks are also enabled,
+ CRLs will be used as a fallback if for some reason an OCSP request
+ will not succeed. Note, that you have to allow OCSP requests in
+ Dirmngr's configuration too (option '--allow-ocsp') and configure
+ Dirmngr properly. If you do not do so you will get the error code
+ 'Not supported'.
+
+'--auto-issuer-key-retrieve'
+ If a required certificate is missing while validating the chain of
+ certificates, try to load that certificate from an external
+ location. This usually means that Dirmngr is employed to search
+ for the certificate. Note that this option makes a "web bug" like
+ behavior possible. LDAP server operators can see which keys you
+ request, so by sending you a message signed by a brand new key
+ (which you naturally will not have on your local keybox), the
+ operator can tell both your IP address and the time when you
+ verified the signature.
+
+'--validation-model NAME'
+ This option changes the default validation model. The only
+ possible values are "shell" (which is the default), "chain" which
+ forces the use of the chain model and "steed" for a new simplified
+ model. The chain model is also used if an option in the
+ 'trustlist.txt' or an attribute of the certificate requests it.
+ However the standard model (shell) is in that case always tried
+ first.
+
+'--ignore-cert-extension OID'
+ Add OID to the list of ignored certificate extensions. The OID is
+ expected to be in dotted decimal form, like '2.5.29.3'. This
+ option may be used more than once. Critical flagged certificate
+ extensions matching one of the OIDs in the list are treated as if
+ they are actually handled and thus the certificate will not be
+ rejected due to an unknown critical extension. Use this option
+ with care because extensions are usually flagged as critical for a
+ reason.
+
+
+File: gnupg.info, Node: Input and Output, Next: CMS Options, Prev: Certificate Options, Up: GPGSM Options
+
+5.2.3 Input and Output
+----------------------
+
+'--armor'
+'-a'
+ Create PEM encoded output. Default is binary output.
+
+'--base64'
+ Create Base-64 encoded output; i.e. PEM without the header lines.
+
+'--assume-armor'
+ Assume the input data is PEM encoded. Default is to autodetect the
+ encoding but this is may fail.
+
+'--assume-base64'
+ Assume the input data is plain base-64 encoded.
+
+'--assume-binary'
+ Assume the input data is binary encoded.
+
+'--p12-charset NAME'
+ 'gpgsm' uses the UTF-8 encoding when encoding passphrases for
+ PKCS#12 files. This option may be used to force the passphrase to
+ be encoded in the specified encoding NAME. This is useful if the
+ application used to import the key uses a different encoding and
+ thus will not be able to import a file generated by 'gpgsm'.
+ Commonly used values for NAME are 'Latin1' and 'CP850'. Note that
+ 'gpgsm' itself automagically imports any file with a passphrase
+ encoded to the most commonly used encodings.
+
+'--default-key USER_ID'
+ Use USER_ID as the standard key for signing. This key is used if
+ no other key has been defined as a signing key. Note, that the
+ first '--local-users' option also sets this key if it has not yet
+ been set; however '--default-key' always overrides this.
+
+'--local-user USER_ID'
+'-u USER_ID'
+ Set the user(s) to be used for signing. The default is the first
+ secret key found in the database.
+
+'--recipient NAME'
+'-r'
+ Encrypt to the user id NAME. There are several ways a user id may
+ be given (*note how-to-specify-a-user-id::).
+
+'--output FILE'
+'-o FILE'
+ Write output to FILE. The default is to write it to stdout.
+
+'--with-key-data'
+ Displays extra information with the '--list-keys' commands.
+ Especially a line tagged 'grp' is printed which tells you the
+ keygrip of a key. This string is for example used as the file name
+ of the secret key.
+
+'--with-validation'
+ When doing a key listing, do a full validation check for each key
+ and print the result. This is usually a slow operation because it
+ requires a CRL lookup and other operations.
+
+ When used along with -import, a validation of the certificate to
+ import is done and only imported if it succeeds the test. Note
+ that this does not affect an already available certificate in the
+ DB. This option is therefore useful to simply verify a certificate.
+
+'--with-md5-fingerprint'
+ For standard key listings, also print the MD5 fingerprint of the
+ certificate.
+
+'--with-keygrip'
+ Include the keygrip in standard key listings. Note that the
+ keygrip is always listed in -with-colons mode.
+
+'--with-secret'
+ Include info about the presence of a secret key in public key
+ listings done with '--with-colons'.
+
+
+File: gnupg.info, Node: CMS Options, Next: Esoteric Options, Prev: Input and Output, Up: GPGSM Options
+
+5.2.4 How to change how the CMS is created.
+-------------------------------------------
+
+'--include-certs N'
+ Using N of -2 includes all certificate except for the root cert, -1
+ includes all certs, 0 does not include any certs, 1 includes only
+ the signers cert and all other positive values include up to N
+ certificates starting with the signer cert. The default is -2.
+
+'--cipher-algo OID'
+ Use the cipher algorithm with the ASN.1 object identifier OID for
+ encryption. For convenience the strings '3DES', 'AES' and 'AES256'
+ may be used instead of their OIDs. The default is 'AES'
+ (2.16.840.1.101.3.4.1.2).
+
+'--digest-algo name'
+ Use 'name' as the message digest algorithm. Usually this algorithm
+ is deduced from the respective signing certificate. This option
+ forces the use of the given algorithm and may lead to severe
+ interoperability problems.
+
+
+File: gnupg.info, Node: Esoteric Options, Prev: CMS Options, Up: GPGSM Options
+
+5.2.5 Doing things one usually do not want to do.
+-------------------------------------------------
+
+'--extra-digest-algo NAME'
+ Sometimes signatures are broken in that they announce a different
+ digest algorithm than actually used. 'gpgsm' uses a one-pass data
+ processing model and thus needs to rely on the announced digest
+ algorithms to properly hash the data. As a workaround this option
+ may be used to tell gpg to also hash the data using the algorithm
+ NAME; this slows processing down a little bit but allows to verify
+ such broken signatures. If 'gpgsm' prints an error like "digest
+ algo 8 has not been enabled" you may want to try this option, with
+ 'SHA256' for NAME.
+
+'--faked-system-time EPOCH'
+ This option is only useful for testing; it sets the system time
+ back or forth to EPOCH which is the number of seconds elapsed since
+ the year 1970. Alternatively EPOCH may be given as a full ISO time
+ string (e.g. "20070924T154812").
+
+'--with-ephemeral-keys'
+ Include ephemeral flagged keys in the output of key listings. Note
+ that they are included anyway if the key specification for a
+ listing is given as fingerprint or keygrip.
+
+'--debug-level LEVEL'
+ Select the debug level for investigating problems. LEVEL may be a
+ numeric value or by a keyword:
+
+ 'none'
+ No debugging at all. A value of less than 1 may be used
+ instead of the keyword.
+ 'basic'
+ Some basic debug messages. A value between 1 and 2 may be
+ used instead of the keyword.
+ 'advanced'
+ More verbose debug messages. A value between 3 and 5 may be
+ used instead of the keyword.
+ 'expert'
+ Even more detailed messages. A value between 6 and 8 may be
+ used instead of the keyword.
+ 'guru'
+ All of the debug messages you can get. A value greater than 8
+ may be used instead of the keyword. The creation of hash
+ tracing files is only enabled if the keyword is used.
+
+ How these messages are mapped to the actual debugging flags is not
+ specified and may change with newer releases of this program. They
+ are however carefully selected to best aid in debugging.
+
+'--debug FLAGS'
+ This option is only useful for debugging and the behaviour may
+ change at any time without notice; using '--debug-levels' is the
+ preferred method to select the debug verbosity. FLAGS are bit
+ encoded and may be given in usual C-Syntax. The currently defined
+ bits are:
+
+ '0 (1)'
+ X.509 or OpenPGP protocol related data
+ '1 (2)'
+ values of big number integers
+ '2 (4)'
+ low level crypto operations
+ '5 (32)'
+ memory allocation
+ '6 (64)'
+ caching
+ '7 (128)'
+ show memory statistics.
+ '9 (512)'
+ write hashed data to files named 'dbgmd-000*'
+ '10 (1024)'
+ trace Assuan protocol
+
+ Note, that all flags set using this option may get overridden by
+ '--debug-level'.
+
+'--debug-all'
+ Same as '--debug=0xffffffff'
+
+'--debug-allow-core-dump'
+ Usually 'gpgsm' tries to avoid dumping core by well written code
+ and by disabling core dumps for security reasons. However, bugs
+ are pretty durable beasts and to squash them it is sometimes useful
+ to have a core dump. This option enables core dumps unless the Bad
+ Thing happened before the option parsing.
+
+'--debug-no-chain-validation'
+ This is actually not a debugging option but only useful as such.
+ It lets 'gpgsm' bypass all certificate chain validation checks.
+
+'--debug-ignore-expiration'
+ This is actually not a debugging option but only useful as such.
+ It lets 'gpgsm' ignore all notAfter dates, this is used by the
+ regression tests.
+
+'--passphrase-fd n'
+ Read the passphrase from file descriptor 'n'. Only the first line
+ will be read from file descriptor 'n'. If you use 0 for 'n', the
+ passphrase will be read from STDIN. This can only be used if only
+ one passphrase is supplied.
+
+ Note that this passphrase is only used if the option '--batch' has
+ also been given.
+
+'--pinentry-mode mode'
+ Set the pinentry mode to 'mode'. Allowed values for 'mode' are:
+ default
+ Use the default of the agent, which is 'ask'.
+ ask
+ Force the use of the Pinentry.
+ cancel
+ Emulate use of Pinentry's cancel button.
+ error
+ Return a Pinentry error ("No Pinentry").
+ loopback
+ Redirect Pinentry queries to the caller. Note that in
+ contrast to Pinentry the user is not prompted again if he
+ enters a bad password.
+
+'--no-common-certs-import'
+ Suppress the import of common certificates on keybox creation.
+
+ All the long options may also be given in the configuration file
+after stripping off the two leading dashes.
+
+
+File: gnupg.info, Node: GPGSM Configuration, Next: GPGSM Examples, Prev: GPGSM Options, Up: Invoking GPGSM
+
+5.3 Configuration files
+=======================
+
+There are a few configuration files to control certain aspects of
+'gpgsm''s operation. Unless noted, they are expected in the current
+home directory (*note option --homedir::).
+
+'gpgsm.conf'
+ This is the standard configuration file read by 'gpgsm' on startup.
+ It may contain any valid long option; the leading two dashes may
+ not be entered and the option may not be abbreviated. This default
+ name may be changed on the command line (*note gpgsm-option
+ --options::). You should backup this file.
+
+'policies.txt'
+ This is a list of allowed CA policies. This file should list the
+ object identifiers of the policies line by line. Empty lines and
+ lines starting with a hash mark are ignored. Policies missing in
+ this file and not marked as critical in the certificate will print
+ only a warning; certificates with policies marked as critical and
+ not listed in this file will fail the signature verification. You
+ should backup this file.
+
+ For example, to allow only the policy 2.289.9.9, the file should
+ look like this:
+
+ # Allowed policies
+ 2.289.9.9
+
+'qualified.txt'
+ This is the list of root certificates used for qualified
+ certificates. They are defined as certificates capable of creating
+ legally binding signatures in the same way as handwritten
+ signatures are. Comments start with a hash mark and empty lines
+ are ignored. Lines do have a length limit but this is not a
+ serious limitation as the format of the entries is fixed and
+ checked by gpgsm: A non-comment line starts with optional
+ whitespace, followed by exactly 40 hex character, white space and a
+ lowercased 2 letter country code. Additional data delimited with
+ by a white space is current ignored but might late be used for
+ other purposes.
+
+ Note that even if a certificate is listed in this file, this does
+ not mean that the certificate is trusted; in general the
+ certificates listed in this file need to be listed also in
+ 'trustlist.txt'.
+
+ This is a global file an installed in the data directory (e.g.
+ '/usr/local/share/gnupg/qualified.txt'). GnuPG installs a suitable
+ file with root certificates as used in Germany. As new Root-CA
+ certificates may be issued over time, these entries may need to be
+ updated; new distributions of this software should come with an
+ updated list but it is still the responsibility of the
+ Administrator to check that this list is correct.
+
+ Everytime 'gpgsm' uses a certificate for signing or verification
+ this file will be consulted to check whether the certificate under
+ question has ultimately been issued by one of these CAs. If this
+ is the case the user will be informed that the verified signature
+ represents a legally binding ("qualified") signature. When
+ creating a signature using such a certificate an extra prompt will
+ be issued to let the user confirm that such a legally binding
+ signature shall really be created.
+
+ Because this software has not yet been approved for use with such
+ certificates, appropriate notices will be shown to indicate this
+ fact.
+
+'help.txt'
+ This is plain text file with a few help entries used with
+ 'pinentry' as well as a large list of help items for 'gpg' and
+ 'gpgsm'. The standard file has English help texts; to install
+ localized versions use filenames like 'help.LL.txt' with LL
+ denoting the locale. GnuPG comes with a set of predefined help
+ files in the data directory (e.g.
+ '/usr/local/share/gnupg/gnupg/help.de.txt') and allows overriding
+ of any help item by help files stored in the system configuration
+ directory (e.g. '/etc/gnupg/help.de.txt'). For a reference of the
+ help file's syntax, please see the installed 'help.txt' file.
+
+'com-certs.pem'
+ This file is a collection of common certificates used to populated
+ a newly created 'pubring.kbx'. An administrator may replace this
+ file with a custom one. The format is a concatenation of PEM
+ encoded X.509 certificates. This global file is installed in the
+ data directory (e.g. '/usr/local/share/gnupg/com-certs.pem').
+
+ Note that on larger installations, it is useful to put predefined
+files into the directory '/etc/skel/.gnupg/' so that newly created users
+start up with a working configuration. For existing users a small
+helper script is provided to create these files (*note addgnupghome::).
+
+ For internal purposes gpgsm creates and maintains a few other files;
+they all live in in the current home directory (*note option
+--homedir::). Only 'gpgsm' may modify these files.
+
+'pubring.kbx'
+ This a database file storing the certificates as well as meta
+ information. For debugging purposes the tool 'kbxutil' may be used
+ to show the internal structure of this file. You should backup
+ this file.
+
+'random_seed'
+ This content of this file is used to maintain the internal state of
+ the random number generator across invocations. The same file is
+ used by other programs of this software too.
+
+'S.gpg-agent'
+ If this file exists 'gpgsm' will first try to connect to this
+ socket for accessing 'gpg-agent' before starting a new 'gpg-agent'
+ instance. Under Windows this socket (which in reality be a plain
+ file describing a regular TCP listening port) is the standard way
+ of connecting the 'gpg-agent'.
+
+
+File: gnupg.info, Node: GPGSM Examples, Next: Unattended Usage, Prev: GPGSM Configuration, Up: Invoking GPGSM
+
+5.4 Examples
+============
+
+ $ gpgsm -er goo at bar.net <plaintext >ciphertext
+
+
+File: gnupg.info, Node: Unattended Usage, Next: GPGSM Protocol, Prev: GPGSM Examples, Up: Invoking GPGSM
+
+5.5 Unattended Usage
+====================
+
+'gpgsm' is often used as a backend engine by other software. To help
+with this a machine interface has been defined to have an unambiguous
+way to do this. This is most likely used with the '--server' command
+but may also be used in the standard operation mode by using the
+'--status-fd' option.
+
+* Menu:
+
+* Automated signature checking:: Automated signature checking.
+* CSR and certificate creation:: CSR and certificate creation.
+
+
+File: gnupg.info, Node: Automated signature checking, Next: CSR and certificate creation, Up: Unattended Usage
+
+5.5.1 Automated signature checking
+----------------------------------
+
+It is very important to understand the semantics used with signature
+verification. Checking a signature is not as simple as it may sound and
+so the operation is a bit complicated. In most cases it is required to
+look at several status lines. Here is a table of all cases a signed
+message may have:
+
+The signature is valid
+ This does mean that the signature has been successfully verified,
+ the certificates are all sane. However there are two subcases with
+ important information: One of the certificates may have expired or
+ a signature of a message itself as expired. It is a sound practise
+ to consider such a signature still as valid but additional
+ information should be displayed. Depending on the subcase 'gpgsm'
+ will issue these status codes:
+ signature valid and nothing did expire
+ 'GOODSIG', 'VALIDSIG', 'TRUST_FULLY'
+ signature valid but at least one certificate has expired
+ 'EXPKEYSIG', 'VALIDSIG', 'TRUST_FULLY'
+ signature valid but expired
+ 'EXPSIG', 'VALIDSIG', 'TRUST_FULLY' Note, that this case is
+ currently not implemented.
+
+The signature is invalid
+ This means that the signature verification failed (this is an
+ indication of af a transfer error, a program error or tampering
+ with the message). 'gpgsm' issues one of these status codes
+ sequences:
+ 'BADSIG'
+ 'GOODSIG, VALIDSIG TRUST_NEVER'
+
+Error verifying a signature
+ For some reason the signature could not be verified, i.e. it
+ cannot be decided whether the signature is valid or invalid. A
+ common reason for this is a missing certificate.
+
+
+File: gnupg.info, Node: CSR and certificate creation, Prev: Automated signature checking, Up: Unattended Usage
+
+5.5.2 CSR and certificate creation
+----------------------------------
+
+The command '--gen-key' may be used along with the option '--batch' to
+either create a certificate signing request (CSR) or an X.509
+certificate. This is controlled by a parameter file; the format of this
+file is as follows:
+
+ * Text only, line length is limited to about 1000 characters.
+ * UTF-8 encoding must be used to specify non-ASCII characters.
+ * Empty lines are ignored.
+ * Leading and trailing while space is ignored.
+ * A hash sign as the first non white space character indicates a
+ comment line.
+ * Control statements are indicated by a leading percent sign, the
+ arguments are separated by white space from the keyword.
+ * Parameters are specified by a keyword, followed by a colon.
+ Arguments are separated by white space.
+ * The first parameter must be 'Key-Type', control statements may be
+ placed anywhere.
+ * The order of the parameters does not matter except for 'Key-Type'
+ which must be the first parameter. The parameters are only used
+ for the generated CSR/certificate; parameters from previous sets
+ are not used. Some syntactically checks may be performed.
+ * Key generation takes place when either the end of the parameter
+ file is reached, the next 'Key-Type' parameter is encountered or at
+ the control statement '%commit' is encountered.
+
+Control statements:
+
+%echo TEXT
+ Print TEXT as diagnostic.
+
+%dry-run
+ Suppress actual key generation (useful for syntax checking).
+
+%commit
+ Perform the key generation. Note that an implicit commit is done
+ at the next Key-Type parameter.
+
+General Parameters:
+
+Key-Type: ALGO
+ Starts a new parameter block by giving the type of the primary key.
+ The algorithm must be capable of signing. This is a required
+ parameter. The only supported value for ALGO is 'rsa'.
+
+Key-Length: NBITS
+ The requested length of a generated key in bits. Defaults to 2048.
+
+Key-Grip: HEXSTRING
+ This is optional and used to generate a CSR or certificatet for an
+ already existing key. Key-Length will be ignored when given.
+
+Key-Usage: USAGE-LIST
+ Space or comma delimited list of key usage, allowed values are
+ 'encrypt', 'sign' and 'cert'. This is used to generate the
+ keyUsage extension. Please make sure that the algorithm is capable
+ of this usage. Default is to allow encrypt and sign.
+
+Name-DN: SUBJECT-NAME
+ This is the Distinguished Name (DN) of the subject in RFC-2253
+ format.
+
+Name-Email: STRING
+ This is an email address for the altSubjectName. This parameter is
+ optional but may occur several times to add several email addresses
+ to a certificate.
+
+Name-DNS: STRING
+ The is an DNS name for the altSubjectName. This parameter is
+ optional but may occur several times to add several DNS names to a
+ certificate.
+
+Name-URI: STRING
+ This is an URI for the altSubjectName. This parameter is optional
+ but may occur several times to add several URIs to a certificate.
+
+Additional parameters used to create a certificate (in contrast to a
+certificate signing request):
+
+Serial: SN
+ If this parameter is given an X.509 certificate will be generated.
+ SN is expected to be a hex string representing an unsigned integer
+ of arbitary length. The special value 'random' can be used to
+ create a 64 bit random serial number.
+
+Issuer-DN: ISSUER-NAME
+ This is the DN name of the issuer in rfc2253 format. If it is not
+ set it will default to the subject DN and a special GnuPG extension
+ will be included in the certificate to mark it as a standalone
+ certificate.
+
+Creation-Date: ISO-DATE
+Not-Before: ISO-DATE
+ Set the notBefore date of the certificate. Either a date like
+ '1986-04-26' or '1986-04-26 12:00' or a standard ISO timestamp like
+ '19860426T042640' may be used. The time is considered to be UTC.
+ If it is not given the current date is used.
+
+Expire-Date: ISO-DATE
+Not-After: ISO-DATE
+ Set the notAfter date of the certificate. Either a date like
+ '2063-04-05' or '2063-04-05 17:00' or a standard ISO timestamp like
+ '20630405T170000' may be used. The time is considered to be UTC.
+ If it is not given a default value in the not too far future is
+ used.
+
+Signing-Key: KEYGRIP
+ This gives the keygrip of the key used to sign the certificate. If
+ it is not given a self-signed certificate will be created. For
+ compatibility with future versions, it is suggested to prefix the
+ keygrip with a '&'.
+
+Hash-Algo: HASH-ALGO
+ Use HASH-ALGO for this CSR or certificate. The supported hash
+ algorithms are: 'sha1', 'sha256', 'sha384' and 'sha512'; they may
+ also be specified with uppercase letters. The default is 'sha256'.
+
+
+File: gnupg.info, Node: GPGSM Protocol, Prev: Unattended Usage, Up: Invoking GPGSM
+
+5.6 The Protocol the Server Mode Uses.
+======================================
+
+Description of the protocol used to access 'GPGSM'. 'GPGSM' does
+implement the Assuan protocol and in addition provides a regular command
+line interface which exhibits a full client to this protocol (but uses
+internal linking). To start 'gpgsm' as a server the command line the
+option '--server' must be used. Additional options are provided to
+select the communication method (i.e. the name of the socket).
+
+ We assume that the connection has already been established; see the
+Assuan manual for details.
+
+* Menu:
+
+* GPGSM ENCRYPT:: Encrypting a message.
+* GPGSM DECRYPT:: Decrypting a message.
+* GPGSM SIGN:: Signing a message.
+* GPGSM VERIFY:: Verifying a message.
+* GPGSM GENKEY:: Generating a key.
+* GPGSM LISTKEYS:: List available keys.
+* GPGSM EXPORT:: Export certificates.
+* GPGSM IMPORT:: Import certificates.
+* GPGSM DELETE:: Delete certificates.
+* GPGSM GETAUDITLOG:: Retrieve an audit log.
+* GPGSM GETINFO:: Information about the process
+* GPGSM OPTION:: Session options.
+
+
+File: gnupg.info, Node: GPGSM ENCRYPT, Next: GPGSM DECRYPT, Up: GPGSM Protocol
+
+5.6.1 Encrypting a Message
+--------------------------
+
+Before encryption can be done the recipient must be set using the
+command:
+
+ RECIPIENT USERID
+
+ Set the recipient for the encryption. USERID should be the internal
+representation of the key; the server may accept any other way of
+specification. If this is a valid and trusted recipient the server does
+respond with OK, otherwise the return is an ERR with the reason why the
+recipient cannot be used, the encryption will then not be done for this
+recipient. If the policy is not to encrypt at all if not all recipients
+are valid, the client has to take care of this. All 'RECIPIENT'
+commands are cumulative until a 'RESET' or an successful 'ENCRYPT'
+command.
+
+ INPUT FD[=N] [--armor|--base64|--binary]
+
+ Set the file descriptor for the message to be encrypted to N.
+Obviously the pipe must be open at that point, the server establishes
+its own end. If the server returns an error the client should consider
+this session failed. If N is not given, this commands uses the last
+file descriptor passed to the application. *Note the assuan_sendfd
+function: (assuan)fun-assuan_sendfd, on how to do descriptor passing.
+
+ The '--armor' option may be used to advice the server that the input
+data is in PEM format, '--base64' advices that a raw base-64 encoding is
+used, '--binary' advices of raw binary input (BER). If none of these
+options is used, the server tries to figure out the used encoding, but
+this may not always be correct.
+
+ OUTPUT FD[=N] [--armor|--base64]
+
+ Set the file descriptor to be used for the output (i.e. the
+encrypted message). Obviously the pipe must be open at that point, the
+server establishes its own end. If the server returns an error he
+client should consider this session failed.
+
+ The option armor encodes the output in PEM format, the '--base64'
+option applies just a base 64 encoding. No option creates binary output
+(BER).
+
+ The actual encryption is done using the command
+
+ ENCRYPT
+
+ It takes the plaintext from the 'INPUT' command, writes to the
+ciphertext to the file descriptor set with the 'OUTPUT' command, take
+the recipients from all the recipients set so far. If this command
+fails the clients should try to delete all output currently done or
+otherwise mark it as invalid. 'GPGSM' does ensure that there will not
+be any security problem with leftover data on the output in this case.
+
+ This command should in general not fail, as all necessary checks have
+been done while setting the recipients. The input and output pipes are
+closed.
+
+
+File: gnupg.info, Node: GPGSM DECRYPT, Next: GPGSM SIGN, Prev: GPGSM ENCRYPT, Up: GPGSM Protocol
+
+5.6.2 Decrypting a message
+--------------------------
+
+Input and output FDs are set the same way as in encryption, but 'INPUT'
+refers to the ciphertext and output to the plaintext. There is no need
+to set recipients. 'GPGSM' automatically strips any S/MIME headers from
+the input, so it is valid to pass an entire MIME part to the INPUT pipe.
+
+ The encryption is done by using the command
+
+ DECRYPT
+
+ It performs the decrypt operation after doing some check on the
+internal state. (e.g. that all needed data has been set). Because it
+utilizes the GPG-Agent for the session key decryption, there is no need
+to ask the client for a protecting passphrase - GpgAgent takes care of
+this by requesting this from the user.
+
+
+File: gnupg.info, Node: GPGSM SIGN, Next: GPGSM VERIFY, Prev: GPGSM DECRYPT, Up: GPGSM Protocol
+
+5.6.3 Signing a Message
+-----------------------
+
+Signing is usually done with these commands:
+
+ INPUT FD[=N] [--armor|--base64|--binary]
+
+ This tells 'GPGSM' to read the data to sign from file descriptor N.
+
+ OUTPUT FD[=M] [--armor|--base64]
+
+ Write the output to file descriptor M. If a detached signature is
+requested, only the signature is written.
+
+ SIGN [--detached]
+
+ Sign the data set with the INPUT command and write it to the sink set
+by OUTPUT. With '--detached', a detached signature is created
+(surprise).
+
+ The key used for signing is the default one or the one specified in
+the configuration file. To get finer control over the keys, it is
+possible to use the command
+
+ SIGNER USERID
+
+ to the signer's key. USERID should be the internal representation of
+the key; the server may accept any other way of specification. If this
+is a valid and trusted recipient the server does respond with OK,
+otherwise the return is an ERR with the reason why the key cannot be
+used, the signature will then not be created using this key. If the
+policy is not to sign at all if not all keys are valid, the client has
+to take care of this. All 'SIGNER' commands are cumulative until a
+'RESET' is done. Note that a 'SIGN' does not reset this list of signers
+which is in contrats to the 'RECIPIENT' command.
+
+
+File: gnupg.info, Node: GPGSM VERIFY, Next: GPGSM GENKEY, Prev: GPGSM SIGN, Up: GPGSM Protocol
+
+5.6.4 Verifying a Message
+-------------------------
+
+To verify a mesage the command:
+
+ VERIFY
+
+ is used. It does a verify operation on the message send to the input
+FD. The result is written out using status lines. If an output FD was
+given, the signed text will be written to that. If the signature is a
+detached one, the server will inquire about the signed material and the
+client must provide it.
+
+
+File: gnupg.info, Node: GPGSM GENKEY, Next: GPGSM LISTKEYS, Prev: GPGSM VERIFY, Up: GPGSM Protocol
+
+5.6.5 Generating a Key
+----------------------
+
+This is used to generate a new keypair, store the secret part in the PSE
+and the public key in the key database. We will probably add optional
+commands to allow the client to select whether a hardware token is used
+to store the key. Configuration options to 'GPGSM' can be used to
+restrict the use of this command.
+
+ GENKEY
+
+ 'GPGSM' checks whether this command is allowed and then does an
+INQUIRY to get the key parameters, the client should then send the key
+parameters in the native format:
+
+ S: INQUIRE KEY_PARAM native
+ C: D foo:fgfgfg
+ C: D bar
+ C: END
+
+ Please note that the server may send Status info lines while reading
+the data lines from the client. After this the key generation takes
+place and the server eventually does send an ERR or OK response. Status
+lines may be issued as a progress indicator.
+
+
+File: gnupg.info, Node: GPGSM LISTKEYS, Next: GPGSM EXPORT, Prev: GPGSM GENKEY, Up: GPGSM Protocol
+
+5.6.6 List available keys
+-------------------------
+
+To list the keys in the internal database or using an external key
+provider, the command:
+
+ LISTKEYS PATTERN
+
+ is used. To allow multiple patterns (which are ORed during the
+search) quoting is required: Spaces are to be translated into "+" or
+into "%20"; in turn this requires that the usual escape quoting rules
+are done.
+
+ LISTSECRETKEYS PATTERN
+
+ Lists only the keys where a secret key is available.
+
+ The list commands commands are affected by the option
+
+ OPTION list-mode=MODE
+
+ where mode may be:
+'0'
+ Use default (which is usually the same as 1).
+'1'
+ List only the internal keys.
+'2'
+ List only the external keys.
+'3'
+ List internal and external keys.
+
+ Note that options are valid for the entire session.
+
+
+File: gnupg.info, Node: GPGSM EXPORT, Next: GPGSM IMPORT, Prev: GPGSM LISTKEYS, Up: GPGSM Protocol
+
+5.6.7 Export certificates
+-------------------------
+
+To export certificate from the internal key database the command:
+
+ EXPORT [--data [--armor] [--base64]] [--] PATTERN
+
+ is used. To allow multiple patterns (which are ORed) quoting is
+required: Spaces are to be translated into "+" or into "%20"; in turn
+this requires that the usual escape quoting rules are done.
+
+ If the '--data' option has not been given, the format of the output
+depends on what was set with the OUTPUT command. When using PEM
+encoding a few informational lines are prepended.
+
+ If the '--data' has been given, a target set via OUTPUT is ignored
+and the data is returned inline using standard 'D'-lines. This avoids
+the need for an extra file descriptor. In this case the options
+'--armor' and '--base64' may be used in the same way as with the OUTPUT
+command.
+
+
+File: gnupg.info, Node: GPGSM IMPORT, Next: GPGSM DELETE, Prev: GPGSM EXPORT, Up: GPGSM Protocol
+
+5.6.8 Import certificates
+-------------------------
+
+To import certificates into the internal key database, the command
+
+ IMPORT [--re-import]
+
+ is used. The data is expected on the file descriptor set with the
+'INPUT' command. Certain checks are performed on the certificate. Note
+that the code will also handle PKCS#12 files and import private keys; a
+helper program is used for that.
+
+ With the option '--re-import' the input data is expected to a be a
+linefeed separated list of fingerprints. The command will re-import the
+corresponding certificates; that is they are made permanent by removing
+their ephemeral flag.
+
+
+File: gnupg.info, Node: GPGSM DELETE, Next: GPGSM GETAUDITLOG, Prev: GPGSM IMPORT, Up: GPGSM Protocol
+
+5.6.9 Delete certificates
+-------------------------
+
+To delete a certificate the command
+
+ DELKEYS PATTERN
+
+ is used. To allow multiple patterns (which are ORed) quoting is
+required: Spaces are to be translated into "+" or into "%20"; in turn
+this requires that the usual escape quoting rules are done.
+
+ The certificates must be specified unambiguously otherwise an error
+is returned.
+
+
+File: gnupg.info, Node: GPGSM GETAUDITLOG, Next: GPGSM GETINFO, Prev: GPGSM DELETE, Up: GPGSM Protocol
+
+5.6.10 Retrieve an audit log.
+-----------------------------
+
+This command is used to retrieve an audit log.
+
+ GETAUDITLOG [--data] [--html]
+
+ If '--data' is used, the audit log is send using D-lines instead of
+being sent to the file descriptor given by an OUTPUT command. If
+'--html' is used, the output is formated as an XHTML block. This is
+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.
-
diff --cc doc/gnupg.info-2
index 569092d,0000000..2879321
mode 100644,000000..100644
--- a/doc/gnupg.info-2
+++ b/doc/gnupg.info-2
@@@ -1,4167 -1,0 +1,4324 @@@
+This is gnupg.info, produced by makeinfo version 5.2 from gnupg.texi.
+
- This is the 'The GNU Privacy Guard Manual' (version 2.1.13, June 2016).
++This is the 'The GNU Privacy Guard Manual' (version 2.1.14, July 2016).
+
+ (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
+(C) 2013, 2014, 2015 Werner Koch.
+(C) 2015 g10 Code GmbH.
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or (at your option) any later version. The text of the
+ license can be found in the section entitled "Copying".
+INFO-DIR-SECTION GNU Utilities
+START-INFO-DIR-ENTRY
+* gpg2: (gnupg). OpenPGP encryption and signing tool.
+* gpgsm: (gnupg). S/MIME encryption and signing tool.
+* gpg-agent: (gnupg). The secret key daemon.
+* dirmngr: (gnupg). X.509 CRL and OCSP server.
+* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+END-INFO-DIR-ENTRY
+
+
++File: gnupg.info, Node: Scdaemon APDU, Prev: Scdaemon RESTART, Up: Scdaemon Protocol
++
++6.6.15 Send a verbatim APDU to the card.
++----------------------------------------
++
++ APDU [--atr] [--more] [--exlen[=N]] [HEXSTRING]
++
++ Send an APDU to the current reader. This command bypasses the high
++level functions and sends the data directly to the card. HEXSTRING is
++expected to be a proper APDU. If HEXSTRING is not given no commands are
++send to the card; However the command will implicitly check whether the
++card is ready for use.
++
++ Using the option '--atr' returns the ATR of the card as a status
++message before any data like this:
++ S CARD-ATR 3BFA1300FF813180450031C173C00100009000B1
++
++ Using the option '--more' handles the card status word MORE_DATA
++(61xx) and concatenate all responses to one block.
++
++ Using the option '--exlen' the returned APDU may use extended length
++up to N bytes. If N is not given a default value is used (currently
++4096).
++
++
++File: gnupg.info, Node: Specify a User ID, Next: Helper Tools, Prev: Invoking SCDAEMON, Up: Top
++
++7 How to Specify a User Id
++**************************
++
++There are different ways to specify a user ID to GnuPG. Some of them are
++only valid for 'gpg' others are only good for 'gpgsm'. Here is the
++entire list of ways to specify a key:
++
++ * By key Id. This format is deduced from the length of the string
++ and its content or '0x' prefix. The key Id of an X.509 certificate
++ are the low 64 bits of its SHA-1 fingerprint. The use of key Ids
++ is just a shortcut, for all automated processing the fingerprint
++ should be used.
++
++ When using 'gpg' an exclamation mark (!) may be appended to force
++ using the specified primary or secondary key and not to try and
++ calculate which primary or secondary key to use.
++
++ The last four lines of the example give the key ID in their long
++ form as internally used by the OpenPGP protocol. You can see the
++ long key ID using the option '--with-colons'.
++
++ 234567C4
++ 0F34E556E
++ 01347A56A
++ 0xAB123456
++
++ 234AABBCC34567C4
++ 0F323456784E56EAB
++ 01AB3FED1347A5612
++ 0x234AABBCC34567C4
++
++ * By fingerprint. This format is deduced from the length of the
++ string and its content or the '0x' prefix. Note, that only the 20
++ byte version fingerprint is available with 'gpgsm' (i.e. the SHA-1
++ hash of the certificate).
++
++ When using 'gpg' an exclamation mark (!) may be appended to force
++ using the specified primary or secondary key and not to try and
++ calculate which primary or secondary key to use.
++
++ The best way to specify a key Id is by using the fingerprint. This
++ avoids any ambiguities in case that there are duplicated key IDs.
++
++ 1234343434343434C434343434343434
++ 123434343434343C3434343434343734349A3434
++ 0E12343434343434343434EAB3484343434343434
++ 0xE12343434343434343434EAB3484343434343434
++
++ 'gpgsm' also accepts colons between each pair of hexadecimal digits
++ because this is the de-facto standard on how to present X.509
++ fingerprints. 'gpg' also allows the use of the space separated
++ SHA-1 fingerprint as printed by the key listing commands.
++
++ * By exact match on OpenPGP user ID. This is denoted by a leading
++ equal sign. It does not make sense for X.509 certificates.
++
++ =Heinrich Heine <heinrichh at uni-duesseldorf.de>
++
++ * By exact match on an email address. This is indicated by enclosing
++ the email address in the usual way with left and right angles.
++
++ <heinrichh at uni-duesseldorf.de>
++
++ * By partial match on an email address. This is indicated by
++ prefixing the search string with an '@'. This uses a substring
++ search but considers only the mail address (i.e. inside the angle
++ brackets).
++
++ @heinrichh
++
++ * By exact match on the subject's DN. This is indicated by a leading
++ slash, directly followed by the RFC-2253 encoded DN of the subject.
++ Note that you can't use the string printed by "gpgsm -list-keys"
++ because that one as been reordered and modified for better
++ readability; use -with-colons to print the raw (but standard
++ escaped) RFC-2253 string
++
++ /CN=Heinrich Heine,O=Poets,L=Paris,C=FR
++
++ * By exact match on the issuer's DN. This is indicated by a leading
++ hash mark, directly followed by a slash and then directly followed
++ by the rfc2253 encoded DN of the issuer. This should return the
++ Root cert of the issuer. See note above.
++
++ #/CN=Root Cert,O=Poets,L=Paris,C=FR
++
++ * By exact match on serial number and issuer's DN. This is indicated
++ by a hash mark, followed by the hexadecimal representation of the
++ serial number, then followed by a slash and the RFC-2253 encoded DN
++ of the issuer. See note above.
++
++ #4F03/CN=Root Cert,O=Poets,L=Paris,C=FR
++
++ * By keygrip This is indicated by an ampersand followed by the 40 hex
++ digits of a keygrip. 'gpgsm' prints the keygrip when using the
++ command '--dump-cert'. It does not yet work for OpenPGP keys.
++
++ &D75F22C3F86E355877348498CDC92BD21010A480
++
++ * By substring match. This is the default mode but applications may
++ want to explicitly indicate this by putting the asterisk in front.
++ Match is not case sensitive.
++
++ Heine
++ *Heine
++
++ * . and + prefixes These prefixes are reserved for looking up mails
++ anchored at the end and for a word search mode. They are not yet
++ implemented and using them is undefined.
++
++ Please note that we have reused the hash mark identifier which was
++used in old GnuPG versions to indicate the so called local-id. It is
++not anymore used and there should be no conflict when used with X.509
++stuff.
++
++ Using the RFC-2253 format of DNs has the drawback that it is not
++possible to map them back to the original encoding, however we don't
++have to do this because our key database stores this encoding as meta
++data.
++
++
+File: gnupg.info, Node: Helper Tools, Next: Howtos, Prev: Specify a User ID, Up: Top
+
+8 Helper Tools
+**************
+
+GnuPG comes with a couple of smaller tools:
+
+* Menu:
+
+* watchgnupg:: Read logs from a socket.
+* gpgv:: Verify OpenPGP signatures.
+* addgnupghome:: Create .gnupg home directories.
+* gpgconf:: Modify .gnupg home directories.
+* applygnupgdefaults:: Run gpgconf for all users.
+* gpg-preset-passphrase:: Put a passphrase into the cache.
+* gpg-connect-agent:: Communicate with a running agent.
+* dirmngr-client:: How to use the Dirmngr client tool.
+* gpgparsemail:: Parse a mail message into an annotated format
+* symcryptrun:: Call a simple symmetric encryption tool.
+* gpg-zip:: Encrypt or sign files into an archive.
+
+
+File: gnupg.info, Node: watchgnupg, Next: gpgv, Up: Helper Tools
+
+8.1 Read logs from a socket
+===========================
+
+Most of the main utilities are able to write their log files to a Unix
+Domain socket if configured that way. 'watchgnupg' is a simple listener
+for such a socket. It ameliorates the output with a time stamp and
+makes sure that long lines are not interspersed with log output from
+other utilities. This tool is not available for Windows.
+
+'watchgnupg' is commonly invoked as
+
+ watchgnupg --force ~/.gnupg/S.log
+
+This starts it on the current terminal for listening on the socket
+'~/.gnupg/S.log'.
+
+'watchgnupg' understands these options:
+
+'--force'
+ Delete an already existing socket file.
+
+'--tcp N'
+ Instead of reading from a local socket, listen for connects on TCP
+ port N.
+
+'--verbose'
+ Enable extra informational output.
+
+'--version'
+ Print version of the program and exit.
+
+'--help'
+ Display a brief help page and exit.
+
+Examples
+********
+
+ $ watchgnupg --force /home/foo/.gnupg/S.log
+
+ This waits for connections on the local socket
+'/home/foo/.gnupg/S.log' and shows all log entries. To make this work
+the option 'log-file' needs to be used with all modules which logs are
+to be shown. The value for that option must be given with a special
+prefix (e.g. in the conf file):
+
+ log-file socket:///home/foo/.gnupg/S.log
+
+ For debugging purposes it is also possible to do remote logging.
+Take care if you use this feature because the information is send in the
+clear over the network. Use this syntax in the conf files:
+
+ log-file tcp://192.168.1.1:4711
+
+ You may use any port and not just 4711 as shown above; only IP
+addresses are supported (v4 and v6) and no host names. You need to
+start 'watchgnupg' with the 'tcp' option. Note that under Windows the
+registry entry HKCU\SOFTWARE\GNU\GNUPG:DEFAULTLOGFILE can be used to
+change the default log output from 'stderr' to whatever is given by that
+entry. However the only useful entry is a TCP name for remote
+debugging.
+
+
+File: gnupg.info, Node: gpgv, Next: addgnupghome, Prev: watchgnupg, Up: Helper Tools
+
+8.2 Verify OpenPGP signatures
+=============================
+
+'gpgv' is an OpenPGP signature verification tool.
+
+ This program is actually a stripped-down version of 'gpg' which is
+only able to check signatures. It is somewhat smaller than the
+fully-blown 'gpg' and uses a different (and simpler) way to check that
+the public keys used to make the signature are valid. There are no
+configuration files and only a few options are implemented.
+
+ 'gpgv' assumes that all keys in the keyring are trustworthy. That
+does also mean that it does not check for expired or revoked keys.
+
+ By default a keyring named 'trustedkeys.kbx' is used; if that does
+not exist a keyring named 'trustedkeys.gpg' is used. The default
+keyring is assumed to be in the home directory of GnuPG, either the
+default home directory or the one set by an option or an environment
+variable. The option '--keyring' may be used to specify a different
+keyring or even multiple keyrings.
+
+ 'gpgv' recognizes these options:
+
+'--verbose'
+'-v'
+ Gives more information during processing. If used twice, the input
+ data is listed in detail.
+
+'--quiet'
+'-q'
+ Try to be as quiet as possible.
+
+'--keyring FILE'
+ Add FILE to the list of keyrings. If FILE begins with a tilde and
+ a slash, these are replaced by the HOME directory. If the filename
+ does not contain a slash, it is assumed to be in the home-directory
+ ("~/.gnupg" if -homedir is not used).
+
+'--status-fd N'
+ Write special status strings to the file descriptor N. See the
+ file DETAILS in the documentation for a listing of them.
+
+'--logger-fd n'
+ Write log output to file descriptor 'n' and not to stderr.
+
+'--ignore-time-conflict'
+ GnuPG normally checks that the timestamps associated with keys and
+ signatures have plausible values. However, sometimes a signature
+ seems to be older than the key due to clock problems. This option
+ turns these checks into warnings.
+
+'--homedir DIR'
+ Set the name of the home directory to DIR. If this option is not
+ used, the home directory defaults to '~/.gnupg'. It is only
+ recognized when given on the command line. It also overrides any
+ home directory stated through the environment variable 'GNUPGHOME'
+ or (on Windows systems) by means of the Registry entry
+ HKCU\SOFTWARE\GNU\GNUPG:HOMEDIR.
+
+ On Windows systems it is possible to install GnuPG as a portable
+ application. In this case only this command line option is
+ considered, all other ways to set a home directory are ignored.
+
+ To install GnuPG as a portable application under Windows, create an
+ empty file name 'gpgconf.ctl' in the same directory as the tool
+ 'gpgconf.exe'. The root of the installation is than that
+ directory; or, if 'gpgconf.exe' has been installed directly below a
+ directory named 'bin', its parent directory. You also need to make
+ sure that the following directories exist and are writable:
+ 'ROOT/home' for the GnuPG home and 'ROOT/usr/local/var/cache/gnupg'
+ for internal cache files.
+
+'--weak-digest name'
+ Treat the specified digest algorithm as weak. Signatures made over
+ weak digests algorithms are normally rejected. This option can be
+ supplied multiple times if multiple algorithms should be considered
+ weak. MD5 is always considered weak, and does not need to be
+ listed explicitly.
+
+ The program returns 0 if everything is fine, 1 if at least one
+signature was bad, and other error codes for fatal errors.
+
+8.2.1 Examples
+--------------
+
+gpgv 'pgpfile'
+gpgv 'sigfile' ['datafile']
+ Verify the signature of the file. The second form is used for
+ detached signatures, where 'sigfile' is the detached signature
+ (either ASCII-armored or binary) and 'datafile' contains the signed
+ data; if 'datafile' is "-" the signed data is expected on 'stdin';
+ if 'datafile' is not given the name of the file holding the signed
+ data is constructed by cutting off the extension (".asc", ".sig" or
+ ".sign") from 'sigfile'.
+
+8.2.2 Environment
+-----------------
+
+HOME
+ Used to locate the default home directory.
+
+GNUPGHOME
+ If set directory used instead of "~/.gnupg".
+
+8.2.3 FILES
+-----------
+
+~/.gnupg/trustedkeys.gpg
+ The default keyring with the allowed keys.
+
+ 'gpg2'(1)
+
+
+File: gnupg.info, Node: addgnupghome, Next: gpgconf, Prev: gpgv, Up: Helper Tools
+
+8.3 Create .gnupg home directories.
+===================================
+
+If GnuPG is installed on a system with existing user accounts, it is
+sometimes required to populate the GnuPG home directory with existing
+files. Especially a 'trustlist.txt' and a keybox with some initial
+certificates are often desired. This scripts help to do this by copying
+all files from '/etc/skel/.gnupg' to the home directories of the
+accounts given on the command line. It takes care not to overwrite
+existing GnuPG home directories.
+
+'addgnupghome' is invoked by root as:
+
+ addgnupghome account1 account2 ... accountn
+
+
+File: gnupg.info, Node: gpgconf, Next: applygnupgdefaults, Prev: addgnupghome, Up: Helper Tools
+
+8.4 Modify .gnupg home directories.
+===================================
+
+The 'gpgconf' is a utility to automatically and reasonable safely query
+and modify configuration files in the '.gnupg' home directory. It is
+designed not to be invoked manually by the user, but automatically by
+graphical user interfaces (GUI).(1)
+
+ 'gpgconf' provides access to the configuration of one or more
+components of the GnuPG system. These components correspond more or
+less to the programs that exist in the GnuPG framework, like GnuPG,
+GPGSM, DirMngr, etc. But this is not a strict one-to-one relationship.
+Not all configuration options are available through 'gpgconf'.
+'gpgconf' provides a generic and abstract method to access the most
+important configuration options that can feasibly be controlled via such
+a mechanism.
+
+ 'gpgconf' can be used to gather and change the options available in
+each component, and can also provide their default values. 'gpgconf'
+will give detailed type information that can be used to restrict the
+user's input without making an attempt to commit the changes.
+
+ 'gpgconf' provides the backend of a configuration editor. The
+configuration editor would usually be a graphical user interface
+program, that allows to display the current options, their default
+values, and allows the user to make changes to the options. These
+changes can then be made active with 'gpgconf' again. Such a program
+that uses 'gpgconf' in this way will be called GUI throughout this
+section.
+
+* 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'
++'--list-dirs [NAMES]'
+ Lists the directories used by 'gpgconf'. One directory is listed
+ per line, and each line consists of a colon-separated list where
+ the first field names the directory type (for example 'sysconfdir')
+ and the second field contains the percent-escaped directory.
+ Although they are not directories, the socket file names used by
+ 'gpg-agent' and 'dirmngr' are printed as well. Note that the
+ socket file names and the 'homedir' lines are the default names and
- they may be overridden by command line switches.
++ they may be overridden by command line switches. If NAMES are
++ given only the directories or file names specified by the list
++ names are printed without any escaping.
+
+'--list-config [FILENAME]'
+ List the global configuration file in a colon separated format. If
+ FILENAME is given, check that file instead.
+
+'--check-config [FILENAME]'
+ Run a syntax check on the global configuration file. If FILENAME
+ is given, check that file instead.
+
+'--reload [COMPONENT]'
+ Reload all or the given component. This is basically the same as
+ sending a SIGHUP to the component. Components which don't support
+ reloading are ignored.
+
+'--launch [COMPONENT]'
+ If the COMPONENT is not already running, start it. 'component'
+ must be a daemon. This is in general not required because the
+ system starts these daemons as needed. However, external software
+ making direct use of 'gpg-agent' or 'dirmngr' may use this command
+ to ensure that they are started.
+
+'--kill [COMPONENT]'
+ Kill the given component. Components which support killing are
+ gpg-agent and scdaemon. Components which don't support reloading
+ are ignored. Note that as of now reload and kill have the same
+ effect for scdaemon.
+
+'--create-socketdir'
+ Create a directory for sockets below /run/user or /var/run/user.
+ This is command is only required if a non default home directory is
+ used and the /run based sockets shall be used. For the default
+ home directory GnUPG creates a directory on the fly.
+
+'--remove-socketdir'
+ Remove a directory created with command '--create-socketdir'.
+
+ The following options may be used:
+
+'-o FILE'
+'--output FILE'
+ Write output to FILE. Default is to write to stdout.
+
+'-v'
+'--verbose'
+ Outputs additional information while running. Specifically, this
+ extends numerical field values by human-readable descriptions.
+
+'-q'
+'--quiet'
+ Try to be as quiet as possible.
+
+'-n'
+'--dry-run'
+ Do not actually change anything. This is currently only
+ implemented for '--change-options' and can be used for testing
+ purposes.
+
+'-r'
+'--runtime'
+ Only used together with '--change-options'. If one of the modified
+ options can be changed in a running daemon process, signal the
+ running daemon to ask it to reparse its configuration file after
+ changing.
+
+ This means that the changes will take effect at run-time, as far as
+ this is possible. Otherwise, they will take effect at the next
+ start of the respective backend programs.
+
+
+File: gnupg.info, Node: Format conventions, Next: Listing components, Prev: Invoking gpgconf, Up: gpgconf
+
+8.4.2 Format conventions
+------------------------
+
+Some lines in the output of 'gpgconf' contain a list of colon-separated
+fields. The following conventions apply:
+
+ * The GUI program is required to strip off trailing newline and/or
+ carriage return characters from the output.
+
+ * 'gpgconf' will never leave out fields. If a certain version
+ provides a certain field, this field will always be present in all
+ 'gpgconf' versions from that time on.
+
+ * Future versions of 'gpgconf' might append fields to the list. New
+ fields will always be separated from the previously last field by a
+ colon separator. The GUI should be prepared to parse the last
+ field it knows about up until a colon or end of line.
+
+ * Not all fields are defined under all conditions. You are required
+ to ignore the content of undefined fields.
+
+ There are several standard types for the content of a field:
+
+verbatim
+ Some fields contain strings that are not escaped in any way. Such
+ fields are described to be used _verbatim_. These fields will
+ never contain a colon character (for obvious reasons). No
+ de-escaping or other formatting is required to use the field
+ content. This is for easy parsing of the output, when it is known
+ that the content can never contain any special characters.
+
+percent-escaped
+ Some fields contain strings that are described to be
+ _percent-escaped_. Such strings need to be de-escaped before their
+ content can be presented to the user. A percent-escaped string is
+ de-escaped by replacing all occurrences of '%XY' by the byte that
+ has the hexadecimal value 'XY'. 'X' and 'Y' are from the set
+ '0-9a-f'.
+
+localised
+ Some fields contain strings that are described to be _localised_.
+ Such strings are translated to the active language and formatted in
+ the active character set.
+
+unsigned number
+ Some fields contain an _unsigned number_. This number will always
+ fit into a 32-bit unsigned integer variable. The number may be
+ followed by a space, followed by a human readable description of
+ that value (if the verbose option is used). You should ignore
+ everything in the field that follows the number.
+
+signed number
+ Some fields contain a _signed number_. This number will always fit
+ into a 32-bit signed integer variable. The number may be followed
+ by a space, followed by a human readable description of that value
+ (if the verbose option is used). You should ignore everything in
+ the field that follows the number.
+
+boolean value
+ Some fields contain a _boolean value_. This is a number with
+ either the value 0 or 1. The number may be followed by a space,
+ followed by a human readable description of that value (if the
+ verbose option is used). You should ignore everything in the field
+ that follows the number; checking just the first character is
+ sufficient in this case.
+
+option
+ Some fields contain an _option_ argument. The format of an option
+ argument depends on the type of the option and on some flags:
+
+ no argument
+ The simplest case is that the option does not take an argument
+ at all (TYPE '0'). Then the option argument is an unsigned
+ number that specifies how often the option occurs. If the
+ 'list' flag is not set, then the only valid number is '1'.
+ Options that do not take an argument never have the 'default'
+ or 'optional arg' flag set.
+
+ number
+ If the option takes a number argument (ALT-TYPE is '2' or
+ '3'), and it can only occur once ('list' flag is not set),
+ then the option argument is either empty (only allowed if the
+ argument is optional), or it is a number. A number is a
+ string that begins with an optional minus character, followed
+ by one or more digits. The number must fit into an integer
+ variable (unsigned or signed, depending on ALT-TYPE).
+
+ number list
+ If the option takes a number argument and it can occur more
+ than once, then the option argument is either empty, or it is
+ a comma-separated list of numbers as described above.
+
+ string
+ If the option takes a string argument (ALT-TYPE is 1), and it
+ can only occur once ('list' flag is not set) then the option
+ argument is either empty (only allowed if the argument is
+ optional), or it starts with a double quote character ('"')
+ followed by a percent-escaped string that is the argument
+ value. Note that there is only a leading double quote
+ character, no trailing one. The double quote character is
+ only needed to be able to differentiate between no value and
+ the empty string as value.
+
+ string list
+ If the option takes a number argument and it can occur more
+ than once, then the option argument is either empty, or it is
+ a comma-separated list of string arguments as described above.
+
+ The active language and character set are currently determined from
+the locale environment of the 'gpgconf' program.
+
+
+File: gnupg.info, Node: Listing components, Next: Checking programs, Prev: Format conventions, Up: gpgconf
+
+8.4.3 Listing components
+------------------------
+
+The command '--list-components' will list all components that can be
+configured with 'gpgconf'. Usually, one component will correspond to
+one GnuPG-related program and contain the options of that programs
+configuration file that can be modified using 'gpgconf'. However, this
+is not necessarily the case. A component might also be a group of
+selected options from several programs, or contain entirely virtual
+options that have a special effect rather than changing exactly one
+option in one configuration file.
+
+ A component is a set of configuration options that semantically
+belong together. Furthermore, several changes to a component can be
+made in an atomic way with a single operation. The GUI could for
+example provide a menu with one entry for each component, or a window
+with one tabulator sheet per component.
+
+ The command argument '--list-components' lists all available
+components, one per line. The format of each line is:
+
+ 'NAME:DESCRIPTION:PGMNAME:'
+
+NAME
+ This field contains a name tag of the component. The name tag is
+ used to specify the component in all communication with 'gpgconf'.
+ The name tag is to be used _verbatim_. It is thus not in any
+ escaped format.
+
+DESCRIPTION
+ The _string_ in this field contains a human-readable description of
+ the component. It can be displayed to the user of the GUI for
+ informational purposes. It is _percent-escaped_ and _localized_.
+
+PGMNAME
+ The _string_ in this field contains the absolute name of the
+ program's file. It can be used to unambiguously invoke that
+ program. It is _percent-escaped_.
+
+ Example:
+ $ gpgconf --list-components
+ gpg:GPG for OpenPGP:/usr/local/bin/gpg2:
+ gpg-agent:GPG Agent:/usr/local/bin/gpg-agent:
+ scdaemon:Smartcard Daemon:/usr/local/bin/scdaemon:
+ gpgsm:GPG for S/MIME:/usr/local/bin/gpgsm:
+ dirmngr:Directory Manager:/usr/local/bin/dirmngr:
+
+
+File: gnupg.info, Node: Checking programs, Next: Listing options, Prev: Listing components, Up: gpgconf
+
+8.4.4 Checking programs
+-----------------------
+
+The command '--check-programs' is similar to '--list-components' but
+works on backend programs and not on components. It runs each program
+to test whether it is installed and runnable. This also includes a
+syntax check of all config file options of the program.
+
+ The command argument '--check-programs' lists all available programs,
+one per line. The format of each line is:
+
+ 'NAME:DESCRIPTION:PGMNAME:AVAIL:OKAY:CFGFILE:LINE:ERROR:'
+
+NAME
+ This field contains a name tag of the program which is identical to
+ the name of the component. The name tag is to be used _verbatim_.
+ It is thus not in any escaped format. This field may be empty to
+ indicate a continuation of error descriptions for the last name.
+ The description and pgmname fields are then also empty.
+
+DESCRIPTION
+ The _string_ in this field contains a human-readable description of
+ the component. It can be displayed to the user of the GUI for
+ informational purposes. It is _percent-escaped_ and _localized_.
+
+PGMNAME
+ The _string_ in this field contains the absolute name of the
+ program's file. It can be used to unambiguously invoke that
+ program. It is _percent-escaped_.
+
+AVAIL
+ The _boolean value_ in this field indicates whether the program is
+ installed and runnable.
+
+OKAY
+ The _boolean value_ in this field indicates whether the program's
+ config file is syntactically okay.
+
+CFGFILE
+ If an error occurred in the configuration file (as indicated by a
+ false value in the field 'okay'), this field has the name of the
+ failing configuration file. It is _percent-escaped_.
+
+LINE
+ If an error occurred in the configuration file, this field has the
+ line number of the failing statement in the configuration file. It
+ is an _unsigned number_.
+
+ERROR
+ If an error occurred in the configuration file, this field has the
+ error text of the failing statement in the configuration file. It
+ is _percent-escaped_ and _localized_.
+
+In the following example the 'dirmngr' is not runnable and the
+configuration file of 'scdaemon' is not okay.
+
+ $ gpgconf --check-programs
+ gpg:GPG for OpenPGP:/usr/local/bin/gpg2:1:1:
+ gpg-agent:GPG Agent:/usr/local/bin/gpg-agent:1:1:
+ scdaemon:Smartcard Daemon:/usr/local/bin/scdaemon:1:0:
+ gpgsm:GPG for S/MIME:/usr/local/bin/gpgsm:1:1:
+ dirmngr:Directory Manager:/usr/local/bin/dirmngr:0:0:
+
+The command '--check-options COMPONENT' will verify the configuration
+file in the same manner as '--check-programs', but only for the
+component COMPONENT.
+
+
+File: gnupg.info, Node: Listing options, Next: Changing options, Prev: Checking programs, Up: gpgconf
+
+8.4.5 Listing options
+---------------------
+
+Every component contains one or more options. Options may be gathered
+into option groups to allow the GUI to give visual hints to the user
+about which options are related.
+
+ The command argument '--list-options COMPONENT' lists all options
+(and the groups they belong to) in the component COMPONENT, one per
+line. COMPONENT must be the string in the field NAME in the output of
+the '--list-components' command.
+
+ There is one line for each option and each group. First come all
+options that are not in any group. Then comes a line describing a
+group. Then come all options that belong into each group. Then comes
+the next group and so on. There does not need to be any group (and in
+this case the output will stop after the last non-grouped option).
+
+ The format of each line is:
+
+ 'NAME:FLAGS:LEVEL:DESCRIPTION:TYPE:ALT-TYPE:ARGNAME:DEFAULT:ARGDEF:VALUE'
+
+NAME
+ This field contains a name tag for the group or option. The name
+ tag is used to specify the group or option in all communication
+ with 'gpgconf'. The name tag is to be used _verbatim_. It is thus
+ not in any escaped format.
+
+FLAGS
+ The flags field contains an _unsigned number_. Its value is the
+ OR-wise combination of the following flag values:
+
+ 'group (1)'
+ If this flag is set, this is a line describing a group and not
+ an option.
+
+ The following flag values are only defined for options (that is, if
+ the 'group' flag is not used).
+
+ 'optional arg (2)'
+ If this flag is set, the argument is optional. This is never
+ set for TYPE '0' (none) options.
+
+ 'list (4)'
+ If this flag is set, the option can be given multiple times.
+
+ 'runtime (8)'
+ If this flag is set, the option can be changed at runtime.
+
+ 'default (16)'
+ If this flag is set, a default value is available.
+
+ 'default desc (32)'
+ If this flag is set, a (runtime) default is available. This
+ and the 'default' flag are mutually exclusive.
+
+ 'no arg desc (64)'
+ If this flag is set, and the 'optional arg' flag is set, then
+ the option has a special meaning if no argument is given.
+
+ 'no change (128)'
+ If this flag is set, gpgconf ignores requests to change the
+ value. GUI frontends should grey out this option. Note, that
+ manual changes of the configuration files are still possible.
+
+LEVEL
+ This field is defined for options and for groups. It contains an
+ _unsigned number_ that specifies the expert level under which this
+ group or option should be displayed. The following expert levels
+ are defined for options (they have analogous meaning for groups):
+
+ 'basic (0)'
+ This option should always be offered to the user.
+
+ 'advanced (1)'
+ This option may be offered to advanced users.
+
+ 'expert (2)'
+ This option should only be offered to expert users.
+
+ 'invisible (3)'
+ This option should normally never be displayed, not even to
+ expert users.
+
+ 'internal (4)'
+ This option is for internal use only. Ignore it.
+
+ The level of a group will always be the lowest level of all options
+ it contains.
+
+DESCRIPTION
+ This field is defined for options and groups. The _string_ in this
+ field contains a human-readable description of the option or group.
+ It can be displayed to the user of the GUI for informational
+ purposes. It is _percent-escaped_ and _localized_.
+
+TYPE
+ This field is only defined for options. It contains an _unsigned
+ number_ that specifies the type of the option's argument, if any.
+ The following types are defined:
+
+ Basic types:
+
+ 'none (0)'
+ No argument allowed.
+
+ 'string (1)'
+ An _unformatted string_.
+
+ 'int32 (2)'
+ A _signed number_.
+
+ 'uint32 (3)'
+ An _unsigned number_.
+
+ Complex types:
+
+ 'pathname (32)'
+ A _string_ that describes the pathname of a file. The file
+ does not necessarily need to exist.
+
+ 'ldap server (33)'
+ A _string_ that describes an LDAP server in the format:
+
+ 'HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN'
+
+ 'key fingerprint (34)'
+ A _string_ with a 40 digit fingerprint specifying a
+ certificate.
+
+ 'pub key (35)'
+ A _string_ that describes a certificate by user ID, key ID or
+ fingerprint.
+
+ 'sec key (36)'
+ A _string_ that describes a certificate with a key by user ID,
+ key ID or fingerprint.
+
+ 'alias list (37)'
+ A _string_ that describes an alias list, like the one used
+ with gpg's group option. The list consists of a key, an equal
+ sign and space separated values.
+
+ More types will be added in the future. Please see the ALT-TYPE
+ field for information on how to cope with unknown types.
+
+ALT-TYPE
+ This field is identical to TYPE, except that only the types '0' to
+ '31' are allowed. The GUI is expected to present the user the
+ option in the format specified by TYPE. But if the argument type
+ TYPE is not supported by the GUI, it can still display the option
+ in the more generic basic type ALT-TYPE. The GUI must support all
+ the defined basic types to be able to display all options. More
+ basic types may be added in future versions. If the GUI encounters
+ a basic type it doesn't support, it should report an error and
+ abort the operation.
+
+ARGNAME
+ This field is only defined for options with an argument type TYPE
+ that is not '0'. In this case it may contain a _percent-escaped_
+ and _localised string_ that gives a short name for the argument.
+ The field may also be empty, though, in which case a short name is
+ not known.
+
+DEFAULT
+ This field is defined only for options for which the 'default' or
+ 'default desc' flag is set. If the 'default' flag is set, its
+ format is that of an _option argument_ (*Note Format conventions::,
+ for details). If the default value is empty, then no default is
+ known. Otherwise, the value specifies the default value for this
+ option. If the 'default desc' flag is set, the field is either
+ empty or contains a description of the effect if the option is not
+ given.
+
+ARGDEF
+ This field is defined only for options for which the 'optional arg'
+ flag is set. If the 'no arg desc' flag is not set, its format is
+ that of an _option argument_ (*Note Format conventions::, for
+ details). If the default value is empty, then no default is known.
+ Otherwise, the value specifies the default argument for this
+ option. If the 'no arg desc' flag is set, the field is either
+ empty or contains a description of the effect of this option if no
+ argument is given.
+
+VALUE
+ This field is defined only for options. Its format is that of an
+ _option argument_. If it is empty, then the option is not
+ explicitly set in the current configuration, and the default
+ applies (if any). Otherwise, it contains the current value of the
+ option. Note that this field is also meaningful if the option
+ itself does not take a real argument (in this case, it contains the
+ number of times the option appears).
+
+
+File: gnupg.info, Node: Changing options, Next: Listing global options, Prev: Listing options, Up: gpgconf
+
+8.4.6 Changing options
+----------------------
+
+The command '--change-options COMPONENT' will attempt to change the
+options of the component COMPONENT to the specified values. COMPONENT
+must be the string in the field NAME in the output of the
+'--list-components' command. You have to provide the options that shall
+be changed in the following format on standard input:
+
+ 'NAME:FLAGS:NEW-VALUE'
+
+NAME
+ This is the name of the option to change. NAME must be the string
+ in the field NAME in the output of the '--list-options' command.
+
+FLAGS
+ The flags field contains an _unsigned number_. Its value is the
+ OR-wise combination of the following flag values:
+
+ 'default (16)'
+ If this flag is set, the option is deleted and the default
+ value is used instead (if applicable).
+
+NEW-VALUE
+ The new value for the option. This field is only defined if the
+ 'default' flag is not set. The format is that of an _option
+ argument_. If it is empty (or the field is omitted), the default
+ argument is used (only allowed if the argument is optional for this
+ option). Otherwise, the option will be set to the specified value.
+
+The output of the command is the same as that of '--check-options' for
+the modified configuration file.
+
+ Examples:
+
+ To set the force option, which is of basic type 'none (0)':
+
+ $ echo 'force:0:1' | gpgconf --change-options dirmngr
+
+ To delete the force option:
+
+ $ echo 'force:16:' | gpgconf --change-options dirmngr
+
+ The '--runtime' option can influence when the changes take effect.
+
+
+File: gnupg.info, Node: Listing global options, Next: Files used by gpgconf, Prev: Changing options, Up: gpgconf
+
+8.4.7 Listing global options
+----------------------------
+
+Sometimes it is useful for applications to look at the global options
+file 'gpgconf.conf'. The colon separated listing format is record
+oriented and uses the first field to identify the record type:
+
+'k'
+ This describes a key record to start the definition of a new
+ ruleset for a user/group. The format of a key record is:
+
+ 'k:USER:GROUP:'
+
+ USER
+ This is the user field of the key. It is percent escaped.
+ See the definition of the gpgconf.conf format for details.
+
+ GROUP
+ This is the group field of the key. It is percent escaped.
+
+'r'
+ This describes a rule record. All rule records up to the next key
+ record make up a rule set for that key. The format of a rule
+ record is:
+
+ 'r:::COMPONENT:OPTION:FLAGS:VALUE:'
+
+ COMPONENT
+ This is the component part of a rule. It is a plain string.
+
+ OPTION
+ This is the option part of a rule. It is a plain string.
+
+ FLAG
+ This is the flags part of a rule. There may be only one flag
+ per rule but by using the same component and option, several
+ flags may be assigned to an option. It is a plain string.
+
+ VALUE
+ This is the optional value for the option. It is a percent
+ escaped string with a single quotation mark to indicate a
+ string. The quotation mark is only required to distinguish
+ between no value specified and an empty string.
+
+Unknown record types should be ignored. Note that there is
+intentionally no feature to change the global option file through
+'gpgconf'.
+
+
+File: gnupg.info, Node: Files used by gpgconf, Prev: Listing global options, Up: gpgconf
+
+8.4.8 Files used by gpgconf
+---------------------------
+
+'/etc/gnupg/gpgconf.conf'
+ If this file exists, it is processed as a global configuration
+ file. A commented example can be found in the 'examples' directory
+ of the distribution.
+
+
+File: gnupg.info, Node: applygnupgdefaults, Next: gpg-preset-passphrase, Prev: gpgconf, Up: Helper Tools
+
+8.5 Run gpgconf for all users.
+==============================
+
+This script is a wrapper around 'gpgconf' to run it with the command
+'--apply-defaults' for all real users with an existing GnuPG home
+directory. Admins might want to use this script to update he GnuPG
+configuration files for all users after '/etc/gnupg/gpgconf.conf' has
+been changed. This allows to enforce certain policies for all users.
+Note, that this is not a bulletproof of forcing a user to use certain
+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:
+
+ * We are planning to use file descriptor passing for interprocess
+ communication. This will allow us save a lot of resources and
+ improve performance of certain operations a lot. Systems not
+ supporting this won't gain these benefits but we try to keep them
+ working the standard way as it is done today.
+
+ * We require more or less full POSIX compatibility. This has been
+ around for 15 years now and thus we don't believe it makes sense to
+ support non POSIX systems anymore. Well, we of course the usual
+ workarounds for near POSIX systems well be applied.
+
+ There is one exception of this rule: Systems based the Microsoft
+ Windows API (called here _W32_) will be supported to some extend.
+
+* Menu:
+
+* W32 Notes:: Microsoft Windows Notes
+
+
+File: gnupg.info, Node: W32 Notes, Up: System Notes
+
+10.1 Microsoft Windows Notes
+============================
+
+Current limitations are:
+
+ * 'gpgconf' does not create backup files, so in case of trouble your
+ configuration file might get lost.
+
+ * 'watchgnupg' is not available. Logging to sockets is not possible.
+
+ * The periodical smartcard status checking done by 'scdaemon' is not
+ yet supported.
+
+
+File: gnupg.info, Node: Debugging, Next: Copying, Prev: System Notes, Up: Top
+
+11 How to solve problems
+************************
+
+Everyone knows that software often does not do what it should do and
+thus there is a need to track down problems. We call this debugging in
+a reminiscent to the moth jamming a relay in a Mark II box back in 1947.
+
+ Most of the problems a merely configuration and user problems but
+nevertheless there are the most annoying ones and responsible for many
+gray hairs. We try to give some guidelines here on how to identify and
+solve the problem at hand.
+
+* Menu:
+
+* Debugging Tools:: Description of some useful tools.
+* Debugging Hints:: Various hints on debugging.
+* Common Problems:: Commonly seen problems.
+* Architecture Details:: How the whole thing works internally.
+
+
+File: gnupg.info, Node: Debugging Tools, Next: Debugging Hints, Up: Debugging
+
+11.1 Debugging Tools
+====================
+
+The GnuPG distribution comes with a couple of tools, useful to help find
+and solving problems.
+
+* Menu:
+
+* kbxutil:: Scrutinizing a keybox file.
+
+
+File: gnupg.info, Node: kbxutil, Up: Debugging Tools
+
+11.1.1 Scrutinizing a keybox file
+---------------------------------
+
+A keybox is a file format used to store public keys along with meta
+information and indices. The commonly used one is the file
+'pubring.kbx' in the '.gnupg' directory. It contains all X.509
+certificates as well as OpenPGP keys(1) .
+
+When called the standard way, e.g.:
+
+ 'kbxutil ~/.gnupg/pubring.kbx'
+
+it lists all records (called blobs) with there meta-information in a
+human readable format.
+
+To see statistics on the keybox in question, run it using
+
+ 'kbxutil --stats ~/.gnupg/pubring.kbx'
+
+and you get an output like:
+
+ Total number of blobs: 99
+ header: 1
+ empty: 0
+ openpgp: 0
+ x509: 98
+ non flagged: 81
+ secret flagged: 0
+ ephemeral flagged: 17
+
+ In this example you see that the keybox does not have any OpenPGP
+keys but contains 98 X.509 certificates and a total of 17 keys or
+certificates are flagged as ephemeral, meaning that they are only
+temporary stored (cached) in the keybox and won't get listed using the
+usual commands provided by 'gpgsm' or 'gpg'. 81 certificates are stored
+in a standard way and directly available from 'gpgsm'.
+
+To find duplicated certificates and keyblocks in a keybox file (this
+should not occur but sometimes things go wrong), run it using
+
+ 'kbxutil --find-dups ~/.gnupg/pubring.kbx'
+
+ ---------- Footnotes ----------
+
+ (1) Well, OpenPGP keys are not implemented, 'gpg' still used the
+keyring file 'pubring.gpg'
+
+
+File: gnupg.info, Node: Debugging Hints, Next: Common Problems, Prev: Debugging Tools, Up: Debugging
+
+11.2 Various hints on debugging.
+================================
+
+ * How to find the IP address of a keyserver
+
+ If a round robin URL of is used for a keyserver (e.g.
+ subkeys.gnupg.org); it is not easy to see what server is actually
+ used. Using the keyserver debug option as in
+
+ gpg --keyserver-options debug=1 -v --refresh-key 1E42B367
+
+ is thus often helpful. Note that the actual output depends on the
+ backend and may change from release to release.
+
+ * Logging on WindowsCE
+
+ For development, the best logging method on WindowsCE is the use of
+ remote debugging using a log file name of 'tcp://<ip-addr>:<port>'.
+ The command 'watchgnupg' may be used on the remote host to listen
+ on the given port. (*note option watchgnupg --tcp::). For in the
+ field tests it is better to make use of the logging facility
+ provided by the 'gpgcedev' driver (part of libassuan); this is
+ enabled by using a log file name of 'GPG2:'. (*note option
+ --log-file::).
+
+
+File: gnupg.info, Node: Common Problems, Next: Architecture Details, Prev: Debugging Hints, Up: Debugging
+
+11.3 Commonly Seen Problems
+===========================
+
+ * Error code 'Not supported' from Dirmngr
+
+ Most likely the option 'enable-ocsp' is active for gpgsm but
+ Dirmngr's OCSP feature has not been enabled using 'allow-ocsp' in
+ 'dirmngr.conf'.
+
+ * The Curses based Pinentry does not work
+
+ The far most common reason for this is that the environment
+ variable 'GPG_TTY' has not been set correctly. Make sure that it
+ has been set to a real tty devce and not just to '/dev/tty'; i.e.
+ 'GPG_TTY=tty' is plainly wrong; what you want is 'GPG_TTY=`tty`' --
+ note the back ticks. Also make sure that this environment variable
+ gets exported, that is you should follow up the setting with an
+ 'export GPG_TTY' (assuming a Bourne style shell). Even for GUI
+ based Pinentries; you should have set 'GPG_TTY'. See the section
+ on installing the 'gpg-agent' on how to do it.
+
+ * SSH hangs while a popping up pinentry was expected
+
+ SSH has no way to tell the gpg-agent what terminal or X display it
+ is running on. So when remotely logging into a box where a
+ gpg-agent with SSH support is running, the pinentry will get popped
+ up on whatever display the gpg-agent has been started. To solve
+ this problem you may issue the command
+
+ echo UPDATESTARTUPTTY | gpg-connect-agent
+
+ and the next pinentry will pop up on your display or screen.
+ However, you need to kill the running pinentry first because only
+ one pinentry may be running at once. If you plan to use ssh on a
+ new display you should issue the above command before invoking ssh
+ or any other service making use of ssh.
+
+ * Exporting a secret key without a certificate
+
+ I may happen that you have created a certificate request using
+ 'gpgsm' but not yet received and imported the certificate from the
+ CA. However, you want to export the secret key to another machine
+ right now to import the certificate over there then. You can do
+ this with a little trick but it requires that you know the
+ approximate time you created the signing request. By running the
+ command
+
+ ls -ltr ~/.gnupg/private-keys-v1.d
+
+ you get a listing of all private keys under control of 'gpg-agent'.
+ Pick the key which best matches the creation time and run the
+ command
+
+ /usr/local/libexec/gpg-protect-tool --p12-export \
+ ~/.gnupg/private-keys-v1.d/FOO >FOO.p12
+
+ (Please adjust the path to 'gpg-protect-tool' to the appropriate
+ location). FOO is the name of the key file you picked (it should
+ have the suffix '.key'). A Pinentry box will pop up and ask you
+ for the current passphrase of the key and a new passphrase to
+ protect it in the pkcs#12 file.
+
+ To import the created file on the machine you use this command:
+
+ /usr/local/libexec/gpg-protect-tool --p12-import --store FOO.p12
+
+ You will be asked for the pkcs#12 passphrase and a new passphrase
+ to protect the imported private key at its new location.
+
+ Note that there is no easy way to match existing certificates with
+ stored private keys because some private keys are used for Secure
+ Shell or other purposes and don't have a corresponding certificate.
+
+ * A root certificate does not verify
+
+ A common problem is that the root certificate misses the required
+ basicConstraints attribute and thus 'gpgsm' rejects this
+ certificate. An error message indicating "no value" is a sign for
+ such a certificate. You may use the 'relax' flag in
+ 'trustlist.txt' to accept the certificate anyway. Note that the
+ fingerprint and this flag may only be added manually to
+ 'trustlist.txt'.
+
+ * Error message: "digest algorithm N has not been enabled"
+
+ The signature is broken. You may try the option
+ '--extra-digest-algo SHA256' to workaround the problem. The number
+ N is the internal algorithm identifier; for example 8 refers to
+ SHA-256.
+
+ * The Windows version does not work under Wine
+
+ When running the W32 version of 'gpg' under Wine you may get an
+ error messages like:
+
+ gpg: fatal: WriteConsole failed: Access denied
+
+ The solution is to use the command 'wineconsole'.
+
+ Some operations like gen-key really want to talk to the console
+ directly for increased security (for example to prevent the
+ passphrase from appearing on the screen). So, you should use
+ 'wineconsole' instead of 'wine', which will launch a windows
+ console that implements those additional features.
+
+ * Why does GPG's -search-key list weird keys?
+
+ For performance reasons the keyservers do not check the keys the
+ same way 'gpg' does. It may happen that the listing of keys
+ available on the keyservers shows keys with wrong user IDs or with
+ user Ids from other keys. If you try to import this key, the bad
+ keys or bad user ids won't get imported, though. This is a bit
+ unfortunate but we can't do anything about it without actually
+ downloading the keys.
+
+
+File: gnupg.info, Node: Architecture Details, Prev: Common Problems, Up: Debugging
+
+11.4 How the whole thing works internally.
+==========================================
+
+* Menu:
+
+* Component interaction:: How the components work together.
+* GnuPG-1 and GnuPG-2:: Relationship between GnuPG 1.4 and 2.x.
+
+
+File: gnupg.info, Node: Component interaction, Next: GnuPG-1 and GnuPG-2, Up: Architecture Details
+
+11.4.1 How the components work together.
+----------------------------------------
+
+
+
+Figure 11.1: GnuPG module overview
+
+
+File: gnupg.info, Node: GnuPG-1 and GnuPG-2, Prev: Component interaction, Up: Architecture Details
+
+11.4.2 Relationship between GnuPG 1.4 and 2.x.
+----------------------------------------------
+
+Here is a little picture showing how the different GnuPG versions make
+use of a smartcard:
+
+
+
+Figure 11.2: GnuPG card architecture
+
+
+File: gnupg.info, Node: Copying, Next: Contributors, Prev: Debugging, Up: Top
+
+GNU General Public License
+**************************
+
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+ Everyone is permitted to copy and distribute verbatim copies of this
+ license document, but changing it is not allowed.
+
+Preamble
+========
+
+The GNU General Public License is a free, copyleft license for software
+and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program-to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public
+ License.
+
+ "Copyright" also means copyright-like laws that apply to other
+ kinds of works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+ License. Each licensee is addressed as "you". "Licensees" and
+ "recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the
+ work in a fashion requiring copyright permission, other than the
+ making of an exact copy. The resulting work is called a "modified
+ version" of the earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work
+ based on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+ permission, would make you directly or secondarily liable for
+ infringement under applicable copyright law, except executing it on
+ a computer or modifying a private copy. Propagation includes
+ copying, distribution (with or without modification), making
+ available to the public, and in some countries other activities as
+ well.
+
+ To "convey" a work means any kind of propagation that enables other
+ parties to make or receive copies. Mere interaction with a user
+ through a computer network, with no transfer of a copy, is not
+ conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+ to the extent that it includes a convenient and prominently visible
+ feature that (1) displays an appropriate copyright notice, and (2)
+ tells the user that there is no warranty for the work (except to
+ the extent that warranties are provided), that licensees may convey
+ the work under this License, and how to view a copy of this
+ License. If the interface presents a list of user commands or
+ options, such as a menu, a prominent item in the list meets this
+ criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+ for making modifications to it. "Object code" means any non-source
+ form of a work.
+
+ A "Standard Interface" means an interface that either is an
+ official standard defined by a recognized standards body, or, in
+ the case of interfaces specified for a particular programming
+ language, one that is widely used among developers working in that
+ language.
+
+ The "System Libraries" of an executable work include anything,
+ other than the work as a whole, that (a) is included in the normal
+ form of packaging a Major Component, but which is not part of that
+ Major Component, and (b) serves only to enable use of the work with
+ that Major Component, or to implement a Standard Interface for
+ which an implementation is available to the public in source code
+ form. A "Major Component", in this context, means a major
+ essential component (kernel, window system, and so on) of the
+ specific operating system (if any) on which the executable work
+ runs, or a compiler used to produce the work, or an object code
+ interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+ the source code needed to generate, install, and (for an executable
+ work) run the object code and to modify the work, including scripts
+ to control those activities. However, it does not include the
+ work's System Libraries, or general-purpose tools or generally
+ available free programs which are used unmodified in performing
+ those activities but which are not part of the work. For example,
+ Corresponding Source includes interface definition files associated
+ with source files for the work, and the source code for shared
+ libraries and dynamically linked subprograms that the work is
+ specifically designed to require, such as by intimate data
+ communication or control flow between those subprograms and other
+ parts of the work.
+
+ The Corresponding Source need not include anything that users can
+ regenerate automatically from other parts of the Corresponding
+ Source.
+
+ The Corresponding Source for a work in source code form is that
+ same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+ copyright on the Program, and are irrevocable provided the stated
+ conditions are met. This License explicitly affirms your unlimited
+ permission to run the unmodified Program. The output from running
+ a covered work is covered by this License only if the output, given
+ its content, constitutes a covered work. This License acknowledges
+ your rights of fair use or other equivalent, as provided by
+ copyright law.
+
+ You may make, run and propagate covered works that you do not
+ convey, without conditions so long as your license otherwise
+ remains in force. You may convey covered works to others for the
+ sole purpose of having them make modifications exclusively for you,
+ or provide you with facilities for running those works, provided
+ that you comply with the terms of this License in conveying all
+ material for which you do not control copyright. Those thus making
+ or running the covered works for you must do so exclusively on your
+ behalf, under your direction and control, on terms that prohibit
+ them from making any copies of your copyrighted material outside
+ their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+ the conditions stated below. Sublicensing is not allowed; section
+ 10 makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+ measure under any applicable law fulfilling obligations under
+ article 11 of the WIPO copyright treaty adopted on 20 December
+ 1996, or similar laws prohibiting or restricting circumvention of
+ such measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+ circumvention of technological measures to the extent such
+ circumvention is effected by exercising rights under this License
+ with respect to the covered work, and you disclaim any intention to
+ limit operation or modification of the work as a means of
+ enforcing, against the work's users, your or third parties' legal
+ rights to forbid circumvention of technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+ receive it, in any medium, provided that you conspicuously and
+ appropriately publish on each copy an appropriate copyright notice;
+ keep intact all notices stating that this License and any
+ non-permissive terms added in accord with section 7 apply to the
+ code; keep intact all notices of the absence of any warranty; and
+ give all recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+ and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+ produce it from the Program, in the form of source code under the
+ terms of section 4, provided that you also meet all of these
+ conditions:
+
+ a. The work must carry prominent notices stating that you
+ modified it, and giving a relevant date.
+
+ b. The work must carry prominent notices stating that it is
+ released under this License and any conditions added under
+ section 7. This requirement modifies the requirement in
+ section 4 to "keep intact all notices".
+
+ c. You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable
+ section 7 additional terms, to the whole of the work, and all
+ its parts, regardless of how they are packaged. This License
+ gives no permission to license the work in any other way, but
+ it does not invalidate such permission if you have separately
+ received it.
+
+ d. If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has
+ interactive interfaces that do not display Appropriate Legal
+ Notices, your work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+ works, which are not by their nature extensions of the covered
+ work, and which are not combined with it such as to form a larger
+ program, in or on a volume of a storage or distribution medium, is
+ called an "aggregate" if the compilation and its resulting
+ copyright are not used to limit the access or legal rights of the
+ compilation's users beyond what the individual works permit.
+ Inclusion of a covered work in an aggregate does not cause this
+ License to apply to the other parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+ of sections 4 and 5, provided that you also convey the
+ machine-readable Corresponding Source under the terms of this
+ License, in one of these ways:
+
+ a. Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b. Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that
+ product model, to give anyone who possesses the object code
+ either (1) a copy of the Corresponding Source for all the
+ software in the product that is covered by this License, on a
+ durable physical medium customarily used for software
+ interchange, for a price no more than your reasonable cost of
+ physically performing this conveying of source, or (2) access
+ to copy the Corresponding Source from a network server at no
+ charge.
+
+ c. Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially,
+ and only if you received the object code with such an offer,
+ in accord with subsection 6b.
+
+ d. Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to
+ the Corresponding Source in the same way through the same
+ place at no further charge. You need not require recipients
+ to copy the Corresponding Source along with the object code.
+ If the place to copy the object code is a network server, the
+ Corresponding Source may be on a different server (operated by
+ you or a third party) that supports equivalent copying
+ facilities, provided you maintain clear directions next to the
+ object code saying where to find the Corresponding Source.
+ Regardless of what server hosts the Corresponding Source, you
+ remain obligated to ensure that it is available for as long as
+ needed to satisfy these requirements.
+
+ e. Convey the object code using peer-to-peer transmission,
+ provided you inform other peers where the object code and
+ Corresponding Source of the work are being offered to the
+ general public at no charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is
+ excluded from the Corresponding Source as a System Library, need
+ not be included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means
+ any tangible personal property which is normally used for personal,
+ family, or household purposes, or (2) anything designed or sold for
+ incorporation into a dwelling. In determining whether a product is
+ a consumer product, doubtful cases shall be resolved in favor of
+ coverage. For a particular product received by a particular user,
+ "normally used" refers to a typical or common use of that class of
+ product, regardless of the status of the particular user or of the
+ way in which the particular user actually uses, or expects or is
+ expected to use, the product. A product is a consumer product
+ regardless of whether the product has substantial commercial,
+ industrial or non-consumer uses, unless such uses represent the
+ only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+ procedures, authorization keys, or other information required to
+ install and execute modified versions of a covered work in that
+ User Product from a modified version of its Corresponding Source.
+ The information must suffice to ensure that the continued
+ functioning of the modified object code is in no case prevented or
+ interfered with solely because modification has been made.
+
+ If you convey an object code work under this section in, or with,
+ or specifically for use in, a User Product, and the conveying
+ occurs as part of a transaction in which the right of possession
+ and use of the User Product is transferred to the recipient in
+ perpetuity or for a fixed term (regardless of how the transaction
+ is characterized), the Corresponding Source conveyed under this
+ section must be accompanied by the Installation Information. But
+ this requirement does not apply if neither you nor any third party
+ retains the ability to install modified object code on the User
+ Product (for example, the work has been installed in ROM).
+
+ The requirement to provide Installation Information does not
+ include a requirement to continue to provide support service,
+ warranty, or updates for a work that has been modified or installed
+ by the recipient, or for the User Product in which it has been
+ modified or installed. Access to a network may be denied when the
+ modification itself materially and adversely affects the operation
+ of the network or violates the rules and protocols for
+ communication across the network.
+
+ Corresponding Source conveyed, and Installation Information
+ provided, in accord with this section must be in a format that is
+ publicly documented (and with an implementation available to the
+ public in source code form), and must require no special password
+ or key for unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of
+ this License by making exceptions from one or more of its
+ conditions. Additional permissions that are applicable to the
+ entire Program shall be treated as though they were included in
+ this License, to the extent that they are valid under applicable
+ law. If additional permissions apply only to part of the Program,
+ that part may be used separately under those permissions, but the
+ entire Program remains governed by this License without regard to
+ the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+ remove any additional permissions from that copy, or from any part
+ of it. (Additional permissions may be written to require their own
+ removal in certain cases when you modify the work.) You may place
+ additional permissions on material, added by you to a covered work,
+ for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material
+ you add to a covered work, you may (if authorized by the copyright
+ holders of that material) supplement the terms of this License with
+ terms:
+
+ a. Disclaiming warranty or limiting liability differently from
+ the terms of sections 15 and 16 of this License; or
+
+ b. Requiring preservation of specified reasonable legal notices
+ or author attributions in that material or in the Appropriate
+ Legal Notices displayed by works containing it; or
+
+ c. Prohibiting misrepresentation of the origin of that material,
+ or requiring that modified versions of such material be marked
+ in reasonable ways as different from the original version; or
+
+ d. Limiting the use for publicity purposes of names of licensors
+ or authors of the material; or
+
+ e. Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f. Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified
+ versions of it) with contractual assumptions of liability to
+ the recipient, for any liability that these contractual
+ assumptions directly impose on those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+ restrictions" within the meaning of section 10. If the Program as
+ you received it, or any part of it, contains a notice stating that
+ it is governed by this License along with a term that is a further
+ restriction, you may remove that term. If a license document
+ contains a further restriction but permits relicensing or conveying
+ under this License, you may add to a covered work material governed
+ by the terms of that license document, provided that the further
+ restriction does not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+ must place, in the relevant source files, a statement of the
+ additional terms that apply to those files, or a notice indicating
+ where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in
+ the form of a separately written license, or stated as exceptions;
+ the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+ provided under this License. Any attempt otherwise to propagate or
+ modify it is void, and will automatically terminate your rights
+ under this License (including any patent licenses granted under the
+ third paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+ license from a particular copyright holder is reinstated (a)
+ provisionally, unless and until the copyright holder explicitly and
+ finally terminates your license, and (b) permanently, if the
+ copyright holder fails to notify you of the violation by some
+ reasonable means prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+ reinstated permanently if the copyright holder notifies you of the
+ violation by some reasonable means, this is the first time you have
+ received notice of violation of this License (for any work) from
+ that copyright holder, and you cure the violation prior to 30 days
+ after your receipt of the notice.
+
+ Termination of your rights under this section does not terminate
+ the licenses of parties who have received copies or rights from you
+ under this License. If your rights have been terminated and not
+ permanently reinstated, you do not qualify to receive new licenses
+ for the same material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+ run a copy of the Program. Ancillary propagation of a covered work
+ occurring solely as a consequence of using peer-to-peer
+ transmission to receive a copy likewise does not require
+ acceptance. However, nothing other than this License grants you
+ permission to propagate or modify any covered work. These actions
+ infringe copyright if you do not accept this License. Therefore,
+ by modifying or propagating a covered work, you indicate your
+ acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+ receives a license from the original licensors, to run, modify and
+ propagate that work, subject to this License. You are not
+ responsible for enforcing compliance by third parties with this
+ License.
+
+ An "entity transaction" is a transaction transferring control of an
+ organization, or substantially all assets of one, or subdividing an
+ organization, or merging organizations. If propagation of a
+ covered work results from an entity transaction, each party to that
+ transaction who receives a copy of the work also receives whatever
+ licenses to the work the party's predecessor in interest had or
+ could give under the previous paragraph, plus a right to possession
+ of the Corresponding Source of the work from the predecessor in
+ interest, if the predecessor has it or can get it with reasonable
+ efforts.
+
+ You may not impose any further restrictions on the exercise of the
+ rights granted or affirmed under this License. For example, you
+ may not impose a license fee, royalty, or other charge for exercise
+ of rights granted under this License, and you may not initiate
+ litigation (including a cross-claim or counterclaim in a lawsuit)
+ alleging that any patent claim is infringed by making, using,
+ selling, offering for sale, or importing the Program or any portion
+ of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+ License of the Program or a work on which the Program is based.
+ The work thus licensed is called the contributor's "contributor
+ version".
+
+ A contributor's "essential patent claims" are all patent claims
+ owned or controlled by the contributor, whether already acquired or
+ hereafter acquired, that would be infringed by some manner,
+ permitted by this License, of making, using, or selling its
+ contributor version, but do not include claims that would be
+ infringed only as a consequence of further modification of the
+ contributor version. For purposes of this definition, "control"
+ includes the right to grant patent sublicenses in a manner
+ consistent with the requirements of this License.
+
+ Each contributor grants you a non-exclusive, worldwide,
+ royalty-free patent license under the contributor's essential
+ patent claims, to make, use, sell, offer for sale, import and
+ otherwise run, modify and propagate the contents of its contributor
+ version.
+
+ In the following three paragraphs, a "patent license" is any
+ express agreement or commitment, however denominated, not to
+ enforce a patent (such as an express permission to practice a
+ patent or covenant not to sue for patent infringement). To "grant"
+ such a patent license to a party means to make such an agreement or
+ commitment not to enforce a patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent
+ license, and the Corresponding Source of the work is not available
+ for anyone to copy, free of charge and under the terms of this
+ License, through a publicly available network server or other
+ readily accessible means, then you must either (1) cause the
+ Corresponding Source to be so available, or (2) arrange to deprive
+ yourself of the benefit of the patent license for this particular
+ work, or (3) arrange, in a manner consistent with the requirements
+ of this License, to extend the patent license to downstream
+ recipients. "Knowingly relying" means you have actual knowledge
+ that, but for the patent license, your conveying the covered work
+ in a country, or your recipient's use of the covered work in a
+ country, would infringe one or more identifiable patents in that
+ country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+ arrangement, you convey, or propagate by procuring conveyance of, a
+ covered work, and grant a patent license to some of the parties
+ receiving the covered work authorizing them to use, propagate,
+ modify or convey a specific copy of the covered work, then the
+ patent license you grant is automatically extended to all
+ recipients of the covered work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+ the scope of its coverage, prohibits the exercise of, or is
+ conditioned on the non-exercise of one or more of the rights that
+ are specifically granted under this License. You may not convey a
+ covered work if you are a party to an arrangement with a third
+ party that is in the business of distributing software, under which
+ you make payment to the third party based on the extent of your
+ activity of conveying the work, and under which the third party
+ grants, to any of the parties who would receive the covered work
+ from you, a discriminatory patent license (a) in connection with
+ copies of the covered work conveyed by you (or copies made from
+ those copies), or (b) primarily for and in connection with specific
+ products or compilations that contain the covered work, unless you
+ entered into that arrangement, or that patent license was granted,
+ prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+ any implied license or other defenses to infringement that may
+ otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement
+ or otherwise) that contradict the conditions of this License, they
+ do not excuse you from the conditions of this License. If you
+ cannot convey a covered work so as to satisfy simultaneously your
+ obligations under this License and any other pertinent obligations,
+ then as a consequence you may not convey it at all. For example,
+ if you agree to terms that obligate you to collect a royalty for
+ further conveying from those to whom you convey the Program, the
+ only way you could satisfy both those terms and this License would
+ be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+ permission to link or combine any covered work with a work licensed
+ under version 3 of the GNU Affero General Public License into a
+ single combined work, and to convey the resulting work. The terms
+ of this License will continue to apply to the part which is the
+ covered work, but the special requirements of the GNU Affero
+ General Public License, section 13, concerning interaction through
+ a network will apply to the combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new
+ versions of the GNU General Public License from time to time. Such
+ new versions will be similar in spirit to the present version, but
+ may differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+ Program specifies that a certain numbered version of the GNU
+ General Public License "or any later version" applies to it, you
+ have the option of following the terms and conditions either of
+ that numbered version or of any later version published by the Free
+ Software Foundation. If the Program does not specify a version
+ number of the GNU General Public License, you may choose any
+ version ever published by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+ versions of the GNU General Public License can be used, that
+ proxy's public statement of acceptance of a version permanently
+ authorizes you to choose that version for the Program.
+
+ Later license versions may give you additional or different
+ permissions. However, no additional obligations are imposed on any
+ author or copyright holder as a result of your choosing to follow a
+ later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+ APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+ COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS"
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE
+ RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.
+ SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+ NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+ WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES
+ AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+ DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+ THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+ BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+ above cannot be given local legal effect according to their terms,
+ reviewing courts shall apply local law that most closely
+ approximates an absolute waiver of all civil liability in
+ connection with the Program, unless a warranty or assumption of
+ liability accompanies a copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+=============================================
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
+ Copyright (C) YEAR NAME OF AUTHOR
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice
+like this when it starts in an interactive mode:
+
+ PROGRAM Copyright (C) YEAR NAME OF AUTHOR
+ This program comes with ABSOLUTELY NO WARRANTY; for details
+ type 'show w'. This is free software, and you are
+ welcome to redistribute it under certain conditions;
+ type 'show c' for details.
+
+ The hypothetical commands 'show w' and 'show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".
+
+ You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
+
+File: gnupg.info, Node: Contributors, Next: Glossary, Prev: Copying, Up: Top
+
+Contributors to GnuPG
+*********************
+
+The GnuPG project would like to thank its many contributors. Without
+them the project would not have been nearly as successful as it has
+been. Any omissions in this list are accidental. Feel free to contact
+the maintainer if you have been left out or some of your contributions
+are not listed.
+
+ David Shaw, Matthew Skala, Michael Roth, Niklas Hernaeus, Nils
+Ellmenreich, R�mi Guyomarch, Stefan Bellon, Timo Schulz and Werner Koch
+wrote the code. Birger Langkjer, Daniel Resare, Dokianakis Theofanis,
+Edmund GRIMLEY EVANS, Ga�l Qu�ri, Gregory Steuck, Nagy Ferenc L�szl�,
+Ivo Timmermans, Jacobo Tarri'o Barreiro, Janusz Aleksander Urbanowicz,
+Jedi Lin, Jouni Hiltunen, Laurentiu Buzdugan, Magda Procha'zkova',
+Michael Anckaert, Michal Majer, Marco d'Itri, Nilgun Belma Buguner,
+Pedro Morais, Tedi Heriyanto, Thiago Jung Bauermann, Rafael Caetano dos
+Santos, Toomas Soome, Urko Lusa, Walter Koch, Yosiaki IIDA did the
+official translations. Mike Ashley wrote and maintains the GNU Privacy
+Handbook. David Scribner is the current FAQ editor. Lorenzo
+Cappelletti maintains the web site.
+
+ The new modularized architecture of gnupg 1.9 as well as the
+X.509/CMS part has been developed as part of the �gypten project.
+Direct contributors to this project are: Bernhard Herzog, who did
+extensive testing and tracked down a lot of bugs. Bernhard Reiter, who
+made sure that we met the specifications and the deadlines. He did
+extensive testing and came up with a lot of suggestions. Jan-Oliver
+Wagner made sure that we met the specifications and the deadlines. He
+also did extensive testing and came up with a lot of suggestions.
+Karl-Heinz Zimmer and Marc Mutz had to struggle with all the bugs and
+misconceptions while working on KDE integration. Marcus Brinkman
+extended GPGME, cleaned up the Assuan code and fixed bugs all over the
+place. Moritz Schulte took over Libgcrypt maintenance and developed it
+into a stable an useful library. Steffen Hansen had a hard time to
+write the dirmngr due to underspecified interfaces. Thomas Koester did
+extensive testing and tracked down a lot of bugs. Werner Koch designed
+the system and wrote most of the code.
+
+ The following people helped greatly by suggesting improvements,
+testing, fixing bugs, providing resources and doing other important
+tasks: Adam Mitchell, Albert Chin, Alec Habig, Allan Clark, Anand
+Kumria, Andreas Haumer, Anthony Mulcahy, Ariel T Glenn, Bob Mathews,
+Bodo Moeller, Brendan O'Dea, Brenno de Winter, Brian M. Carlson, Brian
+Moore, Brian Warner, Bryan Fullerton, Caskey L. Dickson, Cees van de
+Griend, Charles Levert, Chip Salzenberg, Chris Adams, Christian Biere,
+Christian Kurz, Christian von Roques, Christopher Oliver, Christian
+Recktenwald, Dan Winship, Daniel Eisenbud, Daniel Koening, Dave Dykstra,
+David C Niemi, David Champion, David Ellement, David Hallinan, David
+Hollenberg, David Mathog, David R. Bergstein, Detlef Lannert, Dimitri,
+Dirk Lattermann, Dirk Meyer, Disastry, Douglas Calvert, Ed Boraas,
+Edmund GRIMLEY EVANS, Edwin Woudt, Enzo Michelangeli, Ernst Molitor,
+Fabio Coatti, Felix von Leitner, fish stiqz, Florian Weimer, Francesco
+Potorti, Frank Donahoe, Frank Heckenbach, Frank Stajano, Frank Tobin,
+Gabriel Rosenkoetter, Ga�l Qu�ri, Gene Carter, Geoff Keating, Georg
+Schwarz, Giampaolo Tomassoni, Gilbert Fernandes, Greg Louis, Greg
+Troxel, Gregory Steuck, Gregery Barton, Harald Denker, Holger Baust,
+Hendrik Buschkamp, Holger Schurig, Holger Smolinski, Holger Trapp, Hugh
+Daniel, Huy Le, Ian McKellar, Ivo Timmermans, Jan Krueger, Jan
+Niehusmann, Janusz A. Urbanowicz, James Troup, Jean-loup Gailly, Jeff
+Long, Jeffery Von Ronne, Jens Bachem, Jeroen C. van Gelderen, J Horacio
+MG, J. Michael Ashley, Jim Bauer, Jim Small, Joachim Backes, Joe Rhett,
+John A. Martin, Johnny Teve�en, J�rg Schilling, Jos Backus, Joseph
+Walton, Juan F. Codagnone, Jun Kuriyama, Kahil D. Jallad, Karl Fogel,
+Karsten Thygesen, Katsuhiro Kondou, Kazu Yamamoto, Keith Clayton, Kevin
+Ryde, Klaus Singvogel, Kurt Garloff, Lars Kellogg-Stedman, L. Sassaman,
+M Taylor, Marcel Waldvogel, Marco d'Itri, Marco Parrone, Marcus
+Brinkmann, Mark Adler, Mark Elbrecht, Mark Pettit, Markus Friedl, Martin
+Kahlert, Martin Hamilton, Martin Schulte, Matt Kraai, Matthew Skala,
+Matthew Wilcox, Matthias Urlichs, Max Valianskiy, Michael Engels,
+Michael Fischer v. Mollard, Michael Roth, Michael Sobolev, Michael
+Tokarev, Nicolas Graner, Mike McEwan, Neal H Walfield, Nelson H. F.
+Beebe, NIIBE Yutaka, Niklas Hernaeus, Nimrod Zimerman, N J Doye, Oliver
+Haakert, Oskari J��skel�inen, Pascal Scheffers, Paul D. Smith, Per
+Cederqvist, Phil Blundell, Philippe Laliberte, Peter Fales, Peter
+Gutmann, Peter Marschall, Peter Valchev, Piotr Krukowiecki, QingLong,
+Ralph Gillen, Rat, Reinhard Wobst, R�mi Guyomarch, Reuben Sumner,
+Richard Outerbridge, Robert Joop, Roddy Strachan, Roger Sondermann,
+Roland Rosenfeld, Roman Pavlik, Ross Golder, Ryan Malayter, Sam Roberts,
+Sami Tolvanen, Sean MacLennan, Sebastian Klemke, Serge Munhoven, SL
+Baur, Stefan Bellon, Dr.Stefan.Dalibor, Stefan Karrmann, Stefan Keller,
+Steffen Ullrich, Steffen Zahn, Steven Bakker, Steven Murdoch, Susanne
+Schultz, Ted Cabeen, Thiago Jung Bauermann, Thijmen Klok, Thomas
+Roessler, Tim Mooney, Timo Schulz, Todd Vierling, TOGAWA Satoshi, Tom
+Spindler, Tom Zerucha, Tomas Fasth, Tommi Komulainen, Thomas Klausner,
+Tomasz Kozlowski, Thomas Mikkelsen, Ulf M�ller, Urko Lusa, Vincent P.
+Broman, Volker Quetschke, W Lewis, Walter Hofmann, Walter Koch, Wayne
+Chapeskie, Wim Vandeputte, Winona Brown, Yosiaki IIDA, Yoshihiro Kajiki
+and Gerlinde Klaes.
+
+ This software has been made possible by the previous work of Chris
+Wedgwood, Jean-loup Gailly, Jon Callas, Mark Adler, Martin Hellmann Paul
+Kendall, Philip R. Zimmermann, Peter Gutmann, Philip A. Nelson, Taher
+Elgamal, Torbjorn Granlund, Whitfield Diffie, some unknown NSA
+mathematicians and all the folks who have worked hard to create complete
+and free operating systems.
+
+ And finally we'd like to thank everyone who uses these tools, submits
+bug reports and generally reminds us why we're doing this work in the
+first place.
+
+
+File: gnupg.info, Node: Glossary, Next: Option Index, Prev: Contributors, Up: Top
+
+Glossary
+********
+
+'ARL'
+ The _Authority Revocation List_ is technical identical to a CRL but
+ used for CAs and not for end user certificates.
+
+'Chain model'
+ Verification model for X.509 which uses the creation date of a
+ signature as the date the validation starts and in turn checks that
+ each certificate has been issued within the time frame, the issuing
+ certificate was valid. This allows the verification of signatures
+ after the CA's certificate expired. The validation test also
+ required an online check of the certificate status. The chain
+ model is required by the German signature law. See also _Shell
+ model_.
+
+'CMS'
+ The _Cryptographic Message Standard_ describes a message format for
+ encryption and digital signing. It is closely related to the X.509
+ certificate format. CMS was formerly known under the name 'PKCS#7'
+ and is described by 'RFC3369'.
+
+'CRL'
+ The _Certificate Revocation List_ is a list containing certificates
+ revoked by the issuer.
+
+'CSR'
+ The _Certificate Signing Request_ is a message send to a CA to ask
+ them to issue a new certificate. The data format of such a signing
+ request is called PCKS#10.
+
+'OpenPGP'
+ A data format used to build a PKI and to exchange encrypted or
+ signed messages. In contrast to X.509, OpenPGP also includes the
+ message format but does not explicitly demand a specific PKI.
+ However any kind of PKI may be build upon the OpenPGP protocol.
+
+'Keygrip'
+ This term is used by GnuPG to describe a 20 byte hash value used to
+ identify a certain key without referencing to a concrete protocol.
+ It is used internally to access a private key. Usually it is shown
+ and entered as a 40 character hexadecimal formatted string.
+
+'OCSP'
+ The _Online Certificate Status Protocol_ is used as an alternative
+ to a CRL. It is described in 'RFC 2560'.
+
+'PSE'
+ The _Personal Security Environment_ describes a database to store
+ private keys. This is either a smartcard or a collection of files
+ on a disk; the latter is often called a Soft-PSE.
+
+'Shell model'
+ The standard model for validation of certificates under X.509. At
+ the time of the verification all certificates must be valid and not
+ expired. See also _Chain mode_.
+
+'X.509'
+ Description of a PKI used with CMS. It is for example defined by
+ 'RFC3280'.
+
+
+File: gnupg.info, Node: Option Index, Next: Environment Index, Prev: Glossary, Up: Top
+
+Option Index
+************
+
+
+* Menu:
+
+* add-servers: Dirmngr Options. (line 195)
+* agent-program: GPG Configuration Options.
- (line 707)
++ (line 710)
+* agent-program <1>: Configuration Options.
+ (line 46)
+* agent-program <2>: Invoking gpg-connect-agent.
+ (line 42)
+* allow-admin: Scdaemon Options. (line 192)
+* allow-emacs-pinentry: Agent Options. (line 179)
+* allow-freeform-uid: GPG Esoteric Options.
+ (line 335)
+* allow-loopback-pinentry: Agent Options. (line 161)
+* allow-multiple-messages: GPG Esoteric Options.
- (line 472)
++ (line 475)
+* allow-non-selfsigned-uid: GPG Esoteric Options.
+ (line 330)
+* allow-ocsp: Dirmngr Options. (line 212)
+* allow-preset-passphrase: Agent Options. (line 156)
+* allow-secret-key-import: GPG Esoteric Options.
- (line 468)
++ (line 471)
+* allow-weak-digest-algos: GPG Esoteric Options.
+ (line 370)
+* always-trust: Deprecated Options. (line 21)
+* armor: GPG Input and Output.
+ (line 8)
+* armor <1>: Input and Output. (line 8)
+* ask-cert-expire: GPG Esoteric Options.
- (line 455)
++ (line 458)
+* ask-cert-level: GPG Configuration Options.
- (line 336)
++ (line 339)
+* ask-sig-expire: GPG Esoteric Options.
- (line 441)
++ (line 444)
+* assume-armor: Input and Output. (line 14)
+* assume-base64: Input and Output. (line 18)
+* assume-binary: Input and Output. (line 21)
+* attribute-fd: GPG Esoteric Options.
+ (line 87)
+* attribute-file: GPG Esoteric Options.
+ (line 93)
+* auto-check-trustdb: GPG Configuration Options.
- (line 694)
++ (line 697)
+* auto-issuer-key-retrieve: Certificate Options. (line 50)
+* auto-key-locate: GPG Configuration Options.
- (line 474)
++ (line 477)
+* auto-key-retrieve: GPG Configuration Options.
- (line 526)
++ (line 529)
+* base64: Input and Output. (line 11)
+* batch: Agent Options. (line 44)
+* batch <1>: GPG Configuration Options.
+ (line 43)
+* bzip2-compress-level: GPG Configuration Options.
- (line 310)
++ (line 313)
+* bzip2-decompress-lowmem: GPG Configuration Options.
- (line 320)
++ (line 323)
+* c: Dirmngr Options. (line 81)
+* cache-cert: dirmngr-client. (line 72)
+* call-dirmngr: Operational GPGSM Commands.
+ (line 27)
+* call-protect-tool: Operational GPGSM Commands.
+ (line 41)
+* card-edit: Operational GPG Commands.
- (line 173)
++ (line 174)
+* card-status: Operational GPG Commands.
- (line 179)
++ (line 180)
+* 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 182)
++ (line 183)
+* check-passphrase-pattern: Agent Options. (line 229)
+* check-sigs: Operational GPG Commands.
- (line 139)
++ (line 140)
+* check-trustdb: Operational GPG Commands.
- (line 305)
++ (line 306)
+* 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 651)
++ (line 654)
+* compress-algo: GPG Esoteric Options.
+ (line 204)
+* compress-level: GPG Configuration Options.
- (line 310)
- * create-socketdir: Invoking gpgconf. (line 66)
++ (line 313)
++* create-socketdir: Invoking gpgconf. (line 68)
+* csh: Agent Options. (line 134)
+* csh <1>: Dirmngr Options. (line 81)
+* ctapi-driver: Scdaemon Options. (line 145)
+* daemon: Agent Commands. (line 27)
+* daemon <1>: Dirmngr Commands. (line 27)
+* daemon <2>: Scdaemon Commands. (line 31)
+* dearmor: Operational GPG Commands.
- (line 359)
++ (line 360)
+* debug: Agent Options. (line 78)
+* debug <1>: Dirmngr Options. (line 62)
+* debug <2>: GPG Esoteric Options.
+ (line 47)
+* debug <3>: Esoteric Options. (line 54)
+* debug <4>: Scdaemon Options. (line 69)
+* debug-all: Agent Options. (line 102)
+* debug-all <1>: Dirmngr Options. (line 67)
+* debug-all <2>: GPG Esoteric Options.
+ (line 53)
+* debug-all <3>: Esoteric Options. (line 81)
+* debug-all <4>: Scdaemon Options. (line 96)
+* debug-allow-core-dump: Esoteric Options. (line 84)
+* debug-allow-core-dump <1>: Scdaemon Options. (line 113)
+* debug-assuan-log-cats: Scdaemon Options. (line 122)
+* debug-disable-ticker: Scdaemon Options. (line 109)
+* debug-ignore-expiration: Esoteric Options. (line 95)
+* debug-iolbf: GPG Esoteric Options.
+ (line 56)
+* debug-level: Agent Options. (line 53)
+* debug-level <1>: Dirmngr Options. (line 37)
+* debug-level <2>: GPG Esoteric Options.
+ (line 22)
+* debug-level <3>: Esoteric Options. (line 29)
+* debug-level <4>: Scdaemon Options. (line 40)
+* debug-log-tid: Scdaemon Options. (line 119)
+* debug-no-chain-validation: Esoteric Options. (line 91)
+* debug-pinentry: Agent Options. (line 122)
+* debug-quick-random: Agent Options. (line 110)
+* debug-wait: Agent Options. (line 105)
+* debug-wait <1>: Dirmngr Options. (line 73)
+* debug-wait <2>: Scdaemon Options. (line 99)
+* debug-wait <3>: Scdaemon Options. (line 104)
+* decode: Invoking gpg-connect-agent.
+ (line 95)
+* decrypt: Operational GPG Commands.
+ (line 52)
+* decrypt <1>: Operational GPGSM Commands.
+ (line 11)
+* decrypt <2>: gpg-zip. (line 22)
+* decrypt-files: Operational GPG Commands.
+ (line 100)
+* default-cache-ttl: Agent Options. (line 190)
+* default-cache-ttl <1>: Agent Options. (line 196)
+* default-cert-expire: GPG Esoteric Options.
- (line 461)
++ (line 464)
+* default-cert-level: GPG Configuration Options.
- (line 344)
++ (line 347)
+* default-key: GPG Configuration Options.
+ (line 10)
+* default-key <1>: Input and Output. (line 34)
+* default-keyserver-url: GPG Esoteric Options.
- (line 500)
++ (line 503)
+* default-preference-list: GPG Esoteric Options.
- (line 495)
++ (line 498)
+* default-recipient: GPG Configuration Options.
+ (line 19)
+* default-recipient-self: GPG Configuration Options.
+ (line 23)
+* default-sig-expire: GPG Esoteric Options.
- (line 447)
++ (line 450)
+* delete-keys: Certificate Management.
+ (line 59)
+* delete-secret-and-public-key: Operational GPG Commands.
- (line 200)
++ (line 201)
+* delete-secret-keys: Operational GPG Commands.
- (line 193)
++ (line 194)
+* deny-admin: Scdaemon Options. (line 192)
+* desig-revoke: OpenPGP Key Management.
+ (line 90)
+* detach-sign: Operational GPG Commands.
+ (line 27)
+* digest-algo: GPG Esoteric Options.
+ (line 197)
+* dirmngr: Invoking gpg-connect-agent.
+ (line 54)
+* dirmngr-program: GPG Configuration Options.
- (line 714)
++ (line 717)
+* dirmngr-program <1>: Configuration Options.
+ (line 52)
+* dirmngr-program <2>: Invoking gpg-connect-agent.
+ (line 49)
+* disable-application: Scdaemon Options. (line 202)
+* disable-ccid: Scdaemon Options. (line 150)
+* disable-check-own-socket: Agent Options. (line 294)
+* disable-cipher-algo: GPG Esoteric Options.
+ (line 235)
+* disable-crl-checks: Certificate Options. (line 13)
+* disable-dsa2: GPG Configuration Options.
+ (line 185)
+* disable-http: Dirmngr Options. (line 132)
+* disable-large-rsa: GPG Configuration Options.
+ (line 176)
+* disable-ldap: Dirmngr Options. (line 129)
+* disable-mdc: OpenPGP Options. (line 30)
+* disable-ocsp: Certificate Options. (line 41)
+* disable-pinpad: Scdaemon Options. (line 189)
+* disable-policy-checks: Certificate Options. (line 8)
+* disable-pubkey-algo: GPG Esoteric Options.
+ (line 240)
+* disable-scdaemon: Agent Options. (line 288)
+* disable-signer-uid: OpenPGP Options. (line 35)
+* disable-trusted-cert-crl-check: Certificate Options. (line 19)
+* display: Agent Options. (line 312)
+* display-charset: GPG Configuration Options.
- (line 265)
++ (line 268)
+* display-charset:iso-8859-1: GPG Configuration Options.
- (line 274)
++ (line 277)
+* display-charset:iso-8859-15: GPG Configuration Options.
- (line 280)
++ (line 283)
+* display-charset:iso-8859-2: GPG Configuration Options.
- (line 277)
++ (line 280)
+* display-charset:koi8-r: GPG Configuration Options.
- (line 283)
- * display-charset:utf-8: GPG Configuration Options.
+ (line 286)
++* display-charset:utf-8: GPG Configuration Options.
++ (line 289)
+* dry-run: GPG Esoteric Options.
+ (line 8)
+* dump-cert: Certificate Management.
+ (line 35)
+* dump-chain: Certificate Management.
+ (line 39)
+* dump-external-keys: Certificate Management.
+ (line 46)
+* dump-keys: Certificate Management.
+ (line 35)
+* dump-options: Agent Commands. (line 19)
+* dump-options <1>: Dirmngr Commands. (line 18)
+* dump-options <2>: General GPG Commands.
+ (line 19)
+* dump-options <3>: General GPGSM Commands.
+ (line 19)
+* dump-options <4>: Scdaemon Commands. (line 18)
+* dump-secret-keys: Certificate Management.
+ (line 42)
+* edit-key: OpenPGP Key Management.
+ (line 95)
+* emit-version: GPG Esoteric Options.
+ (line 109)
+* enable-crl-checks: Certificate Options. (line 13)
+* enable-dsa2: GPG Configuration Options.
+ (line 185)
+* enable-large-rsa: GPG Configuration Options.
+ (line 176)
+* enable-ocsp: Certificate Options. (line 41)
+* enable-passphrase-history: Agent Options. (line 248)
+* enable-pinpad-varlen: Scdaemon Options. (line 181)
+* enable-policy-checks: Certificate Options. (line 8)
+* enable-progress-filter: GPG Esoteric Options.
+ (line 66)
+* enable-putty-support: Agent Options. (line 332)
+* enable-special-filenames: GPG Esoteric Options.
- (line 482)
++ (line 485)
+* enable-ssh-support: Agent Options. (line 332)
+* enable-trusted-cert-crl-check: Certificate Options. (line 19)
+* enarmor: Operational GPG Commands.
- (line 359)
++ (line 360)
+* 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)
++ (line 35)
+* enforce-passphrase-constraints: Agent Options. (line 214)
+* escape-from-lines: GPG Esoteric Options.
+ (line 265)
+* exec: Invoking gpg-connect-agent.
+ (line 65)
+* exec-path: GPG Configuration Options.
+ (line 209)
+* exit-on-status-write-error: GPG Configuration Options.
- (line 740)
++ (line 743)
+* expert: GPG Configuration Options.
- (line 798)
++ (line 801)
+* export: Operational GPG Commands.
- (line 206)
++ (line 207)
+* export <1>: Certificate Management.
+ (line 68)
++* export-filter: GPG Input and Output.
++ (line 88)
+* export-options: GPG Input and Output.
- (line 75)
++ (line 118)
+* export-ownertrust: Operational GPG Commands.
- (line 320)
++ (line 321)
+* 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 222)
++ (line 223)
+* export-secret-subkeys: Operational GPG Commands.
- (line 222)
++ (line 223)
+* export-ssh-key: Operational GPG Commands.
- (line 244)
++ (line 245)
+* extra-digest-algo: Esoteric Options. (line 7)
+* extra-socket: Agent Options. (line 322)
+* faked-system-time: Agent Options. (line 48)
+* faked-system-time <1>: GPG Esoteric Options.
+ (line 60)
+* faked-system-time <2>: Esoteric Options. (line 18)
+* fast-list-mode: GPG Esoteric Options.
- (line 401)
++ (line 404)
+* fetch-crl: Dirmngr Commands. (line 44)
+* fetch-keys: Operational GPG Commands.
- (line 289)
++ (line 290)
+* fingerprint: Operational GPG Commands.
- (line 159)
++ (line 160)
+* fixed-list-mode: GPG Input and Output.
- (line 131)
++ (line 174)
+* flush: Dirmngr Commands. (line 54)
+* for-your-eyes-only: GPG Esoteric Options.
+ (line 174)
+* force: Dirmngr Options. (line 87)
+* force <1>: watchgnupg. (line 22)
+* force-crl-refresh: Certificate Options. (line 30)
+* force-default-responder: dirmngr-client. (line 64)
+* force-mdc: OpenPGP Options. (line 24)
+* forget: Invoking gpg-preset-passphrase.
+ (line 24)
+* gen-key: OpenPGP Key Management.
+ (line 63)
+* gen-key <1>: OpenPGP Key Management.
+ (line 69)
+* gen-key <2>: Certificate Management.
+ (line 7)
+* gen-prime: Operational GPG Commands.
- (line 354)
++ (line 355)
+* gen-random: Operational GPG Commands.
- (line 347)
++ (line 348)
+* gen-revoke: OpenPGP Key Management.
+ (line 77)
+* gnupg: Compliance Options. (line 12)
+* gnutls-debug: Dirmngr Options. (line 70)
+* gpg: gpg-zip. (line 50)
+* gpg-agent-info: GPG Configuration Options.
- (line 704)
++ (line 707)
+* gpg-args: gpg-zip. (line 53)
+* gpgconf-list: GPG Esoteric Options.
- (line 516)
++ (line 519)
+* gpgconf-test: GPG Esoteric Options.
- (line 520)
++ (line 523)
+* group: GPG Key related Options.
- (line 45)
++ (line 55)
+* help: Agent Commands. (line 15)
+* help <1>: Dirmngr Commands. (line 14)
+* help <2>: General GPG Commands.
+ (line 12)
+* help <3>: General GPGSM Commands.
+ (line 11)
+* help <4>: Scdaemon Commands. (line 14)
+* help <5>: watchgnupg. (line 35)
+* help <6>: dirmngr-client. (line 44)
+* help <7>: gpg-zip. (line 65)
+* hex: Invoking gpg-connect-agent.
+ (line 91)
+* hidden-encrypt-to: GPG Key related Options.
- (line 29)
++ (line 43)
+* hidden-recipient: GPG Key related Options.
+ (line 14)
++* hidden-recipient-file: GPG Key related Options.
++ (line 29)
+* homedir: Agent Options. (line 13)
+* homedir <1>: GPG Configuration Options.
- (line 244)
++ (line 247)
+* homedir <2>: Configuration Options.
+ (line 16)
+* homedir <3>: Scdaemon Options. (line 13)
+* homedir <4>: gpgv. (line 55)
+* homedir <5>: Invoking gpg-connect-agent.
+ (line 21)
+* homedir <6>: Invoking symcryptrun.
+ (line 36)
+* honor-http-proxy: Dirmngr Options. (line 151)
+* http-proxy: Dirmngr Options. (line 155)
+* ignore-cache-for-signing: Agent Options. (line 184)
+* ignore-cert-extension: Dirmngr Options. (line 261)
+* ignore-cert-extension <1>: Certificate Options. (line 70)
+* ignore-crc-error: GPG Esoteric Options.
+ (line 355)
+* ignore-http-dp: Dirmngr Options. (line 135)
+* ignore-ldap-dp: Dirmngr Options. (line 142)
+* ignore-mdc-error: GPG Esoteric Options.
+ (line 362)
+* ignore-ocsp-service-url: Dirmngr Options. (line 147)
+* ignore-time-conflict: GPG Esoteric Options.
+ (line 341)
+* ignore-time-conflict <1>: gpgv. (line 49)
+* ignore-valid-from: GPG Esoteric Options.
+ (line 348)
+* import: Operational GPG Commands.
- (line 258)
++ (line 259)
+* import <1>: Certificate Management.
+ (line 98)
++* import-filter: GPG Input and Output.
++ (line 88)
+* import-options: GPG Input and Output.
+ (line 29)
+* import-ownertrust: Operational GPG Commands.
- (line 326)
++ (line 327)
+* include-certs: CMS Options. (line 7)
+* interactive: GPG Esoteric Options.
+ (line 19)
+* keep-display: Agent Options. (line 317)
+* keep-tty: Agent Options. (line 317)
+* keydb-clear-some-cert-flags: Certificate Management.
+ (line 51)
+* keyedit:addcardkey: OpenPGP Key Management.
+ (line 238)
+* keyedit:addkey: OpenPGP Key Management.
+ (line 235)
+* keyedit:addphoto: OpenPGP Key Management.
+ (line 157)
+* keyedit:addrevoker: OpenPGP Key Management.
+ (line 286)
+* keyedit:adduid: OpenPGP Key Management.
+ (line 154)
+* keyedit:bkuptocard: OpenPGP Key Management.
+ (line 252)
+* keyedit:check: OpenPGP Key Management.
+ (line 150)
+* keyedit:clean: OpenPGP Key Management.
+ (line 299)
+* keyedit:cross-certify: OpenPGP Key Management.
+ (line 313)
+* keyedit:delkey: OpenPGP Key Management.
+ (line 263)
+* keyedit:delsig: OpenPGP Key Management.
+ (line 140)
+* keyedit:deluid: OpenPGP Key Management.
+ (line 167)
+* keyedit:disable: OpenPGP Key Management.
+ (line 282)
+* keyedit:enable: OpenPGP Key Management.
+ (line 282)
+* keyedit:expire: OpenPGP Key Management.
+ (line 271)
+* keyedit:key: OpenPGP Key Management.
+ (line 104)
+* keyedit:keyserver: OpenPGP Key Management.
+ (line 184)
+* keyedit:keytocard: OpenPGP Key Management.
+ (line 241)
+* keyedit:lsign: OpenPGP Key Management.
+ (line 115)
+* keyedit:minimize: OpenPGP Key Management.
+ (line 308)
+* keyedit:notation: OpenPGP Key Management.
+ (line 191)
+* keyedit:nrsign: OpenPGP Key Management.
+ (line 120)
+* keyedit:passwd: OpenPGP Key Management.
+ (line 292)
+* keyedit:pref: OpenPGP Key Management.
+ (line 199)
+* keyedit:primary: OpenPGP Key Management.
+ (line 176)
+* keyedit:quit: OpenPGP Key Management.
+ (line 324)
+* keyedit:revkey: OpenPGP Key Management.
+ (line 268)
+* keyedit:revsig: OpenPGP Key Management.
+ (line 145)
+* keyedit:revuid: OpenPGP Key Management.
+ (line 173)
+* keyedit:save: OpenPGP Key Management.
+ (line 321)
+* keyedit:setpref: OpenPGP Key Management.
+ (line 211)
+* keyedit:showphoto: OpenPGP Key Management.
+ (line 164)
+* keyedit:showpref: OpenPGP Key Management.
+ (line 203)
+* keyedit:sign: OpenPGP Key Management.
+ (line 108)
+* keyedit:toggle: OpenPGP Key Management.
+ (line 295)
+* keyedit:trust: OpenPGP Key Management.
+ (line 277)
+* keyedit:tsign: OpenPGP Key Management.
+ (line 124)
+* keyedit:uid: OpenPGP Key Management.
+ (line 100)
+* keyid-format: GPG Configuration Options.
- (line 543)
++ (line 546)
+* keyring: GPG Configuration Options.
+ (line 216)
+* keyring <1>: gpgv. (line 36)
+* keyserver: Dirmngr Options. (line 98)
+* keyserver <1>: GPG Configuration Options.
- (line 552)
++ (line 555)
+* keyserver-options: GPG Configuration Options.
- (line 575)
- * kill: Invoking gpgconf. (line 60)
- * launch: Invoking gpgconf. (line 53)
++ (line 578)
++* kill: Invoking gpgconf. (line 62)
++* launch: Invoking gpgconf. (line 55)
+* lc-ctype: Agent Options. (line 312)
+* lc-messages: Agent Options. (line 312)
+* ldap-proxy: Dirmngr Options. (line 160)
+* ldapserverlist-file: Dirmngr Options. (line 171)
+* ldaptimeout: Dirmngr Options. (line 190)
+* learn-card: Certificate Management.
+ (line 103)
+* legacy-list-mode: GPG Input and Output.
- (line 137)
++ (line 180)
+* limit-card-insert-tries: GPG Configuration Options.
- (line 749)
++ (line 752)
+* list-archive: gpg-zip. (line 43)
+* list-chain: Certificate Management.
+ (line 31)
+* list-config: GPG Esoteric Options.
- (line 505)
++ (line 508)
+* list-crls: Dirmngr Commands. (line 32)
+* list-gcrypt-config: GPG Esoteric Options.
- (line 513)
++ (line 516)
+* list-keys: Operational GPG Commands.
+ (line 105)
+* list-keys <1>: Certificate Management.
+ (line 16)
+* list-keys <2>: Certificate Management.
+ (line 27)
+* list-only: GPG Esoteric Options.
+ (line 11)
+* list-options: GPG Configuration Options.
+ (line 63)
+* list-options:show-keyring: GPG Configuration Options.
+ (line 112)
+* list-options:show-keyserver-urls: GPG Configuration Options.
+ (line 96)
+* list-options:show-notations: GPG Configuration Options.
+ (line 91)
+* list-options:show-photos: GPG Configuration Options.
+ (line 71)
+* list-options:show-policy-urls: GPG Configuration Options.
+ (line 85)
+* list-options:show-sig-expire: GPG Configuration Options.
+ (line 116)
+* list-options:show-sig-subpackets: GPG Configuration Options.
+ (line 120)
+* list-options:show-std-notations: GPG Configuration Options.
+ (line 91)
+* list-options:show-uid-validity: GPG Configuration Options.
+ (line 100)
+* list-options:show-unusable-subkeys: GPG Configuration Options.
+ (line 108)
+* list-options:show-unusable-uids: GPG Configuration Options.
+ (line 104)
+* list-options:show-usage: GPG Configuration Options.
+ (line 79)
+* list-options:show-user-notations: GPG Configuration Options.
+ (line 91)
+* list-packets: Operational GPG Commands.
- (line 168)
++ (line 169)
+* list-secret-keys: Operational GPG Commands.
- (line 115)
++ (line 116)
+* list-secret-keys <1>: Certificate Management.
+ (line 23)
+* list-sigs: Operational GPG Commands.
- (line 121)
++ (line 122)
+* load-crl: Dirmngr Commands. (line 36)
+* load-crl <1>: dirmngr-client. (line 80)
+* local-user: GPG Key related Options.
- (line 67)
++ (line 77)
+* local-user <1>: Input and Output. (line 41)
+* local-user <2>: gpg-zip. (line 40)
+* locate-keys: Operational GPG Commands.
- (line 152)
++ (line 153)
+* lock-multiple: GPG Configuration Options.
- (line 729)
++ (line 732)
+* lock-never: GPG Configuration Options.
- (line 733)
++ (line 736)
+* lock-once: GPG Configuration Options.
- (line 725)
++ (line 728)
+* log-file: Agent Options. (line 144)
+* log-file <1>: Dirmngr Options. (line 33)
+* log-file <2>: GPG Esoteric Options.
+ (line 83)
+* log-file <3>: Configuration Options.
+ (line 76)
+* log-file <4>: Scdaemon Options. (line 135)
+* log-file <5>: Invoking symcryptrun.
+ (line 57)
+* logger-fd: GPG Esoteric Options.
+ (line 79)
+* logger-fd <1>: gpgv. (line 46)
+* lookup: dirmngr-client. (line 86)
+* lsign-key: OpenPGP Key Management.
+ (line 359)
+* mangle-dos-filenames: GPG Configuration Options.
- (line 328)
++ (line 331)
+* marginals-needed: GPG Configuration Options.
- (line 655)
++ (line 658)
+* max-cache-ttl: Agent Options. (line 202)
+* max-cache-ttl-ssh: Agent Options. (line 208)
+* max-cert-depth: GPG Configuration Options.
- (line 681)
++ (line 684)
+* max-output: GPG Input and Output.
+ (line 19)
+* max-passphrase-days: Agent Options. (line 243)
+* max-replies: Dirmngr Options. (line 258)
+* min-cert-level: GPG Configuration Options.
- (line 373)
++ (line 376)
+* min-passphrase-len: Agent Options. (line 218)
+* min-passphrase-nonalpha: Agent Options. (line 223)
+* multi-server: Scdaemon Commands. (line 26)
+* multifile: Operational GPG Commands.
+ (line 86)
+* nameserver: Dirmngr Options. (line 121)
+* no: GPG Configuration Options.
+ (line 60)
+* no-allow-external-cache: Agent Options. (line 169)
+* no-allow-loopback-pinentry: Agent Options. (line 161)
+* no-allow-mark-trusted: Agent Options. (line 151)
+* no-armor: GPG Input and Output.
+ (line 12)
+* no-auto-key-retrieve: GPG Configuration Options.
- (line 526)
++ (line 529)
+* no-autostart: GPG Configuration Options.
- (line 718)
++ (line 721)
+* no-autostart <1>: Configuration Options.
+ (line 65)
+* no-autostart <2>: Invoking gpg-connect-agent.
+ (line 77)
+* no-batch: GPG Configuration Options.
+ (line 43)
+* no-common-certs-import: Esoteric Options. (line 124)
+* no-default-keyring: GPG Esoteric Options.
+ (line 386)
+* no-default-recipient: GPG Configuration Options.
+ (line 29)
+* no-detach: Agent Options. (line 127)
+* no-detach <1>: Scdaemon Options. (line 131)
+* no-encrypt-to: GPG Key related Options.
- (line 41)
++ (line 51)
+* no-expensive-trust-checks: GPG Esoteric Options.
- (line 487)
++ (line 490)
+* no-ext-connect: Invoking gpg-connect-agent.
+ (line 72)
+* no-grab: Agent Options. (line 140)
+* no-greeting: GPG Configuration Options.
- (line 763)
++ (line 766)
+* no-groups: GPG Key related Options.
- (line 63)
++ (line 73)
++* no-keyring: GPG Esoteric Options.
++ (line 393)
+* no-literal: GPG Esoteric Options.
- (line 409)
++ (line 412)
+* no-mangle-dos-filenames: GPG Configuration Options.
- (line 328)
++ (line 331)
+* no-mdc-warning: GPG Configuration Options.
- (line 782)
++ (line 785)
+* no-options: GPG Configuration Options.
- (line 303)
++ (line 306)
+* no-random-seed-file: GPG Configuration Options.
- (line 757)
++ (line 760)
+* no-secmem-warning: GPG Configuration Options.
- (line 766)
++ (line 769)
+* no-secmem-warning <1>: Configuration Options.
+ (line 72)
+* no-sig-cache: GPG Configuration Options.
- (line 684)
++ (line 687)
+* no-skip-hidden-recipients: GPG Key related Options.
- (line 90)
++ (line 100)
+* no-tty: GPG Configuration Options.
+ (line 52)
+* no-use-standard-socket: Agent Options. (line 302)
+* no-verbose: GPG Configuration Options.
+ (line 36)
+* not-dash-escaped: GPG Esoteric Options.
+ (line 255)
+* ocsp: dirmngr-client. (line 61)
+* ocsp-current-period: Dirmngr Options. (line 253)
+* ocsp-max-clock-skew: Dirmngr Options. (line 245)
+* ocsp-max-period: Dirmngr Options. (line 249)
+* ocsp-responder: Dirmngr Options. (line 219)
+* ocsp-signer: Dirmngr Options. (line 224)
+* only-ldap-proxy: Dirmngr Options. (line 166)
+* openpgp: Compliance Options. (line 19)
+* options: Agent Options. (line 7)
+* options <1>: Dirmngr Options. (line 7)
+* options <2>: Dirmngr Options. (line 12)
+* options <3>: GPG Configuration Options.
- (line 298)
++ (line 301)
+* options <4>: Configuration Options.
+ (line 10)
+* options <5>: Scdaemon Options. (line 7)
+* output: GPG Input and Output.
+ (line 16)
+* output <1>: Input and Output. (line 51)
+* output <2>: gpg-zip. (line 47)
+* override-session-key: GPG Esoteric Options.
- (line 432)
++ (line 435)
+* p12-charset: Input and Output. (line 24)
+* passphrase: GPG Esoteric Options.
+ (line 295)
+* passphrase <1>: Invoking gpg-preset-passphrase.
+ (line 34)
+* passphrase-fd: GPG Esoteric Options.
+ (line 277)
+* passphrase-fd <1>: Esoteric Options. (line 100)
+* passphrase-file: GPG Esoteric Options.
+ (line 286)
+* passphrase-repeat: GPG Esoteric Options.
+ (line 272)
+* passwd: OpenPGP Key Management.
- (line 391)
++ (line 399)
+* passwd <1>: Certificate Management.
+ (line 108)
+* pcsc-driver: Scdaemon Options. (line 139)
+* pem: dirmngr-client. (line 58)
+* permission-warning: GPG Configuration Options.
- (line 769)
++ (line 772)
+* personal-cipher-preferences: OpenPGP Options. (line 42)
+* personal-compress-preferences: OpenPGP Options. (line 60)
+* personal-digest-preferences: OpenPGP Options. (line 51)
- * pgp6: Compliance Options. (line 34)
- * pgp7: Compliance Options. (line 44)
- * pgp8: Compliance Options. (line 50)
++* pgp6: Compliance Options. (line 41)
++* pgp7: Compliance Options. (line 51)
++* pgp8: Compliance Options. (line 57)
+* photo-viewer: GPG Configuration Options.
+ (line 191)
+* pinentry-invisible-char: Agent Options. (line 251)
+* pinentry-mode: GPG Esoteric Options.
+ (line 303)
+* pinentry-mode <1>: Esoteric Options. (line 109)
+* pinentry-program: Agent Options. (line 262)
+* pinentry-timeout: Agent Options. (line 256)
+* pinentry-touch-file: Agent Options. (line 275)
+* ping: dirmngr-client. (line 69)
+* policy-file: Configuration Options.
+ (line 43)
+* prefer-system-dirmngr: Configuration Options.
+ (line 56)
+* preserve-permissions: GPG Esoteric Options.
- (line 490)
++ (line 493)
+* preset: Invoking gpg-preset-passphrase.
+ (line 20)
+* primary-keyring: GPG Configuration Options.
- (line 232)
- * print-dane-records: GPG Input and Output.
- (line 125)
++ (line 235)
+* print-md: Operational GPG Commands.
- (line 342)
- * print-pka-records: GPG Input and Output.
- (line 119)
++ (line 343)
+* q: Invoking gpg-connect-agent.
+ (line 18)
+* q <1>: Invoking symcryptrun.
+ (line 33)
+* quick-addkey: OpenPGP Key Management.
+ (line 35)
+* quick-adduid: OpenPGP Key Management.
+ (line 384)
+* quick-gen-key: OpenPGP Key Management.
+ (line 9)
+* quick-lsign-key: OpenPGP Key Management.
+ (line 365)
++* quick-revuid: OpenPGP Key Management.
++ (line 391)
+* quick-sign-key: OpenPGP Key Management.
+ (line 365)
+* quiet: Agent Options. (line 41)
+* quiet <1>: GPG Configuration Options.
+ (line 39)
+* quiet <2>: gpgv. (line 33)
- * quiet <3>: Invoking gpgconf. (line 87)
++* quiet <3>: Invoking gpgconf. (line 89)
+* quiet <4>: Invoking gpg-connect-agent.
+ (line 18)
+* quiet <5>: dirmngr-client. (line 48)
+* quiet <6>: Invoking symcryptrun.
+ (line 33)
+* raw-socket: Invoking gpg-connect-agent.
+ (line 59)
+* reader-port: Scdaemon Options. (line 156)
+* rebuild-keydb-caches: Operational GPG Commands.
- (line 336)
++ (line 337)
+* recipient: GPG Key related Options.
+ (line 8)
+* recipient <1>: Input and Output. (line 46)
+* recipient <2>: gpg-zip. (line 36)
++* recipient-file: GPG Key related Options.
++ (line 22)
+* recv-keys: Operational GPG Commands.
- (line 267)
++ (line 268)
+* refresh-keys: Operational GPG Commands.
- (line 271)
- * reload: Invoking gpgconf. (line 48)
- * remove-socketdir: Invoking gpgconf. (line 72)
++ (line 272)
++* reload: Invoking gpgconf. (line 50)
++* remove-socketdir: Invoking gpgconf. (line 74)
+* require-cross-certification: GPG Configuration Options.
- (line 791)
++ (line 794)
+* require-secmem: GPG Configuration Options.
- (line 786)
- * rfc2440: Compliance Options. (line 30)
++ (line 789)
++* rfc2440: Compliance Options. (line 37)
+* rfc4880: Compliance Options. (line 25)
++* rfc4880bis: Compliance Options. (line 30)
+* run: Invoking gpg-connect-agent.
+ (line 82)
+* s: Dirmngr Options. (line 81)
+* s2k-cipher-algo: OpenPGP Options. (line 70)
+* s2k-count: OpenPGP Options. (line 86)
+* s2k-digest-algo: OpenPGP Options. (line 75)
+* s2k-mode: OpenPGP Options. (line 79)
+* scdaemon-program: Agent Options. (line 284)
+* search-keys: Operational GPG Commands.
- (line 280)
++ (line 281)
+* secret-keyring: GPG Configuration Options.
- (line 227)
++ (line 230)
+* send-keys: Operational GPG Commands.
- (line 213)
++ (line 214)
+* 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)
++ (line 416)
+* set-notation: GPG Esoteric Options.
+ (line 119)
+* set-policy-url: GPG Esoteric Options.
+ (line 149)
+* sh: Agent Options. (line 134)
+* sh <1>: Dirmngr Options. (line 81)
+* show-keyring: Deprecated Options. (line 16)
+* show-notation: Deprecated Options. (line 25)
+* show-photos: Deprecated Options. (line 8)
+* show-policy-url: Deprecated Options. (line 33)
+* show-session-key: GPG Esoteric Options.
- (line 417)
++ (line 420)
+* shutdown: Dirmngr Commands. (line 50)
+* sig-keyserver-url: GPG Esoteric Options.
+ (line 159)
+* sig-notation: GPG Esoteric Options.
+ (line 119)
+* sig-policy-url: GPG Esoteric Options.
+ (line 149)
+* sign: Operational GPG Commands.
+ (line 8)
+* sign <1>: Operational GPGSM Commands.
+ (line 16)
+* sign-key: OpenPGP Key Management.
+ (line 355)
+* skip-hidden-recipients: GPG Key related Options.
- (line 90)
++ (line 100)
+* skip-verify: GPG Esoteric Options.
- (line 393)
++ (line 396)
+* squid-mode: dirmngr-client. (line 101)
+* status-fd: GPG Esoteric Options.
+ (line 71)
+* status-fd <1>: gpgv. (line 42)
+* status-file: GPG Esoteric Options.
+ (line 75)
+* store: Operational GPG Commands.
+ (line 48)
+* subst: Invoking gpg-connect-agent.
+ (line 88)
+* symmetric: Operational GPG Commands.
+ (line 39)
+* tar: gpg-zip. (line 56)
+* tar-args: gpg-zip. (line 59)
+* textmode: OpenPGP Options. (line 8)
+* throw-keyids: GPG Esoteric Options.
+ (line 246)
+* tofu-default-policy: GPG Configuration Options.
- (line 659)
++ (line 662)
+* tofu-default-policy <1>: GPG Configuration Options.
- (line 663)
++ (line 666)
+* tofu-policy: Operational GPG Commands.
- (line 364)
++ (line 365)
+* trust-mode:always: GPG Configuration Options.
- (line 459)
++ (line 462)
+* trust-mode:auto: GPG Configuration Options.
- (line 468)
++ (line 471)
+* trust-mode:classic: GPG Configuration Options.
- (line 394)
++ (line 397)
+* trust-mode:direct: GPG Configuration Options.
- (line 455)
++ (line 458)
+* trust-mode:pgp: GPG Configuration Options.
- (line 389)
++ (line 392)
+* trust-mode:tofu: GPG Configuration Options.
- (line 397)
++ (line 400)
+* trust-mode:tofu+pgp: GPG Configuration Options.
- (line 443)
++ (line 446)
+* trust-model: GPG Configuration Options.
- (line 386)
++ (line 389)
+* trustdb-name: GPG Configuration Options.
- (line 237)
++ (line 240)
+* trusted-key: GPG Configuration Options.
- (line 379)
++ (line 382)
+* try-all-secrets: GPG Key related Options.
- (line 82)
++ (line 92)
+* try-secret-key: GPG Key related Options.
- (line 71)
++ (line 81)
+* ttyname: Agent Options. (line 312)
+* ttytype: Agent Options. (line 312)
+* ungroup: GPG Key related Options.
- (line 60)
++ (line 70)
+* update-trustdb: Operational GPG Commands.
- (line 295)
++ (line 296)
+* url: dirmngr-client. (line 94)
+* url <1>: dirmngr-client. (line 98)
+* use-agent: GPG Configuration Options.
- (line 701)
++ (line 704)
+* use-embedded-filename: GPG Esoteric Options.
+ (line 183)
+* use-standard-socket: Agent Options. (line 302)
+* use-standard-socket-p: Agent Options. (line 302)
+* use-tor: Dirmngr Options. (line 91)
+* utf8-strings: GPG Configuration Options.
- (line 291)
++ (line 294)
+* v: Dirmngr Options. (line 28)
+* v <1>: Configuration Options.
+ (line 38)
+* v <2>: Scdaemon Options. (line 35)
+* v <3>: dirmngr-client. (line 53)
+* validate: dirmngr-client. (line 76)
+* validation-model: Certificate Options. (line 61)
+* verbose: Agent Options. (line 35)
+* verbose <1>: Dirmngr Options. (line 28)
+* verbose <2>: GPG Configuration Options.
+ (line 32)
+* verbose <3>: Configuration Options.
+ (line 38)
+* verbose <4>: Scdaemon Options. (line 35)
+* verbose <5>: watchgnupg. (line 29)
+* verbose <6>: gpgv. (line 28)
+* verbose <7>: Invoking gpg-preset-passphrase.
+ (line 30)
+* verbose <8>: Invoking gpg-connect-agent.
+ (line 14)
+* verbose <9>: dirmngr-client. (line 53)
+* verbose <10>: Invoking symcryptrun.
+ (line 29)
+* verify: Operational GPG Commands.
+ (line 60)
+* verify <1>: Operational GPGSM Commands.
+ (line 20)
+* verify-files: Operational GPG Commands.
+ (line 94)
+* verify-options: GPG Configuration Options.
+ (line 127)
+* verify-options:pka-lookups: GPG Configuration Options.
+ (line 163)
+* verify-options:pka-trust-increase: GPG Configuration Options.
+ (line 170)
+* verify-options:show-keyserver-urls: GPG Configuration Options.
+ (line 146)
+* verify-options:show-notations: GPG Configuration Options.
+ (line 142)
+* verify-options:show-photos: GPG Configuration Options.
+ (line 132)
+* verify-options:show-policy-urls: GPG Configuration Options.
+ (line 136)
+* verify-options:show-primary-uid-only: GPG Configuration Options.
+ (line 158)
+* verify-options:show-std-notations: GPG Configuration Options.
+ (line 142)
+* verify-options:show-uid-validity: GPG Configuration Options.
+ (line 150)
+* verify-options:show-unusable-uids: GPG Configuration Options.
+ (line 154)
+* verify-options:show-user-notations: GPG Configuration Options.
+ (line 142)
+* version: Agent Commands. (line 10)
+* version <1>: Dirmngr Commands. (line 10)
+* version <2>: General GPG Commands.
+ (line 7)
+* version <3>: General GPGSM Commands.
+ (line 7)
+* version <4>: Scdaemon Commands. (line 10)
+* version <5>: watchgnupg. (line 32)
+* version <6>: dirmngr-client. (line 40)
+* version <7>: gpg-zip. (line 62)
+* warranty: General GPG Commands.
+ (line 16)
+* warranty <1>: General GPGSM Commands.
+ (line 15)
+* weak-digest: GPG Esoteric Options.
+ (line 378)
+* weak-digest <1>: gpgv. (line 76)
+* with-colons: GPG Input and Output.
- (line 111)
++ (line 166)
+* with-ephemeral-keys: Esoteric Options. (line 24)
+* with-fingerprint: GPG Input and Output.
- (line 143)
++ (line 186)
+* with-icao-spelling: GPG Input and Output.
- (line 154)
++ (line 197)
+* with-key-data: GPG Esoteric Options.
- (line 397)
++ (line 400)
+* with-key-data <1>: Input and Output. (line 54)
+* with-keygrip: GPG Input and Output.
- (line 158)
++ (line 201)
+* with-secret: GPG Input and Output.
- (line 166)
++ (line 209)
+* with-secret <1>: Input and Output. (line 78)
+* with-subkey-fingerprint: GPG Input and Output.
- (line 147)
++ (line 190)
+* with-validation: Input and Output. (line 60)
+* with-wkd-hash: GPG Input and Output.
- (line 161)
++ (line 204)
+* xauthority: Agent Options. (line 312)
+* yes: GPG Configuration Options.
+ (line 57)
+
+
+File: gnupg.info, Node: Environment Index, Next: Index, Prev: Option Index, Up: Top
+
+Environment Variable and File Index
+***********************************
+
+
+* Menu:
+
+* .gpg-v21-migrated: GPG Configuration. (line 52)
+* ~/.gnupg: GPG Configuration. (line 27)
+* ASSUAN_DEBUG: Scdaemon Options. (line 122)
+* COLUMNS: GPG Configuration. (line 96)
+* com-certs.pem: GPGSM Configuration. (line 84)
+* DISPLAY: GPGSM OPTION. (line 21)
+* GNUPGHOME: Agent Options. (line 13)
+* GNUPGHOME <1>: GPG Configuration Options.
- (line 244)
++ (line 247)
+* GNUPGHOME <2>: GPG Configuration. (line 84)
+* GNUPGHOME <3>: Configuration Options.
+ (line 16)
+* GNUPGHOME <4>: Scdaemon Options. (line 13)
+* GNUPGHOME <5>: gpgv. (line 55)
+* GNUPGHOME <6>: Invoking gpg-connect-agent.
+ (line 21)
+* GNUPGHOME <7>: Invoking symcryptrun.
+ (line 36)
+* gpg-agent.conf: Agent Configuration. (line 11)
+* gpg.conf: GPG Configuration. (line 11)
+* gpgconf.ctl: Agent Options. (line 24)
+* gpgconf.ctl <1>: GPG Configuration Options.
- (line 255)
++ (line 258)
+* gpgconf.ctl <2>: Configuration Options.
+ (line 27)
+* gpgconf.ctl <3>: Scdaemon Options. (line 24)
+* gpgconf.ctl <4>: gpgv. (line 66)
+* gpgconf.ctl <5>: Invoking gpg-connect-agent.
+ (line 32)
+* gpgconf.ctl <6>: Invoking symcryptrun.
+ (line 47)
+* gpgsm.conf: GPGSM Configuration. (line 11)
+* GPG_TTY: Invoking GPG-AGENT. (line 17)
+* GPG_TTY <1>: GPGSM OPTION. (line 23)
+* help.txt: GPGSM Configuration. (line 72)
+* HKCU\Software\GNU\GnuPG:DefaultLogFile: Agent Options. (line 144)
+* HKCU\Software\GNU\GnuPG:HomeDir: Agent Options. (line 13)
+* HKCU\Software\GNU\GnuPG:HomeDir <1>: GPG Configuration Options.
- (line 244)
++ (line 247)
+* HKCU\Software\GNU\GnuPG:HomeDir <2>: Configuration Options.
+ (line 16)
+* HKCU\Software\GNU\GnuPG:HomeDir <3>: Scdaemon Options. (line 13)
+* HKCU\Software\GNU\GnuPG:HomeDir <4>: gpgv. (line 55)
+* HKCU\Software\GNU\GnuPG:HomeDir <5>: Invoking gpg-connect-agent.
+ (line 21)
+* HKCU\Software\GNU\GnuPG:HomeDir <6>: Invoking symcryptrun.
+ (line 36)
+* HOME: GPG Configuration. (line 81)
+* http_proxy: Dirmngr Options. (line 155)
+* LANGUAGE: GPG Configuration. (line 99)
+* LC_CTYPE: GPGSM OPTION. (line 27)
+* LC_MESSAGES: GPGSM OPTION. (line 29)
+* LINES: GPG Configuration. (line 96)
+* openpgp-revocs.d: GPG Configuration. (line 66)
+* options.skel: GPG Configuration. (line 76)
+* PATH: GPG Configuration Options.
+ (line 209)
+* PINENTRY_USER_DATA: GPG Configuration. (line 91)
+* PINENTRY_USER_DATA <1>: GPGSM OPTION. (line 33)
+* policies.txt: GPGSM Configuration. (line 18)
+* private-keys-v1.d: Agent Configuration. (line 105)
+* pubring.gpg: GPG Configuration. (line 32)
+* pubring.kbx: GPG Configuration. (line 38)
+* pubring.kbx <1>: GPGSM Configuration. (line 100)
+* qualified.txt: GPGSM Configuration. (line 33)
+* random_seed: GPG Configuration. (line 63)
+* random_seed <1>: GPGSM Configuration. (line 106)
+* S.gpg-agent: GPGSM Configuration. (line 111)
+* secring.gpg: GPG Configuration. (line 45)
+* SHELL: Agent Options. (line 134)
+* sshcontrol: Agent Configuration. (line 75)
+* TERM: GPGSM OPTION. (line 25)
+* trustdb.gpg: GPG Configuration. (line 55)
+* trustlist.txt: Agent Configuration. (line 20)
+* XAUTHORITY: GPGSM OPTION. (line 31)
+
+
+File: gnupg.info, Node: Index, Prev: Environment Index, Up: Top
+
+Index
+*****
+
+
+* Menu:
+
+* command options: Invoking GPG-AGENT. (line 6)
+* command options <1>: Invoking DIRMNGR. (line 6)
+* command options <2>: Invoking GPG. (line 6)
+* command options <3>: Invoking GPGSM. (line 6)
+* command options <4>: Invoking SCDAEMON. (line 6)
+* contributors: Contributors. (line 6)
+* DIRMNGR command options: Invoking DIRMNGR. (line 6)
+* GPG command options: Invoking GPG. (line 6)
+* GPG-AGENT command options: Invoking GPG-AGENT. (line 6)
+* gpgconf.conf: Files used by gpgconf.
+ (line 7)
+* GPGSM command options: Invoking GPGSM. (line 6)
+* options, DIRMNGR command: Invoking DIRMNGR. (line 6)
+* options, GPG command: Invoking GPG. (line 6)
+* options, GPG-AGENT command: Invoking GPG-AGENT. (line 6)
+* options, GPGSM command: Invoking GPGSM. (line 6)
+* options, SCDAEMON command: Invoking SCDAEMON. (line 6)
+* relax: Agent Configuration. (line 63)
+* scd-event: Scdaemon Configuration.
+ (line 18)
+* SCDAEMON command options: Invoking SCDAEMON. (line 6)
+* scdaemon.conf: Scdaemon Configuration.
+ (line 11)
+* SIGHUP: Agent Signals. (line 12)
+* SIGHUP <1>: Dirmngr Signals. (line 12)
+* SIGINT: Agent Signals. (line 31)
+* SIGINT <1>: Dirmngr Signals. (line 26)
+* SIGTERM: Agent Signals. (line 26)
+* SIGTERM <1>: Dirmngr Signals. (line 19)
+* SIGUSR1: Agent Signals. (line 34)
+* SIGUSR1 <1>: Dirmngr Signals. (line 29)
+* SIGUSR2: Agent Signals. (line 37)
+
diff --cc po/ca.po
index 831d0ec,086ac26..8fa8679
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -427,10 -341,6 +427,10 @@@ msgid "run in server mode (foreground)
msgstr ""
# Un dels dos és en la llista d'opcions amb --help. Urgh. jm
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detall"
@@@ -545,11 -430,6 +545,11 @@@ msgstr "no és suportat
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs at gnu.org>.\n"
@@@ -565,55 -443,38 +565,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "AVÍS: %s és una opció desaconsellada.\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Certificat de revocació vàlid"
@@@ -623,28 -483,22 +623,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "error en crear «%s»: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
@@@ -672,7 -520,6 +672,7 @@@ msgstr "base de dades de confiança: h
msgid "can't use '%s' as home directory\n"
msgstr "%s: no s'ha pogut crear el directori: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -697,18 -540,14 +697,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "ha fallat l'actualització de la clau secreta: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu claus es descarta\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@@ -724,8 -561,6 +724,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -733,9 -568,6 +733,9 @@@ msgstr "
"@Ordres:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -974,29 -763,22 +974,29 @@@ msgstr "error en la creació de la cont
msgid "error creating a stream for a pipe: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "error en la lectura de «%s»: %s\n"
@@@ -1011,32 -791,26 +1011,32 @@@ msgstr "s'ha produït un error mentre s
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "no s'ha pogut connectar amb «%s»: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "s'ha cancel·lat per l'usuari\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
@@@ -1115,7 -874,6 +1115,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
@@@ -1393,7 -1097,6 +1393,7 @@@ msgstr "No hi ha ajuda disponible per
msgid "ignoring garbage line"
msgstr "error en l'última línia\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "[no establert]"
@@@ -1540,98 -1216,78 +1540,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "la capçalera d'armadura és invàlida: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "capçalera d'armadura: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "la capçalera de signatura clara és invàlida\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, 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:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "signatures en text pla imbricades\n"
# FIXME: un-indiar. jm
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "la línia escapada amb guió és invàlida: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, 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:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "fi de fitxer prematur (no CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "fi de fitxer prematur (en CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "CRC malformat\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "error de CRC; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fí de fitxer prematur (al final)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "error en l'última línia\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "no s'han trobat dades OpenPGP vàlides.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "no llegible per humans"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1639,25 -1295,20 +1639,25 @@@ msgstr "
"un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
"amb el signe «=»\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, 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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1667,7 -1318,6 +1667,7 @@@ msgstr "
"un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
"amb el signe «=»\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
@@@ -1699,21 -1344,16 +1699,21 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "la clau secreta no està disponible"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
# Destès? ivb
# Desatès, sí. jm
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "no es pot fet això en mode desatès\n"
@@@ -1729,10 -1367,6 +1729,10 @@@ msgstr "Aquesta ordre no està permesa
msgid "Reset Code not or not anymore available\n"
msgstr "parts de la clau secreta no estan disponbles\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "La vostra selecció? "
@@@ -1799,148 -1419,115 +1799,149 @@@ msgstr "no hi ha cap clau pública corr
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "preferències actualitzades"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "Empremta digital:"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "no s'han trobat dades OpenPGP vàlides.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Quina grandària voleu? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
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:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrodonida fins a %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1948,154 -1535,119 +1949,154 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Seleccioneu quin tipus de clau voleu:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr ""
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (només xifrar)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "La selecció és invàlida.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Seleccioneu la raó de la revocació:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "es descarta: la clau secreta ja és present\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Signar realment? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "ix del menú"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "les ordres entren en conflicte\n"
# «pantalla» o «ajuda»? ivb
# «ajuda», evidentment. jm
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "mostra aquesta ajuda"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "La clau és disponible en: "
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "canvia la data de caducitat"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "canvia la confiança"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "mostra empremta"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "genera un nou parell de claus"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr ""
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "L'ordre no és vàlida (proveu «help»)\n"
@@@ -2103,28 -1654,19 +2104,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona per a aquesta ordre\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "no s'ha pogut obrir «%s»\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
@@@ -2183,7 -1714,6 +2184,7 @@@ msgstr "hi ha una clau secreta per a l
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
@@@ -2203,7 -1730,6 +2204,7 @@@ msgstr "Ha fallat el procés de signatu
msgid "'%s' already compressed\n"
msgstr "«%s» ja està comprimida\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2222,7 -1746,6 +2223,7 @@@ msgid "
msgstr ""
"forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2242,17 -1763,14 +2243,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s xifrat per a: «%s»\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "dades xifrades amb %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "xifrat amb l'algoritme %d (desconegut)\n"
@@@ -2329,348 -1834,283 +2330,362 @@@ 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:78
++#: g10/export.c:102
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"La signatura es marcarà com a irrevocable.\n"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "la clau secreta és inusable"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: es descarta: %s\n"
- #: g10/export.c:1225
- #, fuzzy
- msgid "exporting secret keys not allowed\n"
- msgstr "s'està escrivint la clau secreta a «%s»\n"
-
- #: g10/export.c:1303
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
#, 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"
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "s'està escrivint en «%s»\n"
- #: g10/export.c:1490
++#: g10/export.c:1660
#, 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:1602
++#: g10/export.c:1846
+ #, fuzzy
+ msgid "exporting secret keys not allowed\n"
+ msgstr "s'està escrivint la clau secreta a «%s»\n"
+
++#: g10/export.c:1923
+ #, 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:2004
msgid "WARNING: nothing exported\n"
msgstr "AVÍS: no s'ha exportat res\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[No s'ha trobat l'id d'usuari]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "error en crear «%s»: %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "Empremta digital:"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[fitxer]|crea una signatura"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fitxer]|crea una signatura en text clar"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "crea una signatura separada"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "xifra dades"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "xifra només amb xifratge simètric"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "desxifra dades (predeterminat)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifica una signatura"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "llista claus"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "llista claus i signatures"
# «de les claus» o «de la clau»? ivb
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "comprova les signatures de la claus"
# «dactilars» o «digitals»? ivb
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "llista claus i empremtes digitals"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "llista claus secretes"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera un nou parell de claus"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "genera un nou parell de claus"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "genera un certificat de revocació"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "elimina claus de l'anell públic"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "elimina claus de l'anell secret"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "signa una clau"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "signa una clau localment"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "signa o edita una clau"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "canvia la contrasenya"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "exporta claus"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "exporta claus a un servidor de claus"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importa claus d'un servidor de claus"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "cerca claus en un servidor de claus"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "actualitza totes les claus des d'un servidor de claus"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importa/fon claus"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "actualitza la base de dades de confiança"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [fitxers]|imprimeix resums de missatges"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crea eixida amb armadura ascii"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOM|xifra per a NOM"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa aquest id per a signar o desxifrar"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivell de compressió N (0 no comprimeix)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "usa el mode de text canònic"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FITXER|carrega el mòdul d'extensió especificat"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "no fa cap canvi"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "pregunta abans de sobreescriure"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2681,7 -2121,6 +2696,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:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2701,13 -2140,11 +2716,13 @@@ msgstr "
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2727,7 -2164,6 +2742,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:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2735,608 -2171,483 +2750,613 @@@ msgstr "
"\n"
"Algoritmes suportats:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Clau pública: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Xifratge: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Dispersió: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compressió: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "forma d'ús: gpg [opcions] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, 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:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, 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:1904
#, 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:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "desactiva una clau"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "opcions d'importació no vàlides\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, 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:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, 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:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, 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:3276
++#: g10/gpg.c:3330
#, 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:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
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:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no és permés amb %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
#, 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:3528
++#: g10/gpg.c:3601
#, 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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "les preferències per defecte són invàlides\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "les preferències personals de xifrat són invàlides\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "les preferències personals de digest són invàlides\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "les preferències personals de compressió són invàlides\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, 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:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [nom_del_fitxer]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [nom_del_fitxer]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [nom_del_fitxer]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom_del_fitxer]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [nom_del_fitxer]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [nom_del_fitxer]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [ordres]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, 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:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "error en la creació de la contrasenya: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[nom_del_fitxer]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
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:5000
++#: g10/gpg.c:5086
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:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
@@@ -3382,326 -2685,262 +3402,328 @@@ msgstr "No hi ha ajuda disponible
msgid "No help available for '%s'"
msgstr "No hi ha ajuda disponible per a `%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualitza la base de dades de confiança"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualitza la base de dades de confiança"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "mostra empremta"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "la clau secreta és inusable"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "es descarta un bloc de tipus %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "fins ara s'han processat %lu claus\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Nombre total processat: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " claus noves descartades: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sense ID: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importades: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " no modificades: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID d'usuaris nous: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subclaus noves: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " signatures noves: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noves revocacions: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claus privades llegides: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "claus privades importades: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claus privades no canviades: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " importades: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures noves: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " claus privades llegides: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "signatura %s, algorisme de resum %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "es descarta «%s»: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clau %08lX: l'ID no és vàlid\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, 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:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "clau %08lX: clau nova - es descarta \n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "no s'ha trobat cap anell escrivible: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "s'està escrivint en «%s»\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, 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:1134
++#: g10/import.c:1421
#, 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:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, 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:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clau %08lX: «%s» 1 signatura nova\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clau %08lX: «%s» 1 subclau nova\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clau %08lX: «%s» %d subclaus noves\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clau %08lX: «%s» %d signatures noves\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clau %08lX: «%s» no ha estat modificada\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "clau %08lX: s'ha importat la clau secreta\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3716,12 -2955,10 +3738,12 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
@@@ -3731,22 -2968,18 +3753,22 @@@
# O «rebutjara»? ivb
# Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
# «es rebutja» està bé. jm
- #: g10/import.c:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, 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:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
@@@ -3754,116 -2987,95 +3776,116 @@@
"«%s»\n"
"\n"
- #: g10/import.c:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, 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:2043
++#: g10/import.c:2328
#, 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:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, 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:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clau %08lX: Subclau de revocació no vàlida\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, 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:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clau %08lX: es descarta l'ID d'usuari '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "clau %08lX: es descarta la subclau\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, 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:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
@@@ -3900,48 -3106,39 +3922,48 @@@ msgstr "error en crear «%s»: %s\n
msgid "error opening key DB: %s\n"
msgstr "error en la lectura de «%s»: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[revocació]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[autosignatura]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "Signatura correcta de \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "es descarta «%s»: %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3949,7 -3146,6 +3971,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3957,21 -3153,18 +3979,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d signatures errònies\n"
msgstr[1] "%d signatures errònies\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Signatura correcta de \""
msgstr[1] "Signatura correcta de \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3983,70 -3176,55 +4005,70 @@@ msgstr "
"verificar les claus d'altres usuaris (mirant passaports,\n"
"comprovant empremtes de diferents fonts...)?\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Hi confie marginalment\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Hi confie plenament\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Segur que encara voleu signarla? (s/N) "
# O no s'ha pogut? ivb
# FIXME: comprovar context. jm
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " No es pot signar.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'ID d'usuari «%s» ha caducat."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'ID d'usuari «%s» no està autosignat."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'ID d'usuari «%s» no està autosignat."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Signar realment? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4055,11 -3233,9 +4077,11 @@@ msgstr "
"La vostra signatura en «%s»\n"
"és una signatura d'estil PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4068,11 -3244,9 +4090,11 @@@ msgstr "
"La vostra signatura actual en «%s»\n"
"ha caducat.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4081,43 -3255,34 +4103,43 @@@ msgstr "
"La vostra signatura en «%s»\n"
"és una signatura local.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, 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:1350
++#: g10/keyedit.c:1353
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:1372
++#: g10/keyedit.c:1375
#, 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:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "La clau ha caducat!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Aquesta clau caducarà el %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4127,32 -3292,26 +4149,32 @@@ msgstr "
"pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
"contestar, entreu «0».\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No vaig a contestar.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, 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:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He fet algunes comprovacions.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) He fet comprovacions molt acurades.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4161,138 -3320,113 +4183,138 @@@ msgstr "
"Esteu segur que voleu signar aquesta clau\n"
"amb la vostra clau: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Açò serà una autosignatura.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La signatura es marcarà com a inexportable.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La signatura es marcarà com a irrevocable.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"No he comprovat aquesta clau en absolut.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"He fet algunes comprovacions a aquesta clau.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"He comprovat aquesta clau amb molta cura.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Signar realment? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "desa i ix"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra empremta"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Notació de signatura: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
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:1862
++#: g10/keyedit.c:1865
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:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "tria l'ID d'usuari N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "revoca signatures"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "signa la clau localment"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "afegeix un ID d'usuari"
@@@ -4300,139 -3434,110 +4322,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:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "afegeix un photo ID"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "esborra un ID d'usuari"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "esborra una clau secundària"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "afegeix una clau de revocació"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, 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:1901
++#: g10/keyedit.c:1904
#, 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:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marca l'ID d'usuari com a primari"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "llista les preferències (expert)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "llista les preferències (detallat)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, 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:1912
++#: g10/keyedit.c:1915
#, 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:1914
++#: g10/keyedit.c:1917
#, 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:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "canvia la contrasenya"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "canvia la confiança"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revoca un ID d'usuari"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoca una clau secundària"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "activa una clau"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "desactiva una clau"
# Igual que dalt. ivb
# Idem :) jm
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostra el photo ID"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "La clau secreta està disponible.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Cal la clau secreta per a fer açò.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4440,278 -3545,225 +4462,284 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "La clau està revocada."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Realment voleu signar tots els ID d'usuari? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Realment voleu signar tots els ID d'usuari? "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "la classe de signatura és desconeguda"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "No podeu esborrar l'últim ID d'usuari!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Heu de seleccionar, si més no, una clau.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "error en crear l'anell «%s»: %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Heu de seleccionar, si més no, una clau.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Realment voleu eliminar les claus seleccionades? "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Realment voleu eliminar aquesta clau? "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Realment voleu eliminar aquest ID d'usuari? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Realment voleu revocar aquesta clau? "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Realment voleu revocar les claus seleccionades? "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Realment voleu revocar aquesta clau? "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estableix la llista de preferències"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, 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:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Realment voleu actualitzar les preferències? "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Voleu desar els canvis? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Voleu eixir sense desar? "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "ha fallat l'actualització: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "La clau no ha canviat, per tant no cal actualització.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "La generació de claus ha fallat: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "error: l'empremta digital és invàlida\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, 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:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, 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:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Usuari inexistent.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "No hi ha res que signar amb la clau %08lX\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Resum: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Funcionalitats: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Notació: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (sensible)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "no s'ha pogut creat %s: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocada]"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr ""
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confiança: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Aquesta clau ha estat desactivada"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4719,19 -3771,14 +4747,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revocada]"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4740,18 -3787,15 +4768,18 @@@ msgstr "
" causar que una ID d'usuari diferent esdevinga en la primària "
"assumida.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4760,38 -3804,30 +4788,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
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:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
# Werner FIXME: use ngettext. jm
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4799,37 -3835,30 +4827,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:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "No s'hi ha eliminat res.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "invàlida"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "L'ID d'usuari «%s» està revocat."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4838,41 -3867,33 +4866,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:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduïu l'ID d'usuari del revocador designat: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
#, 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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4880,167 -3901,137 +4908,172 @@@
msgstr ""
"Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
#, 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:4640
++#: g10/keyedit.c:4747
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:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Heu de seleccionar exactament un ID.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, 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:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Notació de signatura: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Voleu sobreescriure? (s/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, 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:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "No hi ha cap ID amb l'índex %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID d'usuari: «"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, 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:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (no-exportable)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aquesta signatura va caducar el %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (no-exportable)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocat per %08lX el %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Esteu a punt de revocar aquestes signatures:\n"
# (s/N)? ivb
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realment voleu crear els certificats de revocació? (s/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "ho hi ha clau secreta\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'ID d'usuari «%s» ja està revocat\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5496,13 -4409,10 +5529,13 @@@ msgstr "
"nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
"d'aconseguir prou entropia.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "La generació de claus ha fallat: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5510,69 -4420,56 +5543,69 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "«%s» ja està comprimida\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Voleu crear la clau de tota manera? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Voleu crear la clau de tota manera? "
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "La generació de claus ha estat cancel·lada.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr ""
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, 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:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
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:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5582,7 -4479,6 +5615,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5591,7 -4487,6 +5624,7 @@@ msgstr "
"amb el rellotge)\n"
# Werner FIXME: use ngettext. jm
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5599,51 -4494,40 +5632,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:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
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:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, 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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crear realment? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "mai "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Política de signatura crítica: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Política de signatura: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notació de signatura crítica: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notació de signatura: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5651,7 -4535,6 +5684,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d signatures errònies\n"
msgstr[1] "%d signatures errònies\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5659,46 -4542,33 +5692,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signatura no comprovada a causa d'un error\n"
msgstr[1] "1 signatura no comprovada a causa d'un error\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Anell"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Empremtes digital de la clau primària:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Empremta digital de la clau primària:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Empremta digital de la subclau:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " Empremta digital ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5766,305 -4624,248 +5794,310 @@@ msgstr "la URL de política de signatur
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr ""
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: no és un ID vàlid\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "no s'ha trobat la clau «%s»: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, 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:1703
++#: g10/keyserver.c:1705
#, 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:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "error de servidor de claus"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "es descarta «%s»: %s\n"
+
++#: g10/keyserver.c:1823
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "s'està sol·licitant la clau %08lX de %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "clau de sessió xifrada amb %s\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "xifrat amb l'algoritme %d (desconegut)\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "la clau pública és %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr ""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "xifrat amb una clau %s, ID %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "xifrat amb %lu contrasenyes\n"
# FIXME WK: Use ngettext
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
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:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, 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:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "desxifratge correcte\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom del fitxer original='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Signatura INCORRECTA de \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signatura caducada de \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signatura correcta de \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "s'ha eliminat la verificació de signatura\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "no es poden tractar aquestes signatures múltiples\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:1723
++#: 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:1727
++#: 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:1744
msgid "Key available at: "
msgstr "La clau és disponible en: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[incert]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Aquesta signatura va caducar el %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Aquesta signatura caduca el %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binari"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "mode text"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "desconeguda"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "l'algoritme de clau pública és desconegut"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "No s'ha pogut comprovar la signatura: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "no és una signatura separada\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signatura autònoma de classe 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "signatura de l'estil antic (PGP 2.x)\n"
@@@ -6248,7 -5015,6 +6281,7 @@@ msgid "WARNING: potentially insecure sy
msgstr ""
"AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, 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"
@@@ -6633,46 -5331,37 +6666,46 @@@ msgstr "AVÍS: Aquesta clau no ve certi
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr "No és segur que la signatura pertanya al seu propietari.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: es descarta: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: es descarta: la clau pública està desactivada\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, 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:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6680,37 -5369,29 +6713,37 @@@ msgstr "
"\n"
"Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Usuari inexistent.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "La clau pública està desactivada.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "es descarta: la clau pública ja està establida\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "el destinatari predeterminat és desconegut «%s»\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "no hi ha adreces vàlides\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "clau %08lX: sense ID\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "clau %08lX: sense ID\n"
@@@ -6721,29 -5401,23 +6754,29 @@@ msgstr "les dades no s'han desat; useu
# Indi? ivb
# Em pense que no. jm
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Signatura separada.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Introduïu el nom del fitxer de dades: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "s'està llegint d'stdin...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "no hi ha dades signades\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "no s'han pogut obrir les dades signades `%s'\n"
@@@ -6998,7 -5627,6 +7031,7 @@@ msgstr[0] "la clau pública %08lX és %
msgstr[1] "la clau pública %08lX és %lu segons anterior a la signatura\n"
# Werner FIXME: Use ngettext. jm
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -7078,23 -5697,19 +7111,23 @@@ msgstr "
"AVÍS: no s'ha pogut %%-expandir l'url de política (massa gran). S'utilitza "
"no expandida.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s signatura de: «%s»\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, 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:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "signatura:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "s'utilitzarà xifratge %s\n"
@@@ -7174,136 -5775,109 +7207,136 @@@ msgstr "error de lectura: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "no s'ha pogut obrir «%s»\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, 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:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "la transacció de la base de dades de confiança és massa gran\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: el directori no existeix!\n"
# No em passe! ;) ivb
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, 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:723
++#: g10/tdbio.c:729
#, 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:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: s'ha creat la base de dades de confiança\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: la base de dades de confiança és invàlida\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, 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:836
++#: g10/tdbio.c:842
#, 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:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: error en llegir el registre de la versió: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, 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:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de dades de confiança: ha fallat lseek: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, 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:1493
++#: g10/tdbio.c:1497
#, 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:1518
++#: g10/tdbio.c:1522
#, 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:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: la versió de fitxer %d és invàlida\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: error en llegir el registre lliure: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: error en escriure el registre de directoris: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, 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:1800
++#: g10/tdbio.c:1804
#, 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:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: s'ha creat la base de dades de confiança\n"
@@@ -7671,7 -6183,6 +7704,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:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, 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"
@@@ -7690,7 -6199,6 +7723,7 @@@ msgstr "
"no és necessària una comprovació de la base de dades de confiança\n"
"\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "no s'ha trobat la clau pública %08lX: %s\n"
@@@ -7703,14 -6209,12 +7736,14 @@@ msgstr "si us plau, feu un --check-trus
msgid "checking the trustdb\n"
msgstr "s'està comprovant la base de dades de confiança\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "fins ara s'han processat %lu claus\n"
msgstr[1] "fins ara s'han processat %lu claus\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7718,23 -6222,19 +7751,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
msgstr[1] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "no s'han trobat claus amb confiança absoluta\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, 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"
@@@ -8200,27 -6605,22 +8233,27 @@@ msgstr "les ordres entren en conflicte\
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8230,7 -6629,6 +8263,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@@ -10142,8 -8153,6 +10175,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "forma d'ús: gpg [opcions] "
@@@ -10154,12 -8162,10 +10187,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "%s no és permés amb %s!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
@@@ -10660,77 -8564,61 +10693,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, 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:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, 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:1406
++#: dirmngr/server.c:1415
#, 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:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, 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:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10870,7 -8728,6 +10903,7 @@@ msgstr "el destinatari predeterminat é
msgid "sending line failed: %s\n"
msgstr "Ha fallat el procés de signatura: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "error mentre s'enviava a «%s»: %s\n"
@@@ -11123,16 -8919,13 +11156,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "no s'ha trobat la clau pública"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr ""
diff --cc po/cs.po
index 3dbbefd,96bb049..af04a3f
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, c-format
msgid "can't open '%s': %s\n"
msgstr "nelze otevřít „%s“: %s\n"
@@@ -418,10 -332,6 +418,10 @@@ msgstr "poběží v režimu démona (n
msgid "run in server mode (foreground)"
msgstr "poběží v režimu serveru (na popředí)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "upovídaný režim"
@@@ -521,11 -406,6 +521,11 @@@ msgstr "zapnout podporu pro PuTTY
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Chyby v programu, prosím, oznamujte (anglicky) na <@EMAIL@>,\n"
@@@ -543,52 -421,35 +543,52 @@@ msgstr "
"Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
"Správa tajných klíčů pro @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s je příliš stará (potřeba %s, přítomna %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Poznámka: neexistuje implicitní soubor s možnostmi „%s“\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, c-format
msgid "option file '%s': %s\n"
msgstr "soubor s možnostmi „%s“: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, c-format
msgid "reading options from '%s'\n"
msgstr "čtou se možnosti z „%s“\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Poznámka: „%s“ není uvažovaná možnost\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "socket nelze vytvořit: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "název socketu „%s“ je příliš dlouhý\n"
@@@ -597,29 -457,23 +597,29 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent již běží – nový nebude spuštěn\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "chyba při získávání soli pro socket\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "chyba při přilepování socketu na „%s“: %s\n"
# TODO: i18n of first %s
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Varování: přístupová práva %s „%s“ nejsou bezpečná\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "volání listen() selhalo: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, c-format
msgid "listening on socket '%s'\n"
msgstr "naslouchá se na socketu „%s“\n"
@@@ -646,7 -494,6 +646,7 @@@ msgstr "volání stat() na „%s“ sel
msgid "can't use '%s' as home directory\n"
msgstr "„%s“ nelze použít jako domovský adresář\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba při čtení soli z deskriptoru %d: %s\n"
@@@ -671,18 -514,14 +671,18 @@@ msgstr "SSH obsluha 0x%lx pro fd %d spu
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "SSH obsluha 0x%lx pro fd %d ukončena\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselect selhala: %s – čeká se 1 s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s pozastaveno\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "v této relaci neběží žádný gpg-agent\n"
@@@ -698,8 -535,6 +698,8 @@@ msgstr "
"Syntaxe: gpg-preset-passphrase [volby] KEYGRIP\n"
"Správa dočasné paměti pro hesla\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -707,9 -542,6 +707,9 @@@ msgstr "
"@Příkazy:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -947,30 -736,23 +947,30 @@@ msgstr "chyba při vytváření roury:
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba při vytváření proudu pro rouru: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "chyba při rozdvojování procesu: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, 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:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "chyba v běhu „%s“: návratový kód %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, c-format
msgid "error running '%s': terminated\n"
msgstr "chyba v běhu „%s“: násilně ukončeno\n"
@@@ -985,28 -765,22 +985,28 @@@ msgstr "chyba při získání návratov
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "nelze se připojit k „%s“: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "problémy v komunikaci s gpg-agentem\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "zrušeno uživatelem\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "problém s agentem\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
#| msgid "problem with the agent: %s\n"
msgid "problem with the agent (unexpected response \"%s\")\n"
@@@ -1084,7 -843,6 +1084,7 @@@ msgstr "při pokusu alokovat %lu bajt�
msgid "out of core while allocating %lu bytes"
msgstr "při pokusu alokovat %lu bajtů došla paměť"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 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"
@@@ -1320,7 -1024,6 +1320,7 @@@ msgstr "Nápověda pro „%s“ není d
msgid "ignoring garbage line"
msgstr "ignoruji řádek s nepořádkem"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[neuvedeno]"
@@@ -1449,92 -1125,72 +1449,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII kódování: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "neplatná hlavička ASCII kódování: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "ASCII hlavička: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "neplatná hlavička podpisu v čitelném formátu\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "neznámá ASCII hlavička: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "vnořené podpisy v čitelném formátu\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "neočekávaný ASCII armor: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "nesprávné označení řádku mínusy: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "neplatný radix64 znak %02X byl přeskočen\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "předčasný konec souboru (žádné CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "předčasný konec souboru (žádné CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "špatný formát CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Chyba CRC; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "předčasný konec souboru (v patičce)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "chyba v patičce\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "nenalezena žádná platná data ve formátu OpenPGP.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, 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:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1542,25 -1198,20 +1542,25 @@@ 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:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
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:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "hodnota nemůže obsahovat žádné kontrolní znaky\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1570,7 -1221,6 +1570,7 @@@ 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:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "VAROVÁNÍ: nalezen neplatný formát zápisu data\n"
@@@ -1600,19 -1245,14 +1600,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "VAROVÁNÍ: "
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP karta není dostupná: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Nalezena OpenPGP karta číslo %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "nelze provést v dávkovém módu\n"
@@@ -1624,10 -1262,6 +1624,10 @@@ msgstr "Tento příkaz je dostupný pou
msgid "Reset Code not or not anymore available\n"
msgstr "Resetační kód není nebo už není dostupný\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Váš výběr? "
@@@ -1689,84 -1309,63 +1689,85 @@@ 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: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "chyba při zápisu do „%s“: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Login (jménu účtu): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Chyba: Login je příliš dlouhý (limit je %d znaků).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Privátní DO data: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Chyba: Privátní DO je příliš dlouhé (limit je %d znaků).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Jazykové předvolby: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Chyba: neplatná délka řetězce s předvolbami.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Chyba: neplatný znak v řetězci s předvolbami\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Zadejte pohlaví: M – mužské, F – ženské, nebo stiskněte mezerník: "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Chyba: neplatná odpověď.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "Otisk CA: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Chyba: chybně utvořené otisk.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "operace s klíčem není možná: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "toto není OpenPGP karta"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "chyba při získání informací o aktuálním klíči: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Přepsat existující klíč? (a/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1777,55 -1376,43 +1778,55 @@@ msgstr "
"dokumentace\n"
" své karty, kde se dozvíte, jaké velikosti jsou dovoleny.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Jakou délku klíče pro podepisování si přejete? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Jakou délku klíče pro šifrování si přejete? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Jakou délku klíče pro autentizaci si přejete? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokrouhleno na %u bitů\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "velikost klíče %s musí být v intervalu %u-%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Karta bude nyní přenastavena na generování klíče dlouhého %u bitů\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "chyba při změně velikosti klíče %d na %u bitů: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Vytvořit zálohu šifrovacího klíče mimo kartu? (A/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
msgid "Note: keys are already stored on the card!\n"
msgstr "Poznámka: na kartě jsou již klíče uloženy!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "Přepsat existující klíče? (a/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1836,139 -1423,104 +1837,139 @@@ msgstr "
" PIN = „%s“ PIN administrátora = „%s“\n"
"Měli byste je změnit příkazem --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Prosím, vyberte druh klíče, který chcete generovat:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Podepisovací klíč\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Šifrovací klíč\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) Autentizační klíč\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Neplatný výběr.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Prosím vyberte místo pro uchování klíče:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Volání KEYTOCARD selhalo: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
msgid "This command is not supported by this card\n"
msgstr "Tento příkaz není touto kartou podporován\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Poznámka: Tento příkaz zničí všechny klíče uložené na kartě!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
msgid "Continue? (y/N) "
msgstr "Pokračovat (a/N) "
# The code expects non-localized "yes"
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Opravdu obnovit tovární nastavení (zadejte „yes“) "
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "ukončit toto menu"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "zobraz administrátorské příkazy"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "ukázat tuto pomoc"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "vypiš všechna dostupná data"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "změní jméno majitele karty"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "změní URL pro získání klíče"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "získá klíč specifikovaný v URL karty"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "změnit login name"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "změnit jazykové předvolby"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "změní pohlaví držitele karty"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "vypsat otisk certifikační autority"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "zapnout/vypnout požadování PINu při každé self-sign operaci"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "vytvořit nový pár klíčů"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "nabídka pro změnu anebo odblokování PINu"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "ověř PIN a vypiš všechna data"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "odblokovat PIN pomocí resetačního kódu"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr "zničit všechny klíče a data"
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/karta> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "pouze administrátorské příkazy\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "administrátorské příkazy jsou povoleny\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "administrátorské příkazy nejsou povoleny\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatný příkaz (zkuste „help“)\n"
@@@ -1976,27 -1527,18 +1977,27 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output pro tento příkaz není platný\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "„%s“ nelze otevřít\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klíč „%s“ nenalezen: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, c-format
msgid "key \"%s\" not found\n"
msgstr "klíč „%s“ nenalezen\n"
@@@ -2052,7 -1583,6 +2053,7 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"abyste ho smazal(a), použijte nejprve parametr „--delete-secret-key“.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba při vytváření hesla: %s\n"
@@@ -2071,7 -1598,6 +2072,7 @@@ msgstr "použití šifry: %s\n
msgid "'%s' already compressed\n"
msgstr "„%s“ je již zkomprimován\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "VAROVÁNÍ: soubor „%s“ je prázdný\n"
@@@ -2088,7 -1612,6 +2089,7 @@@ msgid "
msgstr ""
"VAROVÁNÍ: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2107,17 -1628,14 +2108,17 @@@ msgstr "vyžádaná symetrická šifra
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zašifrovaný pro: „%s“\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s zašifrovaná data\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "zašifrováno neznámým algoritmem %d\n"
@@@ -2186,65 -1691,54 +2187,72 @@@ 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:78
++#: g10/export.c:102
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:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exportovat atributy uživatelských ID (obecně ID fotografií)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "exportovat revokační klíče označené jako „citlivé“"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "odstranit nepoužitelné části z klíče při exportu"
- #: g10/export.c:86
++#: g10/export.c:110
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:1144
++#: g10/export.c:1204
msgid " - skipped"
msgstr " – přeskočeno"
- #: g10/export.c:1225
+ # g10/import.c:766 g10/openfile.c:261#, c-format
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, c-format
+ msgid "writing to '%s'\n"
+ msgstr "zapisuje se do „%s“\n"
+
++#: g10/export.c:1660
+ #, 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:1846
msgid "exporting secret keys not allowed\n"
msgstr "exportování tajného klíče není povoleno\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "VAROVÁNÍ: nebylo nic vyexportováno\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "chyba při vytváření „%s“: %s\n"
- #: g10/getkey.c:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[ID uživatele nenalezeno]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(zkontrolujte argument volby „%s“)\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, fuzzy, c-format
#| msgid ""
#| "Warning: value '%s' for option '%s' should be a long key ID or a "
@@@ -2254,214 -1748,170 +2262,221 @@@ msgstr "
"Pozor: hodnota „%s“ volby „%s“ by měla být\n"
"dlouhý identifikátor klíče nebo jeho otisk\n"
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, 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:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "„%s“ automaticky získáno přes %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, 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:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "Chybí otisk"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "tajný klíč „%s“ nenalezen: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
# c-format
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "vytvořit podpis"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "vytvořit podpis v čitelném dokumentu"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "vytvořit podpis oddělený od dokumentu"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "šifrovat data"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "šifrování pouze se symetrickou šifrou"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dešifrovat data (implicitně)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifikovat podpis"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "vypsat seznam klíčů"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "vypsat seznam klíčů a podpisů"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "vypsat a zkontrolovat podpisy klíčů"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vypsat seznam klíčů a otisků"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vypsat seznam tajných klíčů"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "vytvořit nový pár klíčů"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
msgid "quickly generate a new key pair"
msgstr "rychle vytvořit nový pár klíčů"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "quickly add a new user-id"
msgstr "rychle přidat novou identitu uživatele"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "quickly add a new user-id"
+ msgid "quickly revoke a user-id"
+ msgstr "rychle přidat novou identitu uživatele"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr "komplexní vytvoření páru klíčů"
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "vytvořit revokační certifikát"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "odstranit klíč ze souboru veřejných klíčů"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "odstranit klíč ze souboru tajných klíčů"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
msgid "quickly sign a key"
msgstr "rychle podepsat klíč"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
msgid "quickly sign a key locally"
msgstr "rychle lokálně podepsat klíč"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "podepsat klíč"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "podepsat klíč lokálně"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "podepsat nebo modifikovat klíč"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "změnit heslo"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "exportovat klíče"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "exportovat klíče na server klíčů"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importovat klíče ze serveru klíčů"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "vyhledat klíče na serveru klíčů"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "aktualizovat všechny klíče ze serveru klíčů"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importovat/sloučit klíče"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "vytisknout stav karty"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "změnit data na kartě"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "změnit PIN karty"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "aktualizovat databázi důvěry"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "vypsat hash zprávy"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "pracovat v režimu serveru"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
#, fuzzy
#| msgid "|VALUE|set the TOFU policy for a key (good, unknown, bad, ask, auto)"
msgid "|VALUE|set the TOFU policy for a key"
@@@ -2469,43 -1919,33 +2484,43 @@@ msgstr "
"|HODNOTA|nastavit TOFU politiku klíči (good [dobrý], unknown [neznámý], bad "
"[špatný], ask [zeptat se], auto)"
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "vytvoř výstup zakódovaný pomocí ASCII"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID_UŽIVATELE|použít toto ID_UŽIVATELE pro podepsání nebo dešifrování"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "použít kanonický textový mód"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|SOUBOR|zapsat výstup do SOUBORU"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "neprovádět žádné změny"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "vyžádat potvrzení před přepsáním"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "použít chování striktně podle OpenPGP"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2513,7 -1953,6 +2528,7 @@@ msgstr "
"@\n"
"(Pro kompletní seznam všech příkazů a možností použijte manuálové stránky.)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2531,11 -1970,9 +2546,11 @@@ msgstr "
" --list-keys [jména] vypsat klíče\n"
" --fingerprint [jména] vypsat otisky\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2545,7 -1982,6 +2560,7 @@@ msgstr "
"Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
"Výchozí operace závisí na vstupních datech.\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2553,78 -1989,63 +2568,78 @@@ msgstr "
"\n"
"Podporované algoritmy:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Veřejný klíč: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Šifra: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Komprese: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 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:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "konfliktní příkazy\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2632,21 -2053,18 +2647,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:1554
#, 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:1560
#, 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:1563
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2654,7 -2072,6 +2669,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:1566
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
@@@ -2662,488 -2079,383 +2677,494 @@@
"nastavena bezpečně\n"
# c-format
- #: g10/gpg.c:1756
++#: g10/gpg.c:1773
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "neznámá konfigurační položka „%s“\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr "zobrazovat ID fotografií během výpisu klíčů"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
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:1884
msgid "show policy URLs during signature listings"
msgstr "ukazovat URL politik během výpisu podpisů"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
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:1888
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:1892
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:1894
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:1896
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:1898
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:1900
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:1902
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:1904
msgid "show expiration dates during signature listings"
msgstr "ukazovat data expirace během výpisu podpisů"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
msgid "available TOFU policies:\n"
msgstr "dostupné politiky TOFU:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr "(možnosti lze vypsat příkazem „help“)\n"
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "neznámý formát „%s“ databáze TOFU\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt je příliš stará (potřebuji %s, mám %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "„%s“ není platná doba expirace podpisu\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatný režim pinentry „%s“\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "„%s“ není platná znaková sada\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "nelze zpracovat URL serveru klíčů\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatný parametr pro import\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "neplatný parametr pro import\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "neplatný parametr pro výpis\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parametr pro export\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "neplatný parametr pro export\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatný parametr pro výpis\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "zobrazovat ID fotografií při ověřování podpisu"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "ukazovat URL politik při ověřování podpisu"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "ukazovat všechny poznámky při ověřování podpisu"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
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:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
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:3068
++#: g10/gpg.c:3122
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:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "ověřovat podpisy s daty PKA"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatný parametr pro ověření\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "neplatný parametr pro ověření\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVÁNÍ: %s přepíše %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Není dovoleno používat %s s %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nedává s %s smysl!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "VAROVÁNÍ: pracuji s podvrženým systémovým časem: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "vybraný kompresní algoritmus je neplatný\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
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:3522
++#: g10/gpg.c:3595
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:3524
++#: g10/gpg.c:3597
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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "neplatné implicitní předvolby\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "neplatné uživatelské předvolby pro šifrování\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "neplatné uživatelské předvolby pro hashování\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "neplatné uživatelské předvolby pro komprimaci\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud není funkční s %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat databázi důvěry: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [jméno souboru]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [jméno souboru]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [jméno souboru]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [jméno souboru]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
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:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [jméno souboru]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
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:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [jméno souboru]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [jméno souboru]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [jméno souboru]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key id_uživatele"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key id_uživatele"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id_uživatele [příkazy]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd <id-uživatele>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odeslání na keyserver se nezdařilo: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dekódování z ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "kódování do ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatný hashovací algoritmus „%s“\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, 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:4607
++#: g10/gpg.c:4694
#, 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:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[jméno souboru]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Začněte psát svou zprávu…\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "zadané URL pro certifikační politiku je neplatné\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "zadané URL pro podepisovací politiku je neplatné\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
@@@ -3184,125 -2488,107 +3205,135 @@@ msgstr "Nápověda není k dispozici
msgid "No help available for '%s'"
msgstr "Pro „%s“ není dostupná žádná nápověda"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "importovat podpisy, které jsou označeny jen jako místní"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "opravit poškození vzniklá při importu z PKS serveru"
- #: g10/import.c:110
++#: g10/import.c:140
msgid "do not clear the ownertrust values during import"
msgstr "nemazat údaje o důvěře během importu"
- #: g10/import.c:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "neaktualizovat databázi důvěry po importu"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "vypsat otisk klíče"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "přijímat aktualizace pouze u existujících klíčů"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "odstranit z klíče po importu nepoužitelné části"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr "odstranit po importu z klíče vše, co lze"
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d byl přeskočen\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu klíče byly doposud zpracovány\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkový počet zpracovaných klíčů: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " přeskočeny klíče PGP2: %lu\n"
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " přeskočeny nové klíče: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez ID uživatele: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importováno: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " beze změn: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nové ID uživatelů: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nové podklíče: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " nové podpisy: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nové revokace klíčů: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " přečtené tajné klíče: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importované tajné klíče: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajné klíče nezměněny: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportováno: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " odstraněné podpisy: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " odstraněné uživatelské ID: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3311,196 -2597,151 +3342,189 @@@ msgstr "
"VAROVÁNÍ: klíč %s obsahuje předvolby pro nedostupné\n"
"algoritmy na těchto ID uživatelů:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": předvolby pro šifrovací algoritmus %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": předvolby pro podepisovací algoritmus %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": předvolby pro komprimační algoritmus %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
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:893
++#: g10/import.c:1069
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:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "klíč %s: chybí identifikátor uživatele\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, c-format
msgid "key %s: %s\n"
msgstr "klíč %s: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr "zamítnut kontrolou při importu"
- #: g10/import.c:1019
++#: g10/import.c:1264
#, 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:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "klíč %s: chybí platný identifikátor uživatele\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "klíč %s: nový klíč - přeskočen\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, 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:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr "zapisuje se do „%s“\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klíč %s: veřejný klíč „%s“ importován\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klíč %s: neodpovídá naší kopii\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, 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:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klíč %s: „%s“ 1 nový podpis\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klíč %s: „%s“ %d nových podpisů\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klíč %s: „%s“ 1 nový podklíč\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klíč %s: „%s“ %d nových podklíčů\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klíč %s: „%s“ beze změn\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klíč %s: tajný klíč importován\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "klíč %s: tajný klíč již existuje\n"
- #: g10/import.c:1578
++#: g10/import.c:1866
#, 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:1683
++#: g10/import.c:1971
#, c-format
msgid "secret key %s: %s\n"
msgstr "tajný klíč %s: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "import tajných klíčů není povolen\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3515,139 -2756,112 +3539,139 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, 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:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klíč %s: „%s“ revokační certifikát importován\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, 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:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klíč %s: neplatná vazba podklíče\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, 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:2108
++#: g10/import.c:2393
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "klíč %s: neexistuje podklíč pro revokaci klíče\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klíč %s: neplatný revokační podklíč\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, 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:2181
++#: g10/import.c:2463
#, 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:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klíč %s: podklíč přeskočen\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, 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:2595
++#: g10/import.c:2878
#, 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"
@@@ -3682,45 -2890,37 +3706,45 @@@ msgstr "zdroj bloku klíče „%s“: %
msgid "error opening key DB: %s\n"
msgstr "chyba při otevírání databáze klíčů: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[revokace]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[podpis klíče jím samým]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
#| msgid "Good signature from"
msgid " (reordered signatures follow)"
msgstr "Dobrý podpis od"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "key %s: %s\n"
msgid "key %s:\n"
msgstr "klíč %s: %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "%d duplicate signature removed\n"
@@@ -3729,7 -2929,6 +3753,7 @@@ 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3738,7 -2937,6 +3762,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3747,7 -2945,6 +3771,7 @@@ msgstr[0] "%d špatných podpisů\n
msgstr[1] "%d špatných podpisů\n"
msgstr[2] "%d špatných podpisů\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
#| msgid "Good signature from"
msgid "%d signature reordered\n"
@@@ -3756,14 -2953,12 +3780,14 @@@ msgstr[0] "Dobrý podpis od
msgstr[1] "Dobrý podpis od"
msgstr[2] "Dobrý podpis od"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3775,17 -2970,14 +3799,17 @@@ msgstr "
"kontrolou otisků z různých zdrojů…)?\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Důvěřuji částečně\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Důvěřuji úplně\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3795,52 -2987,40 +3819,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:1018
++#: g10/keyedit.c:1021
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:1146
++#: g10/keyedit.c:1149
#, 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:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Uživatelské ID „%s“ je revokováno."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Jste si jistý(á), že stále chcete podepsat tento klíč? (a/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Nelze podepsat.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Vypršela platnost uživatelského ID „%s“."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, 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:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID uživatele „%s“ je připraveno k podpisu."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Podepsat? (a/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3849,11 -3029,9 +3873,11 @@@ msgstr "
"Podpis klíče „%s“ jím samým je\n"
"podpis formátu PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3862,13 -3040,11 +3886,13 @@@ msgstr "
"Platnost vašeho podpisu na „%s“\n"
"vypršela.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3877,43 -3053,34 +3901,43 @@@ msgstr "
"Váš současný podpis na „%s“\n"
"je pouze lokální.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "„%s“ je již podepsán klíčem %s\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Chcete klíč přesto znova podepsat? (a/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nic k podepsání klíčem %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Platnost klíče vypršela!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnost klíče vyprší %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3923,31 -3090,25 +3947,31 @@@ msgstr "
"patří výše uvedené osobě.\n"
"Pokud neznáte odpověď, zadejte „0“.\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpovím.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nijak jsem to nekontroloval(a).%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, 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:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
msgid "Your selection? (enter '?' for more information): "
msgstr "Váš výběr? (pro podrobnosti zadejte „?“): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3956,221 -3117,167 +3980,221 @@@ msgstr "
"Jste si jistý(á), že chcete podepsat tento klíč\n"
"svým klíčem „%s“ (%s)\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Jedná se o podpis klíče jím samým.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
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:1527
++#: g10/keyedit.c:1530
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:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "Podpis bude označen jako neexportovatelný.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "Podpis bude označen jako neodvolatelný (non-revocable).\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "Nijak jsem tento klíč neověřil.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "Částečně jsem ověřil tento klíč.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "Velmi pečlivě jsem ověřil tento klíč.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Skutečně podepsat? (a/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "podepsání selhalo: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
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:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "uložit a ukončit"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "vypsat otisk klíče"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
msgid "show the keygrip"
msgstr "ukázat keygrip"
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "vypsat seznam klíčů a id uživatelů"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "vyberte identifikátor uživatele N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "vyberte podklíč N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "kontrolovat podpisy"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
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:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "podepsat vybrané uživatelské ID lokálně"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "podepsat vybrané uživatelské ID důvěryhodným podpisem"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr "podepsat vybraná uživatelská ID neodvolatelným podpisem"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "přidat identifikátor uživatele"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "přidat fotografický ID"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "smazat vybrané ID uživatele"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "přidat podklíč"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "přidat klíč na kartu"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "přesunout klíč na kartu"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "přesunout záložní klíč na kartu"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "smazat vybrané podklíče"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "přidat revokační klíč"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "smazat podpisy z vybraných uživatelských ID"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
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:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "označit vybrané uživatelské ID jako primární"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "vypsat seznam předvoleb (pro experty)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "vypsat seznam předvoleb (podrobně)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "nastavit sadu preferencí pro vybrané uživatelské ID"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
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:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "zadat poznámku pro vybraná uživatelská ID"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "změnit heslo"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "změnit důvěryhodnost vlastníka klíče"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "revokovat podpisu na vybraných uživatelských ID"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "revokovat vybrané uživatelské ID"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "revokovat klíč nebo vybrané podklíče"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "nastavit klíč jako platný (enable)"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "nastavit klíč jako neplatný (disable)"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "ukázat vybrané fotografické ID"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
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:1936
++#: g10/keyedit.c:1939
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:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Tajný klíč je dostupný.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Pro provedení této operace je potřeba tajný klíč.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4181,252 -3288,199 +4205,258 @@@ 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:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Klíč revokován."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
msgid "Really sign all text user IDs? (y/N) "
msgstr "Opravdu podepsat všechna textová ID uživatele? (a/N) "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Nápověda: Vyberte id uživatele k podepsání\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Neznámý typ podpisu „%s“\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Musíte vybrat alespoň jeden id uživatele.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Použijte příkaz „%s“.)\n"
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Nemůžete smazat poslední id uživatele!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Opravdu odstranit všechny vybrané id uživatele? (a/N) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "Opravdu přesunout primární klíč? (a/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Musíte vybrat právě jeden klíč.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "Příkaz očekává jméno souboru jako argument\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Nelze otevřít „%s“: %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Musíte vybrat alespoň jeden klíč.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Opravdu chcete smazat vybrané klíče? (a/N) "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "Opravdu chcete smazat tento klíč? (a/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Opravdu revokovat všechny vybrané id uživatele? (a/N) "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "Opravdu revokovat tento id uživatele? (a/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Opravdu chcete revokovat celý klíč? (a/N) "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Opravdu chcete revokovat vybrané podklíče? (a/N) "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Opravdu chcete revokovat tento podklíč? (a/N) "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
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:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Nastavit seznam předvoleb:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
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:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Opravdu aktualizovat předvolby? (a/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Uložit změny? (a/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Ukončit bez uložení? (a/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "aktualizace selhala: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
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:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Vytvoření klíče se nepodařilo: %s\n"
+
++#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "„%s“ není otisk\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "„%s“ není primární otisk\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, 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:3134
++#: g10/keyedit.c:3241
msgid "No matching user IDs."
msgstr "Žádný identifikátor uživatele neodpovídá."
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "Nothing to sign.\n"
msgstr "Nic na podepsání.\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Hash: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Vlastnosti: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Keyserver bez modifikace"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Preferovaný keyserver: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Poznámky: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(citlivá informace)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "vytvořen: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "revokován: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "platnost skončila: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "platnost skončí: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "použití: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "číslo karty: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "důvěra: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "platnost: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Tento klíč byl označen za neplatný (disabled)"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4435,17 -3489,12 +4465,17 @@@ msgstr "
"být nutně správné, dokud znova nespustíte program.\n"
# status
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "odvolán"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "platnost skončila"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4453,15 -3502,12 +4483,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "POZOR: Vašemu šifrovacímu podklíči brzy vyprší platnost.\n"
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
msgid "You may want to change its expiration date too.\n"
msgstr "Dobu platnosti také můžete změnit.\n"
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4470,35 -3516,27 +4500,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
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:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Smazat tento dobrý podpis? (a/N/u)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Smazat tento neplatný podpis? (a/N/u)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Smazat tento neznámý podpis? (a/N/u)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4507,20 -3545,16 +4537,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:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Nic nebylo smazáno.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "neplatný"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4529,17 -3563,14 +4559,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:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Uživatelské ID „%s“: je již minimalizované\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Uživatelské ID „%s“: je již odstraněné\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4548,191 -3579,153 +4578,196 @@@ 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:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Vložte identifikátor uživatele pověřeného revokací: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
msgid "this key has already been designated as a revoker\n"
msgstr "tento klíč již byl pověřen revokací\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
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:4632
++#: g10/keyedit.c:4739
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:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Měním dobu expirace podklíče.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Měním dobu expirace primárního klíče.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, 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:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Prosím, vyberte právě jeden id uživatele .\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "přeskočen v3 podpis klíče jím samým u uživatelského id „%s“\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Vložte URL preferovaného serveru klíčů: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
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:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Vložte poznámku: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "Pokračovat (a/N)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Neexistuje uživatelské ID s hashem %s\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Neexistuje podklíč s ID klíče „%s“.\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje podklíč s indexem %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID uživatele: „%s“\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "podepsáno vaším klíčem %s v %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (neexportovatelné)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnost podpisu vyprší %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "Nepodepsáno vámi.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (neodvolatelné)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, 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:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Chystáte se revokovat tyto podpisy:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opravdu vytvořit revokační certifikáty? (a/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "neexistuje tajný klíč\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "uživatelské ID „%s“ je již revokováno\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Klíč %s je již revokován.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Podklíč %s je již revokován.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5171,13 -4086,10 +5206,13 @@@ msgstr "
"používat disky); díky tomu má generátor lepší šanci získat dostatek "
"entropie.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvoření klíče se nepodařilo: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5188,62 -4100,49 +5223,62 @@@ msgstr "
" „%s“\n"
"\n"
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr "Pokračovat (A/n) "
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Klíč pro „%s“ již existuje\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
msgid "Create anyway? (y/N) "
msgstr "Přesto vytvořit? (a/N) "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
msgid "creating anyway\n"
msgstr "přesto se vytváří\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, 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:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Vytváření klíče bylo zrušeno.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, c-format
msgid "writing public key to '%s'\n"
msgstr "veřejný klíč se zapisuje do „%s“\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "nenalezen zapisovatelný soubor veřejných klíčů (pubring): %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
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:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5251,7 -4150,6 +5286,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5259,7 -4157,6 +5294,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:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5267,47 -4164,36 +5302,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:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajné části primárního klíče nejsou dostupné.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Opravdu vytvořit? (a/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "nikdy "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritická podepisovací politika: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Podepisovací politika: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Kriticky preferovaný keyserver: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritická podepisovací notace: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Podepisovací notace: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d good signatures\n"
msgid "%d good signature\n"
@@@ -5316,7 -4202,6 +5351,7 @@@ msgstr[0] "%d dobrých podpisů\n
msgstr[1] "%d dobrých podpisů\n"
msgstr[2] "%d dobrých podpisů\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5325,7 -4210,6 +5360,7 @@@ msgstr[0] "1 podpis neověřen, protož
msgstr[1] "1 podpis neověřen, protože vznikla chyba\n"
msgstr[2] "1 podpis neověřen, protože vznikla chyba\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, 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"
@@@ -5334,38 -4218,26 +5369,33 @@@ msgstr[0] "Pozor: %lu klíč(ů) přesk
msgstr[1] "Pozor: %lu klíč(ů) přeskočen(o) kvůli jejich přílišné velikosti\n"
msgstr[2] "Pozor: %lu klíč(ů) přeskočen(o) kvůli jejich přílišné velikosti\n"
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Soubor klíčů (keyring)"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Otisk primárního klíče:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Otisk podklíče:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Otisk primárního klíče:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Otisk podklíče:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Otisk klíče ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " Sériové číslo karty ="
@@@ -5434,25 -4294,20 +5464,25 @@@ msgstr "respektovat URL upřednostňova
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:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "zneplatněn"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Vložte číslo (čísla), „N“ pro další, nebo „Q“ pro konec > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatný protokol serveru klíčů (naše %d!=obsluha %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "„%s“ není ID klíče: přeskočeno\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5461,271 -4316,219 +5491,276 @@@ 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "klíč „%s“ nebyl na serveru klíčů nalezen\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "klíč nebyl na serveru klíčů nalezen\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "žádný server klíčů není znám (použijte volbu --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "požaduji klíč %s ze %s server %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "požaduji klíč %s z %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "žádná operace se serverem klíčů!\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "přeskočen „%s“: %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "posílám klíč %s na %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, c-format
msgid "requesting key from '%s'\n"
msgstr "požaduje se klíč z „%s“\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "VAROVÁNÍ: URI %s nelze získat: %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s zašifrovaný klíč sezení\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, 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:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "veřejný klíč je %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
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:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " „%s“\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
# [kw]
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "zašifrováno %s klíčem, ID %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "dešifrování veřejným klíčem selhalo: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "zašifrováno s heslem %lu\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "zašifrováno jedním heslem\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "předpokládám %s šifrovaných dat\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
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:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "dešifrování o.k.\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROVÁNÍ: se zašifrovanou zprávou bylo manipulováno!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "dešifrování selhalo: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Poznámka: odesílatel považoval data za důvěrná („for-your-eyes-only“)\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "původní jméno souboru='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "VAROVÁNÍ: zachyceno více prostých textů\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
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:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "nenalezen žádná podpis\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ŠPATNÝ podpis od „%s“"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypršenou platností od „%s“"
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "Dobrý podpis od „%s“"
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "verifikace podpisu potlačena\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "neumím pracovat s těmito nejednoznačnými daty\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Podpis vytvořen %s\n"
- #: g10/mainproc.c:1723
++#: 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:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Klíč k dispozici na: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[nejistý]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " alias „%s“"
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnost podpisu skončila %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnost podpisu skončí %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binární formát"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "textový formát"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "neznámý formát"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
msgid ", key algorithm "
msgstr ", algoritmus klíče"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, 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:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nemohu ověřit podpis: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "toto není podpis oddělený od dokumentu\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatný podpis třídy 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starého typu (PGP 2.x)\n"
@@@ -5896,7 -4665,6 +5931,7 @@@ msgstr "nemohu pracovat s algoritmem ve
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:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpacket typu %d má nastavený kritický bit\n"
@@@ -6252,47 -4952,38 +6287,47 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Není jisté, zda tento podpis patří vlastníkovi.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: přeskočeno: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, 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:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, 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:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Aktuální příjemci:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6300,37 -4991,29 +6335,37 @@@ msgstr "
"\n"
"Napište identifikátor uživatele (user ID). Ukončete prázdným řádkem: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Takový identifikátor uživatele neexistuje.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Veřejný klíč je neplatný (disabled).\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "přeskočeno: veřejný klíč je již nastaven\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "neznámý implicitní adresát „%s“\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "žádné platné adresy\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Poznámka: klíči %s chybí vlastnost %s\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Poznámka: klíči %s chybí předvolby pro %s\n"
@@@ -6340,28 -5022,22 +6375,28 @@@ msgid "data not saved; use option \"--o
msgstr ""
"data nebyla uložena; k jejich uložení použijte parametr příkazu „--output“\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Podpis oddělený od dokumentu.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Prosím, vložte název datového souboru: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "čtu standardní vstup…\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "chybí podepsaná data\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "nelze otevřít podepsaná data „%s“\n"
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nelze otevřít podepsaná data na deskriptoru=%d: %s\n"
@@@ -6622,7 -5253,6 +6657,7 @@@ msgstr[0] "veřejný klíč %s je o %l
msgstr[1] "veřejný klíč %s je o %lu sekund novější než podpis\n"
msgstr[2] "veřejný klíč %s je o %lu sekund novější než podpis\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6708,12 -5329,10 +6743,12 @@@ msgstr "
"VAROVÁNÍ: nemohu %%-expandovat URL preferovaného keyservery (příliš dlouhé). "
"Použity neexpandované.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s podpis od: „%s“\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6721,11 -5340,9 +6756,11 @@@ msgstr "
"VAROVÁNÍ: vyžádaný hashovací algoritmus %s (%d) nevyhovuje předvolbám "
"příjemce\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "podepisuji:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude použito šifrování %s\n"
@@@ -6801,131 -5404,104 +6836,131 @@@ msgstr "chyba při čtení v „%s“:
msgid "trustdb: sync failed: %s\n"
msgstr "databáze důvěry: synchronizace selhala %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
msgstr "„%s“ nelze zamknout\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, 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:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "transakce s databází důvěry je příliš dlouhá\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: adresář neexistuje!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "k „%s“ nelze přistoupit: %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: nepodařilo se vytvořit záznam verze: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: vytvořena neplatná databáze důvěry\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: databáze důvěry vytvořena\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
msgstr "Poznámka: do databáze důvěry nelze zapisovat\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: neplatná databáze důvěry\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: nepodařilo se vytvořit hashovací tabulku: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: chyba při aktualizaci záznamu verze: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: chyba při čtení záznamu verze: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, 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:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "databáze důvěry: procedura lseek() selhala: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, 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:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: není soubor databáze důvěry\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: záznam verze s číslem %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: neplatná verze souboru %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, 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:1753
++#: g10/tdbio.c:1757
#, 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:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: vynulování záznamu selhalo: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: přidání záznamu selhalo: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "Chyba: Databáze důvěry je poškozena.\n"
@@@ -7307,7 -5821,6 +7342,7 @@@ msgstr "použití modelu důvěry %s\n
msgid "no need for a trustdb check\n"
msgstr "není nutné kontrolovat databázi důvěry\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "další kontrola databáze důvěry v %s\n"
@@@ -7322,7 -5833,6 +7357,7 @@@ msgstr "není nutné kontrolovat datab�
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "není nutné aktualizovat databázi důvěry s modelem „%s“\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "veřejný klíč %s nebyl nalezen: %s\n"
@@@ -7335,7 -5843,6 +7370,7 @@@ msgstr "prosím proveďte --check-trust
msgid "checking the trustdb\n"
msgstr "kontroluji databázi důvěry\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7344,7 -5851,6 +7379,7 @@@ msgstr[0] "%lu klíče byly doposud zpr
msgstr[1] "%lu klíče byly doposud zpracovány\n"
msgstr[2] "%lu klíče byly doposud zpracovány\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7353,16 -5859,13 +7388,16 @@@ msgstr[0] "zpracováno %d klíčů (%d
msgstr[1] "zpracováno %d klíčů (%d validit vymazáno)\n"
msgstr[2] "zpracováno %d klíčů (%d validit vymazáno)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "žádný absolutně důvěryhodný klíč nebyl nalezen\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "veřejný klíč k absolutně důvěryhodnému klíči %s nebyl nalezen\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7370,7 -5873,6 +7405,7 @@@ msgstr "
"hloubka: %d platných: %3d podepsaných: %3d důvěra: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, 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"
@@@ -7825,11 -6232,9 +7860,11 @@@ msgstr "zakázat používání správco
msgid "use variable length input for pinpad"
msgstr "používat vstup o proměnné délce na klávesnici čtečky"
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Použití: @SCDAEMON@ [volby] (-h pro nápovědu)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7837,17 -6242,14 +7872,17 @@@ msgstr "
"Syntaxe: scdaemon [volby] [příkaz [argumenty]]\n"
"Démon pro čipové karty (smartcard) pro @GNUPG@\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"prosím, použijte volbu „--daemon“, chcete-li nechat běžet program na pozadí\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "obsluha pro deskriptor %d spuštěna\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obsluha pro deskriptor %d ukončena\n"
@@@ -7857,7 -6258,6 +7892,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "neplatný radix64 znak %02x byl přeskočen\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
msgstr "v této relaci neběží žádný dirmngr\n"
@@@ -9676,8 -7689,6 +9711,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "platné úrovně ladění jsou: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, c-format
msgid "usage: %s [options] "
msgstr "použití: %s [volby] "
@@@ -9686,12 -7696,10 +9721,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "dvojtečky v názvu socketu jsou nepřípustné\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "stahování CRL z „%s“ selhalo: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "zpracování CRL z „%s“ selhalo: %s\n"
@@@ -10168,76 -8074,60 +10203,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:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "volání assuan_inquire(%s) selhalo: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr "chybí ldapserver (LDAP server)"
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr "v ID certifikátu chybí serialno (sériové číslo)"
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "volání assuan_inquire selhalo: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "volání fetch_cert_by_url selhalo: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, c-format
msgid "error sending data: %s\n"
msgstr "chyba při odesílání dat: %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "volání start_cert_fetch selhalo: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "volání fetch_next_cert selhalo: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies (max. odpovědí) %d překročeno\n"
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "řídící strukturu nelze alokovat: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "alokace kontextu assuan selhala: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "inicializace serveru selhala: %s\n"
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "registrace příkazu u Assuanu selhala: %s\n"
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problém příjmu Assuanu: %s\n"
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@@ -10369,7 -8229,6 +10404,7 @@@ msgstr "neznámý příkaz „%s“\n
msgid "sending line failed: %s\n"
msgstr "odesílání řádku selhalo: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "chyba při odesílání standardního parametru: %s\n"
@@@ -10616,15 -8414,12 +10651,15 @@@ msgstr "
"Syntaxe: @GPGCONF@ [volby]\n"
"Spravuje konfigurační volby nástrojů, které patří do systému @GNUPG@\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Potřebuji jeden argument určující komponentu"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Komponenta nenalezena"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "Žádné argumenty nejsou povoleny"
diff --cc po/da.po
index 2f9b1bf,2f8fb37..59ad3d5
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -437,10 -351,6 +437,10 @@@ msgstr "kør i dæmontilstand (baggrund
msgid "run in server mode (foreground)"
msgstr "kør i servertilstand (forgrunden)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "uddybende"
@@@ -546,11 -431,6 +546,11 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
@@@ -572,56 -450,39 +572,56 @@@ msgstr "
"Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
"Hemmelig nøglehåndtering for GnuPG\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s er for gammel (kræver %s, har %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "BEMÆRK: Ingen standardfil for tilvalg »%s«\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "tilvalgsfil »%s«: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "læser tilvalg fra »%s«\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan ikke oprette sokkel: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
@@@ -631,29 -491,23 +631,29 @@@ msgstr "sokkelnavnet »%s« er for lang
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "en gpg-agent kører allerede - starter ikke en ny\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "fejl ved indhentelse af nonce for soklen\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "fejl ved binding af sokkel til »%s«: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() mislykkedes: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
@@@ -685,7 -533,6 +685,7 @@@ msgstr "stat() mislykkedes for »%s«:
msgid "can't use '%s' as home directory\n"
msgstr "kan ikke bruge »%s« som hjemmemappe\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fejl ved læsning af nonce på fd %d: %s\n"
@@@ -710,19 -553,15 +710,19 @@@ msgstr "ssh-håndtering 0x%lx for fd %
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh-håndtering 0x%lx for %d termineret\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
#| msgid "pth_select failed: %s - waiting 1s\n"
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "pth_select mislykkeds: %s - venter 1s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppet\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kører i denne session\n"
@@@ -738,8 -575,6 +738,8 @@@ msgstr "
"Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
"Adgangskode for mellemlagervedligeholdelse\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -747,9 -582,6 +747,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -1004,32 -793,25 +1004,32 @@@ msgstr "fejl ved oprettelse af datakana
msgid "error creating a stream for a pipe: %s\n"
msgstr "fejl ved oprettelse af datakanal: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "fejl ved forgrening af proces: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, 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:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1045,29 -825,23 +1045,29 @@@ msgstr "fejl ved indhentelse af afslutn
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "ventning på at proces %d skulle terminere mislykkedes: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "kan ikke forbinde til »%s«: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "kommunikationsproblem med gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "afbrudt af brugeren\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "problem med agenten\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
#| msgid "problem with the agent: %s\n"
msgid "problem with the agent (unexpected response \"%s\")\n"
@@@ -1143,7 -902,6 +1143,7 @@@ msgstr "ikke nok kerne i sikker hukomme
msgid "out of core while allocating %lu bytes"
msgstr "ikke nok kerne under allokering af %lu byte"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "fejl ved allokering af nok hukommelse: %s\n"
@@@ -1389,7 -1093,6 +1389,7 @@@ msgstr "Ingen hjælp tilgængelig for �
msgid "ignoring garbage line"
msgstr "ignorerer affaldslinje"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[ingen]"
@@@ -1525,91 -1201,71 +1525,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "panser: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "ugyldigt panserhoved: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "panserhoved: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "ugyldigt clearsig-hoved\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "ukendt panserhoved: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "indlejrede underskrifter i klartekst\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "uventet panser: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "ugyldig striplet undvegen linje: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "ugyldigt radix64-tegn %02x udeladt\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "for tidlig eof (ingen CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "for tidlig eof (i CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "ugyldig udformet CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-fejl; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "for tidlig eof (i trailer)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "fejl i trailerlinje\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "ingen gyldige OpenPGP-data fundet.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ugyldigt panser: linje længere end %d tegn\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, 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:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1617,25 -1273,20 +1617,25 @@@ msgstr "
"et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
"sluttes med et »=«\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "et brugernotationsnavn skal indeholde tegnet »@«\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1645,7 -1296,6 +1645,7 @@@ msgstr "
"et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
"sluttes med et »=«\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "ADVARSEL: Ingen notationsdata fundet\n"
@@@ -1677,19 -1322,14 +1677,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP-kort er ikke tilgængeligt: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnr. %s detekteret\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "kan ikke udføre dette i jobtilstand\n"
@@@ -1701,10 -1339,6 +1701,10 @@@ msgstr "Denne kommando er kun tilgænge
msgid "Reset Code not or not anymore available\n"
msgstr "Nulstillingskode er ikke eller ikke mere tilgængelig\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Dit valg? "
@@@ -1766,86 -1386,65 +1766,87 @@@ 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: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "fejl ved skrivning af »%s«: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Loginddata (kontonavn): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Fejl: Loginddata er for lange (begrænsningen er %d tegn).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Private DO-data: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Fejl: Privat DO er for lang (begrænsningen er %d tegn).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Sprogpræferencer: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Fejl: ugyldig længde for præferencestreng.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Fejl: ugyldige tegn i præferencestreng.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Køn ((M)and, Kvinde(F) eller mellemrum): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Fejl: ugyldigt svar.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "CA-fingeraftryk: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Fejl: Ugyldigt formateret fingeraftryk.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "nøglehandling er ikke mulig: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "ikke et OpenPGP-kort"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "fejl ved indhentelse af aktuel nøgleinformation: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Erstat eksisterende nøgle? (j/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1861,58 -1460,46 +1862,58 @@@ msgstr "
" dokumentationen for dit kort for at se hvilke størrelser, der\n"
" er tilladt.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for underskriftsnøglen (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for krypteringsnøglen? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Hvilken nøglestørrelse ønsker du for godkendelsesnøglen? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "afrundet op til %u bit\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s nøglestørrelser skal være i intervallet %u-%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Kortet vil nu blive omkonfigureret til at oprette en nøgle på %u bit\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "fejl ved ændring af størrelsen på nøglen %d til %u bit: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"Lav sikkerhedskopi et andet sted end på kortet for krypteringsnøglen? (J/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "Erstat eksisterende nøgler (j/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1927,145 -1514,110 +1928,145 @@@ msgstr "
" PIN = »%s« Admin-PIN = »%s«\n"
"Du bør ændre dem med kommandoen --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Vælg venligst hvilken slags nøgle der skal oprettes:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Underskriftsnøgle\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Krypteringsnøgle\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) Godkendelsesnøgle\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Ugyldigt valg.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Vælg venligst hvor nøglen skal gemmes:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "læsning mislykkedes: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "BEMÆRK: Nøgler er allerede gemt på kortet!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "afslut denne menu"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "vis administratorkommandoer"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "vis denne hjælpetekst"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "vis alle tilgængelige data"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "ændr kortholders navn"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "ændr adresse for at indhente nøgle"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "hent nøglen angivet i kortadressen"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "ændr logindnavnet"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "ændr sprogpræferencerne"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "ændr kortholders køn"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "ændr et CA-fingeraftryk"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "skift force PIN-flag for underskriften"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "opret nye nøgler"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "menu til at ændre eller fjerne blokering for PIN'en"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "verificer PIN'en og vis alle data"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "fjern blokering for PIN'en med en nulstillingskode"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "Kommandoer kun for administratoren\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Administratorkommandoer er tilladt\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "Administratorkommandoer er ikke tilladt\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Ugyldig kommando (prøv »help«)\n"
@@@ -2073,28 -1624,19 +2074,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output virker ikke for denne kommando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan ikke åbne »%s«\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "nøglen »%s« blev ikke fundet: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2150,7 -1681,6 +2151,7 @@@ msgstr "der er en hemmelig nøgle for o
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "brug tilvalget »--delete-secret-keys« for at slette den først.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
@@@ -2170,7 -1697,6 +2171,7 @@@ msgstr "bruger chiffer %s\n
msgid "'%s' already compressed\n"
msgstr "»%s« allerede komprimeret\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2190,7 -1714,6 +2191,7 @@@ msgstr "
"ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
"præferencer\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2210,17 -1731,14 +2211,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypteret for: »%s«\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s krypterede data\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "krypteret med ukendt algoritme %d\n"
@@@ -2294,330 -1799,265 +2295,344 @@@ 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:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "eksportunderskrifter som er markeret som kun lokale"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "bruger-id'er for eksportattributter (normalt billed-id'er)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "tilbagekaldsnøgler for eksport markeret som »sensitive«"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "fjern nøgledele der ikke kan bruges under eksport"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr "fjern så meget som muligt fra nøglen under eksport"
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: udelod: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "skriver til »%s«\n"
+
++#: g10/export.c:1660
+ #, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr "nøgle %s: nøglemateriale på kort - udeladt\n"
+
++#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "nøgle %s: nøglemateriale på kort - udeladt\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: intet blev eksporteret\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[Bruger-id blev ikke fundet]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, 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:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, 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:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, 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:1435
++#: g10/getkey.c:1437
#, 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:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "Ingen fingeraftryk"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "hemmelig nøgle »%s« blev ikke fundet: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "opret en underskrift"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "opret en underskrift i klartekst"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "opret en separat underskrift"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "krypter data"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "krypter kun med symmetrisk chiffer"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "afkrypter data (standard)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "godkend en underskrift"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "vis nøgler"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "vis nøgler og underskrifter"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "vis og kontroller nøgleunderskrifter"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vis nøgler og fingeraftryk"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vis hemmelige nøgler"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "opret et nyt nøglepar"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "opret et nyt nøglepar"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "opret et tilbagekaldscertifikat"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "fjern nøgler fra den offentlige nøglering"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "fjern nøgler fra den hemmelige nøglering"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "underskriv en nøgle"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "underskriv en nøgle lokalt"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "underskriv eller rediger en nøgle"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "ændr en adgangsfrase"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "eksporter nøgler"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "eksporter nøgler til en nøgletjener"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importer nøgler fra en nøgleserver"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "søg efter nøgler på en nøgleserver"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "opdater alle nøgler fra en nøgleserver"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importer/sammenføj nøgler"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "udskriv kortstatus"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "ændr data på et kort"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "ændr et korts PIN"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "opdater troværdighedsdatabasen"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "vis beskedsammendrag"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "kør i servertilstand"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "opret ascii-pansrede uddata"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|krypter for BRUGER-ID"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "brug kanonisk teksttilstand"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|skriv resultat til FIL"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "lav ingen ændringer"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "spørg før overskrivning"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "brug streng OpenPGP-opførsel"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2625,7 -2065,6 +2640,7 @@@ msgstr "
"@\n"
"(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2645,14 -2084,12 +2660,14 @@@ msgstr "
" --list-keys [navne] vis nøgler\n"
" --fingerprint [navne] vis fingeraftryk\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2667,7 -2104,6 +2682,7 @@@ msgstr "
"Sign, check, encrypt eller decrypt\n"
"standardhandling afhænger af inddata\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2675,81 -2111,66 +2690,81 @@@ msgstr "
"\n"
"Understøttede algoritmer:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "brug: gpgsm [tilvalg] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "kommandoer er i konflikt\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2758,19 -2179,16 +2773,19 @@@ msgid "
msgstr ""
"ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, 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:1560
#, 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:1563
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2780,510 -2198,404 +2795,516 @@@ msgid "
msgstr ""
"ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, 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:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr "vis billed-id'er under nøglevisninger"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr "vil politikadresser under underskriftvisninger"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "vis alle notationer under underskriftvisninger"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotationer under underskriftvisninger"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "vis brugerangivne notationer under underskriftvisninger"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
msgstr "vis bruger-id-validitet under nøglevisninger"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
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:1900
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:1902
msgid "show the keyring name in key listings"
msgstr "vis nøgleringsnavnet i nøglevisninger"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
msgstr "vis udløbsdatoer under underskriftvisninger"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Tilgængelige nøgler:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "ukendt kommando »%s«\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt er for gammel (kræver %s, har %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, 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:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke fortolke nøgleserveradresse\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importindstillinger\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "ugyldige importindstillinger\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "ugyldige listeindstillinger\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "ugyldige eksportindstillinger\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listeindstillinger\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "vis billed-id'er under underskriftverificering"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "vis politikadresser under underskriftverificering"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "vis alle notationer under underskriftverificering"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotationer under underskriftverificering"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "vis brugerangivne notationer under underskriftverificering"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "vis bruger-id-validitet under underskriftverificering"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
msgstr "vis kun den primære bruger-id i underskriftverificering"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "valider underskrifter med PKA-data"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke angive kørselssti til %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: program kan oprette en kernefil!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsløs sammen med %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "ADVARSEL: kører med forfalsket systemtid: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt chifferalgoritme er ugyldig\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "valgt sammendragsalgoritme er ugyldig\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed skal være større end 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed skal være større end 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "ugyldige standardpræferencer\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "ugyldige præferencer for personlig chiffer\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "ugyldige præferencer for personlig sammendrag\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "ugyldige præferencer for personlig komprimering\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker endnu ikke med %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TrustDB: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, 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:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
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:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
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:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd <bruger-id>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nøgleserver send mislykkedes: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nøgleserver modtag mislykkedes: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "nøgleeksport mislykkedes: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nøgleserver søg mislykkedes: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "nøgleserver opdater mislykkedes: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af panser mislykkedes: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "påklædning af panser mislykkedes: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ugyldig hash-algoritme »%s«\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, 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:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Gå til sagen og skriv meddelelsen ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@@ -3325,128 -2629,110 +3346,138 @@@ msgstr "Ingen hjælp tilgængelig
msgid "No help available for '%s'"
msgstr "Ingen hjælp tilgængelig for »%s«"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "importer underskrifter som er markeret som local-only"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "reparer skade fra pks-nøgleserveren under import"
- #: g10/import.c:110
++#: g10/import.c:140
#, 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:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "opdater ikke trustdb efter import"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "vis nøglefingeraftryk"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "accepter kun opdateringer til eksisterende nøgler"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "fjern ubrugelige dele fra nøgle efter import"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr "fjern så meget som muligt fra nøgle efter import"
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr " udelader bloktype %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr " %lu-nøgler behandlet\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Totalt antal behandl.: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " udeladte nye nøgler: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " w/o bruger-id'er: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importerede: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " uændrede: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nye bruger-id'er: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nye undernøgler: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " nye underskrifter: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nye nøgletilbagekald: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " hemmelige nøgler læst: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " hemmel. nøgler import: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "hemmel. nøgler uændret: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ikke importerede: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " underskrifter ryddet: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " bruger-id'er ryddet: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3455,201 -2741,156 +3486,194 @@@ msgstr "
"ADVARSEL: nøgle %s indeholder præferencer for utilgængelige\n"
"algoritmer på disse bruger-id'er:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " »%s«: præference for chifferalgoritme %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " »%s«: præference for sammendragsalgortime %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " »%s«: præference for komprimeringsalgortime %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
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:893
++#: g10/import.c:1069
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:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "nøgle %s: ingen bruger-id\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "udelod »%s«: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, 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:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nøgle %s: ingen gyldige bruger-id'er\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "dette kan skyldes en manglende egenunderskrift\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, 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:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nøgle %s: ny nøgle - udeladt\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ingen skrivbar nøglering fundet: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "skriver til »%s«\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nøgle %s: offentlig nøgle »%s« importeret\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "nøgle %s: stemmer ikke med vores kopi\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nøgle %s: »%s« 1 ny bruger-id\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nøgle %s: »%s« 1 ny underskrift\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nøgle %s: »%s« %d nye underskrifter\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nøgle %s: »%s« 1 ny undernøgle\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nøgle %s: »%s« %d nye undernøgler\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nøgle %s: »%s« %d underskrift renset\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nøgle %s: »%s« %d underskrifter renset\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nøgle %s: »%s« %d bruger-id renset\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nøgle %s: »%s« ikke ændret\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nøgle %s: hemmelig nøgle importeret\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, 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:1683
++#: g10/import.c:1971
#, 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:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "import af hemmelige nøgler er ikke tilladt\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3664,142 -2905,115 +3688,142 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - afvist\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat importeret\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "nøgle %s: ingen bruger-id for underskrift\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nøgle %s: ugyldig direkte nøgleunderskrift\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nøgle %s: ugyldig undernøglebinding\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nøgle %s: fjernet flerundernøglebinding\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nøgle %s: fjernet flerundernøgletilbagekald\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nøgle %s: udeladt bruger-id »%s«\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nøgle %s: udeladt undernøgle\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nøgle %s: ugyldigt tilbagekaldscertifikat: %s - udeladt\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nøgle %s: »%s« tilbagekaldscertifikat tilføjet\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
@@@ -3840,45 -3048,37 +3864,45 @@@ msgstr "nøgleblokressource »%s«: %s\
msgid "error opening key DB: %s\n"
msgstr "fejl ved åbning af »%s«: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[tilbagekald]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[egenunderskrift]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "nøgle %s: ikke understøttet offentlig nøglealgoritme\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
#| msgid "Good signature from"
msgid " (reordered signatures follow)"
msgstr "God underskrift fra"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s:\n"
msgstr "udelod »%s«: %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "%d duplicate signature removed\n"
@@@ -3886,7 -3086,6 +3910,7 @@@ msgid_plural "%d duplicate signatures r
msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
- #: g10/keyedit.c:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3894,7 -3093,6 +3918,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3902,7 -3100,6 +3926,7 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d ugyldige underskrifter\n"
msgstr[1] "%d ugyldige underskrifter\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
#| msgid "Good signature from"
msgid "%d signature reordered\n"
@@@ -3910,14 -3107,12 +3934,14 @@@ msgid_plural "%d signatures reordered\n
msgstr[0] "God underskrift fra"
msgstr[1] "God underskrift fra"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3928,17 -3123,14 +3952,17 @@@ msgstr "
"andre brugers nøgler\n"
"(ved at kigge på pas, kontrollere fingeraftryk fra andre kilder etc.)\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Marginal troværdighed\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Fuld troværdighed\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3948,52 -3140,40 +3972,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:1018
++#: g10/keyedit.c:1021
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:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Bruger-id »%s« er tilbagekaldt."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Er du sikker på, at du stadig vil underskrive (j/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Kunne ikke underskrive.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Bruger-id »%s« er udløbet."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Bruger-id »%s« er ikke egenunderskrevet."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Bruger-id »%s« kan underskrives. "
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4002,11 -3182,9 +4026,11 @@@ msgstr "
"Egenunderskriften på »%s«\n"
"er en underskrift i PGP 2.x-stil.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4015,12 -3193,10 +4039,12 @@@ msgstr "
"Din aktuelle underskrift på »%s«\n"
"er udløbet.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4029,45 -3205,36 +4053,45 @@@ msgstr "
"Din aktuelle underskrift på »%s«\n"
"er en lokal underskrift.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "»%s« var allerede underskrevet af nøgle %s\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Ønsker du at underskrive den igen alligevel? (j/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Intet at underskrive med nøgle %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Denne nøgle er udløbet!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, 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:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4078,33 -3245,27 +4102,33 @@@ msgstr "
"faktisk tilhører personen navngivet ovenfor? Hvis du ikke kender svaret, så "
"indtast »0«.\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jeg vil ikke svare.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, 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:1470
++#: g10/keyedit.c:1473
#, 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:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
#, 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:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4113,233 -3274,179 +4137,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:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Dette vil være en egenunderskrift.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
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:1527
++#: g10/keyedit.c:1530
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:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "Underskriften vil blive markeret som ikke at kunne eksporteres.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "Underskriften vil blive markeret som ikke at kunne tilbagekaldes.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "Jeg har overhovedet ikke kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "Jeg har overfladisk kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "Jeg har omhyggeligt kontrolleret denne nøgle.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Underskriv? (j/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "underskrift mislykkedes: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
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:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "gem og afslut"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
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:1859
++#: g10/keyedit.c:1862
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Indtst nøglegrebet: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "vis nøgle og bruger-id'er"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "vælg bruger-id N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "vælg undernøgle N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "kontroller underskrifter"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"underskriv valgte bruger-id'er [* se nedenfor for relaterede kommandoer]"
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "underskriv valgte bruger-id'er lokalt"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "underskriv valgte bruger-id'er med en troværdighedsunderskrift"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
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:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "tilføj bruger-id"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "tilføj billed-id"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "slet valgte bruger-id'er"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "tilføj en undernøgle"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "tilføj en nøgle til et smartkort"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "flyt en nøgle til et smartkort"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "flyt en sikkerhedskopinøgle til et smartkort"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "slet valgte undernøgler"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "tilføj en tilbagekaldsnøgle"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "slet underskrifter fra de valgte bruger-id'er"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
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:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "marker den valgte bruger-id som primær"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "vis præferencer (ekspert)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "vis præferencer (uddybende)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "angiv præferenceliste for de valgte bruger-id'er"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
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:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "angiv en notation for de valgte bruger-id'er"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "ændr adgangsfrasen"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "ændr ejertroværdigheden"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "tilbagekald underskrifter på de valgte bruger-id'er"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "tilbagekald valgte bruger-id'er"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "tilbagekald nøgle eller valgte undernøgler"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "aktiver nøgle"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "deaktiver nøgle"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "vis valgte billed-id'er"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
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:1936
++#: g10/keyedit.c:1939
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:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Hemmelig nøgle er tilgængelig.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Har brug for den hemmelige nøgle for dette.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4360,263 -3467,210 +4384,269 @@@ msgstr "
"tnrsign\n"
" etc.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Nøglen er tilbagekaldt."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "Vil du gerne underskrive alle bruger-id'er (j/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, 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:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Fif: Vælg bruger-id'erne at underskrive\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Ukendt underskrifttype »%s«\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Du skal vælge mindst en bruger-id.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Du kan ikke slette den sidste bruger-id!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Vil du virkelig fjerne alle valgte bruger-id'er? (j/N) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Du skal vælge præcis en nøgle.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "Kommando forventer en filnavnsparameter\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, 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:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Du skal vælge mindst en nøgle.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
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:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vil du virkelig slette denne nøgle? (j/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Vil du virkelig tilbagekalde alle valgte bruger-id'er? (j/N) "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "Vil du virkelig tilbagekalde dette bruger-id? (j/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
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:2571
++#: g10/keyedit.c:2574
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:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vil du virkelig tilbagekalde denne undernøgle? (j/N) "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
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:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Angiv præferenceliste til:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
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:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Opdater præferencerne? (j/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Gem ændringer? (j/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Afslut uden at gemme? (j/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "opdatering mislykkedes: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Nøgleoprettelse mislykkedes: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ugyldig fingeraftryk"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, 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:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "ugyldig værdi\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Ingen sådan bruger-id.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, 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:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Sammendrag: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Funktioner: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Nøgleserver no-modify"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Fortrukken nøgleserver: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Notationer: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(sensitiv)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "oprettet: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "tilbagekaldt: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "udløbet: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "udløber: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "brug: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "kortnr.: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "troværdighed: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "validitet: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Denne nøgle er blevet deaktiveret"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4624,17 -3678,12 +4654,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "tilbagekaldt"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "udløbet"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4642,17 -3691,14 +4672,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4662,35 -3708,27 +4692,35 @@@ msgstr "
"medføre at\n"
" nogle version af PGP afviser denne nøgle.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
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:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Slet denne gode underskrift? (j/N/a)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Slet denne ugyldige underskrift? (j/N/a)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Slet denne ukendte underskrift? (j/n/a)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Virkelig slette denne egenunderskrift? (j/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4698,20 -3736,16 +4728,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Slettede %d underskrift.\n"
msgstr[1] "Slettede %d underskrift.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Intet slettet.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "ugyldig"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Bruger-id »%s« komprimeret: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4719,17 -3753,14 +4749,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:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Bruger-id »%s«: allerede minimeret\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Bruger-id »%s«: allerede ryddet\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4739,41 -3770,33 +4769,41 @@@ msgstr "
"tilbagekalder\n"
" kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
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:4632
++#: g10/keyedit.c:4739
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4784,158 -3807,128 +4814,163 @@@ msgstr "
"Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
"tilbagekalder? (j/N) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, 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:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Vælg venligst præcis en bruger-id.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Indtast din foretrukne nøglerserveradresse: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
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:5277
++#: g10/keyedit.c:5384
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:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Indtast notationen: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "Fortsæt? (j/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen bruger-id med indeks %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen bruger-id med hash %s\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen undernøgle med indeks %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "bruger-id: »%s«\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "underskrevet af din nøgle %s den %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (kan ikke eksporteres)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denne underskrift udløb den %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "Ikke underskrevet af dig.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (kan ikke tilbagekaldes)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "tilbagekaldt af din nøgle %s på %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "ingen hemmelig nøgle\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Nøgle %s er allerede tilbagekaldt.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5388,13 -4303,10 +5423,13 @@@ msgstr "
"under oprettelse af primtallet; dette giver det vilkårlig\n"
"taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nøgleoprettelse mislykkedes: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5402,71 -4314,58 +5437,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, 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:3604
++#: g10/keygen.c:3605
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "Brug denne nøgle alligevel? (j/N) "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "opretter ny nøgle\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Nøgleoprettelse annulleret.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5474,7 -4373,6 +5509,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5482,7 -4380,6 +5517,7 @@@ msgstr "
"nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5490,50 -4387,39 +5525,50 @@@ msgstr "
"nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
"urproblem)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
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:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Vil du virkelig oprette? (j/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "aldrig "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritisk underskriftspolitik: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Underskriftspolitik: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Kritisk foretrukken nøgleserver: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritisk underskriftnotation: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Underskriftsnotation: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5541,7 -4427,6 +5576,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d ugyldige underskrifter\n"
msgstr[1] "%d ugyldige underskrifter\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5549,45 -4434,32 +5584,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
msgstr[1] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Nøglering"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Primær nøglefingeraftryk:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Undernøglefingeraftryk:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr "Primær nøglefingeraftryk:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Undernøglefingeraftryk:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Nøglefingeraftryk ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " Serielnr. for kort ="
@@@ -5653,25 -4513,20 +5683,25 @@@ msgstr "overhold den foretrukne nøgler
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:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "deaktiveret"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Indtal tal, N)æste eller Q) for Afslut > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ugyldig nøgleserverprotokol (os %d!=håndtag %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "»%s« er ikke et nøgle-id: udelader\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5679,272 -4534,220 +5709,277 @@@ 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "nøgle »%s« blev ikke fundet på nøgleserver\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "nøgle blev ikke fundet på nøgleserver\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen kendt nøgleserver (brug tilvalget --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, 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:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "anmoder om nøgle %s fra %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "ingen nøgleserverhandling!\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "udelod »%s«: %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "sender nøgle %s til %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, 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:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s krypteret sessionsnøgle\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "adgangsfrase oprettet med ukendt sammendragsalgoritme %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "offentlig nøgle er %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "krypterede data for offentlig nøgle: god DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " »%s«\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "krypteret med %s nøgle, id %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "afkryptering af offentlig nøgle mislykkedes: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "krypteret med %lu adgangsfraser\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "krypteret med 1 adgangsfrase\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "antager %s krypterede data\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "ADVARSEL: besked var ikke integritetsbeskyttet\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "afkryptering okay\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "afkryptering mislykkedes: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "BEMÆRK: afsender anmodte om »for-your-eyes-only«\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "oprindeligt filnavn=»%.*s«\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "ADVARSEL: flere klartekster set\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "uafhængig tilbagekald - brug »gpg --import« for at anvende\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "ingen underskrift fundet\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "UGYLDIG underskrift fra »%s«"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Udløbet underskrift fra »%s«"
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "God underskrift fra »%s«"
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "underskriftverificering undertrykt\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Underskrift lavet %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " bruger %s nøgle %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Nøgle tilgængelig på: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " også kendt som »%s«"
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Underskrift udløbet %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Underskrift udløber %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binær"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "tekstilstand"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "ukendt"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritme: %s"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan ikke kontrollere underskrift: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "ikke en frakoblet underskrift\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "uafhængig underskrift for klasse 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "gammeldags (PGP 2.x) underskrift\n"
@@@ -6127,7 -4896,6 +6162,7 @@@ msgstr "kan ikke håndtere offentlig n�
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "ADVARSEL: potentiel usikker symmetrisk krypteret sessionsnøgle\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "underpakke af typen %d har kritiske bitsæt\n"
@@@ -6509,48 -5209,39 +6544,48 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Det er ikke sikkert at signaturen tilhører ejeren.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: udelod: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: udelod: offentlig nøgle er slået fra\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: udelod: offentlig nøgle er allerede til stede\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Aktuelle modtagere:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6558,37 -5249,29 +6593,37 @@@ msgstr "
"\n"
"Indtast bruger-id'et. Slut med en tom linje: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Ingen sådan bruger-id.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "udeladt: offentlig nøgle er allerede valgt som standardmodtager\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Offentlig nøgle er slået fra.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "udelod: offentlig nøgle er allerede angivet\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "ukendt standardmodtager »%s«\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "ingen gyldige adresser\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, 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:1636
++#: g10/pkclist.c:1649
#, 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"
@@@ -6597,29 -5279,23 +6632,29 @@@
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:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Frakoblet underskrift.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Indtast navn for datafil: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "læser stdin ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "ingen underskrevne data\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan ikke åbne underskrevne data fd=%d: %s\n"
@@@ -6871,7 -5502,6 +6906,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
msgstr[1] "offentlig nøgle %s er %lu sekund nyere end underskrift\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6952,12 -5573,10 +6987,12 @@@ msgstr "
"ADVARSEL: kan ikke %%-udvide foretrukken nøgleserveradresse (for stor). "
"Bruger uden udvidelse.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s-underskrift fra: »%s«\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6965,11 -5584,9 +7000,11 @@@ msgstr "
"ADVARSEL: tvang af sammendragsalgoritme %s (%d) overtræder "
"modtagerpræferencer\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "underskriver:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s-kryptering vil blive brugt\n"
@@@ -7046,136 -5649,109 +7081,136 @@@ msgstr "læsefejl i »%s«: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronisering mislykkedes: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, 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:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek mislykkedes: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "transaktion for trustdb er for stor\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: mappe findes ikke!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: kunne ikke oprette versionspost: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ugyldig trustdb oprettet\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trustdb oprettet\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "BEMÆRK: trustdb ikke skrivbar\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ugyldig trustdb\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: kunne ikke oprette hashtabel: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: fejl ved opdatering af versionspost: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: fejl ved læsning af versionspost: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: fejl ved skrivning af versionspost: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek mislykkedes: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: læsning mislykkedes (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ikke en trustdb-fil\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versionspost med recnum %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: ugyldig filversion %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: fejl ved læsning af fri post: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: fejl ved skrivning af mappepost: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: mislykkedes med at nulle en post: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, 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:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "Fejl: trustdb er ødelagt.\n"
@@@ -7545,7 -6059,6 +7580,7 @@@ msgstr "bruger %s troværdighedsmodel\n
msgid "no need for a trustdb check\n"
msgstr "intet behov for kontrol af trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "næste kontrol af trustdb sker den %s\n"
@@@ -7563,7 -6074,6 +7598,7 @@@ msgid "no need for a trustdb update wit
msgstr ""
"intet behov for en opdatering af trustdb med troværdighedsmodellen »%s«\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "offentlig nøgle %s blev ikke fundet: %s\n"
@@@ -7576,7 -6084,6 +7611,7 @@@ msgstr "udfør venligst en --check-trus
msgid "checking the trustdb\n"
msgstr "kontrollerer trustdb\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7584,7 -6091,6 +7619,7 @@@ msgid_plural "%d keys processed
msgstr[0] " %lu-nøgler behandlet\n"
msgstr[1] " %lu-nøgler behandlet\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7592,16 -6098,13 +7627,16 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d nøgler behandlet (%d validiteter ryddet)\n"
msgstr[1] "%d nøgler behandlet (%d validiteter ryddet)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "ingen ultimativ troværdige nøgler fundet\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "offentlig nøgle for ultimativ troværdig nøgle %s blev ikke fundet\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7609,7 -6112,6 +7644,7 @@@ msgstr "
"dybde: %d gyldig: %3d underskrevet: %3d troværdighed: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "kan ikke opdatere trustdb-versionspost: skrivning mislykkedes: %s\n"
@@@ -8067,13 -6474,11 +8102,13 @@@ msgstr "nægt brugen af kommandoer for
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8085,7 -6490,6 +8120,7 @@@ msgstr "
"Syntaks: scdaemon [tilvalg] kommando [parametre]]\n"
"Smartcard-dæmon for GnuPG\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
@@@ -8093,12 -6497,10 +8128,12 @@@ msgid "please use the option '--daemon
msgstr ""
"brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "håndtering for fd %d startet\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "håndtering for fd %d termineret\n"
@@@ -8108,7 -6509,6 +8143,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "ugyldigt radix64-tegn %02x udeladt\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
#| msgid "no gpg-agent running in this session\n"
msgid "no dirmngr running in this session\n"
@@@ -10090,8 -8103,6 +10125,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
@@@ -10103,13 -8113,11 +10138,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:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "omdøbelse af »%s« til »%s« mislykkedes: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10650,86 -8556,70 +10685,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, 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:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, 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:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, 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:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select mislykkedes: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, 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:2406
++#: dirmngr/server.c:2415
#, 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:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10886,7 -8746,6 +10921,7 @@@ msgstr "ukendt kommando »%s«\n
msgid "sending line failed: %s\n"
msgstr "afsendelse af linje mislykkedes: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "fejl under afsendelse af standardtilvalg: %s\n"
@@@ -11153,15 -8951,12 +11188,15 @@@ msgstr "
"Syntaks: gpgconf [tilvalg]\n"
"Håndter konfigurationsindstillinger for værktøjer i GnuPG-systemet\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Kræver en kompomentparameter"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Komponent blev ikke fundet"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "Ingen parameter tilladt"
diff --cc po/de.po
index eb7d65b,f341c5f..d918d04
--- 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-06-16 17:27+0200\n"
- "PO-Revision-Date: 2016-06-16 17:04+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+0200\n"
+ "PO-Revision-Date: 2016-07-14 15:55+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@@ -407,10 -321,6 +407,10 @@@ msgstr "Im Daemon Modus ausführen
msgid "run in server mode (foreground)"
msgstr "Im Server Modus ausführen"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "Detaillierte Informationen"
@@@ -508,11 -393,6 +508,11 @@@ msgstr "PuTTY Unterstützung einschalte
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Berichte über Programmfehler bitte in englisch an <@EMAIL@>.\n"
@@@ -530,51 -408,34 +530,51 @@@ msgstr "
"Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
"Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, c-format
msgid "option file '%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, c-format
msgid "reading options from '%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Hinweis: `%s' wird nicht als Option betrachtet\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "Socket kann nicht erzeugt werden: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "Der Name des Sockets `%s' ist zu lang\n"
@@@ -583,27 -443,21 +583,27 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "Zugriffsrechte für '%s' können nicht gesetzt werden: %s\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, c-format
msgid "listening on socket '%s'\n"
msgstr "Es wird auf Socket `%s' gehört\n"
@@@ -630,7 -478,6 +630,7 @@@ msgstr "stat()-Aufruf für `%s' fehlges
msgid "can't use '%s' as home directory\n"
msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
@@@ -655,18 -498,14 +655,18 @@@ msgstr "SSH-Handhabungsroutine 0x%lx f�
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s angehalten\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "Der gpg-agent läuft nicht für diese Session\n"
@@@ -682,8 -519,6 +682,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
"Kennwortpuffer-Pflege\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -691,9 -526,6 +691,9 @@@ msgstr "
"@Befehle:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -944,29 -733,22 +944,29 @@@ msgstr "Fehler beim Erzeugen einer \"Pi
msgid "error creating a stream for a pipe: %s\n"
msgstr "Fehler beim Erzeugen eines \"streams\" zu einer \"pipe\": %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "Das Warten auf die Beendigung von Prozessen schlug fehl: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, 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:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, c-format
msgid "error running '%s': terminated\n"
msgstr "Fehler bei Ausführung von `%s': beendet\n"
@@@ -981,28 -761,22 +981,28 @@@ msgstr "Fehler beim Holen des Exitwert
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "Kommunikationsproblem mit GPG-Agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "Vom Benutzer abgebrochen\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "Problem mit dem Agenten\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "Problem mit dem Agenten (unerwartete Antwort \"%s\")\n"
@@@ -1078,7 -837,6 +1078,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
@@@ -1314,7 -1018,6 +1314,7 @@@ msgstr "Keine Hilfe für '%s' vorhanden
msgid "ignoring garbage line"
msgstr "Zeile mit nicht identifizierten Zeichen wird ignoriert"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[keine]"
@@@ -1442,91 -1118,71 +1442,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII-Hülle: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "Ungültige ASCII-Hülle"
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "ASCII-Hülle: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "Ungültige Klartextsignatur-Einleitung\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "Unbekannter Header in der ASCII-Hülle: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "verschachtelte Klartextsignatur\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "Unerwartete ASCII-Hülle: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "Ungültiges \"radix64\" Zeichen %02x übersprungen\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "Falsch aufgebaute Prüfsumme\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Prüfsummenfehler; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "Fehler in der Nachsatzzeile\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "[ Nicht als Klartext darstellbar (%zu bytes: %s%s) ]"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1534,29 -1190,23 +1534,29 @@@ msgstr "
"Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
"enthalten und muß mit einem '=' enden\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
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:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
msgid "a notation name may not contain an '=' character\n"
msgstr "Ein \"notation\"-Wert darf das '='-Zeichen nicht verwenden\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
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:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
@@@ -1584,19 -1229,14 +1584,19 @@@ msgstr "Der Server '%s' is älter als w
msgid "WARNING: %s\n"
msgstr "WARNUNG: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP Karte Nr. %s erkannt\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
@@@ -1608,10 -1246,6 +1608,10 @@@ msgstr "Dieser Befehl ist nur für Kart
msgid "Reset Code not or not anymore available\n"
msgstr "Der Rückstellcode ist nicht vorhanden\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ihre Auswahl? "
@@@ -1674,84 -1294,63 +1674,85 @@@ 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: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "Fehler beim Schreiben von %s: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Logindaten (Kontenname): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Geheime DO-Daten: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Spracheinstellungen"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Fehler: ungültige Antwort.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "CA-Fingerabdruck: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "Schlüsseloperation nicht möglich: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "Keine gültige OpenPGP-Karte"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1763,60 -1362,48 +1764,60 @@@ msgstr "
" fehlschlagen, so ziehen Sie bitte die Dokumentation Ihrer Karte\n"
" zu Rate.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Welche Schlüssellänge wünschen Sie für den Signatur-Schlüssel? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr ""
"Welche Schlüssellänge wünschen Sie für den Verschlüsselungs-Schlüssel? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr ""
"Welche Schlüssellänge wünschen Sie für den Authentisierungs-Schlüssel? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "aufgerundet auf %u Bit\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s-Schlüssellängen müssen im Bereich %u-%u sein\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"Die Karte wird nun rekonfiguriert, um einen Schlüssel von %u Bit zu "
"erzeugen\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "Fehler bem Ändern der Länge des Schlüssels %d auf %u Bit: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
msgid "Note: keys are already stored on the card!\n"
msgstr "Hinweis: Auf der Karte sind bereits Schlüssel gespeichert!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1827,140 -1414,105 +1828,140 @@@ msgstr "
" PIN = '%s' Admin-PIN = '%s'\n"
"Sie sollten sie mittels des Befehls --change-pin ändern\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Signatur-Schlüssel\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Verschlüsselungs-Schlüssel\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) Authentisierungs-Schlüssel\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Ungültige Auswahl.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Das KEYTOCARD Kommando schlug fehl: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
msgid "This command is not supported by this card\n"
msgstr "Dieser Befehl wird von dieser Karte nicht unterstützt.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr ""
"Hinweis: Dieses Kommando zerstörrt alle auf der Karte gespeicherten "
"Schlüssel!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
msgid "Continue? (y/N) "
msgstr "Fortsetzen? (j/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
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:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "Menü verlassen"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "Zeige Admin-Befehle"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "Diese Hilfe zeigen"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "Alle vorhandenen Daten auflisten"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "Kartenbesitzernamen ändern"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "Schlüssel-holen-URL ändern"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "Holen des Schlüssels mittels der URL auf der Karte"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "Ändern der Logindaten"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "Ändern der Spracheinstellungen"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "Ändern des Geschlechts des Kartenbesitzers"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "Ändern des CA-Fingerabdrucks"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "neue Schlüssel erzeugen"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "Menü für Ändern oder Entsperren der PIN"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "überprüfe die PIN und liste alle Daten auf"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "die PIN mit dem Rückstellcode wieder freigeben"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr "alle Schlüssel und Daten löschen"
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "nur-Admin Befehl\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Admin-Befehle sind erlaubt\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "Admin-Befehle sind nicht erlaubt\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
@@@ -1968,27 -1519,18 +1969,27 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output funktioniert nicht bei diesem Befehl\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, c-format
msgid "key \"%s\" not found\n"
msgstr "Schlüssel \"%s\" nicht gefunden\n"
@@@ -2043,7 -1574,6 +2044,7 @@@ msgstr "
"Verwenden Sie zunächst den Befehl \"--delete-secret-key\", um ihn zu "
"entfernen.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@@ -2064,7 -1591,6 +2065,7 @@@ msgstr "benutze Cipher %s\n
msgid "'%s' already compressed\n"
msgstr "`%s' ist bereits komprimiert\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@@ -2082,7 -1606,6 +2083,7 @@@ msgstr "
"WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
"%s (%d) verletzt die Empfängervoreinstellungen\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2103,17 -1624,14 +2104,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s verschlüsselt für: %s\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s verschlüsselte Daten\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
@@@ -2184,316 -1689,248 +2185,327 @@@ 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:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "Exportiere auch Signaturen die als nicht exportfähig markiert sind"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "Exportiere Attribute von User-IDs (i.A. Foto-IDs)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "Exportiere Widerrufsschlüssel die als \"sensitiv\" markiert sind"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "Unbrauchbare Teile des Schlüssel während des Exports entfernen"
- #: g10/export.c:86
++#: g10/export.c:110
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:1144
++#: g10/export.c:1204
msgid " - skipped"
msgstr " - übersprungen"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, c-format
+ msgid "writing to '%s'\n"
+ msgstr "Schreiben nach '%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
msgid "exporting secret keys not allowed\n"
msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "WARNUNG: Nichts exportiert\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "Fehler beim Erstellen von `%s': %s\n"
- #: g10/getkey.c:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[User-ID nicht gefunden]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(Prüfe das Argument der Option '%s')\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, 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:541
++#: g10/getkey.c:546
#, c-format
msgid "error looking up: %s\n"
msgstr "Fehler beim Nachschlagen von: %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "`%s' automatisch via %s geholt\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "Fehler beim automatischen holen von `%s' über `%s': %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "Kein Fingerabdruck vorhanden"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "Geheimer Schlüssel \"%s\" nicht gefunden: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "Alle für '%s' angegebenen Werte wurden ignoriert\n"
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "Eine Signatur erzeugen"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "Eine Klartextsignatur erzeugen"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "Eine abgetrennte Signatur erzeugen"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "Daten verschlüsseln"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "Daten symmetrisch verschlüsseln"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "Daten entschlüsseln (Voreinstellung)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "Signatur prüfen"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "Liste der Schlüssel"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "Liste der Schlüssel und ihrer Signaturen"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "Signaturen der Schlüssel auflisten und prüfen"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "Liste der geheimen Schlüssel"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "Ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
msgid "quickly generate a new key pair"
msgstr "Schnell ein neues Schlüsselpaar erzeugen"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "quickly add a new user-id"
msgstr "Schnell eine neue User-ID anfügen"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ msgid "quickly revoke a user-id"
+ msgstr "Schnell eine User-ID widerrufen"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
msgid "quickly sign a key"
msgstr "Schlüssel schnell signieren"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
msgid "quickly sign a key locally"
msgstr "Schlüssel schnell nur für diesen Rechner signieren"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "Schlüssel signieren"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "Schlüssel nur für diesen Rechner signieren"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "Signieren oder bearbeiten eines Schlüssels"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "Die Passphrase ändern"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "Schlüssel exportieren"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "Schlüssel zu einem Schlü.server exportieren"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "Schlüssel von einem Schlü.server importieren"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "Schlüssel auf einem Schlü.server suchen"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "alle Schlüssel per Schlü.server aktualisieren"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "Schlüssel importieren/kombinieren"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "den Karten-Status ausgeben"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "Daten auf einer Karte ändern"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "PIN einer Karte ändern"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "Ändern der \"Trust\"-Datenbank"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "Hashwerte für die Dateien ausgeben"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "Im Server Modus ausführen"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "Ausgabe mit ASCII-Hülle versehen"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|Verschlüsseln für USER-ID"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "Textmodus benutzen"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|DATEI|Ausgabe auf DATEI schreiben"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "Keine wirklichen Änderungen durchführen"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "vor Überschreiben nachfragen"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "OpenPGP-Verhalten strikt beachten"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2502,7 -1939,6 +2514,7 @@@ msgstr "
"(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
"Optionen)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2522,11 -1958,9 +2534,11 @@@ msgstr "
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2536,7 -1970,6 +2548,7 @@@ msgstr "
"Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
"Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2544,74 -1977,59 +2556,74 @@@ msgstr "
"\n"
"Unterstützte Verfahren:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Öff. Schlüssel: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Verschlü.: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Komprimierung: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "Aufruf: %s [Optionen] %s\n"
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2619,20 -2037,17 +2631,20 @@@ msgstr "
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, 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:1560
#, 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:1563
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2640,503 -2055,396 +2652,508 @@@ msgstr "
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
"Konfigurationsdatei '%s'\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, 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:1773
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
msgid "show key usage information during key listings"
msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
msgid "show policy URLs during signature listings"
msgstr "Richtlinien-URL mit den Signaturen anlisten"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "Alle Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "Standard Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "Benutzer-Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
msgid "show preferred keyserver URLs during signature listings"
msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
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:1898
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:1900
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:1902
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:1904
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
msgid "available TOFU policies:\n"
msgstr "Vorhandene TOFU Regeln:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "Unbekanntes TOFU DB Format '%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
- #: g10/gpg.c:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
"Die Bibliothek \"libgcrypt\" ist zu alt (benötigt wird %s, vorhanden ist "
"%s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "Ungültiger Subjekt-Name '%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "`%s' ist kein gültiger Zeichensatz\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "Ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ungültige Import-Option\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "Ungültige Import-Option\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "Ungültige Filter-Option: %s\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ungültige Export-Option.\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "Ungültige Export-Option\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ungültige Listen-Option.\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "Ungültige Listen-Option\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "Foto-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "Alle Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
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:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
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:3068
++#: g10/gpg.c:3122
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:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
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:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "Ungültige Überprüfungs-Option\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, 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:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed müssen größer als 0 sein\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed müssen größer als 1 sein\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "ungültige Standard-Voreinstellungen\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "ungültige private Hashvoreinstellungen\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "ungültige private Komprimierungsvoreinstellungen\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [Dateiname]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [Dateiname]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
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:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [Dateiname]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
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:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd User-ID"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "Schlüsselexport fehlgeschlagen: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "Ungültiges Hashverfahren '%s'\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, 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:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[Dateiname]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@@ -3177,125 -2477,105 +3194,133 @@@ msgstr "Keine Hilfe vorhanden.
msgid "No help available for '%s'"
msgstr "Keine Hilfe für '%s' vorhanden."
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "Importiere Signaturen, die als nicht exportfähig markiert sind"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "Beseitige Beschädigung durch den Schlüsselserver während des Imports"
- #: g10/import.c:110
++#: g10/import.c:140
msgid "do not clear the ownertrust values during import"
msgstr "die \"Ownertrust\" Werte beim Import nicht löschen"
- #: g10/import.c:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "ändern Sie die \"Trust\"-Datenbank nach dem Import nicht"
- #: g10/import.c:116
++#: g10/import.c:146
+ msgid "show key during import"
+ msgstr "Schlüssel beim Import anzeigen"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "Nur Änderungen bereits existierender Schlüssel vornehmen"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "entferne nach dem Import unbrauchbare Teile des Schlüssels"
- #: g10/import.c:122
++#: g10/import.c:155
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:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr "Import-Filter anwenden und Schlüssel direkt exportieren"
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "überspringe den Block vom Typ %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu Schlüssel bislang bearbeitet\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ignorierte PGP-2 Schlüssel: %lu\n"
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorierte neue Schlüssel: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ohne User-ID: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importiert: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " unverändert: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " neue User-IDs: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " neue Unterschlüssel: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " neue Signaturen: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " neue Schlüsselwiderrufe: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gelesene geheime Schlüssel: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " geheime Schlüssel importiert: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " unveränderte geh. Schl.: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nicht importiert: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " Signaturen bereinigt: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " User-IDs bereinigt: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3304,197 -2584,153 +3329,191 @@@ msgstr "
"WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
"Verfahren für folgende User-ID:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": Einstellungen der Hashmethode %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
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:893
++#: g10/import.c:1069
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:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "Schlüssel %s: Keine User-ID\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, c-format
msgid "key %s: %s\n"
msgstr "Schlüssel %s: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr "vom Import-Aufpasser zurückgewiesen"
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, 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:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr "Schreiben nach '%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, 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:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "Schlüssel %s: geheimer Schlüssel bereits vorhanden\n"
- #: g10/import.c:1578
++#: g10/import.c:1866
#, 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:1683
++#: g10/import.c:1971
#, c-format
msgid "secret key %s: %s\n"
msgstr "Geheimer Schlüssel %s: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3511,146 -2747,119 +3530,146 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, 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:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
@@@ -3685,27 -2888,22 +3704,27 @@@ msgstr "Schlüsselblockhilfsmittel`%s'
msgid "error opening key DB: %s\n"
msgstr "Fehler beim Öffnen der Schlüsseldatenbank: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[Widerruf]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[Eigenbeglaubigung]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr ""
"Die Signatur mit den nicht unterstützten Public-Key-Verfahren (%d) kann "
"nicht geprüft werden: %s\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@@ -3713,44 -2911,37 +3732,44 @@@ msgstr "
"Die Signatur mit der nicht unterstützten Hashmethode (%d) kann nicht\n"
"geprüft werden: %s.\n"
- #: g10/keyedit.c:786
++#: g10/keyedit.c:789
msgid " (reordered signatures follow)"
msgstr " (neu geordnete Signaturen folgen)"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, c-format
msgid "key %s:\n"
msgstr "Schlüssel %s:\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
msgstr[0] "%d Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
msgstr[1] "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\n"
- #: g10/keyedit.c:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, c-format
msgid "%d bad signature\n"
msgid_plural "%d bad signatures\n"
msgstr[0] "%d falsche Beglaubigung\n"
msgstr[1] "%d falsche Beglaubigungen\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, 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:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3759,7 -2950,6 +3778,7 @@@ 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:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3772,17 -2962,14 +3791,17 @@@ msgstr "
"unterschiedlichen Quellen ...)?\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Ich vertraue ihm marginal\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Ich vertraue ihm vollständig\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3792,52 -2979,40 +3811,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:1018
++#: g10/keyedit.c:1021
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:1146
++#: g10/keyedit.c:1149
#, 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:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User-ID \"%s\" ist widerrufen."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Beglaubigen ist nicht möglich.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User-ID \"%s\" ist abgelaufen."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "User-ID \"%s\" ist signierbar."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Wirklich signieren? (j/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3846,11 -3021,9 +3865,11 @@@ msgstr "
"Die Eigenbeglaubigung von \"%s\"\n"
"ist eine PGP 2.x artige Signatur.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3859,13 -3032,11 +3878,13 @@@ msgstr "
"Ihre derzeitige Beglaubigung von \"%s\"\n"
"ist abgelaufen.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3874,44 -3045,35 +3893,44 @@@ msgstr "
"Die derzeitige Beglaubigung von \"%s\"\n"
"ist nur für diesen Rechner gültig.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" wurde bereits durch Schlüssel %s beglaubigt\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nichts zu beglaubigen für Schlüssel %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Dieser Schlüssel ist verfallen!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Dieser Schlüssel wird %s verfallen.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3921,32 -3083,26 +3940,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:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ich antworte nicht.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, 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:1470
++#: g10/keyedit.c:1473
#, 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:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
msgid "Your selection? (enter '?' for more information): "
msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3955,227 -3111,173 +3974,227 @@@ msgstr "
"Sind Sie wirklich sicher, daß Sie vorstehenden Schlüssel mit Ihrem\n"
"Schlüssel \"%s\" (%s) beglaubigen wollen\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
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:1527
++#: g10/keyedit.c:1530
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:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "Die Signatur wird als nicht-exportfähig markiert werden.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "Die Signatur wird als unwiderrufbar markiert werden.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "Ich habe diesen Schlüssel überhaupt nicht überprüft.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "Ich habe diesen Schlüssel flüchtig überprüft.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Wirklich signieren? (j/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "Beglaubigung fehlgeschlagen: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
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:1741
++#: g10/keyedit.c:1744
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "Schlüssel %s: Fehler beim Ändern der Passphrase: %s\n"
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "speichern und Menü verlassen"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "Fingerabdruck des Schlüssels anzeigen"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
msgid "show the keygrip"
msgstr "\"Keygrip\" des Schlüssels anzeigen"
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "Schlüssel und User-IDs auflisten"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "User-ID N auswählen"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "Unterschlüssel N auswählen"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "Signaturen prüfen"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
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:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "Die ausgewählte User-ID nur für diesen Rechner beglaubigen"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "Die ausgewählte User-ID mit einer \"Trust\"-Signatur beglaubigen"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr "die ausgewählten User-IDs unwiderrufbar beglaubigen"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "Eine User-ID hinzufügen"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "Eine Foto-ID hinzufügen"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "ausgewählte User-IDs entfernen"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "einen Unterschlüssel hinzufügen"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "der Smartcard einen Schlüssel hinzufügen"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "einen Schlüssel auf die Smartcard schieben"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "eine Sicherungskopie des Schlüssels auf die Smartcard schieben"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "ausgewählte Unterschlüssel entfernen"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "Einen Widerrufschlüssel hinzufügen"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
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:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "User-ID als Haupt-User-ID kennzeichnen"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "Liste der Voreinstellungen (für Experten)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "Liste der Voreinstellungen (ausführlich)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "ändern der Voreinstellungsliste der ausgewählten User-IDs"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
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:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "Eine Notation für die ausgewählten User-IDs setzen"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "Die Passphrase ändern"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "Den \"Ownertrust\" ändern"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "Ausgewählte User-ID widerrufen"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "Schlüssel anschalten"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "Schlüssel abschalten"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "ausgewählte Foto-IDs anzeigen"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
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:1936
++#: g10/keyedit.c:1939
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:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Geheimer Schlüssel ist vorhanden.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4188,254 -3290,200 +4207,259 @@@ msgstr "
"Signaturen\n"
" (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Schlüssel wurde widerrufen."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
msgid "Really sign all text user IDs? (y/N) "
msgstr "Wirklich alle textbasierten User-IDs beglaubigen? (j/N) "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
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:2271
++#: g10/keyedit.c:2274
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Unbekannter Signaturtyp `%s'\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Benutze den '%s' Befehl.)\n"
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
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:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "Befehl benötigt einen Dateinamen als Argument\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
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:2503
++#: g10/keyedit.c:2506
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:2541
++#: g10/keyedit.c:2544
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:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "Diese User-ID wirklich widerrufen? (j/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
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:2571
++#: g10/keyedit.c:2574
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:2573
++#: g10/keyedit.c:2576
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:2631
++#: g10/keyedit.c:2634
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:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Setze die Liste der Voreinstellungen auf:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
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:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Änderungen speichern? (j/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Beenden ohne zu speichern? (j/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "Änderung fehlgeschlagen: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
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:2963
++#: g10/keyedit.c:3025
+ #, c-format
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Widerufen der User-ID fehlgeschlagen: %s\n"
+
++#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" ist kein Fingerabdruck\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, c-format
msgid "Invalid user ID '%s': %s\n"
msgstr "Ungültige User-ID '%s': %s\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "No matching user IDs."
msgstr "Keine passende User-ID"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "Nothing to sign.\n"
msgstr "Nichts zu beglaubigen\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Eigenschaften: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Keyserver no-modify"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Bevorzugter Schlüsselserver:"
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "\"Notationen\": "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Dieser Schlüssel kann von %s-Schlüssel %s widerrufen werden"
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(empfindlich)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "erzeugt: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "widerrufen: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "verfallen: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "verfällt: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "Aufruf: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "Kartennummer:"
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "Vertrauen: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "Gültigkeit: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4443,18 -3491,13 +4467,18 @@@ msgstr "
"Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
"Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "widerrufen"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "verfallen"
# translated by wk
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4462,15 -3505,12 +4486,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "WARNUNG: Ihr Unterschlüssel zum Verschlüsseln wird bald verfallen.\n"
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4480,72 -3520,57 +4504,72 @@@ msgstr "
"könnte\n"
" bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
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:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, 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:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Nichts entfernt.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "ungültig"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "User-ID \"%s\": %d Signatur entfernt\n"
msgstr[1] "User-ID \"%s\": %d Signaturen entfernt\n"
- #: g10/keyedit.c:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "User-ID \"%s\": bereits minimiert\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User-ID \"%s\": bereits sauber\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4555,202 -3580,164 +4579,207 @@@ msgstr "
" Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
" des Schlüssels führen.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
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:4632
++#: g10/keyedit.c:4739
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:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, 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:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Bitte genau eine User-ID auswählen.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Geben Sie die \"Notation\" ein: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "Fortfahren (j/N)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Keine User-ID mit Index %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Keine User-ID mit Hash %s\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "Kein Unterschlüssel mit Index %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "User-ID: \"%s\"\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (nicht-exportierbar)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Diese Signatur ist seit %s verfallen.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "Nicht von Ihnen signiert.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (unwiderrufbar)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "Kein geheimer Schlüssel\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr "Versuch eine nicht-User-ID zu widerrufen: %s\n"
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User-ID \"%s\" ist bereits widerrufen\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Schlüssel %s ist bereits widerrufen\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Unterschlüssel %s ist bereits widerrufen\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5184,13 -4093,10 +5213,13 @@@ msgstr "
"unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
"tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5201,62 -4107,49 +5230,62 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr "Fortsetzen? (J/n) "
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
msgid "Create anyway? (y/N) "
msgstr "Trotzdem erzeugen? (j/N) "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
msgid "creating anyway\n"
msgstr "wird trotzdem erzeugt\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, 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:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Schlüsselerzeugung abgebrochen.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, c-format
msgid "writing public key to '%s'\n"
msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5265,7 -4158,6 +5294,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5273,7 -4165,6 +5302,7 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
"stimmen nicht überein)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5281,99 -4172,74 +5310,94 @@@ msgstr "
"Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
"Uhren stimmen nicht überein)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Wirklich erzeugen? (j/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "niemals "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Entscheidende Beglaubigungsrichtlinie: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Beglaubigungsrichtlinie: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Entscheidender bevorzugter Schlüsselserver"
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Entscheidender Beglaubigungs-\"Notation\": "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Beglaubigungs-\"Notation\": "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, 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:484
++#: g10/keylist.c:485
#, c-format
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
msgstr[0] "%d Beglaubigung aufgrund eines Fehlers nicht geprüft\n"
msgstr[1] "%d Beglaubigungen aufgrund von Fehlern nicht geprüft\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] "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:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Schlüsselbund"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Haupt-Fingerabdruck ="
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr "Unter-Fingerabdruck ="
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Haupt-Fingerabdruck ="
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Unter-Fingerabdruck ="
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Schl.-Fingerabdruck ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " Kartenseriennr. ="
@@@ -5437,294 -4291,237 +5461,299 @@@ msgstr "
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:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "abgeschaltet"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "%d Schlüssel wird per %s aktualisiert\n"
msgstr[1] "%d Schlüssel werden per %s aktualisiert\n"
- #: g10/keyserver.c:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, 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:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, 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:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "fordere Schlüssel %s von %s an\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
msgid "no keyserver known\n"
msgstr "Kein Schlüsselserver bekannt\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "übersprungen \"%s\": %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "sende Schlüssel %s auf %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, c-format
msgid "requesting key from '%s'\n"
msgstr "fordere Schlüssel von %s an\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s verschlüsselter Sitzungsschlüssel\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "Öffentlicher Schlüssel ist %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
# [kw]
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Verschlüsselt mit %lu Passphrases\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "Verschlüsselt mit einer Passphrase\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "vermutlich %s-verschlüsselte Daten\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr ""
"WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "Entschlüsselung erfolgreich\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "WARNUNG: Verschlüsselte Botschaft ist manipuliert worden!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "Entschlüsselung fehlgeschlagen: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr ""
"Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Ursprünglicher Dateiname='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"Einzelner Widerruf - verwenden Sie \"gpg --import\", um ihn anzuwenden\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "Keine Signatur gefunden\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FALSCHE Signatur von \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Verfallene Signatur von \"%s\""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekte Signatur von \"%s\""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "Signaturüberprüfung unterdrückt\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur vom %s\n"
- #: g10/mainproc.c:1723
++#: 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:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Schlüssel erhältlich bei: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[ungewiß] "
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Diese Signatur ist seit %s verfallen.\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Diese Signatur verfällt am %s.\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s Signatur, Hashmethode %s%s%s\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "Binäre"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "Textmodus"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "unbekannt"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
msgid ", key algorithm "
msgstr ", Schlüsselverfahren "
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, 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:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Signatur kann nicht geprüft werden: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "keine abgetrennte Signatur\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "Einzelne Signatur der Klasse 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "Signatur nach alter (PGP 2.x) Art\n"
@@@ -5902,7 -4665,6 +5931,7 @@@ msgstr "
"WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
"Sitzungsschlüssel\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@@ -6283,46 -4977,37 +6312,46 @@@ msgstr "
" Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
"Besitzer gehört.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: übersprungen: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "Verschlüsseln an '%s' ist nicht möglich\n"
- #: g10/pkclist.c:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Derzeitige Empfänger:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6330,38 -5015,30 +6359,38 @@@ msgstr "
"\n"
"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Keine solche User-ID vorhanden.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "übersprungen: öffentlicher Schlüssel bereits gesetzt\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "Keine gültigen Adressaten\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, 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:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@@ -6371,28 -5047,22 +6400,28 @@@ msgid "data not saved; use option \"--o
msgstr ""
"Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Abgetrennte Beglaubigungen.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Bitte geben Sie den Namen der Datendatei ein: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "lese stdin ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "keine signierten Daten\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "kann signierte Datei '%s' nicht öffnen.\n"
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
@@@ -6653,7 -5278,6 +6682,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "Öffentlicher Schlüssel %s ist %lu Tag jünger als die Signatur\n"
msgstr[1] "Öffentlicher Schlüssel %s ist %lu Tage jünger als die Signatur\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6733,12 -5348,10 +6762,12 @@@ msgstr "
"WARNUNG: URL für bevorzugten Schlüsselserver kann nicht %%-erweitert werden "
"(zu groß). Verwende \"unerweiterte\".\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s Signatur von: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6746,11 -5359,9 +6775,11 @@@ msgstr "
"WARNUNG: Erzwingen des Hashverfahrens %s (%d) verstößt gegen die "
"Empfängervoreinstellungen\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "signiere:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s Verschlüsselung wird verwendet\n"
@@@ -6826,131 -5423,104 +6855,131 @@@ msgstr "Lesefehler in `%s': %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
msgstr "'%s' kann nicht gesperrt werden\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "trustdb Transaktion zu groß\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: Verzeichnis existiert nicht!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "kann auf `%s' nicht zugreifen: %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ungültige trust-db erzeugt\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trust-db erzeugt\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
msgstr "Hinweis: Die \"trustdb\" ist nicht schreibbar\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ungültige 'Trust'-Datenbank\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek fehlgeschlagen: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: keine trustdb Datei\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: version record with recnum %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: invalid file version %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: konnte Satz nicht anhängen: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "Fehler: Die Vertrauensdatenbank ist fehlerhaft\n"
@@@ -7343,7 -5851,6 +7372,7 @@@ msgstr "verwende Vertrauensmodell %s\n
msgid "no need for a trustdb check\n"
msgstr "\"Trust-DB\"-Überprüfung nicht nötig\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nächste \"Trust-DB\"-Pflichtüberprüfung am %s\n"
@@@ -7358,7 -5863,6 +7387,7 @@@ msgstr "\"Trust-DB\"-Überprüfung ist
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "\"Trust-DB\"-Änderung ist beim `%s'-Vertrauensmodell nicht nötig\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "Öffentlicher Schlüssel %s nicht gefunden: %s\n"
@@@ -7371,7 -5873,6 +7400,7 @@@ msgstr "Bitte ein --check-trustdb durch
msgid "checking the trustdb\n"
msgstr "\"Trust-DB\" wird überprüft\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
@@@ -7379,23 -5880,19 +7408,23 @@@ msgstr[0] "%d Schlüssel bislang bearbe
msgstr[1] "%d Schlüssel bislang bearbeitet"
# translated by wk
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] " (%d Validity Zähler gelöscht)\n"
msgstr[1] " (%d Validity Zähler gelöscht)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "keine ultimativ vertrauenswürdigen Schlüssel gefunden\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "öff. Schlüssel des ultimativ vertrauten Schlüssel %s nicht gefunden\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7403,7 -5900,6 +7432,7 @@@ msgstr "
"Tiefe: %d gültig: %3d signiert: %3d Vertrauen: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7855,11 -6256,9 +7884,11 @@@ msgstr "Verweigere die Benutzung von \"
msgid "use variable length input for pinpad"
msgstr "Variable Längeneingabe für die Kartenlesertastatur benutzen"
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Gebrauch: @SCDAEMON@ [Optionen] (-h für Hilfe)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7867,18 -6266,15 +7896,18 @@@ msgstr "
"Syntax: @SCDAEMON@ [Optionen] [Befehl [Argumente]]\n"
"Smartcard Daemon für @GNUPG@\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
"auszuführen\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "Handhabungsroutine für fd %d gestartet\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "Handhabungsroutine für den fd %d beendet\n"
@@@ -7888,7 -6283,6 +7917,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "Ungültiges Basis-64 Zeichen %02X wurde übersprungen\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
msgstr "Der Dirmngr läuft nicht für diese Session\n"
@@@ -9743,8 -7750,6 +9772,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "Gültige Debugebenen sind: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, c-format
msgid "usage: %s [options] "
msgstr "Aufruf: %s [Optionen] "
@@@ -9753,12 -7757,10 +9782,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
@@@ -10236,76 -8136,60 +10265,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:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr "LDAP Server fehlt"
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr "Seriennummer fehlt in der Cert-ID"
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url() fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, c-format
msgid "error sending data: %s\n"
msgstr "Fehler beim Senden der Daten: %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert fehlgeschlagen: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d überschritten\n"
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "Fehler beim Initialisieren des Servers: %s\n"
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept Problem: %s\n"
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@@ -10440,7 -8294,6 +10469,7 @@@ msgstr "unbekannter Befehl `%s'\n
msgid "sending line failed: %s\n"
msgstr "Senden der Zeile schlug fehl: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "Fehler beim Senden der Standardoptionen: %s\n"
@@@ -10687,15 -8479,12 +10716,15 @@@ msgstr "
"Syntax: @GPGCONF@ {Optionen]\n"
"Verwalte Konfigurationsoptionen für Programme des @GNUPG@ Systems\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Benötige ein Komponentenargument"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Komponente nicht gefunden"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "Argumente sind nicht erlaubt"
diff --cc po/el.po
index 9eb2aa1,0160ccb..ada9887
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -403,10 -317,6 +403,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "���������"
@@@ -515,11 -400,6 +515,11 @@@ msgstr "��� �������������
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "��������� �� ���������� ��� <gnupg-bugs at gnu.org>\n"
@@@ -535,55 -413,38 +535,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "��������: �� �������������� ������ �������� `%s'\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "������ �������� `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "�������� �������� ��� `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "�������� ����������� ��� %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -593,28 -453,22 +593,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
@@@ -642,7 -490,6 +642,7 @@@ msgstr "trustdb: read ������� (n=%d): %
msgid "can't use '%s' as home directory\n"
msgstr "%s: �������� ����������� ���������: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@@ -667,18 -510,14 +667,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "� ��������� �������� �������: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ������������: %s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
@@@ -694,8 -531,6 +694,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -703,9 -538,6 +703,9 @@@ msgstr "
"@�������:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -942,29 -731,22 +942,29 @@@ msgstr "������ ��� ���������� ��� �����
msgid "error creating a stream for a pipe: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@@ -979,32 -759,26 +979,32 @@@ msgstr "�������� �������� �������� ����
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "�������� �������� ��� `%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "�������� ������������ �� �� gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "��������� ��� �� ������\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
@@@ -1080,7 -839,6 +1080,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
@@@ -1342,7 -1046,6 +1342,7 @@@ msgstr "��� ������� ��������� ������� �
msgid "ignoring garbage line"
msgstr "������ ��� ������ trailer\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "�������"
@@@ -1482,95 -1158,75 +1482,95 @@@ msgstr "�� ������� ������ %08lX ��� ���
msgid "waiting for lock %s...\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "��������: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "�� ������ ����������� ���������: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "����������� ���������: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "�� ������ ����������� clearsig\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "����������� ���������: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "����������� �� ���������������� ���������\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "�� ����������� ��������:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "�� ������ dash escaped ������: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "�� ������� radix64 ���������� %02x ���������\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "������ ����� ������� (������� CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "������ ����� ������� (����� CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "����� ����� CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "������ CRC: %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "������ ����� ������� (��� �railer)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "������ ��� ������ trailer\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "�� �������� ������ OpenPGP ��������.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"�����������, �� ����������, ���������� ��� �������� - ���� ����� ����� "
"������������� MTA\n"
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "�� ����������"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1578,25 -1234,20 +1578,25 @@@ msgstr "
"��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
"��� �� ����� �� ��� '='\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
#, fuzzy
msgid "a notation name may not contain an '=' character\n"
msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1606,7 -1257,6 +1606,7 @@@ msgstr "
"��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
"��� �� ����� �� ��� '='\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "�������������: �������� �� ������ �������� ���������\n"
@@@ -1636,19 -1281,14 +1636,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "�� ������� ������ ��� ����� ���������"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
@@@ -1663,10 -1301,6 +1663,10 @@@ msgstr "���� � ������ ����������� �� ��
msgid "Reset Code not or not anymore available\n"
msgstr "������� ��� �������� �������� ��� ����� ���������\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "� ������� ���; "
@@@ -1733,148 -1353,115 +1733,149 @@@ msgstr "������ ��������� ������� ������
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "����������� ��������"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "������: �� ������ ���������\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "���������� ��� fingerprint"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "������: �� ������ ���������\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "� ���������� �������� �������: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "�� �������� ������ OpenPGP ��������.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "�������� �������� �������� ����������� `%s': %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "�� ������� �������� �� ������; (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "�� ������� �������� �� ������; (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "�� ������� �������� �� ������; (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "����������������� ��� �� %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1882,155 -1469,120 +1883,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (��� ������������� ����)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "�� ������ �������.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "������� �� ���������; "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "����������� ����� ��� �����"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "������������� �������\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "���������� ����� ��� ��������"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "������ ��������� ���: "
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "������ ��� ����������� �����"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "������ ��� ������������ ���������"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "���������� ��� fingerprint"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "������������� �������\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "������������� �������\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "�� ������ ������ (��������� \"help\")\n"
@@@ -2038,28 -1589,19 +2039,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output ��� ���������� ��� ���� ��� ������\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "�� ������ '%s' �� �������: %s\n"
@@@ -2117,7 -1648,6 +2118,7 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@@ -2137,7 -1664,6 +2138,7 @@@ msgstr "����� ��� ���������������: %s\n
msgid "'%s' already compressed\n"
msgstr "`%s' ��� �����������\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2157,7 -1681,6 +2158,7 @@@ msgstr "
"� ������������ ����������� ���������� %s (%d) ���������� ���\n"
"�������� ��� ���������\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2178,17 -1699,14 +2179,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s ��������������� ���: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s ��������������� ��������\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "��������������� �� ������� ��������� %d\n"
@@@ -2261,7 -1766,6 +2262,7 @@@ msgstr "�������������: �������� �������
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
- #: g10/export.c:78
++#: g10/export.c:102
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
@@@ -2269,338 -1773,274 +2270,352 @@@
"� �������� �� ��������� ��� ��-�����������.\n"
"\n"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "�� ��������������� ������� ������"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ������������: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "������� ��� `%s'\n"
+
++#: g10/export.c:1660
+ #, fuzzy, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr ""
+ "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
+
++#: g10/export.c:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, fuzzy, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "������ %08lX: ������ ����� PGP 2.x - ������������\n"
- #: g10/export.c:1490
- #, fuzzy, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr ""
- "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "�������������: ��� ����� ������ �������\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[User id ��� �������]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "������ ���� �� ���������� ��� `%s': %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "���������� ��� fingerprint"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, fuzzy, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "���������� ���� �� ������������� ���������"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[������]|���������� ���� �� ���������������� ���������"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "���������� ���� �� ������������� ���������"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "������������� ���������"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "������������� �� ����� ���� ����������� ����������"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "���������������� ��������� (��������������)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "���������� ���� ���������"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "���������� ��� ������ ��������"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "���������� ��� ������ �������� ��� ���������"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "������� ��������� ��������"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "���������� ��� ������ �������� ��������"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "���������� ���� ���� ������� ��������"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "���������� ���� �������������� ���������"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "�������� ��� �������� ��� �� ������� ����������"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "�������� ���� ��������"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "�������� ���� �������� ������"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "�������� ���� ��������"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "�������� ���� �������� ������"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "�������� � ����������� ���� ��������"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "������ ��� ������ ������"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "������� ��������"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "������� �������� �� ��� ���������� ��������"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "�������� �������� ��� ��� ���������� ��������"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "��������� �������� �� ��� ���������� ��������"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "��������/���������� ��������"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "�������� ��� ����� ��������� ������������"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|����� [������]| ���������� ���������� ��� ���������"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "���������� ascii ������������ ������"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|�����|������������� ��� �����"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|���������� �������� ��������� N (0 �������������)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "����� ��������� ���������� ��������"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|������|������� ��� ���������� ��������� ������"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "�� �� ����� ������ ������"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "������� ���� ��� ���������"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2608,7 -2048,6 +2623,7 @@@ msgstr "
"@\n"
"(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2628,13 -2067,11 +2643,13 @@@ msgstr "
" --list-keys [�������] ���������� ��������\n"
" --fingerprint [�������] ���������� ������������ (fingerprints)\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2649,7 -2086,6 +2664,7 @@@ msgstr "
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2657,608 -2093,483 +2672,613 @@@ msgstr "
"\n"
"��������������� ����������:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "�����������:"
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "���������������: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "��������: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "�����: gpg [��������] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "������������� �������\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, fuzzy, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1524
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1527
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1530
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1536
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1539
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1542
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1548
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1551
#, 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:1554
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1560
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1563
#, 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:1566
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1773
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "������� ����������� ��������� \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, fuzzy
msgid "show key usage information during key listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, fuzzy
msgid "show all notations during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "������������� ��� ������"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, fuzzy, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "�� ������� �������� ���������\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�������� ������� ��� exec-path �� %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"� ����������� ���������� ��������� ��� �����������\n"
"��� ����� �������\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
- #: g10/gpg.c:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "�� ������� �����������\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "�� ������� ����������� ���������� ���������������\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, fuzzy, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3642
++#: g10/gpg.c:3715
#, fuzzy, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3647
++#: g10/gpg.c:3720
#, fuzzy, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"�������������: ������� ���������� (-r) ����� ����� ��������������\n"
"�������� ��������\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [����� �������]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [����� �������]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "���������������� �������: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [����� �������]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [����� �������]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [����� �������]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [����� �������]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [����� �������]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [�������]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver ���� �������: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "������� �������� �������: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "������� �������� �������: %s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver ��������� �������: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "����������� �������: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�������� �������: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[����� �������]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@@ -3303,326 -2606,262 +3323,328 @@@ msgstr "��� ������� ��������� �������
msgid "No help available for '%s'"
msgstr "��� ������� ��������� ������� ��� `%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "�������� ��� ����� ��������� ������������"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "�������� ��� ����� ��������� ������������"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "���������� ��� fingerprint"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "�� ��������������� ������� ������"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "��������� �������� ��� ����� %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu ������� ����� ����� ���� ������������\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "��������� ������� ��� ��������������: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " ��� ������� ��� �������������: %lu\n"
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ��� ������� ��� �������������: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ����� user ID: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " ����������: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " ����������: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ��� user ID: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " ��� ����������: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " ���� ���������: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " ���� ���������� ��������: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " ����������� ������� �������: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " ���������� ������� �������: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " ���������� ������� �������: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " �� ����������: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " ���� ���������: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " ����������� ������� �������: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s ��������, ���������� ��������� %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "������������ `%s': %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, fuzzy, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
- #: g10/import.c:1045
++#: g10/import.c:1292
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "������ %08lX: ��� ���� ������ user ID\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "������ %08lX: ��� ������ - ������������\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "��� ������� ��������� ����������: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "������� ��� `%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "�������� �������� ��� ����������� `%s': %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, fuzzy, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
- #: g10/import.c:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, fuzzy, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
- #: g10/import.c:1201
++#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "������ %08lX: \"%s\" ����������\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "������ %08lX: ������� ������ ���������\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "������������: ������� ������ ��� �����\n"
- #: g10/import.c:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "�� ������� ������ `%s' �� �������: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
@@@ -3637,147 -2876,120 +3659,147 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, fuzzy, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
"���������\n"
- #: g10/import.c:1897
++#: g10/import.c:2182
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"������ %08lX: �� ��������������� ���������� �������� �������� ��� user id "
"\"%s\"\n"
- #: g10/import.c:2025
++#: g10/import.c:2310
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
- #: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "������ %08lX: �� ������ �������� �����������\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "������ %08lX: ������������ user ID '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "������ %08lX: ������������ ���������\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, fuzzy, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
- #: g10/import.c:2244
++#: g10/import.c:2527
#, fuzzy, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr ""
"������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
- #: g10/import.c:2262
++#: g10/import.c:2545
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, fuzzy, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr ""
"������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
- #: g10/import.c:2284
++#: g10/import.c:2567
#, fuzzy, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
- #: g10/import.c:2413
++#: g10/import.c:2696
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� "
"%08lX\n"
- #: g10/import.c:2493
++#: g10/import.c:2776
#, fuzzy, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr ""
"�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
"��� ����� �����.\n"
- #: g10/import.c:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "������ %08lX: ����� �������� �������� ����������\n"
@@@ -3814,48 -3020,39 +3836,48 @@@ msgstr "������ ���� �� ���������� ��� `
msgid "error opening key DB: %s\n"
msgstr "������ ���� ��� �������� ��� `%s': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "�������� ������������ ��� cache �����������: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[revocation]"
msgstr "[��������]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[����-��������]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, fuzzy, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
msgstr "%s ��������, ���������� ��������� %s\n"
- #: g10/keyedit.c:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "���� �������� ��� \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "������������ `%s': %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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,7 -3060,6 +3885,7 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 �������� ��� ��������� ���� ������� ��������\n"
msgstr[1] "1 �������� ��� ��������� ���� ������� ��������\n"
- #: g10/keyedit.c:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3871,21 -3067,18 +3893,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d ����� ���������\n"
msgstr[1] "%d ����� ���������\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "���� �������� ��� \""
msgstr[1] "���� �������� ��� \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3898,68 -3091,53 +3920,68 @@@ msgstr "
"�� �������� passports ��� fingerprints ��� �������� �����...);\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = ��� ������ �����������\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = ��� ����� �����������\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "�� user ID \"%s\" ����������."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "������� ������ ����� �� �� ����������; (y/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " �������� ���������.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "�� user ID \"%s\" ���� �����."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "������� �� ���������; "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3968,11 -3146,9 +3990,11 @@@ msgstr "
"� ����-�������� ��� \"%s\"\n"
"����� ��� �������� ����� PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3981,12 -3157,10 +4003,12 @@@ msgstr "
"� ������������ �������� ��� ��� \"%s\"\n"
"���� �����.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr ""
"������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3995,43 -3169,34 +4017,43 @@@ msgstr "
"� ������������ �������� ��� ��� \"%s\"\n"
"����� ��� ������ ��������.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
#, fuzzy, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "������� ������ ����� �� �� ��������������; (y/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "������ ��� �� ��������� �� �� ������ %08lX\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "���� �� ������ ���� �����!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "������ � ���������� �� ����� ����������; (Y/n) "
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4041,32 -3206,26 +4063,32 @@@ msgstr "
"������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
"�������\"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) ��� ������.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) ��� ��� ������� �������.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) ��� ����� ��� ������ ������.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) ��� ����� ���������� ������.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "� ������� ���; (�������������� ? ��� �����������): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4075,21 -3234,18 +4097,21 @@@ msgstr "
"������� ������ �� ���������� ���� �� ������\n"
"�� �� ������ ���: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"���� �� ����� ��� ����-��������.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, fuzzy
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr ""
"\n"
"�������������: � �������� �� �� ��������� ��� ��-���������.\n"
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
#, fuzzy
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr ""
@@@ -4097,14 -3253,12 +4119,14 @@@
"�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
"\n"
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"� �������� �� ��������� ��� ��-���������.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
@@@ -4112,233 -3266,184 +4134,233 @@@
"� �������� �� ��������� ��� ��-�����������.\n"
"\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"��� ��� ������� ������� ���� �� ������.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"��� ����� ����������� ������ �� ���� �� ������.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"��� ������� ���� ���������� ���� �� ������.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "������� �� ���������; "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "������ ��� ���������� ��� ������ ������: %s\n"
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "���������� ��� ������"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "���������� ��� fingerprint"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "�������� ���������: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "���������� ��� �������� ��� ��� user ID"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "������� user ID N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "������� user ID N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "�������� ���������"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "�������� ��� �������� ������"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "��������: �������� �� user ID ��� ��������\n"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "�������� ���� user ID"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "�������� ���� photo ID"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "�������� ���� user ID"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "�������� ���� ������������� ��������"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "�������� ���� �������� ���������"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "�������� ��� user ID ��� ��������"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "���������� ����������� (�������)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "���������� �������� (���������)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "������ ��� ������ ������"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "������ ��� ������������ ���������"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "�������� ���� user ID"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "�������� ���� ������������� ��������"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "����������� ��� ������"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "������������� ��� ������"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "���������� photo ID"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "�� ������� ������ ����� ���������.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4346,274 -3451,221 +4368,280 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "�� ������ ����������."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "������� �� ���������� ��� �� user ID; "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "������� �� ���������� ��� �� user ID; "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "��������: �������� �� user ID ��� ��������\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "������� ����� ���������"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "������ �� ��������� �� �������� ��� user ID.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "������� ������ �� ��������� ���� �� user ID; "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "������ �� ��������� ����������� ��� ������.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "�������� ����������� ��� ����������� `%s': %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "������ �� ��������� ����������� ��� ������.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "������� ������ �� ��������� ���� �� user ID; "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "������� ������ �� ���������� �� ���������� �������; "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "������� ����������� ��������"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "������� �� ���������� �� �����������;"
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "���������� ��� �������; "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "����������� ����� ����������; "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "� ��������� �������: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "� ���������� �������� �������: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "������: �� ������ ���������\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "�� ������ ����\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "��� ������� ���� �� user ID.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "������ ��� �� ��������� �� �� ������ %08lX\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "��������: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "����������: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "��������: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (���������)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "�������� ����������� ��� %s: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[����������]"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [�����: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [�����: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " �����������: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " �����������: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "���� �� ������ ���� ���������������"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4621,19 -3673,14 +4649,19 @@@ msgstr "
"� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
"����� ��� ��� �������������� �� ���������.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[����������]"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4641,17 -3688,14 +4669,17 @@@ msgstr "
"�������������: ��� ���� ��������� ID ������ ��� ��������. ���� � ������\n"
" ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4660,35 -3704,27 +4688,35 @@@ msgstr "
"�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
" ������ �� ����� ������� �������� PGP �� �� ����������.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "������� ����� ������ �� �� ����������; (y/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4696,38 -3732,31 +4724,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "����������� %d ��������.\n"
msgstr[1] "����������� %d ��������.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "������ ��� �����������.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
#, fuzzy
msgid "invalid"
msgstr "�� ������ ��������"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "�� user ID \"%s\" ����������."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4737,38 -3766,31 +4765,38 @@@ msgstr "
" ������������ �������� ������ �� ����� ������� �������� PGP\n"
" �� �� ����������.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr ""
"��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "�������������� �� user ID ��� ����������� ��������: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
"�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
- #: g10/keyedit.c:4535
++#: g10/keyedit.c:4642
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
"�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr ""
"�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
"���������!\n"
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
#, fuzzy
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4776,7 -3798,6 +4804,7 @@@ msgstr "
"����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
"N): "
- #: g10/keyedit.c:4632
++#: g10/keyedit.c:4739
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4785,165 -3806,135 +4813,170 @@@ msgstr "
"����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
"N): "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
msgid "You can't change the expiration date of a v3 key\n"
msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
- #: g10/keyedit.c:4864
++#: g10/keyedit.c:4971
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr ""
"�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
"������������\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "������ �� ��������� ������� ��� user ID.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "������� ������ ����� �� �� ���������������; (y/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "������� ������ ����� �� �� ���������������; (y/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "�������� ���������: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "��������� (y/N); "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "��� ������� user ID �� ������ %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " ����������� ��� %08lX ���� %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (��-���������)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "���� � �������� ����� ���� %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "������� ������ �� ��������� ���� �� ������; "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " ����������� ��� %08lX ���� %s%s\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "����� ��������� ���� �� user ID:\n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (��-���������)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " ���������� ��� %08lX ���� %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "��������� �� ����������� ����� ��� ���������:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "������ ������� ������\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "�� user ID \"%s\" ���� ��� ���������\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5394,13 -4307,10 +5427,13 @@@ msgstr "
"���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
"��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "� ���������� �������� �������: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5408,66 -4318,53 +5441,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' ��� �����������\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "����� ���������� ����� ��� ��������; "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
msgid "creating anyway\n"
msgstr "���������� ���� ���� ������� ��������"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "� ���������� �������� ����������.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "�� ������� ��������� ������� ����������: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5478,7 -4375,6 +5511,7 @@@ msgstr "
"�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
"��� ���������� ������ ��� ���� �� ����.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5486,7 -4382,6 +5519,7 @@@ msgstr "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5494,7 -4389,6 +5527,7 @@@ msgstr "
"�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
"����� �������� ��� �����)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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"
@@@ -5502,45 -4396,35 +5535,45 @@@ msgstr "
"��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
"�� �� OpenPGP\n"
- #: g10/keygen.c:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "������� �� ������������; "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "���� "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "�������� �������� ���������: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "�������� ���������: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "�������� �������� ���������: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "�������� ���������: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5548,7 -4432,6 +5581,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d ����� ���������\n"
msgstr[1] "%d ����� ���������\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5556,46 -4439,33 +5589,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 �������� ��� ��������� ���� ���� ���������\n"
msgstr[1] "1 �������� ��� ��������� ���� ���� ���������\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "����������"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "��������� �������� ��������:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " ��������� �����������:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " ��������� �������� ��������:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " ��������� �����������:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " ��������� �������� ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5660,301 -4518,244 +5688,306 @@@ msgstr "�� URL ��������� ��������� ���
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, fuzzy, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "�� ������ '%s' �� �������: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "������������ `%s': %s\n"
+
++#: g10/keyserver.c:1823
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"����������� �� �� ������ ��� %08lX ���� %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "������ �������� %08lX ��� �� %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s ������ ���������������� ��������\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "��������������� �� ������� ��������� %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "������� ������ ����� %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ������ ��� \""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "��������������� �� %s key, ID %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "������������� �� ������� ������ �������: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "��������������� �� %lu ������� �������\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "��������������� �� 1 ����� ������\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "������� %s ���������������� ���������\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
"��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
"%s ��������\n"
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "���������������� OK\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "���������������� �������: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "������ ����� �������='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "������� �������� ��� \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "���� �������� ��� \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "��������� ��������� ���������\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "�������� ��������� ����� ��� ��������� ���������\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ������ ��� \""
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "������ ��������� ���: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[�������]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ������ ��� \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "�������� ����� ���� %s.\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "�������"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "���������-��������"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "�������"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "�������� ���������� �������� ��������"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "�������� ������� ��� ���������: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "��� ����� ���������� ��������\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "���������� �������� ������ 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "�������� ������ ���� (PGP 2.x)\n"
@@@ -6134,7 -4901,6 +6167,7 @@@ msgstr "�������� ��������� ��� ��������
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
@@@ -6510,46 -5208,37 +6543,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ������������: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
- #: g10/pkclist.c:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6557,38 -5246,30 +6590,38 @@@ msgstr "
"\n"
"�������������� �� user ID. ����� �� ��� ����� ������: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "��� ������� ���� �� user ID.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr ""
"������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "�� ������� ������ ���� ���������������.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "������������: ������� ������ ���� ��� �������\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "�������� ��������������� ���������� `%s'\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "������ ������ ���������\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
@@@ -6597,29 -5277,23 +6630,29 @@@
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "���������� ��������.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "�������� �� ����� ������� ���������: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "�������� ��� stdin ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "��� �������� ������������� ��������\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "�������� ��������� �������������� ��������� `%s'\n"
@@@ -6876,7 -5505,6 +6909,7 @@@ msgstr[0] "
msgstr[1] ""
"�� ������� ������ %08lX ����� %lu ������������ ������� ��� ��� ��������\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6950,12 -5569,10 +6983,12 @@@ msgstr "
"�������������: �������� ��� %%-�������� ��� url ��������� (���� ������).\n"
" ����� �� ������������.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s �������� ���: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6963,11 -5580,9 +6996,11 @@@ msgstr "
"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
"����������� ��� ���������\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "��������:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s ������������� �� ��������������\n"
@@@ -7047,133 -5648,106 +7080,133 @@@ msgstr "������ ���������: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync �������: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: g10/tdbio.c:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: �������� lseek: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "���� ������ ��������� trustdb\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: � ������� ��� �������!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: �������� ����������� ���� �������� �������: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ������������� �� ������ trustdb\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: ������������� � trustdb\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "��������: � trustdb ��� ����� ���������\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: �� ������ trustdb\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: �������� ����������� hashtable: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: ������� lseek: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read ������� (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ��� ����� trustdb ������\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: ������� ������� �� recnum %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: �� ������ ������ ������� %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: ������������� � trustdb\n"
@@@ -7534,7 -6046,6 +7567,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
@@@ -7549,7 -6058,6 +7582,7 @@@ msgstr "��� ������� ������ ��� ������ �
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "�� ������� ������ %08lX ��� �������: %s\n"
@@@ -7562,14 -6068,12 +7595,14 @@@ msgstr "�������� ����� ��� --check-trus
msgid "checking the trustdb\n"
msgstr "������� ��� trustdb\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu ������� ����� ����� ���� ������������\n"
msgstr[1] "%lu ������� ����� ����� ���� ������������\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7577,23 -6081,19 +7610,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d ������� �������������� (%d ��������� ����������� �������)\n"
msgstr[1] "%d ������� �������������� (%d ��������� ����������� �������)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "�� �������� ������� ������������ �������\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@@ -8056,27 -6461,22 +8089,27 @@@ msgstr "������������� �������\n
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8086,7 -6485,6 +8119,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "�� ������� radix64 ���������� %02x ���������\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
@@@ -9964,8 -7975,6 +9997,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "�����: gpg [��������] "
@@@ -9976,12 -7984,10 +10009,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "�������� �������: %s\n"
@@@ -10476,77 -8380,61 +10509,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "�������� block �������� �������: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: �������� ����������� hashtable: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "�������� ������������ ��� cache �����������: %s\n"
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10686,7 -8544,6 +10719,7 @@@ msgstr "�������� ��������������� ������
msgid "sending line failed: %s\n"
msgstr "� �������� �������: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "������ ��� �������� ���� �� `%s': %s\n"
@@@ -10939,16 -8735,13 +10972,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "��� ������� �� ������� ������"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "������� ��� �������� �������� ��� `%s'\n"
diff --cc po/en at boldquot.po
index 300bec9,0000000..997f6ee
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,10608 -1,0 +1,10637 @@@
+# 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.13\n"
++"Project-Id-Version: GNU gnupg 2.1.14\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-06-16 17:27+0200\n"
- "PO-Revision-Date: 2016-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"PO-Revision-Date: 2016-07-14 16:03+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c:257
+#, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "failed to acquire the pinentry lock: %s\n"
+
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries. An underscore indicates that the next letter
+#. should be used as an accelerator. Double the underscore for
+#. a literal one. The actual to be translated text starts after
+#. the second vertical bar. Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
+#: agent/call-pinentry.c:447
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:448
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:449
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:450
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:451
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:452
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: agent/call-pinentry.c:453
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Do you really want to make your passphrase visible on the screen?"
+
+#: agent/call-pinentry.c:455
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: agent/call-pinentry.c:456
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "|pinentry-tt|Hide passphrase"
+
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:736
+msgid "Quality:"
+msgstr "Quality:"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar. Please use an appropriate
+#. string to describe what this is about. The length of the
+#. tooltip is limited to about 900 characters. If you do not
+#. translate this entry, a default english text (see source)
+#. will be used.
+#: agent/call-pinentry.c:758
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: agent/call-pinentry.c:868
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+
+#: agent/call-pinentry.c:871
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
+#: agent/protect-tool.c:721 tools/symcryptrun.c:443
+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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
+#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
+#, 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:1268
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/divert-scd.c:93 g10/call-agent.c:1269
+msgid "Please remove the current card and insert the one with serial number"
+msgstr "Please remove the current card and insert the one with serial number"
+
+#: agent/divert-scd.c:204
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:209
+msgid "PUK"
+msgstr "PUK"
+
+#: agent/divert-scd.c:216
+msgid "Reset Code"
+msgstr "Reset Code"
+
+#: agent/divert-scd.c:242
+#, c-format
+msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgstr "%s%%0A%%0AUse the reader's pinpad for input."
+
+#: agent/divert-scd.c:291
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
+#: agent/divert-scd.c:293
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
+#: agent/divert-scd.c:294
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
+#: agent/divert-scd.c:299
+msgid "Reset Code not correctly repeated; try again"
+msgstr "Reset Code not correctly repeated; try again"
+
+#: agent/divert-scd.c:301
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
+#: agent/divert-scd.c:302
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
+#: agent/divert-scd.c:314
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "Please enter the PIN%s%s%s to unlock the card"
+
+#: agent/genkey.c:110 sm/certreqgen-ui.c:394
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creating temporary file: %s\n"
+
+#: agent/genkey.c:117
+#, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "error writing to temporary file: %s\n"
+
+#: agent/genkey.c:158 agent/genkey.c:164
+msgid "Enter new passphrase"
+msgstr "Enter new passphrase"
+
+#: agent/genkey.c:172
+msgid "Take this one anyway"
+msgstr "Take this one anyway"
+
+#: agent/genkey.c:202
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+
+#: agent/genkey.c:204
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+
+#: agent/genkey.c:216
+msgid "Yes, protection is not needed"
+msgstr "Yes, protection is not needed"
+
+#: agent/genkey.c:233
+#, c-format
+msgid "A passphrase should be at least %u character long."
+msgid_plural "A passphrase should be at least %u characters long."
+msgstr[0] "A passphrase should be at least %u character long."
+msgstr[1] "A passphrase should be at least %u characters long."
+
+#: agent/genkey.c:252
+#, c-format
+msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
+msgid_plural ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+msgstr[0] ""
+"A passphrase should contain at least %u digit or%%0Aspecial character."
+msgstr[1] ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+
+#: agent/genkey.c:278
+#, c-format
+msgid "A passphrase may not be a known term or match%%0Acertain pattern."
+msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
+
+#: agent/genkey.c:293
+msgid "Warning: You have entered an insecure passphrase."
+msgstr "Warning: You have entered an insecure passphrase."
+
+#: agent/genkey.c:480
+#, c-format
+msgid "Please enter the passphrase to%0Aprotect your new key"
+msgstr "Please enter the passphrase to%0Aprotect your new key"
+
+#: agent/genkey.c:606
+msgid "Please enter the new passphrase"
+msgstr "Please enter the new passphrase"
+
+#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
+#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
+#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
+msgid "verbose"
+msgstr "verbose"
+
+#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
+#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
+#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
+#: 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: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: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:167
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
+#: 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:170
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
+#: 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:177
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
+#: agent/gpg-agent.c:181
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
+#: agent/gpg-agent.c:197
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
+#: 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:202
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
+#: 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:218
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
+#: 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:223
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
+#: agent/gpg-agent.c:225
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
+#: 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:230
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
+msgid "Please report bugs to <@EMAIL@>.\n"
+msgstr "Please report bugs to <@EMAIL@>.\n"
+
+#: 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: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:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
+#, c-format
+msgid "%s is too old (need %s, have %s)\n"
+msgstr "%s is too old (need %s, have %s)\n"
+
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘[1m%s[0m’\n"
+
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
+#, c-format
+msgid "Note: '%s' is not considered an option\n"
+msgstr "Note: ‘[1m%s[0m’ is not considered an option\n"
+
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘[1m%s[0m’ is too long\n"
+
+#: agent/gpg-agent.c:1844
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "a gpg-agent is already running - not starting a new one\n"
+
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
+#, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "can't set permissions of '%s': %s\n"
+
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘[1m%s[0m’\n"
+
+#: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
+#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
+#, c-format
+msgid "can't create directory '%s': %s\n"
+msgstr "can't create directory '%s': %s\n"
+
+#: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘[1m%s[0m’ created\n"
+
+#: agent/gpg-agent.c:1954
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
+#: agent/gpg-agent.c:1958
+#, c-format
+msgid "can't use '%s' as home directory\n"
+msgstr "can't use ‘[1m%s[0m’ as home directory\n"
+
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
+#: agent/gpg-agent.c:2307
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
+#: agent/gpg-agent.c:2312
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
+#: agent/gpg-agent.c:2385
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr "ssh handler 0x%lx for fd %d started\n"
+
+#: agent/gpg-agent.c:2390
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr "ssh handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
+msgid "no gpg-agent running in this session\n"
+msgstr "no gpg-agent running in this session\n"
+
+#: agent/preset-passphrase.c:99
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+
+#: agent/preset-passphrase.c:102
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: agent/protect-tool.c:154
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
+
+#: agent/protect-tool.c:156
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]\n"
+"Secret key maintenance tool\n"
+msgstr ""
+"Syntax: gpg-protect-tool [options] [args]\n"
+"Secret key maintenance tool\n"
+
+#: agent/protect-tool.c:700
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
+
+#: agent/protect-tool.c:705
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Please enter the passphrase to protect the new PKCS#12 object."
+
+#: agent/protect-tool.c:711
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+
+#: agent/protect-tool.c:716
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+
+#: agent/protect-tool.c:727 tools/symcryptrun.c:454
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
+#: agent/protect-tool.c:729 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:362 dirmngr/dirmngr.c:1579
+#, c-format
+msgid "error opening '%s': %s\n"
+msgstr "error opening '%s': %s\n"
+
+#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#, c-format
+msgid "file '%s', line %d: %s\n"
+msgstr "file '%s', line %d: %s\n"
+
+#: agent/trustlist.c:192 agent/trustlist.c:200
+#, c-format
+msgid "statement \"%s\" ignored in '%s', line %d\n"
+msgstr "statement “[1m%s[0m” ignored in '%s', line %d\n"
+
+#: agent/trustlist.c:206
+#, c-format
+msgid "system trustlist '%s' not available\n"
+msgstr "system trustlist ‘[1m%s[0m’ not available\n"
+
+#: agent/trustlist.c:250
+#, c-format
+msgid "bad fingerprint in '%s', line %d\n"
+msgstr "bad fingerprint in '%s', line %d\n"
+
+#: agent/trustlist.c:275 agent/trustlist.c:282
+#, c-format
+msgid "invalid keyflag in '%s', line %d\n"
+msgstr "invalid keyflag in '%s', line %d\n"
+
+#: agent/trustlist.c:316 common/helpfile.c:136
+#, c-format
+msgid "error reading '%s', line %d: %s\n"
+msgstr "error reading '%s', line %d: %s\n"
+
+#: agent/trustlist.c:434 agent/trustlist.c:503
+msgid "error reading list of trusted root certificates\n"
+msgstr "error reading list of trusted root certificates\n"
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break. The double
+#. percent sign is actually needed because it is also
+#. a printf format string. If you need to insert a
+#. plain % sign, you need to encode it as "%%25". The
+#. "%s" gets replaced by the name as stored in the
+#. certificate.
+#: agent/trustlist.c:664
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
+"Do you ultimately trust%%0A “[1m%s[0m”%%0Ato correctly certify user "
+"certificates?"
+
+#: agent/trustlist.c:673 common/audit.c:467
+msgid "Yes"
+msgstr "Yes"
+
+#: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
+#: common/audit.c:469
+msgid "No"
+msgstr "No"
+
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:707
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+"Please verify that the certificate identified as:%%0A “[1m%s[0m”%%0Ahas the "
+"fingerprint:%%0A %s"
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:721
+msgid "Correct"
+msgstr "Correct"
+
+#: agent/trustlist.c:721
+msgid "Wrong"
+msgstr "Wrong"
+
+#: agent/findkey.c:252
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr "Note: This passphrase has never been changed.%0APlease change it now."
+
+#: agent/findkey.c:268
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
+"it now."
+msgstr ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
+"it now."
+
+#: agent/findkey.c:282 agent/findkey.c:289
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
+#: agent/findkey.c:290
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
+#: agent/findkey.c:1429
+#, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
+"%%0A?"
+msgstr ""
+"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
+"%%0A?"
+
+#: agent/findkey.c:1453 agent/findkey.c:1467
+msgid "Delete key"
+msgstr "Delete key"
+
+#: agent/findkey.c:1464
+msgid ""
+"Warning: This key is also listed for use with SSH!\n"
+"Deleting the key might remove your ability to access remote machines."
+msgstr ""
+"Warning: This key is also listed for use with SSH!\n"
+"Deleting the key might remove your ability to access remote machines."
+
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+msgid "DSA requires the hash length to be a multiple of 8 bits\n"
+msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
+
+#: agent/pksign.c:187 sm/certcheck.c:97
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr "%s key uses an unsafe (%u bit) hash\n"
+
+#: agent/pksign.c:204
+#, c-format
+msgid "a %zu bit hash is not valid for a %u bit %s key\n"
+msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
+
+#: agent/pksign.c:512
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "checking created signature failed: %s\n"
+
+#: agent/cvt-openpgp.c:338
+msgid "secret key parts are not available\n"
+msgstr "secret key parts are not available\n"
+
+#: agent/cvt-openpgp.c:344
+#, c-format
+msgid "public key algorithm %d (%s) is not supported\n"
+msgstr "public key algorithm %d (%s) is not supported\n"
+
+#: agent/cvt-openpgp.c:448
+#, c-format
+msgid "protection algorithm %d (%s) is not supported\n"
+msgstr "protection algorithm %d (%s) is not supported\n"
+
+#: agent/cvt-openpgp.c:455
+#, c-format
+msgid "protection hash algorithm %d (%s) is not supported\n"
+msgstr "protection hash algorithm %d (%s) is not supported\n"
+
+#: common/exechelp-posix.c:361 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
+#, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "error creating a pipe: %s\n"
+
+#: common/exechelp-posix.c:374 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
+#, c-format
+msgid "error creating a stream for a pipe: %s\n"
+msgstr "error creating a stream for a pipe: %s\n"
+
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
+#, c-format
+msgid "error forking process: %s\n"
+msgstr "error forking process: %s\n"
+
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
+#, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "waiting for processes to terminate failed: %s\n"
+
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
+#, c-format
+msgid "error running '%s': probably not installed\n"
+msgstr "error running '%s': probably not installed\n"
+
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
+#, c-format
+msgid "error running '%s': exit status %d\n"
+msgstr "error running '%s': exit status %d\n"
+
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
+#, c-format
+msgid "error running '%s': terminated\n"
+msgstr "error running '%s': terminated\n"
+
+#: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
+#, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "error getting exit code of process %d: %s\n"
+
+#: common/exechelp-w32ce.c:767
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr "waiting for process %d to terminate failed: %s\n"
+
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
+#, c-format
+msgid "can't connect to '%s': %s\n"
+msgstr "can't connect to '%s': %s\n"
+
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
+msgid "communication problem with gpg-agent\n"
+msgstr "communication problem with gpg-agent\n"
+
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
+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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
+msgid "canceled by user\n"
+msgstr "canceled by user\n"
+
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
+msgid "problem with the agent\n"
+msgstr "problem with the agent\n"
+
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
+#, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problem with the agent (unexpected response “[1m%s[0m”)\n"
+
+#: common/sysutils.c:124
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "can't disable core dumps: %s\n"
+
+#: common/sysutils.c:219
+#, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Warning: unsafe ownership on %s “[1m%s[0m”\n"
+
+#: common/sysutils.c:251
+#, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Warning: unsafe permissions on %s “[1m%s[0m”\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:45 common/yesno.c:82
+msgid "yes"
+msgstr "yes"
+
+#: common/yesno.c:46 common/yesno.c:87
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:48 common/yesno.c:84
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:49 common/yesno.c:88
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:86
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:89
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:123
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:125
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:126
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:127
+msgid "cC"
+msgstr "cC"
+
+#: common/miscellaneous.c:86
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr "out of core in secure memory while allocating %lu bytes"
+
+#: common/miscellaneous.c:89
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr "out of core while allocating %lu bytes"
+
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error allocating enough memory: %s\n"
+
+#: common/miscellaneous.c:143
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: obsolete option “[1m%s[0m” - it has no effect\n"
+
+#: common/miscellaneous.c:146
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "WARNING: “[1m%s%s[0m” is an obsolete option - it has no effect\n"
+
+#: common/miscellaneous.c:490
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr "unknown debug flag ‘[1m%s[0m’ ignored\n"
+
+#: common/asshelp.c:417
+#, c-format
+msgid "no running gpg-agent - starting '%s'\n"
+msgstr "no running gpg-agent - starting ‘[1m%s[0m’\n"
+
+#: common/asshelp.c:477
+#, c-format
+msgid "waiting for the agent to come up ... (%ds)\n"
+msgstr "waiting for the agent to come up ... (%ds)\n"
+
+#: common/asshelp.c:485
+msgid "connection to agent established\n"
+msgstr "connection to agent established\n"
+
+#: common/asshelp.c:525
+msgid "connection to agent is in restricted mode\n"
+msgstr "connection to agent is in restricted mode\n"
+
+#: common/asshelp.c:606
+#, c-format
+msgid "no running Dirmngr - starting '%s'\n"
+msgstr "no running Dirmngr - starting ‘[1m%s[0m’\n"
+
+#: common/asshelp.c:663
+#, c-format
+msgid "waiting for the dirmngr to come up ... (%ds)\n"
+msgstr "waiting for the dirmngr to come up ... (%ds)\n"
+
+#: common/asshelp.c:672
+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
++#: common/gettime.c:893
+msgid "[none]"
+msgstr "[none]"
+
+#: common/argparse.c:365
+msgid "argument not expected"
+msgstr "argument not expected"
+
+#: common/argparse.c:367
+msgid "read error"
+msgstr "read error"
+
+#: common/argparse.c:369
+msgid "keyword too long"
+msgstr "keyword too long"
+
+#: common/argparse.c:371
+msgid "missing argument"
+msgstr "missing argument"
+
+#: common/argparse.c:373
+msgid "invalid argument"
+msgstr "invalid argument"
+
+#: common/argparse.c:375
+msgid "invalid command"
+msgstr "invalid command"
+
+#: common/argparse.c:377
+msgid "invalid alias definition"
+msgstr "invalid alias definition"
+
+#: common/argparse.c:379
+msgid "out of core"
+msgstr "out of core"
+
+#: common/argparse.c:381
+msgid "invalid option"
+msgstr "invalid option"
+
+#: common/argparse.c:389
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr "missing argument for option “[1m%.50s[0m”\n"
+
+#: common/argparse.c:391
+#, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "invalid argument for option “[1m%.50s[0m”\n"
+
+#: common/argparse.c:393
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr "option “[1m%.50s[0m” does not expect an argument\n"
+
+#: common/argparse.c:395
+#, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "invalid command “[1m%.50s[0m”\n"
+
+#: common/argparse.c:397
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr "option “[1m%.50s[0m” is ambiguous\n"
+
+#: common/argparse.c:399
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr "command “[1m%.50s[0m” is ambiguous\n"
+
+#: common/argparse.c:401 dirmngr/dirmngr.c:1234
+msgid "out of core\n"
+msgstr "out of core\n"
+
+#: common/argparse.c:403
+#, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "invalid option “[1m%.50s[0m”\n"
+
+#: common/utf8conv.c:123
+#, c-format
+msgid "conversion from '%s' to '%s' not available\n"
+msgstr "conversion from ‘[1m%s[0m’ to ‘[1m%s[0m’ not available\n"
+
+#: common/utf8conv.c:131
+#, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "iconv_open failed: %s\n"
+
+#: common/utf8conv.c:385 common/utf8conv.c:651
+#, c-format
+msgid "conversion from '%s' to '%s' failed: %s\n"
+msgstr "conversion from ‘[1m%s[0m’ to ‘[1m%s[0m’ failed: %s\n"
+
+#: common/dotlock.c:707
+#, c-format
+msgid "failed to create temporary file '%s': %s\n"
+msgstr "failed to create temporary file '%s': %s\n"
+
+#: common/dotlock.c:771
+#, c-format
+msgid "error writing to '%s': %s\n"
+msgstr "error writing to '%s': %s\n"
+
+#: common/dotlock.c:1116
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr "removing stale lockfile (created by %d)\n"
+
+#: common/dotlock.c:1152
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "waiting for lock (held by %d%s) %s...\n"
+
+#: common/dotlock.c:1153
+msgid "(deadlock?) "
+msgstr "(deadlock?) "
+
+#: common/dotlock.c:1192
+#, c-format
+msgid "lock '%s' not made: %s\n"
+msgstr "lock ‘[1m%s[0m’ not made: %s\n"
+
+#: common/dotlock.c:1219
+#, c-format
+msgid "waiting for lock %s...\n"
+msgstr "waiting for lock %s...\n"
+
- #: g10/armor.c:417
++#: g10/armor.c:424
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
- #: g10/armor.c:456
++#: g10/armor.c:463
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
- #: g10/armor.c:467
++#: g10/armor.c:474
+msgid "armor header: "
+msgstr "armor header: "
+
- #: g10/armor.c:480
++#: g10/armor.c:487
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
- #: g10/armor.c:493
++#: g10/armor.c:500
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
- #: g10/armor.c:546
++#: g10/armor.c:553
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
- #: g10/armor.c:681
++#: g10/armor.c:688
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
- #: g10/armor.c:694
++#: g10/armor.c:701
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
- #: g10/armor.c:909
++#: g10/armor.c:916
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
- #: g10/armor.c:943
++#: g10/armor.c:950
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
- #: g10/armor.c:951
++#: g10/armor.c:958
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
- #: g10/armor.c:975
++#: g10/armor.c:982
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
- #: g10/armor.c:979
++#: g10/armor.c:986
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
- #: g10/armor.c:1296
++#: g10/armor.c:1303
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
- #: g10/armor.c:1301
++#: g10/armor.c:1308
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
- #: g10/armor.c:1305
++#: g10/armor.c:1312
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
+#, c-format
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "[ not human readable (%zu bytes: %s%s) ]"
+
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"a notation name must have only printable characters or spaces, and end with "
+"an ‘[1m=[0m’\n"
+
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
+msgid "a user notation name must contain the '@' character\n"
+msgstr "a user notation name must contain the ‘[1m@[0m’ character\n"
+
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "a notation name must not contain more than one ‘[1m@[0m’ character\n"
+
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
+msgid "a notation value must not use any control characters\n"
+msgstr "a notation value must not use any control characters\n"
+
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
+msgid "a notation name may not contain an '=' character\n"
+msgstr "a notation name may not contain an ‘[1m=[0m’ character\n"
+
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr "a notation name must have only printable characters or spaces\n"
+
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
+msgid "WARNING: invalid notation data found\n"
+msgstr "WARNING: invalid notation data found\n"
+
+#: g10/call-agent.c:151 sm/call-agent.c:199
+#, c-format
+msgid "failed to proxy %s inquiry to client\n"
+msgstr "failed to proxy %s inquiry to client\n"
+
+#: g10/call-agent.c:176
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
+#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
+#, c-format
+msgid "error getting version from '%s': %s\n"
+msgstr "error getting version from '%s': %s\n"
+
+#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
+#, c-format
+msgid "server '%s' is older than us (%s < %s)"
+msgstr "server ‘[1m%s[0m’ is older than us (%s < %s)"
+
+#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+#, c-format
+msgid "WARNING: %s\n"
+msgstr "WARNING: %s\n"
+
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
+#, c-format
+msgid "OpenPGP card not available: %s\n"
+msgstr "OpenPGP card not available: %s\n"
+
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
+#, c-format
+msgid "OpenPGP card no. %s detected\n"
+msgstr "OpenPGP card no. %s detected\n"
+
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
+msgid "can't do this in batch mode\n"
+msgstr "can't do this in batch mode\n"
+
+#: g10/card-util.c:107
+msgid "This command is only available for version 2 cards\n"
+msgstr "This command is only available for version 2 cards\n"
+
+#: g10/card-util.c:109 scd/app-openpgp.c:2259
+msgid "Reset Code not or not anymore available\n"
+msgstr "Reset Code not or not anymore available\n"
+
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
+msgid "Your selection? "
+msgstr "Your selection? "
+
+#: g10/card-util.c:279 g10/card-util.c:330
+msgid "[not set]"
+msgstr "[not set]"
+
+#: g10/card-util.c:533
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:534
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:534
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:561
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:561
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:636
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:638
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “[1m<[0m” character may not be used.\n"
+
+#: g10/card-util.c:640
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:657
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:659
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:677
+#, c-format
+msgid "Error: Combined name too long (limit is %d characters).\n"
+msgstr "Error: Combined name too long (limit is %d characters).\n"
+
+#: g10/card-util.c:698
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:706
+#, c-format
+msgid "Error: URL too long (limit is %d characters).\n"
+msgstr "Error: URL too long (limit is %d characters).\n"
+
- #: g10/card-util.c: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
+#, c-format
+msgid "error reading '%s': %s\n"
+msgstr "error reading '%s': %s\n"
+
- #: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
- #: g10/card-util.c:871
++#: g10/card-util.c:861
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
- #: g10/card-util.c:881
++#: g10/card-util.c:871
+#, c-format
+msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "Error: Login data too long (limit is %d characters).\n"
+
- #: g10/card-util.c:917
++#: g10/card-util.c:907
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
- #: g10/card-util.c:927
++#: g10/card-util.c:917
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "Error: Private DO too long (limit is %d characters).\n"
+
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
+msgid ""
+"Note: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+"Note: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
+
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
+#, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "What keysize do you want for the Signature key? (%u) "
+
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
+#, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "What keysize do you want for the Encryption key? (%u) "
+
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
+#, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "What keysize do you want for the Authentication key? (%u) "
+
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rounded up to %u bits\n"
+
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s keysizes must be in the range %u-%u\n"
+
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr "The card will now be re-configured to generate a key of %u bits\n"
+
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
+#, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "error changing size of key %d to %u bits: %s\n"
+
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
+#, c-format
+msgid ""
+"Please note that the factory settings of the PINs are\n"
+" PIN = '%s' Admin PIN = '%s'\n"
+"You should change them using the command --change-pin\n"
+msgstr ""
+"Please note that the factory settings of the PINs are\n"
+" PIN = ‘[1m%s[0m’ Admin PIN = ‘[1m%s[0m’\n"
+"You should change them using the command --change-pin\n"
+
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
+msgid "Note: This command destroys all keys stored on the card!\n"
+msgstr "Note: This command destroys all keys stored on the card!\n"
+
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “[1myes[0m”) "
+
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
+msgid "quit this menu"
+msgstr "quit this menu"
+
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
+msgid "show admin commands"
+msgstr "show admin commands"
+
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
+msgid "show this help"
+msgstr "show this help"
+
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
+msgid "list all available data"
+msgstr "list all available data"
+
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
+msgid "change the login name"
+msgstr "change the login name"
+
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
+msgid "generate new keys"
+msgstr "generate new keys"
+
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “[1mhelp[0m”)\n"
+
+#: g10/decrypt.c:191 g10/encrypt.c:956
+msgid "--output doesn't work for this command\n"
+msgstr "--output doesn't work for this command\n"
+
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘[1m%s[0m’\n"
+
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “[1m%s[0m” not found: %s\n"
+
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
+#, c-format
+msgid "key \"%s\" not found\n"
+msgstr "key “[1m%s[0m” not found\n"
+
+#: g10/delkey.c:129 g10/delkey.c:136
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(unless you specify the key by fingerprint)\n"
+
+#: g10/delkey.c:135
+msgid "can't do this in batch mode without \"--yes\"\n"
+msgstr "can't do this in batch mode without “[1m--yes[0m”\n"
+
+#: g10/delkey.c:148
+msgid "Delete this key from the keyring? (y/N) "
+msgstr "Delete this key from the keyring? (y/N) "
+
+#: g10/delkey.c:158
+msgid "This is a secret key! - really delete? (y/N) "
+msgstr "This is a secret key! - really delete? (y/N) "
+
+#: g10/delkey.c:201
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
+#: g10/delkey.c:203
+msgid "key"
+msgstr "key"
+
+#: g10/delkey.c:203
+msgid "subkey"
+msgstr "subkey"
+
+#: g10/delkey.c:226
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
+#: g10/delkey.c:239
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
+#: g10/delkey.c:275
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "there is a secret key for public key “[1m%s[0m”!\n"
+
+#: g10/delkey.c:277
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "use option “[1m--delete-secret-keys[0m” to delete it first.\n"
+
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: 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:254
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: 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:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘[1m%s[0m’ is an empty file\n"
+
+#: g10/encrypt.c:558
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘[1m%s[0m’\n"
+
+#: 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:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
+#, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+
+#: g10/encrypt.c:818
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
+#: g10/encrypt.c:904
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “[1m%s[0m”\n"
+
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
+#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "encrypted with unknown algorithm %d\n"
+
+#: g10/decrypt-data.c:164 sm/decrypt.c:127
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+
+#: g10/decrypt-data.c:176
+msgid "problem handling encrypted packet\n"
+msgstr "problem handling encrypted packet\n"
+
+#: g10/exec.c:60
+msgid "no remote program execution supported\n"
+msgstr "no remote program execution supported\n"
+
+#: g10/exec.c:319
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"external program calls are disabled due to unsafe options file permissions\n"
+
+#: g10/exec.c:349
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr ""
+"this platform requires temporary files when calling external programs\n"
+
+#: g10/exec.c:427
+#, c-format
+msgid "unable to execute program '%s': %s\n"
+msgstr "unable to execute program '%s': %s\n"
+
+#: g10/exec.c:430
+#, c-format
+msgid "unable to execute shell '%s': %s\n"
+msgstr "unable to execute shell '%s': %s\n"
+
+#: g10/exec.c:521
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "system error while calling external program: %s\n"
+
+#: g10/exec.c:532 g10/exec.c:599
+msgid "unnatural exit of external program\n"
+msgstr "unnatural exit of external program\n"
+
+#: g10/exec.c:547
+msgid "unable to execute external program\n"
+msgstr "unable to execute external program\n"
+
+#: g10/exec.c:564
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "unable to read external program response: %s\n"
+
+#: g10/exec.c:610 g10/exec.c:617
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+
+#: g10/exec.c:622
+#, c-format
+msgid "WARNING: unable to remove temp directory '%s': %s\n"
+msgstr "WARNING: unable to remove temp directory '%s': %s\n"
+
- #: g10/export.c:78
++#: g10/export.c:102
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
- #: g10/export.c:80
++#: g10/export.c:104
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
- #: g10/export.c:82
++#: g10/export.c:106
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “[1msensitive[0m”"
+
- #: g10/export.c:84
++#: g10/export.c:108
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
- #: g10/export.c:86
++#: g10/export.c:110
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
- #: g10/export.c:1144
++#: g10/export.c:1204
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
++#, c-format
++msgid "writing to '%s'\n"
++msgstr "writing to ‘[1m%s[0m’\n"
++
++#: g10/export.c:1660
++#, c-format
++msgid "key %s: key material on-card - skipped\n"
++msgstr "key %s: key material on-card - skipped\n"
++
++#: g10/export.c:1846
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:1303
++#: g10/export.c:1923
+#, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "key %s: PGP 2.x style key - skipped\n"
+
- #: g10/export.c:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "key %s: key material on-card - skipped\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
- #: g10/getkey.c:252
++#: g10/getkey.c:257
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
- #: g10/getkey.c:511
++#: g10/getkey.c:516
+#, c-format
+msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
+msgstr "Warning: ‘[1m%s[0m’ should be a long key ID or a fingerprint\n"
+
- #: g10/getkey.c:541
++#: g10/getkey.c:546
+#, c-format
+msgid "error looking up: %s\n"
+msgstr "error looking up: %s\n"
+
- #: g10/getkey.c:631
++#: g10/getkey.c:636
+#, c-format
+msgid "Warning: %s appears in the keyring %d times\n"
+msgstr "Warning: %s appears in the keyring %d times\n"
+
- #: g10/getkey.c:1429
++#: g10/getkey.c:1431
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘[1m%s[0m’ via %s\n"
+
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘[1m%s[0m’ via %s: %s\n"
+
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “[1m%s[0m” not found: %s\n"
+
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
+#, c-format
+msgid "Warning: not using '%s' as default key: %s\n"
+msgstr "Warning: not using ‘[1m%s[0m’ as default key: %s\n"
+
- #: g10/getkey.c:1694
++#: g10/getkey.c:1743
+#, c-format
+msgid "using \"%s\" as default secret key for signing\n"
+msgstr "using “[1m%s[0m” as default secret key for signing\n"
+
- #: g10/getkey.c:1701
++#: g10/getkey.c:1750
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘[1m%s[0m’ ignored\n"
+
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+
- #: g10/getkey.c:3323
++#: g10/getkey.c:3377
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "using subkey %s instead of primary key %s\n"
+
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:410
++#: g10/gpg.c:418
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:414
++#: g10/gpg.c:422
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:422
++#: g10/gpg.c:430
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:423
++#: g10/gpg.c:431
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:429
++#: g10/gpg.c:437
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:431
++#: g10/gpg.c:439
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:434
++#: g10/gpg.c:442
++msgid "quickly revoke a user-id"
++msgstr "quickly revoke a user-id"
++
++#: g10/gpg.c:444
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:435
++#: g10/gpg.c:445
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:439
++#: g10/gpg.c:449
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:441
++#: g10/gpg.c:451
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:443
++#: g10/gpg.c:453
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:444
++#: g10/gpg.c:454
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:445
++#: g10/gpg.c:455
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:446
++#: g10/gpg.c:456
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:450
++#: g10/gpg.c:460
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:451
++#: g10/gpg.c:461
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
- #: g10/gpg.c:452
++#: g10/gpg.c:462
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
- #: g10/gpg.c:454
++#: g10/gpg.c:464
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
- #: g10/gpg.c:456
++#: g10/gpg.c:466
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:462
++#: g10/gpg.c:472
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:465
++#: g10/gpg.c:475
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:466
++#: g10/gpg.c:476
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:467
++#: g10/gpg.c:477
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:479
++#: g10/gpg.c:489
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:488
++#: g10/gpg.c:498
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:493
++#: g10/gpg.c:503
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 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:519
++#: g10/gpg.c:531
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:525
++#: g10/gpg.c:538
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
- #: g10/gpg.c:557
++#: g10/gpg.c:570
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:602
++#: g10/gpg.c:618
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 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:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 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:996
++#: g10/gpg.c:1013
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
+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:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
+#, 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:1524
+#, 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:1527
+#, 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:1530
+#, 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:1536
+#, 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:1539
+#, 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:1542
+#, 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:1548
+#, 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:1551
+#, 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:1554
+#, 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:1560
+#, 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:1563
+#, 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:1566
+#, 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:1773
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
+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:1900
+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:1902
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
+msgid "available TOFU policies:\n"
+msgstr "available TOFU policies:\n"
+
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
+#, 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:2019 g10/gpg.c:2043
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “[1mhelp[0m” to list choices)\n"
+
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
+#, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "unknown TOFU DB format ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
+#, 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:2186
++#: g10/gpg.c:2208
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr "libgcrypt is too old (need %s, have %s)\n"
+
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
+#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
+#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
++#, c-format
++msgid "invalid filter option: %s\n"
++msgstr "invalid filter option: %s\n"
++
++#: g10/gpg.c:3078
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
+#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
+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:3526
++#: g10/gpg.c:3599
+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:3528
++#: g10/gpg.c:3601
+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:3531
++#: g10/gpg.c:3604
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3535
++#: g10/gpg.c:3608
+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:3542
++#: g10/gpg.c:3615
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
+#, 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:3642
++#: g10/gpg.c:3715
+#, 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:3647
++#: g10/gpg.c:3720
+#, 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:3740
++#: g10/gpg.c:3814
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
+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:3808
++#: g10/gpg.c:3883
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘[1m%s[0m’ failed: %s\n"
+
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
+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:3854
++#: g10/gpg.c:3929
+#, 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:3875
++#: g10/gpg.c:3950
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
+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:3914
++#: g10/gpg.c:3989
+#, 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:3938
++#: g10/gpg.c:4013
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
+msgid "--passwd <user-id>"
+msgstr "--passwd <user-id>"
+
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
+#, 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:4654
++#: g10/gpg.c:4740
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: g10/gpgv.c:75
+msgid "|FILE|take the keys from the keyring FILE"
+msgstr "|FILE|take the keys from the keyring FILE"
+
+#: g10/gpgv.c:77
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
+#: g10/gpgv.c:79 sm/gpgsm.c:343
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
+#: g10/gpgv.c:83
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr "|ALGO|reject signatures made with ALGO"
+
+#: g10/gpgv.c:120
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: g10/gpgv.c:122
+msgid ""
+"Syntax: gpgv [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Syntax: gpgv [options] [files]\n"
+"Check signatures against known trusted keys\n"
+
+#: g10/helptext.c:72
+msgid "No help available"
+msgstr "No help available"
+
+#: g10/helptext.c:82
+#, c-format
+msgid "No help available for '%s'"
+msgstr "No help available for ‘[1m%s[0m’"
+
- #: g10/import.c:104
++#: g10/import.c:134
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
- #: g10/import.c:107
++#: g10/import.c:137
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
- #: g10/import.c:110
++#: g10/import.c:140
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
- #: g10/import.c:113
++#: g10/import.c:143
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
- #: g10/import.c:116
++#: g10/import.c:146
++msgid "show key during import"
++msgstr "show key during import"
++
++#: g10/import.c:149
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
- #: g10/import.c:119
++#: g10/import.c:152
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
- #: g10/import.c:122
++#: g10/import.c:155
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
- #: g10/import.c:343
++#: g10/import.c:158
++msgid "run import filters and export key immediately"
++msgstr "run import filters and export key immediately"
++
++#: g10/import.c:277 g10/import.c:519
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
- #: g10/import.c:360
++#: g10/import.c:536
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
- #: g10/import.c:430
++#: g10/import.c:606
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
- #: g10/import.c:433
++#: g10/import.c:609
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
- #: g10/import.c:435
++#: g10/import.c:611
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
- #: g10/import.c:438
++#: g10/import.c:614
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
- #: g10/import.c:447
++#: g10/import.c:623
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
- #: g10/import.c:449
++#: g10/import.c:625
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
- #: g10/import.c:451
++#: g10/import.c:627
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
- #: g10/import.c:453
++#: g10/import.c:629
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
- #: g10/import.c:463
++#: g10/import.c:639
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
- #: g10/import.c:465
++#: g10/import.c:641
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
- #: g10/import.c:809
++#: g10/import.c:985
+#, 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:851
++#: g10/import.c:1027
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for cipher algorithm %s\n"
+
- #: g10/import.c:866
++#: g10/import.c:1042
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for digest algorithm %s\n"
+
- #: g10/import.c:878
++#: g10/import.c:1054
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for compression algorithm %s\n"
+
- #: g10/import.c:891
++#: g10/import.c:1067
+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:893
++#: g10/import.c:1069
+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:918
++#: g10/import.c:1094
+#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
- #: g10/import.c:988
++#: g10/import.c:1233
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
- #: g10/import.c:1019
++#: g10/import.c:1264
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
- #: g10/import.c:1035
++#: g10/import.c:1282
+#, 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:1045
++#: g10/import.c:1292
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
- #: g10/import.c:1047
++#: g10/import.c:1294
+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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
- #: g10/import.c:1066
++#: g10/import.c:1353
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1081
++#: g10/import.c:1368
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr "writing to ‘[1m%s[0m’\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1110
++#: g10/import.c:1397
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “[1m%s[0m” imported\n"
+
- #: g10/import.c:1134
++#: g10/import.c:1421
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
+#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
+#, 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:1201
++#: g10/import.c:1488
+#, 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:1204
++#: g10/import.c:1491
+#, 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:1207
++#: g10/import.c:1494
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “[1m%s[0m” 1 new signature\n"
+
- #: g10/import.c:1210
++#: g10/import.c:1497
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “[1m%s[0m” %d new signatures\n"
+
- #: g10/import.c:1213
++#: g10/import.c:1500
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “[1m%s[0m” 1 new subkey\n"
+
- #: g10/import.c:1216
++#: g10/import.c:1503
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “[1m%s[0m” %d new subkeys\n"
+
- #: g10/import.c:1219
++#: g10/import.c:1506
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signature cleaned\n"
+
- #: g10/import.c:1222
++#: g10/import.c:1509
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signatures cleaned\n"
+
- #: g10/import.c:1225
++#: g10/import.c:1512
+#, 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:1228
++#: g10/import.c:1515
+#, 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:1251
++#: g10/import.c:1538
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “[1m%s[0m” not changed\n"
+
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:1570
++#: g10/import.c:1858
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:1578
++#: g10/import.c:1866
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:1683
++#: g10/import.c:1971
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:1727
++#: g10/import.c:2015
+#, 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:1796
++#: g10/import.c:2084
+#, 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:1848
++#: g10/import.c:2133
+#, 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:1897
++#: g10/import.c:2182
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:1930
++#: g10/import.c:2215
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate imported\n"
+
- #: g10/import.c:2006
++#: g10/import.c:2291
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:2023
++#: g10/import.c:2308
+#, 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:2025
++#: g10/import.c:2310
+#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:2043
++#: g10/import.c:2328
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2057
++#: g10/import.c:2342
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2070
++#: g10/import.c:2355
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2086
++#: g10/import.c:2371
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2108
++#: g10/import.c:2393
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2121
++#: g10/import.c:2406
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2136
++#: g10/import.c:2421
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2181
++#: g10/import.c:2463
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “[1m%s[0m”\n"
+
- #: g10/import.c:2204
++#: g10/import.c:2487
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2233
++#: g10/import.c:2516
+#, 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:2244
++#: g10/import.c:2527
+#, 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:2262
++#: g10/import.c:2545
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2276
++#: g10/import.c:2559
+#, 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:2284
++#: g10/import.c:2567
+#, 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:2413
++#: g10/import.c:2696
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:2477
++#: g10/import.c:2760
+#, 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:2493
++#: g10/import.c:2776
+#, 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:2557
++#: g10/import.c:2840
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate added\n"
+
- #: g10/import.c:2595
++#: g10/import.c:2878
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
+#, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "error creating keybox '%s': %s\n"
+
+#: g10/keydb.c:405 g10/keydb.c:432
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:441 sm/keydb.c:229
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:443
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:822
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
+#: g10/keydb.c:907
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
+msgid "[revocation]"
+msgstr "[revocation]"
+
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"can't check signature with unsupported public-key algorithm (%d): %s.\n"
+
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+
- #: g10/keyedit.c:786
++#: g10/keyedit.c:789
+msgid " (reordered signatures follow)"
+msgstr " (reordered signatures follow)"
+
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
+#, c-format
+msgid "key %s:\n"
+msgstr "key %s:\n"
+
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d duplicate signature removed\n"
+msgstr[1] "%d duplicate signatures removed\n"
+
- #: g10/keyedit.c:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d signature not checked due to a missing key\n"
+msgstr[1] "%d signatures not checked due to missing keys\n"
+
- #: g10/keyedit.c:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d bad signature\n"
+msgstr[1] "%d bad signatures\n"
+
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d signature reordered\n"
+msgstr[1] "%d signatures reordered\n"
+
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Warning: errors found and only checked self-signatures, run ‘[1m%s[0m’ to "
+"check all signatures.\n"
+
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
+msgid ""
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
+msgstr ""
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
+
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
+
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr "Skipping user ID “[1m%s[0m”, which is not a text ID.\n"
+
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “[1m%s[0m” is revoked."
+
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Are you sure you still want to sign it? (y/N) "
+
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “[1m%s[0m” is expired."
+
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “[1m%s[0m” is not self-signed."
+
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “[1m%s[0m” is signable. "
+
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"The self-signature on “[1m%s[0m”\n"
+"is a PGP 2.x-style signature.\n"
+
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Your current signature on “[1m%s[0m”\n"
+"has expired.\n"
+
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+"Do you want to issue a new signature to replace the expired one? (y/N) "
+
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"Your current signature on “[1m%s[0m”\n"
+"is a local signature.\n"
+
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr "Do you want to promote it to a full exportable signature? (y/N) "
+
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
+#, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "“[1m%s[0m” was already locally signed by key %s\n"
+
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“[1m%s[0m” was already signed by key %s\n"
+
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Do you want to sign it again anyway? (y/N) "
+
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "This key is due to expire on %s.\n"
+
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr "Do you want your signature to expire at the same time? (Y/n) "
+
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
+msgid ""
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
+"to the person named above? If you don't know what to answer, enter \"0\".\n"
+msgstr ""
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
+"to the person named above? If you don't know what to answer, enter "
+"“[1m0[0m”.\n"
+
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
+#, c-format
+msgid " (1) I have not checked at all.%s\n"
+msgstr " (1) I have not checked at all.%s\n"
+
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
+#, c-format
+msgid " (3) I have done very careful checking.%s\n"
+msgstr " (3) I have done very careful checking.%s\n"
+
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘[1m?[0m’ for more information): "
+
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
+#, c-format
+msgid ""
+"Are you sure that you want to sign this key with your\n"
+"key \"%s\" (%s)\n"
+msgstr ""
+"Are you sure that you want to sign this key with your\n"
+"key “[1m%s[0m” (%s)\n"
+
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
+msgid "WARNING: the signature will not be marked as non-exportable.\n"
+msgstr "WARNING: the signature will not be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
+msgid "WARNING: the signature will not be marked as non-revocable.\n"
+msgstr "WARNING: the signature will not be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr "Key has only stub or on-card key items - no passphrase to change.\n"
+
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
+msgid "save and quit"
+msgstr "save and quit"
+
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
+msgid "select user ID N"
+msgstr "select user ID N"
+
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
+msgid "select subkey N"
+msgstr "select subkey N"
+
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
+msgid "check signatures"
+msgstr "check signatures"
+
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
+msgid "add a user ID"
+msgstr "add a user ID"
+
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
+msgid "add a subkey"
+msgstr "add a subkey"
+
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "change the expiration date for the key or selected subkeys"
+
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
+msgid "set the preferred keyserver URL for the selected user IDs"
+msgstr "set the preferred keyserver URL for the selected user IDs"
+
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
+msgid "enable key"
+msgstr "enable key"
+
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
+msgid "disable key"
+msgstr "disable key"
+
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr "compact unusable user IDs and remove unusable signatures from key"
+
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr "compact unusable user IDs and remove all signatures from key"
+
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
+msgid ""
+"* The 'sign' command may be prefixed with an 'l' for local signatures "
+"(lsign),\n"
+" a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
+" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+"* The ‘[1msign[0m’ command may be prefixed with an ‘[1ml[0m’ for local "
+"signatures (lsign),\n"
+" a ‘[1mt[0m’ for trust signatures (tsign), an ‘[1mnr[0m’ for non-revocable "
+"signatures\n"
+" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘[1m%s[0m’\n"
+
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "This command is not allowed while in %s mode.\n"
+
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘[1m%s[0m’ command.)\n"
+
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
+msgid "Really remove this user ID? (y/N) "
+msgstr "Really remove this user ID? (y/N) "
+
+#. TRANSLATORS: Please take care: This is about
+#. moving the key and not about removing it.
- #: g10/keyedit.c:2383
++#: g10/keyedit.c:2386
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
+msgid "Do you really want to delete the selected keys? (y/N) "
+msgstr "Do you really want to delete the selected keys? (y/N) "
+
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
+msgid "Do you really want to delete this key? (y/N) "
+msgstr "Do you really want to delete this key? (y/N) "
+
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Do you really want to revoke the entire key? (y/N) "
+
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgstr "Do you really want to revoke the selected subkeys? (y/N) "
+
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
+msgid "Do you really want to revoke this subkey? (y/N) "
+msgstr "Do you really want to revoke this subkey? (y/N) "
+
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
+msgid "Owner trust may not be set while using a user provided trust database\n"
+msgstr ""
+"Owner trust may not be set while using a user provided trust database\n"
+
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
+msgid "Really update the preferences for the selected user IDs? (y/N) "
+msgstr "Really update the preferences for the selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
++#, c-format
++msgid "User ID revocation failed: %s\n"
++msgstr "User ID revocation failed: %s\n"
++
++#: g10/keyedit.c:3070
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“[1m%s[0m” is not a fingerprint\n"
+
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“[1m%s[0m” is not the primary fingerprint\n"
+
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
+msgid "Digest: "
+msgstr "Digest: "
+
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
+msgid "Features: "
+msgstr "Features: "
+
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
+msgid "Notations: "
+msgstr "Notations: "
+
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
+
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
+#, c-format
+msgid "The following key was revoked on %s by %s key %s\n"
+msgstr "The following key was revoked on %s by %s key %s\n"
+
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
+#, c-format
+msgid "This key may be revoked by %s key %s"
+msgstr "This key may be revoked by %s key %s"
+
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
+msgid "card-no: "
+msgstr "card-no: "
+
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
+msgid "revoked"
+msgstr "revoked"
+
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
+msgid "expired"
+msgstr "expired"
+
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
+msgid ""
+"WARNING: no user ID has been marked as primary. This command may\n"
+" cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"WARNING: no user ID has been marked as primary. This command may\n"
+" cause a different user ID to become the assumed primary.\n"
+
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
+msgid "You may want to change its expiration date too.\n"
+msgstr "You may want to change its expiration date too.\n"
+
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
+msgid ""
+"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
+"versions\n"
+" of PGP to reject this key.\n"
+msgstr ""
+"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
+"versions\n"
+" of PGP to reject this key.\n"
+
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Are you sure you still want to add it? (y/N) "
+
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "You may not add a photo ID to a PGP2-style key.\n"
+
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Such a user ID already exists on this key!\n"
+
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
+#, c-format
+msgid "Deleted %d signature.\n"
+msgid_plural "Deleted %d signatures.\n"
+msgstr[0] "Deleted %d signature.\n"
+msgstr[1] "Deleted %d signatures.\n"
+
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
+msgid "invalid"
+msgstr "invalid"
+
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “[1m%s[0m” compacted: %s\n"
+
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgid_plural "User ID \"%s\": %d signatures removed\n"
+msgstr[0] "User ID “[1m%s[0m”: %d signature removed\n"
+msgstr[1] "User ID “[1m%s[0m”: %d signatures removed\n"
+
- #: g10/keyedit.c:4397
++#: g10/keyedit.c:4504
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “[1m%s[0m”: already minimized\n"
+
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “[1m%s[0m”: already clean\n"
+
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
+msgid ""
+"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
+"cause\n"
+" some versions of PGP to reject this key.\n"
+msgstr ""
+"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
+"cause\n"
+" some versions of PGP to reject this key.\n"
+
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
+
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
+
- #: g10/keyedit.c:4535
++#: g10/keyedit.c:4642
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "you cannot appoint a key as its own designated revoker\n"
+
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
+msgid "this key has already been designated as a revoker\n"
+msgstr "this key has already been designated as a revoker\n"
+
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgstr ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
+
- #: g10/keyedit.c:4632
++#: g10/keyedit.c:4739
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "You can't change the expiration date of a v3 key\n"
+
- #: g10/keyedit.c:4864
++#: g10/keyedit.c:4971
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
+#, c-format
+msgid "subkey %s does not sign and so does not need to be cross-certified\n"
+msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
+
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
+#, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
+msgstr "skipping v3 self-signature on user ID “[1m%s[0m”\n"
+
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Are you sure you want to replace it? (y/N) "
+
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Are you sure you want to delete it? (y/N) "
+
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “[1m%s[0m”\n"
+
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#, c-format
+msgid "signed by your key %s on %s%s%s\n"
+msgstr "signed by your key %s on %s%s%s\n"
+
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "Are you sure you still want to revoke it? (y/N) "
+
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
+#, c-format
+msgid "You have signed these user IDs on key %s:\n"
+msgstr "You have signed these user IDs on key %s:\n"
+
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
++#, c-format
++msgid "tried to revoke a non-user ID: %s\n"
++msgstr "tried to revoke a non-user ID: %s\n"
++
++#: g10/keyedit.c:6240
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “[1m%s[0m” is already revoked\n"
+
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
+
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+
+#: g10/keygen.c:295
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘[1m%s[0m’ duplicated\n"
+
+#: g10/keygen.c:302
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:304
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:306
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: g10/keygen.c:447
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘[1m%s[0m’ in preference string\n"
+
+#: g10/keygen.c:926
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:972
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:1028
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
+#: g10/keygen.c:1600 g10/keygen.c:1605
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1493
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+
+#: g10/keygen.c:1667
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1670
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1673
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1676
+msgid "Authenticate"
+msgstr "Authenticate"
+
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation. If this is not possible use single digits. The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1695
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1722
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1728
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1733
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1736
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1739
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1742
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1871 sm/certreqgen-ui.c:161
+msgid "Please select what kind of key you want:\n"
+msgstr "Please select what kind of key you want:\n"
+
+#: g10/keygen.c:1875
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1879
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1881
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1883
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1888
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1890
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1895
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1897
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1903
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
+#: g10/keygen.c:1905
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
+#: g10/keygen.c:1907
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
+#: g10/keygen.c:1909
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
+#: g10/keygen.c:1913
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: g10/keygen.c:2003 sm/certreqgen-ui.c:206
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
+#: g10/keygen.c:2016 sm/certreqgen-ui.c:214
+msgid "Not a valid keygrip (expecting 40 hex digits)\n"
+msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
+
+#: g10/keygen.c:2018 sm/certreqgen-ui.c:216
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
+#: g10/keygen.c:2092 g10/keygen.c:2106
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
+#: g10/keygen.c:2147
+#, c-format
+msgid "%s keys may be between %u and %u bits long.\n"
+msgstr "%s keys may be between %u and %u bits long.\n"
+
+#: g10/keygen.c:2155
+#, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "What keysize do you want for the subkey? (%u) "
+
+#: g10/keygen.c:2158 sm/certreqgen-ui.c:183
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:2172 sm/certreqgen-ui.c:193
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:2217
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
+#: g10/keygen.c:2382
+msgid ""
+"Please specify how long the key should be valid.\n"
+" 0 = key does not expire\n"
+" <n> = key expires in n days\n"
+" <n>w = key expires in n weeks\n"
+" <n>m = key expires in n months\n"
+" <n>y = key expires in n years\n"
+msgstr ""
+"Please specify how long the key should be valid.\n"
+" 0 = key does not expire\n"
+" <n> = key expires in n days\n"
+" <n>w = key expires in n weeks\n"
+" <n>m = key expires in n months\n"
+" <n>y = key expires in n years\n"
+
+#: g10/keygen.c:2393
+msgid ""
+"Please specify how long the signature should be valid.\n"
+" 0 = signature does not expire\n"
+" <n> = signature expires in n days\n"
+" <n>w = signature expires in n weeks\n"
+" <n>m = signature expires in n months\n"
+" <n>y = signature expires in n years\n"
+msgstr ""
+"Please specify how long the signature should be valid.\n"
+" 0 = signature does not expire\n"
+" <n> = signature expires in n days\n"
+" <n>w = signature expires in n weeks\n"
+" <n>m = signature expires in n months\n"
+" <n>y = signature expires in n years\n"
+
+#: g10/keygen.c:2416
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:2421
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:2440 g10/keygen.c:2465
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:2447
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:2448
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:2453
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:2454
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:2458
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+
+#: g10/keygen.c:2471
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:2539
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+
+#. TRANSLATORS: This string is in general not anymore used
+#. but you should keep your existing translation. In case
+#. the new string is not translated this old string will
+#. be used.
+#: g10/keygen.c:2554
+msgid ""
+"\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
+" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
+"\n"
+msgstr ""
+"\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
+" “[1mHeinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>[0m”\n"
+"\n"
+
+#: g10/keygen.c:2573
+msgid "Real name: "
+msgstr "Real name: "
+
+#: g10/keygen.c:2582
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:2583
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr "The characters ‘[1m%s[0m’ and ‘[1m%s[0m’ may not appear in name\n"
+
+#: g10/keygen.c:2587
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
+#: g10/keygen.c:2590
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
+#: g10/keygen.c:2600
+msgid "Email address: "
+msgstr "Email address: "
+
+#: g10/keygen.c:2606
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
+#: g10/keygen.c:2615
+msgid "Comment: "
+msgstr "Comment: "
+
+#: g10/keygen.c:2621
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
+#: g10/keygen.c:2657
+#, c-format
+msgid "You are using the '%s' character set.\n"
+msgstr "You are using the ‘[1m%s[0m’ character set.\n"
+
+#: g10/keygen.c:2663
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+" \"%s\"\n"
+"\n"
+msgstr ""
+"You selected this USER-ID:\n"
+" “[1m%s[0m”\n"
+"\n"
+
+#: g10/keygen.c:2668
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "Please don't put the email address into the real name or the comment\n"
+
+#. TRANSLATORS: These are the allowed answers in
+#. lower and uppercase. Below you will find the matching
+#. string which should be translated accordingly and the
+#. letter changed to match the one in the answer string.
+#.
+#. n = Change name
+#. c = Change comment
+#. e = Change email
+#. o = Okay (ready, continue)
+#. q = Quit
+#.
+#: g10/keygen.c:2693
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:2703
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+
+#: g10/keygen.c:2704
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+
+#: g10/keygen.c:2709
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
+#: g10/keygen.c:2710
+msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
+
+#: g10/keygen.c:2729
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
+#: g10/keygen.c:2775
+msgid ""
+"We need to generate a lot of random bytes. It is a good idea to perform\n"
+"some other action (type on the keyboard, move the mouse, utilize the\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"We need to generate a lot of random bytes. It is a good idea to perform\n"
+"some other action (type on the keyboard, move the mouse, utilize the\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
+#, c-format
+msgid ""
+"About to create a key for:\n"
+" \"%s\"\n"
+"\n"
+msgstr ""
+"About to create a key for:\n"
+" “[1m%s[0m”\n"
+"\n"
+
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “[1m%s[0m” already exists\n"
+
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
+#, c-format
+msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
+msgstr "Note: Use “[1m%s %s[0m” for a full featured key generation dialog.\n"
+
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
+#, c-format
+msgid "Note: backup of card key saved to '%s'\n"
+msgstr "Note: backup of card key saved to ‘[1m%s[0m’\n"
+
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘[1m%s[0m’\n"
+
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
+msgid ""
+"Note that this key cannot be used for encryption. You may want to use\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
+msgstr ""
+"Note that this key cannot be used for encryption. You may want to use\n"
+"the command “[1m--edit-key[0m” to generate a subkey for this purpose.\n"
+
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
+msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
+
- #: g10/keygen.c:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Secret parts of primary key are stored on-card.\n"
+
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
+msgid "never "
+msgstr "never "
+
- #: g10/keylist.c:330
++#: g10/keylist.c:331
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
- #: g10/keylist.c:332
++#: g10/keylist.c:333
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
- #: g10/keylist.c:374
++#: g10/keylist.c:375
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
- #: g10/keylist.c:427
++#: g10/keylist.c:428
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
- #: g10/keylist.c:429
++#: g10/keylist.c:430
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
- #: g10/keylist.c:471
++#: g10/keylist.c:472
+#, c-format
+msgid "%d good signature\n"
+msgid_plural "%d good signatures\n"
+msgstr[0] "%d good signature\n"
+msgstr[1] "%d good signatures\n"
+
- #: g10/keylist.c:484
++#: g10/keylist.c:485
+#, c-format
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "%d signature not checked due to an error\n"
+msgstr[1] "%d signatures not checked due to errors\n"
+
- #: g10/keylist.c:566
++#: g10/keylist.c:567
+#, c-format
+msgid "Warning: %lu key skipped due to its large size\n"
+msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
+msgstr[0] "Warning: %lu key skipped due to its large size\n"
+msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
+
- #: g10/keylist.c:588
++#: g10/keylist.c:589
+msgid "Keyring"
+msgstr "Keyring"
+
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#. TRANSLATORS: this should fit into 24 bytes so that the
+#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
+#: g10/keyring.c:1489
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘[1m%s[0m’\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 keys cached so far (%lu signature)\n"
+msgstr[1] "%lu keys cached so far (%lu signatures)\n"
+
+#: 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: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:1659
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
+#: g10/keyserver.c:90
+msgid "override proxy options set for dirmngr"
+msgstr "override proxy options set for dirmngr"
+
+#: g10/keyserver.c:92
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
+#: g10/keyserver.c:93
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
+#: g10/keyserver.c:95
+msgid "override timeout options set for dirmngr"
+msgstr "override timeout options set for dirmngr"
+
+#: g10/keyserver.c:99
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
+#: g10/keyserver.c:101
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
+#: g10/keyserver.c:103
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr "honor the PKA record set on a key when retrieving keys"
+
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
+msgid "disabled"
+msgstr "disabled"
+
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
+msgid "Enter number(s), N)ext, or Q)uit > "
+msgstr "Enter number(s), N)ext, or Q)uit > "
+
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
+#, c-format
+msgid "invalid keyserver protocol (us %d!=handler %d)\n"
+msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
+
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
+#, c-format
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr "“[1m%s[0m” not a key ID: skipping\n"
+
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
+#, c-format
+msgid "refreshing %d key from %s\n"
+msgid_plural "refreshing %d keys from %s\n"
+msgstr[0] "refreshing %d key from %s\n"
+msgstr[1] "refreshing %d keys from %s\n"
+
- #: g10/keyserver.c:1424
++#: g10/keyserver.c:1426
+#, c-format
+msgid "WARNING: unable to refresh key %s via %s: %s\n"
+msgstr "WARNING: unable to refresh key %s via %s: %s\n"
+
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “[1m%s[0m” not found on keyserver\n"
+
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#, c-format
++msgid "skipped \"%s\": %s\n"
++msgstr "skipped “[1m%s[0m”: %s\n"
++
++#: g10/keyserver.c:1823
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘[1m%s[0m’\n"
+
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "weird size for an encrypted session key (%d)\n"
+
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
+#, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
+
- #: g10/mainproc.c:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “[1m%s[0m”\n"
+
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “[1mfor-your-eyes-only[0m”\n"
+
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “[1mgpg --import[0m” to apply\n"
+
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “[1m%s[0m”"
+
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1727
++#: 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:1744
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “[1m%s[0m”"
+
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
+#, 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:2184
++#: g10/mainproc.c:2189
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
+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:2334
++#: g10/mainproc.c:2339
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
+msgid "old style (PGP 2.x) signature\n"
+msgstr "old style (PGP 2.x) signature\n"
+
+#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
+#, c-format
+msgid "fstat of '%s' failed in %s: %s\n"
+msgstr "fstat of ‘[1m%s[0m’ failed in %s: %s\n"
+
+#: g10/misc.c:170
+#, c-format
+msgid "fstat(%d) failed in %s: %s\n"
+msgstr "fstat(%d) failed in %s: %s\n"
+
+#: g10/misc.c:279
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "WARNING: using experimental public key algorithm %s\n"
+
+#: g10/misc.c:286
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+
+#: g10/misc.c:300
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "WARNING: using experimental cipher algorithm %s\n"
+
+#: g10/misc.c:319
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "WARNING: using experimental digest algorithm %s\n"
+
+#: g10/misc.c:328
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNING: digest algorithm %s is deprecated\n"
+
+#: g10/misc.c:353
+#, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "Note: signatures using the %s algorithm are rejected\n"
+
+#: g10/misc.c:375
+#, c-format
+msgid "(reported error: %s)\n"
+msgstr "(reported error: %s)\n"
+
+#: g10/misc.c:378
+#, c-format
+msgid "(reported error: %s <%s>)\n"
+msgstr "(reported error: %s <%s>)\n"
+
+#: g10/misc.c:397
+msgid "(further info: "
+msgstr "(further info: "
+
+#: g10/misc.c:1056
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “[1m%s[0m”\n"
+
+#: g10/misc.c:1060
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated option\n"
+
+#: g10/misc.c:1062
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “[1m%s%s[0m” instead\n"
+
+#: g10/misc.c:1069
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated command - do not use it\n"
+
+#: g10/misc.c:1079
+#, c-format
+msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr ""
+"%s:%u: “[1m%s[0m” is obsolete in this file - it only has effect in %s\n"
+
+#: g10/misc.c:1083
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+"WARNING: “[1m%s%s[0m” is an obsolete option - it has no effect except on %s\n"
+
+#: g10/misc.c:1147
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1172
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
+#: g10/misc.c:1292
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "this message may not be usable by %s\n"
+
+#: g10/misc.c:1467
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘[1m%s[0m’\n"
+
+#: g10/misc.c:1492
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘[1m%s[0m’\n"
+
+#: g10/misc.c:1730
+msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
+msgstr ""
+"ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
+
+#: g10/misc.c:1752
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘[1m%s[0m’\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘[1m%s[0m’ exists. "
+
+#: g10/openfile.c:88
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:123
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:147
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:218
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:366
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘[1m%s[0m’\n"
+
+#: g10/openfile.c:457
+#, c-format
+msgid "new configuration file '%s' created\n"
+msgstr "new configuration file ‘[1m%s[0m’ created\n"
+
+#: g10/openfile.c:498
+#, c-format
+msgid "WARNING: options in '%s' are not yet active during this run\n"
+msgstr "WARNING: options in ‘[1m%s[0m’ are not yet active during this run\n"
+
+#: g10/parse-packet.c:257
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
+#: g10/parse-packet.c:1113
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "subpacket of type %d has critical bit set\n"
+
+#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
+#, c-format
+msgid "problem with the agent: %s\n"
+msgstr "problem with the agent: %s\n"
+
+#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
+#: g10/passphrase.c:277
+#, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+msgstr ""
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
+"“[1m%.*s[0m”\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+
+#: g10/passphrase.c:296
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
+#: g10/passphrase.c:325
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
+#: g10/passphrase.c:483
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for\n"
+"user: \"%s\"\n"
+msgstr ""
+"You need a passphrase to unlock the secret key for\n"
+"user: “[1m%s[0m”\n"
+
+#: g10/passphrase.c:491
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
+#: g10/passphrase.c:500
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
+#: 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: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: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: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: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: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: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:380
+msgid "unable to display photo ID!\n"
+msgstr "unable to display photo ID!\n"
+
+#: g10/pkclist.c:72 g10/revoke.c:757
+msgid "No reason specified"
+msgstr "No reason specified"
+
+#: g10/pkclist.c:74 g10/revoke.c:759
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
+#: g10/pkclist.c:76 g10/revoke.c:758
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
+#: g10/pkclist.c:78 g10/revoke.c:760
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
+#: g10/pkclist.c:80 g10/revoke.c:761
+msgid "User ID is no longer valid"
+msgstr "User ID is no longer valid"
+
+#: g10/pkclist.c:84
+msgid "reason for revocation: "
+msgstr "reason for revocation: "
+
+#: g10/pkclist.c:100
+msgid "revocation comment: "
+msgstr "revocation comment: "
+
+#. TRANSLATORS: These are the allowed answers in lower and
+#. uppercase. Below you will find the matching strings which
+#. should be translated accordingly and the letter changed to
+#. match the one in the answer string.
+#.
+#. i = please show me more information
+#. m = back to the main menu
+#. s = skip this key
+#. q = quit
+#.
+#: g10/pkclist.c:216
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
+#: g10/pkclist.c:224
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
+
+#: g10/pkclist.c:257
+#, c-format
+msgid " aka \"%s\"\n"
+msgstr " aka “[1m%s[0m”\n"
+
+#: g10/pkclist.c:267
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
+msgstr ""
+"How much do you trust that this key actually belongs to the named user?\n"
+
+#: g10/pkclist.c:282
+#, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = I don't know or won't say\n"
+
+#: g10/pkclist.c:284
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = I do NOT trust\n"
+
+#: g10/pkclist.c:290
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = I trust ultimately\n"
+
+#: g10/pkclist.c:296
+msgid " m = back to the main menu\n"
+msgstr " m = back to the main menu\n"
+
+#: g10/pkclist.c:299
+msgid " s = skip this key\n"
+msgstr " s = skip this key\n"
+
+#: g10/pkclist.c:300
+msgid " q = quit\n"
+msgstr " q = quit\n"
+
+#: g10/pkclist.c:304
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+
+#: g10/pkclist.c:310 g10/revoke.c:786
+msgid "Your decision? "
+msgstr "Your decision? "
+
+#: g10/pkclist.c:331
+msgid "Do you really want to set this key to ultimate trust? (y/N) "
+msgstr "Do you really want to set this key to ultimate trust? (y/N) "
+
+#: g10/pkclist.c:345
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificates leading to an ultimately trusted key:\n"
+
+#: g10/pkclist.c:434
+#, c-format
+msgid "%s: There is no assurance this key belongs to the named user\n"
+msgstr "%s: There is no assurance this key belongs to the named user\n"
+
+#: g10/pkclist.c:439
+#, c-format
+msgid "%s: There is limited assurance this key belongs to the named user\n"
+msgstr "%s: There is limited assurance this key belongs to the named user\n"
+
+#: g10/pkclist.c:445
+msgid "This key probably belongs to the named user\n"
+msgstr "This key probably belongs to the named user\n"
+
+#: g10/pkclist.c:450
+msgid "This key belongs to us\n"
+msgstr "This key belongs to us\n"
+
+#: g10/pkclist.c:476
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID. If you *really* know what you are doing,\n"
+"you may answer the next question with yes.\n"
+msgstr ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID. If you *really* know what you are doing,\n"
+"you may answer the next question with yes.\n"
+
+#: g10/pkclist.c:495
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
+#: g10/pkclist.c:545
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
+#: g10/pkclist.c:552
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "WARNING: this key might be revoked (revocation key not present)\n"
+
+#: g10/pkclist.c:561
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "WARNING: This key has been revoked by its designated revoker!\n"
+
+#: g10/pkclist.c:564
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "WARNING: This key has been revoked by its owner!\n"
+
+#: g10/pkclist.c:565
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
+#: g10/pkclist.c:571
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "WARNING: This subkey has been revoked by its owner!\n"
+
+#: g10/pkclist.c:576
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
+#: g10/pkclist.c:596
+#, c-format
+msgid "Note: Verified signer's address is '%s'\n"
+msgstr "Note: Verified signer's address is ‘[1m%s[0m’\n"
+
+#: g10/pkclist.c:603
+#, c-format
+msgid "Note: Signer's address '%s' does not match DNS entry\n"
+msgstr "Note: Signer's address ‘[1m%s[0m’ does not match DNS entry\n"
+
+#: g10/pkclist.c:615
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr "trustlevel adjusted to FULL due to valid PKA info\n"
+
+#: g10/pkclist.c:623
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr "trustlevel adjusted to NEVER due to bad PKA info\n"
+
+#: g10/pkclist.c:634
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
+#: g10/pkclist.c:645
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "WARNING: This key is not certified with a trusted signature!\n"
+
+#: g10/pkclist.c:647
+msgid ""
+" There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+" There is no indication that the signature belongs to the owner.\n"
+
+#: g10/pkclist.c:655
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
+#: g10/pkclist.c:656
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
+#: g10/pkclist.c:664
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+
+#: g10/pkclist.c:666
+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:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
+#, c-format
+msgid "can't encrypt to '%s'\n"
+msgstr "can't encrypt to ‘[1m%s[0m’\n"
+
- #: g10/pkclist.c:972
++#: g10/pkclist.c:984
+#, 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:979
++#: g10/pkclist.c:991
+#, 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:1082
++#: g10/pkclist.c:1094
+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:1106
++#: g10/pkclist.c:1118
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
+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:1156
++#: g10/pkclist.c:1168
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “[1m%s[0m”\n"
+
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
+#, c-format
+msgid "Note: key %s has no preference for %s\n"
+msgstr "Note: key %s has no preference for %s\n"
+
+#: g10/plaintext.c:84
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "data not saved; use option “[1m--output[0m” to save it\n"
+
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
+#, c-format
+msgid "can't open signed data '%s'\n"
+msgstr "can't open signed data ‘[1m%s[0m’\n"
+
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
+#, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "can't open signed data fd=%d: %s\n"
+
+#: g10/pubkey-enc.c:116
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:123
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:282
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:310
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "cipher algorithm %d%s is unknown or disabled\n"
+
+#: g10/pubkey-enc.c:352
+#, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
+
+#: g10/pubkey-enc.c:377
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:384
+msgid "Note: key has been revoked"
+msgstr "Note: key has been revoked"
+
+#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
+#: g10/revoke.c:500
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:144
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
+#: g10/revoke.c:312
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
+#: g10/revoke.c:316
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
+#: g10/revoke.c:322
+msgid "Secret key is not available.\n"
+msgstr "Secret key is not available.\n"
+
+#: g10/revoke.c:327
+msgid "Create a designated revocation certificate for this key? (y/N) "
+msgstr "Create a designated revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:336 g10/revoke.c:727
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
+#: g10/revoke.c:352 g10/revoke.c:479
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
+#: g10/revoke.c:415
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
+#: g10/revoke.c:421
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “[1m%s[0m”\n"
+
+#: g10/revoke.c:551
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
+#: g10/revoke.c:567
+msgid ""
+"A revocation certificate is a kind of \"kill switch\" to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+msgstr ""
+"A revocation certificate is a kind of “[1mkill switch[0m” to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+
+#: g10/revoke.c:570
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command \"--gen-revoke\" in the GnuPG manual."
+msgstr ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command “[1m--gen-revoke[0m” in the GnuPG manual."
+
+#: g10/revoke.c:575
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+msgstr ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+
+#: g10/revoke.c:590
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘[1m%s.rev[0m’\n"
+
+#: g10/revoke.c:634
+#, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "secret key “[1m%s[0m” not found\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line. Several lines
+#. lines with secret key infos are printed after this message.
+#: g10/revoke.c:661
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘[1m%s[0m’ matches multiple secret keys:\n"
+
+#: g10/revoke.c:688
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
+#: g10/revoke.c:711
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:735
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+
+#: g10/revoke.c:769
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
+#: g10/revoke.c:779
+msgid "Cancel"
+msgstr "Cancel"
+
+#: g10/revoke.c:781
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
+#: g10/revoke.c:822
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Enter an optional description; end it with an empty line:\n"
+
+#: g10/revoke.c:850
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
+#: g10/revoke.c:852
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
+#: g10/revoke.c:857
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: g10/seskey.c:62 sm/encrypt.c:123
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
+#: g10/seskey.c:66
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+
+#: g10/seskey.c:306
+#, c-format
+msgid "%s key %s uses an unsafe (%zu bit) hash\n"
+msgstr "%s key %s uses an unsafe (%zu bit) hash\n"
+
+#: g10/seskey.c:324
+#, c-format
+msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
+msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
+
+#: g10/sig-check.c:116
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
+#: g10/sig-check.c:143
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "WARNING: signing subkey %s is not cross-certified\n"
+
+#: g10/sig-check.c:145
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: g10/sig-check.c:155
+#, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
+
+#: g10/sig-check.c:277
+#, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgid_plural "public key %s is %lu seconds newer than the signature\n"
+msgstr[0] "public key %s is %lu second newer than the signature\n"
+msgstr[1] "public key %s is %lu seconds newer than the signature\n"
+
+#: g10/sig-check.c:286
+#, c-format
+msgid "public key %s is %lu day newer than the signature\n"
+msgid_plural "public key %s is %lu days newer than the signature\n"
+msgstr[0] "public key %s is %lu day newer than the signature\n"
+msgstr[1] "public key %s is %lu days newer than the signature\n"
+
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:309
+#, c-format
+msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu days in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu day in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu days in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:326
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
+#: g10/sig-check.c:337
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
+#: g10/sig-check.c:471
+#, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
+
+#: g10/sig-check.c:1048
+#, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "key %s: no subkey for subkey revocation signature\n"
+
+#: g10/sig-check.c:1051
+#, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "key %s: no subkey for subkey binding signature\n"
+
+#: g10/sign.c:88
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+
+#: g10/sign.c:114
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+
+#: g10/sign.c:137
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+
- #: g10/sign.c:313
++#: g10/sign.c:314
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “[1m%s[0m”\n"
+
- #: g10/sign.c:861
++#: g10/sign.c:863
+#, 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:992
++#: g10/sign.c:994
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1268
++#: g10/sign.c:1271
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
+#: g10/skclist.c:155 g10/skclist.c:236
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
+
+#: g10/skclist.c:187
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “[1m%s[0m”: duplicated\n"
+
+#: g10/skclist.c:206
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
+#: g10/skclist.c:225
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
+#: g10/tdbdump.c:57 g10/trustdb.c:361
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "trust record %lu, type %d: write failed: %s\n"
+
+#: g10/tdbdump.c:105
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use “[1mgpg --import-ownertrust[0m” to restore them)\n"
+
+#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
+#, c-format
+msgid "error in '%s': %s\n"
+msgstr "error in '%s': %s\n"
+
+#: g10/tdbdump.c:162
+msgid "line too long"
+msgstr "line too long"
+
+#: g10/tdbdump.c:170
+msgid "colon missing"
+msgstr "colon missing"
+
+#: g10/tdbdump.c:176
+msgid "invalid fingerprint"
+msgstr "invalid fingerprint"
+
+#: g10/tdbdump.c:181
+msgid "ownertrust value missing"
+msgstr "ownertrust value missing"
+
+#: g10/tdbdump.c:217
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
+#: g10/tdbdump.c:221
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
+#: g10/tdbdump.c:230 g10/trustdb.c:376
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:355
+#, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "can't create lock for ‘[1m%s[0m’\n"
+
- #: g10/tdbio.c:145
++#: g10/tdbio.c:146
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "can't lock ‘[1m%s[0m’\n"
+
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek failed: %s\n"
+
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
+
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaction too large\n"
+
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
+#, c-format
+msgid "can't access '%s': %s\n"
+msgstr "can't access '%s': %s\n"
+
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
+#: g10/textfilter.c:146
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "can't handle text lines longer than %d characters\n"
+
+#: g10/textfilter.c:241
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
+#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
+#, c-format
+msgid "error beginning transaction on TOFU database: %s\n"
+msgstr "error beginning transaction on TOFU database: %s\n"
+
+#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
+#, c-format
+msgid "error committing transaction on TOFU database: %s\n"
+msgstr "error committing transaction on TOFU database: %s\n"
+
+#: g10/tofu.c:375 g10/tofu.c:715
+#, c-format
+msgid "error rolling back transaction on TOFU database: %s\n"
+msgstr "error rolling back transaction on TOFU database: %s\n"
+
+#: g10/tofu.c:512
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
+#: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
+#: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
+#: 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: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:761
+#, c-format
+msgid "error opening TOFU database '%s': %s\n"
+msgstr "error opening TOFU database '%s': %s\n"
+
+#: g10/tofu.c:1027
+msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
+msgstr "Warning: Home directory contains both tofu.db and tofu.d.\n"
+
+#: g10/tofu.c:1029
+msgid "Using split format for TOFU database\n"
+msgstr "Using split format for TOFU database\n"
+
+#: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
+#: g10/tofu.c:1626
+#, c-format
+msgid "The binding %s is NOT known."
+msgstr "The binding %s is NOT known."
+
+#: g10/tofu.c:1636
+#, c-format
+msgid ""
+"The key with fingerprint %s raised a conflict with the binding %s. Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
+msgstr ""
+"The key with fingerprint %s raised a conflict with the binding %s. Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
+
+#: g10/tofu.c:1648
+#, c-format
+msgid ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+msgstr ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+
+#: g10/tofu.c:1737
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
+#: g10/tofu.c:1747
+msgid "Known user IDs associated with this key:\n"
+msgstr "Known user IDs associated with this key:\n"
+
+#: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
+#: g10/tofu.c:1817
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
+#: g10/tofu.c:1821
+#, c-format
+msgid "The email address \"%s\" is associated with %d key:\n"
+msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+msgstr[0] "The email address “[1m%s[0m” is associated with %d key:\n"
+msgstr[1] "The email address “[1m%s[0m” is associated with %d keys:\n"
+
+#: g10/tofu.c:1845
+#, c-format
+msgid "Statistics for keys with the email address \"%s\":\n"
+msgstr "Statistics for keys with the email address “[1m%s[0m”:\n"
+
+#: g10/tofu.c:1859
+msgid "this key"
+msgstr "this key"
+
+#: g10/tofu.c:1869
+#, c-format
+msgid "%ld message signed in the future."
+msgid_plural "%ld messages signed in the future."
+msgstr[0] "%ld message signed in the future."
+msgstr[1] "%ld messages signed in the future."
+
+#: g10/tofu.c:1878
+#, c-format
+msgid "%ld message signed"
+msgid_plural "%ld messages signed"
+msgstr[0] "%ld message signed"
+msgstr[1] "%ld messages signed"
+
+#: g10/tofu.c:1884
+#, c-format
+msgid " over the past %ld day."
+msgid_plural " over the past %ld days."
+msgstr[0] " over the past %ld day."
+msgstr[1] " over the past %ld days."
+
+#: g10/tofu.c:1888
+#, c-format
+msgid " over the past %ld week."
+msgid_plural " over the past %ld weeks."
+msgstr[0] " over the past %ld week."
+msgstr[1] " over the past %ld weeks."
+
+#: g10/tofu.c:1892
+#, c-format
+msgid " over the past %ld month."
+msgid_plural " over the past %ld months."
+msgstr[0] " over the past %ld month."
+msgstr[1] " over the past %ld months."
+
+#. TRANSLATORS: Please translate the text found in the source
+#. * file below. We don't directly internationalize that text so
+#. * that we can tweak it without breaking translations.
+#: g10/tofu.c:1909
+msgid "TOFU detected a binding conflict"
+msgstr "TOFU detected a binding conflict"
+
+#. TRANSLATORS: Two letters (normally the lower and upper case
+#. * version of the hotkey) for each of the five choices. If
+#. * there is only one choice in your language, repeat it.
+#: g10/tofu.c:1947
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
+#: g10/tofu.c:1953
+msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
+msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
+
+#: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
+#, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "error setting TOFU binding's trust level to %s\n"
+
+#: g10/tofu.c:2259
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
+#: g10/tofu.c:2351
+#, c-format
+msgid "%d~year"
+msgid_plural "%d~years"
+msgstr[0] "%d~year"
+msgstr[1] "%d~years"
+
+#: g10/tofu.c:2360
+#, c-format
+msgid "%d~month"
+msgid_plural "%d~months"
+msgstr[0] "%d~month"
+msgstr[1] "%d~months"
+
+#: g10/tofu.c:2369
+#, c-format
+msgid "%d~day"
+msgid_plural "%d~days"
+msgstr[0] "%d~day"
+msgstr[1] "%d~days"
+
+#: g10/tofu.c:2378
+#, c-format
+msgid "%d~hour"
+msgid_plural "%d~hours"
+msgstr[0] "%d~hour"
+msgstr[1] "%d~hours"
+
+#: g10/tofu.c:2387
+#, c-format
+msgid "%d~minute"
+msgid_plural "%d~minutes"
+msgstr[0] "%d~minute"
+msgstr[1] "%d~minutes"
+
+#: g10/tofu.c:2396
+#, c-format
+msgid "%d~second"
+msgid_plural "%d~seconds"
+msgstr[0] "%d~second"
+msgstr[1] "%d~seconds"
+
+#: g10/tofu.c:2484
+#, c-format
+msgid "Have never verified a message signed by key %s!\n"
+msgstr "Have never verified a message signed by key %s!\n"
+
+#: g10/tofu.c:2513
+#, c-format
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
+msgstr ""
+"Failed to collect signature statistics for “[1m%s[0m”\n"
+"(key %s)\n"
+
+#: g10/tofu.c:2533
+#, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "Verified %ld messages signed by “[1m%s[0m”."
+
+#: g10/tofu.c:2544
+#, c-format
+msgid ""
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
+msgid_plural ""
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
+msgstr[0] ""
+"Verified %ld message signed by “[1m%s[0m”\n"
+"in the past %s."
+msgstr[1] ""
+"Verified %ld messages signed by “[1m%s[0m”\n"
+"in the past %s."
+
+#: g10/tofu.c:2555
+#, c-format
+msgid "The most recent message was verified %s ago."
+msgstr "The most recent message was verified %s ago."
+
+#: g10/tofu.c:2603
+msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgstr "Warning: we've have yet to see a message signed by this key!\n"
+
+#: g10/tofu.c:2606
+msgid "Warning: we've only seen a single message signed by this key!\n"
+msgstr "Warning: we've only seen a single message signed by this key!\n"
+
+#: g10/tofu.c:2614
+#, c-format
+msgid ""
+"Warning: if you think you've seen more than %ld message signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgid_plural ""
+"Warning: if you think you've seen more than %ld messages signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgstr[0] ""
+"Warning: if you think you've seen more than %ld message signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgstr[1] ""
+"Warning: if you think you've seen more than %ld messages signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+
+#: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
+#: g10/tofu.c:3058
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
+#: g10/trustdb.c:215
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "‘[1m%s[0m’ is not a valid long keyID\n"
+
+#: g10/trustdb.c:241
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
+#: g10/trustdb.c:279
+#, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "key %s occurs more than once in the trustdb\n"
+
+#: g10/trustdb.c:294
+#, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "key %s: no public key for trusted key - skipped\n"
+
+#: g10/trustdb.c:304
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
+#: g10/trustdb.c:340
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "trust record %lu, req type %d: read failed: %s\n"
+
+#: g10/trustdb.c:346
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "trust record %lu is not of requested type %d\n"
+
+#: g10/trustdb.c:421
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr "You may try to re-create the trustdb using the commands:\n"
+
+#: g10/trustdb.c:430
+msgid "If that does not work, please consult the manual\n"
+msgstr "If that does not work, please consult the manual\n"
+
+#: g10/trustdb.c:467
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
+
+#: g10/trustdb.c:473
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
+#: g10/trustdb.c:510
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:525
+#, c-format
+msgid "no need for a trustdb check with '%s' trust model\n"
+msgstr "no need for a trustdb check with ‘[1m%s[0m’ trust model\n"
+
+#: g10/trustdb.c:541
+#, c-format
+msgid "no need for a trustdb update with '%s' trust model\n"
+msgstr "no need for a trustdb update with ‘[1m%s[0m’ trust model\n"
+
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:965
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:970
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
+#, c-format
+msgid " (%d validity count cleared)\n"
+msgid_plural " (%d validity counts cleared)\n"
+msgstr[0] " (%d validity count cleared)\n"
+msgstr[1] " (%d validity counts cleared)\n"
+
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
+#, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "public key of ultimately trusted key %s not found\n"
+
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
+#, c-format
+msgid ""
+"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
+
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
+#, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "unable to update trustdb version record: write failed: %s\n"
+
+#: g10/trust.c:105
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trust.c:106
+msgid "never"
+msgstr "never"
+
+#: g10/trust.c:107
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trust.c:108
+msgid "full"
+msgstr "full"
+
+#: g10/trust.c:109
+msgid "ultimate"
+msgstr "ultimate"
+
+#. TRANSLATORS: these strings are similar to those in
+#. trust_value_to_string(), but are a fixed length. This is needed to
+#. make attractive information listings where columns line up
+#. properly. The value "10" should be the length of the strings you
+#. choose to translate to. This is the length in printable columns.
+#. It gets passed to atoi() so everything after the number is
+#. essentially a comment and need not be translated. Either key and
+#. uid are both NULL, or neither are NULL.
+#: g10/trust.c:146
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
+#: g10/trust.c:149
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trust.c:151 g10/trust.c:157
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trust.c:156
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trust.c:158
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: g10/trust.c:159
+msgid "[ never ]"
+msgstr "[ never ]"
+
+#: g10/trust.c:160
+msgid "[marginal]"
+msgstr "[marginal]"
+
+#: g10/trust.c:161
+msgid "[ full ]"
+msgstr "[ full ]"
+
+#: g10/trust.c:162
+msgid "[ultimate]"
+msgstr "[ultimate]"
+
+#: g10/verify.c:117
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+
+#: g10/verify.c:204
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "input line %u too long or missing LF\n"
+
+#: g10/verify.c:253
+#, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "can't open fd %d: %s\n"
+
+#: kbx/kbxutil.c:92
+msgid "set debugging flags"
+msgstr "set debugging flags"
+
+#: kbx/kbxutil.c:93
+msgid "enable full debugging"
+msgstr "enable full debugging"
+
+#: kbx/kbxutil.c:117
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Usage: kbxutil [options] [files] (-h for help)"
+
+#: kbx/kbxutil.c:120
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+msgstr ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+
+#: scd/app-nks.c:714 scd/app-openpgp.c:2995
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA modulus missing or not of size %d bits\n"
+
+#: scd/app-nks.c:722 scd/app-openpgp.c:3007
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA public exponent missing or larger than %d bits\n"
+
+#: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
+#: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
+#: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN callback returned error: %s\n"
+
+#: scd/app-nks.c:835
+msgid "the NullPIN has not yet been changed\n"
+msgstr "the NullPIN has not yet been changed\n"
+
+#: scd/app-nks.c:1096
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "|N|Please enter a new PIN for the standard keys."
+
+#: scd/app-nks.c:1097
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Please enter the PIN for the standard keys."
+
+#: scd/app-nks.c:1103
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+
+#: scd/app-nks.c:1105
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+
+#: scd/app-nks.c:1113
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
+
+#: scd/app-nks.c:1115
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Please enter the PIN for the key to create qualified signatures."
+
+#: scd/app-nks.c:1123
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+
+#: scd/app-nks.c:1125
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+
+#: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error getting new PIN: %s\n"
+
+#: scd/app-openpgp.c:805
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: scd/app-openpgp.c:818
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "failed to store the creation date: %s\n"
+
+#: scd/app-openpgp.c:1286
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: scd/app-openpgp.c:1322
+msgid "response does not contain the EC public point\n"
+msgstr "response does not contain the EC public point\n"
+
+#: scd/app-openpgp.c:1708
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: scd/app-openpgp.c:1715
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
+
+#: scd/app-openpgp.c:1730
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
+
+#: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN for CHV%d is too short; minimum length is %d\n"
+
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
+#: scd/app-openpgp.c:3937
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:1877
+#, c-format
+msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgid_plural ""
+"%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string. Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1887
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+
+#: scd/app-openpgp.c:1891
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:1912
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2265
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "Reset Code is too short; minimum length is %d\n"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:2298
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2299
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2299
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2370
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2371
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2443
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2447
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2449
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2451
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA prime %s missing or not of size %d bits\n"
+
+#: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3320
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3577
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3590
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3596
+#, c-format
+msgid "key generation completed (%d second)\n"
+msgid_plural "key generation completed (%d seconds)\n"
+msgstr[0] "key generation completed (%d second)\n"
+msgstr[1] "key generation completed (%d seconds)\n"
+
+#: scd/app-openpgp.c:3661
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:3711
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:3827
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:3912
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4365
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"verification of Admin PIN is currently prohibited through this command\n"
+
+#: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "can't access %s - invalid OpenPGP card?\n"
+
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's pinpad"
+msgstr "||Please enter your PIN at the reader's pinpad"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-dinsig.c:529
+msgid "|N|Initial New PIN"
+msgstr "|N|Initial New PIN"
+
+#: scd/scdaemon.c:114
+msgid "run in multi server mode (foreground)"
+msgstr "run in multi server mode (foreground)"
+
+#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
+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
++#: scd/scdaemon.c:287
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for @GNUPG@\n"
+msgstr ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for @GNUPG@\n"
+
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
+msgid "please use the option '--daemon' to run the program in the background\n"
+msgstr ""
+"please use the option ‘[1m--daemon[0m’ to run the program in the background\n"
+
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
+#, 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:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
+msgid "no dirmngr running in this session\n"
+msgstr "no dirmngr running in this session\n"
+
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr "validation model requested by certificate: %s"
+
+#: sm/certchain.c:195 sm/certchain.c:1919
+msgid "chain"
+msgstr "chain"
+
+#: sm/certchain.c:196 sm/certchain.c:1919
+msgid "shell"
+msgstr "shell"
+
+#: sm/certchain.c:256 dirmngr/validate.c:107
+#, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "critical certificate extension %s is not supported"
+
+#: sm/certchain.c:295 dirmngr/validate.c:205
+msgid "issuer certificate is not marked as a CA"
+msgstr "issuer certificate is not marked as a CA"
+
+#: sm/certchain.c:333
+msgid "critical marked policy without configured policies"
+msgstr "critical marked policy without configured policies"
+
+#: sm/certchain.c:343
+#, c-format
+msgid "failed to open '%s': %s\n"
+msgstr "failed to open '%s': %s\n"
+
+#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
+msgid "Note: non-critical certificate policy not allowed"
+msgstr "Note: non-critical certificate policy not allowed"
+
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
+msgid "certificate policy not allowed"
+msgstr "certificate policy not allowed"
+
+#: sm/certchain.c:527
+msgid "looking up issuer at external location\n"
+msgstr "looking up issuer at external location\n"
+
+#: sm/certchain.c:546
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr "number of issuers matching: %d\n"
+
+#: sm/certchain.c:590
+msgid "looking up issuer from the Dirmngr cache\n"
+msgstr "looking up issuer from the Dirmngr cache\n"
+
+#: sm/certchain.c:614
+#, c-format
+msgid "number of matching certificates: %d\n"
+msgstr "number of matching certificates: %d\n"
+
+#: sm/certchain.c:616
+#, c-format
+msgid "dirmngr cache-only key lookup failed: %s\n"
+msgstr "dirmngr cache-only key lookup failed: %s\n"
+
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
+#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
+msgid "failed to allocate keyDB handle\n"
+msgstr "failed to allocate keyDB handle\n"
+
+#: sm/certchain.c:981
+msgid "certificate has been revoked"
+msgstr "certificate has been revoked"
+
+#: sm/certchain.c:996
+msgid "the status of the certificate is unknown"
+msgstr "the status of the certificate is unknown"
+
+#: sm/certchain.c:1003
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr "please make sure that the “[1mdirmngr[0m” is properly installed\n"
+
+#: sm/certchain.c:1009
+#, c-format
+msgid "checking the CRL failed: %s"
+msgstr "checking the CRL failed: %s"
+
+#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
+#, 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:1223 sm/keydb.c:1321
+#, c-format
+msgid "error locking keybox: %s\n"
+msgstr "error locking keybox: %s\n"
+
+#: sm/delete.c:143
+#, c-format
+msgid "duplicated certificate '%s' deleted\n"
+msgstr "duplicated certificate ‘[1m%s[0m’ deleted\n"
+
+#: sm/delete.c:145
+#, c-format
+msgid "certificate '%s' deleted\n"
+msgstr "certificate ‘[1m%s[0m’ deleted\n"
+
+#: sm/delete.c:175
+#, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "deleting certificate “[1m%s[0m” failed: %s\n"
+
+#: sm/encrypt.c:328
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
+#: sm/gpgsm.c:207
+msgid "list external keys"
+msgstr "list external keys"
+
+#: sm/gpgsm.c:209
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
+#: sm/gpgsm.c:216
+msgid "import certificates"
+msgstr "import certificates"
+
+#: sm/gpgsm.c:217
+msgid "export certificates"
+msgstr "export certificates"
+
+#: sm/gpgsm.c:225
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
+#: sm/gpgsm.c:228
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
+#: sm/gpgsm.c:230
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
+#: sm/gpgsm.c:246
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:254
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
+#: sm/gpgsm.c:256
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
+#: sm/gpgsm.c:258
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
+#: sm/gpgsm.c:265
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
+#: sm/gpgsm.c:275
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
+#: sm/gpgsm.c:280
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
+#: sm/gpgsm.c:283
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:286
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
+#: sm/gpgsm.c:290
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:301
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: sm/gpgsm.c:303
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
+#: sm/gpgsm.c:308
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
+#: sm/gpgsm.c:311
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
+#: sm/gpgsm.c:312
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
+#: sm/gpgsm.c:313
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
+#: sm/gpgsm.c:316
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
+#: sm/gpgsm.c:319
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
+#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: sm/gpgsm.c:346
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
+#: sm/gpgsm.c:348
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
+#: sm/gpgsm.c:564
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
+#: sm/gpgsm.c:567
+msgid ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+msgstr ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+
+#: sm/gpgsm.c:771
+#, c-format
+msgid "Note: won't be able to encrypt to '%s': %s\n"
+msgstr "Note: won't be able to encrypt to '%s': %s\n"
+
+#: sm/gpgsm.c:782
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘[1m%s[0m’\n"
+
+#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%s:%u: no hostname given\n"
+
+#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: password given without user\n"
+
+#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
+#: sm/gpgsm.c:1433
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
+#: sm/gpgsm.c:1632
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘[1m%s[0m’\n"
+
+#: sm/gpgsm.c:1673
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
+#: sm/gpgsm.c:2029
+msgid "invalid command (there is no implicit command)\n"
+msgstr "invalid command (there is no implicit command)\n"
+
+#: sm/import.c:127
+#, c-format
+msgid "total number processed: %lu\n"
+msgstr "total number processed: %lu\n"
+
+#: sm/import.c:246
+msgid "error storing certificate\n"
+msgstr "error storing certificate\n"
+
+#: sm/import.c:254
+msgid "basic certificate checks failed - not imported\n"
+msgstr "basic certificate checks failed - not imported\n"
+
+#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
+#, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error getting stored flags: %s\n"
+
+#: sm/import.c:526 sm/import.c:558
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:746 tools/gpg-connect-agent.c:1433
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
+#: sm/keydb.c:1120 sm/keydb.c:1206
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/keydb.c:1162
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
+#: sm/keydb.c:1174
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
+#: sm/keydb.c:1182
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
+#: sm/keydb.c:1234
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
+#: sm/keydb.c:1255 sm/keydb.c:1344
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
+#: sm/keylist.c:658
+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:385
+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:389
+#, 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:169
+msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+
+#: dirmngr/dirmngr-client.c:173
+msgid ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+msgstr ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+
+#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#, c-format
+msgid "error reading certificate from stdin: %s\n"
+msgstr "error reading certificate from stdin: %s\n"
+
+#: dirmngr/dirmngr-client.c:281
+#, c-format
+msgid "error reading certificate from '%s': %s\n"
+msgstr "error reading certificate from '%s': %s\n"
+
+#: dirmngr/dirmngr-client.c:295
+msgid "certificate too large to make any sense\n"
+msgstr "certificate too large to make any sense\n"
+
+#: dirmngr/dirmngr-client.c:310
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "can't connect to the dirmngr: %s\n"
+
+#: dirmngr/dirmngr-client.c:332
+#, c-format
+msgid "lookup failed: %s\n"
+msgstr "lookup failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:347
+#, c-format
+msgid "loading CRL '%s' failed: %s\n"
+msgstr "loading CRL ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:375
+msgid "a dirmngr daemon is up and running\n"
+msgstr "a dirmngr daemon is up and running\n"
+
+#: dirmngr/dirmngr-client.c:397
+#, c-format
+msgid "validation of certificate failed: %s\n"
+msgstr "validation of certificate failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+msgid "certificate is valid\n"
+msgstr "certificate is valid\n"
+
+#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+msgid "certificate has been revoked\n"
+msgstr "certificate has been revoked\n"
+
+#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#, c-format
+msgid "certificate check failed: %s\n"
+msgstr "certificate check failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:428
+#, c-format
+msgid "got status: '%s'\n"
+msgstr "got status: ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr-client.c:443
+#, c-format
+msgid "error writing base64 encoding: %s\n"
+msgstr "error writing base64 encoding: %s\n"
+
+#: dirmngr/dirmngr-client.c:701
+#, c-format
+msgid "unsupported inquiry '%s'\n"
+msgstr "unsupported inquiry ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr-client.c:803
+msgid "absolute file name expected\n"
+msgstr "absolute file name expected\n"
+
+#: dirmngr/dirmngr-client.c:848
+#, c-format
+msgid "looking up '%s'\n"
+msgstr "looking up ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr.c:159
+msgid "run as windows service (background)"
+msgstr "run as windows service (background)"
+
+#: dirmngr/dirmngr.c:161
+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:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
+#: dirmngr/dirmngr.c:1123
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘[1m%s[0m’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr.c:1594
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
+#: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
+#: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
+#: dirmngr/dirmngr.c:1740
+#, c-format
+msgid "%s:%u: garbage at end of line ignored\n"
+msgstr "%s:%u: garbage at end of line ignored\n"
+
+#: dirmngr/dirmngr.c:1807
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
+#: dirmngr/dirmngr.c:1834
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
+#: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
+#: dirmngr/dirmngr.c:1841
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
+#: dirmngr/dirmngr.c:1854
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
+#: dirmngr/dirmngr.c:1861
+#, c-format
+msgid "signal %d received - no action defined\n"
+msgstr "signal %d received - no action defined\n"
+
+#: dirmngr/dirmngr_ldap.c:138
+msgid "return all values in a record oriented format"
+msgstr "return all values in a record oriented format"
+
+#: dirmngr/dirmngr_ldap.c:141
+msgid "|NAME|ignore host part and connect through NAME"
+msgstr "|NAME|ignore host part and connect through NAME"
+
+#: dirmngr/dirmngr_ldap.c:142
+msgid "|NAME|connect to host NAME"
+msgstr "|NAME|connect to host NAME"
+
+#: dirmngr/dirmngr_ldap.c:143
+msgid "|N|connect to port N"
+msgstr "|N|connect to port N"
+
+#: dirmngr/dirmngr_ldap.c:144
+msgid "|NAME|use user NAME for authentication"
+msgstr "|NAME|use user NAME for authentication"
+
+#: dirmngr/dirmngr_ldap.c:145
+msgid "|PASS|use password PASS for authentication"
+msgstr "|PASS|use password PASS for authentication"
+
+#: dirmngr/dirmngr_ldap.c:147
+msgid "take password from $DIRMNGR_LDAP_PASS"
+msgstr "take password from $DIRMNGR_LDAP_PASS"
+
+#: dirmngr/dirmngr_ldap.c:148
+msgid "|STRING|query DN STRING"
+msgstr "|STRING|query DN STRING"
+
+#: dirmngr/dirmngr_ldap.c:149
+msgid "|STRING|use STRING as filter expression"
+msgstr "|STRING|use STRING as filter expression"
+
+#: dirmngr/dirmngr_ldap.c:150
+msgid "|STRING|return the attribute STRING"
+msgstr "|STRING|return the attribute STRING"
+
+#: dirmngr/dirmngr_ldap.c:209
+msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+
+#: dirmngr/dirmngr_ldap.c:212
+msgid ""
+"Syntax: dirmngr_ldap [options] [URL]\n"
+"Internal LDAP helper for Dirmngr\n"
+"Interface and options may change without notice\n"
+msgstr ""
+"Syntax: dirmngr_ldap [options] [URL]\n"
+"Internal LDAP helper for Dirmngr\n"
+"Interface and options may change without notice\n"
+
+#: dirmngr/dirmngr_ldap.c:337
+#, c-format
+msgid "invalid port number %d\n"
+msgstr "invalid port number %d\n"
+
+#: dirmngr/dirmngr_ldap.c:413
+#, c-format
+msgid "scanning result for attribute '%s'\n"
+msgstr "scanning result for attribute ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
+#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
+#: dirmngr/dirmngr_ldap.c:677
+#, c-format
+msgid "error writing to stdout: %s\n"
+msgstr "error writing to stdout: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:437
+#, c-format
+msgid " available attribute '%s'\n"
+msgstr " available attribute ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:475
+#, c-format
+msgid "attribute '%s' not found\n"
+msgstr "attribute ‘[1m%s[0m’ not found\n"
+
+#: dirmngr/dirmngr_ldap.c:482
+#, c-format
+msgid "found attribute '%s'\n"
+msgstr "found attribute ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:591
+#, c-format
+msgid "processing url '%s'\n"
+msgstr "processing url ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:593
+#, c-format
+msgid " user '%s'\n"
+msgstr " user ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:595
+#, c-format
+msgid " pass '%s'\n"
+msgstr " pass ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:597
+#, c-format
+msgid " host '%s'\n"
+msgstr " host ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:598
+#, c-format
+msgid " port %d\n"
+msgstr " port %d\n"
+
+#: dirmngr/dirmngr_ldap.c:600
+#, c-format
+msgid " DN '%s'\n"
+msgstr " DN ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:602
+#, c-format
+msgid " filter '%s'\n"
+msgstr " filter ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
+#, c-format
+msgid " attr '%s'\n"
+msgstr " attr ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:616
+#, c-format
+msgid "no host name in '%s'\n"
+msgstr "no host name in ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:621
+#, c-format
+msgid "no attribute given for query '%s'\n"
+msgstr "no attribute given for query ‘[1m%s[0m’\n"
+
+#: dirmngr/dirmngr_ldap.c:627
+msgid "WARNING: using first attribute only\n"
+msgstr "WARNING: using first attribute only\n"
+
+#: dirmngr/dirmngr_ldap.c:636
+#, c-format
+msgid "LDAP init to '%s:%d' failed: %s\n"
+msgstr "LDAP init to ‘[1m%s:%d[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:659
+#, c-format
+msgid "binding to '%s:%d' failed: %s\n"
+msgstr "binding to ‘[1m%s:%d[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:686
+#, c-format
+msgid "searching '%s' failed: %s\n"
+msgstr "searching ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:718
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘[1m%s[0m’ is not an LDAP URL\n"
+
+#: dirmngr/dirmngr_ldap.c:724
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "‘[1m%s[0m’ is an invalid LDAP URL\n"
+
+#: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
+#: dirmngr/ldap-wrapper.c:693
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "error allocating memory: %s\n"
+
+#: dirmngr/ldap-wrapper.c:207
+#, c-format
+msgid "error printing log line: %s\n"
+msgstr "error printing log line: %s\n"
+
+#: dirmngr/ldap-wrapper.c:236
+#, c-format
+msgid "error reading log from ldap wrapper %d: %s\n"
+msgstr "error reading log from ldap wrapper %d: %s\n"
+
+#: dirmngr/ldap-wrapper.c:304
+#, c-format
+msgid "npth_select failed: %s - waiting 1s\n"
+msgstr "npth_select failed: %s - waiting 1s\n"
+
+#: dirmngr/ldap-wrapper.c:343
+#, c-format
+msgid "ldap wrapper %d ready"
+msgstr "ldap wrapper %d ready"
+
+#: dirmngr/ldap-wrapper.c:352
+#, c-format
+msgid "ldap wrapper %d ready: timeout\n"
+msgstr "ldap wrapper %d ready: timeout\n"
+
+#: dirmngr/ldap-wrapper.c:355
+#, c-format
+msgid "ldap wrapper %d ready: exitcode=%d\n"
+msgstr "ldap wrapper %d ready: exitcode=%d\n"
+
+#: dirmngr/ldap-wrapper.c:364
+#, c-format
+msgid "waiting for ldap wrapper %d failed: %s\n"
+msgstr "waiting for ldap wrapper %d failed: %s\n"
+
+#: dirmngr/ldap-wrapper.c:376
+#, c-format
+msgid "ldap wrapper %d stalled - killing\n"
+msgstr "ldap wrapper %d stalled - killing\n"
+
+#: dirmngr/ldap-wrapper.c:444
+#, c-format
+msgid "error spawning ldap wrapper reaper thread: %s\n"
+msgstr "error spawning ldap wrapper reaper thread: %s\n"
+
+#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
+#, c-format
+msgid "reading from ldap wrapper %d failed: %s\n"
+msgstr "reading from ldap wrapper %d failed: %s\n"
+
+#: dirmngr/ldap.c:91
+#, c-format
+msgid "invalid char 0x%02x in host name - not added\n"
+msgstr "invalid char 0x%02x in host name - not added\n"
+
+#: dirmngr/ldap.c:95
+#, c-format
+msgid "adding '%s:%d' to the ldap server list\n"
+msgstr "adding ‘[1m%s:%d[0m’ to the ldap server list\n"
+
+#: dirmngr/ldap.c:98 dirmngr/misc.c:502
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
+#: dirmngr/ldap.c:627
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘[1m%s[0m’\n"
+
+#: dirmngr/ldap.c:840
+msgid "ldap_search hit the size limit of the server\n"
+msgstr "ldap_search hit the size limit of the server\n"
+
+#: dirmngr/misc.c:170
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: dirmngr/misc.c:194 dirmngr/misc.c:228
+#, c-format
+msgid "gcry_md_open failed: %s\n"
+msgstr "gcry_md_open failed: %s\n"
+
+#: dirmngr/misc.c:199 dirmngr/misc.c:233
+#, c-format
+msgid "oops: ksba_cert_hash failed: %s\n"
+msgstr "oops: ksba_cert_hash failed: %s\n"
+
+#: dirmngr/misc.c:518
+msgid "bad URL encoding detected\n"
+msgstr "bad URL encoding detected\n"
+
+#: dirmngr/ocsp.c:80
+#, c-format
+msgid "error reading from responder: %s\n"
+msgstr "error reading from responder: %s\n"
+
+#: dirmngr/ocsp.c:98
+#, c-format
+msgid "response from server too large; limit is %d bytes\n"
+msgstr "response from server too large; limit is %d bytes\n"
+
+#: dirmngr/ocsp.c:139
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "OCSP request not possible due to Tor mode\n"
+
+#: dirmngr/ocsp.c:145
+msgid "OCSP request not possible due to disabled HTTP\n"
+msgstr "OCSP request not possible due to disabled HTTP\n"
+
+#: dirmngr/ocsp.c:152
+#, c-format
+msgid "error setting OCSP target: %s\n"
+msgstr "error setting OCSP target: %s\n"
+
+#: dirmngr/ocsp.c:170
+#, c-format
+msgid "error building OCSP request: %s\n"
+msgstr "error building OCSP request: %s\n"
+
+#: dirmngr/ocsp.c:181
+#, c-format
+msgid "error connecting to '%s': %s\n"
+msgstr "error connecting to '%s': %s\n"
+
+#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
+#, c-format
+msgid "error reading HTTP response for '%s': %s\n"
+msgstr "error reading HTTP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:240
+#, c-format
+msgid "error accessing '%s': http status %u\n"
+msgstr "error accessing '%s': http status %u\n"
+
+#: dirmngr/ocsp.c:265
+#, c-format
+msgid "error parsing OCSP response for '%s': %s\n"
+msgstr "error parsing OCSP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
+#, c-format
+msgid "OCSP responder at '%s' status: %s\n"
+msgstr "OCSP responder at ‘[1m%s[0m’ status: %s\n"
+
+#: dirmngr/ocsp.c:293
+#, c-format
+msgid "hashing the OCSP response for '%s' failed: %s\n"
+msgstr "hashing the OCSP response for ‘[1m%s[0m’ failed: %s\n"
+
+#: dirmngr/ocsp.c:328
+msgid "not signed by a default OCSP signer's certificate"
+msgstr "not signed by a default OCSP signer's certificate"
+
+#: dirmngr/ocsp.c:417
+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:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
+#, 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:2466
++#: dirmngr/server.c:2475
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
+#, 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:91 tools/symcryptrun.c:167
+msgid "quiet"
+msgstr "quiet"
+
+#: tools/gpg-connect-agent.c:79
+msgid "print data out hex encoded"
+msgstr "print data out hex encoded"
+
+#: tools/gpg-connect-agent.c:80
+msgid "decode received data lines"
+msgstr "decode received data lines"
+
+#: tools/gpg-connect-agent.c:81
+msgid "connect to the dirmngr"
+msgstr "connect to the dirmngr"
+
+#: tools/gpg-connect-agent.c:84
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr "|NAME|connect to Assuan socket NAME"
+
+#: tools/gpg-connect-agent.c:86
+msgid "|ADDR|connect to Assuan server at ADDR"
+msgstr "|ADDR|connect to Assuan server at ADDR"
+
+#: tools/gpg-connect-agent.c:88
+msgid "run the Assuan server given on the command line"
+msgstr "run the Assuan server given on the command line"
+
+#: tools/gpg-connect-agent.c:90
+msgid "do not use extended connect mode"
+msgstr "do not use extended connect mode"
+
+#: tools/gpg-connect-agent.c:92
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FILE|run commands from FILE on startup"
+
+#: tools/gpg-connect-agent.c:93
+msgid "run /subst on startup"
+msgstr "run /subst on startup"
+
+#: tools/gpg-connect-agent.c:205
+msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
+msgstr "Usage: @GPG at -connect-agent [options] (-h for help)"
+
+#: tools/gpg-connect-agent.c:208
+msgid ""
+"Syntax: @GPG at -connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+"Syntax: @GPG at -connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+
+#: tools/gpg-connect-agent.c:1247
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr "option “[1m%s[0m” requires a program and optional arguments\n"
+
+#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
+#: tools/gpg-connect-agent.c:1270
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr "option “[1m%s[0m” ignored due to “[1m%s[0m”\n"
+
+#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
+#, c-format
+msgid "receiving line failed: %s\n"
+msgstr "receiving line failed: %s\n"
+
+#: tools/gpg-connect-agent.c:1458
+msgid "line too long - skipped\n"
+msgstr "line too long - skipped\n"
+
+#: tools/gpg-connect-agent.c:1462
+msgid "line shortened due to embedded Nul character\n"
+msgstr "line shortened due to embedded Nul character\n"
+
+#: tools/gpg-connect-agent.c:1837
+#, c-format
+msgid "unknown command '%s'\n"
+msgstr "unknown command ‘[1m%s[0m’\n"
+
+#: tools/gpg-connect-agent.c:1855
+#, c-format
+msgid "sending line failed: %s\n"
+msgstr "sending line failed: %s\n"
+
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
+#, c-format
+msgid "error sending standard options: %s\n"
+msgstr "error sending standard options: %s\n"
+
+#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
+#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
+#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: tools/gpgconf-comp.c:528
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
+#: tools/gpgconf-comp.c:532
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:536
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:560
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: tools/gpgconf-comp.c:563
+msgid "do not allow to bypass the passphrase policy"
+msgstr "do not allow to bypass the passphrase policy"
+
+#: tools/gpgconf-comp.c:567
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|set minimal required length for new passphrases to N"
+
+#: tools/gpgconf-comp.c:571
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|require at least N non-alpha characters for a new passphrase"
+
+#: tools/gpgconf-comp.c:575
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: tools/gpgconf-comp.c:579
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: tools/gpgconf-comp.c:583
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: tools/gpgconf-comp.c:587
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:704
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:735
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:738
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:787
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:790
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:820
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:869
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:905
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:915
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:929
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:940
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:945
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:974
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:982
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1063
+msgid "GPG for OpenPGP"
+msgstr "GPG for OpenPGP"
+
+#: tools/gpgconf-comp.c:1064
+msgid "GPG Agent"
+msgstr "GPG Agent"
+
+#: tools/gpgconf-comp.c:1065
+msgid "Smartcard Daemon"
+msgstr "Smartcard Daemon"
+
+#: tools/gpgconf-comp.c:1066
+msgid "GPG for S/MIME"
+msgstr "GPG for S/MIME"
+
+#: tools/gpgconf-comp.c:1067
+msgid "Key Acquirer"
+msgstr "Key Acquirer"
+
+#: tools/gpgconf-comp.c:1068
+msgid "PIN and Passphrase Entry"
+msgstr "PIN and Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1182
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3240
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3391
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
+#: tools/gpgconf.c:68
+msgid "list all components"
+msgstr "list all components"
+
+#: tools/gpgconf.c:69
+msgid "check all programs"
+msgstr "check all programs"
+
+#: tools/gpgconf.c:70
+msgid "|COMPONENT|list options"
+msgstr "|COMPONENT|list options"
+
+#: tools/gpgconf.c:71
+msgid "|COMPONENT|change options"
+msgstr "|COMPONENT|change options"
+
+#: tools/gpgconf.c:72
+msgid "|COMPONENT|check options"
+msgstr "|COMPONENT|check options"
+
+#: tools/gpgconf.c:74
+msgid "apply global default values"
+msgstr "apply global default values"
+
+#: tools/gpgconf.c:76
+msgid "get the configuration directories for @GPGCONF@"
+msgstr "get the configuration directories for @GPGCONF@"
+
+#: tools/gpgconf.c:78
+msgid "list global configuration file"
+msgstr "list global configuration file"
+
+#: tools/gpgconf.c:80
+msgid "check global configuration file"
+msgstr "check global configuration file"
+
+#: tools/gpgconf.c:81
+msgid "reload all or a given component"
+msgstr "reload all or a given component"
+
+#: tools/gpgconf.c:82
+msgid "launch a given component"
+msgstr "launch a given component"
+
+#: tools/gpgconf.c:83
+msgid "kill a given component"
+msgstr "kill a given component"
+
+#: tools/gpgconf.c:89
+msgid "use as output file"
+msgstr "use as output file"
+
+#: tools/gpgconf.c:93
+msgid "activate changes at runtime, if possible"
+msgstr "activate changes at runtime, if possible"
+
+#: tools/gpgconf.c:116
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
+#: tools/gpgconf.c:119
+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:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
+msgid "Component not found"
+msgstr "Component not found"
+
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
+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:991
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr "either %s or %s must be given\n"
+
+#: tools/symcryptrun.c:1018
+msgid "no class provided\n"
+msgstr "no class provided\n"
+
+#: tools/symcryptrun.c:1027
+#, 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 09cc345,0000000..4794a5a
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,10594 -1,0 +1,10623 @@@
+# 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.13\n"
++"Project-Id-Version: GNU gnupg 2.1.14\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-06-16 17:27+0200\n"
- "PO-Revision-Date: 2016-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+0200\n"
++"PO-Revision-Date: 2016-07-14 16:03+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agent/call-pinentry.c:257
+#, c-format
+msgid "failed to acquire the pinentry lock: %s\n"
+msgstr "failed to acquire the pinentry lock: %s\n"
+
+#. TRANSLATORS: These are labels for buttons etc used in
+#. Pinentries. An underscore indicates that the next letter
+#. should be used as an accelerator. Double the underscore for
+#. a literal one. The actual to be translated text starts after
+#. the second vertical bar. Note that gpg-agent has been set to
+#. utf-8 so that the strings are in the expected encoding.
+#: agent/call-pinentry.c:447
+msgid "|pinentry-label|_OK"
+msgstr "|pinentry-label|_OK"
+
+#: agent/call-pinentry.c:448
+msgid "|pinentry-label|_Cancel"
+msgstr "|pinentry-label|_Cancel"
+
+#: agent/call-pinentry.c:449
+msgid "|pinentry-label|_Yes"
+msgstr "|pinentry-label|_Yes"
+
+#: agent/call-pinentry.c:450
+msgid "|pinentry-label|_No"
+msgstr "|pinentry-label|_No"
+
+#: agent/call-pinentry.c:451
+msgid "|pinentry-label|PIN:"
+msgstr "|pinentry-label|PIN:"
+
+#: agent/call-pinentry.c:452
+msgid "|pinentry-label|_Save in password manager"
+msgstr "|pinentry-label|_Save in password manager"
+
+#: agent/call-pinentry.c:453
+msgid "Do you really want to make your passphrase visible on the screen?"
+msgstr "Do you really want to make your passphrase visible on the screen?"
+
+#: agent/call-pinentry.c:455
+msgid "|pinentry-tt|Make passphrase visible"
+msgstr "|pinentry-tt|Make passphrase visible"
+
+#: agent/call-pinentry.c:456
+msgid "|pinentry-tt|Hide passphrase"
+msgstr "|pinentry-tt|Hide passphrase"
+
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:736
+msgid "Quality:"
+msgstr "Quality:"
+
+#. TRANSLATORS: This string is a tooltip, shown by pinentry when
+#. hovering over the quality bar. Please use an appropriate
+#. string to describe what this is about. The length of the
+#. tooltip is limited to about 900 characters. If you do not
+#. translate this entry, a default english text (see source)
+#. will be used.
+#: agent/call-pinentry.c:758
+msgid "pinentry.qualitybar.tooltip"
+msgstr "pinentry.qualitybar.tooltip"
+
+#: agent/call-pinentry.c:868
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+
+#: agent/call-pinentry.c:871
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
+msgid "PIN:"
+msgstr "PIN:"
+
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
+#: agent/protect-tool.c:721 tools/symcryptrun.c:443
+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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
+#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
+#, 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:1268
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/divert-scd.c:93 g10/call-agent.c:1269
+msgid "Please remove the current card and insert the one with serial number"
+msgstr "Please remove the current card and insert the one with serial number"
+
+#: agent/divert-scd.c:204
+msgid "Admin PIN"
+msgstr "Admin PIN"
+
+#. TRANSLATORS: A PUK is the Personal Unblocking Code
+#. used to unblock a PIN.
+#: agent/divert-scd.c:209
+msgid "PUK"
+msgstr "PUK"
+
+#: agent/divert-scd.c:216
+msgid "Reset Code"
+msgstr "Reset Code"
+
+#: agent/divert-scd.c:242
+#, c-format
+msgid "%s%%0A%%0AUse the reader's pinpad for input."
+msgstr "%s%%0A%%0AUse the reader's pinpad for input."
+
+#: agent/divert-scd.c:291
+msgid "Repeat this Reset Code"
+msgstr "Repeat this Reset Code"
+
+#: agent/divert-scd.c:293
+msgid "Repeat this PUK"
+msgstr "Repeat this PUK"
+
+#: agent/divert-scd.c:294
+msgid "Repeat this PIN"
+msgstr "Repeat this PIN"
+
+#: agent/divert-scd.c:299
+msgid "Reset Code not correctly repeated; try again"
+msgstr "Reset Code not correctly repeated; try again"
+
+#: agent/divert-scd.c:301
+msgid "PUK not correctly repeated; try again"
+msgstr "PUK not correctly repeated; try again"
+
+#: agent/divert-scd.c:302
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
+#: agent/divert-scd.c:314
+#, c-format
+msgid "Please enter the PIN%s%s%s to unlock the card"
+msgstr "Please enter the PIN%s%s%s to unlock the card"
+
+#: agent/genkey.c:110 sm/certreqgen-ui.c:394
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creating temporary file: %s\n"
+
+#: agent/genkey.c:117
+#, c-format
+msgid "error writing to temporary file: %s\n"
+msgstr "error writing to temporary file: %s\n"
+
+#: agent/genkey.c:158 agent/genkey.c:164
+msgid "Enter new passphrase"
+msgstr "Enter new passphrase"
+
+#: agent/genkey.c:172
+msgid "Take this one anyway"
+msgstr "Take this one anyway"
+
+#: agent/genkey.c:202
+#, c-format
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgstr ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+
+#: agent/genkey.c:204
+#, c-format
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+
+#: agent/genkey.c:216
+msgid "Yes, protection is not needed"
+msgstr "Yes, protection is not needed"
+
+#: agent/genkey.c:233
+#, c-format
+msgid "A passphrase should be at least %u character long."
+msgid_plural "A passphrase should be at least %u characters long."
+msgstr[0] "A passphrase should be at least %u character long."
+msgstr[1] "A passphrase should be at least %u characters long."
+
+#: agent/genkey.c:252
+#, c-format
+msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
+msgid_plural ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+msgstr[0] ""
+"A passphrase should contain at least %u digit or%%0Aspecial character."
+msgstr[1] ""
+"A passphrase should contain at least %u digits or%%0Aspecial characters."
+
+#: agent/genkey.c:278
+#, c-format
+msgid "A passphrase may not be a known term or match%%0Acertain pattern."
+msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
+
+#: agent/genkey.c:293
+msgid "Warning: You have entered an insecure passphrase."
+msgstr "Warning: You have entered an insecure passphrase."
+
+#: agent/genkey.c:480
+#, c-format
+msgid "Please enter the passphrase to%0Aprotect your new key"
+msgstr "Please enter the passphrase to%0Aprotect your new key"
+
+#: agent/genkey.c:606
+msgid "Please enter the new passphrase"
+msgstr "Please enter the new passphrase"
+
+#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
+msgid ""
+"@Options:\n"
+" "
+msgstr ""
+"@Options:\n"
+" "
+
+#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
+msgid "run in daemon mode (background)"
+msgstr "run in daemon mode (background)"
+
+#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
+msgid "run in server mode (foreground)"
+msgstr "run in server mode (foreground)"
+
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
+msgid "verbose"
+msgstr "verbose"
+
+#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
+#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
+#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
+msgid "sh-style command output"
+msgstr "sh-style command output"
+
+#: 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: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: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:167
+msgid "do not grab keyboard and mouse"
+msgstr "do not grab keyboard and mouse"
+
+#: 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:170
+msgid "|PGM|use PGM as the PIN-Entry program"
+msgstr "|PGM|use PGM as the PIN-Entry program"
+
+#: 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:177
+msgid "do not use the SCdaemon"
+msgstr "do not use the SCdaemon"
+
+#: agent/gpg-agent.c:181
+msgid "|NAME|accept some commands via NAME"
+msgstr "|NAME|accept some commands via NAME"
+
+#: agent/gpg-agent.c:197
+msgid "ignore requests to change the TTY"
+msgstr "ignore requests to change the TTY"
+
+#: 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:202
+msgid "|N|expire cached PINs after N seconds"
+msgstr "|N|expire cached PINs after N seconds"
+
+#: 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:218
+msgid "disallow the use of an external password cache"
+msgstr "disallow the use of an external password cache"
+
+#: 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:223
+msgid "allow presetting passphrase"
+msgstr "allow presetting passphrase"
+
+#: agent/gpg-agent.c:225
+msgid "disallow caller to override the pinentry"
+msgstr "disallow caller to override the pinentry"
+
+#: 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:230
+msgid "enable ssh support"
+msgstr "enable ssh support"
+
+#: 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:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
+msgid "Please report bugs to <@EMAIL@>.\n"
+msgstr "Please report bugs to <@EMAIL@>.\n"
+
+#: 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: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:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
+#, c-format
+msgid "%s is too old (need %s, have %s)\n"
+msgstr "%s is too old (need %s, have %s)\n"
+
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
+#, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Note: no default option file ‘%s’\n"
+
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "option file '%s': %s\n"
+
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
+#, c-format
+msgid "reading options from '%s'\n"
+msgstr "reading options from ‘%s’\n"
+
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
+#, c-format
+msgid "Note: '%s' is not considered an option\n"
+msgstr "Note: ‘%s’ is not considered an option\n"
+
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
+#, c-format
+msgid "can't create socket: %s\n"
+msgstr "can't create socket: %s\n"
+
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
+#, c-format
+msgid "socket name '%s' is too long\n"
+msgstr "socket name ‘%s’ is too long\n"
+
+#: agent/gpg-agent.c:1844
+msgid "a gpg-agent is already running - not starting a new one\n"
+msgstr "a gpg-agent is already running - not starting a new one\n"
+
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
+msgid "error getting nonce for the socket\n"
+msgstr "error getting nonce for the socket\n"
+
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
+#, c-format
+msgid "error binding socket to '%s': %s\n"
+msgstr "error binding socket to '%s': %s\n"
+
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
+#, c-format
+msgid "can't set permissions of '%s': %s\n"
+msgstr "can't set permissions of '%s': %s\n"
+
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
+#, c-format
+msgid "listen() failed: %s\n"
+msgstr "listen() failed: %s\n"
+
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
+#, c-format
+msgid "listening on socket '%s'\n"
+msgstr "listening on socket ‘%s’\n"
+
+#: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
+#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
+#, c-format
+msgid "can't create directory '%s': %s\n"
+msgstr "can't create directory '%s': %s\n"
+
+#: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
+#, c-format
+msgid "directory '%s' created\n"
+msgstr "directory ‘%s’ created\n"
+
+#: agent/gpg-agent.c:1954
+#, c-format
+msgid "stat() failed for '%s': %s\n"
+msgstr "stat() failed for '%s': %s\n"
+
+#: agent/gpg-agent.c:1958
+#, c-format
+msgid "can't use '%s' as home directory\n"
+msgstr "can't use ‘%s’ as home directory\n"
+
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
+#, c-format
+msgid "error reading nonce on fd %d: %s\n"
+msgstr "error reading nonce on fd %d: %s\n"
+
+#: agent/gpg-agent.c:2307
+#, c-format
+msgid "handler 0x%lx for fd %d started\n"
+msgstr "handler 0x%lx for fd %d started\n"
+
+#: agent/gpg-agent.c:2312
+#, c-format
+msgid "handler 0x%lx for fd %d terminated\n"
+msgstr "handler 0x%lx for fd %d terminated\n"
+
+#: agent/gpg-agent.c:2385
+#, c-format
+msgid "ssh handler 0x%lx for fd %d started\n"
+msgstr "ssh handler 0x%lx for fd %d started\n"
+
+#: agent/gpg-agent.c:2390
+#, c-format
+msgid "ssh handler 0x%lx for fd %d terminated\n"
+msgstr "ssh handler 0x%lx for fd %d terminated\n"
+
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
+#, c-format
+msgid "npth_pselect failed: %s - waiting 1s\n"
+msgstr "npth_pselect failed: %s - waiting 1s\n"
+
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
+#, c-format
+msgid "%s %s stopped\n"
+msgstr "%s %s stopped\n"
+
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
+msgid "no gpg-agent running in this session\n"
+msgstr "no gpg-agent running in this session\n"
+
+#: agent/preset-passphrase.c:99
+msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+msgstr "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
+
+#: agent/preset-passphrase.c:102
+msgid ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+msgstr ""
+"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
+"Password cache maintenance\n"
+
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: agent/protect-tool.c:154
+msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
+msgstr "Usage: gpg-protect-tool [options] (-h for help)\n"
+
+#: agent/protect-tool.c:156
+msgid ""
+"Syntax: gpg-protect-tool [options] [args]\n"
+"Secret key maintenance tool\n"
+msgstr ""
+"Syntax: gpg-protect-tool [options] [args]\n"
+"Secret key maintenance tool\n"
+
+#: agent/protect-tool.c:700
+msgid "Please enter the passphrase to unprotect the PKCS#12 object."
+msgstr "Please enter the passphrase to unprotect the PKCS#12 object."
+
+#: agent/protect-tool.c:705
+msgid "Please enter the passphrase to protect the new PKCS#12 object."
+msgstr "Please enter the passphrase to protect the new PKCS#12 object."
+
+#: agent/protect-tool.c:711
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+msgstr ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
+
+#: agent/protect-tool.c:716
+msgid ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+msgstr ""
+"Please enter the passphrase or the PIN\n"
+"needed to complete this operation."
+
+#: agent/protect-tool.c:727 tools/symcryptrun.c:454
+msgid "cancelled\n"
+msgstr "cancelled\n"
+
+#: agent/protect-tool.c:729 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:362 dirmngr/dirmngr.c:1579
+#, c-format
+msgid "error opening '%s': %s\n"
+msgstr "error opening '%s': %s\n"
+
+#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#, c-format
+msgid "file '%s', line %d: %s\n"
+msgstr "file '%s', line %d: %s\n"
+
+#: agent/trustlist.c:192 agent/trustlist.c:200
+#, c-format
+msgid "statement \"%s\" ignored in '%s', line %d\n"
+msgstr "statement “%s” ignored in '%s', line %d\n"
+
+#: agent/trustlist.c:206
+#, c-format
+msgid "system trustlist '%s' not available\n"
+msgstr "system trustlist ‘%s’ not available\n"
+
+#: agent/trustlist.c:250
+#, c-format
+msgid "bad fingerprint in '%s', line %d\n"
+msgstr "bad fingerprint in '%s', line %d\n"
+
+#: agent/trustlist.c:275 agent/trustlist.c:282
+#, c-format
+msgid "invalid keyflag in '%s', line %d\n"
+msgstr "invalid keyflag in '%s', line %d\n"
+
+#: agent/trustlist.c:316 common/helpfile.c:136
+#, c-format
+msgid "error reading '%s', line %d: %s\n"
+msgstr "error reading '%s', line %d: %s\n"
+
+#: agent/trustlist.c:434 agent/trustlist.c:503
+msgid "error reading list of trusted root certificates\n"
+msgstr "error reading list of trusted root certificates\n"
+
+#. TRANSLATORS: This prompt is shown by the Pinentry
+#. and has one special property: A "%%0A" is used by
+#. Pinentry to insert a line break. The double
+#. percent sign is actually needed because it is also
+#. a printf format string. If you need to insert a
+#. plain % sign, you need to encode it as "%%25". The
+#. "%s" gets replaced by the name as stored in the
+#. certificate.
+#: agent/trustlist.c:664
+#, c-format
+msgid ""
+"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
+"certificates?"
+msgstr ""
+"Do you ultimately trust%%0A “%s”%%0Ato correctly certify user certificates?"
+
+#: agent/trustlist.c:673 common/audit.c:467
+msgid "Yes"
+msgstr "Yes"
+
+#: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
+#: common/audit.c:469
+msgid "No"
+msgstr "No"
+
+#. TRANSLATORS: This prompt is shown by the Pinentry and has
+#. one special property: A "%%0A" is used by Pinentry to
+#. insert a line break. The double percent sign is actually
+#. needed because it is also a printf format string. If you
+#. need to insert a plain % sign, you need to encode it as
+#. "%%25". The second "%s" gets replaced by a hexdecimal
+#. fingerprint string whereas the first one receives the name
+#. as stored in the certificate.
+#: agent/trustlist.c:707
+#, c-format
+msgid ""
+"Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the "
+"fingerprint:%%0A %s"
+msgstr ""
+"Please verify that the certificate identified as:%%0A “%s”%%0Ahas the "
+"fingerprint:%%0A %s"
+
+#. TRANSLATORS: "Correct" is the label of a button and intended
+#. to be hit if the fingerprint matches the one of the CA. The
+#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:721
+msgid "Correct"
+msgstr "Correct"
+
+#: agent/trustlist.c:721
+msgid "Wrong"
+msgstr "Wrong"
+
+#: agent/findkey.c:252
+#, c-format
+msgid "Note: This passphrase has never been changed.%0APlease change it now."
+msgstr "Note: This passphrase has never been changed.%0APlease change it now."
+
+#: agent/findkey.c:268
+#, c-format
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
+"it now."
+msgstr ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
+"it now."
+
+#: agent/findkey.c:282 agent/findkey.c:289
+msgid "Change passphrase"
+msgstr "Change passphrase"
+
+#: agent/findkey.c:290
+msgid "I'll change it later"
+msgstr "I'll change it later"
+
+#: agent/findkey.c:1429
+#, c-format
+msgid ""
+"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
+"%%0A?"
+msgstr ""
+"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
+"%%0A?"
+
+#: agent/findkey.c:1453 agent/findkey.c:1467
+msgid "Delete key"
+msgstr "Delete key"
+
+#: agent/findkey.c:1464
+msgid ""
+"Warning: This key is also listed for use with SSH!\n"
+"Deleting the key might remove your ability to access remote machines."
+msgstr ""
+"Warning: This key is also listed for use with SSH!\n"
+"Deleting the key might remove your ability to access remote machines."
+
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
+msgid "DSA requires the hash length to be a multiple of 8 bits\n"
+msgstr "DSA requires the hash length to be a multiple of 8 bits\n"
+
+#: agent/pksign.c:187 sm/certcheck.c:97
+#, c-format
+msgid "%s key uses an unsafe (%u bit) hash\n"
+msgstr "%s key uses an unsafe (%u bit) hash\n"
+
+#: agent/pksign.c:204
+#, c-format
+msgid "a %zu bit hash is not valid for a %u bit %s key\n"
+msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
+
+#: agent/pksign.c:512
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "checking created signature failed: %s\n"
+
+#: agent/cvt-openpgp.c:338
+msgid "secret key parts are not available\n"
+msgstr "secret key parts are not available\n"
+
+#: agent/cvt-openpgp.c:344
+#, c-format
+msgid "public key algorithm %d (%s) is not supported\n"
+msgstr "public key algorithm %d (%s) is not supported\n"
+
+#: agent/cvt-openpgp.c:448
+#, c-format
+msgid "protection algorithm %d (%s) is not supported\n"
+msgstr "protection algorithm %d (%s) is not supported\n"
+
+#: agent/cvt-openpgp.c:455
+#, c-format
+msgid "protection hash algorithm %d (%s) is not supported\n"
+msgstr "protection hash algorithm %d (%s) is not supported\n"
+
+#: common/exechelp-posix.c:361 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
+#, c-format
+msgid "error creating a pipe: %s\n"
+msgstr "error creating a pipe: %s\n"
+
+#: common/exechelp-posix.c:374 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
+#, c-format
+msgid "error creating a stream for a pipe: %s\n"
+msgstr "error creating a stream for a pipe: %s\n"
+
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
+#, c-format
+msgid "error forking process: %s\n"
+msgstr "error forking process: %s\n"
+
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
+#, c-format
+msgid "waiting for processes to terminate failed: %s\n"
+msgstr "waiting for processes to terminate failed: %s\n"
+
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
+#, c-format
+msgid "error running '%s': probably not installed\n"
+msgstr "error running '%s': probably not installed\n"
+
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
+#, c-format
+msgid "error running '%s': exit status %d\n"
+msgstr "error running '%s': exit status %d\n"
+
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
+#, c-format
+msgid "error running '%s': terminated\n"
+msgstr "error running '%s': terminated\n"
+
+#: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
+#, c-format
+msgid "error getting exit code of process %d: %s\n"
+msgstr "error getting exit code of process %d: %s\n"
+
+#: common/exechelp-w32ce.c:767
+#, c-format
+msgid "waiting for process %d to terminate failed: %s\n"
+msgstr "waiting for process %d to terminate failed: %s\n"
+
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
+#, c-format
+msgid "can't connect to '%s': %s\n"
+msgstr "can't connect to '%s': %s\n"
+
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
+msgid "communication problem with gpg-agent\n"
+msgstr "communication problem with gpg-agent\n"
+
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
+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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
+msgid "canceled by user\n"
+msgstr "canceled by user\n"
+
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
+msgid "problem with the agent\n"
+msgstr "problem with the agent\n"
+
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
+#, c-format
+msgid "problem with the agent (unexpected response \"%s\")\n"
+msgstr "problem with the agent (unexpected response “%s”)\n"
+
+#: common/sysutils.c:124
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "can't disable core dumps: %s\n"
+
+#: common/sysutils.c:219
+#, c-format
+msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Warning: unsafe ownership on %s “%s”\n"
+
+#: common/sysutils.c:251
+#, c-format
+msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Warning: unsafe permissions on %s “%s”\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:45 common/yesno.c:82
+msgid "yes"
+msgstr "yes"
+
+#: common/yesno.c:46 common/yesno.c:87
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:48 common/yesno.c:84
+msgid "no"
+msgstr "no"
+
+#: common/yesno.c:49 common/yesno.c:88
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:86
+msgid "quit"
+msgstr "quit"
+
+#: common/yesno.c:89
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:123
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:125
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: common/yesno.c:126
+msgid "oO"
+msgstr "oO"
+
+#: common/yesno.c:127
+msgid "cC"
+msgstr "cC"
+
+#: common/miscellaneous.c:86
+#, c-format
+msgid "out of core in secure memory while allocating %lu bytes"
+msgstr "out of core in secure memory while allocating %lu bytes"
+
+#: common/miscellaneous.c:89
+#, c-format
+msgid "out of core while allocating %lu bytes"
+msgstr "out of core while allocating %lu bytes"
+
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error allocating enough memory: %s\n"
+
+#: common/miscellaneous.c:143
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr "%s:%u: obsolete option “%s” - it has no effect\n"
+
+#: common/miscellaneous.c:146
+#, c-format
+msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
+msgstr "WARNING: “%s%s” is an obsolete option - it has no effect\n"
+
+#: common/miscellaneous.c:490
+#, c-format
+msgid "unknown debug flag '%s' ignored\n"
+msgstr "unknown debug flag ‘%s’ ignored\n"
+
+#: common/asshelp.c:417
+#, c-format
+msgid "no running gpg-agent - starting '%s'\n"
+msgstr "no running gpg-agent - starting ‘%s’\n"
+
+#: common/asshelp.c:477
+#, c-format
+msgid "waiting for the agent to come up ... (%ds)\n"
+msgstr "waiting for the agent to come up ... (%ds)\n"
+
+#: common/asshelp.c:485
+msgid "connection to agent established\n"
+msgstr "connection to agent established\n"
+
+#: common/asshelp.c:525
+msgid "connection to agent is in restricted mode\n"
+msgstr "connection to agent is in restricted mode\n"
+
+#: common/asshelp.c:606
+#, c-format
+msgid "no running Dirmngr - starting '%s'\n"
+msgstr "no running Dirmngr - starting ‘%s’\n"
+
+#: common/asshelp.c:663
+#, c-format
+msgid "waiting for the dirmngr to come up ... (%ds)\n"
+msgstr "waiting for the dirmngr to come up ... (%ds)\n"
+
+#: common/asshelp.c:672
+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
++#: common/gettime.c:893
+msgid "[none]"
+msgstr "[none]"
+
+#: common/argparse.c:365
+msgid "argument not expected"
+msgstr "argument not expected"
+
+#: common/argparse.c:367
+msgid "read error"
+msgstr "read error"
+
+#: common/argparse.c:369
+msgid "keyword too long"
+msgstr "keyword too long"
+
+#: common/argparse.c:371
+msgid "missing argument"
+msgstr "missing argument"
+
+#: common/argparse.c:373
+msgid "invalid argument"
+msgstr "invalid argument"
+
+#: common/argparse.c:375
+msgid "invalid command"
+msgstr "invalid command"
+
+#: common/argparse.c:377
+msgid "invalid alias definition"
+msgstr "invalid alias definition"
+
+#: common/argparse.c:379
+msgid "out of core"
+msgstr "out of core"
+
+#: common/argparse.c:381
+msgid "invalid option"
+msgstr "invalid option"
+
+#: common/argparse.c:389
+#, c-format
+msgid "missing argument for option \"%.50s\"\n"
+msgstr "missing argument for option “%.50s”\n"
+
+#: common/argparse.c:391
+#, c-format
+msgid "invalid argument for option \"%.50s\"\n"
+msgstr "invalid argument for option “%.50s”\n"
+
+#: common/argparse.c:393
+#, c-format
+msgid "option \"%.50s\" does not expect an argument\n"
+msgstr "option “%.50s” does not expect an argument\n"
+
+#: common/argparse.c:395
+#, c-format
+msgid "invalid command \"%.50s\"\n"
+msgstr "invalid command “%.50s”\n"
+
+#: common/argparse.c:397
+#, c-format
+msgid "option \"%.50s\" is ambiguous\n"
+msgstr "option “%.50s” is ambiguous\n"
+
+#: common/argparse.c:399
+#, c-format
+msgid "command \"%.50s\" is ambiguous\n"
+msgstr "command “%.50s” is ambiguous\n"
+
+#: common/argparse.c:401 dirmngr/dirmngr.c:1234
+msgid "out of core\n"
+msgstr "out of core\n"
+
+#: common/argparse.c:403
+#, c-format
+msgid "invalid option \"%.50s\"\n"
+msgstr "invalid option “%.50s”\n"
+
+#: common/utf8conv.c:123
+#, c-format
+msgid "conversion from '%s' to '%s' not available\n"
+msgstr "conversion from ‘%s’ to ‘%s’ not available\n"
+
+#: common/utf8conv.c:131
+#, c-format
+msgid "iconv_open failed: %s\n"
+msgstr "iconv_open failed: %s\n"
+
+#: common/utf8conv.c:385 common/utf8conv.c:651
+#, c-format
+msgid "conversion from '%s' to '%s' failed: %s\n"
+msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
+
+#: common/dotlock.c:707
+#, c-format
+msgid "failed to create temporary file '%s': %s\n"
+msgstr "failed to create temporary file '%s': %s\n"
+
+#: common/dotlock.c:771
+#, c-format
+msgid "error writing to '%s': %s\n"
+msgstr "error writing to '%s': %s\n"
+
+#: common/dotlock.c:1116
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr "removing stale lockfile (created by %d)\n"
+
+#: common/dotlock.c:1152
+#, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "waiting for lock (held by %d%s) %s...\n"
+
+#: common/dotlock.c:1153
+msgid "(deadlock?) "
+msgstr "(deadlock?) "
+
+#: common/dotlock.c:1192
+#, c-format
+msgid "lock '%s' not made: %s\n"
+msgstr "lock ‘%s’ not made: %s\n"
+
+#: common/dotlock.c:1219
+#, c-format
+msgid "waiting for lock %s...\n"
+msgstr "waiting for lock %s...\n"
+
- #: g10/armor.c:417
++#: g10/armor.c:424
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
- #: g10/armor.c:456
++#: g10/armor.c:463
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
- #: g10/armor.c:467
++#: g10/armor.c:474
+msgid "armor header: "
+msgstr "armor header: "
+
- #: g10/armor.c:480
++#: g10/armor.c:487
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
- #: g10/armor.c:493
++#: g10/armor.c:500
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
- #: g10/armor.c:546
++#: g10/armor.c:553
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
- #: g10/armor.c:681
++#: g10/armor.c:688
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
- #: g10/armor.c:694
++#: g10/armor.c:701
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
- #: g10/armor.c:909
++#: g10/armor.c:916
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
- #: g10/armor.c:943
++#: g10/armor.c:950
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
- #: g10/armor.c:951
++#: g10/armor.c:958
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
- #: g10/armor.c:975
++#: g10/armor.c:982
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
- #: g10/armor.c:979
++#: g10/armor.c:986
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
- #: g10/armor.c:1296
++#: g10/armor.c:1303
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
- #: g10/armor.c:1301
++#: g10/armor.c:1308
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
- #: g10/armor.c:1305
++#: g10/armor.c:1312
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
+#, c-format
+msgid "[ not human readable (%zu bytes: %s%s) ]"
+msgstr "[ not human readable (%zu bytes: %s%s) ]"
+
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
+msgstr ""
+"a notation name must have only printable characters or spaces, and end with "
+"an ‘=’\n"
+
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
+msgid "a user notation name must contain the '@' character\n"
+msgstr "a user notation name must contain the ‘@’ character\n"
+
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
+msgid "a notation name must not contain more than one '@' character\n"
+msgstr "a notation name must not contain more than one ‘@’ character\n"
+
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
+msgid "a notation value must not use any control characters\n"
+msgstr "a notation value must not use any control characters\n"
+
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
+msgid "a notation name may not contain an '=' character\n"
+msgstr "a notation name may not contain an ‘=’ character\n"
+
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
+msgid "a notation name must have only printable characters or spaces\n"
+msgstr "a notation name must have only printable characters or spaces\n"
+
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
+msgid "WARNING: invalid notation data found\n"
+msgstr "WARNING: invalid notation data found\n"
+
+#: g10/call-agent.c:151 sm/call-agent.c:199
+#, c-format
+msgid "failed to proxy %s inquiry to client\n"
+msgstr "failed to proxy %s inquiry to client\n"
+
+#: g10/call-agent.c:176
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
+#: g10/call-agent.c:266 sm/call-agent.c:98 sm/call-dirmngr.c:164
+#, c-format
+msgid "error getting version from '%s': %s\n"
+msgstr "error getting version from '%s': %s\n"
+
+#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
+#, c-format
+msgid "server '%s' is older than us (%s < %s)"
+msgstr "server ‘%s’ is older than us (%s < %s)"
+
+#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+#, c-format
+msgid "WARNING: %s\n"
+msgstr "WARNING: %s\n"
+
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
+#, c-format
+msgid "OpenPGP card not available: %s\n"
+msgstr "OpenPGP card not available: %s\n"
+
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
+#, c-format
+msgid "OpenPGP card no. %s detected\n"
+msgstr "OpenPGP card no. %s detected\n"
+
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
+msgid "can't do this in batch mode\n"
+msgstr "can't do this in batch mode\n"
+
+#: g10/card-util.c:107
+msgid "This command is only available for version 2 cards\n"
+msgstr "This command is only available for version 2 cards\n"
+
+#: g10/card-util.c:109 scd/app-openpgp.c:2259
+msgid "Reset Code not or not anymore available\n"
+msgstr "Reset Code not or not anymore available\n"
+
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
+msgid "Your selection? "
+msgstr "Your selection? "
+
+#: g10/card-util.c:279 g10/card-util.c:330
+msgid "[not set]"
+msgstr "[not set]"
+
+#: g10/card-util.c:533
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:534
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:534
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:561
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:561
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:636
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:638
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “<” character may not be used.\n"
+
+#: g10/card-util.c:640
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:657
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:659
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:677
+#, c-format
+msgid "Error: Combined name too long (limit is %d characters).\n"
+msgstr "Error: Combined name too long (limit is %d characters).\n"
+
+#: g10/card-util.c:698
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:706
+#, c-format
+msgid "Error: URL too long (limit is %d characters).\n"
+msgstr "Error: URL too long (limit is %d characters).\n"
+
- #: g10/card-util.c: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
+#, c-format
+msgid "error reading '%s': %s\n"
+msgstr "error reading '%s': %s\n"
+
- #: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
+#, c-format
+msgid "error writing '%s': %s\n"
+msgstr "error writing '%s': %s\n"
+
- #: g10/card-util.c:871
++#: g10/card-util.c:861
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
- #: g10/card-util.c:881
++#: g10/card-util.c:871
+#, c-format
+msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "Error: Login data too long (limit is %d characters).\n"
+
- #: g10/card-util.c:917
++#: g10/card-util.c:907
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
- #: g10/card-util.c:927
++#: g10/card-util.c:917
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "Error: Private DO too long (limit is %d characters).\n"
+
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
+msgid ""
+"Note: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+"Note: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
+
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
+#, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "What keysize do you want for the Signature key? (%u) "
+
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
+#, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "What keysize do you want for the Encryption key? (%u) "
+
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
+#, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "What keysize do you want for the Authentication key? (%u) "
+
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rounded up to %u bits\n"
+
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s keysizes must be in the range %u-%u\n"
+
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr "The card will now be re-configured to generate a key of %u bits\n"
+
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
+#, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "error changing size of key %d to %u bits: %s\n"
+
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
+msgid "Note: keys are already stored on the card!\n"
+msgstr "Note: keys are already stored on the card!\n"
+
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
+#, c-format
+msgid ""
+"Please note that the factory settings of the PINs are\n"
+" PIN = '%s' Admin PIN = '%s'\n"
+"You should change them using the command --change-pin\n"
+msgstr ""
+"Please note that the factory settings of the PINs are\n"
+" PIN = ‘%s’ Admin PIN = ‘%s’\n"
+"You should change them using the command --change-pin\n"
+
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
+#, c-format
+msgid "KEYTOCARD failed: %s\n"
+msgstr "KEYTOCARD failed: %s\n"
+
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
+msgid "This command is not supported by this card\n"
+msgstr "This command is not supported by this card\n"
+
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
+msgid "Note: This command destroys all keys stored on the card!\n"
+msgstr "Note: This command destroys all keys stored on the card!\n"
+
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
+msgid "Continue? (y/N) "
+msgstr "Continue? (y/N) "
+
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
+msgid "Really do a factory reset? (enter \"yes\") "
+msgstr "Really do a factory reset? (enter “yes”) "
+
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
+msgid "quit this menu"
+msgstr "quit this menu"
+
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
+msgid "show admin commands"
+msgstr "show admin commands"
+
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
+msgid "show this help"
+msgstr "show this help"
+
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
+msgid "list all available data"
+msgstr "list all available data"
+
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
+msgid "change the login name"
+msgstr "change the login name"
+
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
+msgid "generate new keys"
+msgstr "generate new keys"
+
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
+msgid "destroy all keys and data"
+msgstr "destroy all keys and data"
+
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “help”)\n"
+
+#: g10/decrypt.c:191 g10/encrypt.c:956
+msgid "--output doesn't work for this command\n"
+msgstr "--output doesn't work for this command\n"
+
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
+#, c-format
+msgid "can't open '%s'\n"
+msgstr "can't open ‘%s’\n"
+
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “%s” not found: %s\n"
+
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
+#, c-format
+msgid "key \"%s\" not found\n"
+msgstr "key “%s” not found\n"
+
+#: g10/delkey.c:129 g10/delkey.c:136
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(unless you specify the key by fingerprint)\n"
+
+#: g10/delkey.c:135
+msgid "can't do this in batch mode without \"--yes\"\n"
+msgstr "can't do this in batch mode without “--yes”\n"
+
+#: g10/delkey.c:148
+msgid "Delete this key from the keyring? (y/N) "
+msgstr "Delete this key from the keyring? (y/N) "
+
+#: g10/delkey.c:158
+msgid "This is a secret key! - really delete? (y/N) "
+msgstr "This is a secret key! - really delete? (y/N) "
+
+#: g10/delkey.c:201
+#, c-format
+msgid "deleting secret %s failed: %s\n"
+msgstr "deleting secret %s failed: %s\n"
+
+#: g10/delkey.c:203
+msgid "key"
+msgstr "key"
+
+#: g10/delkey.c:203
+msgid "subkey"
+msgstr "subkey"
+
+#: g10/delkey.c:226
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
+#: g10/delkey.c:239
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
+#: g10/delkey.c:275
+#, c-format
+msgid "there is a secret key for public key \"%s\"!\n"
+msgstr "there is a secret key for public key “%s”!\n"
+
+#: g10/delkey.c:277
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "use option “--delete-secret-keys” to delete it first.\n"
+
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: 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:254
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encrypt.c:264 g10/encrypt.c:625
+#, c-format
+msgid "'%s' already compressed\n"
+msgstr "‘%s’ already compressed\n"
+
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
+#, c-format
+msgid "WARNING: '%s' is an empty file\n"
+msgstr "WARNING: ‘%s’ is an empty file\n"
+
+#: g10/encrypt.c:558
+#, c-format
+msgid "reading from '%s'\n"
+msgstr "reading from ‘%s’\n"
+
+#: 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:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
+#, c-format
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+msgstr ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
+
+#: g10/encrypt.c:818
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
+#: g10/encrypt.c:904
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “%s”\n"
+
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
+#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "encrypted with unknown algorithm %d\n"
+
+#: g10/decrypt-data.c:164 sm/decrypt.c:127
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+
+#: g10/decrypt-data.c:176
+msgid "problem handling encrypted packet\n"
+msgstr "problem handling encrypted packet\n"
+
+#: g10/exec.c:60
+msgid "no remote program execution supported\n"
+msgstr "no remote program execution supported\n"
+
+#: g10/exec.c:319
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
+msgstr ""
+"external program calls are disabled due to unsafe options file permissions\n"
+
+#: g10/exec.c:349
+msgid "this platform requires temporary files when calling external programs\n"
+msgstr ""
+"this platform requires temporary files when calling external programs\n"
+
+#: g10/exec.c:427
+#, c-format
+msgid "unable to execute program '%s': %s\n"
+msgstr "unable to execute program '%s': %s\n"
+
+#: g10/exec.c:430
+#, c-format
+msgid "unable to execute shell '%s': %s\n"
+msgstr "unable to execute shell '%s': %s\n"
+
+#: g10/exec.c:521
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "system error while calling external program: %s\n"
+
+#: g10/exec.c:532 g10/exec.c:599
+msgid "unnatural exit of external program\n"
+msgstr "unnatural exit of external program\n"
+
+#: g10/exec.c:547
+msgid "unable to execute external program\n"
+msgstr "unable to execute external program\n"
+
+#: g10/exec.c:564
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "unable to read external program response: %s\n"
+
+#: g10/exec.c:610 g10/exec.c:617
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+msgstr "WARNING: unable to remove tempfile (%s) '%s': %s\n"
+
+#: g10/exec.c:622
+#, c-format
+msgid "WARNING: unable to remove temp directory '%s': %s\n"
+msgstr "WARNING: unable to remove temp directory '%s': %s\n"
+
- #: g10/export.c:78
++#: g10/export.c:102
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
- #: g10/export.c:80
++#: g10/export.c:104
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
- #: g10/export.c:82
++#: g10/export.c:106
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “sensitive”"
+
- #: g10/export.c:84
++#: g10/export.c:108
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
- #: g10/export.c:86
++#: g10/export.c:110
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
- #: g10/export.c:1144
++#: g10/export.c:1204
+msgid " - skipped"
+msgstr " - skipped"
+
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
++#, c-format
++msgid "writing to '%s'\n"
++msgstr "writing to ‘%s’\n"
++
++#: g10/export.c:1660
++#, c-format
++msgid "key %s: key material on-card - skipped\n"
++msgstr "key %s: key material on-card - skipped\n"
++
++#: g10/export.c:1846
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
- #: g10/export.c:1303
++#: g10/export.c:1923
+#, c-format
+msgid "key %s: PGP 2.x style key - skipped\n"
+msgstr "key %s: PGP 2.x style key - skipped\n"
+
- #: g10/export.c:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "key %s: key material on-card - skipped\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
+#, c-format
+msgid "error creating '%s': %s\n"
+msgstr "error creating '%s': %s\n"
+
- #: g10/getkey.c:252
++#: g10/getkey.c:257
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
+#, c-format
+msgid "(check argument of option '%s')\n"
+msgstr "(check argument of option '%s')\n"
+
- #: g10/getkey.c:511
++#: g10/getkey.c:516
+#, c-format
+msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
+msgstr "Warning: ‘%s’ should be a long key ID or a fingerprint\n"
+
- #: g10/getkey.c:541
++#: g10/getkey.c:546
+#, c-format
+msgid "error looking up: %s\n"
+msgstr "error looking up: %s\n"
+
- #: g10/getkey.c:631
++#: g10/getkey.c:636
+#, c-format
+msgid "Warning: %s appears in the keyring %d times\n"
+msgstr "Warning: %s appears in the keyring %d times\n"
+
- #: g10/getkey.c:1429
++#: g10/getkey.c:1431
+#, c-format
+msgid "automatically retrieved '%s' via %s\n"
+msgstr "automatically retrieved ‘%s’ via %s\n"
+
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
+#, c-format
+msgid "error retrieving '%s' via %s: %s\n"
+msgstr "error retrieving ‘%s’ via %s: %s\n"
+
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
+msgid "No fingerprint"
+msgstr "No fingerprint"
+
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “%s” not found: %s\n"
+
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
+#, c-format
+msgid "Warning: not using '%s' as default key: %s\n"
+msgstr "Warning: not using ‘%s’ as default key: %s\n"
+
- #: g10/getkey.c:1694
++#: g10/getkey.c:1743
+#, c-format
+msgid "using \"%s\" as default secret key for signing\n"
+msgstr "using “%s” as default secret key for signing\n"
+
- #: g10/getkey.c:1701
++#: g10/getkey.c:1750
+#, c-format
+msgid "all values passed to '%s' ignored\n"
+msgstr "all values passed to ‘%s’ ignored\n"
+
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+
- #: g10/getkey.c:3323
++#: g10/getkey.c:3377
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "using subkey %s instead of primary key %s\n"
+
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
+msgid "make a signature"
+msgstr "make a signature"
+
- #: g10/gpg.c:410
++#: g10/gpg.c:418
+msgid "make a clear text signature"
+msgstr "make a clear text signature"
+
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
+msgid "encrypt data"
+msgstr "encrypt data"
+
- #: g10/gpg.c:414
++#: g10/gpg.c:422
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
+msgid "verify a signature"
+msgstr "verify a signature"
+
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
+msgid "list keys"
+msgstr "list keys"
+
- #: g10/gpg.c:422
++#: g10/gpg.c:430
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
- #: g10/gpg.c:423
++#: g10/gpg.c:431
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
+msgid "list secret keys"
+msgstr "list secret keys"
+
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
- #: g10/gpg.c:429
++#: g10/gpg.c:437
+msgid "quickly generate a new key pair"
+msgstr "quickly generate a new key pair"
+
- #: g10/gpg.c:431
++#: g10/gpg.c:439
+msgid "quickly add a new user-id"
+msgstr "quickly add a new user-id"
+
- #: g10/gpg.c:434
++#: g10/gpg.c:442
++msgid "quickly revoke a user-id"
++msgstr "quickly revoke a user-id"
++
++#: g10/gpg.c:444
+msgid "full featured key pair generation"
+msgstr "full featured key pair generation"
+
- #: g10/gpg.c:435
++#: g10/gpg.c:445
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
- #: g10/gpg.c:439
++#: g10/gpg.c:449
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
- #: g10/gpg.c:441
++#: g10/gpg.c:451
+msgid "quickly sign a key"
+msgstr "quickly sign a key"
+
- #: g10/gpg.c:443
++#: g10/gpg.c:453
+msgid "quickly sign a key locally"
+msgstr "quickly sign a key locally"
+
- #: g10/gpg.c:444
++#: g10/gpg.c:454
+msgid "sign a key"
+msgstr "sign a key"
+
- #: g10/gpg.c:445
++#: g10/gpg.c:455
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
- #: g10/gpg.c:446
++#: g10/gpg.c:456
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
+msgid "change a passphrase"
+msgstr "change a passphrase"
+
- #: g10/gpg.c:450
++#: g10/gpg.c:460
+msgid "export keys"
+msgstr "export keys"
+
- #: g10/gpg.c:451
++#: g10/gpg.c:461
+msgid "export keys to a keyserver"
+msgstr "export keys to a keyserver"
+
- #: g10/gpg.c:452
++#: g10/gpg.c:462
+msgid "import keys from a keyserver"
+msgstr "import keys from a keyserver"
+
- #: g10/gpg.c:454
++#: g10/gpg.c:464
+msgid "search for keys on a keyserver"
+msgstr "search for keys on a keyserver"
+
- #: g10/gpg.c:456
++#: g10/gpg.c:466
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
- #: g10/gpg.c:462
++#: g10/gpg.c:472
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
- #: g10/gpg.c:465
++#: g10/gpg.c:475
+msgid "print the card status"
+msgstr "print the card status"
+
- #: g10/gpg.c:466
++#: g10/gpg.c:476
+msgid "change data on a card"
+msgstr "change data on a card"
+
- #: g10/gpg.c:467
++#: g10/gpg.c:477
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
- #: g10/gpg.c:479
++#: g10/gpg.c:489
+msgid "update the trust database"
+msgstr "update the trust database"
+
- #: g10/gpg.c:488
++#: g10/gpg.c:498
+msgid "print message digests"
+msgstr "print message digests"
+
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
+msgid "run in server mode"
+msgstr "run in server mode"
+
- #: g10/gpg.c:493
++#: g10/gpg.c:503
+msgid "|VALUE|set the TOFU policy for a key"
+msgstr "|VALUE|set the TOFU policy for a key"
+
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
+msgid "|USER-ID|encrypt for USER-ID"
+msgstr "|USER-ID|encrypt for USER-ID"
+
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 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:519
++#: g10/gpg.c:531
+msgid "|N|set compress level to N (0 disables)"
+msgstr "|N|set compress level to N (0 disables)"
+
- #: g10/gpg.c:525
++#: g10/gpg.c:538
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
+msgid "|FILE|write output to FILE"
+msgstr "|FILE|write output to FILE"
+
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
- #: g10/gpg.c:557
++#: g10/gpg.c:570
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
- #: g10/gpg.c:602
++#: g10/gpg.c:618
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 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:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 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:996
++#: g10/gpg.c:1013
+msgid "Usage: @GPG@ [options] [files] (-h for help)"
+msgstr "Usage: @GPG@ [options] [files] (-h for help)"
+
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
+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:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
+#, c-format
+msgid "usage: %s [options] %s\n"
+msgstr "usage: %s [options] %s\n"
+
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
+#, 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:1524
+#, 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:1527
+#, 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:1530
+#, 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:1536
+#, 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:1539
+#, 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:1542
+#, 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:1548
+#, 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:1551
+#, 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:1554
+#, 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:1560
+#, 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:1563
+#, 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:1566
+#, 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:1773
+#, c-format
+msgid "unknown configuration item '%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
+
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
+msgid "show key usage information during key listings"
+msgstr "show key usage information during key listings"
+
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
+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:1900
+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:1902
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
+msgid "available TOFU policies:\n"
+msgstr "available TOFU policies:\n"
+
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
+#, 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:2019 g10/gpg.c:2043
+msgid "(use \"help\" to list choices)\n"
+msgstr "(use “help” to list choices)\n"
+
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
+#, c-format
+msgid "unknown TOFU DB format '%s'\n"
+msgstr "unknown TOFU DB format ‘%s’\n"
+
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
+#, c-format
+msgid "Note: old default options file '%s' ignored\n"
+msgstr "Note: old default options file ‘%s’ ignored\n"
+
- #: g10/gpg.c:2186
++#: g10/gpg.c:2208
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr "libgcrypt is too old (need %s, have %s)\n"
+
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
+#, c-format
+msgid "Note: %s is not for normal use!\n"
+msgstr "Note: %s is not for normal use!\n"
+
- #: g10/gpg.c:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
+#, c-format
+msgid "'%s' is not a valid signature expiration\n"
+msgstr "‘%s’ is not a valid signature expiration\n"
+
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
+#, c-format
+msgid "invalid pinentry mode '%s'\n"
+msgstr "invalid pinentry mode ‘%s’\n"
+
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
+#, c-format
+msgid "'%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
+
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
++#, c-format
++msgid "invalid filter option: %s\n"
++msgstr "invalid filter option: %s\n"
++
++#: g10/gpg.c:3078
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
+msgid "WARNING: running with faked system time: "
+msgstr "WARNING: running with faked system time: "
+
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
+#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
+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:3526
++#: g10/gpg.c:3599
+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:3528
++#: g10/gpg.c:3601
+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:3531
++#: g10/gpg.c:3604
+msgid "Note: simple S2K mode (0) is strongly discouraged\n"
+msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3535
++#: g10/gpg.c:3608
+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:3542
++#: g10/gpg.c:3615
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
+#, 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:3642
++#: g10/gpg.c:3715
+#, 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:3647
++#: g10/gpg.c:3720
+#, 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:3740
++#: g10/gpg.c:3814
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
+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:3808
++#: g10/gpg.c:3883
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
+#, c-format
+msgid "symmetric encryption of '%s' failed: %s\n"
+msgstr "symmetric encryption of ‘%s’ failed: %s\n"
+
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
+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:3854
++#: g10/gpg.c:3929
+#, 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:3875
++#: g10/gpg.c:3950
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
+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:3914
++#: g10/gpg.c:3989
+#, 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:3938
++#: g10/gpg.c:4013
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
+msgid "--passwd <user-id>"
+msgstr "--passwd <user-id>"
+
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
+#, c-format
+msgid "export as ssh key failed: %s\n"
+msgstr "export as ssh key failed: %s\n"
+
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
+#, c-format
+msgid "invalid hash algorithm '%s'\n"
+msgstr "invalid hash algorithm ‘%s’\n"
+
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
+#, c-format
+msgid "error parsing key specification '%s': %s\n"
+msgstr "error parsing key specification '%s': %s\n"
+
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
+#, 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:4654
++#: g10/gpg.c:4740
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: g10/gpgv.c:75
+msgid "|FILE|take the keys from the keyring FILE"
+msgstr "|FILE|take the keys from the keyring FILE"
+
+#: g10/gpgv.c:77
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
+#: g10/gpgv.c:79 sm/gpgsm.c:343
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
+#: g10/gpgv.c:83
+msgid "|ALGO|reject signatures made with ALGO"
+msgstr "|ALGO|reject signatures made with ALGO"
+
+#: g10/gpgv.c:120
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: g10/gpgv.c:122
+msgid ""
+"Syntax: gpgv [options] [files]\n"
+"Check signatures against known trusted keys\n"
+msgstr ""
+"Syntax: gpgv [options] [files]\n"
+"Check signatures against known trusted keys\n"
+
+#: g10/helptext.c:72
+msgid "No help available"
+msgstr "No help available"
+
+#: g10/helptext.c:82
+#, c-format
+msgid "No help available for '%s'"
+msgstr "No help available for ‘%s’"
+
- #: g10/import.c:104
++#: g10/import.c:134
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
- #: g10/import.c:107
++#: g10/import.c:137
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
- #: g10/import.c:110
++#: g10/import.c:140
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
- #: g10/import.c:113
++#: g10/import.c:143
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
- #: g10/import.c:116
++#: g10/import.c:146
++msgid "show key during import"
++msgstr "show key during import"
++
++#: g10/import.c:149
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
- #: g10/import.c:119
++#: g10/import.c:152
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
- #: g10/import.c:122
++#: g10/import.c:155
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
- #: g10/import.c:343
++#: g10/import.c:158
++msgid "run import filters and export key immediately"
++msgstr "run import filters and export key immediately"
++
++#: g10/import.c:277 g10/import.c:519
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
- #: g10/import.c:360
++#: g10/import.c:536
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
- #: g10/import.c:430
++#: g10/import.c:606
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
- #: g10/import.c:433
++#: g10/import.c:609
+#, c-format
+msgid " skipped PGP-2 keys: %lu\n"
+msgstr " skipped PGP-2 keys: %lu\n"
+
- #: g10/import.c:435
++#: g10/import.c:611
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
- #: g10/import.c:438
++#: g10/import.c:614
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
- #: g10/import.c:447
++#: g10/import.c:623
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
- #: g10/import.c:449
++#: g10/import.c:625
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
- #: g10/import.c:451
++#: g10/import.c:627
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
- #: g10/import.c:453
++#: g10/import.c:629
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
- #: g10/import.c:463
++#: g10/import.c:639
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
- #: g10/import.c:465
++#: g10/import.c:641
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
- #: g10/import.c:809
++#: g10/import.c:985
+#, 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:851
++#: g10/import.c:1027
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “%s”: preference for cipher algorithm %s\n"
+
- #: g10/import.c:866
++#: g10/import.c:1042
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “%s”: preference for digest algorithm %s\n"
+
- #: g10/import.c:878
++#: g10/import.c:1054
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “%s”: preference for compression algorithm %s\n"
+
- #: g10/import.c:891
++#: g10/import.c:1067
+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:893
++#: g10/import.c:1069
+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:918
++#: g10/import.c:1094
+#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
- #: g10/import.c:988
++#: g10/import.c:1233
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
+msgid "rejected by import screener"
+msgstr "rejected by import screener"
+
- #: g10/import.c:1019
++#: g10/import.c:1264
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
- #: g10/import.c:1035
++#: g10/import.c:1282
+#, 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:1045
++#: g10/import.c:1292
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
- #: g10/import.c:1047
++#: g10/import.c:1294
+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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
- #: g10/import.c:1066
++#: g10/import.c:1353
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
- #: g10/import.c:1081
++#: g10/import.c:1368
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr "writing to ‘%s’\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
+#, c-format
+msgid "error writing keyring '%s': %s\n"
+msgstr "error writing keyring '%s': %s\n"
+
- #: g10/import.c:1110
++#: g10/import.c:1397
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
+
- #: g10/import.c:1134
++#: g10/import.c:1421
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
+#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
+#, 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:1201
++#: g10/import.c:1488
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
+
- #: g10/import.c:1204
++#: g10/import.c:1491
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
+
- #: g10/import.c:1207
++#: g10/import.c:1494
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
+
- #: g10/import.c:1210
++#: g10/import.c:1497
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
+
- #: g10/import.c:1213
++#: g10/import.c:1500
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
+
- #: g10/import.c:1216
++#: g10/import.c:1503
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
+
- #: g10/import.c:1219
++#: g10/import.c:1506
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “%s” %d signature cleaned\n"
+
- #: g10/import.c:1222
++#: g10/import.c:1509
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “%s” %d signatures cleaned\n"
+
- #: g10/import.c:1225
++#: g10/import.c:1512
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "key %s: “%s” %d user ID cleaned\n"
+
- #: g10/import.c:1228
++#: g10/import.c:1515
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "key %s: “%s” %d user IDs cleaned\n"
+
- #: g10/import.c:1251
++#: g10/import.c:1538
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
+
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
- #: g10/import.c:1570
++#: g10/import.c:1858
+#, c-format
+msgid "key %s: secret key already exists\n"
+msgstr "key %s: secret key already exists\n"
+
- #: g10/import.c:1578
++#: g10/import.c:1866
+#, c-format
+msgid "key %s: error sending to agent: %s\n"
+msgstr "key %s: error sending to agent: %s\n"
+
- #: g10/import.c:1683
++#: g10/import.c:1971
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
- #: g10/import.c:1727
++#: g10/import.c:2015
+#, 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:1796
++#: g10/import.c:2084
+#, 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:1848
++#: g10/import.c:2133
+#, 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:1897
++#: g10/import.c:2182
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
- #: g10/import.c:1930
++#: g10/import.c:2215
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
+
- #: g10/import.c:2006
++#: g10/import.c:2291
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
- #: g10/import.c:2023
++#: g10/import.c:2308
+#, 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:2025
++#: g10/import.c:2310
+#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
- #: g10/import.c:2043
++#: g10/import.c:2328
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
- #: g10/import.c:2057
++#: g10/import.c:2342
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
- #: g10/import.c:2070
++#: g10/import.c:2355
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
- #: g10/import.c:2086
++#: g10/import.c:2371
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
- #: g10/import.c:2108
++#: g10/import.c:2393
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
- #: g10/import.c:2121
++#: g10/import.c:2406
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
- #: g10/import.c:2136
++#: g10/import.c:2421
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
- #: g10/import.c:2181
++#: g10/import.c:2463
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
+
- #: g10/import.c:2204
++#: g10/import.c:2487
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
- #: g10/import.c:2233
++#: g10/import.c:2516
+#, 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:2244
++#: g10/import.c:2527
+#, 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:2262
++#: g10/import.c:2545
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
- #: g10/import.c:2276
++#: g10/import.c:2559
+#, 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:2284
++#: g10/import.c:2567
+#, 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:2413
++#: g10/import.c:2696
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
- #: g10/import.c:2477
++#: g10/import.c:2760
+#, 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:2493
++#: g10/import.c:2776
+#, 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:2557
++#: g10/import.c:2840
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
+
- #: g10/import.c:2595
++#: g10/import.c:2878
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
+#, c-format
+msgid "error creating keybox '%s': %s\n"
+msgstr "error creating keybox '%s': %s\n"
+
+#: g10/keydb.c:405 g10/keydb.c:432
+#, c-format
+msgid "error creating keyring '%s': %s\n"
+msgstr "error creating keyring '%s': %s\n"
+
+#: g10/keydb.c:441 sm/keydb.c:229
+#, c-format
+msgid "keybox '%s' created\n"
+msgstr "keybox ‘%s’ created\n"
+
+#: g10/keydb.c:443
+#, c-format
+msgid "keyring '%s' created\n"
+msgstr "keyring ‘%s’ created\n"
+
+#: g10/keydb.c:822
+#, c-format
+msgid "keyblock resource '%s': %s\n"
+msgstr "keyblock resource '%s': %s\n"
+
+#: g10/keydb.c:907
+#, c-format
+msgid "error opening key DB: %s\n"
+msgstr "error opening key DB: %s\n"
+
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
+msgid "[revocation]"
+msgstr "[revocation]"
+
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
+#, c-format
+msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
+msgstr ""
+"can't check signature with unsupported public-key algorithm (%d): %s.\n"
+
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
+#, c-format
+msgid ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+msgstr ""
+"can't check signature with unsupported message-digest algorithm %d: %s.\n"
+
- #: g10/keyedit.c:786
++#: g10/keyedit.c:789
+msgid " (reordered signatures follow)"
+msgstr " (reordered signatures follow)"
+
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
+#, c-format
+msgid "key %s:\n"
+msgstr "key %s:\n"
+
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
+#, c-format
+msgid "%d duplicate signature removed\n"
+msgid_plural "%d duplicate signatures removed\n"
+msgstr[0] "%d duplicate signature removed\n"
+msgstr[1] "%d duplicate signatures removed\n"
+
- #: g10/keyedit.c:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
+#, c-format
+msgid "%d signature not checked due to a missing key\n"
+msgid_plural "%d signatures not checked due to missing keys\n"
+msgstr[0] "%d signature not checked due to a missing key\n"
+msgstr[1] "%d signatures not checked due to missing keys\n"
+
- #: g10/keyedit.c:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
+#, c-format
+msgid "%d bad signature\n"
+msgid_plural "%d bad signatures\n"
+msgstr[0] "%d bad signature\n"
+msgstr[1] "%d bad signatures\n"
+
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
+#, c-format
+msgid "%d signature reordered\n"
+msgid_plural "%d signatures reordered\n"
+msgstr[0] "%d signature reordered\n"
+msgstr[1] "%d signatures reordered\n"
+
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
+#, c-format
+msgid ""
+"Warning: errors found and only checked self-signatures, run '%s' to check "
+"all signatures.\n"
+msgstr ""
+"Warning: errors found and only checked self-signatures, run ‘%s’ to check "
+"all signatures.\n"
+
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
+msgid ""
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
+msgstr ""
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
+
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
+msgid ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+msgstr ""
+"Please enter the depth of this trust signature.\n"
+"A depth greater than 1 allows the key you are signing to make\n"
+"trust signatures on your behalf.\n"
+
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
+msgid "Please enter a domain to restrict this signature, or enter for none.\n"
+msgstr "Please enter a domain to restrict this signature, or enter for none.\n"
+
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
+#, c-format
+msgid "Skipping user ID \"%s\", which is not a text ID.\n"
+msgstr "Skipping user ID “%s”, which is not a text ID.\n"
+
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “%s” is revoked."
+
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
+msgid "Are you sure you still want to sign it? (y/N) "
+msgstr "Are you sure you still want to sign it? (y/N) "
+
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “%s” is expired."
+
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “%s” is not self-signed."
+
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “%s” is signable. "
+
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
+#, c-format
+msgid ""
+"The self-signature on \"%s\"\n"
+"is a PGP 2.x-style signature.\n"
+msgstr ""
+"The self-signature on “%s”\n"
+"is a PGP 2.x-style signature.\n"
+
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
+msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+msgstr "Do you want to promote it to an OpenPGP self-signature? (y/N) "
+
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"has expired.\n"
+msgstr ""
+"Your current signature on “%s”\n"
+"has expired.\n"
+
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
+msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
+msgstr ""
+"Do you want to issue a new signature to replace the expired one? (y/N) "
+
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
+#, c-format
+msgid ""
+"Your current signature on \"%s\"\n"
+"is a local signature.\n"
+msgstr ""
+"Your current signature on “%s”\n"
+"is a local signature.\n"
+
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
+msgid "Do you want to promote it to a full exportable signature? (y/N) "
+msgstr "Do you want to promote it to a full exportable signature? (y/N) "
+
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
+#, c-format
+msgid "\"%s\" was already locally signed by key %s\n"
+msgstr "“%s” was already locally signed by key %s\n"
+
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
+
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
+msgid "Do you want to sign it again anyway? (y/N) "
+msgstr "Do you want to sign it again anyway? (y/N) "
+
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
+#, c-format
+msgid "This key is due to expire on %s.\n"
+msgstr "This key is due to expire on %s.\n"
+
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
+msgid "Do you want your signature to expire at the same time? (Y/n) "
+msgstr "Do you want your signature to expire at the same time? (Y/n) "
+
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
+msgid ""
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
+"to the person named above? If you don't know what to answer, enter \"0\".\n"
+msgstr ""
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
+"to the person named above? If you don't know what to answer, enter “0”.\n"
+
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
+#, c-format
+msgid " (1) I have not checked at all.%s\n"
+msgstr " (1) I have not checked at all.%s\n"
+
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
+#, c-format
+msgid " (3) I have done very careful checking.%s\n"
+msgstr " (3) I have done very careful checking.%s\n"
+
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
+msgid "Your selection? (enter '?' for more information): "
+msgstr "Your selection? (enter ‘?’ for more information): "
+
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
+#, c-format
+msgid ""
+"Are you sure that you want to sign this key with your\n"
+"key \"%s\" (%s)\n"
+msgstr ""
+"Are you sure that you want to sign this key with your\n"
+"key “%s” (%s)\n"
+
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
+msgid "WARNING: the signature will not be marked as non-exportable.\n"
+msgstr "WARNING: the signature will not be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
+msgid "WARNING: the signature will not be marked as non-revocable.\n"
+msgstr "WARNING: the signature will not be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
+msgid "Key has only stub or on-card key items - no passphrase to change.\n"
+msgstr "Key has only stub or on-card key items - no passphrase to change.\n"
+
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
+#, c-format
+msgid "key %s: error changing passphrase: %s\n"
+msgstr "key %s: error changing passphrase: %s\n"
+
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
+msgid "save and quit"
+msgstr "save and quit"
+
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
+msgid "show the keygrip"
+msgstr "show the keygrip"
+
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
+msgid "select user ID N"
+msgstr "select user ID N"
+
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
+msgid "select subkey N"
+msgstr "select subkey N"
+
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
+msgid "check signatures"
+msgstr "check signatures"
+
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
+msgid "add a user ID"
+msgstr "add a user ID"
+
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
+msgid "add a subkey"
+msgstr "add a subkey"
+
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
+msgid "change the expiration date for the key or selected subkeys"
+msgstr "change the expiration date for the key or selected subkeys"
+
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
+msgid "set the preferred keyserver URL for the selected user IDs"
+msgstr "set the preferred keyserver URL for the selected user IDs"
+
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
+msgid "enable key"
+msgstr "enable key"
+
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
+msgid "disable key"
+msgstr "disable key"
+
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr "compact unusable user IDs and remove unusable signatures from key"
+
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr "compact unusable user IDs and remove all signatures from key"
+
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
+msgid ""
+"* The 'sign' command may be prefixed with an 'l' for local signatures "
+"(lsign),\n"
+" a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
+" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+msgstr ""
+"* The ‘sign’ command may be prefixed with an ‘l’ for local signatures "
+"(lsign),\n"
+" a ‘t’ for trust signatures (tsign), an ‘nr’ for non-revocable signatures\n"
+" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
+
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
+msgid "Really sign all text user IDs? (y/N) "
+msgstr "Really sign all text user IDs? (y/N) "
+
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
+#, c-format
+msgid "Unknown signature type '%s'\n"
+msgstr "Unknown signature type ‘%s’\n"
+
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
+#, c-format
+msgid "This command is not allowed while in %s mode.\n"
+msgstr "This command is not allowed while in %s mode.\n"
+
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
+#, c-format
+msgid "(Use the '%s' command.)\n"
+msgstr "(Use the ‘%s’ command.)\n"
+
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
+msgid "Really remove this user ID? (y/N) "
+msgstr "Really remove this user ID? (y/N) "
+
+#. TRANSLATORS: Please take care: This is about
+#. moving the key and not about removing it.
- #: g10/keyedit.c:2383
++#: g10/keyedit.c:2386
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
+#, c-format
+msgid "Can't open '%s': %s\n"
+msgstr "Can't open '%s': %s\n"
+
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
+#, c-format
+msgid "Error reading backup key from '%s': %s\n"
+msgstr "Error reading backup key from '%s': %s\n"
+
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
+msgid "Do you really want to delete the selected keys? (y/N) "
+msgstr "Do you really want to delete the selected keys? (y/N) "
+
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
+msgid "Do you really want to delete this key? (y/N) "
+msgstr "Do you really want to delete this key? (y/N) "
+
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
+msgid "Do you really want to revoke the entire key? (y/N) "
+msgstr "Do you really want to revoke the entire key? (y/N) "
+
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
+msgid "Do you really want to revoke the selected subkeys? (y/N) "
+msgstr "Do you really want to revoke the selected subkeys? (y/N) "
+
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
+msgid "Do you really want to revoke this subkey? (y/N) "
+msgstr "Do you really want to revoke this subkey? (y/N) "
+
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
+msgid "Owner trust may not be set while using a user provided trust database\n"
+msgstr ""
+"Owner trust may not be set while using a user provided trust database\n"
+
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
+msgid "Really update the preferences for the selected user IDs? (y/N) "
+msgstr "Really update the preferences for the selected user IDs? (y/N) "
+
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
++#, c-format
++msgid "User ID revocation failed: %s\n"
++msgstr "User ID revocation failed: %s\n"
++
++#: g10/keyedit.c:3070
+#, c-format
+msgid "\"%s\" is not a fingerprint\n"
+msgstr "“%s” is not a fingerprint\n"
+
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
+#, c-format
+msgid "\"%s\" is not the primary fingerprint\n"
+msgstr "“%s” is not the primary fingerprint\n"
+
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
+#, c-format
+msgid "Invalid user ID '%s': %s\n"
+msgstr "Invalid user ID '%s': %s\n"
+
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
+msgid "No matching user IDs."
+msgstr "No matching user IDs."
+
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
+msgid "Nothing to sign.\n"
+msgstr "Nothing to sign.\n"
+
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
+msgid "Digest: "
+msgstr "Digest: "
+
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
+msgid "Features: "
+msgstr "Features: "
+
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
+msgid "Notations: "
+msgstr "Notations: "
+
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
+
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
+#, c-format
+msgid "The following key was revoked on %s by %s key %s\n"
+msgstr "The following key was revoked on %s by %s key %s\n"
+
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
+#, c-format
+msgid "This key may be revoked by %s key %s"
+msgstr "This key may be revoked by %s key %s"
+
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
+msgid "card-no: "
+msgstr "card-no: "
+
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
+msgid "revoked"
+msgstr "revoked"
+
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
+msgid "expired"
+msgstr "expired"
+
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
+msgid ""
+"WARNING: no user ID has been marked as primary. This command may\n"
+" cause a different user ID to become the assumed primary.\n"
+msgstr ""
+"WARNING: no user ID has been marked as primary. This command may\n"
+" cause a different user ID to become the assumed primary.\n"
+
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
+msgid "You may want to change its expiration date too.\n"
+msgstr "You may want to change its expiration date too.\n"
+
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
+msgid ""
+"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
+"versions\n"
+" of PGP to reject this key.\n"
+msgstr ""
+"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
+"versions\n"
+" of PGP to reject this key.\n"
+
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
+msgid "Are you sure you still want to add it? (y/N) "
+msgstr "Are you sure you still want to add it? (y/N) "
+
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
+msgid "You may not add a photo ID to a PGP2-style key.\n"
+msgstr "You may not add a photo ID to a PGP2-style key.\n"
+
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Such a user ID already exists on this key!\n"
+
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
+#, c-format
+msgid "Deleted %d signature.\n"
+msgid_plural "Deleted %d signatures.\n"
+msgstr[0] "Deleted %d signature.\n"
+msgstr[1] "Deleted %d signatures.\n"
+
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
+msgid "invalid"
+msgstr "invalid"
+
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “%s” compacted: %s\n"
+
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgid_plural "User ID \"%s\": %d signatures removed\n"
+msgstr[0] "User ID “%s”: %d signature removed\n"
+msgstr[1] "User ID “%s”: %d signatures removed\n"
+
- #: g10/keyedit.c:4397
++#: g10/keyedit.c:4504
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “%s”: already minimized\n"
+
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “%s”: already clean\n"
+
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
+msgid ""
+"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
+"cause\n"
+" some versions of PGP to reject this key.\n"
+msgstr ""
+"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
+"cause\n"
+" some versions of PGP to reject this key.\n"
+
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
+msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
+msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
+
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
+msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
+msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
+
- #: g10/keyedit.c:4535
++#: g10/keyedit.c:4642
+msgid "you cannot appoint a key as its own designated revoker\n"
+msgstr "you cannot appoint a key as its own designated revoker\n"
+
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
+msgid "this key has already been designated as a revoker\n"
+msgstr "this key has already been designated as a revoker\n"
+
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
+msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
+
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgstr ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
+
- #: g10/keyedit.c:4632
++#: g10/keyedit.c:4739
+msgid ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+msgstr ""
+"Are you sure you want to change the expiration time for multiple subkeys? (y/"
+"N) "
+
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr "You can't change the expiration date of a v3 key\n"
+
- #: g10/keyedit.c:4864
++#: g10/keyedit.c:4971
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
+#, c-format
+msgid "subkey %s does not sign and so does not need to be cross-certified\n"
+msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
+
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
+#, c-format
+msgid "skipping v3 self-signature on user ID \"%s\"\n"
+msgstr "skipping v3 self-signature on user ID “%s”\n"
+
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
+msgid "Are you sure you want to replace it? (y/N) "
+msgstr "Are you sure you want to replace it? (y/N) "
+
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
+msgid "Are you sure you want to delete it? (y/N) "
+msgstr "Are you sure you want to delete it? (y/N) "
+
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
+#, c-format
+msgid "No subkey with key ID '%s'.\n"
+msgstr "No subkey with key ID '%s'.\n"
+
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “%s”\n"
+
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
+#, c-format
+msgid "signed by your key %s on %s%s%s\n"
+msgstr "signed by your key %s on %s%s%s\n"
+
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
+msgid "Are you sure you still want to revoke it? (y/N) "
+msgstr "Are you sure you still want to revoke it? (y/N) "
+
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
+#, c-format
+msgid "You have signed these user IDs on key %s:\n"
+msgstr "You have signed these user IDs on key %s:\n"
+
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
++#, c-format
++msgid "tried to revoke a non-user ID: %s\n"
++msgstr "tried to revoke a non-user ID: %s\n"
++
++#: g10/keyedit.c:6240
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “%s” is already revoked\n"
+
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
+#, c-format
+msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
+msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
+
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
+#, c-format
+msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
+
+#: g10/keygen.c:295
+#, c-format
+msgid "preference '%s' duplicated\n"
+msgstr "preference ‘%s’ duplicated\n"
+
+#: g10/keygen.c:302
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:304
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:306
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: g10/keygen.c:447
+#, c-format
+msgid "invalid item '%s' in preference string\n"
+msgstr "invalid item ‘%s’ in preference string\n"
+
+#: g10/keygen.c:926
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:972
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:1028
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
+#: g10/keygen.c:1600 g10/keygen.c:1605
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1493
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgstr ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+
+#: g10/keygen.c:1667
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1670
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1673
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1676
+msgid "Authenticate"
+msgstr "Authenticate"
+
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation. If this is not possible use single digits. The
+#. string needs to 8 bytes long. Here is a description of the
+#. functions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1695
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1722
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1728
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1733
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1736
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1739
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1742
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1871 sm/certreqgen-ui.c:161
+msgid "Please select what kind of key you want:\n"
+msgstr "Please select what kind of key you want:\n"
+
+#: g10/keygen.c:1875
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1879
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1881
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1883
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1888
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1890
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1895
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1897
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1903
+#, c-format
+msgid " (%d) ECC and ECC\n"
+msgstr " (%d) ECC and ECC\n"
+
+#: g10/keygen.c:1905
+#, c-format
+msgid " (%d) ECC (sign only)\n"
+msgstr " (%d) ECC (sign only)\n"
+
+#: g10/keygen.c:1907
+#, c-format
+msgid " (%d) ECC (set your own capabilities)\n"
+msgstr " (%d) ECC (set your own capabilities)\n"
+
+#: g10/keygen.c:1909
+#, c-format
+msgid " (%d) ECC (encrypt only)\n"
+msgstr " (%d) ECC (encrypt only)\n"
+
+#: g10/keygen.c:1913
+#, c-format
+msgid " (%d) Existing key\n"
+msgstr " (%d) Existing key\n"
+
+#: g10/keygen.c:2003 sm/certreqgen-ui.c:206
+msgid "Enter the keygrip: "
+msgstr "Enter the keygrip: "
+
+#: g10/keygen.c:2016 sm/certreqgen-ui.c:214
+msgid "Not a valid keygrip (expecting 40 hex digits)\n"
+msgstr "Not a valid keygrip (expecting 40 hex digits)\n"
+
+#: g10/keygen.c:2018 sm/certreqgen-ui.c:216
+msgid "No key with this keygrip\n"
+msgstr "No key with this keygrip\n"
+
+#: g10/keygen.c:2092 g10/keygen.c:2106
+#, c-format
+msgid "rounded to %u bits\n"
+msgstr "rounded to %u bits\n"
+
+#: g10/keygen.c:2147
+#, c-format
+msgid "%s keys may be between %u and %u bits long.\n"
+msgstr "%s keys may be between %u and %u bits long.\n"
+
+#: g10/keygen.c:2155
+#, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "What keysize do you want for the subkey? (%u) "
+
+#: g10/keygen.c:2158 sm/certreqgen-ui.c:183
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:2172 sm/certreqgen-ui.c:193
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:2217
+msgid "Please select which elliptic curve you want:\n"
+msgstr "Please select which elliptic curve you want:\n"
+
+#: g10/keygen.c:2382
+msgid ""
+"Please specify how long the key should be valid.\n"
+" 0 = key does not expire\n"
+" <n> = key expires in n days\n"
+" <n>w = key expires in n weeks\n"
+" <n>m = key expires in n months\n"
+" <n>y = key expires in n years\n"
+msgstr ""
+"Please specify how long the key should be valid.\n"
+" 0 = key does not expire\n"
+" <n> = key expires in n days\n"
+" <n>w = key expires in n weeks\n"
+" <n>m = key expires in n months\n"
+" <n>y = key expires in n years\n"
+
+#: g10/keygen.c:2393
+msgid ""
+"Please specify how long the signature should be valid.\n"
+" 0 = signature does not expire\n"
+" <n> = signature expires in n days\n"
+" <n>w = signature expires in n weeks\n"
+" <n>m = signature expires in n months\n"
+" <n>y = signature expires in n years\n"
+msgstr ""
+"Please specify how long the signature should be valid.\n"
+" 0 = signature does not expire\n"
+" <n> = signature expires in n days\n"
+" <n>w = signature expires in n weeks\n"
+" <n>m = signature expires in n months\n"
+" <n>y = signature expires in n years\n"
+
+#: g10/keygen.c:2416
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:2421
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:2440 g10/keygen.c:2465
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:2447
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:2448
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:2453
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:2454
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:2458
+msgid ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+msgstr ""
+"Your system can't display dates beyond 2038.\n"
+"However, it will be correctly handled up to 2106.\n"
+
+#: g10/keygen.c:2471
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:2539
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+
+#. TRANSLATORS: This string is in general not anymore used
+#. but you should keep your existing translation. In case
+#. the new string is not translated this old string will
+#. be used.
+#: g10/keygen.c:2554
+msgid ""
+"\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
+" \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\n"
+"\n"
+msgstr ""
+"\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
+"from the Real Name, Comment and Email Address in this form:\n"
+" “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\n"
+"\n"
+
+#: g10/keygen.c:2573
+msgid "Real name: "
+msgstr "Real name: "
+
+#: g10/keygen.c:2582
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:2583
+#, c-format
+msgid "The characters '%s' and '%s' may not appear in name\n"
+msgstr "The characters ‘%s’ and ‘%s’ may not appear in name\n"
+
+#: g10/keygen.c:2587
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
+#: g10/keygen.c:2590
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
+#: g10/keygen.c:2600
+msgid "Email address: "
+msgstr "Email address: "
+
+#: g10/keygen.c:2606
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
+#: g10/keygen.c:2615
+msgid "Comment: "
+msgstr "Comment: "
+
+#: g10/keygen.c:2621
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
+#: g10/keygen.c:2657
+#, c-format
+msgid "You are using the '%s' character set.\n"
+msgstr "You are using the ‘%s’ character set.\n"
+
+#: g10/keygen.c:2663
+#, c-format
+msgid ""
+"You selected this USER-ID:\n"
+" \"%s\"\n"
+"\n"
+msgstr ""
+"You selected this USER-ID:\n"
+" “%s”\n"
+"\n"
+
+#: g10/keygen.c:2668
+msgid "Please don't put the email address into the real name or the comment\n"
+msgstr "Please don't put the email address into the real name or the comment\n"
+
+#. TRANSLATORS: These are the allowed answers in
+#. lower and uppercase. Below you will find the matching
+#. string which should be translated accordingly and the
+#. letter changed to match the one in the answer string.
+#.
+#. n = Change name
+#. c = Change comment
+#. e = Change email
+#. o = Okay (ready, continue)
+#. q = Quit
+#.
+#: g10/keygen.c:2693
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:2703
+msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+msgstr "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
+
+#: g10/keygen.c:2704
+msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
+
+#: g10/keygen.c:2709
+msgid "Change (N)ame, (E)mail, or (Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (Q)uit? "
+
+#: g10/keygen.c:2710
+msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
+msgstr "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
+
+#: g10/keygen.c:2729
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
+#: g10/keygen.c:2775
+msgid ""
+"We need to generate a lot of random bytes. It is a good idea to perform\n"
+"some other action (type on the keyboard, move the mouse, utilize the\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+msgstr ""
+"We need to generate a lot of random bytes. It is a good idea to perform\n"
+"some other action (type on the keyboard, move the mouse, utilize the\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
+
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
+#, c-format
+msgid ""
+"About to create a key for:\n"
+" \"%s\"\n"
+"\n"
+msgstr ""
+"About to create a key for:\n"
+" “%s”\n"
+"\n"
+
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
+msgid "Continue? (Y/n) "
+msgstr "Continue? (Y/n) "
+
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
+#, c-format
+msgid "A key for \"%s\" already exists\n"
+msgstr "A key for “%s” already exists\n"
+
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
+msgid "Create anyway? (y/N) "
+msgstr "Create anyway? (y/N) "
+
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
+msgid "creating anyway\n"
+msgstr "creating anyway\n"
+
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
+#, c-format
+msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
+msgstr "Note: Use “%s %s” for a full featured key generation dialog.\n"
+
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
+#, c-format
+msgid "can't create backup file '%s': %s\n"
+msgstr "can't create backup file '%s': %s\n"
+
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
+#, c-format
+msgid "Note: backup of card key saved to '%s'\n"
+msgstr "Note: backup of card key saved to ‘%s’\n"
+
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
+#, c-format
+msgid "writing public key to '%s'\n"
+msgstr "writing public key to ‘%s’\n"
+
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
+#, c-format
+msgid "error writing public keyring '%s': %s\n"
+msgstr "error writing public keyring '%s': %s\n"
+
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
+msgid ""
+"Note that this key cannot be used for encryption. You may want to use\n"
+"the command \"--edit-key\" to generate a subkey for this purpose.\n"
+msgstr ""
+"Note that this key cannot be used for encryption. You may want to use\n"
+"the command “--edit-key” to generate a subkey for this purpose.\n"
+
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
+#, c-format
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
+#, c-format
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
+msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
+msgstr "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
+
- #: g10/keygen.c:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Secret parts of primary key are stored on-card.\n"
+
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
+msgid "never "
+msgstr "never "
+
- #: g10/keylist.c:330
++#: g10/keylist.c:331
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
- #: g10/keylist.c:332
++#: g10/keylist.c:333
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
- #: g10/keylist.c:374
++#: g10/keylist.c:375
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
- #: g10/keylist.c:427
++#: g10/keylist.c:428
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
- #: g10/keylist.c:429
++#: g10/keylist.c:430
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
- #: g10/keylist.c:471
++#: g10/keylist.c:472
+#, c-format
+msgid "%d good signature\n"
+msgid_plural "%d good signatures\n"
+msgstr[0] "%d good signature\n"
+msgstr[1] "%d good signatures\n"
+
- #: g10/keylist.c:484
++#: g10/keylist.c:485
+#, c-format
+msgid "%d signature not checked due to an error\n"
+msgid_plural "%d signatures not checked due to errors\n"
+msgstr[0] "%d signature not checked due to an error\n"
+msgstr[1] "%d signatures not checked due to errors\n"
+
- #: g10/keylist.c:566
++#: g10/keylist.c:567
+#, c-format
+msgid "Warning: %lu key skipped due to its large size\n"
+msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
+msgstr[0] "Warning: %lu key skipped due to its large size\n"
+msgstr[1] "Warning: %lu keys skipped due to their large sizes\n"
+
- #: g10/keylist.c:588
++#: g10/keylist.c:589
+msgid "Keyring"
+msgstr "Keyring"
+
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#. TRANSLATORS: this should fit into 24 bytes so that the
+#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
+#: g10/keyring.c:1489
+#, c-format
+msgid "caching keyring '%s'\n"
+msgstr "caching keyring ‘%s’\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 keys cached so far (%lu signature)\n"
+msgstr[1] "%lu keys cached so far (%lu signatures)\n"
+
+#: 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: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:1659
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
+#: g10/keyserver.c:90
+msgid "override proxy options set for dirmngr"
+msgstr "override proxy options set for dirmngr"
+
+#: g10/keyserver.c:92
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
+#: g10/keyserver.c:93
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
+#: g10/keyserver.c:95
+msgid "override timeout options set for dirmngr"
+msgstr "override timeout options set for dirmngr"
+
+#: g10/keyserver.c:99
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
+#: g10/keyserver.c:101
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
+#: g10/keyserver.c:103
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr "honor the PKA record set on a key when retrieving keys"
+
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
+msgid "disabled"
+msgstr "disabled"
+
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
+msgid "Enter number(s), N)ext, or Q)uit > "
+msgstr "Enter number(s), N)ext, or Q)uit > "
+
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
+#, c-format
+msgid "invalid keyserver protocol (us %d!=handler %d)\n"
+msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
+
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
+#, c-format
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr "“%s” not a key ID: skipping\n"
+
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
+#, c-format
+msgid "refreshing %d key from %s\n"
+msgid_plural "refreshing %d keys from %s\n"
+msgstr[0] "refreshing %d key from %s\n"
+msgstr[1] "refreshing %d keys from %s\n"
+
- #: g10/keyserver.c:1424
++#: g10/keyserver.c:1426
+#, c-format
+msgid "WARNING: unable to refresh key %s via %s: %s\n"
+msgstr "WARNING: unable to refresh key %s via %s: %s\n"
+
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “%s” not found on keyserver\n"
+
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
+msgid "no keyserver known\n"
+msgstr "no keyserver known\n"
+
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
++#, c-format
++msgid "skipped \"%s\": %s\n"
++msgstr "skipped “%s”: %s\n"
++
++#: g10/keyserver.c:1823
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
+#, c-format
+msgid "requesting key from '%s'\n"
+msgstr "requesting key from ‘%s’\n"
+
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
+#, c-format
+msgid "weird size for an encrypted session key (%d)\n"
+msgstr "weird size for an encrypted session key (%d)\n"
+
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
+#, c-format
+msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
+msgstr "encrypted with %u-bit %s key, ID %s, created %s\n"
+
- #: g10/mainproc.c:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “%s”\n"
+
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
+#, c-format
+msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
+
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
+msgid "Note: sender requested \"for-your-eyes-only\"\n"
+msgstr "Note: sender requested “for-your-eyes-only”\n"
+
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “gpg --import” to apply\n"
+
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “%s”"
+
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “%s”"
+
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “%s”"
+
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
- #: g10/mainproc.c:1727
++#: 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:1744
+msgid "Key available at: "
+msgstr "Key available at: "
+
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “%s”"
+
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
+#, c-format
+msgid "%s signature, digest algorithm %s%s%s\n"
+msgstr "%s signature, digest algorithm %s%s%s\n"
+
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
+msgid "binary"
+msgstr "binary"
+
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
+msgid "textmode"
+msgstr "textmode"
+
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
+msgid "unknown"
+msgstr "unknown"
+
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
+msgid ", key algorithm "
+msgstr ", key algorithm "
+
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
+#, 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:2184
++#: g10/mainproc.c:2189
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
+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:2334
++#: g10/mainproc.c:2339
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
+msgid "old style (PGP 2.x) signature\n"
+msgstr "old style (PGP 2.x) signature\n"
+
+#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
+#, c-format
+msgid "fstat of '%s' failed in %s: %s\n"
+msgstr "fstat of ‘%s’ failed in %s: %s\n"
+
+#: g10/misc.c:170
+#, c-format
+msgid "fstat(%d) failed in %s: %s\n"
+msgstr "fstat(%d) failed in %s: %s\n"
+
+#: g10/misc.c:279
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "WARNING: using experimental public key algorithm %s\n"
+
+#: g10/misc.c:286
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+
+#: g10/misc.c:300
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "WARNING: using experimental cipher algorithm %s\n"
+
+#: g10/misc.c:319
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "WARNING: using experimental digest algorithm %s\n"
+
+#: g10/misc.c:328
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNING: digest algorithm %s is deprecated\n"
+
+#: g10/misc.c:353
+#, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "Note: signatures using the %s algorithm are rejected\n"
+
+#: g10/misc.c:375
+#, c-format
+msgid "(reported error: %s)\n"
+msgstr "(reported error: %s)\n"
+
+#: g10/misc.c:378
+#, c-format
+msgid "(reported error: %s <%s>)\n"
+msgstr "(reported error: %s <%s>)\n"
+
+#: g10/misc.c:397
+msgid "(further info: "
+msgstr "(further info: "
+
+#: g10/misc.c:1056
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “%s”\n"
+
+#: g10/misc.c:1060
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “%s” is a deprecated option\n"
+
+#: g10/misc.c:1062
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “%s%s” instead\n"
+
+#: g10/misc.c:1069
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
+msgstr "WARNING: “%s” is a deprecated command - do not use it\n"
+
+#: g10/misc.c:1079
+#, c-format
+msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
+msgstr "%s:%u: “%s” is obsolete in this file - it only has effect in %s\n"
+
+#: g10/misc.c:1083
+#, c-format
+msgid ""
+"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
+msgstr ""
+"WARNING: “%s%s” is an obsolete option - it has no effect except on %s\n"
+
+#: g10/misc.c:1147
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1172
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
+#: g10/misc.c:1292
+#, c-format
+msgid "this message may not be usable by %s\n"
+msgstr "this message may not be usable by %s\n"
+
+#: g10/misc.c:1467
+#, c-format
+msgid "ambiguous option '%s'\n"
+msgstr "ambiguous option ‘%s’\n"
+
+#: g10/misc.c:1492
+#, c-format
+msgid "unknown option '%s'\n"
+msgstr "unknown option ‘%s’\n"
+
+#: g10/misc.c:1730
+msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
+msgstr ""
+"ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
+
+#: g10/misc.c:1752
+#, c-format
+msgid "unknown weak digest '%s'\n"
+msgstr "unknown weak digest ‘%s’\n"
+
+#: g10/openfile.c:84
+#, c-format
+msgid "File '%s' exists. "
+msgstr "File ‘%s’ exists. "
+
+#: g10/openfile.c:88
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:123
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:147
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:218
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:366
+#, c-format
+msgid "assuming signed data in '%s'\n"
+msgstr "assuming signed data in ‘%s’\n"
+
+#: g10/openfile.c:457
+#, c-format
+msgid "new configuration file '%s' created\n"
+msgstr "new configuration file ‘%s’ created\n"
+
+#: g10/openfile.c:498
+#, c-format
+msgid "WARNING: options in '%s' are not yet active during this run\n"
+msgstr "WARNING: options in ‘%s’ are not yet active during this run\n"
+
+#: g10/parse-packet.c:257
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
+#: g10/parse-packet.c:1113
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr "subpacket of type %d has critical bit set\n"
+
+#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
+#, c-format
+msgid "problem with the agent: %s\n"
+msgstr "problem with the agent: %s\n"
+
+#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
+#: g10/passphrase.c:277
+#, c-format
+msgid ""
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+msgstr ""
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
+"“%.*s”\n"
+"%u-bit %s key, ID %s,\n"
+"created %s%s.\n"
+
+#: g10/passphrase.c:296
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
+#: g10/passphrase.c:325
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
+#: g10/passphrase.c:483
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for\n"
+"user: \"%s\"\n"
+msgstr ""
+"You need a passphrase to unlock the secret key for\n"
+"user: “%s”\n"
+
+#: g10/passphrase.c:491
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
+#: g10/passphrase.c:500
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
+#: 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: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: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: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: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: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: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:380
+msgid "unable to display photo ID!\n"
+msgstr "unable to display photo ID!\n"
+
+#: g10/pkclist.c:72 g10/revoke.c:757
+msgid "No reason specified"
+msgstr "No reason specified"
+
+#: g10/pkclist.c:74 g10/revoke.c:759
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
+#: g10/pkclist.c:76 g10/revoke.c:758
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
+#: g10/pkclist.c:78 g10/revoke.c:760
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
+#: g10/pkclist.c:80 g10/revoke.c:761
+msgid "User ID is no longer valid"
+msgstr "User ID is no longer valid"
+
+#: g10/pkclist.c:84
+msgid "reason for revocation: "
+msgstr "reason for revocation: "
+
+#: g10/pkclist.c:100
+msgid "revocation comment: "
+msgstr "revocation comment: "
+
+#. TRANSLATORS: These are the allowed answers in lower and
+#. uppercase. Below you will find the matching strings which
+#. should be translated accordingly and the letter changed to
+#. match the one in the answer string.
+#.
+#. i = please show me more information
+#. m = back to the main menu
+#. s = skip this key
+#. q = quit
+#.
+#: g10/pkclist.c:216
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
+#: g10/pkclist.c:224
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
+
+#: g10/pkclist.c:257
+#, c-format
+msgid " aka \"%s\"\n"
+msgstr " aka “%s”\n"
+
+#: g10/pkclist.c:267
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
+msgstr ""
+"How much do you trust that this key actually belongs to the named user?\n"
+
+#: g10/pkclist.c:282
+#, c-format
+msgid " %d = I don't know or won't say\n"
+msgstr " %d = I don't know or won't say\n"
+
+#: g10/pkclist.c:284
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = I do NOT trust\n"
+
+#: g10/pkclist.c:290
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = I trust ultimately\n"
+
+#: g10/pkclist.c:296
+msgid " m = back to the main menu\n"
+msgstr " m = back to the main menu\n"
+
+#: g10/pkclist.c:299
+msgid " s = skip this key\n"
+msgstr " s = skip this key\n"
+
+#: g10/pkclist.c:300
+msgid " q = quit\n"
+msgstr " q = quit\n"
+
+#: g10/pkclist.c:304
+#, c-format
+msgid ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+msgstr ""
+"The minimum trust level for this key is: %s\n"
+"\n"
+
+#: g10/pkclist.c:310 g10/revoke.c:786
+msgid "Your decision? "
+msgstr "Your decision? "
+
+#: g10/pkclist.c:331
+msgid "Do you really want to set this key to ultimate trust? (y/N) "
+msgstr "Do you really want to set this key to ultimate trust? (y/N) "
+
+#: g10/pkclist.c:345
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificates leading to an ultimately trusted key:\n"
+
+#: g10/pkclist.c:434
+#, c-format
+msgid "%s: There is no assurance this key belongs to the named user\n"
+msgstr "%s: There is no assurance this key belongs to the named user\n"
+
+#: g10/pkclist.c:439
+#, c-format
+msgid "%s: There is limited assurance this key belongs to the named user\n"
+msgstr "%s: There is limited assurance this key belongs to the named user\n"
+
+#: g10/pkclist.c:445
+msgid "This key probably belongs to the named user\n"
+msgstr "This key probably belongs to the named user\n"
+
+#: g10/pkclist.c:450
+msgid "This key belongs to us\n"
+msgstr "This key belongs to us\n"
+
+#: g10/pkclist.c:476
+msgid ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID. If you *really* know what you are doing,\n"
+"you may answer the next question with yes.\n"
+msgstr ""
+"It is NOT certain that the key belongs to the person named\n"
+"in the user ID. If you *really* know what you are doing,\n"
+"you may answer the next question with yes.\n"
+
+#: g10/pkclist.c:495
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
+#: g10/pkclist.c:545
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
+#: g10/pkclist.c:552
+msgid "WARNING: this key might be revoked (revocation key not present)\n"
+msgstr "WARNING: this key might be revoked (revocation key not present)\n"
+
+#: g10/pkclist.c:561
+msgid "WARNING: This key has been revoked by its designated revoker!\n"
+msgstr "WARNING: This key has been revoked by its designated revoker!\n"
+
+#: g10/pkclist.c:564
+msgid "WARNING: This key has been revoked by its owner!\n"
+msgstr "WARNING: This key has been revoked by its owner!\n"
+
+#: g10/pkclist.c:565
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
+#: g10/pkclist.c:571
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "WARNING: This subkey has been revoked by its owner!\n"
+
+#: g10/pkclist.c:576
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
+#: g10/pkclist.c:596
+#, c-format
+msgid "Note: Verified signer's address is '%s'\n"
+msgstr "Note: Verified signer's address is ‘%s’\n"
+
+#: g10/pkclist.c:603
+#, c-format
+msgid "Note: Signer's address '%s' does not match DNS entry\n"
+msgstr "Note: Signer's address ‘%s’ does not match DNS entry\n"
+
+#: g10/pkclist.c:615
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr "trustlevel adjusted to FULL due to valid PKA info\n"
+
+#: g10/pkclist.c:623
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr "trustlevel adjusted to NEVER due to bad PKA info\n"
+
+#: g10/pkclist.c:634
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
+#: g10/pkclist.c:645
+msgid "WARNING: This key is not certified with a trusted signature!\n"
+msgstr "WARNING: This key is not certified with a trusted signature!\n"
+
+#: g10/pkclist.c:647
+msgid ""
+" There is no indication that the signature belongs to the owner.\n"
+msgstr ""
+" There is no indication that the signature belongs to the owner.\n"
+
+#: g10/pkclist.c:655
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
+#: g10/pkclist.c:656
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
+#: g10/pkclist.c:664
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+
+#: g10/pkclist.c:666
+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:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
+#, c-format
+msgid "can't encrypt to '%s'\n"
+msgstr "can't encrypt to ‘%s’\n"
+
- #: g10/pkclist.c:972
++#: g10/pkclist.c:984
+#, 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:979
++#: g10/pkclist.c:991
+#, 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:1082
++#: g10/pkclist.c:1094
+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:1106
++#: g10/pkclist.c:1118
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
+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:1156
++#: g10/pkclist.c:1168
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “%s”\n"
+
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
+#, c-format
+msgid "Note: key %s has no %s feature\n"
+msgstr "Note: key %s has no %s feature\n"
+
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
+#, c-format
+msgid "Note: key %s has no preference for %s\n"
+msgstr "Note: key %s has no preference for %s\n"
+
+#: g10/plaintext.c:84
+msgid "data not saved; use option \"--output\" to save it\n"
+msgstr "data not saved; use option “--output” to save it\n"
+
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
+#, c-format
+msgid "can't open signed data '%s'\n"
+msgstr "can't open signed data ‘%s’\n"
+
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
+#, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "can't open signed data fd=%d: %s\n"
+
+#: g10/pubkey-enc.c:116
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:123
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:282
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:310
+#, c-format
+msgid "cipher algorithm %d%s is unknown or disabled\n"
+msgstr "cipher algorithm %d%s is unknown or disabled\n"
+
+#: g10/pubkey-enc.c:352
+#, c-format
+msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
+msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n"
+
+#: g10/pubkey-enc.c:377
+#, c-format
+msgid "Note: secret key %s expired at %s\n"
+msgstr "Note: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:384
+msgid "Note: key has been revoked"
+msgstr "Note: key has been revoked"
+
+#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
+#: g10/revoke.c:500
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:144
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
+#: g10/revoke.c:312
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
+#: g10/revoke.c:316
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
+#: g10/revoke.c:322
+msgid "Secret key is not available.\n"
+msgstr "Secret key is not available.\n"
+
+#: g10/revoke.c:327
+msgid "Create a designated revocation certificate for this key? (y/N) "
+msgstr "Create a designated revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:336 g10/revoke.c:727
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
+#: g10/revoke.c:352 g10/revoke.c:479
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
+#: g10/revoke.c:415
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
+#: g10/revoke.c:421
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “%s”\n"
+
+#: g10/revoke.c:551
+msgid "This is a revocation certificate for the OpenPGP key:"
+msgstr "This is a revocation certificate for the OpenPGP key:"
+
+#: g10/revoke.c:567
+msgid ""
+"A revocation certificate is a kind of \"kill switch\" to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+msgstr ""
+"A revocation certificate is a kind of “kill switch” to publicly\n"
+"declare that a key shall not anymore be used. It is not possible\n"
+"to retract such a revocation certificate once it has been published."
+
+#: g10/revoke.c:570
+msgid ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command \"--gen-revoke\" in the GnuPG manual."
+msgstr ""
+"Use it to revoke this key in case of a compromise or loss of\n"
+"the secret key. However, if the secret key is still accessible,\n"
+"it is better to generate a new revocation certificate and give\n"
+"a reason for the revocation. For details see the description of\n"
+"of the gpg command “--gen-revoke” in the GnuPG manual."
+
+#: g10/revoke.c:575
+msgid ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+msgstr ""
+"To avoid an accidental use of this file, a colon has been inserted\n"
+"before the 5 dashes below. Remove this colon with a text editor\n"
+"before importing and publishing this revocation certificate."
+
+#: g10/revoke.c:590
+#, c-format
+msgid "revocation certificate stored as '%s.rev'\n"
+msgstr "revocation certificate stored as ‘%s.rev’\n"
+
+#: g10/revoke.c:634
+#, c-format
+msgid "secret key \"%s\" not found\n"
+msgstr "secret key “%s” not found\n"
+
+#. TRANSLATORS: The %s prints a key specification which
+#. for example has been given at the command line. Several lines
+#. lines with secret key infos are printed after this message.
+#: g10/revoke.c:661
+#, c-format
+msgid "'%s' matches multiple secret keys:\n"
+msgstr "‘%s’ matches multiple secret keys:\n"
+
+#: g10/revoke.c:688
+#, c-format
+msgid "error searching the keyring: %s\n"
+msgstr "error searching the keyring: %s\n"
+
+#: g10/revoke.c:711
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:735
+msgid ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+msgstr ""
+"Revocation certificate created.\n"
+"\n"
+"Please move it to a medium which you can hide away; if Mallory gets\n"
+"access to this certificate he can use it to make your key unusable.\n"
+"It is smart to print this certificate and store it away, just in case\n"
+"your media become unreadable. But have some caution: The print system of\n"
+"your machine might store the data and make it available to others!\n"
+
+#: g10/revoke.c:769
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
+#: g10/revoke.c:779
+msgid "Cancel"
+msgstr "Cancel"
+
+#: g10/revoke.c:781
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
+#: g10/revoke.c:822
+msgid "Enter an optional description; end it with an empty line:\n"
+msgstr "Enter an optional description; end it with an empty line:\n"
+
+#: g10/revoke.c:850
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
+#: g10/revoke.c:852
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
+#: g10/revoke.c:857
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: g10/seskey.c:62 sm/encrypt.c:123
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
+#: g10/seskey.c:66
+#, c-format
+msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n"
+
+#: g10/seskey.c:306
+#, c-format
+msgid "%s key %s uses an unsafe (%zu bit) hash\n"
+msgstr "%s key %s uses an unsafe (%zu bit) hash\n"
+
+#: g10/seskey.c:324
+#, c-format
+msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
+msgstr "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
+
+#: g10/sig-check.c:116
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
+#: g10/sig-check.c:143
+#, c-format
+msgid "WARNING: signing subkey %s is not cross-certified\n"
+msgstr "WARNING: signing subkey %s is not cross-certified\n"
+
+#: g10/sig-check.c:145
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: g10/sig-check.c:155
+#, c-format
+msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
+msgstr "WARNING: signing subkey %s has an invalid cross-certification\n"
+
+#: g10/sig-check.c:277
+#, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgid_plural "public key %s is %lu seconds newer than the signature\n"
+msgstr[0] "public key %s is %lu second newer than the signature\n"
+msgstr[1] "public key %s is %lu seconds newer than the signature\n"
+
+#: g10/sig-check.c:286
+#, c-format
+msgid "public key %s is %lu day newer than the signature\n"
+msgid_plural "public key %s is %lu days newer than the signature\n"
+msgstr[0] "public key %s is %lu day newer than the signature\n"
+msgstr[1] "public key %s is %lu days newer than the signature\n"
+
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:309
+#, c-format
+msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
+msgid_plural ""
+"key %s was created %lu days in the future (time warp or clock problem)\n"
+msgstr[0] ""
+"key %s was created %lu day in the future (time warp or clock problem)\n"
+msgstr[1] ""
+"key %s was created %lu days in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:326
+#, c-format
+msgid "Note: signature key %s expired %s\n"
+msgstr "Note: signature key %s expired %s\n"
+
+#: g10/sig-check.c:337
+#, c-format
+msgid "Note: signature key %s has been revoked\n"
+msgstr "Note: signature key %s has been revoked\n"
+
+#: g10/sig-check.c:471
+#, c-format
+msgid "assuming bad signature from key %s due to an unknown critical bit\n"
+msgstr "assuming bad signature from key %s due to an unknown critical bit\n"
+
+#: g10/sig-check.c:1048
+#, c-format
+msgid "key %s: no subkey for subkey revocation signature\n"
+msgstr "key %s: no subkey for subkey revocation signature\n"
+
+#: g10/sig-check.c:1051
+#, c-format
+msgid "key %s: no subkey for subkey binding signature\n"
+msgstr "key %s: no subkey for subkey binding signature\n"
+
+#: g10/sign.c:88
+#, c-format
+msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
+
+#: g10/sign.c:114
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
+
+#: g10/sign.c:137
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+msgstr ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
+"unexpanded.\n"
+
- #: g10/sign.c:313
++#: g10/sign.c:314
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “%s”\n"
+
- #: g10/sign.c:861
++#: g10/sign.c:863
+#, 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:992
++#: g10/sign.c:994
+msgid "signing:"
+msgstr "signing:"
+
- #: g10/sign.c:1268
++#: g10/sign.c:1271
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
+#: g10/skclist.c:155 g10/skclist.c:236
+msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+msgstr "key is not flagged as insecure - can't use it with the faked RNG!\n"
+
+#: g10/skclist.c:187
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “%s”: duplicated\n"
+
+#: g10/skclist.c:206
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
+#: g10/skclist.c:225
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
+#: g10/tdbdump.c:57 g10/trustdb.c:361
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr "trust record %lu, type %d: write failed: %s\n"
+
+#: g10/tdbdump.c:105
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpg --import-ownertrust\" to restore them)\n"
+msgstr ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use “gpg --import-ownertrust” to restore them)\n"
+
+#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
+#, c-format
+msgid "error in '%s': %s\n"
+msgstr "error in '%s': %s\n"
+
+#: g10/tdbdump.c:162
+msgid "line too long"
+msgstr "line too long"
+
+#: g10/tdbdump.c:170
+msgid "colon missing"
+msgstr "colon missing"
+
+#: g10/tdbdump.c:176
+msgid "invalid fingerprint"
+msgstr "invalid fingerprint"
+
+#: g10/tdbdump.c:181
+msgid "ownertrust value missing"
+msgstr "ownertrust value missing"
+
+#: g10/tdbdump.c:217
+#, c-format
+msgid "error finding trust record in '%s': %s\n"
+msgstr "error finding trust record in '%s': %s\n"
+
+#: g10/tdbdump.c:221
+#, c-format
+msgid "read error in '%s': %s\n"
+msgstr "read error in '%s': %s\n"
+
+#: g10/tdbdump.c:230 g10/trustdb.c:376
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:355
+#, c-format
+msgid "can't create lock for '%s'\n"
+msgstr "can't create lock for ‘%s’\n"
+
- #: g10/tdbio.c:145
++#: g10/tdbio.c:146
+#, c-format
+msgid "can't lock '%s'\n"
+msgstr "can't lock ‘%s’\n"
+
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek failed: %s\n"
+
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
+#, c-format
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
+
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaction too large\n"
+
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
+#, c-format
+msgid "can't access '%s': %s\n"
+msgstr "can't access '%s': %s\n"
+
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
+msgid "Note: trustdb not writable\n"
+msgstr "Note: trustdb not writable\n"
+
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
+#: g10/textfilter.c:146
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "can't handle text lines longer than %d characters\n"
+
+#: g10/textfilter.c:241
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
+#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
+#, c-format
+msgid "error beginning transaction on TOFU database: %s\n"
+msgstr "error beginning transaction on TOFU database: %s\n"
+
+#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
+#, c-format
+msgid "error committing transaction on TOFU database: %s\n"
+msgstr "error committing transaction on TOFU database: %s\n"
+
+#: g10/tofu.c:375 g10/tofu.c:715
+#, c-format
+msgid "error rolling back transaction on TOFU database: %s\n"
+msgstr "error rolling back transaction on TOFU database: %s\n"
+
+#: g10/tofu.c:512
+#, c-format
+msgid "unsupported TOFU database version: %s\n"
+msgstr "unsupported TOFU database version: %s\n"
+
+#: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
+#: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
+#, c-format
+msgid "error reading TOFU database: %s\n"
+msgstr "error reading TOFU database: %s\n"
+
+#: 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: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:761
+#, c-format
+msgid "error opening TOFU database '%s': %s\n"
+msgstr "error opening TOFU database '%s': %s\n"
+
+#: g10/tofu.c:1027
+msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
+msgstr "Warning: Home directory contains both tofu.db and tofu.d.\n"
+
+#: g10/tofu.c:1029
+msgid "Using split format for TOFU database\n"
+msgstr "Using split format for TOFU database\n"
+
+#: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
+#, c-format
+msgid "error updating TOFU database: %s\n"
+msgstr "error updating TOFU database: %s\n"
+
+#: g10/tofu.c:1626
+#, c-format
+msgid "The binding %s is NOT known."
+msgstr "The binding %s is NOT known."
+
+#: g10/tofu.c:1636
+#, c-format
+msgid ""
+"The key with fingerprint %s raised a conflict with the binding %s. Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
+msgstr ""
+"The key with fingerprint %s raised a conflict with the binding %s. Since "
+"this binding's policy was 'auto', it was changed to 'ask'."
+
+#: g10/tofu.c:1648
+#, c-format
+msgid ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+msgstr ""
+"Please indicate whether you believe the binding %s%sis legitimate (the key "
+"belongs to the stated owner) or a forgery (bad)."
+
+#: g10/tofu.c:1737
+#, c-format
+msgid "error gathering other user IDs: %s\n"
+msgstr "error gathering other user IDs: %s\n"
+
+#: g10/tofu.c:1747
+msgid "Known user IDs associated with this key:\n"
+msgstr "Known user IDs associated with this key:\n"
+
+#: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
+#, c-format
+msgid "policy: %s"
+msgstr "policy: %s"
+
+#: g10/tofu.c:1817
+#, c-format
+msgid "error gathering signature stats: %s\n"
+msgstr "error gathering signature stats: %s\n"
+
+#: g10/tofu.c:1821
+#, c-format
+msgid "The email address \"%s\" is associated with %d key:\n"
+msgid_plural "The email address \"%s\" is associated with %d keys:\n"
+msgstr[0] "The email address “%s” is associated with %d key:\n"
+msgstr[1] "The email address “%s” is associated with %d keys:\n"
+
+#: g10/tofu.c:1845
+#, c-format
+msgid "Statistics for keys with the email address \"%s\":\n"
+msgstr "Statistics for keys with the email address “%s”:\n"
+
+#: g10/tofu.c:1859
+msgid "this key"
+msgstr "this key"
+
+#: g10/tofu.c:1869
+#, c-format
+msgid "%ld message signed in the future."
+msgid_plural "%ld messages signed in the future."
+msgstr[0] "%ld message signed in the future."
+msgstr[1] "%ld messages signed in the future."
+
+#: g10/tofu.c:1878
+#, c-format
+msgid "%ld message signed"
+msgid_plural "%ld messages signed"
+msgstr[0] "%ld message signed"
+msgstr[1] "%ld messages signed"
+
+#: g10/tofu.c:1884
+#, c-format
+msgid " over the past %ld day."
+msgid_plural " over the past %ld days."
+msgstr[0] " over the past %ld day."
+msgstr[1] " over the past %ld days."
+
+#: g10/tofu.c:1888
+#, c-format
+msgid " over the past %ld week."
+msgid_plural " over the past %ld weeks."
+msgstr[0] " over the past %ld week."
+msgstr[1] " over the past %ld weeks."
+
+#: g10/tofu.c:1892
+#, c-format
+msgid " over the past %ld month."
+msgid_plural " over the past %ld months."
+msgstr[0] " over the past %ld month."
+msgstr[1] " over the past %ld months."
+
+#. TRANSLATORS: Please translate the text found in the source
+#. * file below. We don't directly internationalize that text so
+#. * that we can tweak it without breaking translations.
+#: g10/tofu.c:1909
+msgid "TOFU detected a binding conflict"
+msgstr "TOFU detected a binding conflict"
+
+#. TRANSLATORS: Two letters (normally the lower and upper case
+#. * version of the hotkey) for each of the five choices. If
+#. * there is only one choice in your language, repeat it.
+#: g10/tofu.c:1947
+msgid "gGaAuUrRbB"
+msgstr "gGaAuUrRbB"
+
+#: g10/tofu.c:1953
+msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
+msgstr "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
+
+#: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
+#, c-format
+msgid "error setting TOFU binding's trust level to %s\n"
+msgstr "error setting TOFU binding's trust level to %s\n"
+
+#: g10/tofu.c:2259
+#, c-format
+msgid "error changing TOFU policy: %s\n"
+msgstr "error changing TOFU policy: %s\n"
+
+#. TRANSLATORS: The tilde ('~') is used here to indicate a
+#. * non-breakable space
+#: g10/tofu.c:2351
+#, c-format
+msgid "%d~year"
+msgid_plural "%d~years"
+msgstr[0] "%d~year"
+msgstr[1] "%d~years"
+
+#: g10/tofu.c:2360
+#, c-format
+msgid "%d~month"
+msgid_plural "%d~months"
+msgstr[0] "%d~month"
+msgstr[1] "%d~months"
+
+#: g10/tofu.c:2369
+#, c-format
+msgid "%d~day"
+msgid_plural "%d~days"
+msgstr[0] "%d~day"
+msgstr[1] "%d~days"
+
+#: g10/tofu.c:2378
+#, c-format
+msgid "%d~hour"
+msgid_plural "%d~hours"
+msgstr[0] "%d~hour"
+msgstr[1] "%d~hours"
+
+#: g10/tofu.c:2387
+#, c-format
+msgid "%d~minute"
+msgid_plural "%d~minutes"
+msgstr[0] "%d~minute"
+msgstr[1] "%d~minutes"
+
+#: g10/tofu.c:2396
+#, c-format
+msgid "%d~second"
+msgid_plural "%d~seconds"
+msgstr[0] "%d~second"
+msgstr[1] "%d~seconds"
+
+#: g10/tofu.c:2484
+#, c-format
+msgid "Have never verified a message signed by key %s!\n"
+msgstr "Have never verified a message signed by key %s!\n"
+
+#: g10/tofu.c:2513
+#, c-format
+msgid ""
+"Failed to collect signature statistics for \"%s\"\n"
+"(key %s)\n"
+msgstr ""
+"Failed to collect signature statistics for “%s”\n"
+"(key %s)\n"
+
+#: g10/tofu.c:2533
+#, c-format
+msgid "Verified %ld messages signed by \"%s\"."
+msgstr "Verified %ld messages signed by “%s”."
+
+#: g10/tofu.c:2544
+#, c-format
+msgid ""
+"Verified %ld message signed by \"%s\"\n"
+"in the past %s."
+msgid_plural ""
+"Verified %ld messages signed by \"%s\"\n"
+"in the past %s."
+msgstr[0] ""
+"Verified %ld message signed by “%s”\n"
+"in the past %s."
+msgstr[1] ""
+"Verified %ld messages signed by “%s”\n"
+"in the past %s."
+
+#: g10/tofu.c:2555
+#, c-format
+msgid "The most recent message was verified %s ago."
+msgstr "The most recent message was verified %s ago."
+
+#: g10/tofu.c:2603
+msgid "Warning: we've have yet to see a message signed by this key!\n"
+msgstr "Warning: we've have yet to see a message signed by this key!\n"
+
+#: g10/tofu.c:2606
+msgid "Warning: we've only seen a single message signed by this key!\n"
+msgstr "Warning: we've only seen a single message signed by this key!\n"
+
+#: g10/tofu.c:2614
+#, c-format
+msgid ""
+"Warning: if you think you've seen more than %ld message signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgid_plural ""
+"Warning: if you think you've seen more than %ld messages signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgstr[0] ""
+"Warning: if you think you've seen more than %ld message signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+msgstr[1] ""
+"Warning: if you think you've seen more than %ld messages signed by this key, "
+"then this key might be a forgery! Carefully examine the email address for "
+"small variations. If the key is suspect, then use\n"
+" %s\n"
+"to mark it as being bad.\n"
+
+#: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
+#: g10/tofu.c:3058
+#, c-format
+msgid "error opening TOFU database: %s\n"
+msgstr "error opening TOFU database: %s\n"
+
+#: g10/trustdb.c:215
+#, c-format
+msgid "'%s' is not a valid long keyID\n"
+msgstr "‘%s’ is not a valid long keyID\n"
+
+#: g10/trustdb.c:241
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
+#: g10/trustdb.c:279
+#, c-format
+msgid "key %s occurs more than once in the trustdb\n"
+msgstr "key %s occurs more than once in the trustdb\n"
+
+#: g10/trustdb.c:294
+#, c-format
+msgid "key %s: no public key for trusted key - skipped\n"
+msgstr "key %s: no public key for trusted key - skipped\n"
+
+#: g10/trustdb.c:304
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
+#: g10/trustdb.c:340
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr "trust record %lu, req type %d: read failed: %s\n"
+
+#: g10/trustdb.c:346
+#, c-format
+msgid "trust record %lu is not of requested type %d\n"
+msgstr "trust record %lu is not of requested type %d\n"
+
+#: g10/trustdb.c:421
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr "You may try to re-create the trustdb using the commands:\n"
+
+#: g10/trustdb.c:430
+msgid "If that does not work, please consult the manual\n"
+msgstr "If that does not work, please consult the manual\n"
+
+#: g10/trustdb.c:467
+#, c-format
+msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
+msgstr "unable to use unknown trust model (%d) - assuming %s trust model\n"
+
+#: g10/trustdb.c:473
+#, c-format
+msgid "using %s trust model\n"
+msgstr "using %s trust model\n"
+
+#: g10/trustdb.c:510
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:525
+#, c-format
+msgid "no need for a trustdb check with '%s' trust model\n"
+msgstr "no need for a trustdb check with ‘%s’ trust model\n"
+
+#: g10/trustdb.c:541
+#, c-format
+msgid "no need for a trustdb update with '%s' trust model\n"
+msgstr "no need for a trustdb update with ‘%s’ trust model\n"
+
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:965
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:970
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
+#, c-format
+msgid "%d key processed"
+msgid_plural "%d keys processed"
+msgstr[0] "%d key processed"
+msgstr[1] "%d keys processed"
+
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
+#, c-format
+msgid " (%d validity count cleared)\n"
+msgid_plural " (%d validity counts cleared)\n"
+msgstr[0] " (%d validity count cleared)\n"
+msgstr[1] " (%d validity counts cleared)\n"
+
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
+#, c-format
+msgid "public key of ultimately trusted key %s not found\n"
+msgstr "public key of ultimately trusted key %s not found\n"
+
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
+#, c-format
+msgid ""
+"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgstr ""
+"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
+
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
+#, c-format
+msgid "unable to update trustdb version record: write failed: %s\n"
+msgstr "unable to update trustdb version record: write failed: %s\n"
+
+#: g10/trust.c:105
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trust.c:106
+msgid "never"
+msgstr "never"
+
+#: g10/trust.c:107
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trust.c:108
+msgid "full"
+msgstr "full"
+
+#: g10/trust.c:109
+msgid "ultimate"
+msgstr "ultimate"
+
+#. TRANSLATORS: these strings are similar to those in
+#. trust_value_to_string(), but are a fixed length. This is needed to
+#. make attractive information listings where columns line up
+#. properly. The value "10" should be the length of the strings you
+#. choose to translate to. This is the length in printable columns.
+#. It gets passed to atoi() so everything after the number is
+#. essentially a comment and need not be translated. Either key and
+#. uid are both NULL, or neither are NULL.
+#: g10/trust.c:146
+msgid "10 translator see trust.c:uid_trust_string_fixed"
+msgstr "10 translator see trust.c:uid_trust_string_fixed"
+
+#: g10/trust.c:149
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trust.c:151 g10/trust.c:157
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trust.c:156
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trust.c:158
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: g10/trust.c:159
+msgid "[ never ]"
+msgstr "[ never ]"
+
+#: g10/trust.c:160
+msgid "[marginal]"
+msgstr "[marginal]"
+
+#: g10/trust.c:161
+msgid "[ full ]"
+msgstr "[ full ]"
+
+#: g10/trust.c:162
+msgid "[ultimate]"
+msgstr "[ultimate]"
+
+#: g10/verify.c:117
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+
+#: g10/verify.c:204
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "input line %u too long or missing LF\n"
+
+#: g10/verify.c:253
+#, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "can't open fd %d: %s\n"
+
+#: kbx/kbxutil.c:92
+msgid "set debugging flags"
+msgstr "set debugging flags"
+
+#: kbx/kbxutil.c:93
+msgid "enable full debugging"
+msgstr "enable full debugging"
+
+#: kbx/kbxutil.c:117
+msgid "Usage: kbxutil [options] [files] (-h for help)"
+msgstr "Usage: kbxutil [options] [files] (-h for help)"
+
+#: kbx/kbxutil.c:120
+msgid ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+msgstr ""
+"Syntax: kbxutil [options] [files]\n"
+"List, export, import Keybox data\n"
+
+#: scd/app-nks.c:714 scd/app-openpgp.c:2995
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA modulus missing or not of size %d bits\n"
+
+#: scd/app-nks.c:722 scd/app-openpgp.c:3007
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA public exponent missing or larger than %d bits\n"
+
+#: scd/app-nks.c:802 scd/app-openpgp.c:1757 scd/app-openpgp.c:1776
+#: scd/app-openpgp.c:1941 scd/app-openpgp.c:1958 scd/app-openpgp.c:2222
+#: scd/app-openpgp.c:2269 scd/app-openpgp.c:2374 scd/app-dinsig.c:303
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN callback returned error: %s\n"
+
+#: scd/app-nks.c:835
+msgid "the NullPIN has not yet been changed\n"
+msgstr "the NullPIN has not yet been changed\n"
+
+#: scd/app-nks.c:1096
+msgid "|N|Please enter a new PIN for the standard keys."
+msgstr "|N|Please enter a new PIN for the standard keys."
+
+#: scd/app-nks.c:1097
+msgid "||Please enter the PIN for the standard keys."
+msgstr "||Please enter the PIN for the standard keys."
+
+#: scd/app-nks.c:1103
+msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+msgstr ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
+
+#: scd/app-nks.c:1105
+msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
+
+#: scd/app-nks.c:1113
+msgid "|N|Please enter a new PIN for the key to create qualified signatures."
+msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
+
+#: scd/app-nks.c:1115
+msgid "||Please enter the PIN for the key to create qualified signatures."
+msgstr "||Please enter the PIN for the key to create qualified signatures."
+
+#: scd/app-nks.c:1123
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+
+#: scd/app-nks.c:1125
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+msgstr ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
+
+#: scd/app-nks.c:1229 scd/app-openpgp.c:2303 scd/app-dinsig.c:532
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error getting new PIN: %s\n"
+
+#: scd/app-openpgp.c:805
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: scd/app-openpgp.c:818
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "failed to store the creation date: %s\n"
+
+#: scd/app-openpgp.c:1286
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: scd/app-openpgp.c:1322
+msgid "response does not contain the EC public point\n"
+msgstr "response does not contain the EC public point\n"
+
+#: scd/app-openpgp.c:1708
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: scd/app-openpgp.c:1715
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
+
+#: scd/app-openpgp.c:1730
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
+
+#: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: scd/app-openpgp.c:1783 scd/app-openpgp.c:1965 scd/app-openpgp.c:2229
+#, c-format
+msgid "PIN for CHV%d is too short; minimum length is %d\n"
+msgstr "PIN for CHV%d is too short; minimum length is %d\n"
+
+#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1835 scd/app-openpgp.c:1977
+#: scd/app-openpgp.c:3937
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: scd/app-openpgp.c:1864 scd/app-openpgp.c:2250 scd/app-openpgp.c:4351
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: scd/app-openpgp.c:1877
+#, c-format
+msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgid_plural ""
+"%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
+msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string. Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1887
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+
+#: scd/app-openpgp.c:1891
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: scd/app-openpgp.c:1912
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: scd/app-openpgp.c:2265
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
+#, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "Reset Code is too short; minimum length is %d\n"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-openpgp.c:2298
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: scd/app-openpgp.c:2299
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: scd/app-openpgp.c:2299
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: scd/app-openpgp.c:2370
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||Please enter the Admin PIN and New Admin PIN"
+
+#: scd/app-openpgp.c:2371
+msgid "||Please enter the PIN and New PIN"
+msgstr "||Please enter the PIN and New PIN"
+
+#: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: scd/app-openpgp.c:2443
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: scd/app-openpgp.c:2447
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: scd/app-openpgp.c:2449
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: scd/app-openpgp.c:2451
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: scd/app-openpgp.c:3017 scd/app-openpgp.c:3025
+#, c-format
+msgid "RSA prime %s missing or not of size %d bits\n"
+msgstr "RSA prime %s missing or not of size %d bits\n"
+
+#: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: scd/app-openpgp.c:3320
+msgid "unsupported curve\n"
+msgstr "unsupported curve\n"
+
+#: scd/app-openpgp.c:3577
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: scd/app-openpgp.c:3590
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: scd/app-openpgp.c:3596
+#, c-format
+msgid "key generation completed (%d second)\n"
+msgid_plural "key generation completed (%d seconds)\n"
+msgstr[0] "key generation completed (%d second)\n"
+msgstr[1] "key generation completed (%d seconds)\n"
+
+#: scd/app-openpgp.c:3661
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: scd/app-openpgp.c:3711
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: scd/app-openpgp.c:3827
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: scd/app-openpgp.c:3912
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: scd/app-openpgp.c:4365
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"verification of Admin PIN is currently prohibited through this command\n"
+
+#: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "can't access %s - invalid OpenPGP card?\n"
+
+#: scd/app-dinsig.c:299
+msgid "||Please enter your PIN at the reader's pinpad"
+msgstr "||Please enter your PIN at the reader's pinpad"
+
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string. We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-dinsig.c:529
+msgid "|N|Initial New PIN"
+msgstr "|N|Initial New PIN"
+
+#: scd/scdaemon.c:114
+msgid "run in multi server mode (foreground)"
+msgstr "run in multi server mode (foreground)"
+
+#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
+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
++#: scd/scdaemon.c:287
+msgid "Usage: @SCDAEMON@ [options] (-h for help)"
+msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
+
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
+msgid ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for @GNUPG@\n"
+msgstr ""
+"Syntax: scdaemon [options] [command [args]]\n"
+"Smartcard daemon for @GNUPG@\n"
+
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
+msgid "please use the option '--daemon' to run the program in the background\n"
+msgstr ""
+"please use the option ‘--daemon’ to run the program in the background\n"
+
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
+#, c-format
+msgid "handler for fd %d started\n"
+msgstr "handler for fd %d started\n"
+
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
+#, 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:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
+msgid "no dirmngr running in this session\n"
+msgstr "no dirmngr running in this session\n"
+
+#: sm/certchain.c:194
+#, c-format
+msgid "validation model requested by certificate: %s"
+msgstr "validation model requested by certificate: %s"
+
+#: sm/certchain.c:195 sm/certchain.c:1919
+msgid "chain"
+msgstr "chain"
+
+#: sm/certchain.c:196 sm/certchain.c:1919
+msgid "shell"
+msgstr "shell"
+
+#: sm/certchain.c:256 dirmngr/validate.c:107
+#, c-format
+msgid "critical certificate extension %s is not supported"
+msgstr "critical certificate extension %s is not supported"
+
+#: sm/certchain.c:295 dirmngr/validate.c:205
+msgid "issuer certificate is not marked as a CA"
+msgstr "issuer certificate is not marked as a CA"
+
+#: sm/certchain.c:333
+msgid "critical marked policy without configured policies"
+msgstr "critical marked policy without configured policies"
+
+#: sm/certchain.c:343
+#, c-format
+msgid "failed to open '%s': %s\n"
+msgstr "failed to open '%s': %s\n"
+
+#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
+msgid "Note: non-critical certificate policy not allowed"
+msgstr "Note: non-critical certificate policy not allowed"
+
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
+msgid "certificate policy not allowed"
+msgstr "certificate policy not allowed"
+
+#: sm/certchain.c:527
+msgid "looking up issuer at external location\n"
+msgstr "looking up issuer at external location\n"
+
+#: sm/certchain.c:546
+#, c-format
+msgid "number of issuers matching: %d\n"
+msgstr "number of issuers matching: %d\n"
+
+#: sm/certchain.c:590
+msgid "looking up issuer from the Dirmngr cache\n"
+msgstr "looking up issuer from the Dirmngr cache\n"
+
+#: sm/certchain.c:614
+#, c-format
+msgid "number of matching certificates: %d\n"
+msgstr "number of matching certificates: %d\n"
+
+#: sm/certchain.c:616
+#, c-format
+msgid "dirmngr cache-only key lookup failed: %s\n"
+msgstr "dirmngr cache-only key lookup failed: %s\n"
+
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
+#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
+msgid "failed to allocate keyDB handle\n"
+msgstr "failed to allocate keyDB handle\n"
+
+#: sm/certchain.c:981
+msgid "certificate has been revoked"
+msgstr "certificate has been revoked"
+
+#: sm/certchain.c:996
+msgid "the status of the certificate is unknown"
+msgstr "the status of the certificate is unknown"
+
+#: sm/certchain.c:1003
+msgid "please make sure that the \"dirmngr\" is properly installed\n"
+msgstr "please make sure that the “dirmngr” is properly installed\n"
+
+#: sm/certchain.c:1009
+#, c-format
+msgid "checking the CRL failed: %s"
+msgstr "checking the CRL failed: %s"
+
+#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
+#, 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:1223 sm/keydb.c:1321
+#, c-format
+msgid "error locking keybox: %s\n"
+msgstr "error locking keybox: %s\n"
+
+#: sm/delete.c:143
+#, c-format
+msgid "duplicated certificate '%s' deleted\n"
+msgstr "duplicated certificate ‘%s’ deleted\n"
+
+#: sm/delete.c:145
+#, c-format
+msgid "certificate '%s' deleted\n"
+msgstr "certificate ‘%s’ deleted\n"
+
+#: sm/delete.c:175
+#, c-format
+msgid "deleting certificate \"%s\" failed: %s\n"
+msgstr "deleting certificate “%s” failed: %s\n"
+
+#: sm/encrypt.c:328
+msgid "no valid recipients given\n"
+msgstr "no valid recipients given\n"
+
+#: sm/gpgsm.c:207
+msgid "list external keys"
+msgstr "list external keys"
+
+#: sm/gpgsm.c:209
+msgid "list certificate chain"
+msgstr "list certificate chain"
+
+#: sm/gpgsm.c:216
+msgid "import certificates"
+msgstr "import certificates"
+
+#: sm/gpgsm.c:217
+msgid "export certificates"
+msgstr "export certificates"
+
+#: sm/gpgsm.c:225
+msgid "register a smartcard"
+msgstr "register a smartcard"
+
+#: sm/gpgsm.c:228
+msgid "pass a command to the dirmngr"
+msgstr "pass a command to the dirmngr"
+
+#: sm/gpgsm.c:230
+msgid "invoke gpg-protect-tool"
+msgstr "invoke gpg-protect-tool"
+
+#: sm/gpgsm.c:246
+msgid "create base-64 encoded output"
+msgstr "create base-64 encoded output"
+
+#: sm/gpgsm.c:254
+msgid "assume input is in PEM format"
+msgstr "assume input is in PEM format"
+
+#: sm/gpgsm.c:256
+msgid "assume input is in base-64 format"
+msgstr "assume input is in base-64 format"
+
+#: sm/gpgsm.c:258
+msgid "assume input is in binary format"
+msgstr "assume input is in binary format"
+
+#: sm/gpgsm.c:265
+msgid "never consult a CRL"
+msgstr "never consult a CRL"
+
+#: sm/gpgsm.c:275
+msgid "check validity using OCSP"
+msgstr "check validity using OCSP"
+
+#: sm/gpgsm.c:280
+msgid "|N|number of certificates to include"
+msgstr "|N|number of certificates to include"
+
+#: sm/gpgsm.c:283
+msgid "|FILE|take policy information from FILE"
+msgstr "|FILE|take policy information from FILE"
+
+#: sm/gpgsm.c:286
+msgid "do not check certificate policies"
+msgstr "do not check certificate policies"
+
+#: sm/gpgsm.c:290
+msgid "fetch missing issuer certificates"
+msgstr "fetch missing issuer certificates"
+
+#: sm/gpgsm.c:301
+msgid "don't use the terminal at all"
+msgstr "don't use the terminal at all"
+
+#: sm/gpgsm.c:303
+msgid "|FILE|write a server mode log to FILE"
+msgstr "|FILE|write a server mode log to FILE"
+
+#: sm/gpgsm.c:308
+msgid "|FILE|write an audit log to FILE"
+msgstr "|FILE|write an audit log to FILE"
+
+#: sm/gpgsm.c:311
+msgid "batch mode: never ask"
+msgstr "batch mode: never ask"
+
+#: sm/gpgsm.c:312
+msgid "assume yes on most questions"
+msgstr "assume yes on most questions"
+
+#: sm/gpgsm.c:313
+msgid "assume no on most questions"
+msgstr "assume no on most questions"
+
+#: sm/gpgsm.c:316
+msgid "|FILE|add keyring to the list of keyrings"
+msgstr "|FILE|add keyring to the list of keyrings"
+
+#: sm/gpgsm.c:319
+msgid "|USER-ID|use USER-ID as default secret key"
+msgstr "|USER-ID|use USER-ID as default secret key"
+
+#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
+msgid "|SPEC|use this keyserver to lookup keys"
+msgstr "|SPEC|use this keyserver to lookup keys"
+
+#: sm/gpgsm.c:346
+msgid "|NAME|use cipher algorithm NAME"
+msgstr "|NAME|use cipher algorithm NAME"
+
+#: sm/gpgsm.c:348
+msgid "|NAME|use message digest algorithm NAME"
+msgstr "|NAME|use message digest algorithm NAME"
+
+#: sm/gpgsm.c:564
+msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
+msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
+
+#: sm/gpgsm.c:567
+msgid ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+msgstr ""
+"Syntax: @GPGSM@ [options] [files]\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
+
+#: sm/gpgsm.c:771
+#, c-format
+msgid "Note: won't be able to encrypt to '%s': %s\n"
+msgstr "Note: won't be able to encrypt to '%s': %s\n"
+
+#: sm/gpgsm.c:782
+#, c-format
+msgid "unknown validation model '%s'\n"
+msgstr "unknown validation model ‘%s’\n"
+
+#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
+#, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "%s:%u: no hostname given\n"
+
+#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr "%s:%u: password given without user\n"
+
+#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
+#, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "%s:%u: skipping this line\n"
+
+#: sm/gpgsm.c:1433
+msgid "could not parse keyserver\n"
+msgstr "could not parse keyserver\n"
+
+#: sm/gpgsm.c:1632
+#, c-format
+msgid "importing common certificates '%s'\n"
+msgstr "importing common certificates ‘%s’\n"
+
+#: sm/gpgsm.c:1673
+#, c-format
+msgid "can't sign using '%s': %s\n"
+msgstr "can't sign using '%s': %s\n"
+
+#: sm/gpgsm.c:2029
+msgid "invalid command (there is no implicit command)\n"
+msgstr "invalid command (there is no implicit command)\n"
+
+#: sm/import.c:127
+#, c-format
+msgid "total number processed: %lu\n"
+msgstr "total number processed: %lu\n"
+
+#: sm/import.c:246
+msgid "error storing certificate\n"
+msgstr "error storing certificate\n"
+
+#: sm/import.c:254
+msgid "basic certificate checks failed - not imported\n"
+msgstr "basic certificate checks failed - not imported\n"
+
+#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
+#, c-format
+msgid "error getting stored flags: %s\n"
+msgstr "error getting stored flags: %s\n"
+
+#: sm/import.c:526 sm/import.c:558
+#, c-format
+msgid "error importing certificate: %s\n"
+msgstr "error importing certificate: %s\n"
+
+#: sm/import.c:746 tools/gpg-connect-agent.c:1433
+#, c-format
+msgid "error reading input: %s\n"
+msgstr "error reading input: %s\n"
+
+#: sm/keydb.c:1120 sm/keydb.c:1206
+msgid "failed to get the fingerprint\n"
+msgstr "failed to get the fingerprint\n"
+
+#: sm/keydb.c:1162
+#, c-format
+msgid "problem looking for existing certificate: %s\n"
+msgstr "problem looking for existing certificate: %s\n"
+
+#: sm/keydb.c:1174
+#, c-format
+msgid "error finding writable keyDB: %s\n"
+msgstr "error finding writable keyDB: %s\n"
+
+#: sm/keydb.c:1182
+#, c-format
+msgid "error storing certificate: %s\n"
+msgstr "error storing certificate: %s\n"
+
+#: sm/keydb.c:1234
+#, c-format
+msgid "problem re-searching certificate: %s\n"
+msgstr "problem re-searching certificate: %s\n"
+
+#: sm/keydb.c:1255 sm/keydb.c:1344
+#, c-format
+msgid "error storing flags: %s\n"
+msgstr "error storing flags: %s\n"
+
+#: sm/keylist.c:658
+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:385
+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:389
+#, 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:169
+msgid "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+msgstr "Usage: dirmngr-client [options] [certfile|pattern] (-h for help)\n"
+
+#: dirmngr/dirmngr-client.c:173
+msgid ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+msgstr ""
+"Syntax: dirmngr-client [options] [certfile|pattern]\n"
+"Test an X.509 certificate against a CRL or do an OCSP check\n"
+"The process returns 0 if the certificate is valid, 1 if it is\n"
+"not valid and other error codes for general failures\n"
+
+#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
+#, c-format
+msgid "error reading certificate from stdin: %s\n"
+msgstr "error reading certificate from stdin: %s\n"
+
+#: dirmngr/dirmngr-client.c:281
+#, c-format
+msgid "error reading certificate from '%s': %s\n"
+msgstr "error reading certificate from '%s': %s\n"
+
+#: dirmngr/dirmngr-client.c:295
+msgid "certificate too large to make any sense\n"
+msgstr "certificate too large to make any sense\n"
+
+#: dirmngr/dirmngr-client.c:310
+#, c-format
+msgid "can't connect to the dirmngr: %s\n"
+msgstr "can't connect to the dirmngr: %s\n"
+
+#: dirmngr/dirmngr-client.c:332
+#, c-format
+msgid "lookup failed: %s\n"
+msgstr "lookup failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:347
+#, c-format
+msgid "loading CRL '%s' failed: %s\n"
+msgstr "loading CRL ‘%s’ failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:375
+msgid "a dirmngr daemon is up and running\n"
+msgstr "a dirmngr daemon is up and running\n"
+
+#: dirmngr/dirmngr-client.c:397
+#, c-format
+msgid "validation of certificate failed: %s\n"
+msgstr "validation of certificate failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
+msgid "certificate is valid\n"
+msgstr "certificate is valid\n"
+
+#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
+msgid "certificate has been revoked\n"
+msgstr "certificate has been revoked\n"
+
+#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
+#, c-format
+msgid "certificate check failed: %s\n"
+msgstr "certificate check failed: %s\n"
+
+#: dirmngr/dirmngr-client.c:428
+#, c-format
+msgid "got status: '%s'\n"
+msgstr "got status: ‘%s’\n"
+
+#: dirmngr/dirmngr-client.c:443
+#, c-format
+msgid "error writing base64 encoding: %s\n"
+msgstr "error writing base64 encoding: %s\n"
+
+#: dirmngr/dirmngr-client.c:701
+#, c-format
+msgid "unsupported inquiry '%s'\n"
+msgstr "unsupported inquiry ‘%s’\n"
+
+#: dirmngr/dirmngr-client.c:803
+msgid "absolute file name expected\n"
+msgstr "absolute file name expected\n"
+
+#: dirmngr/dirmngr-client.c:848
+#, c-format
+msgid "looking up '%s'\n"
+msgstr "looking up ‘%s’\n"
+
+#: dirmngr/dirmngr.c:159
+msgid "run as windows service (background)"
+msgstr "run as windows service (background)"
+
+#: dirmngr/dirmngr.c:161
+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:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
+#, c-format
+msgid "usage: %s [options] "
+msgstr "usage: %s [options] "
+
+#: dirmngr/dirmngr.c:1123
+msgid "colons are not allowed in the socket name\n"
+msgstr "colons are not allowed in the socket name\n"
+
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
+#, c-format
+msgid "fetching CRL from '%s' failed: %s\n"
+msgstr "fetching CRL from ‘%s’ failed: %s\n"
+
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
+#, c-format
+msgid "processing CRL from '%s' failed: %s\n"
+msgstr "processing CRL from ‘%s’ failed: %s\n"
+
+#: dirmngr/dirmngr.c:1594
+#, c-format
+msgid "%s:%u: line too long - skipped\n"
+msgstr "%s:%u: line too long - skipped\n"
+
+#: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
+#, c-format
+msgid "%s:%u: invalid fingerprint detected\n"
+msgstr "%s:%u: invalid fingerprint detected\n"
+
+#: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
+#, c-format
+msgid "%s:%u: read error: %s\n"
+msgstr "%s:%u: read error: %s\n"
+
+#: dirmngr/dirmngr.c:1740
+#, c-format
+msgid "%s:%u: garbage at end of line ignored\n"
+msgstr "%s:%u: garbage at end of line ignored\n"
+
+#: dirmngr/dirmngr.c:1807
+msgid "SIGHUP received - re-reading configuration and flushing caches\n"
+msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
+
+#: dirmngr/dirmngr.c:1834
+msgid "SIGUSR2 received - no action defined\n"
+msgstr "SIGUSR2 received - no action defined\n"
+
+#: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
+msgid "SIGTERM received - shutting down ...\n"
+msgstr "SIGTERM received - shutting down ...\n"
+
+#: dirmngr/dirmngr.c:1841
+#, c-format
+msgid "SIGTERM received - still %d active connections\n"
+msgstr "SIGTERM received - still %d active connections\n"
+
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
+msgid "shutdown forced\n"
+msgstr "shutdown forced\n"
+
+#: dirmngr/dirmngr.c:1854
+msgid "SIGINT received - immediate shutdown\n"
+msgstr "SIGINT received - immediate shutdown\n"
+
+#: dirmngr/dirmngr.c:1861
+#, c-format
+msgid "signal %d received - no action defined\n"
+msgstr "signal %d received - no action defined\n"
+
+#: dirmngr/dirmngr_ldap.c:138
+msgid "return all values in a record oriented format"
+msgstr "return all values in a record oriented format"
+
+#: dirmngr/dirmngr_ldap.c:141
+msgid "|NAME|ignore host part and connect through NAME"
+msgstr "|NAME|ignore host part and connect through NAME"
+
+#: dirmngr/dirmngr_ldap.c:142
+msgid "|NAME|connect to host NAME"
+msgstr "|NAME|connect to host NAME"
+
+#: dirmngr/dirmngr_ldap.c:143
+msgid "|N|connect to port N"
+msgstr "|N|connect to port N"
+
+#: dirmngr/dirmngr_ldap.c:144
+msgid "|NAME|use user NAME for authentication"
+msgstr "|NAME|use user NAME for authentication"
+
+#: dirmngr/dirmngr_ldap.c:145
+msgid "|PASS|use password PASS for authentication"
+msgstr "|PASS|use password PASS for authentication"
+
+#: dirmngr/dirmngr_ldap.c:147
+msgid "take password from $DIRMNGR_LDAP_PASS"
+msgstr "take password from $DIRMNGR_LDAP_PASS"
+
+#: dirmngr/dirmngr_ldap.c:148
+msgid "|STRING|query DN STRING"
+msgstr "|STRING|query DN STRING"
+
+#: dirmngr/dirmngr_ldap.c:149
+msgid "|STRING|use STRING as filter expression"
+msgstr "|STRING|use STRING as filter expression"
+
+#: dirmngr/dirmngr_ldap.c:150
+msgid "|STRING|return the attribute STRING"
+msgstr "|STRING|return the attribute STRING"
+
+#: dirmngr/dirmngr_ldap.c:209
+msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+msgstr "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
+
+#: dirmngr/dirmngr_ldap.c:212
+msgid ""
+"Syntax: dirmngr_ldap [options] [URL]\n"
+"Internal LDAP helper for Dirmngr\n"
+"Interface and options may change without notice\n"
+msgstr ""
+"Syntax: dirmngr_ldap [options] [URL]\n"
+"Internal LDAP helper for Dirmngr\n"
+"Interface and options may change without notice\n"
+
+#: dirmngr/dirmngr_ldap.c:337
+#, c-format
+msgid "invalid port number %d\n"
+msgstr "invalid port number %d\n"
+
+#: dirmngr/dirmngr_ldap.c:413
+#, c-format
+msgid "scanning result for attribute '%s'\n"
+msgstr "scanning result for attribute ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
+#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
+#: dirmngr/dirmngr_ldap.c:677
+#, c-format
+msgid "error writing to stdout: %s\n"
+msgstr "error writing to stdout: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:437
+#, c-format
+msgid " available attribute '%s'\n"
+msgstr " available attribute ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:475
+#, c-format
+msgid "attribute '%s' not found\n"
+msgstr "attribute ‘%s’ not found\n"
+
+#: dirmngr/dirmngr_ldap.c:482
+#, c-format
+msgid "found attribute '%s'\n"
+msgstr "found attribute ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:591
+#, c-format
+msgid "processing url '%s'\n"
+msgstr "processing url ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:593
+#, c-format
+msgid " user '%s'\n"
+msgstr " user ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:595
+#, c-format
+msgid " pass '%s'\n"
+msgstr " pass ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:597
+#, c-format
+msgid " host '%s'\n"
+msgstr " host ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:598
+#, c-format
+msgid " port %d\n"
+msgstr " port %d\n"
+
+#: dirmngr/dirmngr_ldap.c:600
+#, c-format
+msgid " DN '%s'\n"
+msgstr " DN ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:602
+#, c-format
+msgid " filter '%s'\n"
+msgstr " filter ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
+#, c-format
+msgid " attr '%s'\n"
+msgstr " attr ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:616
+#, c-format
+msgid "no host name in '%s'\n"
+msgstr "no host name in ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:621
+#, c-format
+msgid "no attribute given for query '%s'\n"
+msgstr "no attribute given for query ‘%s’\n"
+
+#: dirmngr/dirmngr_ldap.c:627
+msgid "WARNING: using first attribute only\n"
+msgstr "WARNING: using first attribute only\n"
+
+#: dirmngr/dirmngr_ldap.c:636
+#, c-format
+msgid "LDAP init to '%s:%d' failed: %s\n"
+msgstr "LDAP init to ‘%s:%d’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:659
+#, c-format
+msgid "binding to '%s:%d' failed: %s\n"
+msgstr "binding to ‘%s:%d’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:686
+#, c-format
+msgid "searching '%s' failed: %s\n"
+msgstr "searching ‘%s’ failed: %s\n"
+
+#: dirmngr/dirmngr_ldap.c:718
+#, c-format
+msgid "'%s' is not an LDAP URL\n"
+msgstr "‘%s’ is not an LDAP URL\n"
+
+#: dirmngr/dirmngr_ldap.c:724
+#, c-format
+msgid "'%s' is an invalid LDAP URL\n"
+msgstr "‘%s’ is an invalid LDAP URL\n"
+
+#: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
+#: dirmngr/ldap-wrapper.c:693
+#, c-format
+msgid "error allocating memory: %s\n"
+msgstr "error allocating memory: %s\n"
+
+#: dirmngr/ldap-wrapper.c:207
+#, c-format
+msgid "error printing log line: %s\n"
+msgstr "error printing log line: %s\n"
+
+#: dirmngr/ldap-wrapper.c:236
+#, c-format
+msgid "error reading log from ldap wrapper %d: %s\n"
+msgstr "error reading log from ldap wrapper %d: %s\n"
+
+#: dirmngr/ldap-wrapper.c:304
+#, c-format
+msgid "npth_select failed: %s - waiting 1s\n"
+msgstr "npth_select failed: %s - waiting 1s\n"
+
+#: dirmngr/ldap-wrapper.c:343
+#, c-format
+msgid "ldap wrapper %d ready"
+msgstr "ldap wrapper %d ready"
+
+#: dirmngr/ldap-wrapper.c:352
+#, c-format
+msgid "ldap wrapper %d ready: timeout\n"
+msgstr "ldap wrapper %d ready: timeout\n"
+
+#: dirmngr/ldap-wrapper.c:355
+#, c-format
+msgid "ldap wrapper %d ready: exitcode=%d\n"
+msgstr "ldap wrapper %d ready: exitcode=%d\n"
+
+#: dirmngr/ldap-wrapper.c:364
+#, c-format
+msgid "waiting for ldap wrapper %d failed: %s\n"
+msgstr "waiting for ldap wrapper %d failed: %s\n"
+
+#: dirmngr/ldap-wrapper.c:376
+#, c-format
+msgid "ldap wrapper %d stalled - killing\n"
+msgstr "ldap wrapper %d stalled - killing\n"
+
+#: dirmngr/ldap-wrapper.c:444
+#, c-format
+msgid "error spawning ldap wrapper reaper thread: %s\n"
+msgstr "error spawning ldap wrapper reaper thread: %s\n"
+
+#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
+#, c-format
+msgid "reading from ldap wrapper %d failed: %s\n"
+msgstr "reading from ldap wrapper %d failed: %s\n"
+
+#: dirmngr/ldap.c:91
+#, c-format
+msgid "invalid char 0x%02x in host name - not added\n"
+msgstr "invalid char 0x%02x in host name - not added\n"
+
+#: dirmngr/ldap.c:95
+#, c-format
+msgid "adding '%s:%d' to the ldap server list\n"
+msgstr "adding ‘%s:%d’ to the ldap server list\n"
+
+#: dirmngr/ldap.c:98 dirmngr/misc.c:502
+#, c-format
+msgid "malloc failed: %s\n"
+msgstr "malloc failed: %s\n"
+
+#: dirmngr/ldap.c:627
+#, c-format
+msgid "start_cert_fetch: invalid pattern '%s'\n"
+msgstr "start_cert_fetch: invalid pattern ‘%s’\n"
+
+#: dirmngr/ldap.c:840
+msgid "ldap_search hit the size limit of the server\n"
+msgstr "ldap_search hit the size limit of the server\n"
+
+#: dirmngr/misc.c:170
+msgid "invalid canonical S-expression found\n"
+msgstr "invalid canonical S-expression found\n"
+
+#: dirmngr/misc.c:194 dirmngr/misc.c:228
+#, c-format
+msgid "gcry_md_open failed: %s\n"
+msgstr "gcry_md_open failed: %s\n"
+
+#: dirmngr/misc.c:199 dirmngr/misc.c:233
+#, c-format
+msgid "oops: ksba_cert_hash failed: %s\n"
+msgstr "oops: ksba_cert_hash failed: %s\n"
+
+#: dirmngr/misc.c:518
+msgid "bad URL encoding detected\n"
+msgstr "bad URL encoding detected\n"
+
+#: dirmngr/ocsp.c:80
+#, c-format
+msgid "error reading from responder: %s\n"
+msgstr "error reading from responder: %s\n"
+
+#: dirmngr/ocsp.c:98
+#, c-format
+msgid "response from server too large; limit is %d bytes\n"
+msgstr "response from server too large; limit is %d bytes\n"
+
+#: dirmngr/ocsp.c:139
+msgid "OCSP request not possible due to Tor mode\n"
+msgstr "OCSP request not possible due to Tor mode\n"
+
+#: dirmngr/ocsp.c:145
+msgid "OCSP request not possible due to disabled HTTP\n"
+msgstr "OCSP request not possible due to disabled HTTP\n"
+
+#: dirmngr/ocsp.c:152
+#, c-format
+msgid "error setting OCSP target: %s\n"
+msgstr "error setting OCSP target: %s\n"
+
+#: dirmngr/ocsp.c:170
+#, c-format
+msgid "error building OCSP request: %s\n"
+msgstr "error building OCSP request: %s\n"
+
+#: dirmngr/ocsp.c:181
+#, c-format
+msgid "error connecting to '%s': %s\n"
+msgstr "error connecting to '%s': %s\n"
+
+#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
+#, c-format
+msgid "error reading HTTP response for '%s': %s\n"
+msgstr "error reading HTTP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:240
+#, c-format
+msgid "error accessing '%s': http status %u\n"
+msgstr "error accessing '%s': http status %u\n"
+
+#: dirmngr/ocsp.c:265
+#, c-format
+msgid "error parsing OCSP response for '%s': %s\n"
+msgstr "error parsing OCSP response for '%s': %s\n"
+
+#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
+#, c-format
+msgid "OCSP responder at '%s' status: %s\n"
+msgstr "OCSP responder at ‘%s’ status: %s\n"
+
+#: dirmngr/ocsp.c:293
+#, c-format
+msgid "hashing the OCSP response for '%s' failed: %s\n"
+msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
+
+#: dirmngr/ocsp.c:328
+msgid "not signed by a default OCSP signer's certificate"
+msgstr "not signed by a default OCSP signer's certificate"
+
+#: dirmngr/ocsp.c:417
+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:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
+#, c-format
+msgid "assuan_inquire(%s) failed: %s\n"
+msgstr "assuan_inquire(%s) failed: %s\n"
+
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
+msgid "ldapserver missing"
+msgstr "ldapserver missing"
+
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
+msgid "serialno missing in cert ID"
+msgstr "serialno missing in cert ID"
+
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
+#, c-format
+msgid "assuan_inquire failed: %s\n"
+msgstr "assuan_inquire failed: %s\n"
+
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
+#, c-format
+msgid "fetch_cert_by_url failed: %s\n"
+msgstr "fetch_cert_by_url failed: %s\n"
+
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
+#, c-format
+msgid "error sending data: %s\n"
+msgstr "error sending data: %s\n"
+
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
+#, c-format
+msgid "start_cert_fetch failed: %s\n"
+msgstr "start_cert_fetch failed: %s\n"
+
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
+#, c-format
+msgid "fetch_next_cert failed: %s\n"
+msgstr "fetch_next_cert failed: %s\n"
+
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
+#, c-format
+msgid "max_replies %d exceeded\n"
+msgstr "max_replies %d exceeded\n"
+
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
+#, c-format
+msgid "can't allocate control structure: %s\n"
+msgstr "can't allocate control structure: %s\n"
+
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr "failed to allocate assuan context: %s\n"
+
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
+#, c-format
+msgid "failed to initialize the server: %s\n"
+msgstr "failed to initialize the server: %s\n"
+
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
+#, 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:2466
++#: dirmngr/server.c:2475
+#, c-format
+msgid "Assuan accept problem: %s\n"
+msgstr "Assuan accept problem: %s\n"
+
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
+#, 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:91 tools/symcryptrun.c:167
+msgid "quiet"
+msgstr "quiet"
+
+#: tools/gpg-connect-agent.c:79
+msgid "print data out hex encoded"
+msgstr "print data out hex encoded"
+
+#: tools/gpg-connect-agent.c:80
+msgid "decode received data lines"
+msgstr "decode received data lines"
+
+#: tools/gpg-connect-agent.c:81
+msgid "connect to the dirmngr"
+msgstr "connect to the dirmngr"
+
+#: tools/gpg-connect-agent.c:84
+msgid "|NAME|connect to Assuan socket NAME"
+msgstr "|NAME|connect to Assuan socket NAME"
+
+#: tools/gpg-connect-agent.c:86
+msgid "|ADDR|connect to Assuan server at ADDR"
+msgstr "|ADDR|connect to Assuan server at ADDR"
+
+#: tools/gpg-connect-agent.c:88
+msgid "run the Assuan server given on the command line"
+msgstr "run the Assuan server given on the command line"
+
+#: tools/gpg-connect-agent.c:90
+msgid "do not use extended connect mode"
+msgstr "do not use extended connect mode"
+
+#: tools/gpg-connect-agent.c:92
+msgid "|FILE|run commands from FILE on startup"
+msgstr "|FILE|run commands from FILE on startup"
+
+#: tools/gpg-connect-agent.c:93
+msgid "run /subst on startup"
+msgstr "run /subst on startup"
+
+#: tools/gpg-connect-agent.c:205
+msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
+msgstr "Usage: @GPG at -connect-agent [options] (-h for help)"
+
+#: tools/gpg-connect-agent.c:208
+msgid ""
+"Syntax: @GPG at -connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+msgstr ""
+"Syntax: @GPG at -connect-agent [options]\n"
+"Connect to a running agent and send commands\n"
+
+#: tools/gpg-connect-agent.c:1247
+#, c-format
+msgid "option \"%s\" requires a program and optional arguments\n"
+msgstr "option “%s” requires a program and optional arguments\n"
+
+#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
+#: tools/gpg-connect-agent.c:1270
+#, c-format
+msgid "option \"%s\" ignored due to \"%s\"\n"
+msgstr "option “%s” ignored due to “%s”\n"
+
+#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
+#, c-format
+msgid "receiving line failed: %s\n"
+msgstr "receiving line failed: %s\n"
+
+#: tools/gpg-connect-agent.c:1458
+msgid "line too long - skipped\n"
+msgstr "line too long - skipped\n"
+
+#: tools/gpg-connect-agent.c:1462
+msgid "line shortened due to embedded Nul character\n"
+msgstr "line shortened due to embedded Nul character\n"
+
+#: tools/gpg-connect-agent.c:1837
+#, c-format
+msgid "unknown command '%s'\n"
+msgstr "unknown command ‘%s’\n"
+
+#: tools/gpg-connect-agent.c:1855
+#, c-format
+msgid "sending line failed: %s\n"
+msgstr "sending line failed: %s\n"
+
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
+#, c-format
+msgid "error sending standard options: %s\n"
+msgstr "error sending standard options: %s\n"
+
+#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
+#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
+msgid "Options controlling the diagnostic output"
+msgstr "Options controlling the diagnostic output"
+
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
+msgid "Options controlling the configuration"
+msgstr "Options controlling the configuration"
+
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
+#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
+msgid "Options useful for debugging"
+msgstr "Options useful for debugging"
+
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
+msgid "Options controlling the security"
+msgstr "Options controlling the security"
+
+#: tools/gpgconf-comp.c:528
+msgid "|N|expire SSH keys after N seconds"
+msgstr "|N|expire SSH keys after N seconds"
+
+#: tools/gpgconf-comp.c:532
+msgid "|N|set maximum PIN cache lifetime to N seconds"
+msgstr "|N|set maximum PIN cache lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:536
+msgid "|N|set maximum SSH key lifetime to N seconds"
+msgstr "|N|set maximum SSH key lifetime to N seconds"
+
+#: tools/gpgconf-comp.c:560
+msgid "Options enforcing a passphrase policy"
+msgstr "Options enforcing a passphrase policy"
+
+#: tools/gpgconf-comp.c:563
+msgid "do not allow to bypass the passphrase policy"
+msgstr "do not allow to bypass the passphrase policy"
+
+#: tools/gpgconf-comp.c:567
+msgid "|N|set minimal required length for new passphrases to N"
+msgstr "|N|set minimal required length for new passphrases to N"
+
+#: tools/gpgconf-comp.c:571
+msgid "|N|require at least N non-alpha characters for a new passphrase"
+msgstr "|N|require at least N non-alpha characters for a new passphrase"
+
+#: tools/gpgconf-comp.c:575
+msgid "|FILE|check new passphrases against pattern in FILE"
+msgstr "|FILE|check new passphrases against pattern in FILE"
+
+#: tools/gpgconf-comp.c:579
+msgid "|N|expire the passphrase after N days"
+msgstr "|N|expire the passphrase after N days"
+
+#: tools/gpgconf-comp.c:583
+msgid "do not allow the reuse of old passphrases"
+msgstr "do not allow the reuse of old passphrases"
+
+#: tools/gpgconf-comp.c:587
+msgid "|N|set the Pinentry timeout to N seconds"
+msgstr "|N|set the Pinentry timeout to N seconds"
+
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
+msgid "|NAME|use NAME as default secret key"
+msgstr "|NAME|use NAME as default secret key"
+
+#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
+msgid "|NAME|encrypt to user ID NAME as well"
+msgstr "|NAME|encrypt to user ID NAME as well"
+
+#: tools/gpgconf-comp.c:704
+msgid "|SPEC|set up email aliases"
+msgstr "|SPEC|set up email aliases"
+
+#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
+msgid "Configuration for Keyservers"
+msgstr "Configuration for Keyservers"
+
+#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
+msgid "|URL|use keyserver at URL"
+msgstr "|URL|use keyserver at URL"
+
+#: tools/gpgconf-comp.c:735
+msgid "allow PKA lookups (DNS requests)"
+msgstr "allow PKA lookups (DNS requests)"
+
+#: tools/gpgconf-comp.c:738
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
+
+#: tools/gpgconf-comp.c:787
+msgid "disable all access to the dirmngr"
+msgstr "disable all access to the dirmngr"
+
+#: tools/gpgconf-comp.c:790
+msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
+msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
+
+#: tools/gpgconf-comp.c:820
+msgid "do not check CRLs for root certificates"
+msgstr "do not check CRLs for root certificates"
+
+#: tools/gpgconf-comp.c:869
+msgid "Options controlling the format of the output"
+msgstr "Options controlling the format of the output"
+
+#: tools/gpgconf-comp.c:905
+msgid "Options controlling the interactivity and enforcement"
+msgstr "Options controlling the interactivity and enforcement"
+
+#: tools/gpgconf-comp.c:915
+msgid "Options controlling the use of Tor"
+msgstr "Options controlling the use of Tor"
+
+#: tools/gpgconf-comp.c:929
+msgid "Configuration for HTTP servers"
+msgstr "Configuration for HTTP servers"
+
+#: tools/gpgconf-comp.c:940
+msgid "use system's HTTP proxy setting"
+msgstr "use system's HTTP proxy setting"
+
+#: tools/gpgconf-comp.c:945
+msgid "Configuration of LDAP servers to use"
+msgstr "Configuration of LDAP servers to use"
+
+#: tools/gpgconf-comp.c:974
+msgid "LDAP server list"
+msgstr "LDAP server list"
+
+#: tools/gpgconf-comp.c:982
+msgid "Configuration for OCSP"
+msgstr "Configuration for OCSP"
+
+#: tools/gpgconf-comp.c:1063
+msgid "GPG for OpenPGP"
+msgstr "GPG for OpenPGP"
+
+#: tools/gpgconf-comp.c:1064
+msgid "GPG Agent"
+msgstr "GPG Agent"
+
+#: tools/gpgconf-comp.c:1065
+msgid "Smartcard Daemon"
+msgstr "Smartcard Daemon"
+
+#: tools/gpgconf-comp.c:1066
+msgid "GPG for S/MIME"
+msgstr "GPG for S/MIME"
+
+#: tools/gpgconf-comp.c:1067
+msgid "Key Acquirer"
+msgstr "Key Acquirer"
+
+#: tools/gpgconf-comp.c:1068
+msgid "PIN and Passphrase Entry"
+msgstr "PIN and Passphrase Entry"
+
+#: tools/gpgconf-comp.c:1182
+msgid "Component not suitable for launching"
+msgstr "Component not suitable for launching"
+
+#: tools/gpgconf-comp.c:3240
+#, c-format
+msgid "External verification of component %s failed"
+msgstr "External verification of component %s failed"
+
+#: tools/gpgconf-comp.c:3391
+msgid "Note that group specifications are ignored\n"
+msgstr "Note that group specifications are ignored\n"
+
+#: tools/gpgconf.c:68
+msgid "list all components"
+msgstr "list all components"
+
+#: tools/gpgconf.c:69
+msgid "check all programs"
+msgstr "check all programs"
+
+#: tools/gpgconf.c:70
+msgid "|COMPONENT|list options"
+msgstr "|COMPONENT|list options"
+
+#: tools/gpgconf.c:71
+msgid "|COMPONENT|change options"
+msgstr "|COMPONENT|change options"
+
+#: tools/gpgconf.c:72
+msgid "|COMPONENT|check options"
+msgstr "|COMPONENT|check options"
+
+#: tools/gpgconf.c:74
+msgid "apply global default values"
+msgstr "apply global default values"
+
+#: tools/gpgconf.c:76
+msgid "get the configuration directories for @GPGCONF@"
+msgstr "get the configuration directories for @GPGCONF@"
+
+#: tools/gpgconf.c:78
+msgid "list global configuration file"
+msgstr "list global configuration file"
+
+#: tools/gpgconf.c:80
+msgid "check global configuration file"
+msgstr "check global configuration file"
+
+#: tools/gpgconf.c:81
+msgid "reload all or a given component"
+msgstr "reload all or a given component"
+
+#: tools/gpgconf.c:82
+msgid "launch a given component"
+msgstr "launch a given component"
+
+#: tools/gpgconf.c:83
+msgid "kill a given component"
+msgstr "kill a given component"
+
+#: tools/gpgconf.c:89
+msgid "use as output file"
+msgstr "use as output file"
+
+#: tools/gpgconf.c:93
+msgid "activate changes at runtime, if possible"
+msgstr "activate changes at runtime, if possible"
+
+#: tools/gpgconf.c:116
+msgid "Usage: @GPGCONF@ [options] (-h for help)"
+msgstr "Usage: @GPGCONF@ [options] (-h for help)"
+
+#: tools/gpgconf.c:119
+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:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
+msgid "Need one component argument"
+msgstr "Need one component argument"
+
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
+msgid "Component not found"
+msgstr "Component not found"
+
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
+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:991
+#, c-format
+msgid "either %s or %s must be given\n"
+msgstr "either %s or %s must be given\n"
+
+#: tools/symcryptrun.c:1018
+msgid "no class provided\n"
+msgstr "no class provided\n"
+
+#: tools/symcryptrun.c:1027
+#, 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 97e1cd2,958c534..6848170
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -405,10 -319,6 +405,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detala eligo"
@@@ -517,11 -402,6 +517,11 @@@ msgstr "ne realigita
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Bonvolu raporti cimojn al <gnupg-bugs at gnu.org>.\n"
@@@ -537,54 -415,37 +537,54 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "legas opciojn el '%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ne povas krei %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Valida atestilrevoko"
@@@ -594,28 -454,22 +594,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "skribas sekretan �losilon al '%s'\n"
@@@ -642,7 -490,6 +642,7 @@@ msgstr "fido-datenaro: lego malsukcesi
msgid "can't use '%s' as home directory\n"
msgstr "%s: ne povas krei dosierujon: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -667,18 -510,14 +667,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aktualigo de sekreto malsukcesis: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu �losiloj ignoritaj\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
@@@ -694,8 -531,6 +694,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -703,9 -538,6 +703,9 @@@ msgstr "
"@Komandoj:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -942,29 -731,22 +942,29 @@@ msgstr "eraro dum kreado de pasfrazo: %
msgid "error creating a stream for a pipe: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "eraro dum legado de '%s': %s\n"
@@@ -979,32 -759,26 +979,32 @@@ msgstr "eraro dum skribado de sekreta �
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "ne povas konekti�i al '%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "komunikproblemo kun gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "nuligita de uzanto\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "problemo kun agento: agento redonas 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "problemo kun agento: agento redonas 0x%lx\n"
@@@ -1081,7 -840,6 +1081,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
@@@ -1347,7 -1051,6 +1347,7 @@@ msgstr "Nenia helpo disponata por '%s'
msgid "ignoring garbage line"
msgstr "eraro en vostolinio\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "nekonata versio"
@@@ -1487,95 -1163,75 +1487,95 @@@ msgstr "publika �losilo %08lX ne trovit
msgid "waiting for lock %s...\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "kiraso: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "nevalida kiraso�apo: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "kiraso�apo: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "nevalida �apo de klarteksta subskribo\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "kiraso�apo: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "ingitaj klartekstaj subskriboj\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "neatendita kiraso:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "nevalida strek-eskapita linio: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "nevalida signo %02x en bazo 64 ignorita\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "tro frua dosierfino (nenia CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "tro frua dosierfino (en CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "misformita CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-eraro; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "tro frua dosierfino (en vosto)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "eraro en vostolinio\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "ne homlegebla"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
#, fuzzy
msgid ""
"a notation name must have only printable characters or spaces, and end with "
@@@ -1584,33 -1240,27 +1584,33 @@@ msgstr "
"notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
"kaj fini per '='\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
#, fuzzy
msgid "a user notation name must contain the '@' character\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, 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:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
#, fuzzy
msgid "a notation name may not contain an '=' character\n"
msgstr "notacia valoro ne povas enhavi stirsignojn\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
#, 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:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTO: nevalida notacia dateno trovita\n"
@@@ -1640,19 -1285,14 +1640,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "sekreta �losilo ne havebla"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "ne povas fari tion en neinteraga re�imo\n"
@@@ -1667,10 -1305,6 +1667,10 @@@ msgstr "Tiu komando ne eblas en la re�i
msgid "Reset Code not or not anymore available\n"
msgstr "sekretaj �losilpartoj ne estas disponataj\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Via elekto? "
@@@ -1737,148 -1357,115 +1737,149 @@@ msgstr "skribas publikan �losilon al '%
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eraro dum skribado de �losilaro '%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "aktualigitaj preferoj"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "nevalida signo en signo�eno\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "nevalida signo en signo�eno\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "Fingrospuro:"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Kiun �losilgrandon vi deziras? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
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:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rondigita �is %u bitoj\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "ignorita: sekreta �losilo jam �eestas\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1886,155 -1473,120 +1887,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (nur �ifri)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Nevalida elekto.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Kialo por revoko: "
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tiu komando ne eblas en la re�imo %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "ignorita: sekreta �losilo jam �eestas\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "�u vere subskribi? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "forlasi �i tiun menuon"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "montri �i tiun helpon"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "Nenia helpo disponata"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "�an�i la daton de eksvalidi�o"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "�an�i la posedantofidon"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "montri fingrospuron"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "krei novan �losilparon"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "malkongruaj komandoj\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Nevalida komando (provu per \"helpo\")\n"
@@@ -2042,28 -1593,19 +2043,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output ne funkcias por �i tiu komando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "ne povas malfermi '%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "�losilo '%s' ne trovita: %s\n"
@@@ -2119,7 -1650,6 +2120,7 @@@ msgstr "estas sekreta �losilo por la pu
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
@@@ -2139,7 -1666,6 +2140,7 @@@ msgstr "subskribado malsukcesis: %s\n
msgid "'%s' already compressed\n"
msgstr "'%s' jam densigita\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2157,7 -1681,6 +2158,7 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2174,17 -1695,14 +2175,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s-�ifrita por: %s\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s-�ifritaj datenoj\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "�ifrita per nekonata metodo %d\n"
@@@ -2251,342 -1756,277 +2252,356 @@@ 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:78
++#: g10/export.c:102
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "neuzebla sekreta �losilo"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ignorita: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "skribas al '%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "AVERTO: nenio estis eksportita\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[Uzantidentigilo ne trovita]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "nevalida kiraso"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "eraro dum kreado de '%s': %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "Fingrospuro:"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[dosiero]|fari klartekstan subskribon"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "fari apartan subskribon"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "�ifri datenojn"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "�ifri nur kun simetria �ifro"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "mal�ifri datenojn (implicita elekto)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "kontroli subskribon"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "listigi �losilojn"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "listigi �losilojn kaj subskribojn"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "kontroli �losilsubskribojn"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "listigi �losilojn kaj fingro�purojn"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "listigi sekretajn �losilojn"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "krei novan �losilparon"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "krei novan �losilparon"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "krei revokatestilon"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "forigi �losilojn de la publika �losilaro"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "forigi �losilojn de la sekreta �losilaro"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "subskribi �losilon"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "subskribi �losilon loke"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "subskribi �losilon"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "subskribi �losilon loke"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "subskribi a� redakti �losilon"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "�an�i la pasfrazon"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "eksporti �losilojn"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "eksporti �losilojn al �losilservilo"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importi �losilojn de �losilservilo"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "ser�i �losilojn �e �losilservilo"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "aktualigi �iujn �losilojn de �losilservilo"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importi/kunfandi �losilojn"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "aktualigi la fido-datenaron"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "krei eligon en askia kiraso"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOMO|�ifri por NOMO"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|difini densig-nivelon N (0=nenia)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "uzi tekstan re�imon"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "fari neniajn �an�ojn"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr ""
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2594,7 -2034,6 +2609,7 @@@ msgstr "
"@\n"
"(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2614,13 -2053,11 +2629,13 @@@ msgstr "
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2635,7 -2072,6 +2650,7 @@@ msgstr "
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2643,607 -2079,482 +2658,612 @@@ msgstr "
"\n"
"Realigitaj metodoj:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uzado: gpg [opcioj] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr ""
- #: g10/gpg.c:1507
++#: g10/gpg.c:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, fuzzy
msgid "show key usage information during key listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "montri, en kiu �losilaro estas listigita �losilo"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "mal�alti �losilon"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, fuzzy, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
- #: g10/gpg.c:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "nevalida kiraso"
+
++#: g10/gpg.c:3078
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
#, 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:3528
++#: g10/gpg.c:3601
#, 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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [dosiero]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [dosiero]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key uzantidentigilo"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eraro dum kreado de pasfrazo: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[dosiero]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@@ -3287,326 -2590,262 +3307,328 @@@ msgstr "Nenia helpo disponata
msgid "No help available for '%s'"
msgstr "Nenia helpo disponata por '%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aktualigi la fido-datenaron"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aktualigi la fido-datenaron"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "montri fingrospuron"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "neuzebla sekreta �losilo"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignoras blokon de speco %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu �losiloj jam traktitaj\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Nombro traktita entute: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignoritaj novaj �losiloj: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sen uzantidentigilo: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importitaj: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " ne�an�itaj: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novaj uzantidentigiloj: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novaj sub�losiloj: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " novaj subskriboj: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novaj �losilrevokoj: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "sekretaj �losiloj importitaj: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, fuzzy, c-format
msgid " not imported: %lu\n"
msgstr " importitaj: %lu"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novaj subskriboj: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " sekretaj �losiloj legitaj: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ignoris '%s': %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "�losilo %08lX: nova �losilo - ignorita\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "neniu skribebla �losilaro trovita: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "skribas al '%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "�losilo %08lX: publika �losilo importita\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "�losilo %08lX: diferencas de nia kopio\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "�losilo %08lX: 1 nova subskribo\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "�losilo %08lX: 1 nova sub�losilo\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "�losilo %08lX: %d novaj subskriboj\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "�losilo %08lX: ne �an�ita\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "�losilo %08lX: sekreta �losilo importita\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@@ -3621,138 -2860,111 +3643,138 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "�losilo %08lX: revokatestilo importita\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, fuzzy, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
- #: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "�losilo %08lX: ignoris uzantidentigilon '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "�losilo %08lX: ignoris sub�losilon\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, fuzzy, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "�losilo %08lX: revokatestilo aldonita\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
@@@ -3789,48 -2995,39 +3811,48 @@@ msgstr "eraro dum kreado de '%s': %s\n
msgid "error opening key DB: %s\n"
msgstr "eraro dum legado de '%s': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[revocation]"
msgstr "[revoko]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[mem-subskribo]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "Bona subskribo de \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "ignoris '%s': %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3838,7 -3035,6 +3860,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3846,21 -3042,18 +3868,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d malbonaj subskriboj\n"
msgstr[1] "%d malbonaj subskriboj\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Bona subskribo de \""
msgstr[1] "Bona subskribo de \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3873,69 -3066,54 +3895,69 @@@ msgstr "
"kontrolante fingrospurojn el diversaj fontoj ...)?\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Mi fidas iomete\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Mi plene fidas\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, fuzzy, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
#, 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:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr ""
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, fuzzy, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "�u vere subskribi? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, fuzzy, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3946,7 -3124,6 +3968,7 @@@ msgstr "
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
#, fuzzy
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
@@@ -3955,7 -3132,6 +3977,7 @@@
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3966,12 -3142,10 +3988,12 @@@ msgstr "
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
#, 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:1316
++#: g10/keyedit.c:1319
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3982,7 -3156,6 +4004,7 @@@ msgstr "
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
#, fuzzy
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
@@@ -3991,41 -3164,33 +4013,41 @@@
"\n"
"�u vi volas igi �in plena eksportebla subskribo?\n"
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
#, 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:1372
++#: g10/keyedit.c:1375
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nenio por subskribi per �losilo %08lX\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "�i tiu �losilo eksvalidi�is!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
#, 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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4034,32 -3199,26 +4056,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:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Mi ne respondas.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Mi tute ne kontrolis.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Mi malzorge kontrolis.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Mi tre zorge kontrolis.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr " i = bonvolu montri pli da informoj\n"
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4068,264 -3227,210 +4090,264 @@@ msgstr "
"�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
"per via �losilo: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel neeksportebla.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La subskribo estos markita kiel nerevokebla.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Mi tute ne kontrolis �i tiun �losilon.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Mi malzorge kontrolis �i tiun �losilon.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Mi tre zorge kontrolis �i tiun �losilon.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "�u vere subskribi? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "skribi kaj fini"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "montri fingrospuron"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Subskribo-notacio: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "listigi �losilojn kaj uzantidentigilojn"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "elekti uzantidentigilon N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "elekti uzantidentigilon N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "revoki subskribojn"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "subskribi la �losilon loke"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "aldoni uzantidentigilon"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "aldoni foto-identigilon"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "forvi�i uzantidentigilon"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "al"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "forvi�i flankan �losilon"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
#, fuzzy
msgid "add a revocation key"
msgstr "aldoni flankan �losilon"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
#, 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:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marku uzantidentigilon kiel �efan"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "listigi preferojn (spertula)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "listigi preferojn (detale)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "�an�i la pasfrazon"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "�an�i la posedantofidon"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "aldoni uzantidentigilon"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoki flankan �losilon"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "�alti �losilon"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "mal�alti �losilon"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "montri foto-identigilon"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Sekreta �losilo estas havebla.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Bezonas la sekretan �losilon por fari tion.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4333,308 -3438,247 +4355,314 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
#, fuzzy
msgid "Key is revoked."
msgstr "�losilo estas revokita.\n"
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "�u vere subskribi �iujn uzantidentigilojn? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "�u vere subskribi �iujn uzantidentigilojn? "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "nekonata klaso de subskribo"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Vi devas elekti almena� unu �losilon.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "eraro dum kreado de �losilaro '%s': %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Vi devas elekti almena� unu �losilon.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, 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:2503
++#: g10/keyedit.c:2506
#, 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:2541
++#: g10/keyedit.c:2544
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "�u vere forigi �i tiun uzantidentigilon? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, 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:2571
++#: g10/keyedit.c:2574
#, 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:2573
++#: g10/keyedit.c:2576
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "�u vi vere volas revoki �i tiun �losilon? "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "agordi liston de preferoj"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, 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:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "�u vere aktualigi la preferojn? "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "�u skribi �an�ojn? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "�u fini sen skribi �an�ojn? "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "aktualigo malsukcesis: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Kreado de �losiloj malsukcesis: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "nevalida valoro\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Uzantidentigilo ne ekzistas.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nenio por subskribi per �losilo %08lX\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr ""
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr ""
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Notacio: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (sentema)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "ne povas krei %s: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "rev"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [eksvalidi�os: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [eksvalidi�os: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " fido: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fido: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "�i tiu �losilo estas mal�altita"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "rev"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "eksval"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4643,36 -3687,28 +4671,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
#, 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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4680,37 -3716,30 +4708,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Forvi�is %d subskribon.\n"
msgstr[1] "Forvi�is %d subskribon.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Nenio estis forvi�ita.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "nevalida"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
#, fuzzy
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
@@@ -4720,205 -3749,167 +4748,210 @@@ 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:4478
++#: g10/keyedit.c:4585
#, 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:4495
++#: g10/keyedit.c:4602
#, fuzzy
msgid "Enter the user ID of the designated revoker: "
msgstr "Donu la �losilgrandon"
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr ""
- #: g10/keyedit.c:4535
++#: g10/keyedit.c:4642
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr ""
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
#, 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:4575
++#: g10/keyedit.c:4682
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, 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:4637
++#: g10/keyedit.c:4744
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
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:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, fuzzy, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "�losilo %08lX: nevalida mem-subskribo\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, 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:5277
++#: g10/keyedit.c:5384
#, 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:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Subskribo-notacio: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�u surskribi (j/N)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Mankas uzantidentigilo kun indekso %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "uzantidentigilo: \""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, 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:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr ""
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, fuzzy, c-format
msgid "This signature expired on %s.\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
#, 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:5898
++#: g10/keyedit.c:6005
#, fuzzy
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " subskribita per %08lX je %s%s\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr "subskribi �losilon nerevokeble"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokita de %08lX je %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Vi revokos la sekvajn subskribojn:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
#, fuzzy
msgid "Really create the revocation certificates? (y/N) "
msgstr "�u vere krei la revokatestilojn? (j/N)"
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "mankas sekreta �losilo\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, fuzzy, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5369,13 -4282,10 +5402,13 @@@ msgstr "
"kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
"akiri sufi�e da entropio.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5383,66 -4293,53 +5416,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "'%s' jam densigita\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
msgid "creating anyway\n"
msgstr "�u tamen uzi �i tiun �losilon? "
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Kreado de �losiloj nuligita.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "neniu skribebla publika �losilaro trovita: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5451,7 -4348,6 +5484,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5459,7 -4355,6 +5492,7 @@@ msgstr "
"�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5467,53 -4362,42 +5500,53 @@@ msgstr "
"�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
"horlo�eraro)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, 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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "�u vere krei? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr ""
- #: g10/keylist.c:330
++#: g10/keylist.c:331
#, fuzzy
msgid "Critical signature policy: "
msgstr "Subskribo-gvidlinioj: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Subskribo-gvidlinioj: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
#, fuzzy
msgid "Critical signature notation: "
msgstr "Subskribo-notacio: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Subskribo-notacio: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5521,7 -4405,6 +5554,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d malbonaj subskriboj\n"
msgstr[1] "%d malbonaj subskriboj\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5529,50 -4412,37 +5562,45 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 subskribo ne kontrolita pro eraro\n"
msgstr[1] "1 subskribo ne kontrolita pro eraro\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "�losilaro"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
#, fuzzy
msgid "Primary key fingerprint:"
msgstr "listigi �losilojn kaj fingro�purojn"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " �losilo-fingrospuro ="
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
#, fuzzy
msgid " Primary key fingerprint:"
msgstr " �losilo-fingrospuro ="
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
#, fuzzy
msgid " Subkey fingerprint:"
msgstr " �losilo-fingrospuro ="
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " �losilo-fingrospuro ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5638,302 -4496,245 +5666,307 @@@ msgstr "la donita gvidlinia URL por sub
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "el"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "nevalida �losilaro"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: ne valida �losilidentigilo\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "�losilo '%s' ne trovita: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, 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:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "nevalida �losilaro"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "ignoris '%s': %s\n"
+
++#: g10/keyserver.c:1823
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"subskribita per via �losilo %08lX je %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr ""
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, fuzzy, c-format
msgid "%s encrypted session key\n"
msgstr "%s-�ifritaj datenoj\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "�ifrita per nekonata metodo %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "publika �losilo estas %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alinome \""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "�ifrita per %s-�losilo, %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, fuzzy, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Ripetu pasfrazon\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
#, fuzzy
msgid "encrypted with 1 passphrase\n"
msgstr "Ripetu pasfrazon\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "supozas %s �ifritajn datenojn\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
#, fuzzy
msgid "WARNING: message was not integrity protected\n"
msgstr "AVERTO: nenio estis eksportita\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "mal�ifrado sukcesis\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "originala dosiernomo='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "MALBONA subskribo de \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Eksvalidi�inta subskribo de \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Bona subskribo de \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "kontrolo de subskribo estas mal�altita\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alinome \""
- #: g10/mainproc.c:1727
++#: 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:1744
#, fuzzy
msgid "Key available at: "
msgstr "Nenia helpo disponata"
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[malcerta]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alinome \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
#, fuzzy
msgid "binary"
msgstr "�efa"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
#, fuzzy
msgid "unknown"
msgstr "nekonata versio"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "nekonata publik�losila metodo"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Ne povas kontroli subskribon: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "ne aparta subskribo\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "memstara subskribo de klaso 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "malnovstila subskribo (PGP 2.x)\n"
@@@ -6106,7 -4873,6 +6139,7 @@@ msgstr "ne povas trakti publik�losilan
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@@ -6476,46 -5174,37 +6509,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorita: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorita: publika �losilo jam �eestas\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6523,37 -5212,29 +6556,37 @@@ msgstr "
"\n"
"Donu la uzantidentigilon. Finu per malplena linio: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Uzantidentigilo ne ekzistas.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Publika �losilo estas mal�altita.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "ignorita: publika �losilo jam agordita\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nekonata implicita ricevonto '%s'\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "mankas validaj adresitoj\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "�losilo %08lX: mankas uzantidentigilo\n"
@@@ -6562,29 -5242,23 +6595,29 @@@
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:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Aparta subskribo.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Bonvolu doni la nomon de la dosiero: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "legas la normalan enigon ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "mankas subskribitaj datenoj\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
@@@ -6827,7 -5456,6 +6860,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
msgstr[1] "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6901,22 -5520,18 +6934,22 @@@ msgstr "
"AVERTO: ne povas %%-kompletigi gvidlinian URL (tro granda); uzas sen "
"kompletigo.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s-subskribo de: %s\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, 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:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "subskribas:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s �ifrado estos aplikata\n"
@@@ -6994,132 -5595,105 +7027,132 @@@ msgstr "kiraso: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "fido-datenaro: sync malsukcesis: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "ne povas malfermi '%s'\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "fido-datenaro-transakcio tro granda\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: dosierujo ne ekzistas!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: malsukcesis krei versiregistron: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: nevalida fido-datenaro kreita\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: fido-datenaro kreita\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, fuzzy
msgid "Note: trustdb not writable\n"
msgstr "sekretaj �losilpartoj ne estas disponataj\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: nevalida fido-datenaro\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: eraro dum legado de versiregistro: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: eraro dum skribado de versiregistro: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "fido-datenaro: lseek malsukcesis: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ne estas fido-datenaro\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versiregistro kun registronumero %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: eraro dum legado de libera registro: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: malsukcesis nuligi registron: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: malsukcesis aldoni registron: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: fido-datenaro kreita\n"
@@@ -7478,7 -5990,6 +7511,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "sekva kontrolo de fido-datenaro je %s\n"
@@@ -7493,7 -6002,6 +7526,7 @@@ msgstr "kontrolo de fido-datenaro ne es
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "publika �losilo %08lX ne trovita: %s\n"
@@@ -7506,37 -6012,31 +7539,37 @@@ msgstr "
msgid "checking the trustdb\n"
msgstr "kontrolas la fido-datenaron\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu �losiloj jam traktitaj\n"
msgstr[1] "%lu �losiloj jam traktitaj\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
#, fuzzy
msgid "no ultimately trusted keys found\n"
msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@@ -7998,27 -6403,22 +8031,27 @@@ msgstr "malkongruaj komandoj\n
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8028,7 -6427,6 +8061,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "nevalida signo %02x en bazo 64 ignorita\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
@@@ -9909,8 -7920,6 +9942,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uzado: gpg [opcioj] "
@@@ -9921,12 -7929,10 +9954,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "%s ne eblas kun %s!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
@@@ -10419,77 -8323,61 +10452,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10629,7 -8487,6 +10662,7 @@@ msgstr "nekonata implicita ricevonto '%
msgid "sending line failed: %s\n"
msgstr "subskribado malsukcesis: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "eraro dum sendo al '%s': %s\n"
@@@ -10882,16 -8678,13 +10915,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "publika �losilo ne trovita"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "skribas sekretan �losilon al '%s'\n"
diff --cc po/es.po
index 17d9752,5e374f5..20b986c
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -451,10 -365,6 +451,10 @@@ msgstr "ejecutar en modo demonio (segun
msgid "run in server mode (foreground)"
msgstr "ejecutar en modo servidor (primer plano)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolijo"
@@@ -562,11 -447,6 +562,11 @@@ msgstr "no disponible
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Por favor, informe de posibles \"bugs\" a <@EMAIL@>.\n"
@@@ -588,56 -466,39 +588,56 @@@ msgstr "
"Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
"Manejo de claves privadas por GnuPG\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "leyendo opciones desde `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "no se puede crear el socket: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
@@@ -647,29 -507,23 +647,29 @@@ msgstr "el nombre de socket `%s' es dem
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "ya hay un agente gpg ejecut�ndose - no se inicia otro\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "error obteniendo valor �nico para el socket\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "error enlazando el socket con `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() fall�: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
@@@ -701,7 -549,6 +701,7 @@@ msgstr "stat() fall� para `%s': %s\n
msgid "can't use '%s' as home directory\n"
msgstr "no puede usar `%s' como directorio personal\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "error leyendo valor �nico en el descriptor %d: %s\n"
@@@ -726,20 -569,16 +726,20 @@@ msgstr "manejador ssh 0x%lx para el des
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "manejador ssh 0x%lx para el descriptor %d finalizado\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
#| msgid "pth_select failed: %s - waiting 1s\n"
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "pth_select fall�: %s - espero 1s\n"
# msgstr "clave %08lX: %d nuevas subclaves\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s detenido\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "no hay un agente gpg ejecut�ndose en esta sesi�n\n"
@@@ -759,8 -596,6 +759,8 @@@ msgstr "
# S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
# puede acentuar? �demasiado alta?
# �Qui�n dice que no se puede? :-)
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -768,9 -603,6 +768,9 @@@ msgstr "
"@�rdenes:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -1023,32 -812,25 +1023,32 @@@ msgstr "error creando tuber�a: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "error creando tuber�a: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "error bifurcando procesos: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "fallo esperando que el proceso %d terminara: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, 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:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1064,29 -844,23 +1064,29 @@@ msgstr "error obteniendo c�digo de fina
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "fallo esperando que el proceso %d terminara: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "no se puede conectar con `%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "problema de comunicaci�n con el agente gpg\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "cancelado por el usuario\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "problema con el agente\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
#| msgid "problem with the agent: %s\n"
msgid "problem with the agent (unexpected response \"%s\")\n"
@@@ -1162,7 -921,6 +1162,7 @@@ msgstr "agotado nucleo de memoria segur
msgid "out of core while allocating %lu bytes"
msgstr "error de memoria reservando %lu bytes"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "error reservando memoria: %s\n"
@@@ -1408,7 -1112,6 +1408,7 @@@ msgstr "No hay ayuda disponible para `%
msgid "ignoring garbage line"
msgstr "ignorando l�nea con basura"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[ninguno]"
@@@ -1544,92 -1220,72 +1544,92 @@@ msgstr "bloqueo `%s' no hecho: %s\n
msgid "waiting for lock %s...\n"
msgstr "esperando al bloqueo %s...\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "cabecera de armadura inv�lida: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "cabecera de armadura: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "cabecera de firma clara inv�lida\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "cabecera de armadura desconocida: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "firmas en texto claro anidadas\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "armadura inesperada: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "L�nea con guiones inv�lida: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter inv�lido radix64 %02X omitido\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "Fin de suma de comprobaci�n prematuro\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "Suma de comprobaci�n mal creada\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "fin de fichero prematuro (en el cierre)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "error en la l�nea de cierre\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "no se han encontrados datos OpenPGP v�lidos\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "ilegible"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1637,25 -1293,20 +1637,25 @@@ msgstr "
"un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
"acabar con un '='\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1665,7 -1316,6 +1665,7 @@@ msgstr "
"un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
"acabar con un '='\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
@@@ -1695,19 -1340,14 +1695,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "ATENCION: "
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "tarjeta OpenPGP no disponible: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "tarjeta OpenPGP num. %s detectada\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "imposible hacer esto en modo de proceso por lotes\n"
@@@ -1719,10 -1357,6 +1719,10 @@@ msgstr "Esta orden solo est� disponibl
msgid "Reset Code not or not anymore available\n"
msgstr "No hay C�digo de Reinicio o ya no est� disponible\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Su elecci�n: "
@@@ -1784,87 -1404,66 +1784,88 @@@ 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: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "error escribiendo `%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Datos de login (nombre de la cuenta): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Datos privados: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
"Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Preferencias de idioma: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Error: respuesta no v�lida.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "Huella dactilar CA:"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Error: formato inv�lido de huella dactilar.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "la operaci�n con la clave no es posible: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "no es una tarjeta OpenPGP"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "�Reemplazar la clave existente? (s/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1879,58 -1478,46 +1880,58 @@@ msgstr "
" requerido. Si la generaci�n de clave fracasa, por favor compruebe\n"
" la documentaci�n de su tarjeta para ver los tama�os posibles.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "�De qu� tama�o quiere la clave de Firmado? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "�De qu� tama�o quiere la clave de Cifrado? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "�De qu� tama�o quiere la clave de Autenticaci�n? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeados a %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "los tama�os de claves %s deben estar en el rango %u-%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Ahora la tarjeta se reconfigurar� para generar una clave de %u bits\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "error cambiando el tama�o de la clave %d a %u bits: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "NOTA: �claves ya almacenadas en la tarjeta!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "�Reemplazar las claves existentes? (s/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1945,145 -1532,110 +1946,145 @@@ msgstr "
" PIN = `%s' PIN Administrador = `%s'\n"
"Deber�a cambiarlos usando la orden --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Por favor seleccione tipo de clave que generar:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Clave de firmado\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Clave de cifrado\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
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:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Elecci�n inv�lida.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Por favor elija donde guardar la clave:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "lectura fallida: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Esta orden no se permite en modo %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "NOTA: �claves ya almacenadas en la tarjeta!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "�Firmarlo? (s/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "sale de este men�"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "ver �rdenes de administrador"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "muestra esta ayuda"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "listar todos los datos disponibles"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "cambiar el nombre del titular de la tarjeta"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "cambiar URL de donde obtener la clave"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "recuperar la clave especificada en la URL de la tarjeta"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "cambiar nombre de usuario"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "cambiar preferencias de idioma"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "cambiar sexo del titular de la tarjeta"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "cambiar huella dactilar de una CA"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "cambiar estado de la opci�n forzar firma del PIN"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "generar nuevas claves"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "men� para cambiar o desbloquear el PIN"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "verificar PIN y listar todos los datos"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "desbloquear PIN usando C�digo de Reinicio"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/tarjeta> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "�rdenes s�lo de administrador\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Se permiten �rdenes de administrador\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "No se permiten �rdenes de administrador\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Orden inv�lida (pruebe \"help\")\n"
@@@ -2091,28 -1642,19 +2092,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output no funciona con esta orden\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "no se puede abrir `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clave \"%s\" no encontrada: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2168,7 -1699,6 +2169,7 @@@ msgstr "�hay una clave secreta para est
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "error creando frase contrase�a: %s\n"
@@@ -2188,7 -1715,6 +2189,7 @@@ msgstr "usando cifrado %s\n
msgid "'%s' already compressed\n"
msgstr "`%s' ya est� comprimido\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2208,7 -1732,6 +2209,7 @@@ msgstr "
"AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
"del destinatario\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2229,17 -1750,14 +2230,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado con algoritmo desconocido %d\n"
@@@ -2313,326 -1818,262 +2314,340 @@@ 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:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "exportar firmas marcadas como s�lo locales"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exportar el atributo ID de usuario (generalmente fotogr�fico)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "exportar claves de revocaci�n marcadas como \"confidenciales\""
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "borrar partes inutilizables de la clave al exportar"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr "borrar tanto como sea posible de la clave al exportar"
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "escribiendo en `%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
msgid "exporting secret keys not allowed\n"
msgstr "no se permite exportar claves secretas\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "ATENCI�N: no se ha exportado nada\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[ID de usuario no encontrado]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, 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:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "error cerrando %s: %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, 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:1435
++#: g10/getkey.c:1437
#, 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:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "No hay huella dactilar"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "clave secreta \"%s\" no encontrada: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "crea una firma"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "crea una firma en texto claro"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "crea una firma separada"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifra datos"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "cifra s�lo con un cifrado sim�trico"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "descifra datos (predefinido)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "lista claves"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "lista claves y firmas"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "lista y comprueba firmas de las claves"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "lista claves y huellas dactilares"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "lista claves secretas"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera un nuevo par de claves"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "genera un nuevo par de claves"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "genera un certificado de revocaci�n"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "elimina claves del anillo p�blico"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "elimina claves del anillo privado"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "firma la clave"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "firma la clave localmente"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "firma o modifica una clave"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "cambia una frase contrase�a"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "exporta claves"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "exporta claves a un servidor de claves"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importa claves desde un servidor de claves"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "busca claves en un servidor de claves"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "actualiza todas las claves desde un servidor de claves"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importa/fusiona claves"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "escribir estado de la tarjeta"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "cambiar datos en la tarjeta"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "cambiar el PIN de la tarjeta"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "actualiza la base de datos de confianza"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "imprime res�menes de mensaje"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "ejecutar en modo servidor"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crea una salida ascii con armadura"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ID-USUARIO|cifra para ID-USUARIO"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|nivel de compresi�n N (0 desactiva)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "usa modo de texto can�nico"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FICHERO|volcar salida en FICHERO"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "no hace ning�n cambio"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "preguntar antes de sobreescribir"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "usar estilo OpenPGP estricto"
@@@ -2640,7 -2081,6 +2655,7 @@@
# p�gina man -> p�gina de manual
# Vale. �del manual mejor?
# Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2648,7 -2088,6 +2663,7 @@@ msgstr "
"@\n"
"(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2668,13 -2107,11 +2683,13 @@@ msgstr "
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas dactilares\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2689,7 -2126,6 +2704,7 @@@ msgstr "
"firma, comprueba, cifra o descifra\n"
"la operaci�n por defecto depende de los datos de entrada\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2697,81 -2133,66 +2712,81 @@@ msgstr "
"\n"
"Algoritmos disponibles:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Clave p�blica: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifrado: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Resumen: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compresi�n: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] %s\n"
msgstr "uso: gpgsm [opciones] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "�rdenes incompatibles\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2781,20 -2202,17 +2796,20 @@@ msgstr "
"AVISO: propiedad insegura del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, 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:1560
#, 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:1563
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2805,494 -2223,392 +2820,500 @@@ msgstr "
"AVISO: permisos inseguros del directorio contenedor del fichero de\n"
"configuraci�n `%s'\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, 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:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr "mostrar foto IDs al listar claves"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr "mostrar URLS de pol�tica al listar firmas"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "mostrar todas las notaciones al listar firmas"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "mostrar notaciones est�ndar IETF al listar firmas"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "mostrar notaciones personalizadas al listar firmas"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
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:1896
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:1898
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:1900
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:1902
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:1904
msgid "show expiration dates during signature listings"
msgstr "mostrar fechas de caducidad al listar firmas"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Claves disponibles:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "orden desconocida `%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, 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:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "opciones del servidor de claves inv�lidas\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "opciones de importaci�n inv�lidas\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "lista de opciones inv�lida\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "opciones de exportaci�n inv�lidas\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: lista de opciones inv�lida\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "lista de opciones inv�lida\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "mostrar foto IDs al verificar firmas"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "mostrar URLs de pol�tica al verificar firmas"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "mostrar todas las notaciones al verificar firmas"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "mostrar notaciones personalizadas al verificar firmas"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "mostrar validez del ID de usuario al verificar firmas"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
msgstr "mostrar solo ID primario de usuario al verificar firmas"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "validar firmas con datos PKA"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "opciones de verificaci�n inv�lidas\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer camino de ejecutables %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, 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:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "lista de auto-localizaci�n de claves inv�lida\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sustituye a %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s no permitido con %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s no tiene sentido con %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "preferencias por defecto inv�lidas\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inv�lidas\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresi�n inv�lidas\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s a�n no funciona con %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, 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:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, 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:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nombre_fichero]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
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:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
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:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nombre_fichero]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [�rdenes]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd <id-usuario>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "env�o al servidor de claves fallido: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepci�n del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "exportaci�n de clave fallida: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "b�squeda del servidor de claves fallida: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "renovaci�n al servidor de claves fallida: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminaci�n de armadura fallida: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creaci�n de armadura fallida: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, 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:4595
++#: g10/gpg.c:4682
#, 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:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[nombre_fichero]"
@@@ -3300,19 -2616,15 +3321,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:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "URL de pol�tica de certificado inv�lida\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "URL de pol�tica inv�lida\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL del servidor de claves preferido no es v�lida\n"
@@@ -3354,128 -2658,110 +3375,138 @@@ msgstr "Ayuda no disponible
msgid "No help available for '%s'"
msgstr "No hay ayuda disponible para `%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "importar firmas marcadas como s�lo locales"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "reparar da�o del servidor de claves p�blicas al importar"
- #: g10/import.c:110
++#: g10/import.c:140
#, 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:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "no actualiza la base de datos de confianza despu�s de importar"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "muestra huella dactilar de la clave"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "s�lo aceptar actualizaciones de claves ya existentes"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "borrar partes in�tiles de la clave despu�s de importar"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr "borrar tanto como sea posible de la clave tras importar"
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "omitiendo bloque de tipo %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu claves procesadas hasta ahora\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Cantidad total procesada: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " omitidas nuevas claves: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin identificador: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuevos identificativos: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuevas subclaves: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuevas firmas: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nuevas revocaciones de claves: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " claves secretas le�das: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " claves secretas importadas: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "claves secretas sin cambios: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " no importadas: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " firmas limpiadas: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " IDs de usuario limpiados: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3484,202 -2770,157 +3515,195 @@@ msgstr "
"AVISO: la clave %s contiene preferencias para algoritmos\n"
"no disponibles en estos IDs de usuario:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": algoritmo de cifrado preferido %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": algoritmo de resumen preferido %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": algoritmo de compresi�n preferido %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
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:893
++#: g10/import.c:1069
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:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "clave %s: sin identificador de usuario\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "omitido \"%s\": %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "clave %s: reparada la subclave PKS corrompida\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clave %s: sin identificadores de usuario v�lidos\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clave %s: clave p�blica no encontrada: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "clave %s: clave nueva - omitida\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "anillo de claves no escribible encontrado: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "escribiendo en `%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clave %s: clave p�blica \"%s\" importada\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clave %s: no coincide con nuestra copia\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clave %s: \"%s\" 1 firma nueva\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clave %s: \"%s\" %d firmas nuevas\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clave %s: \"%s\" 1 subclave nueva\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clave %s: \"%s\" sin cambios\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clave %s: clave secreta importada\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, 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:1683
++#: g10/import.c:1971
#, 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:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "no se permite importar claves secretas\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3694,141 -2935,114 +3718,141 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clave %s: firma directa de clave inv�lida\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clave %s: uni�n de subclave inv�lida\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clave %s: revocaci�n de subclave inv�lida\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clave %s: omitido ID de usuario \"%s\"\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clave %s: subclave omitida\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "clave %s: detectado usuario duplicado - fusionada\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clave %s: firma directa de clave a�adida\n"
@@@ -3869,45 -3077,37 +3893,45 @@@ msgstr "recurso de bloque de claves: `%
msgid "error opening key DB: %s\n"
msgstr "error abriendo `%s': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[revocaci�n]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[autofirma]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
#| msgid "revoke signatures"
msgid " (reordered signatures follow)"
msgstr "revoca firmas"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s:\n"
msgstr "omitido \"%s\": %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "%d duplicate signature removed\n"
@@@ -3915,7 -3115,6 +3939,7 @@@ msgid_plural "%d duplicate signatures r
msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
- #: g10/keyedit.c:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3923,7 -3122,6 +3947,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3931,7 -3129,6 +3955,7 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d firmas incorrectas\n"
msgstr[1] "%d firmas incorrectas\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
#| msgid "Good signature from"
msgid "%d signature reordered\n"
@@@ -3939,14 -3136,12 +3963,14 @@@ msgid_plural "%d signatures reordered\n
msgstr[0] "Firma correcta de"
msgstr[1] "Firma correcta de"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3958,17 -3153,14 +3982,17 @@@ msgstr "
"pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Conf�o un poco\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Conf�o totalmente\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3978,50 -3170,38 +4002,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:1018
++#: g10/keyedit.c:1021
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:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID de usuario \"%s\" revocado."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Imposible firmar.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID de usuario \"%s\" expirado."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID de usuario \"%s\" no tiene autofirma."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID de usuario \"%s\" puede firmarse."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "�Firmarlo? (s/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4030,11 -3210,9 +4054,11 @@@ msgstr "
"La autofirma en \"%s\"\n"
"es una firma de tipo PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4043,11 -3221,9 +4067,11 @@@ msgstr "
"Su firma actual en \"%s\"\n"
"ha expirado.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4056,43 -3232,34 +4080,43 @@@ msgstr "
"Su firma actual en \"%s\"\n"
"es una firma local.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" ya estaba firmada por la clave %s\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "�Quiere firmarlo a�n as�? (s/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que firmar con la clave %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "�Esta clave ha caducado!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta clave expirar� el %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4102,33 -3269,27 +4126,33 @@@ msgstr "
"firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
"contestar, introduzca \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) No contesto.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, 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:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) He hecho una comprobaci�n informal.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Lo he comprobado meticulosamente.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, 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:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4137,223 -3298,169 +4161,223 @@@ msgstr "
"�Est� realmente seguro de querer firmar esta clave\n"
"con su clave: \"%s\" (%s)?\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Esto ser� una autofirma.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
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:1527
++#: g10/keyedit.c:1530
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:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "La firma se marcar� como no exportable.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "La firma se marcar� como no revocable.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "No he comprobado esta clave en absoluto.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "He comprobado esta clave informalmente.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "He comprobado esta clave meticulosamente.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "�Firmar de verdad? (s/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallida: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
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:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "graba y sale"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "muestra huella dactilar de la clave"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Introduzca keygrip: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "lista clave e identificadores de usuario"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "selecciona identificador de usuario N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "selecciona subclave N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "comprueba firmas"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "firma localmente los IDs de usuarios elegidos"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "firmar IDs seleccionados con firma de confianza"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr "firmar IDs seleccionados con firma no revocable"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "a�adir un identificador de usuario"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "a�adir un ID fotogr�fico"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "borrar identificadores de usuario seleccionados"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "a�adir una subclave"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "a�adir clave a tarjeta"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "mover una clave a la tarjeta"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "mover una clave de respaldo a la tarjeta"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "borrar clave secundaria"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "a�adir una clave de revocaci�n"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "borrar firmas de los ID seleccionados"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
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:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "marcar ID de usuario seleccionado como primario"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "mostrar preferencias (experto)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "mostrar preferencias (prolijo)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "establecer preferencias para todos los ID seleccionados"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
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:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "establecer notaci�n para los IDs de usuario seleccionados"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "cambia la frase contrase�a"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "cambia valores de confianza"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "revocar firmas de los identificadores seleccionados"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "revocar los identificadores seleccionados"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "revoca clave o subclaves seleccionadas"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "habilita clave"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "deshabilita clave"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "mostrar fotos de los ID seleccionados"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
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:1936
++#: g10/keyedit.c:1939
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:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Clave secreta disponible.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Se necesita la clave secreta para hacer esto.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4371,264 -3478,211 +4395,270 @@@ 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:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "La clave est� revocada."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, 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:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, 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:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "�Realmente cambiar de sitio la clave primaria? (s/N)"
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Debe seleccionar exactamente una clave.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "La orden espera un nombre de fichero como argumento\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, 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:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar por lo menos una clave.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
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:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "�De verdad quiere borrar esta clave? (s/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "�Revocar realmente este identificador de usuario? (s/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
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:2571
++#: g10/keyedit.c:2574
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:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "�De verdad quiere revocar esta subclave? (s/N) "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
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:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Establecer lista de preferencias a:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
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:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "�Actualizar realmente las preferencias? (s/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "�Grabar cambios? (s/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "�Salir sin grabar? (s/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "actualizaci�n fallida: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Creaci�n de la clave fallida: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "huella dactilar no v�lida"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, 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:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valor inv�lido\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "ID de usuario inexistente.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, 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:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Resumen: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Caracter�sticas: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Sevidor de claves no-modificar"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Servidor de claves preferido: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Notaciones: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(confidencial)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "creado: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "revocada: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "caduc�: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "caduca: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "num. tarjeta: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "confianza: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "validez: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Esta clave est� deshabilitada"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4636,17 -3690,12 +4666,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "revocada"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "caducada"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4654,17 -3703,14 +4684,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4673,35 -3719,27 +4703,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de querer a�adirla? (s/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
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:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta firma correcta? (s/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta firma inv�lida? (s/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta firma desconocida? (s/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "�Borrar realmente esta autofirma? (s/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4709,20 -3747,16 +4739,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d firmas borradas.\n"
msgstr[1] "%d firmas borradas.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "No se borr� nada\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "inv�lida"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID de usuario \"%s\" compactado: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4730,17 -3764,14 +4760,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:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID de usuario \"%s\": ya minimizado\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID de usuario \"%s\" ya limpiado\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4749,38 -3780,30 +4779,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:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduzca el ID de usuario del revocador designado: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
msgid "this key has already been designated as a revoker\n"
msgstr "esta clave ya ha sido designada como revocadora\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
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:4632
++#: g10/keyedit.c:4739
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4790,156 -3813,127 +4820,162 @@@ msgid "
msgstr ""
"�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando fecha de caducidad de subclave.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando caducidad de clave primaria.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, 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:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Introduzca la URL de su servidor de claves preferido: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�Seguro que quiere reemplazarlo? (s/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�Seguro que quiere borrarlo? (s/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Introduzca la notaci�n: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "�Continuar? (s/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, 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:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "No hay ID de usuario con hash %s\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "No existe una subclave con �ndice %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \"%s\"\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "firmada con su clave %s el %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (no exportable)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta firma caduc� el %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�De verdad quiere revocarla? (s/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "No est� firmado por usted.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (no revocable)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocada por la clave %s el %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Va a revocar las siguientes firmas:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "no hay clave secreta\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, fuzzy, c-format
+ #| msgid "revoke a user ID"
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr "revocar un identificador de usuario"
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La clave %s ya ha sido revocada.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La subclave %s ya ha sido revocada.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5388,13 -4304,10 +5424,13 @@@ msgstr "
"generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
"entrop�a.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Creaci�n de la clave fallida: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5402,71 -4315,58 +5438,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, 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:3604
++#: g10/keygen.c:3605
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "�Crear de todas formas?"
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "�Crear de todas formas?"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Creaci�n de claves cancelada.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "claves p�blica y secreta creadas y firmadas.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5474,7 -4374,6 +5510,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5482,7 -4381,6 +5518,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:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5490,49 -4388,38 +5526,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:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
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:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "�Crear de verdad? (s/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "nunca "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Pol�tica de firmas cr�ticas: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Pol�tica de firmas: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Servidor de claves cr�tico preferido: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notaci�n de firmas cr�ticas: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notaci�n de firma: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5540,7 -4427,6 +5576,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d firmas incorrectas\n"
msgstr[1] "%d firmas incorrectas\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5548,45 -4434,32 +5584,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 firma no comprobada por causa de un error\n"
msgstr[1] "1 firma no comprobada por causa de un error\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Anillo de claves"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Huellas dactilares de la clave primaria:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Huella clave primaria:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Huella de subclave:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Huella de clave ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " N�mero de serie de la tarjeta ="
@@@ -5653,25 -4514,20 +5684,25 @@@ msgstr "usar la URL de servidor de clav
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:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "deshabilitado"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduzca n�mero(s), O)tro, o F)in >"
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5679,270 -4535,218 +5710,275 @@@ 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "clave \"%s\" no encontrada en el servidor\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "clave no encontrada en el servidor\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando clave %s de %s servidor %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando clave %s de %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, 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:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "omitido \"%s\": %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "enviando clave %s a %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, 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:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: imposible recuperar URI %s: %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s clave de sesi�n cifrada\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, 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:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "la clave p�blica es %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrado con clave %s, ID %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "descifrado de la clave p�blica fallido: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifrado con %lu frases contrase�a\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "cifrado con 1 frase contrase�a\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "suponiendo %s datos cifrados\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "descifrado correcto\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "descifrado fallido: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nombre fichero original='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "AVISO: se observan varios textos en claro\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "no se encontr� firma\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma INCORRECTA de \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma caducada de \"%s\""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "Firma correcta de \"%s\""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "suprimida la verificaci�n de la firma\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "no puedo manejar estos datos ambiguos en la firma\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Firmado el %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " usando %s clave %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Clave disponible en: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[incierto]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " alias \"%s\""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma caducada en %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "La firma caduca el %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binaria"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "modotexto"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "desconocido"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "Algoritmo de clave p�blica desconocido"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposible comprobar la firma: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "no es una firma separada\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "firma al viejo estilo (PGP 2.x)\n"
@@@ -6125,7 -4895,6 +6161,7 @@@ msgid "WARNING: potentially insecure sy
msgstr ""
"AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, 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"
@@@ -6501,48 -5202,39 +6537,48 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " No es seguro que la firma pertenezca al propietario.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitida: clave p�blica deshabilitada\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitida: clave p�blica ya presente\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Destinatarios actuales:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6550,37 -5242,29 +6586,37 @@@ msgstr "
"\n"
"Introduzca ID de usuario. Acabe con una l�nea vac�a: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "ID de usuario inexistente.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Clave p�blica deshabilitada.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "omitida: clave p�blica ya establecida\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "desconocido el destinatario predefinido \"%s\"\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "no hay direcciones v�lidas\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Nota: la clave %s no usa %s\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Nota: clave %s no tiene preferencias para %s\n"
@@@ -6589,29 -5272,23 +6625,29 @@@
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:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Firma separada.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Introduzca el nombre del fichero de datos: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "leyendo stdin...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "no hay datos firmados\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "imposible abrir datos firmados fd=%d: %s\n"
@@@ -6865,7 -5497,6 +6901,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
msgstr[1] "la clave p�blica %s es %lu segundos m�s nueva que la firma\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6945,12 -5567,10 +6981,12 @@@ msgstr "
"AVISO: no puedo expandir el %% de la URL del servidor de claves\n"
"preferido. Se usa sin expandir.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s firma de: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6958,11 -5578,9 +6994,11 @@@ msgstr "
"AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
"preferencias del destinatario\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "firmando:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "se usar� un cifrado %s\n"
@@@ -7038,137 -5642,110 +7074,137 @@@ msgstr "error de lectura `%s': %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, 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:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, 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:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: �el directorio no existe!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, 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:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: se ha creado base de datos de confianza inv�lida\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: se ha creado base de datos de confianza\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de datos de confianza inv�lida\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, 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:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: error actualizando el registro de versi�n: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: error leyendo registro de versi�n: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: error escribiendo registro de versi�n: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de datos de confianza: fallo lseek: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, 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:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: no es una base de datos de confianza\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, 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:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versi�n del fichero %d inv�lida\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: error leyendo registro libre: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: error escribiendo registro de directorio: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, 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:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: fallo al a�adir un registro: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "Error: base de datos de confianza corrupta.\n"
@@@ -7538,7 -6053,6 +7574,7 @@@ msgstr "usando %s como modelo de confia
msgid "no need for a trustdb check\n"
msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
@@@ -7559,7 -6071,6 +7595,7 @@@ msgstr "
"no es necesario comprobar la base de datos de confianza\n"
"con el modelo `%s'\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "clave p�blica %s no encontrada: %s\n"
@@@ -7572,7 -6081,6 +7608,7 @@@ msgstr "por favor haga un --check-trust
msgid "checking the trustdb\n"
msgstr "comprobando base de datos de confianza\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7580,7 -6088,6 +7616,7 @@@ msgid_plural "%d keys processed
msgstr[0] "%lu claves procesadas hasta ahora\n"
msgstr[1] "%lu claves procesadas hasta ahora\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7588,16 -6095,13 +7624,16 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d claves procesadas (%d validaciones superadas)\n"
msgstr[1] "%d claves procesadas (%d validaciones superadas)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "no se encuentran claves absolutamente fiables\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7605,7 -6109,6 +7641,7 @@@ msgstr "
"nivel: %d validez: %3d firmada: %3d confianza: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8074,13 -6482,11 +8110,13 @@@ msgstr "denegar �rdenes de administraci
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8092,19 -6498,16 +8128,19 @@@ msgstr "
"Sintaxis: scdaemon [opciones] [orden [args]]\n"
"Demonio de la tarjeta inteligente para GnuPG\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "use la opci�n `--daemon' para ejectuar el programa en segundo plano\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "manejador del descriptor %d iniciado\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "manejador del descriptor %d terminado\n"
@@@ -8114,7 -6516,6 +8150,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "caracter inv�lido radix64 %02x omitido\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
#| msgid "no gpg-agent running in this session\n"
msgid "no dirmngr running in this session\n"
@@@ -10112,8 -8126,6 +10148,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
@@@ -10125,13 -8136,11 +10161,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:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "renombrando `%s' en `%s' fallo: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10675,87 -8582,71 +10711,87 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, 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:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, 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:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, 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:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "select fallido: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, 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:2406
++#: dirmngr/server.c:2415
#, 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:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, 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:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10912,7 -8773,6 +10948,7 @@@ msgstr "orden desconocida `%s'\n
msgid "sending line failed: %s\n"
msgstr "fallo mandando la l�nea: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "error enviando opciones est�ndar: %s\n"
@@@ -11188,15 -8987,12 +11224,15 @@@ msgstr "
"Sintaxis: gpgconf [opciones]\n"
"Administrar opciones de configuraci�n de las herramientas GnuPG\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Necesita un argumento de un componente"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Componente no encontrado"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "No se permiten par�metros"
diff --cc po/et.po
index c103285,5d9dcf3..9607c03
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -401,10 -315,6 +401,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ole jutukas"
@@@ -513,11 -398,6 +513,11 @@@ msgstr "ei ole toetatud
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Palun saatke veateated aadressil <gnupg-bugs at gnu.org>.\n"
@@@ -533,55 -411,38 +533,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "v�tmete fail `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s ei �nnestu luua: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -591,28 -451,22 +591,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "viga parooli loomisel: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
@@@ -640,7 -488,6 +640,7 @@@ msgstr "trustdb: lugemine eba�nnestus (
msgid "can't use '%s' as home directory\n"
msgstr "%s: kataloogi ei �nnestu luua: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -665,18 -508,14 +665,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: j�tsin vahele: %s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@@ -692,8 -529,6 +692,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -536,6 +701,9 @@@ msgstr "
"@K�sud:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -940,29 -729,22 +940,29 @@@ msgstr "viga parooli loomisel: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "viga `%s' lugemisel: %s\n"
@@@ -977,32 -757,26 +977,32 @@@ msgstr "viga salajase v�tme v�tmehoidla
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "probleem gpg-agent programmiga suhtlemisel\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "katkestatud kasutaja poolt\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "probleem agendiga: agent tagastas 0x%lx\n"
@@@ -1078,7 -837,6 +1078,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
@@@ -1340,7 -1044,6 +1340,7 @@@ msgstr "`%s' kohta abiinfo puudub
msgid "ignoring garbage line"
msgstr "viga l�petaval real\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "tundmatu"
@@@ -1480,94 -1156,74 +1480,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "pakend: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "vigane pakendi p�is: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "pakendi p�is: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "vigane avateksti allkirja p�is\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "pakendi p�is: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "avateksti allkirjad �ksteise sees\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "ootamatu pakend:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "vigane kriipsudega m�rgitud rida: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "enneaegne failil�pp (puudub CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "enneaegne failil�pp (poolik CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "vigane CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC viga; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "enneaegne failil�pp (l�petaval real)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "viga l�petaval real\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "ei leia OpenPGP andmeid.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "pole inimese poolt loetav"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1575,25 -1231,20 +1575,25 @@@ 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:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, 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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, fuzzy
msgid "a notation name may not contain an '=' character\n"
msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1603,7 -1254,6 +1603,7 @@@ 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:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
@@@ -1633,19 -1278,14 +1633,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "salajane v�ti ei ole k�ttesaadav"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "seda ei saa teha pakettmoodis\n"
@@@ -1660,10 -1298,6 +1660,10 @@@ msgstr "See k�sklus ei ole %s moodis lu
msgid "Reset Code not or not anymore available\n"
msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Teie valik? "
@@@ -1730,148 -1350,115 +1730,149 @@@ msgstr "vastavat avalikku v�tit pole: %
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "uuendatud eelistused"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "lubamatu s�mbol eelistuste s�nes\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "n�ita s�rmej�lge"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "ei leia OpenPGP andmeid.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Millist v�tmepikkust te soovite? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "�mardatud �les %u bitini\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1879,155 -1466,120 +1880,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Allkiri aegus %s\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (ainult kr�pteerimiseks)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Vigane valik.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Palun valige t�histamise p�hjus:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "See k�sklus ei ole %s moodis lubatud.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Allkirjastan t�esti? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "v�lju sellest men��st"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "vastuolulised k�sud\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "n�ita seda abiinfot"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "V�tme leiate: "
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "muuda aegumise kuup�eva"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "muuda omaniku usaldust"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "n�ita s�rmej�lge"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "genereeri uus v�tmepaar"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "vastuolulised k�sud\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "vastuolulised k�sud\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Vigane k�sklus (proovige \"help\")\n"
@@@ -2035,28 -1586,19 +2036,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "v�ti --output ei t��ta selle k�suga\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "`%s' ei �nnestu avada\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "v�tit '%s' ei leitud: %s\n"
@@@ -2113,7 -1644,6 +2114,7 @@@ msgstr "avaliku v�tme \"%s\" jaoks on s
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "viga parooli loomisel: %s\n"
@@@ -2133,7 -1660,6 +2134,7 @@@ msgstr "kasutan �iffrit %s\n
msgid "'%s' already compressed\n"
msgstr "`%s' on juba pakitud\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2152,7 -1676,6 +2153,7 @@@ msgid "
msgstr ""
"s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2171,17 -1692,14 +2172,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s kr�pteeritud andmed\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
@@@ -2253,347 -1758,282 +2254,361 @@@ 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:78
++#: g10/export.c:102
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
"`%s' jaoks pole t�histamise v�tmeid\n"
"\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "mittekasutatav salajane v�ti"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: j�tsin vahele: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "kirjutan faili `%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "HOIATUS: midagi ei eksporditud\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[Kasutaja id puudub]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "viga `%s' loomisel: %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "n�ita s�rmej�lge"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fail]|loo avateksti allkiri"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "loo eraldiseisev allkiri"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "kr�pteeri andmed"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekr�pteeri andmed (vaikimisi)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "kontrolli allkirja"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "n�ita v�tmeid"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "n�ita v�tmeid ja allkirju"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "kontrolli v�tmete allkirju"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "n�ita v�tmeid ja s�rmej�lgi"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "n�ita salajasi v�tmeid"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genereeri uus v�tmepaar"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "genereeri uus v�tmepaar"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "genereeri t�histamise sertifikaat"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "eemalda v�tmed avalike v�tmete hoidlast"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allkirjasta v�ti"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "allkirjasta v�ti"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "allkirjasta v�ti lokaalselt"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "allkirjasta v�i toimeta v�tit"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "muuda parooli"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "ekspordi v�tmed"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "ekspordi v�tmed v�tmeserverisse"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "impordi v�tmed v�tmeserverist"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "otsi v�tmeid v�tmeserverist"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "uuenda v�tmeid v�tmeserverist"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "impordi/mesti v�tmed"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "uuenda usalduse andmebaasi"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [failid]|tr�ki teatel�hendid"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "loo ascii pakendis v�ljund"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|kr�pti NIMEle"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "kasuta seda kasutaja IDd"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "kasuta kanoonilist tekstimoodi"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FAIL|lae laiendusmoodul FAIL"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "�ra tee mingeid muutusi"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "k�si enne �lekirjutamist"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2601,7 -2041,6 +2616,7 @@@ msgstr "
"@\n"
"(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2621,13 -2060,11 +2636,13 @@@ msgstr "
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2642,7 -2079,6 +2657,7 @@@ msgstr "
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2650,600 -2086,475 +2665,605 @@@ msgstr "
"\n"
"Toetatud algoritmid:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Avalik v�ti: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "�iffer: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "R�si: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Pakkimine: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "kasuta: gpg [v�tmed] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tundmatu seade \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, 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:1904
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "blokeeri v�ti"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "vigased impordi v�tmed\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku �ifri eelistused\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku l�hendi eelistused\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei t��ta veel koos %s-ga\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [failinimi]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key kasutaja-id"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "viga parooli loomisel: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[failinimi]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
@@@ -3288,327 -2591,263 +3308,329 @@@ msgstr "Abiinfo puudub
msgid "No help available for '%s'"
msgstr "`%s' kohta abiinfo puudub"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "uuenda usalduse andmebaasi"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "uuenda usalduse andmebaasi"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "n�ita s�rmej�lge"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "mittekasutatav salajane v�ti"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "j�tan bloki t��biga %d vahele\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu v�tit on seni t��deldud\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "T��deldud kokku: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " vahele j�etud uusi v�tmeid: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " puudub kasutaja ID: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " imporditud: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " muutmata: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusi kasutajaid: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusi alamv�tmeid: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusi allkirju: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusi t�histamisi: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " loetud salajasi v�tmeid: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " salajasi v�tmeid imporditud: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muutmata salajasi v�tmeid: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " pole imporditud: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusi allkirju: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " loetud salajasi v�tmeid: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "`%s' j�tsin vahele: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, 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:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "kirjutan faili `%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, 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:1134
++#: g10/import.c:1421
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, 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:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salajast v�tit `%s' ei leitud: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3623,140 -2862,113 +3645,140 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, fuzzy, c-format
msgid "key %s: no user ID for signature\n"
msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "v�ti %08lX: vigane alamv�tme seos\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, 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:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
@@@ -3793,48 -2999,39 +3815,48 @@@ msgstr "viga `%s' loomisel: %s\n
msgid "error opening key DB: %s\n"
msgstr "viga `%s' lugemisel: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[t�histamine]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[iseenda allkiri]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "`%s' j�tsin vahele: %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3842,7 -3039,6 +3864,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3850,21 -3046,18 +3872,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d halba allkirja\n"
msgstr[1] "%d halba allkirja\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Korrektne allkiri kasutajalt \""
msgstr[1] "Korrektne allkiri kasutajalt \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3877,68 -3070,53 +3899,68 @@@ msgstr "
"passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Usaldan v�hesel m��ral\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Usaldan t�iesti\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kasutaja ID \"%s\" on t�histatud."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Ei saa allkirjastada.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kasutaja ID \"%s\" on aegunud."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Allkirjastan t�esti? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3947,11 -3125,9 +3969,11 @@@ msgstr "
"Iseenda allkiri \"%s\"\n"
"on PGP 2.x stiilis allkiri.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3960,11 -3136,9 +3982,11 @@@ msgstr "
"Teie praegune allkiri \"%s\"\n"
"on aegunud.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3973,44 -3147,35 +3995,44 @@@ msgstr "
"Teie praegune allkiri \"%s\"\n"
"on lokaalne allkiri.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "See v�ti on aegunud!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "See v�ti aegub %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4020,32 -3185,26 +4042,32 @@@ msgstr "
"kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
"sisestage \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Ma ei vasta.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Ma ei ole �ldse kontrollinud.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4054,265 -3213,211 +4076,265 @@@ msgstr "
"Olete t�esti kindel, et soovite seda v�tit oma\n"
"v�tmega allkirjastada: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"See saab olema iseenda allkiri.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Allkiri m�rgitakse mitte-eksporditavaks.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
#, 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:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, 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:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Allkirjastan t�esti? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "salvesta ja v�lju"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "n�ita s�rmej�lge"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Allkirja noteerimine: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "n�ita v�tit ja kasutaja IDd"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "vali kasutaja ID N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "vali kasutaja ID N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "t�hista allkirjad"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "allkirjasta v�ti lokaalselt"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "lisa kasutaja ID"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "lisa foto ID"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "kustuta kasutaja ID"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "kustuta sekundaarne v�ti"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "lisa t�histamise v�ti"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
#, 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:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "m�rgi kasutaja ID primaarseks"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "n�ita eelistusi (ekspert)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "n�ita eelistusi (detailsena)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "muuda parooli"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "muuda omaniku usaldust"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "t�hista kasutaja ID"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "t�hista sekundaarne v�ti"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "luba v�ti"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "blokeeri v�ti"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "n�ita foto ID"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Salajane v�ti on kasutatav.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4320,273 -3425,220 +4342,279 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "V�ti on t�histatud."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "tundmatu allkirja klass"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Viimast kasutaja ID ei saa kustutada!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Kas eemaldan t�esti selle kasutaja ID? "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Te peata valima v�hemalt �he v�tme.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, 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:2503
++#: g10/keyedit.c:2506
#, 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:2541
++#: g10/keyedit.c:2544
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Kas t�histan t�esti selle kasutaja ID? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, 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:2571
++#: g10/keyedit.c:2574
#, 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:2573
++#: g10/keyedit.c:2576
#, 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:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "sea eelistuste nimekiri"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, 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:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Kas t�esti uuendan seaded? "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Salvestan muutused? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "V�ljun salvestamata? "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "uuendamine eba�nnestus: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "V�tme genereerimine eba�nnestus: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "viga: vigane s�rmej�lg\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "vigane v��rtus\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Tundmatu kasutaja ID.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "V�tmega %08lX pole midagi allkirjastada\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Teatel�hend: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Omadused: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Noteering: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (tundlik)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s ei �nnestu luua: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[t�histatud] "
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [aegub: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [aegub: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " usaldus: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " usaldus: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "See v�ti on blokeeritud"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4594,19 -3646,14 +4622,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[t�histatud] "
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4614,17 -3661,14 +4642,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4633,35 -3677,27 +4661,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Kustutan selle vigase allkirja? (j/E/v)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4669,38 -3705,31 +4697,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Kustutatud %d allkiri.\n"
msgstr[1] "Kustutatud %d allkiri.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Midagi ei kustutatud.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
#, fuzzy
msgid "invalid"
msgstr "vigane pakend"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Kasutaja ID \"%s\" on t�histatud."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4709,39 -3738,31 +4737,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:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
#, 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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4749,162 -3770,132 +4777,167 @@@
msgstr ""
"Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Muudan primaarse v�tme aegumise aega.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, 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:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Allkirja noteerimine: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Kirjutan �le (j/E)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Kasutaja ID numbriga %d puudub\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "kasutaja ID: \""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, fuzzy, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr " allkirjastanud %08lX %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (mitte-eksporditav)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "See allkiri aegub %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " allkirjastanud %08lX %s%s\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (mitte-eksporditav)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " t�histanud %08lX %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Te asute t�histama j�rgmisi allkirju:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "salajast v�tit pole\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5354,13 -4267,10 +5387,13 @@@ msgstr "
"kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
"koguda paremat entroopiat.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "V�tme genereerimine eba�nnestus: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5368,66 -4278,53 +5401,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' on juba pakitud\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Kasutan seda v�tit ikka? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
msgid "creating anyway\n"
msgstr "genereeri uus v�tmepaar"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "V�tme genereerimine katkestati.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5437,63 -4334,50 +5470,63 @@@ msgstr "
"Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
"kasutades v�tit \"--edit-key\".\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, 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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Loon t�esti? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "mitte kunagi"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kriitiline allkirja poliitika: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Allkirja poliitika: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kriitiline allkirja noteerimine: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Allkirja noteerimine: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5501,7 -4385,6 +5534,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d halba allkirja\n"
msgstr[1] "%d halba allkirja\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5509,46 -4392,33 +5542,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 allkiri j�i vea t�ttu kontrollimata\n"
msgstr[1] "1 allkiri j�i vea t�ttu kontrollimata\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "V�tmehoidla"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Primaarse v�tme s�rmej�lg:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Alamv�tme s�rmej�lg:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Primaarse v�tme s�rmej�lg:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Alamv�tme s�rmej�lg:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " V�tme s�rmej�lg ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5613,298 -4471,241 +5641,303 @@@ msgstr "antud allkirja poliisi URL on v
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "v�tit '%s' ei leitud: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, 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:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "`%s' j�tsin vahele: %s\n"
+
++#: g10/keyserver.c:1823
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allkirjastatud teie v�tmega %08lX %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s kr�pteeritud sessiooni v�ti\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "avalik v�ti on %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ka \""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "kr�pteeritud kasutades %lu parooli\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "kr�pteeritud �he parooliga\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "eeldan %s kr�pteeritud andmeid\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "lahtikr�pteerimine �nnestus\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "algne failinimi on='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "HALB allkiri kasutajalt \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Aegunud allkiri kasutajalt \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Korrektne allkiri kasutajalt \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "allkirja kontroll j�eti �ra\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neid allkirju ei �nnestu t��delda\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ka \""
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "V�tme leiate: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[ebakindel]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ka \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Allkiri aegus %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Allkiri aegub %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binaarne"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "tekstimood"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "tundmatu"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tundmatu avaliku v�tme algoritm"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allkirja ei saa kontrollida: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "ei ole eraldiseisev allkiri\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "vana stiili (PGP 2.x) allkiri\n"
@@@ -6083,7 -4850,6 +6116,7 @@@ msgstr "
"HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
"v�ti\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@@ -6450,46 -5148,37 +6483,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ei ole kindel, et allkiri kuulub omanikule.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: j�tsin vahele: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, 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:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6497,37 -5186,29 +6530,37 @@@ msgstr "
"\n"
"Sisestage kasutaja ID. L�petage t�hja reaga: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Tundmatu kasutaja ID.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Avalik v�ti on blokeeritud.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tundmatu vaikimisi saaja `%s'\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "kehtivaid aadresse pole\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "v�ti %08lX: kasutaja ID puudub\n"
@@@ -6536,29 -5216,23 +6569,29 @@@
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Eraldiseisev allkiri.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Palun sisestage andmefaili nimi: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "loen standardsisendit ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "allkirjastatud andmeid pole\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
@@@ -6811,7 -5440,6 +6844,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
msgstr[1] "avalik v�ti %08lX on %lu sekund uuem, kui allkiri\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6877,23 -5496,19 +6910,23 @@@ msgstr "
"HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
"kompaktset.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s allkiri kasutajalt: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, 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:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "allkirjastan:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "kasutatakse %s kr�pteerimist\n"
@@@ -6972,133 -5573,106 +7005,133 @@@ msgstr "viga lugemisel: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync eba�nnestus: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "`%s' ei �nnestu avada\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "trustdb transaktsioon on liiga suur\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: kataloogi ei ole!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "`%s' ei �nnestu sulgeda: %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: versioonikirje loomine ei �nnestu: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: loodi vigane usalduse andmebaas\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trustdb on loodud\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "M�RKUS: trustdb pole kirjutatav\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: vigane trustdb\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: viga versioonikirje uuendamisel: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: viga versioonikirje lugemisel: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek eba�nnestus: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ei ole trustdb fail\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versioonikirje kirje numbriga %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: vigane faili versioon %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: viga vaba kirje lugemisel: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: kirje nullimine eba�nnestus: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: kirje lisamine eba�nnestus: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: trustdb on loodud\n"
@@@ -7457,7 -5969,6 +7490,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "trustdb kontrolliks puudub vajadus\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "trustdb j�rgmine kontroll %s\n"
@@@ -7472,7 -5981,6 +7505,7 @@@ msgstr "trustdb kontrolliks puudub vaja
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "trustdb kontrolliks puudub vajadus\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "ei leia avalikku v�tit %08lX: %s\n"
@@@ -7485,14 -5991,12 +7518,14 @@@ msgstr "palun tehke --check-trustdb\n
msgid "checking the trustdb\n"
msgstr "kontrollin trustdb faili\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu v�tit on seni t��deldud\n"
msgstr[1] "%lu v�tit on seni t��deldud\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7500,22 -6004,18 +7533,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
msgstr[1] "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, 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"
@@@ -7978,27 -6383,22 +8011,27 @@@ msgstr "vastuolulised k�sud\n
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8008,7 -6407,6 +8041,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@@ -9881,8 -7892,6 +9914,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "kasuta: gpg [v�tmed] "
@@@ -9893,12 -7901,10 +9926,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
@@@ -10393,77 -8297,61 +10426,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10603,7 -8461,6 +10636,7 @@@ msgstr "tundmatu vaikimisi saaja `%s'\n
msgid "sending line failed: %s\n"
msgstr "allkirjastamine eba�nnestus: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "viga teate saatmisel serverile `%s': %s\n"
@@@ -10856,16 -8652,13 +10889,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "ei leia avalikku v�tit"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "kirjutan salajase v�tme faili `%s'\n"
diff --cc po/fi.po
index 5fea364,414f99b..f49ba47
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -417,10 -331,6 +417,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "monisanainen"
@@@ -529,11 -414,6 +529,11 @@@ msgstr "ei tuettu
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@@ -550,55 -428,38 +550,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -608,28 -468,22 +608,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@@ -657,7 -505,6 +657,7 @@@ msgstr "trustdb: luku epäonnistui (n=%
msgid "can't use '%s' as home directory\n"
msgstr "%s: hakemistoa ei voi luoda: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -682,18 -525,14 +682,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "salaisen päivitys epäonnistui: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ohitettu: %s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@@ -709,8 -546,6 +709,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -718,9 -553,6 +718,9 @@@ msgstr "
"@Komennot:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -957,29 -746,22 +957,29 @@@ msgstr "virhe luotaessa salasanaa: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@@ -994,32 -774,26 +994,32 @@@ msgstr "virhe kirjoitettaessa salaisee
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "gpg-agentin kanssa yhteysongelma\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "käyttäjän peruma\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
@@@ -1095,7 -854,6 +1095,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
@@@ -1357,7 -1061,6 +1357,7 @@@ msgstr "Ei ohjetta aiheesta \"%s\"
msgid "ignoring garbage line"
msgstr "virhe trailer-rivissä\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "tuntematon "
@@@ -1497,82 -1173,64 +1497,82 @@@ msgstr "julkista avainta %08lX ei löyd
msgid "waiting for lock %s...\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ascii-koodaus: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "epäkelpo ascii-koodausotsake: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "ascii-koodausotsake: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "ascii-koodausotsake: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "odottamaton ascii-koodaus:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "epäkelpo viiva rivin lopussa: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "väärinmuotoiltu CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-virhe; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "virhe trailer-rivissä\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@@ -1580,13 -1238,11 +1580,13 @@@
"viallista\n"
"MTA:ta on käytetty\n"
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "ei ihmisten luettavissa"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1594,25 -1250,20 +1594,25 @@@ 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:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, 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:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1622,7 -1273,6 +1622,7 @@@ 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:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
@@@ -1652,19 -1297,14 +1652,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "salaista avainta ei löydy"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tätä ei voi tehdä eräajossa\n"
@@@ -1679,10 -1317,6 +1679,10 @@@ msgstr "Tätä komentoa ei sallita %s-t
msgid "Reset Code not or not anymore available\n"
msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Valintasi? "
@@@ -1749,148 -1369,115 +1749,149 @@@ msgstr "ei vastaavaa julkista avainta:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "päivitä valinnat"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "Valinnassa on luvaton merkki\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "Valinnassa on luvaton merkki\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "näytä sormenjälki"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Minkä kokoisen avaimen haluat? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
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:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "pyöristetty %u bittiin\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1898,155 -1485,120 +1899,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Valitse millaisen avaimen haluat:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (vain salaus)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Valinta ei kelpaa.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Valitse mitätöinnin syy:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "ohitetaan: salainen avain on jo paikalla\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "ulos tästä valikosta"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "näytä tämä ohje"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "Avain saatavilla kohteessa: "
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "muuta voimassoloaikaa"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "muuta luottamusastetta"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "näytä sormenjälki"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "luo uusi avainpari"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "ristiriitainen komento\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
@@@ -2054,28 -1605,19 +2055,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "virhe luettaessa avainlohkoa: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
@@@ -2132,7 -1663,6 +2133,7 @@@ msgstr "julkiselle avaimelle \"%s\" lö
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
@@@ -2152,7 -1679,6 +2153,7 @@@ msgstr "käytetään salakirjoitusalgor
msgid "'%s' already compressed\n"
msgstr "\"%s\" on jo pakattu\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2170,7 -1694,6 +2171,7 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2187,17 -1708,14 +2188,17 @@@ msgstr "valittu symmetrinen salain %s (
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s salattua dataa\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "salattu tuntemattomalla algoritmilla %d\n"
@@@ -2270,345 -1775,280 +2271,359 @@@ 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:78
++#: g10/export.c:102
#, 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:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "salaista avainta ei voi käyttää"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ohitettu: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
++#: g10/export.c:1660
+ #, 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:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "VAROITUS: mitään ei viety\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[Käyttäjätunnusta ei löytynyt]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "virhe luotaessa \"%s\": %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "näytä sormenjälki"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "tee erillinen allekirjoitus"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "salaa tiedot"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "salaa vain symmetrisellä salaimella"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "avaa tiedot (oletus)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "tarkista allekirjoitus"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "näytä avaimet"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "näytä avaimet allekirjoituksineen"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "tarkista avainten allekirjoitukset"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "näytä avaimet sormenjälkineen"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "näytä salaiset avaimet"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "luo uusi avainpari"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "luo uusi avainpari"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "luo mitätöintivarmenne"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "poista avaimet julkisten avainten renkaasta"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "poista avaimet salaisten avainten renkaasta"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "allekirjoita avain"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "allekirjoita tai muokkaa avainta"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "muuta salasanaa"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "vie avaimia"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "vie avaimia palvelimelle"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "nouda avaimia avainpalvelimelta"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "etsi avaimia avainpalvelimelta"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "päivitä kaikki avaimet avainpalvelimelta"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "nouda/liitä avaimia"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "päivitä luottamustietokanta"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "tuota ascii-koodattu tuloste"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NIMI|salaa vastaanottajalle NIMI"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "käytä tekstimuotoa"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "älä tee muutoksia"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "kysy ennen ylikirjoittamista"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2617,7 -2057,6 +2632,7 @@@ msgstr "
"(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
"sivuilta)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2636,13 -2075,11 +2651,13 @@@ msgstr "
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2657,7 -2094,6 +2672,7 @@@ msgstr "
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2665,601 -2101,476 +2680,606 @@@ msgstr "
"\n"
"Tuetut algoritmit:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "JulkAvain: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Salaus: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Tiiviste: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Pakkaus: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "käyttö: gpg [valitsimet] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "poista avain käytöstä"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "virheelliset tuontivalitsimet\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [tiedostonimi]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [tiedostonimi]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [tiedostonimi]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--allekirjoita [tiedostonimi]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [tiedostonimi]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [tiedostonimi]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [tiedostonimi]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key käyttäjätunnus"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key käyttäjätunnus"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key käyttäjätunnus [komennot]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key käyttäjätunnus"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "virhe luotaessa salasanaa: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[tiedostonimi]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@@ -3304,328 -2607,264 +3324,330 @@@ msgstr "Ei ohjeita saatavilla
msgid "No help available for '%s'"
msgstr "Ei ohjetta aiheesta \"%s\""
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "päivitä luottamustietokanta"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "päivitä luottamustietokanta"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "näytä sormenjälki"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "salaista avainta ei voi käyttää"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "ohitetaan tyypin %d lohko\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "tähän mennessä käsitelty %lu avainta\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Kaikkiaan käsitelty: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ohitetaan uudet avaimet: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ilman käyttäjätunnuksia: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " tuotu: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " muuttamatonta: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " uusia käyttäjätunnuksia: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " uusia aliavaimia: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " uusia avainten mitätöintejä: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tuotuja salaisia avaimia: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " muuttamattomia salaisia avaimia: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ei tuotu: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " uusia allekirjoituksia: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " luettuja salaisia avaimia: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ohitetaan \"%s\": %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, 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:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "avain %08lX: uusi avain - ohitetaan\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "kirjoitetaan kohteeseen \"%s\"\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, 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:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "avain %08lX: \"%s\" ei muutoksia\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "avain %08lX: salainen avain tuotu\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "salaista avainta \"%s\" ei löydy: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3640,142 -2879,115 +3662,142 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, fuzzy, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "avain %08lX: käyttäjätunnus ohitettu '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "avain %08lX: aliavain ohitettu\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
@@@ -3812,49 -3018,40 +3834,49 @@@ msgstr "virhe luotaessa \"%s\": %s\n
msgid "error opening key DB: %s\n"
msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[mitätöinti]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[oma-allekirjoitus]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, fuzzy, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
- #: g10/keyedit.c:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "ohitetaan \"%s\": %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3862,7 -3059,6 +3884,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3870,21 -3066,18 +3892,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d väärää allekirjoitusta\n"
msgstr[1] "%d väärää allekirjoitusta\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Allekirjoitus täsmää lähettäjään \""
msgstr[1] "Allekirjoitus täsmää lähettäjään \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3897,68 -3090,53 +3919,68 @@@ msgstr "
"lähteistä...)?\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Luotan osittain\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Luotan täysin\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Allekirjoittaminen ei onnistu.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3967,13 -3145,11 +3989,13 @@@ msgstr "
"Oma-allekirjoitus kohteessa \"%s\"\n"
"on PGP 2.x -muodon allekirjoitus.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3982,11 -3158,9 +4004,11 @@@ msgstr "
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on vanhentunut.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3995,44 -3169,35 +4017,44 @@@ msgstr "
"Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
"on paikallinen allekirjoitus.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, 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:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Tämä avain on vanhentunut!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Avain vanhenee %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4041,32 -3206,26 +4063,32 @@@ msgstr "
"Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
"Jos et tiedä vastausta, syötä \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) En vastaa.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) En ole tarkistanut lainkaan.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Olen suorittanut arkisen tarkistuksen.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4075,265 -3234,211 +4097,265 @@@ msgstr "
"Haluatko varmasti allekirjoittaa tämän avaimen\n"
"omalla avaimellasi: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Tämä tulee olemaan oma-allekirjoitus.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
#, 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:1551
++#: g10/keyedit.c:1554
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"En ole tarkistanut tätä avainta lainkaan.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Olen tarkistanut avaimen arkisesti.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Olen tarkistanut avaimen erittäin huolellisesti.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Varmastiko allekirjoita? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "tallenna ja lopeta"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "näytä sormenjälki"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Allekirjoitusnotaatio: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "näytä avaimet ja käyttäjätunnukset"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "valitse käyttäjätunnus N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "valitse käyttäjätunnus N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "mitätöi allekirjoitus"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "allekirjoita avain paikallisesti"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "lisää käyttäjätunnus"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "lisää valokuva"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "poista käyttäjätunnus"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "poista toissijainen avain"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "lisää mitätöintiavain"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
#, fuzzy
msgid "change the expiration date for the key or selected subkeys"
msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "merkitse käyttäjätunnus ensisijaiseksi"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "näytä valinnat (asiantuntija)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "näytä valinnat (monisanaisesti)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "muuta salasanaa"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "muuta luottamusastetta"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "mitätöi käyttäjätunnus"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "mitätöi toissijainen avain"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "ota avain käyttöön"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "poista avain käytöstä"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "näytä valokuvatunniste"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Salainen avain on saatavilla.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Tähän tarvitaan salainen avain.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4341,273 -3446,220 +4363,279 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Avain on mitätöity."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "tuntematon allekirjoitusluokka"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
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:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Varmastiko poista tämä käyttäjätunnus? "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Sinun täytyy valita ainakin yksi avain.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Sinun täytyy valita ainakin yksi avain.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Haluatko varmasti poistaa valitut avaimet? "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Haluatko varmasti poistaa tämän avaimen? "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, 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:2571
++#: g10/keyedit.c:2574
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
#, 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:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "näytä valinnat"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, 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:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Varmastiko päivitä valinnat? "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Tallenna muutokset? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Lopeta tallentamatta muutoksia?"
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "päivitys epäonnistui: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Avaimen luonti epäonnistui: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "virhe: sormenjälki on väärä\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "arvo ei kelpaa\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Käyttäjätunnusta ei löydy.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Tiiviste: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Ominaisuudet: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Notaatio: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (luottamuksellinen)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "ei voida luoda kohdetta %s: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[mitätöity] "
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [vanhenee: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [vanhenee: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " luottamus: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " luottamus: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Tämä avain on poistettu käytöstä"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4615,19 -3667,14 +4643,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[mitätöity] "
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4635,17 -3682,14 +4663,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4654,35 -3698,27 +4682,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4690,38 -3726,31 +4718,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d allekirjoitus poistettu.\n"
msgstr[1] "%d allekirjoitus poistettu.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Mitään ei poistettu.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
#, fuzzy
msgid "invalid"
msgstr "virheellinen ascii-koodaus"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Käyttäjätunnus \"%s\" on mitätöity."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, 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:4398
++#: g10/keyedit.c:4505
#, 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:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4731,39 -3760,31 +4759,39 @@@ msgstr "
"voi\n"
" saada jotkin PGP:n versiot hylkäämään avaimen.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
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:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
#, 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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4771,164 -3792,134 +4799,169 @@@
msgstr ""
"Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Valitse tasan yksi käyttäjätunnus!\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, 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:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Haluatko varmasti käyttää sitä (k/E)? "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ylikirjoita (k/E)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, 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:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "käyttäjätunnus: \""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, 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:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (vientiin kelpaamaton)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Tämä allekirjoitus vanheni %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " %08lX allekirjoitti tämän %s%s\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (vientiin kelpaamaton)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, 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:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "salainen avain ei ole saatavilla\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, 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:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, 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:6291
++#: g10/keyedit.c:6432
#, 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:6388
++#: g10/keyedit.c:6529
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5382,13 -4295,10 +5415,13 @@@ msgstr "
"alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
"paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Avaimen luonti epäonnistui: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5396,66 -4306,53 +5429,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" on jo pakattu\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
msgid "creating anyway\n"
msgstr "luo uusi avainpari"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Avaimen luonti keskeytetty.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "HUOM: salainen avain %08lX vanheni %s\n"
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5464,7 -4361,6 +5497,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5472,7 -4368,6 +5505,7 @@@ msgstr "
"avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5480,51 -4375,40 +5513,51 @@@ msgstr "
"avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
"kellon kanssa on ongelmia)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, 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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Haluatko varmasti luoda? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "ei koskaan"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kriittinen allekirjoituskäytäntö: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Allekirjoituskäytäntö: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kriittinen allekirjoitusnotaatio: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Allekirjoitusnotaatio: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5532,7 -4416,6 +5565,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d väärää allekirjoitusta\n"
msgstr[1] "%d väärää allekirjoitusta\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5540,46 -4423,33 +5573,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
msgstr[1] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Avainrengas"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Ensisijaisen avaimen sormenjälki:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Ensisijaisen avaimen sormenjälki:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Aliavaimen sormenjälki:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " Avaimen sormenjälki ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5644,304 -4502,247 +5672,309 @@@ msgstr "annettu allekirjoituskäytänn�
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "avainta \"%s\" ei löydy: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "ohitetaan \"%s\": %s\n"
+
++#: g10/keyserver.c:1823
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"allekirjoitettu avaimellasi %08lX %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "pyydetään avainta %08lX kohteesta %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s-salattu istuntoavain\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "salattu tuntemattomalla algoritmilla %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "julkinen avain on %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " aka \""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "salattu %s-avaimella, tunnus %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "julkisen avaimen avaus epäonnistui: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "salattu %lu salasanalla\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "salattu yhdellä salasanalla\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "oletettavasti %s-salattua dataa\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "avaus onnistui\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROITUS: salattua viestiä on muokattu!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
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:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Vanhentunut allekirjoitus lähettäjältä \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Allekirjoitus täsmää lähettäjään \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "allekirjoituksen varmistus vaiennetaan\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "näitä allekirjoituksia ei voi käsitellä\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " aka \""
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Avain saatavilla kohteessa: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[ei tiedossa]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " aka \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Allekirjoitus vanheni %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, 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:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binääri"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "teksti"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "tuntematon "
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "tuntematon julkisen avaimen algoritmi"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "allekirjoitus ei ole erillinen\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
@@@ -6122,7 -4889,6 +6155,7 @@@ msgstr "julkisen avaimen algorimin %d k
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@@ -6498,46 -5196,37 +6531,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ohitettu: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6545,37 -5234,29 +6578,37 @@@ msgstr "
"\n"
"Syötä käyttäjätunnus. Lopeta tyhjällä rivillä: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Käyttäjätunnusta ei löydy.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Julkinen avain on poistettu käytöstä\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "ohitettu: julkinen avain on jo asetettu\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "ei kelvollisia vastaanottajia\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@@ -6585,29 -5265,23 +6618,29 @@@ msgid "data not saved; use option \"--o
msgstr ""
"dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Erillinen allekirjoitus.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Anna datatiedoston nimi: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "luetaan vakiosyötettä ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "ei allekirjoitettua dataa\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
@@@ -6858,7 -5487,6 +6891,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
msgstr[1] "julkinen avain %08lX on %lu sekuntia uudempi kuin allekirjoitus\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6934,23 -5553,19 +6967,23 @@@ msgstr "
"VAROITUS: käytäntö-url:n %%-laajennus ei onnistu (liian suuri). \n"
"Käytetään laajentamatonta.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, 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:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "allekirjoitetaan:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "käytetään %s-salausta\n"
@@@ -7030,133 -5631,106 +7063,133 @@@ msgstr "lukuvirhe: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronointi epäonnistui: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "trustdb-tapahtuma on liian suuri\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: hakemistoa ei ole olemassa!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: versiotietueen luonti epäonnistui: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: luotu trustdb ei kelpaa\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trustdb luotu\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb ei kelpaa\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek epäonnistui: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ei ole trustdb-tiedosto\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versiotietue tietuenumerolla %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: tiedostoversio %d ei kelpaa\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: trustdb luotu\n"
@@@ -7516,7 -6028,6 +7549,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "trustdb:n tarkistusta ei tarvita\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "seuraava trustdb tarkistus %s\n"
@@@ -7531,7 -6040,6 +7564,7 @@@ msgstr "trustdb:n tarkistusta ei tarvit
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "trustdb:n tarkistusta ei tarvita\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "julkista avainta %08lX ei löydy: %s\n"
@@@ -7544,14 -6050,12 +7577,14 @@@ msgstr "tee --check-trustdb, kiitos\n
msgid "checking the trustdb\n"
msgstr "tarkistetaan trustdb:tä\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "tähän mennessä käsitelty %lu avainta\n"
msgstr[1] "tähän mennessä käsitelty %lu avainta\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7559,22 -6063,18 +7592,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
msgstr[1] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@@ -8038,27 -6443,22 +8071,27 @@@ msgstr "ristiriitainen komento\n
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8068,7 -6467,6 +8101,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@@ -9944,8 -7955,6 +9977,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "käyttö: gpg [valitsimet] "
@@@ -9956,12 -7964,10 +9989,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@@ -10456,77 -8360,61 +10489,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "avainlohkojen poisto epäonnistui: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10666,7 -8524,6 +10699,7 @@@ msgstr "tuntematon oletusvastaanottaja
msgid "sending line failed: %s\n"
msgstr "allekirjoitus epäonnistui: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@@ -10919,16 -8715,13 +10952,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "julkista avainta ei löydy"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
diff --cc po/fr.po
index f074bea,c4b6e4d..44e6481
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, c-format
msgid "can't open '%s': %s\n"
msgstr "impossible d'ouvrir « %s » : %s\n"
@@@ -411,10 -325,6 +411,10 @@@ msgstr "exécuter en mode démon (arri�
msgid "run in server mode (foreground)"
msgstr "exécuter en mode serveur (premier plan)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "bavard"
@@@ -517,11 -402,6 +517,11 @@@ msgstr "activer la prise en charge de p
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
@@@ -539,51 -417,34 +539,51 @@@ msgstr "
"Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
"Gestionnaire de clefs secrètes pour @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, c-format
msgid "option file '%s': %s\n"
msgstr "fichier d'options « %s » : %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, c-format
msgid "reading options from '%s'\n"
msgstr "lecture des options de « %s »\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Remarque : « %s » n'est pas considéré comme une option\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "impossible de créer la socket : %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "le nom de la socket « %s » est trop long\n"
@@@ -594,28 -454,22 +594,28 @@@ msgstr "
"une instance de gpg-agent fonctionne déjà —\n"
"pas de démarrage d'une nouvelle instance\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "erreur de lecture du « nonce » de la socket\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erreur de lien de la socket à « %s » : %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "échec de listen() : %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, c-format
msgid "listening on socket '%s'\n"
msgstr "écoute sur la socket « %s »\n"
@@@ -642,7 -490,6 +642,7 @@@ msgstr "échec de stat() pour « %s �
msgid "can't use '%s' as home directory\n"
msgstr "impossible d'utiliser « %s » comme répertoire personnel\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erreur de lecture du « nonce » sur le descripteur %d : %s\n"
@@@ -667,18 -510,14 +667,18 @@@ msgstr "gestionnaire SSH 0x%lx pour le
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "gestionnaire SSH 0x%lx pour le descripteur %d terminé\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "échec de npth_pselect : %s — attente 1 s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s arrêté\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr ""
"aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
@@@ -696,8 -533,6 +696,8 @@@ msgstr "
"Syntaxe : gpg-preset-passphrase [options] KEYGRIP\n"
"Maintenance du cache des mots de passe\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -705,9 -540,6 +705,9 @@@ msgstr "
"@Commandes :\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -955,30 -744,23 +955,30 @@@ msgstr "erreur de création d'un tube
msgid "error creating a stream for a pipe: %s\n"
msgstr "erreur de création d'un flux pour un tube : %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "erreur de création de processus fils : %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "échec d'attente de fin du processus %d : %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, 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:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "erreur d'exécution de « %s » : code de retour %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, c-format
msgid "error running '%s': terminated\n"
msgstr "erreur d'exécution de « %s » : terminé\n"
@@@ -993,28 -773,22 +993,28 @@@ msgstr "erreur de lecture du code de re
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "échec d'attente de fin du processus %d : %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "impossible de se connecter à « %s » : %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "problème de communication avec gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "annulé par l'utilisateur\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "problème avec l'agent\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
#| msgid "problem with the agent: %s\n"
msgid "problem with the agent (unexpected response \"%s\")\n"
@@@ -1090,7 -849,6 +1090,7 @@@ msgstr "hors limite de la mémoire séc
msgid "out of core while allocating %lu bytes"
msgstr "hors limite lors de l'allocation de %lu octets"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 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"
@@@ -1329,7 -1033,6 +1329,7 @@@ msgstr "Pas d'aide disponible pour «
msgid "ignoring garbage line"
msgstr "ligne inutile ignorée"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[aucun]"
@@@ -1457,92 -1133,72 +1457,92 @@@ msgstr "verrou « %s » non effectif�
msgid "waiting for lock %s...\n"
msgstr "attente du verrou %s…\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armure : %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "en-tête d'armure incorrect : "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "en-tête d'armure : "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "en-tête de signature en texte clair incorrect\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "en-tête d'armure inconnu : "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "signatures en texte clair imbriquées\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "armure inattendue : "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "ligne protégée par « - » incorrecte : "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caractère %02X incorrect en radix64, ignoré\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "fin de fichier prématurée (pas de CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "fin de fichier prématurée (dans le CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "CRC mal défini\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "erreur de CRC ; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "fin de fichier prématurée (dans le pied)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "erreur dans la ligne de pied\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "aucune donnée OpenPGP valable n'a été trouvée.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, 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:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1550,25 -1206,20 +1550,25 @@@ 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:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1578,7 -1229,6 +1578,7 @@@ 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:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "Attention : des données de notation incorrectes ont été trouvées.\n"
@@@ -1608,19 -1253,14 +1608,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "Attention : "
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "la carte OpenPGP n'est pas disponible : %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "carte OpenPGP nº %s détectée\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "impossible de faire cela en mode automatique\n"
@@@ -1632,10 -1270,6 +1632,10 @@@ msgstr "Cette commande n'est disponibl
msgid "Reset Code not or not anymore available\n"
msgstr "le code de réinitialisation n'est plus disponible\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Quel est votre choix ? "
@@@ -1697,88 -1317,67 +1697,89 @@@ 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: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "erreur d'écriture de « %s » : %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Données d'identification (nom du compte) : "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
"Erreur : données d'identification trop longues (limitées à\n"
"%d caractères).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Données DO privées : "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Erreur : DO privé trop long (limité à %d caractères).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Préférences de langue : "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Erreur : taille incorrecte de la chaîne de préférences.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Erreur : caractères incorrects dans la chaîne de préférences.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Sexe ((M)asculin, (F)éminin ou espace) : "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Erreur : réponse incorrecte.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "empreinte de l'autorité de certification : "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Erreur : formatage incorrect de l'empreinte.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "opération sur la clef impossible : %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "ce n'est pas une carte OpenPGP"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr ""
"erreur de lecture des renseignements actuellement contenus\n"
"dans la clef : %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Faut-il remplacer la clef existante ? (o/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1788,58 -1387,46 +1789,58 @@@ msgstr "
" En cas d'échec de génération de la clef, veuillez vérifier les\n"
" tailles permises dans la documentation de la carte.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Quelle taille de clef désirez-vous pour la clef de signature ? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Quelle taille de clef désirez-vous pour la clef de chiffrement ? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr ""
"Quelle taille de clef désirez-vous pour la clef d'authentification ? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrondie à %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "les tailles de clefs %s doivent être dans l'intervalle %u-%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"La carte sera maintenant reconfigurée pour générer une clef de %u bits\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "erreur de modification de taille de clef %d en %u bits : %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
"Faut-il faire une sauvegarde hors carte de la clef de chiffrement ? (O/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
msgid "Note: keys are already stored on the card!\n"
msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "Faut-il remplacer les clefs existantes ? (o/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1850,146 -1437,111 +1851,146 @@@ msgstr "
" code personnel = « %s » code personnel d'admin. = « %s ».\n"
"Vous devriez les modifier avec la commande --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Veuillez sélectionner le type de clef à générer :\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Clef de signature\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Clef de chiffrement\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) Clef d'authentification\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Choix incorrect.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Veuillez sélectionner l'endroit où stocker la clef :\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "échec de KEYTOCARD : %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Cette commande n'est pas permise en mode %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
#| msgid "Note: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Remarque : les clefs sont déjà stockées sur la carte.\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
#| msgid "Continue? (Y/n) "
msgid "Continue? (y/N) "
msgstr "Faut-il continuer ? (O/n) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "quitter ce menu"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "afficher les commandes d'administration"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "afficher cette aide"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "afficher toutes les données disponibles"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "modifier le nom du détenteur de la carte"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "modifier l'URL pour récupérer la clef"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "récupérer la clef indiquée dans l'URL de la carte"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "modifier l'identifiant de connexion"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "modifier les préférences de langue"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "modifier le sexe du détenteur de la carte"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "modifier une empreinte d'autorité de certification"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
"inverser le paramètre obligeant à entrer le code personnel pour les\n"
"signatures"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "générer de nouvelles clefs"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "menu pour modifier ou déverrouiller le code personnel"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "vérifier le code personnel et afficher toutes les données"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "débloquer le code personnel en utilisant un code de réinitialisation"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/carte> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "La commande n'est utilisable qu'en mode administration\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Les commandes d'administration sont permises\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
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:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Commande incorrecte (essayez « help »)\n"
@@@ -1997,27 -1548,18 +1998,27 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output n'est pas compatible avec cette commande\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "impossible d'ouvrir « %s »\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "clef « %s » introuvable : %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2071,7 -1602,6 +2072,7 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"utiliser d'abord l'option « --delete-secret-keys » pour la supprimer.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erreur de création de la phrase secrète : %s\n"
@@@ -2090,7 -1617,6 +2091,7 @@@ msgstr "utilisation de l'algorithme de
msgid "'%s' already compressed\n"
msgstr "« %s » est déjà compressé\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "Attention : « %s » est un fichier vide\n"
@@@ -2108,7 -1632,6 +2109,7 @@@ msgstr "
"Attention : forcer le chiffrement symétrique %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2129,17 -1650,14 +2130,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s chiffré pour : « %s »\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "données chiffrées avec %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "chiffré avec l'algorithme inconnu %d\n"
@@@ -2214,324 -1719,258 +2215,337 @@@ msgstr "
"Attention : impossible de supprimer le répertoire temporaire « %s » :\n"
" %s\n"
- #: g10/export.c:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "exporter les signatures marquées comme locales seulement"
- #: g10/export.c:80
++#: g10/export.c:104
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:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "exporter les clefs de révocation marquées comme « sensibles »"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "supprimer les parties inutilisables de la clef pendant l'exportation"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr "supprimer autant que possible de la clef pendant l'exportation"
- #: g10/export.c:1144
++#: g10/export.c:1204
msgid " - skipped"
msgstr " — ignoré"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, c-format
+ msgid "writing to '%s'\n"
+ msgstr "écriture de « %s »\n"
+
++#: g10/export.c:1660
+ #, 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:1846
msgid "exporting secret keys not allowed\n"
msgstr "il est interdit d'exporter les clefs secrètes\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "Attention : rien n'a été exporté\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "erreur de création de « %s » : %s\n"
- #: g10/getkey.c:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[identité introuvable]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, 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:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, 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:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "« %s » automatiquement récupéré par %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, 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:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "Aucune empreinte"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "clef secrète « %s » introuvable : %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "faire une signature"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "faire une signature en texte clair"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "faire une signature détachée"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "chiffrer les données"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "chiffrement symétrique seulement"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "déchiffrer les données (défaut)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "vérifier une signature"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "afficher les clefs"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "afficher les clefs et les signatures"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "afficher et vérifier les signatures de clefs"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "afficher les clefs et les empreintes"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "afficher les clefs secrètes"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "générer une nouvelle paire de clefs"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
msgid "quickly generate a new key pair"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly add a new user-id"
msgstr "générer rapidement une nouvelle paire de clefs"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "quickly generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "générer rapidement une nouvelle paire de clefs"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr "générer une paire de clefs complètes"
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "générer un certificat de révocation"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "supprimer les clefs du porte-clefs public"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "supprimer les clefs du porte-clefs secret"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
msgid "quickly sign a key"
msgstr "signer rapidement une clef"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
msgid "quickly sign a key locally"
msgstr "signer rapidement une clef localement"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "signer une clef"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "signer une clef localement"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "signer ou éditer une clef"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "modifier une phrase secrète"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "exporter les clefs"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "exporter les clefs vers un serveur de clefs"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importer les clefs d'un serveur de clefs"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "chercher les clefs avec un serveur de clefs"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "mettre à jour les clefs depuis un serveur"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importer ou fusionner les clefs"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "afficher l'état de la carte"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "modifier les données d'une carte"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "modifier le code personnel d'une carte"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "mettre la base de confiance à jour"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "indiquer les fonctions de hachage"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "exécuter en mode serveur"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 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:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|niveau de compression N (0 désactive)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "utiliser le mode texte canonique"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FICHIER|écrire la sortie dans le FICHIER"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "ne rien modifier"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "demander avant d'écraser un fichier"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "utiliser le comportement strict d'OpenPGP"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2540,7 -1979,6 +2554,7 @@@ msgstr "
"(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
"et options)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2560,11 -1998,9 +2574,11 @@@ msgstr "
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2574,7 -2010,6 +2588,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:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2582,86 -2017,71 +2596,86 @@@ msgstr "
"\n"
"Algorithmes pris en charge :\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Clef publique : "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Chiffrement : "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hachage : "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compression : "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "utilisation : %s [options] %s\n"
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2669,21 -2089,18 +2683,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:1554
#, 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:1560
#, 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:1563
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2691,502 -2108,396 +2705,508 @@@ 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:1566
#, 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:1773
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "élément de configuration « %s » inconnu\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr "montrer les photos d'identité en affichant les clefs"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
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:1884
msgid "show policy URLs during signature listings"
msgstr "montrer les URL de politique en affichant les signatures"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "montrer toutes les notations en affichant les signatures"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
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:1892
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:1894
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:1896
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:1898
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:1900
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:1902
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:1904
msgid "show expiration dates during signature listings"
msgstr "montrer les dates d'expiration en affichant les signatures"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Clefs disponibles :\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
#| msgid "unknown command '%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "commande « %s » inconnue\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt est trop ancienne (nécessaire : %s, utilisé : %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "mode pinentry « %s » incorrect\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "impossible d'analyser l'URL du serveur de clefs\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s : %d : options d'importation incorrectes\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "options d'importation incorrectes\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "options de liste incorrectes\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s : %d : options d'exportation incorrectes\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "options d'exportation incorrectes\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s : %d : options de liste incorrectes\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "montrer les photos d'identité en vérifiant les signatures"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "montrer les URL de politique en vérifiant les signatures"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "montrer toutes les notations en vérifiant les signatures"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
"utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
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:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "indiquer la validité de l'identité en vérifiant les signatures"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
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:3068
++#: g10/gpg.c:3122
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:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "valider les signatures avec les données PKA"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
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:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s : %d : options de vérification incorrectes\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "options de vérification incorrectes\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, 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:3276
++#: g10/gpg.c:3330
#, 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:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "liste de recherche automatique de clef incorrecte\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Attention : %s remplace %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s.\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s.\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "Attention : exécution avec un système de temps contrefait : "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage sélectionnée est incorrecte\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de compression sélectionné est incorrect\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "« completes-needed » doit être supérieur à 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "« marginals-needed » doit être supérieur à 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "préférences par défaut incorrectes\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "préférences personnelles de chiffrement incorrectes\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "préférences personnelles de hachage incorrectes\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "préférences personnelles de compression incorrectes\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne fonctionne pas encore avec %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance : %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [fichier]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [fichier]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "échec du chiffrement symétrique de « %s » : %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [fichier]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [fichier]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
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:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [fichier]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [fichier]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [fichier]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
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:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [fichier]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [fichier]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [fichier]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key identité"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key identité"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key identité [commandes]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd <identité>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "échec d'envoi vers le serveur de clefs : %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "échec de réception depuis le serveur de clefs : %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "échec d'exportation de la clef : %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "échec de recherche au sein du serveur de clefs : %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "échec de déconstruction d'une armure : %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "échec de construction d'une armure : %s \n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "algorithme de hachage « %s » incorrect\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, 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:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[fichier]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message…\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donnée est incorrecte\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donnée est incorrecte\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
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"
@@@ -3227,128 -2530,110 +3247,138 @@@ msgstr "Pas d'aide disponible
msgid "No help available for '%s'"
msgstr "Pas d'aide disponible pour « %s »"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "importer des signatures marquées comme locales seulement"
- #: g10/import.c:107
++#: g10/import.c:137
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:110
++#: g10/import.c:140
#, 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:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "ne pas mettre à jour la base de confiance après l'importation"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "afficher l'empreinte de la clef"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "n'accepter que les mises à jour des clefs existantes"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "nettoyer les parties inutilisables de la clef après l'importation"
- #: g10/import.c:122
++#: g10/import.c:155
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:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "un bloc de type %d a été ignoré\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu clefs traitées jusqu'à présent\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr " Quantité totale traitée : %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nouvelles clefs ignorées : %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sans identité : %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importées : %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modifiées : %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nouvelles identités : %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nouvelles sous-clefs : %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " nouvelles signatures : %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nouvelles révocations de clef : %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " clefs secrètes lues : %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " clefs secrètes importées : %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " clefs secrètes non modifiées : %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " non importées : %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signatures nettoyées : %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " identités nettoyées : %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3357,195 -2642,151 +3387,189 @@@ msgstr "
"Attention : la clef %s contient des préférences pour des\n"
" algorithmes indisponibles pour ces identités :\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, 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:866
++#: g10/import.c:1042
#, 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:878
++#: g10/import.c:1054
#, 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:891
++#: g10/import.c:1067
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:893
++#: g10/import.c:1069
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:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "clef %s : pas d'identité\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, c-format
msgid "key %s: %s\n"
msgstr "clef %s : %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr "rejetée par le filtre d’importation"
- #: g10/import.c:1019
++#: g10/import.c:1264
#, 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:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "clef %s : pas d'identité valable\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "cela pourrait provenir d'une autosignature manquante\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "clef %s : clef publique introuvable : %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "clef %s : nouvelle clef — ignorée\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, 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:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr "écriture de « %s »\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "erreur d'écriture du porte-clefs « %s » : %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "clef %s : clef publique « %s » importée\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "clef %s : ne correspond pas à notre copie\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "clef %s : « %s » 1 nouvelle identité\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "clef %s : « %s » %d nouvelles identités\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "clef %s : « %s » 1 nouvelle signature\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "clef %s : « %s » %d nouvelles signatures\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "clef %s : « %s » 1 nouvelle sous-clef\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "clef %s : « %s » %d nouvelles sous-clefs\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "clef %s : « %s » %d signature nettoyée\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "clef %s : « %s » %d signatures nettoyées\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "clef %s : « %s » %d identité nettoyée\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "clef %s : « %s » %d identités nettoyées\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "clef %s : « %s » n'est pas modifiée\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "clef %s : clef secrète importée\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, c-format
msgid "secret key %s: %s\n"
msgstr "clef secrète %s : %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "impossible d'importer des clefs secrètes\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3560,143 -2801,116 +3584,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "clef %s : « %s » certificat de révocation importé\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "clef %s : pas d'identité pour la signature\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "clef %s : algorithme à clef publique non pris en charge\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "clef %s : signature directe de clef incorrecte\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "clef %s : lien à la sous-clef incorrect\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "clef %s : suppression de lien multiple aux sous-clefs\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "clef %s : révocation de sous-clef incorrecte\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, 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:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "clef %s : identité « %s » ignorée\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "clef %s : sous-clef ignorée\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "clef %s : ajout du certificat de révocation « %s »\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "clef %s : ajout de la signature directe de clef\n"
@@@ -3732,45 -2940,37 +3756,45 @@@ msgstr "ressource de bloc de clef « %
msgid "error opening key DB: %s\n"
msgstr "erreur d'ouverture de « %s » : %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[révocation]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[autosignature]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "clef %s : algorithme à clef publique non pris en charge\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
#| msgid "Good signature from"
msgid " (reordered signatures follow)"
msgstr "Bonne signature de"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "key %s: %s\n"
msgid "key %s:\n"
msgstr "clef %s : %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "%d duplicate signature removed\n"
@@@ -3778,7 -2978,6 +3802,7 @@@ msgid_plural "%d duplicate signatures r
msgstr[0] "Identité « %s » : %d signature supprimée\n"
msgstr[1] "Identité « %s » : %d signature supprimée\n"
- #: g10/keyedit.c:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3786,7 -2985,6 +3810,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3794,7 -2992,6 +3818,7 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d mauvaises signatures\n"
msgstr[1] "%d mauvaises signatures\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
#| msgid "Good signature from"
msgid "%d signature reordered\n"
@@@ -3802,14 -2999,12 +3826,14 @@@ msgid_plural "%d signatures reordered\n
msgstr[0] "Bonne signature de"
msgstr[1] "Bonne signature de"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3820,17 -3015,14 +3844,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:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = je fais très légèrement confiance\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = je fais entièrement confiance\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3840,52 -3032,40 +3864,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:1018
++#: g10/keyedit.c:1021
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:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'identité « %s » est révoquée."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Voulez-vous vraiment toujours la signer ? (o/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Impossible de signer.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'identité « %s » est expiré."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'identité « %s » n'est pas autosignée."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'identité « %s » peut être signée. "
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Faut-il la signer ? (o/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3894,11 -3074,9 +3918,11 @@@ msgstr "
"L'autosignature de « %s »\n"
"est une signature de type PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3907,13 -3085,11 +3931,13 @@@ msgstr "
"Votre signature actuelle de « %s »\n"
"a expiré.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3922,43 -3098,34 +3946,43 @@@ msgstr "
"Votre signature actuelle de « %s »\n"
"est locale.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, 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:1350
++#: g10/keyedit.c:1353
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:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Rien à signer avec la clef %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Cette clef a expiré."
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Cette clef va expirer le %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3967,31 -3134,25 +3991,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:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Je ne répondrai pas.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, 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:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) J'ai partiellement vérifié.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
msgid "Your selection? (enter '?' for more information): "
msgstr "Quel est votre choix ? (Entrez « ? » pour plus de renseignements) : "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4000,229 -3161,175 +4024,229 @@@ msgstr "
"Voulez-vous vraiment signer cette clef avec votre\n"
"clef « %s » (%s)\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Ce sera une autosignature.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
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:1527
++#: g10/keyedit.c:1530
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:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "La signature sera marquée comme non exportable.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "La signature sera marquée comme non révocable.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
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:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "J'ai partiellement vérifié cette clef.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "J'ai complètement vérifié cette clef.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Voulez-vous vraiment signer ? (o/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "échec de la signature : %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
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:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "enregistrer et quitter"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "afficher l'empreinte de la clef"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Entrez le keygrip : "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "afficher la clef et les identités"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "sélectionner l'identité N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "sélectionner la sous-clef N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "vérifier les signatures"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
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:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "signer les identités sélectionnées localement"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
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:1878
++#: g10/keyedit.c:1881
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:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "ajouter une identité"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "ajouter une photo d'identité"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "supprimer les identités sélectionnées"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "ajouter une sous-clef"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "ajouter une clef à une carte à puce"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "déplacer une clef vers une carte à puce"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "déplacer une clef de sauvegarde vers une carte à puce"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "supprimer les sous-clefs sélectionnées"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "ajouter une clef de révocation"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "supprimer les signatures des identités sélectionnées"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
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:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "marquer l'identité sélectionnée comme principale"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "afficher les préférences (expert)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "afficher les préférences (bavard)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
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:1912
++#: g10/keyedit.c:1915
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:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "définir une notation pour les identités sélectionnées"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "modifier la phrase secrète"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "modifier la confiance du propriétaire"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "révoquer les signatures des identités sélectionnées"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "révoquer les identités sélectionnées"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "révoquer la clef ou des sous-clefs sélectionnées"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "activer la clef"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "désactiver la clef"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "montrer les photos d'identité sélectionnées"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
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:1936
++#: g10/keyedit.c:1939
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:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "La clef secrète est disponible.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "La clef secrète est nécessaire pour faire cela.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4234,257 -3341,204 +4258,263 @@@ msgstr "
" confiance (tsign), « nr » pour les signatures non révocables\n"
" (nrsign), ou toute combinaison possible (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "La clef est révoquée."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "Voulez-vous vraiment signer toutes les identités ? (o/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, 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:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Conseil : sélectionner les identités à signer\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Type de signature « %s » inconnu\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Vous devez sélectionner au moins une identité.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
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:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Vous devez sélectionner exactement une clef.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "La commande attend un nom de fichier comme argument\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Impossible d'ouvrir « %s » : %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Vous devez sélectionner au moins une clef.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
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:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "Voulez-vous vraiment supprimer cette clef ? (o/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
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:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "Voulez-vous vraiment révoquer cette identité ? (o/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
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:2571
++#: g10/keyedit.c:2574
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:2573
++#: g10/keyedit.c:2576
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:2631
++#: g10/keyedit.c:2634
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:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Définir la liste de préférences en :\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
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:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Faut-il vraiment mettre à jour les préférences ? (o/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Faut-il enregistrer les modifications ? (o/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Faut-il quitter sans enregistrer ? (o/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "échec de la mise à jour : %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
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:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Échec de génération de la clef : %s\n"
+
++#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "« %s » n’est pas une empreinte\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "« %s » n’est pas l’empreinte principale\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valeur incorrecte\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "No matching user IDs."
msgstr "Pas d’identités correspondantes."
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "Nothing to sign.\n"
msgstr "Rien à signer.\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Hachage : "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Fonctionnalités : "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Serveur de clefs sans modification"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Serveur de clefs favori : "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Notations : "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(sensible)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "créé : %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "révoquée : %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "expirée : %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "expire : %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "utilisation : %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "nº de carte : "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "confiance : %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "validité : %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Cette clef a été désactivée"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4492,17 -3546,12 +4522,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "révoquée"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "expirée"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4511,15 -3560,12 +4541,15 @@@ msgstr "
"commande\n"
" risque de rendre une autre identité principale par défaut.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
msgid "You may want to change its expiration date too.\n"
msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4528,36 -3574,28 +4558,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr "Cette identité existe déjà pour cette clef.\n"
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Supprimer cette bonne signature ? (o/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Supprimer cette signature inconnue ? (o/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4565,20 -3603,16 +4595,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d signature supprimée.\n"
msgstr[1] "%d signature supprimée.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Rien n'a été supprimé.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "incorrecte"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Identité « %s » compactée : %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4586,17 -3620,14 +4616,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:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Identité « %s » : déjà minimisée\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Identité « %s » : déjà nettoyée\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4605,43 -3636,35 +4635,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:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Entrez l'identité du révocateur désigné : "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
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:4632
++#: g10/keyedit.c:4739
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4651,160 -3674,130 +4681,165 @@@ msgid "
msgstr ""
"Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Modification de la date d'expiration d'une sous-clef.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Modification de la date d'expiration de la clef principale.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, 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:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Veuillez sélectionner exactement une identité.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "l'autosignature v3 de l'identité « %s » a été ignorée\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Entrez l'URL de votre serveur de clefs favori : "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Entrez la notation : "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "Faut-il continuer ? (o/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Pas d'identité d'indice %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Pas d'identité avec le hachage %s\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "Pas de sous-clef d'indice %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "identité : « %s »\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "signée par votre clef %s le %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Cette signature a expiré le %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "Non signée par vous.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (non révocable)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, 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:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "pas de clef secrète\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'identité « %s »\" est déjà révoquée.\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "La clef %s est déjà révoqué.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "La sous-clef %s est déjà révoquée.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5250,13 -4165,10 +5285,13 @@@ msgstr "
"pendant la génération de nombres premiers ; cela donne au générateur de\n"
"nombres aléatoires une meilleure chance d'obtenir suffisamment d'entropie.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Échec de génération de la clef : %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5267,64 -4179,51 +5302,64 @@@ msgstr "
" « %s »\n"
"\n"
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr "Faut-il continuer ? (O/n) "
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Une clef pour « %s » existe déjà\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
msgid "Create anyway? (y/N) "
msgstr "Faut-il quand même créer ? (o/N) "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
msgid "creating anyway\n"
msgstr "création quand même\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, 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:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "La génération de clef a été annulée.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, c-format
msgid "writing public key to '%s'\n"
msgstr "écriture de la clef publique dans « %s »\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, 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:4316
++#: g10/keygen.c:4323
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
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:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5333,7 -4232,6 +5368,7 @@@ msgstr "
"pouvez\n"
"utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5341,7 -4239,6 +5376,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:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5349,50 -4246,39 +5384,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:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
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:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Faut-il vraiment la créer ? (o/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "jamais "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politique de signature critique : "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politique de signature : "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Serveur de clefs critique favori : "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notation de signature critique : "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notation de signature : "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5400,7 -4286,6 +5435,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d mauvaises signatures\n"
msgstr[1] "%d mauvaises signatures\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5408,7 -4293,6 +5443,7 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signature non vérifiée à cause d'une erreur\n"
msgstr[1] "1 signature non vérifiée à cause d'une erreur\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, 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"
@@@ -5416,38 -4300,26 +5451,33 @@@ msgid_plural "Warning: %lu keys skippe
msgstr[0] "Attention : %lu clefs ignorées en raison de leur grande taille\n"
msgstr[1] "Attention : %lu clefs ignorées en raison de leur grande taille\n"
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Porte-clefs"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Empreinte de clef principale :"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Empreinte de la sous-clef :"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr "Empreinte clef princip. :"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Empreinte de sous-clef :"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Empreinte de la clef ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " Nº de série de carte ="
@@@ -5515,25 -4375,20 +5545,25 @@@ msgstr "
"respecter l'enregistrement PKA positionné sur une clef en récupérant les "
"clefs"
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "désactivée"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Entrez le ou les nombres, (S)uivant, ou (Q)uitter > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocole de serveur de clefs incorrect (nous %d!=gestionnaire %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "« %s » n'est pas un identifiant de clef : ignoré\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5541,271 -4396,219 +5571,276 @@@ 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "clef « %s » introuvable sur le serveur de clefs\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "clef introuvable sur le serveur de clefs\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "pas de serveur de clefs connu (utilisez l'option --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, 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:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "requête de la clef %s sur %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "pas d'action pour le serveur de clefs.\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "« %s » a été ignorée : %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "envoi de la clef %s à %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, c-format
msgid "requesting key from '%s'\n"
msgstr "requête de la clef sur « %s »\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "clef de session chiffrée %s\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, 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:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "la clef publique est %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
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:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " « %s »\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "chiffré avec une clef %s, identifiant %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "échec du déchiffrement par clef publique : %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "chiffré avec %lu phrases secrètes\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "chiffré avec 1 phrase secrète\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "les données sont supposées chiffrées avec %s\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
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:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "le déchiffrement a réussi\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Attention : le message chiffré a été manipulé.\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "échec du déchiffrement : %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "Remarque : l'expéditeur a demandé « à votre seule attention »\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nom de fichier original : « %.*s »\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "Attention : plusieurs textes en clair ont été vus\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "révocation autonome — utilisez « gpg --import » pour l'appliquer\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "aucune signature trouvée\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "MAUVAISE signature de « %s »"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature expirée de « %s »"
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "Bonne signature de « %s »"
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "vérification de signature supprimée\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "impossible de traiter ces données ambiguës de signature\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Signature faite le %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " avec la clef %s %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Clef disponible sur : "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[doute]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " alias « %s »"
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "La signature a expiré le %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "La signature expire le %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "signature %s, algorithme de hachage %s%s%s\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binaire"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "mode texte"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "inconnu"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
msgid ", key algorithm "
msgstr ", algorithme de clef "
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossible de vérifier la signature : %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "la signature n'est pas détachée\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "signature autonome de classe 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "signature d'un ancien type (PGP 2.x)\n"
@@@ -5988,7 -4757,6 +6023,7 @@@ 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:1631
++#: g10/parse-packet.c:1649
#, 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"
@@@ -6368,48 -5068,39 +6403,48 @@@ msgstr "
" Aucune certitude que la signature appartienne à son "
"propriétaire.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s : ignoré : %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s : ignoré : la clef publique est désactivée\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s : ignoré : clef publique déjà présente\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Destinataires actuels :\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6417,38 -5108,30 +6452,38 @@@ msgstr "
"\n"
"Entrez l'identité, en terminant par une ligne vide : "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Cette identité n'existe pas.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "La clef publique est désactivée.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "ignoré : clef publique déjà activée\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinataire par défaut « %s » inconnu\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "pas de destinataire valable\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, 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:1636
++#: g10/pkclist.c:1649
#, 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"
@@@ -6459,28 -5141,22 +6494,28 @@@ msgstr "
"les données ne sont pas enregistrées ; utilisez l'option « --output » pour\n"
"les enregistrer\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Signature détachée.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Entrez le nom du fichier de données : "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "lecture de l'entrée standard…\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "pas de données signées\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "impossible d'ouvrir les données signées « %s »\n"
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
#, 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"
@@@ -6759,7 -5390,6 +6794,7 @@@ msgstr[0] "
msgstr[1] ""
"la clef publique %s est plus récente de %lu seconde que la signature\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6843,12 -5464,10 +6878,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:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signature de : « %s »\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6856,11 -5475,9 +6891,11 @@@ msgstr "
"Attention : forcer l'algorithme de hachage %s (%d) est en\n"
" désaccord avec les préférences du destinataire\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "signature :"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "le chiffrement %s sera utilisé\n"
@@@ -6936,132 -5539,105 +6971,132 @@@ msgstr "erreur de lecture dans « %s
msgid "trustdb: sync failed: %s\n"
msgstr "base de confiance : échec de synchronisation : %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
msgstr "impossible de verrouiller « %s »\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, 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:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "transaction de base de confiance trop grande\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s : le répertoire n'existe pas.\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "impossible d'accéder à « %s » : %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s : impossible de créer un enregistrement de version : %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s : base de confiance incorrecte créée\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s : base de confiance créée\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
msgstr "Remarque : la base de confiance n'est pas accessible en écriture\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s : base de confiance incorrecte\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, 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:836
++#: g10/tdbio.c:842
#, 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:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s : erreur de lecture d'enregistrement de version : %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, 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:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de confiance : échec de lseek : %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "base de confiance : échec de lecture (n=%d) : %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, 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:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s : enregistrement de version avec le numéro %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s : version %d du fichier incorrecte\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s : erreur de lecture d'enregistrement libre : %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, 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:1764
++#: g10/tdbio.c:1768
#, 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:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s : impossible d'ajouter un enregistrement : %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "Erreur : la base de confiance est corrompue\n"
@@@ -7432,7 -5946,6 +7467,7 @@@ msgstr "utilisation du modèle de confi
msgid "no need for a trustdb check\n"
msgstr "inutile de vérifier la base de confiance\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, 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"
@@@ -7451,7 -5962,6 +7486,7 @@@ msgstr "
"inutile de mettre à jour la base de confiance avec le modèle de\n"
" confiance « %s »\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "clef publique %s introuvable : %s\n"
@@@ -7464,7 -5972,6 +7499,7 @@@ msgstr "veuillez faire un --check-trust
msgid "checking the trustdb\n"
msgstr "vérification de la base de confiance\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7472,7 -5979,6 +7507,7 @@@ msgid_plural "%d keys processed
msgstr[0] "%lu clefs traitées jusqu'à présent\n"
msgstr[1] "%lu clefs traitées jusqu'à présent\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7480,16 -5986,13 +7515,16 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
msgstr[1] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "aucune clef de confiance ultime n'a été trouvée\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "la clef publique de la clef de confiance ultime %s est introuvable\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7497,7 -6000,6 +7532,7 @@@ msgstr "
"profondeur : %d valables : %3d signées : %3d\n"
" confiance : %d i., %d n.d., %d j., %d m., %d t., %d u.\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7974,11 -6381,9 +8009,11 @@@ msgstr "refus d'utiliser les commandes
msgid "use variable length input for pinpad"
msgstr "utiliser une entrée de taille variable pour le pavé numérique"
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Utilisation : @SCDAEMON@ [options] (-h pour l'aide)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7986,18 -6391,15 +8021,18 @@@ msgstr "
"Syntaxe : scdaemon [options] [commande [arguments]]\n"
"Démon de carte à puce pour @GNUPG@\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
"en arrière-plan\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "gestionnaire pour le descripteur %d démarré\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "gestionnaire pour le descripteur %d terminé\n"
@@@ -8007,7 -6408,6 +8042,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "caractère %02x incorrect en radix64, ignoré\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
#| msgid "no gpg-agent running in this session\n"
msgid "no dirmngr running in this session\n"
@@@ -9897,8 -7910,6 +9932,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "les niveaux de débogage possibles sont : %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, c-format
msgid "usage: %s [options] "
msgstr "utilisation : %s [options] "
@@@ -9907,13 -7917,11 +9942,13 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "les deux-points ne sont pas permis dans le nom de socket\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr ""
"échec de récupération de liste de révocations de certificat sur « %s » : %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr ""
@@@ -10393,76 -8299,60 +10428,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:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "échec d'assuan_inquire(%s) : %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr "ldapserver manquant"
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr "serialno manquant dans l'identifiant de certificat"
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "échec d'assuan_inquire : %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "échec de fetch_cert_by_url : %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, c-format
msgid "error sending data: %s\n"
msgstr "erreur d'envoi de données : %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "échec de start_cert_fetch : %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "échec de fetch_next_cert : %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d dépassé\n"
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossible d'allouer une structure de contrôle : %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "échec d'allocation du contexte Assuan : %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "impossible d'initialiser le serveur : %s\n"
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "problème d'accept_assuan : %s\n"
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "problème de traitement Assuan : %s\n"
@@@ -10602,7 -8462,6 +10637,7 @@@ msgstr "commande « %s » inconnue\n
msgid "sending line failed: %s\n"
msgstr "échec d'envoi de ligne : %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "erreur d'envoi d'options standards : %s\n"
@@@ -10855,15 -8653,12 +10890,15 @@@ msgstr "
"Syntaxe : @GPGCONF@ [options]\n"
"Gérer les options de configuration pour les outils du système @GNUPG@\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Un argument de composant nécessaire"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Composant introuvable"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "Aucun argument permis"
diff --cc po/gl.po
index 632f720,c8c5a26..948cf41
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -403,10 -317,6 +403,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "lareto"
@@@ -515,11 -400,6 +515,11 @@@ msgstr "non est� soportado
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@@ -537,55 -415,38 +537,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "ficheiro de opci�ns `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "lendo as opci�ns de `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "non foi posible crear %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, fuzzy, c-format
msgid "socket name '%s' is too long\n"
msgstr "Revocaci�n de certificado v�lida"
@@@ -595,28 -455,22 +595,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "gravando a chave secreta en `%s'\n"
@@@ -644,7 -492,6 +644,7 @@@ msgstr "base de datos de confianza: fal
msgid "can't use '%s' as home directory\n"
msgstr "%s: non foi posible crear un directorio: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro lendo `%s': %s\n"
@@@ -669,18 -512,14 +669,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "o segredo da actualizaci�n fallou: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "\t%lu chaves omitidas\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
@@@ -696,8 -533,6 +696,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -705,9 -540,6 +705,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -944,29 -733,22 +944,29 @@@ msgstr "erro ao crea-lo contrasinal: %s
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "erro lendo `%s': %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "erro lendo `%s': %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "erro lendo `%s': %s\n"
@@@ -981,32 -761,26 +981,32 @@@ msgstr "erro escribindo no chaveiro sec
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "non se puido conectar a `%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "problema de comunicaci�n con gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "cancelado polo usuario\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
@@@ -1082,7 -841,6 +1082,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
@@@ -1348,7 -1052,6 +1348,7 @@@ msgstr "Non hai axuda dispo�ible para `
msgid "ignoring garbage line"
msgstr "error nunha li�a adicional\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "desco�ecido"
@@@ -1488,95 -1164,75 +1488,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "cabeceira de armadura non v�lida: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "cabeceira de armadura: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "cabeceira de sinatura en claro non v�lida\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "cabeceira de armadura: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "sinaturas en texto claro ani�adas\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "li�a escapada cunha barra non v�lida: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "car�cter radix64 non v�lido %02x omitido\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "fin de ficheiro prematura (non hai CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "fin de ficheiro prematura (no CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "CRC mal formado\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Erro de CRC; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "error nunha li�a adicional\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "non se atoparon datos OpenPGP v�lidos.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "non lexible por humanos"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1584,25 -1240,20 +1584,25 @@@ msgstr "
"un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
"rematar en '='\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, 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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1612,7 -1263,6 +1612,7 @@@ msgstr "
"un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
"rematar en '='\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
@@@ -1642,19 -1287,14 +1642,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "a chave secreta non est� dispo�ible"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "non se pode facer iso no modo por lotes\n"
@@@ -1669,10 -1307,6 +1669,10 @@@ msgstr "Non se admite este comando no m
msgid "Reset Code not or not anymore available\n"
msgstr "hai partes da chave secreta non dispo�ibles\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "�A s�a selecci�n? "
@@@ -1739,148 -1359,115 +1739,149 @@@ msgstr "non hai unha chave p�blica corr
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro escribindo no chaveiro `%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "preferencias actualizadas"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "caracter non v�lido na cadea de preferencias\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "caracter non v�lido na cadea de preferencias\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "Pegada dactilar:"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "A xeraci�n da chave fallou: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "non se atoparon datos OpenPGP v�lidos.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "�Qu� tama�o de chave quere? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "�Qu� tama�o de chave quere? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "�Qu� tama�o de chave quere? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "redondeado a %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "om�tese: a chave secreta xa est� presente\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1888,155 -1475,120 +1889,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Por favor, seleccione o tipo de chave que quere:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (s� cifrar)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Selecci�n non v�lida.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Por favor, escolla o motivo da revocaci�n:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Non se admite este comando no modo %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "om�tese: a chave secreta xa est� presente\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "�Asinar de verdade? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "sa�r deste men�"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "amosar esta axuda"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "Chave dispo�ible en: "
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "cambia-la fecha de expiraci�n"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "cambia-la confianza sobre o dono"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "amosar fingerprint"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "xerar un novo par de chaves"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "comandos conflictivos\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Comando incorrecto (tente \"help\")\n"
@@@ -2044,28 -1595,19 +2045,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output non traballa con este comando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "non se puido abrir `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "non se atopou a chave `%s': %s\n"
@@@ -2123,7 -1654,6 +2124,7 @@@ msgstr "�hai unha chave secreta para a
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
@@@ -2143,7 -1670,6 +2144,7 @@@ msgstr "fallou a sinatura: %s\n
msgid "'%s' already compressed\n"
msgstr "`%s' xa est� comprimido\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2162,7 -1686,6 +2163,7 @@@ msgid "
msgstr ""
"forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2182,17 -1703,14 +2183,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "datos cifrados con %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado cun algoritmo desco�ecido %d\n"
@@@ -2264,344 -1769,279 +2265,358 @@@ 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:78
++#: g10/export.c:102
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"A sinatura hase marcar coma non revocable.\n"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "chave secreta non utilizable"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: omitido: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "escribindo a `%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "AVISO: non se exportou nada\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[Non se atopou o id de usuario]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erro ao crear `%s': %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "Pegada dactilar:"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|facer unha sinatura en texto claro"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "facer unha sinatura separada"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifrar datos"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "cifrar s� con cifrado sim�trico"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "descifrar datos (por defecto)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verificar unha sinatura"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "ve-la lista de chaves"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "ve-la lista de chaves e sinaturas"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "verifica-las sinaturas das chaves"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "ve-la lista de chaves e pegadas dactilares"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "ve-la lista de chaves secretas"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "xerar un novo par de chaves"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "xerar un novo par de chaves"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "xerar un certificado de revocaci�n"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "borrar chaves do chaveiro p�blico"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "borrar chaves do chaveiro secreto"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "asinar unha chave"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "asinar unha chave localmente"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "asinar ou editar unha chave"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "cambia-lo contrasinal"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "exportar chaves a un servidor de chaves"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importar chaves dun servidor de chaves"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "buscar chaves nun servidor de chaves"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "actualizar t�dalas chaves dun servidor de chaves"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importar/mesturar chaves"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "actualiza-la base de datos de confianza"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crear sa�da con armadura en ascii"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "empregar este id de usuario para asinar ou descifrar"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "non facer ning�n cambio"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "avisar antes de sobrescribir"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2609,7 -2049,6 +2624,7 @@@ msgstr "
"@\n"
"(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2629,13 -2068,11 +2644,13 @@@ msgstr "
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2650,7 -2087,6 +2665,7 @@@ msgstr "
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2658,602 -2094,477 +2673,607 @@@ msgstr "
"\n"
"Algoritmos soportados:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "P�blica: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compresi�n: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opci�ns] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, 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:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, 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:1904
#, 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:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "deshabilitar unha chave"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, 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:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "opci�ns de importaci�n non v�lidas\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, 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:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, 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:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, 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:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s non se admite con %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
#, 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:3528
++#: g10/gpg.c:3601
#, 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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non v�lidas\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non v�lidas\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non v�lidas\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresi�n personais non v�lidas\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�%s a�nda non traballa con %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, 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:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [ficheiro]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [ficheiro]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [ficheiro]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [ficheiro]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ficheiro]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [ficheiro]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [ficheiro]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key id-de-usuario"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key id-de-usuario"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-de-usuario [comandos]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-de-usuario"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o env�o ao servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepci�n do servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, 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:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro ao crea-lo contrasinal: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[ficheiro]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a s�a mensaxe ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
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:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@@ -3298,330 -2601,266 +3318,332 @@@ msgstr "Non hai axuda dispo�ible
msgid "No help available for '%s'"
msgstr "Non hai axuda dispo�ible para `%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualiza-la base de datos de confianza"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualiza-la base de datos de confianza"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "amosar fingerprint"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chave secreta non utilizable"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "pasando por alto un bloque de tipo %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves procesadas hasta polo momento\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total procesado: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "novas chaves omitidas: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sin IDs de usuario: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importadas: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " sin cambios: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de usuario: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas sub-chaves: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas sinaturas: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revocaci�ns de chaves: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chaves secretas importadas: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chaves secretas sin cambios: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " non importadas: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas sinaturas: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr "chaves secretas lidas: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Sinatura %s, algoritmo de resumo %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "om�tese `%s': %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, 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:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, 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:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, 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:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: nova chave - omitida\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, 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:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "escribindo a `%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chave %08lX: non coincide coa nosa copia\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, 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:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" sen cambios\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "non se atopou a chave secreta `%s': %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3636,148 -2875,121 +3658,148 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, 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:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, 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:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, 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:2136
++#: g10/import.c:2421
#, 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:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: omitido o ID de usuario '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: omitida a sub-chave\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
@@@ -3814,48 -3020,39 +3836,48 @@@ msgstr "erro ao crear `%s': %s\n
msgid "error opening key DB: %s\n"
msgstr "erro lendo `%s': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[revocaci�n]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[auto-sinatura]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "Sinatura correcta de \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "om�tese `%s': %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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,7 -3060,6 +3885,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3871,21 -3067,18 +3893,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d sinaturas err�neas\n"
msgstr[1] "%d sinaturas err�neas\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Sinatura correcta de \""
msgstr[1] "Sinatura correcta de \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3897,68 -3090,53 +3919,68 @@@ msgstr "
"correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
"comprobando pegadas dactilares de varias fontes...).\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Conf�o marxinalmente\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Conf�o totalmente\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "O ID de usuario \"%s\" est� revocado."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "�Est� seguro de que quere asinalo? (s/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Non se puido asinar.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "O ID de usuario \"%s\" est� caducado."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, 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:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "�Asinar de verdade? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3967,11 -3145,9 +3989,11 @@@ msgstr "
"A auto-sinatura de \"%s\"\n"
"� unha sinatura tipo PGP 2.x\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3980,11 -3156,9 +4002,11 @@@ msgstr "
"A s�a sinatura actual en \"%s\"\n"
"caducou.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3993,43 -3167,34 +4015,43 @@@ msgstr "
"A s�a sinatura actual en \"%s\"\n"
"� unha sinatura local.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
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:1372
++#: g10/keyedit.c:1375
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada que asinar coa chave %08lX\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "�Esta chave caducou!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave ha caducar o %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4038,32 -3203,26 +4060,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:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Non hei respostar.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Non o comprobei en absoluto.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Fixen algunhas comprobaci�ns.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4072,271 -3231,217 +4094,271 @@@ msgstr "
"�Esta seguro de que quere asinar esta chave\n"
"coa s�a chave: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Esta ha ser unha auto-sinatura.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"A sinatura hase marcar coma non exportable.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"A sinatura hase marcar coma non revocable.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Non se comprobou esta chave en absoluto.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Comprobouse esta chave de xeito informal.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Comprobouse esta chave con moito tino.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "�Asinar de verdade? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "gardar e sa�r"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "amosar fingerprint"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Notaci�n de sinaturas: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "listar chave e IDs de usuario"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "selecciona-lo ID de usuario N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "selecciona-lo ID de usuario N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "revocar sinaturas"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "asina-la chave localmente"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "engadir un ID de usuario"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "engadir unha identificaci�n fotogr�fica"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "borrar un ID de usuario"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "borrar unha chave secundaria"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "engadir unha chave de revocaci�n"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"�Seguro que quere actualiza-las preferencias dos IDs de usuario "
"seleccionados? "
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
#, 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:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "marcar un ID de usuario coma primario"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "lista-las preferencias (expertos)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "lista-las preferencias (moitos datos)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, 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:1912
++#: g10/keyedit.c:1915
#, 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:1914
++#: g10/keyedit.c:1917
#, 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:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "cambia-lo contrasinal"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "cambia-la confianza sobre o dono"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revocar un ID de usuario"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revocar unha chave secundaria"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "habilitar unha chave"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "deshabilitar unha chave"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "amosa-la identificaci�n fotogr�fica"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "A chave secreta est� disponible.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "C�mpre a chave secreta para facer isto.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4344,275 -3449,222 +4366,281 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "A chave est� revocada."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "clase de sinatura desco�ecida"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Debe seleccionar alomenos un ID de usuario.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
#, 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:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "�Seguro de que quere borrar este ID de usuario? "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Debe seleccionar alomenos unha chave.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "erro ao crea-lo chaveiro `%s': %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Debe seleccionar alomenos unha chave.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, 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:2503
++#: g10/keyedit.c:2506
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "�Seguro de que quere borrar esta chave? "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
#, 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:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "�Seguro de que quere revocar este ID de usuario? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "�Realmente quere revocar esta chave? "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "�Realmente quere revoca-las chaves seleccionadas? "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "�Realmente quere revocar esta chave? "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "estabrece-la lista de preferencias"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, 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:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "�Realmente desexa actualiza-las preferencias? "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "�Garda-los cambios? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "�Sa�r sin gardar? "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "a actualizaci�n fallou: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "A xeraci�n da chave fallou: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "erro: pegada dactilar non v�lida\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, 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:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valor non v�lido\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Non hai tal ID de usuario.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nada que asinar coa chave %08lX\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Resumo: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Caracter�sticas: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Notaci�n: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (sensible)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "non foi posible crear %s: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocada] "
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [caduca: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " confianza: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confianza: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Esta chave est� desactivada"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4620,19 -3672,14 +4648,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revocada] "
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4640,17 -3687,14 +4668,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4659,37 -3703,29 +4687,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "�Est� seguro de que quere engadila? (s/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "�Borrar esta sinatura correcta? (s/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4697,38 -3733,31 +4725,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Borrada %d sinatura.\n"
msgstr[1] "Borrada %d sinatura.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Non se borrou nada.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
#, fuzzy
msgid "invalid"
msgstr "armadura non v�lida"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "O ID de usuario \"%s\" est� revocado."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4738,43 -3767,35 +4766,43 @@@ msgstr "
"designado\n"
" pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduza o ID de usuario do revocador designado: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
#, fuzzy
msgid "this key has already been designated as a revoker\n"
msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4782,165 -3803,135 +4810,170 @@@
msgstr ""
"�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Escolla exactamente un ID de usuario.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, 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:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "�Est� seguro de que quere empregala (s/N)? "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "�Est� seguro de que quere empregala (s/N)? "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Notaci�n de sinaturas: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "�Sobrescribir? (s/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Non hai ID de usuario con �ndice %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de usuario: \""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, 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:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta sinatura caducou o %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "�Est� seguro de que quere revocala? (s/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " asinada por %08lX no %s%s\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Asinou estes IDs de usuario: \n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (non exportable)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocada por %08lX no %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Est� a punto de revocar estas sinaturas:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "non hai chave secreta\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o ID de usuario \"%s\" xa est� revocado\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5393,13 -4306,10 +5426,13 @@@ msgstr "
"mentres se xeran os n�meros primos; isto proporci�nalle ao xerador de\n"
"n�meros aleatorios unha opoertunidade de acumular entrop�a de abondo.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A xeraci�n da chave fallou: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5407,68 -4317,55 +5440,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' xa est� comprimido\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "�Crear de t�dolos xeitos? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "�Crear de t�dolos xeitos? "
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Cancelouse a xeraci�n de chaves.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, 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:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
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:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5478,7 -4375,6 +5511,7 @@@ msgstr "
"queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
"con esa finalidade.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5486,7 -4382,6 +5519,7 @@@ msgstr "
"creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5494,51 -4389,40 +5527,51 @@@ msgstr "
"creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
"reloxo)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
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:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, 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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "�Crear realmente? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "nunca "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Normativa de sinaturas cr�ticas: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Normativa de sinaturas: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notaci�n de sinaturas cr�ticas: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notaci�n de sinaturas: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5546,7 -4430,6 +5579,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d sinaturas err�neas\n"
msgstr[1] "%d sinaturas err�neas\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5554,46 -4437,33 +5587,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 sinatura non verificada debido a un erro\n"
msgstr[1] "1 sinatura non verificada debido a un erro\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Chaveiro"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr "Pegada dactilar da chave primaria:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Pegada dactilar da sub-chave:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " Pegada dactilar ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5659,300 -4517,243 +5687,305 @@@ msgstr "o URL de normativa de sinatura
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, fuzzy, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "%s: non � un ID de chave v�lido\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "non se atopou a chave `%s': %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
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:1699
++#: g10/keyserver.c:1701
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "om�tese `%s': %s\n"
+
++#: g10/keyserver.c:1823
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"asinado coa s�a chave %08lX no %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "solicitando a chave %08lX de %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "chave de sesi�n cifrada con %s\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "cifrado cun algoritmo desco�ecido %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "a chave p�blica � %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrado cunha chave %s, ID %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "fallou o descifrado de chave p�blica: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifrado con %lu contrasinais\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "cifrado con 1 contrasinal\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "supo�endo datos cifrados con %s\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "descifrado correcto\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: o remitente pediu \"confidencial\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome do ficheiro orixinal='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Sinatura INCORRECTA de\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Sinatura caducada de \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Sinatura correcta de \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "verificaci�n de sinatura suprimida\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "non se poden manexar estas sinaturas m�ltiples\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Chave dispo�ible en: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "A sinatura caducou o %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "A sinatura caduca o %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "modo texto"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "desco�ecido"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave p�blica desco�ecido"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Non foi posible verifica-la sinatura: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "non � unha sinatura separada\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "sinatura independiente de clase 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "Sinatura � vello estilo (PGP 2.x)\n"
@@@ -6132,7 -4899,6 +6165,7 @@@ msgid "WARNING: potentially insecure sy
msgstr ""
"AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, 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"
@@@ -6506,46 -5204,37 +6539,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Non � seguro que a sinatura pertenza ao seu propietario.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: omitido: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: omitido: a chave p�blica est� desactivada\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: omitido: a chave p�blica xa est� presente\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6553,38 -5242,30 +6586,38 @@@ msgstr "
"\n"
"Introduza o ID de usuario. Remate cunha li�a en branco: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Non hai tal ID de usuario.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "A chave p�blica est� desactivada.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "omitido: chave p�blica xa estabrecida\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario por defecto `%s' desco�ecido\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "non hai enderezos v�lidos\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: non hai ID de usuario\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chave %08lX: non hai ID de usuario\n"
@@@ -6593,29 -5273,23 +6626,29 @@@
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:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Sinatura non adxunta.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Por favor, introduza o nome do ficheiro de datos: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "lendo de stdin ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "non hai datos asinados\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "non foi posible abri-los datos asinados `%s'\n"
@@@ -6865,7 -5494,6 +6898,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
msgstr[1] "a chave p�blica %08lX � %lu segundo m�is nova c� sinatura\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6939,23 -5558,19 +6972,23 @@@ msgid "
"unexpanded.\n"
msgstr "AVISO: non se pode expandir-%% o url de normativa (grande de m�is).\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "Sinatura %s de: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, 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:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "asinando:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "hase empregar cifrado %s\n"
@@@ -7035,134 -5636,107 +7068,134 @@@ msgstr "erro de lectura: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallou a sincronizaci�n: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "non se puido abrir `%s'\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, 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:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "transacci�n da base de datos de confianza demasiado grande\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: �o directorio non existe!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, 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:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: creouse a base de datos de confianza\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de datos de confianza non v�lida\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, 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:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: erro ao le-lo rexistro de versi�n: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, 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:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de datos de confianza: lseek fallou: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, 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:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: non � un ficheiro de base de datos de confianza\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, 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:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versi�n do ficheiro incorrecta %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: erro ao ler un rexistro libre: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, 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:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: non se puido engadir un rexistro: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: creouse a base de datos de confianza\n"
@@@ -7522,7 -6034,6 +7555,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "non se precisa comproba-la base de datos de confianza\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "hase comproba-la base de datos de confianza o %s\n"
@@@ -7537,7 -6046,6 +7570,7 @@@ msgstr "non se precisa comproba-la bas
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "non se precisa comproba-la base de datos de confianza\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "non se atopou a chave p�blica %08lX: %s\n"
@@@ -7550,14 -6056,12 +7583,14 @@@ msgstr "por favor, execute con --check-
msgid "checking the trustdb\n"
msgstr "comprobando a base de datos de confianza\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu chaves procesadas hasta polo momento\n"
msgstr[1] "%lu chaves procesadas hasta polo momento\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7565,22 -6069,18 +7598,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
msgstr[1] "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "non se atoparon chaves de confianza absoluta\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, 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"
@@@ -8045,27 -6450,22 +8078,27 @@@ msgstr "comandos conflictivos\n
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8075,7 -6474,6 +8108,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "car�cter radix64 non v�lido %02x omitido\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
@@@ -9967,8 -7978,6 +10000,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opci�ns] "
@@@ -9979,12 -7987,10 +10012,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "�%s non se admite con %s!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
@@@ -10479,77 -8383,61 +10512,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fallou o borrado do bloque de chaves: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, 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:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10689,7 -8547,6 +10722,7 @@@ msgstr "destinatario por defecto `%s' d
msgid "sending line failed: %s\n"
msgstr "fallou a sinatura: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar a `%s': %s\n"
@@@ -10943,16 -8739,13 +10976,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "non se atopou a chave p�blica"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "gravando a chave secreta en `%s'\n"
diff --cc po/gnupg2.pot
index c23675d,d9a4bb8..43a95c4
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@@ -1,27 -1,28 +1,27 @@@
-# Traditional Chinese(zh-tw) messages for GnuPG
-# Copyright (C) 2002 Free Software Foundation, Inc.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
-# Jedi Lin <Jedi at Jedi.org>, 2003~2013.
-#
-# Special thanks to "Audrey Tang <audreyt at audreyt.org>".
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
- "Project-Id-Version: GNU gnupg 2.1.13\n"
-"Project-Id-Version: GNU gnupg 2.1.0\n"
++"Project-Id-Version: GNU gnupg 2.1.14\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-06-16 17:27+0200\n"
-"PO-Revision-Date: 2014-11-22 20:56+0800\n"
-"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
-"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
-"Language: zh_TW\n"
++"POT-Creation-Date: 2016-07-14 16:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Basepath: gnupg-2.1.0/\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.7\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+#: agent/call-pinentry.c:257
#, c-format
msgid "failed to acquire the pinentry lock: %s\n"
-msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
+msgstr ""
#. TRANSLATORS: These are labels for buttons etc used in
#. Pinentries. An underscore indicates that the next letter
@@@ -110,97 -105,67 +110,97 @@@ msgstr "
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#: agent/call-pinentry.c:959
#, c-format
msgid "SETERROR %s (try %d of %d)"
-msgstr "設定錯誤: %s (第 %d 次嘗試, 最多 %d 次)"
+msgstr ""
+#: agent/call-pinentry.c:971
msgid "Repeat:"
-msgstr "重複:"
+msgstr ""
+#: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
msgid "PIN too long"
-msgstr "個人識別碼 (PIN) 太長"
+msgstr ""
+#: agent/call-pinentry.c:1002
msgid "Passphrase too long"
-msgstr "密語太長"
+msgstr ""
+#: agent/call-pinentry.c:1010
msgid "Invalid characters in PIN"
-msgstr "個人識別碼 (PIN) 含有無效的字符"
+msgstr ""
+#: agent/call-pinentry.c:1015
msgid "PIN too short"
-msgstr "個人識別碼 (PIN) 太短"
+msgstr ""
+#: agent/call-pinentry.c:1028
msgid "Bad PIN"
-msgstr "不良的個人識別碼 (PIN)"
+msgstr ""
+#: agent/call-pinentry.c:1028
msgid "Bad Passphrase"
-msgstr "不良的密語"
+msgstr ""
+#: agent/command-ssh.c:651 agent/command-ssh.c:746
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
-msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
+msgstr ""
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, c-format
msgid "can't create '%s': %s\n"
-msgstr "無法建立 '%s': %s\n"
+msgstr ""
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, c-format
msgid "can't open '%s': %s\n"
-msgstr "無法開啟 '%s': %s\n"
+msgstr ""
+#: agent/command-ssh.c:2535 agent/command-ssh.c:2553
#, c-format
msgid "error getting serial number of card: %s\n"
-msgstr "取得此卡片序號時出錯: %s\n"
+msgstr ""
+#: agent/command-ssh.c:2539
#, c-format
msgid "detected card with S/N: %s\n"
-msgstr "偵測到卡片, 其序號為: %s\n"
+msgstr ""
+#: agent/command-ssh.c:2544
#, c-format
msgid "no authentication key for ssh on card: %s\n"
-msgstr "卡片上沒有 ssh 用的認證金鑰: %s\n"
+msgstr ""
+#: agent/command-ssh.c:2564
#, c-format
msgid "no suitable card key found: %s\n"
-msgstr "找不到合適的卡片金鑰: %s\n"
+msgstr ""
+#: agent/command-ssh.c:2614
#, c-format
msgid "shadowing the key failed: %s\n"
-msgstr "遮蔽金鑰時失敗: %s\n"
+msgstr ""
+#: agent/command-ssh.c:2629
#, c-format
msgid "error writing key: %s\n"
-msgstr "寫入金鑰時出錯: %s\n"
+msgstr ""
+#: agent/command-ssh.c:2912
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
@@@ -366,98 -300,76 +366,98 @@@ msgid "
"@Options:\n"
" "
msgstr ""
-"@選項:\n"
-" "
+#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
-msgstr "以服務模式執行 (背景)"
+msgstr ""
+#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
-msgstr "以伺服器模式執行 (前景)"
+msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
-msgstr "囉唆模式"
+msgstr ""
+#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
+#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
-msgstr "盡量安靜些"
+msgstr ""
+#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
-msgstr "sh 樣式的指令輸出"
+msgstr ""
+#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
-msgstr "csh 樣式的指令輸出"
+msgstr ""
+#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
-msgstr "|檔案|從指定檔案中讀取選項"
+msgstr ""
+#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
-msgstr "不要從 console 分離"
+msgstr ""
+#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
-msgstr "不要奪取鍵盤及滑鼠"
+msgstr ""
+#: agent/gpg-agent.c:168 tools/symcryptrun.c:168
msgid "use a log file for the server"
-msgstr "為伺服器使用日誌檔"
+msgstr ""
+#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
-msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
+msgstr ""
+#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
-msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
+msgstr ""
+#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
-msgstr "不要使用 SCdaemon"
+msgstr ""
-#, fuzzy
-#| msgid "|NAME|connect to host NAME"
+#: agent/gpg-agent.c:181
msgid "|NAME|accept some commands via NAME"
-msgstr "|名稱|連線至位於指定名稱的主機"
+msgstr ""
+#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
-msgstr "忽略變更 TTY 的要求"
+msgstr ""
+#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
-msgstr "忽略變更 X display 的要求"
+msgstr ""
+#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
-msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
+msgstr ""
+#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
-msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
+msgstr ""
-#, fuzzy
-#| msgid "do not allow the reuse of old passphrases"
+#: agent/gpg-agent.c:218
msgid "disallow the use of an external password cache"
-msgstr "不允許重複使用舊密語"
+msgstr ""
+#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
-msgstr "不允許用戶端將金鑰標記為 \"已信任\""
+msgstr ""
+#: agent/gpg-agent.c:223
msgid "allow presetting passphrase"
-msgstr "允許預先設定密語"
+msgstr ""
+#: agent/gpg-agent.c:225
msgid "disallow caller to override the pinentry"
msgstr ""
@@@ -476,184 -385,138 +476,184 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
-msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
+msgstr ""
+#: agent/gpg-agent.c:482
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
-msgstr "用法: @GPG_AGENT@ [選項] (或用 -h 求助)"
+msgstr ""
+#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
-"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
-"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
-msgstr "給定的除錯等級 '%s' 無效\n"
+msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
-msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
+msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, c-format
msgid "Note: no default option file '%s'\n"
-msgstr "請注意: 沒有預設選項檔 '%s'\n"
+msgstr ""
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, c-format
msgid "option file '%s': %s\n"
-msgstr "選項檔 '%s': %s\n"
+msgstr ""
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, c-format
msgid "reading options from '%s'\n"
-msgstr "從 '%s' 讀取選項中\n"
+msgstr ""
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, c-format
msgid "Note: '%s' is not considered an option\n"
-msgstr "請注意: '%s' 並不當成選項\n"
+msgstr ""
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
-msgstr "無法建立 socket: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
-msgstr "socket 名稱 '%s' 太長\n"
+msgstr ""
+#: agent/gpg-agent.c:1844
msgid "a gpg-agent is already running - not starting a new one\n"
-msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
+msgstr ""
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
-msgstr "為 socket 取得 nonce 時出錯\n"
+msgstr ""
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, c-format
msgid "error binding socket to '%s': %s\n"
-msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
-#, fuzzy, c-format
-#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
+#, c-format
msgid "can't set permissions of '%s': %s\n"
-msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
+msgstr ""
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
-msgstr "listen() 失敗: %s\n"
+msgstr ""
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, c-format
msgid "listening on socket '%s'\n"
-msgstr "正在候聽 socket '%s'\n"
+msgstr ""
+#: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
+#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
#, c-format
msgid "can't create directory '%s': %s\n"
-msgstr "無法建立目錄 '%s': %s\n"
+msgstr ""
+#: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
#, c-format
msgid "directory '%s' created\n"
-msgstr "目錄 '%s' 已建立\n"
+msgstr ""
+#: agent/gpg-agent.c:1954
#, c-format
msgid "stat() failed for '%s': %s\n"
-msgstr "'%s' 的 stat() 失敗: %s\n"
+msgstr ""
+#: agent/gpg-agent.c:1958
#, c-format
msgid "can't use '%s' as home directory\n"
-msgstr "無法使用 '%s' 做為家目錄\n"
+msgstr ""
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
-msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
+msgstr ""
+#: agent/gpg-agent.c:2307
#, c-format
msgid "handler 0x%lx for fd %d started\n"
-msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
+msgstr ""
+#: agent/gpg-agent.c:2312
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
-msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
+msgstr ""
+#: agent/gpg-agent.c:2385
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
-msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
+msgstr ""
+#: agent/gpg-agent.c:2390
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
-msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
+msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
-msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
+msgstr ""
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
-msgstr "%s %s 已停止\n"
+msgstr ""
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
-msgstr "在此階段中沒有執行中的 gpg-agent\n"
+msgstr ""
+#: agent/preset-passphrase.c:99
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
-msgstr "用法: gpg-preset-passphrase [選項] 金鑰鑰柄 (或用 -h 求助)\n"
+msgstr ""
+#: agent/preset-passphrase.c:102
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
-"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
-"密碼快取維護\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
msgstr ""
-"@指令:\n"
-" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -824,207 -665,164 +824,207 @@@ msgid "
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
-"警告: 這把金鑰同時列為 SSH 所使用!\n"
-"刪除這把金鑰可能會讓你失去存取遠端機器的能力."
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
-msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
+msgstr ""
+#: agent/pksign.c:187 sm/certcheck.c:97
#, c-format
msgid "%s key uses an unsafe (%u bit) hash\n"
-msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
+msgstr ""
+#: agent/pksign.c:204
#, c-format
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
-msgstr "%zu 位元的雜湊對 %u 位元的 %s 金鑰無效\n"
+msgstr ""
+#: agent/pksign.c:512
#, c-format
msgid "checking created signature failed: %s\n"
-msgstr "檢查已建立的簽章時出錯: %s\n"
+msgstr ""
+#: agent/cvt-openpgp.c:338
msgid "secret key parts are not available\n"
-msgstr "私鑰部分無法取用\n"
+msgstr ""
+#: agent/cvt-openpgp.c:344
#, c-format
msgid "public key algorithm %d (%s) is not supported\n"
-msgstr "公鑰演算法 %d (%s) 未支援\n"
+msgstr ""
+#: agent/cvt-openpgp.c:448
#, c-format
msgid "protection algorithm %d (%s) is not supported\n"
-msgstr "保護演算法 %d (%s) 未支援\n"
+msgstr ""
+#: agent/cvt-openpgp.c:455
#, c-format
msgid "protection hash algorithm %d (%s) is not supported\n"
-msgstr "保護雜湊演算法 %d (%s) 未支援\n"
+msgstr ""
+#: common/exechelp-posix.c:361 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
#, c-format
msgid "error creating a pipe: %s\n"
-msgstr "建立管道時出錯: %s\n"
+msgstr ""
+#: common/exechelp-posix.c:374 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
#, c-format
msgid "error creating a stream for a pipe: %s\n"
-msgstr "建立管道串流時出錯: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
-msgstr "衍生執行程序時出錯: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
-#, fuzzy, c-format
-#| msgid "waiting for process %d to terminate failed: %s\n"
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
+#, c-format
msgid "waiting for processes to terminate failed: %s\n"
-msgstr "等候 %d 處理程序終止時失敗: %s\n"
+msgstr ""
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, c-format
msgid "error running '%s': probably not installed\n"
-msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
+msgstr ""
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
-msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
+msgstr ""
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, c-format
msgid "error running '%s': terminated\n"
-msgstr "執行 '%s' 時出錯: 已終止\n"
+msgstr ""
+#: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
#, c-format
msgid "error getting exit code of process %d: %s\n"
-msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
+msgstr ""
+#: common/exechelp-w32ce.c:767
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
-msgstr "等候 %d 處理程序終止時失敗: %s\n"
+msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, c-format
msgid "can't connect to '%s': %s\n"
-msgstr "無法連接至 '%s': %s\n"
+msgstr ""
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
-msgstr "與 gpg-agent 的溝通問題\n"
+msgstr ""
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
msgid "problem setting the gpg-agent options\n"
-msgstr "設定 gpg-agent 選項時發生問題\n"
+msgstr ""
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
-msgstr "由使用者取消\n"
+msgstr ""
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
-msgstr "代理程式的問題\n"
+msgstr ""
- #: common/simple-pwquery.c:697
-#, fuzzy, c-format
-#| msgid "problem with the agent: %s\n"
++#: common/simple-pwquery.c:701
+#, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
-msgstr "代理程式的問題: %s\n"
+msgstr ""
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
-msgstr "無法讓系統停止傾印核心檔: %s\n"
+msgstr ""
+#: common/sysutils.c:219
#, c-format
msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr "警告: %s 的所有權 \"%s\" 並不安全\n"
+msgstr ""
+#: common/sysutils.c:251
#, c-format
msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:45 common/yesno.c:82
msgid "yes"
-msgstr "yes"
+msgstr ""
+#: common/yesno.c:46 common/yesno.c:87
msgid "yY"
-msgstr "yY"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:48 common/yesno.c:84
msgid "no"
-msgstr "no"
+msgstr ""
+#: common/yesno.c:49 common/yesno.c:88
msgid "nN"
-msgstr "nN"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:86
msgid "quit"
-msgstr "quit"
+msgstr ""
+#: common/yesno.c:89
msgid "qQ"
-msgstr "qQ"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:123
msgid "okay|okay"
-msgstr "okay|okay"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:125
msgid "cancel|cancel"
-msgstr "cancel|cancel"
+msgstr ""
+#: common/yesno.c:126
msgid "oO"
-msgstr "oO"
+msgstr ""
+#: common/yesno.c:127
msgid "cC"
-msgstr "cC"
+msgstr ""
+#: common/miscellaneous.c:86
#, c-format
msgid "out of core in secure memory while allocating %lu bytes"
-msgstr "在安全記憶體配置 %lu 位元組時超出核心"
+msgstr ""
+#: common/miscellaneous.c:89
#, c-format
msgid "out of core while allocating %lu bytes"
-msgstr "配置 %lu 位元組時超出核心"
+msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
-msgstr "配置足夠的記憶體時出錯: %s\n"
+msgstr ""
+#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
-msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
+msgstr ""
+#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
-msgstr "警告: \"%s%s\" 是已廢棄的選項 - 沒有效果\n"
+msgstr ""
+#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
msgstr ""
@@@ -1063,1331 -856,1052 +1063,1343 @@@ msgstr "
#. TRANSLATORS: Copy the prefix between the vertical bars
#. verbatim. It will not be printed.
+#: common/audit.c:474
msgid "|audit-log-result|Good"
-msgstr "|audit-log-result|良好"
+msgstr ""
+#: common/audit.c:477
msgid "|audit-log-result|Bad"
-msgstr "|audit-log-result|不良"
+msgstr ""
+#: common/audit.c:479
msgid "|audit-log-result|Not supported"
-msgstr "|audit-log-result|不支援"
+msgstr ""
+#: common/audit.c:481
msgid "|audit-log-result|No certificate"
-msgstr "|audit-log-result|沒有憑證"
+msgstr ""
+#: common/audit.c:483
msgid "|audit-log-result|Not enabled"
-msgstr "|audit-log-result|未啟用"
+msgstr ""
+#: common/audit.c:485
msgid "|audit-log-result|Error"
-msgstr "|audit-log-result|錯誤"
+msgstr ""
+#: common/audit.c:487
msgid "|audit-log-result|Not used"
-msgstr "|audit-log-result|未使用"
+msgstr ""
+#: common/audit.c:489
msgid "|audit-log-result|Okay"
-msgstr "|audit-log-result|沒問題"
+msgstr ""
+#: common/audit.c:491
msgid "|audit-log-result|Skipped"
-msgstr "|audit-log-result|已跳過"
+msgstr ""
+#: common/audit.c:493
msgid "|audit-log-result|Some"
-msgstr "|audit-log-result|有些"
+msgstr ""
+#: common/audit.c:726
msgid "Certificate chain available"
-msgstr "有可用的憑證鏈"
+msgstr ""
+#: common/audit.c:733
msgid "root certificate missing"
-msgstr "根憑證遺失"
+msgstr ""
+#: common/audit.c:759
msgid "Data encryption succeeded"
-msgstr "資料已加密成功"
+msgstr ""
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
msgid "Data available"
-msgstr "有可用的資料"
+msgstr ""
+#: common/audit.c:767
msgid "Session key created"
-msgstr "階段金鑰已建立"
+msgstr ""
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
#, c-format
msgid "algorithm: %s"
-msgstr "演算法: %s"
+msgstr ""
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
+#: scd/app-openpgp.c:2885
#, c-format
msgid "unsupported algorithm: %s"
-msgstr "未支援的演算法: %s"
+msgstr ""
+#: common/audit.c:778 common/audit.c:925
msgid "seems to be not encrypted"
-msgstr "看起來未加密"
+msgstr ""
+#: common/audit.c:784 common/audit.c:933
msgid "Number of recipients"
-msgstr "收件者數量"
+msgstr ""
+#: common/audit.c:792 common/audit.c:956
#, c-format
msgid "Recipient %d"
-msgstr "收件者 %d"
+msgstr ""
+#: common/audit.c:825
msgid "Data signing succeeded"
-msgstr "資料已簽署成功"
+msgstr ""
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
#, c-format
msgid "data hash algorithm: %s"
-msgstr "資料雜湊演算法: %s"
+msgstr ""
+#: common/audit.c:862
#, c-format
msgid "Signer %d"
-msgstr "簽署者 %d"
+msgstr ""
+#: common/audit.c:866 common/audit.c:1065
#, c-format
msgid "attr hash algorithm: %s"
-msgstr "屬性雜湊演算法: %s"
+msgstr ""
+#: common/audit.c:901
msgid "Data decryption succeeded"
-msgstr "資料已解密成功"
+msgstr ""
+#: common/audit.c:910
msgid "Encryption algorithm supported"
-msgstr "支援的加密演算法"
+msgstr ""
+#: common/audit.c:993
msgid "Data verification succeeded"
-msgstr "資料驗證成功"
+msgstr ""
+#: common/audit.c:1002
msgid "Signature available"
-msgstr "有可用的簽章"
+msgstr ""
+#: common/audit.c:1024
msgid "Parsing data succeeded"
-msgstr "剖析資料成功"
+msgstr ""
+#: common/audit.c:1036
#, c-format
msgid "bad data hash algorithm: %s"
-msgstr "不良的資料雜湊演算法: %s"
+msgstr ""
+#: common/audit.c:1051
#, c-format
msgid "Signature %d"
-msgstr "簽章 %d"
+msgstr ""
+#: common/audit.c:1079
msgid "Certificate chain valid"
-msgstr "憑證鏈有效"
+msgstr ""
+#: common/audit.c:1090
msgid "Root certificate trustworthy"
-msgstr "根憑證可信賴"
+msgstr ""
+#: common/audit.c:1111 sm/certchain.c:991
msgid "no CRL found for certificate"
-msgstr "找不到用於憑證的 CRL"
+msgstr ""
+#: common/audit.c:1114 sm/certchain.c:1001
msgid "the available CRL is too old"
-msgstr "可用的 CRL 太舊了"
+msgstr ""
+#: common/audit.c:1119
msgid "CRL/OCSP check of certificates"
-msgstr "CRL/OCSP 憑證檢查"
+msgstr ""
+#: common/audit.c:1139
msgid "Included certificates"
-msgstr "包含在內的憑證"
+msgstr ""
+#: common/audit.c:1194
msgid "No audit log entries."
-msgstr "沒有稽核日誌項目."
+msgstr ""
+#: common/audit.c:1243
msgid "Unknown operation"
-msgstr "未知的操作"
+msgstr ""
+#: common/audit.c:1261
msgid "Gpg-Agent usable"
-msgstr "Gpg-Agent 可以使用"
+msgstr ""
+#: common/audit.c:1271
msgid "Dirmngr usable"
-msgstr "Dirmngr 可以使用"
+msgstr ""
+#: common/audit.c:1307
#, c-format
msgid "No help available for '%s'."
-msgstr "'%s' 沒有可用的說明."
+msgstr ""
+#: common/helpfile.c:90
msgid "ignoring garbage line"
-msgstr "忽略垃圾列"
+msgstr ""
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
-msgstr "[ 無 ]"
+msgstr ""
+#: common/argparse.c:365
msgid "argument not expected"
-msgstr "沒料到有引數"
+msgstr ""
+#: common/argparse.c:367
msgid "read error"
-msgstr "讀取錯誤"
+msgstr ""
+#: common/argparse.c:369
msgid "keyword too long"
-msgstr "關鍵字太長"
+msgstr ""
+#: common/argparse.c:371
msgid "missing argument"
-msgstr "無效的引數"
+msgstr ""
+#: common/argparse.c:373
msgid "invalid argument"
-msgstr "無效的引數"
+msgstr ""
+#: common/argparse.c:375
msgid "invalid command"
-msgstr "無效的指令"
+msgstr ""
+#: common/argparse.c:377
msgid "invalid alias definition"
-msgstr "無效的別名定義"
+msgstr ""
+#: common/argparse.c:379
msgid "out of core"
-msgstr "超出核心"
+msgstr ""
+#: common/argparse.c:381
msgid "invalid option"
-msgstr "無效的選項"
+msgstr ""
+#: common/argparse.c:389
#, c-format
msgid "missing argument for option \"%.50s\"\n"
-msgstr "\"%.50s\" 選項遺失了引數\n"
+msgstr ""
+#: common/argparse.c:391
#, c-format
msgid "invalid argument for option \"%.50s\"\n"
-msgstr "選項 \"%.50s\" 的引數無效\n"
+msgstr ""
+#: common/argparse.c:393
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
-msgstr "\"%.50s\" 選項沒料到會有引數\n"
+msgstr ""
+#: common/argparse.c:395
#, c-format
msgid "invalid command \"%.50s\"\n"
-msgstr "無效的指令 \"%.50s\"\n"
+msgstr ""
+#: common/argparse.c:397
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
-msgstr "\"%.50s\" 選項不明確\n"
+msgstr ""
+#: common/argparse.c:399
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
-msgstr "\"%.50s\" 指令不明確\n"
+msgstr ""
+#: common/argparse.c:401 dirmngr/dirmngr.c:1234
msgid "out of core\n"
-msgstr "超出核心\n"
+msgstr ""
+#: common/argparse.c:403
#, c-format
msgid "invalid option \"%.50s\"\n"
-msgstr "無效的選項 \"%.50s\"\n"
+msgstr ""
+#: common/utf8conv.c:123
#, c-format
msgid "conversion from '%s' to '%s' not available\n"
-msgstr "沒有從 '%s' 到 '%s' 之間的轉換可用\n"
+msgstr ""
+#: common/utf8conv.c:131
#, c-format
msgid "iconv_open failed: %s\n"
-msgstr "iconv_open 失敗: %s\n"
+msgstr ""
+#: common/utf8conv.c:385 common/utf8conv.c:651
#, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
-msgstr "從 '%s' 轉換到 '%s' 失敗: %s\n"
+msgstr ""
+#: common/dotlock.c:707
#, c-format
msgid "failed to create temporary file '%s': %s\n"
-msgstr "建立暫存檔失敗 '%s': %s\n"
+msgstr ""
+#: common/dotlock.c:771
#, c-format
msgid "error writing to '%s': %s\n"
-msgstr "寫入 '%s' 時出錯: %s\n"
+msgstr ""
+#: common/dotlock.c:1116
#, c-format
msgid "removing stale lockfile (created by %d)\n"
-msgstr "正在移除陳腐的鎖定檔 (由 %d 所建立)\n"
+msgstr ""
+#: common/dotlock.c:1152
#, c-format
msgid "waiting for lock (held by %d%s) %s...\n"
-msgstr "正在等候鎖定 (被 %d%s 持有) %s...\n"
+msgstr ""
+#: common/dotlock.c:1153
msgid "(deadlock?) "
-msgstr "(死結嗎?) "
+msgstr ""
+#: common/dotlock.c:1192
#, c-format
msgid "lock '%s' not made: %s\n"
-msgstr "未鎖定 '%s': %s\n"
+msgstr ""
+#: common/dotlock.c:1219
#, c-format
msgid "waiting for lock %s...\n"
-msgstr "正在等候 `%s' 鎖定...\n"
+msgstr ""
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
-msgstr "封裝: %s\n"
+msgstr ""
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
-msgstr "無效的封裝檔頭: "
+msgstr ""
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
-msgstr "封裝檔頭: "
+msgstr ""
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
-msgstr "無效的明文簽章檔頭\n"
+msgstr ""
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
-msgstr "未知的封裝檔頭: "
+msgstr ""
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
-msgstr "多層明文簽章\n"
+msgstr ""
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
-msgstr "未預期的封裝: "
+msgstr ""
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
-msgstr "無效的破折號逸出列: "
+msgstr ""
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
-msgstr "無效的 64 進位字符 %02x 已跳過\n"
+msgstr ""
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
-msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
+msgstr ""
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
-msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
+msgstr ""
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
-msgstr "格式不對的 CRC\n"
+msgstr ""
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC 錯誤; %06lX - %06lX\n"
+msgstr ""
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
-msgstr "檔案未預期的結束 (於結尾處)\n"
+msgstr ""
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
-msgstr "結尾列有問題\n"
+msgstr ""
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
-msgstr "找不到有效的 OpenPGP 資料.\n"
+msgstr ""
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
-msgstr "無效的封裝: 列長超出 %d 字符\n"
+msgstr ""
- #: g10/armor.c:1305
++#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
+msgstr ""
- #: g10/build-packet.c:1093
-#, fuzzy, c-format
-#| msgid "not human readable"
++#: g10/build-packet.c:1115
+#, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
-msgstr "不是人類能讀得懂的"
+msgstr ""
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
-msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+msgstr ""
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
-msgstr "使用者標記名稱一定要含有 '@' 字符\n"
+msgstr ""
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
msgid "a notation name must not contain more than one '@' character\n"
-msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+msgstr ""
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
-msgstr "標記值一定不能使用任何的控制字符\n"
+msgstr ""
- #: g10/build-packet.c:1237
-#, fuzzy
-#| msgid "a notation name must not contain more than one '@' character\n"
++#: g10/build-packet.c:1259
msgid "a notation name may not contain an '=' character\n"
-msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
+msgstr ""
- #: g10/build-packet.c:1243
-#, fuzzy
-#| msgid ""
-#| "a notation name must have only printable characters or spaces, and end "
-#| "with an '='\n"
++#: g10/build-packet.c:1265
msgid "a notation name must have only printable characters or spaces\n"
-msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
+msgstr ""
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
-msgstr "警告: 找到無效的標記資料\n"
+msgstr ""
+#: g10/call-agent.c:151 sm/call-agent.c:199
#, c-format
msgid "failed to proxy %s inquiry to client\n"
-msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
+msgstr ""
+#: g10/call-agent.c:176
msgid "Enter passphrase: "
-msgstr "請輸入密語: "
+msgstr ""
-#, 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 ""
+#: 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 ""
-#, fuzzy, c-format
-#| msgid "WARNING: %s overrides %s\n"
+#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
+#, c-format
msgid "WARNING: %s\n"
-msgstr "警告: %s 會推翻 %s\n"
+msgstr ""
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
-msgstr "沒有可用的 OpenPGP 卡片: %s\n"
+msgstr ""
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
-msgstr "偵測到 OpenPGP 卡片編號 %s\n"
+msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
-msgstr "無法在批次模式中這樣做\n"
+msgstr ""
+#: g10/card-util.c:107
msgid "This command is only available for version 2 cards\n"
-msgstr "祇有第二版卡片纔能用這個指令\n"
+msgstr ""
+#: g10/card-util.c:109 scd/app-openpgp.c:2259
msgid "Reset Code not or not anymore available\n"
-msgstr "(再也) 沒有重設碼\n"
+msgstr ""
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
-msgstr "你要選哪一個? "
+msgstr ""
+#: g10/card-util.c:279 g10/card-util.c:330
msgid "[not set]"
-msgstr "[未設定]"
+msgstr ""
+#: g10/card-util.c:533
msgid "male"
-msgstr "男性"
+msgstr ""
+#: g10/card-util.c:534
msgid "female"
-msgstr "女性"
+msgstr ""
+#: g10/card-util.c:534
msgid "unspecified"
-msgstr "未特定"
+msgstr ""
+#: g10/card-util.c:561
msgid "not forced"
-msgstr "不強迫使用"
+msgstr ""
+#: g10/card-util.c:561
msgid "forced"
-msgstr "強迫使用"
+msgstr ""
+#: g10/card-util.c:636
msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
+msgstr ""
+#: g10/card-util.c:638
msgid "Error: The \"<\" character may not be used.\n"
-msgstr "錯誤: 不能使用 \"<\" 字符.\n"
+msgstr ""
+#: g10/card-util.c:640
msgid "Error: Double spaces are not allowed.\n"
-msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
+msgstr ""
+#: g10/card-util.c:657
msgid "Cardholder's surname: "
-msgstr "卡片持有者的姓氏: "
+msgstr ""
+#: g10/card-util.c:659
msgid "Cardholder's given name: "
-msgstr "卡片持有者的名字: "
+msgstr ""
+#: g10/card-util.c:677
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
+msgstr ""
+#: g10/card-util.c:698
msgid "URL to retrieve public key: "
-msgstr "取回公鑰的 URL: "
+msgstr ""
+#: g10/card-util.c:706
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
-msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
+msgstr ""
- #: g10/card-util.c: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, c-format
msgid "error reading '%s': %s\n"
-msgstr "讀取 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
-msgstr "寫入 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
-msgstr "登入資料 (帳號名稱): "
+msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
+msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
-msgstr "私人的 DO 資料: "
+msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
+msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
-msgstr "介面語言偏好設定: "
+msgstr ""
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
-msgstr "錯誤: 無效的偏好設定字串長度\n"
+msgstr ""
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
-msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
+msgstr ""
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "性別 ((M)男性, (F)女性或留空): "
+msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
-msgstr "錯誤: 無效的回應.\n"
+msgstr ""
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
-msgstr "憑證中心 (CA) 指紋: "
+msgstr ""
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
-msgstr "錯誤: 無效的格式化指紋.\n"
+msgstr ""
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
-msgstr "不可能進行金鑰操作: %s\n"
+msgstr ""
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
-msgstr "這不是 OpenPGP 卡片"
+msgstr ""
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
-msgstr "取得現用金鑰資訊時出錯: %s\n"
+msgstr ""
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
-msgstr "是否要取代既有的金鑰? (y/N) "
+msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
-"請注意: 我們完全無法保證卡片支援你想用的尺寸.\n"
-" 如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
-" 看看這張卡片支援哪些尺寸.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
-msgstr "你的簽署金鑰想要用多大的金鑰尺寸? (%u) "
+msgstr ""
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
-msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
+msgstr ""
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
-msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
+msgstr ""
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
-msgstr "加大到 %u 位元\n"
+msgstr ""
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
+msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
-msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
+msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
-msgstr "將金鑰 %d 尺寸變更至 %u 位元時出錯: %s\n"
+msgstr ""
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
+msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
msgid "Note: keys are already stored on the card!\n"
-msgstr "請注意: 金鑰已經存放在卡片上了!\n"
+msgstr ""
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
-msgstr "是否要取代既有的金鑰? (y/N) "
+msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
" PIN = '%s' Admin PIN = '%s'\n"
"You should change them using the command --change-pin\n"
msgstr ""
-"請注意個人識別碼 (PIN) 的出廠設定值為\n"
-" PIN = '%s' 管理者 PIN = '%s'\n"
-"你應該用 --change-pin 指令來加以變更\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
-msgstr "請選擇你要產生的金鑰種類:\n"
+msgstr ""
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
-msgstr " (1) 簽署用金鑰\n"
+msgstr ""
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
-msgstr " (2) 加密用金鑰\n"
+msgstr ""
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
-msgstr " (3) 憑證用金鑰\n"
+msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
-msgstr "無效的選擇.\n"
+msgstr ""
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
-msgstr "請選擇要把金鑰存放在哪裡:\n"
+msgstr ""
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, c-format
msgid "KEYTOCARD failed: %s\n"
-msgstr "KEYTOCARD 失敗: %s\n"
+msgstr ""
- #: g10/card-util.c:1710
-#, fuzzy
-#| msgid "This command is not allowed while in %s mode.\n"
++#: g10/card-util.c:1700
msgid "This command is not supported by this card\n"
-msgstr "在 %s 模式中不允許使用這個指令.\n"
+msgstr ""
- #: g10/card-util.c:1715
-#, fuzzy
-#| msgid "Note: keys are already stored on the card!\n"
++#: g10/card-util.c:1705
msgid "Note: This command destroys all keys stored on the card!\n"
-msgstr "請注意: 金鑰已經存放在卡片上了!\n"
+msgstr ""
- #: g10/card-util.c:1718
-#, fuzzy
-#| msgid "Continue? (Y/n) "
++#: g10/card-util.c:1708
msgid "Continue? (y/N) "
-msgstr "是否繼續? (Y/n) "
+msgstr ""
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
-msgstr "離開這個選單"
+msgstr ""
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
-msgstr "顯示管理者指令"
+msgstr ""
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
-msgstr "顯示這份線上說明"
+msgstr ""
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
-msgstr "列出所有可用的資料"
+msgstr ""
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
-msgstr "變更卡片持有人的名字"
+msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
-msgstr "變更取回金鑰的 URL"
+msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
-msgstr "從卡片 URL 取回指定的金鑰"
+msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
-msgstr "變更登入名稱"
+msgstr ""
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
-msgstr "變更介面語言偏好設定"
+msgstr ""
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
-msgstr "變更卡片持有者的性別"
+msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
-msgstr "變更某個憑證中心 (CA) 的指紋"
+msgstr ""
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
-msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
+msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
-msgstr "產生新的金鑰"
+msgstr ""
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
-msgstr "變更或重設個人識別碼 (PIN) 的選單"
+msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
-msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
+msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
-msgstr "用重設碼來解凍個人識別碼 (PIN)"
+msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
-msgstr "gpg/卡片> "
+msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
-msgstr "限管理者使用的指令\n"
+msgstr ""
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
-msgstr "允許使用管理者指令\n"
+msgstr ""
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
-msgstr "未允許使用管理者指令\n"
+msgstr ""
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
-msgstr "無效的指令 (試試看 \"help\")\n"
+msgstr ""
+#: g10/decrypt.c:191 g10/encrypt.c:956
msgid "--output doesn't work for this command\n"
-msgstr "--output 在這個指令中沒有作用\n"
+msgstr ""
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
-msgstr "無法開啟 '%s'\n"
+msgstr ""
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
-msgstr "找不到金鑰 \"%s\": %s\n"
+msgstr ""
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
-msgstr "讀取金鑰區塊時出錯: %s\n"
+msgstr ""
- #: g10/delkey.c:118 g10/getkey.c:574
-#, fuzzy, c-format
-#| msgid "key \"%s\" not found: %s\n"
++#: g10/delkey.c:118 g10/getkey.c:579
+#, c-format
msgid "key \"%s\" not found\n"
-msgstr "找不到金鑰 \"%s\": %s\n"
+msgstr ""
+#: g10/delkey.c:129 g10/delkey.c:136
msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(除非你用指紋指定了金鑰)\n"
+msgstr ""
+#: g10/delkey.c:135
msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "沒有 \"--yes\" 就沒辦法在批次模式中這麼做\n"
+msgstr ""
+#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
-msgstr "要從鑰匙圈裡刪除這把金鑰嗎? (y/N) "
+msgstr ""
+#: g10/delkey.c:158
msgid "This is a secret key! - really delete? (y/N) "
-msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
+msgstr ""
+#: g10/delkey.c:201
#, c-format
msgid "deleting secret %s failed: %s\n"
-msgstr "刪除私鑰 %s 時失敗: %s\n"
+msgstr ""
+#: g10/delkey.c:203
msgid "key"
-msgstr "金鑰"
+msgstr ""
+#: g10/delkey.c:203
msgid "subkey"
-msgstr "子鑰"
+msgstr ""
+#: g10/delkey.c:226
#, c-format
msgid "deleting keyblock failed: %s\n"
-msgstr "刪除金鑰區塊時失敗: %s\n"
+msgstr ""
+#: g10/delkey.c:239
msgid "ownertrust information cleared\n"
-msgstr "主觀信任資訊已清除\n"
+msgstr ""
+#: g10/delkey.c:275
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
+msgstr ""
+#: g10/delkey.c:277
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
+msgstr ""
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
-msgstr "建立密語時出錯: %s\n"
+msgstr ""
+#: g10/encrypt.c:240
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
+msgstr ""
+#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
-msgstr "正在使用 %s 編密法\n"
+msgstr ""
+#: g10/encrypt.c:264 g10/encrypt.c:625
#, c-format
msgid "'%s' already compressed\n"
-msgstr "'%s' 已經被壓縮了\n"
+msgstr ""
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, c-format
msgid "WARNING: '%s' is an empty file\n"
-msgstr "警告: '%s' 是個空檔案\n"
+msgstr ""
+#: g10/encrypt.c:558
#, c-format
msgid "reading from '%s'\n"
-msgstr "正在從 '%s' 讀取\n"
+msgstr ""
+#: g10/encrypt.c:606
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
+msgstr ""
+#: g10/encrypt.c:818
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
+msgstr ""
+#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s 已加密給: \"%s\"\n"
+msgstr ""
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, c-format
msgid "you may not use %s while in %s mode\n"
-msgstr "你不能夠將 %s 用於 %s 模式中\n"
+msgstr ""
- #: g10/decrypt-data.c:93 g10/mainproc.c:306
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
-msgstr "%s 已加密的資料\n"
+msgstr ""
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
-msgstr "以 %d 未知演算法所加密\n"
+msgstr ""
+#: g10/decrypt-data.c:164 sm/decrypt.c:127
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
+msgstr ""
+#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
-msgstr "處理已加密封包有問題\n"
+msgstr ""
+#: g10/exec.c:60
msgid "no remote program execution supported\n"
-msgstr "沒有支援的遠端程式執行\n"
+msgstr ""
+#: g10/exec.c:319
msgid ""
"external program calls are disabled due to unsafe options file permissions\n"
-msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
+msgstr ""
+#: g10/exec.c:349
msgid "this platform requires temporary files when calling external programs\n"
-msgstr "在這個作業平台上叫用外部程式時需要暫存檔\n"
+msgstr ""
+#: g10/exec.c:427
#, c-format
msgid "unable to execute program '%s': %s\n"
-msgstr "無法執行程式 '%s': %s\n"
+msgstr ""
+#: g10/exec.c:430
#, c-format
msgid "unable to execute shell '%s': %s\n"
-msgstr "無法執行 shell '%s': %s\n"
+msgstr ""
+#: g10/exec.c:521
#, c-format
msgid "system error while calling external program: %s\n"
-msgstr "叫用外部程式時發生系統錯誤: %s\n"
+msgstr ""
+#: g10/exec.c:532 g10/exec.c:599
msgid "unnatural exit of external program\n"
-msgstr "外部程式不自然地離開\n"
+msgstr ""
+#: g10/exec.c:547
msgid "unable to execute external program\n"
-msgstr "無法執行外部程式\n"
+msgstr ""
+#: g10/exec.c:564
#, c-format
msgid "unable to read external program response: %s\n"
-msgstr "無法讀取外部程式回應: %s\n"
+msgstr ""
+#: g10/exec.c:610 g10/exec.c:617
#, c-format
msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
-msgstr "警告: 無法移除暫存檔 (%s) '%s': %s\n"
+msgstr ""
+#: g10/exec.c:622
#, c-format
msgid "WARNING: unable to remove temp directory '%s': %s\n"
-msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
+msgstr ""
- #: g10/export.c:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
-msgstr "匯出標記為僅限本機使用的簽章"
+msgstr ""
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
-msgstr "匯出署名使用者 ID (通常是照片 ID)"
+msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
-msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
+msgstr ""
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
-msgstr "匯出時從金鑰中移除無法使用的部分"
+msgstr ""
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
-msgstr "匯出時盡可能地從金鑰中移除"
+msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
msgid " - skipped"
-msgstr " - 已跳過"
+msgstr ""
- #: g10/export.c:1225
- msgid "exporting secret keys not allowed\n"
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, c-format
+ msgid "writing to '%s'\n"
-msgstr "正在寫入 '%s'\n"
+msgstr ""
- #: g10/export.c:1303
++#: g10/export.c:1660
#, c-format
- msgid "key %s: PGP 2.x style key - skipped\n"
+ msgid "key %s: key material on-card - skipped\n"
-msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
++msgstr ""
+
++#: g10/export.c:1846
+ msgid "exporting secret keys not allowed\n"
-msgstr "不允許匯出私鑰\n"
+msgstr ""
- #: g10/export.c:1490
++#: g10/export.c:1923
#, c-format
- msgid "key %s: key material on-card - skipped\n"
+ msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
+msgstr ""
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
-msgstr "警告: 沒有匯出任何東西\n"
+msgstr ""
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
-msgstr "建立 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/getkey.c:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
-msgstr "[找不到使用者 ID]"
+msgstr ""
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
-#, fuzzy, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
+#, c-format
msgid "(check argument of option '%s')\n"
-msgstr "\"%.50s\" 選項遺失了引數\n"
+msgstr ""
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
-#, fuzzy, c-format
-#| msgid "error closing %s: %s\n"
++#: g10/getkey.c:546
+#, c-format
msgid "error looking up: %s\n"
-msgstr "關閉 %s 時出錯: %s\n"
+msgstr ""
- #: g10/getkey.c:631
-#, fuzzy, c-format
-#| msgid "error creating keyring '%s': %s\n"
++#: g10/getkey.c:636
+#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
-msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/getkey.c:1429
++#: g10/getkey.c:1431
#, c-format
msgid "automatically retrieved '%s' via %s\n"
-msgstr "已自動取回 '%s' (經由 %s )\n"
+msgstr ""
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
-msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
+msgstr ""
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
-msgstr "沒有指紋"
+msgstr ""
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
-msgstr "找不到私鑰 \"%s\": %s\n"
+msgstr ""
- #: g10/getkey.c:1686
-#, fuzzy, c-format
-#| msgid "|NAME|use NAME as default secret key"
++#: g10/getkey.c:1735
+#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
-msgstr "|名字|使用指定名字做為預設私鑰"
+msgstr ""
- #: g10/getkey.c:1694
-#, fuzzy, c-format
-#| msgid "|NAME|use NAME as default secret key"
++#: g10/getkey.c:1743
+#, c-format
msgid "using \"%s\" as default secret key for signing\n"
-msgstr "|名字|使用指定名字做為預設私鑰"
+msgstr ""
- #: g10/getkey.c:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
+msgstr ""
- #: g10/getkey.c:3323
++#: g10/getkey.c:3377
#, c-format
msgid "using subkey %s instead of primary key %s\n"
-msgstr "使用子鑰 %s 來替換主鑰 %s\n"
+msgstr ""
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
-msgstr "建立簽章"
+msgstr ""
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
-msgstr "建立明文簽章"
+msgstr ""
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
-msgstr "建立分離式簽章"
+msgstr ""
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
-msgstr "加密資料"
+msgstr ""
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
-msgstr "僅使用對稱式編密法來加密"
+msgstr ""
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
-msgstr "資料解密 (預設)"
+msgstr ""
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
-msgstr "驗證簽章"
+msgstr ""
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
-msgstr "列出金鑰"
+msgstr ""
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
-msgstr "列出金鑰和簽章"
+msgstr ""
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
-msgstr "列出並檢查金鑰簽章"
+msgstr ""
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
-msgstr "列出金鑰和指紋"
+msgstr ""
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
-msgstr "列出私鑰"
+msgstr ""
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
-msgstr "產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:429
++#: g10/gpg.c:437
msgid "quickly generate a new key pair"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:431
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:439
msgid "quickly add a new user-id"
-msgstr "快速產生新的金鑰對"
+msgstr ""
- #: g10/gpg.c:434
-#, fuzzy
-#| msgid "quickly generate a new key pair"
++#: g10/gpg.c:442
+ msgid "quickly revoke a user-id"
-msgstr "快速產生新的金鑰對"
++msgstr ""
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
-msgstr "全能金鑰對生成"
+msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
-msgstr "產生撤銷憑證"
+msgstr ""
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
-msgstr "從公鑰鑰匙圈裡移除金鑰"
+msgstr ""
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
-msgstr "從私鑰鑰匙圈裡移除金鑰"
+msgstr ""
- #: g10/gpg.c:441
++#: g10/gpg.c:451
msgid "quickly sign a key"
-msgstr "快速簽署金鑰"
+msgstr ""
- #: g10/gpg.c:443
++#: g10/gpg.c:453
msgid "quickly sign a key locally"
-msgstr "快速在本機簽署金鑰"
+msgstr ""
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
-msgstr "簽署金鑰"
+msgstr ""
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
-msgstr "僅在本機簽署金鑰"
+msgstr ""
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
-msgstr "簽署或編輯金鑰"
+msgstr ""
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
-msgstr "更改密語"
+msgstr ""
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
-msgstr "匯出金鑰"
+msgstr ""
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
-msgstr "把金鑰匯出至金鑰伺服器"
+msgstr ""
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
-msgstr "從金鑰伺服器匯入金鑰"
+msgstr ""
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
-msgstr "在金鑰伺服器上搜尋金鑰"
+msgstr ""
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
-msgstr "從金鑰伺服器更新所有的金鑰"
+msgstr ""
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
-msgstr "匯入/合併金鑰"
+msgstr ""
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
-msgstr "列印卡片狀態"
+msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
-msgstr "變更卡片上的資料"
+msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
-msgstr "變更卡片的個人識別碼 (PIN)"
+msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
-msgstr "更新信任資料庫"
+msgstr ""
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
-msgstr "印出訊息摘要"
+msgstr ""
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
-msgstr "以伺服器模式執行"
+msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
-msgstr "建立以 ASCII 封裝過的輸出"
+msgstr ""
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
-msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
+msgstr ""
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
-msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
+msgstr ""
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
-msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
+msgstr ""
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
-msgstr "使用標準的文字模式"
+msgstr ""
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
-msgstr "|檔案|將輸出寫入至指定檔案"
+msgstr ""
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
-msgstr "不要做任何改變"
+msgstr ""
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
-msgstr "覆寫前先詢問"
+msgstr ""
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
-msgstr "使用嚴謹的 OpenPGP 行為"
+msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
msgstr ""
-"@\n"
-"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2398,608 -1912,496 +2410,613 @@@
" --list-keys [names] show keys\n"
" --fingerprint [names] show fingerprints\n"
msgstr ""
-"@\n"
-"範例:\n"
-"\n"
-" -se -r Bob [檔案] 對 Bob 這個使用者簽署及加密\n"
-" --clearsign [檔案] 做出明文簽章\n"
-" --detach-sign [檔案] 做出分離式簽章\n"
-" --list-keys [名字] 顯示金鑰\n"
-" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
msgid "Usage: @GPG@ [options] [files] (-h for help)"
-msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
+msgstr ""
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
"Default operation depends on the input data\n"
msgstr ""
-"語法: @GPG@ [選項] [檔案]\n"
-"簽署, 檢查, 加密, 解密\n"
-"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
msgstr ""
-"\n"
-"已支援的演算法:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
-msgstr "公鑰: "
+msgstr ""
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
-msgstr "編密法: "
+msgstr ""
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
-msgstr "雜湊: "
+msgstr ""
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
-msgstr "壓縮: "
+msgstr ""
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
-msgstr "用法: %s [選項] %s\n"
+msgstr ""
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
-msgstr "指令彼此矛盾\n"
+msgstr ""
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, c-format
msgid "no = sign found in group definition '%s'\n"
-msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
+msgstr ""
- #: g10/gpg.c:1507
++#: g10/gpg.c:1524
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1510
++#: g10/gpg.c:1527
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1513
++#: g10/gpg.c:1530
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1519
++#: g10/gpg.c:1536
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1522
++#: g10/gpg.c:1539
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1525
++#: g10/gpg.c:1542
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1531
++#: g10/gpg.c:1548
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1534
++#: g10/gpg.c:1551
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
+msgstr ""
- #: g10/gpg.c:1543
++#: g10/gpg.c:1560
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
-msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1546
++#: g10/gpg.c:1563
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
-msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
-msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
+msgstr ""
- #: g10/gpg.c:1756
++#: g10/gpg.c:1773
#, c-format
msgid "unknown configuration item '%s'\n"
-msgstr "未知的組態項目 '%s'\n"
+msgstr ""
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
-msgstr "列出金鑰時顯示照片 ID"
+msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
msgid "show key usage information during key listings"
-msgstr "列出金鑰時顯示金鑰用途資訊"
+msgstr ""
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
msgid "show policy URLs during signature listings"
-msgstr "列出簽章時顯示原則 URL"
+msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
-msgstr "列出簽章時顯示所有的註記"
+msgstr ""
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
-msgstr "列出簽章時顯示 IETF 標準註記"
+msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
-msgstr "列出簽章時顯示使用者提供的註記"
+msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
msgid "show preferred keyserver URLs during signature listings"
-msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
-msgstr "列出金鑰時顯示使用者 ID 有效性"
+msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
-msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
+msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
-msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
+msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
msgid "show the keyring name in key listings"
-msgstr "在金鑰清單中顯示鑰匙圈名稱"
+msgstr ""
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
-msgstr "列出簽章時顯示有效期限"
+msgstr ""
- #: g10/gpg.c:1989
-#, fuzzy
-#| msgid "Available keys:\n"
++#: g10/gpg.c:2006
msgid "available TOFU policies:\n"
-msgstr "可用金鑰:\n"
+msgstr ""
- #: g10/gpg.c:2000
-#, fuzzy, c-format
-#| msgid "unknown option '%s'\n"
++#: g10/gpg.c:2017
+#, c-format
msgid "unknown TOFU policy '%s'\n"
-msgstr "未知的選項 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
-#, fuzzy, c-format
-#| msgid "unknown command '%s'\n"
++#: g10/gpg.c:2041
+#, c-format
msgid "unknown TOFU DB format '%s'\n"
-msgstr "未知的指令 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, c-format
msgid "Note: old default options file '%s' ignored\n"
-msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
-msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
+msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, c-format
msgid "Note: %s is not for normal use!\n"
-msgstr "請注意: 一般情況下不採用 %s!\n"
+msgstr ""
- #: g10/gpg.c:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, c-format
msgid "'%s' is not a valid signature expiration\n"
-msgstr "'%s' 不是有效的簽章使用期限\n"
+msgstr ""
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, c-format
msgid "invalid pinentry mode '%s'\n"
-msgstr "無效的個人識別碼項目模式 '%s'\n"
+msgstr ""
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, c-format
msgid "'%s' is not a valid character set\n"
-msgstr "'%s' 不是有效的字元集\n"
+msgstr ""
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
-msgstr "無法剖析金鑰伺服器 URL\n"
+msgstr ""
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: 無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
-msgstr "無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: 無效的匯入選項\n"
+msgstr ""
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
-msgstr "無效的匯入選項\n"
+msgstr ""
- #: g10/gpg.c:3029
-#, fuzzy, c-format
-#| msgid "invalid list options\n"
++#: g10/gpg.c:3072 g10/gpg.c:3087
++#, c-format
+ msgid "invalid filter option: %s\n"
-msgstr "無效的清單選項\n"
++msgstr ""
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: 無效的匯出選項\n"
+msgstr ""
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
-msgstr "無效的匯出選項\n"
+msgstr ""
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: 無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
-msgstr "無效的清單選項\n"
+msgstr ""
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
-msgstr "驗證簽章時顯示照片 ID"
+msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
-msgstr "驗證簽章時顯示原則 URL"
+msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
-msgstr "驗證簽章時顯示所有的註記"
+msgstr ""
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
-msgstr "驗證簽章時顯示 IETF 標準註記"
+msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
-msgstr "驗證簽章時顯示使用者提供的註記"
+msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
-msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
-msgstr "驗證簽章時顯示使用者 ID 有效性"
+msgstr ""
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
-msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
+msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
-msgstr "驗證簽章時祇顯示主要的使用者 ID"
+msgstr ""
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
-msgstr "以 PKA 資料驗證簽章"
+msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
-msgstr "提高對持有有效 PKA 資料之簽章的信任"
+msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: 無效的驗證選項\n"
+msgstr ""
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
-msgstr "無效的驗證選項\n"
+msgstr ""
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
-msgstr "無法把執行檔路徑設成 %s\n"
+msgstr ""
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: 無效的自動金鑰定址清單\n"
+msgstr ""
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
-msgstr "無效的自動金鑰定址清單\n"
+msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
-msgstr "警告: 程式可能會傾印出核心檔!\n"
+msgstr ""
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
-msgstr "警告: %s 會推翻 %s\n"
+msgstr ""
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr "%s 不允許跟 %s 併用!\n"
+msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr "%s 跟 %s 放在一起沒有意義!\n"
+msgstr ""
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
-msgstr "警告: 正在偽造的系統時間中執行: "
+msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, c-format
msgid "will not run with insecure memory due to %s\n"
-msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
+msgstr ""
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
-msgstr "所選的編密演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
-msgstr "所選的摘要演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
-msgstr "所選的壓縮演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
-msgstr "所選的憑證摘要演算法無效\n"
+msgstr ""
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
-msgstr "completes-needed 一定要大於 0\n"
+msgstr ""
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
-msgstr "marginals-needed 一定要大於 1\n"
+msgstr ""
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
+msgstr ""
- #: g10/gpg.c:3526
++#: g10/gpg.c:3599
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
+msgstr ""
- #: g10/gpg.c:3528
++#: g10/gpg.c:3601
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
+msgstr ""
- #: g10/gpg.c:3531
++#: g10/gpg.c:3604
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
-msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
+msgstr ""
- #: g10/gpg.c:3535
++#: g10/gpg.c:3608
msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
+msgstr ""
- #: g10/gpg.c:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
-msgstr "無效的預設偏好\n"
+msgstr ""
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
-msgstr "無效的個人編密法偏好\n"
+msgstr ""
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
-msgstr "無效的個人摘要偏好\n"
+msgstr ""
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
-msgstr "無效的個人壓縮偏好\n"
+msgstr ""
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
-msgstr "%s 還沒辦法跟 %s 一起運作\n"
+msgstr ""
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
-msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3642
++#: g10/gpg.c:3715
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
-msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3647
++#: g10/gpg.c:3720
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
-msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
+msgstr ""
- #: g10/gpg.c:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
-msgstr "信任資料庫啟始失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
+msgstr ""
- #: g10/gpg.c:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
-msgstr "--store [檔名]"
+msgstr ""
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
-msgstr "--symmetric [檔名]"
+msgstr ""
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
-msgstr "'%s' 對稱式加密失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
-msgstr "--encrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
-msgstr "--symmetric --encrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
+msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
+msgstr ""
- #: g10/gpg.c:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
-msgstr "--sign [檔名]"
+msgstr ""
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
-msgstr "--sign --encrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--symmetric --sign --encrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
+msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
+msgstr ""
- #: g10/gpg.c:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
-msgstr "--sign --symmetric [檔名]"
+msgstr ""
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
-msgstr "--clearsign [檔名]"
+msgstr ""
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
-msgstr "--decrypt [檔名]"
+msgstr ""
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
-msgstr "--sign-key 使用者ID"
+msgstr ""
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
-msgstr "--lsign-key 使用者ID"
+msgstr ""
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
-msgstr "--edit-key 使用者ID [指令]"
+msgstr ""
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
-msgstr "--passwd 使用者ID"
+msgstr ""
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
-msgstr "送至金鑰伺服器失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
-msgstr "從金鑰伺服器接收失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
-msgstr "金鑰匯出失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4256
-#, fuzzy, c-format
-#| msgid "key export failed: %s\n"
++#: g10/gpg.c:4343
+#, c-format
msgid "export as ssh key failed: %s\n"
-msgstr "金鑰匯出失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
-msgstr "用金鑰伺服器搜尋失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
-msgstr "從金鑰伺服器更新失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
-msgstr "解開封裝失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
-msgstr "進行封裝失敗: %s\n"
+msgstr ""
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, c-format
msgid "invalid hash algorithm '%s'\n"
-msgstr "無效的雜湊演算法 '%s'\n"
+msgstr ""
- #: g10/gpg.c:4595
-#, fuzzy, c-format
-#| msgid "error loading certificate '%s': %s\n"
++#: g10/gpg.c:4682
+#, c-format
msgid "error parsing key specification '%s': %s\n"
-msgstr "載入憑證 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
-msgstr "[檔名]"
+msgstr ""
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
-msgstr "請開始輸入你的訊息 ...\n"
+msgstr ""
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
-msgstr "給定的的憑證原則 URL 無效\n"
+msgstr ""
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
-msgstr "給定的簽章原則 URL 無效\n"
+msgstr ""
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
-msgstr "給定的偏好金鑰伺服器 URL 無效\n"
+msgstr ""
+#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
-msgstr "|檔案|從指定鑰匙圈檔案裡取用金鑰"
+msgstr ""
+#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
-msgstr "僅把時間戳印矛盾視為警告"
+msgstr ""
+#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
-msgstr "|檔案描述|把狀態資訊寫入此指定檔案描述"
+msgstr ""
+#: g10/gpgv.c:83
msgid "|ALGO|reject signatures made with ALGO"
msgstr ""
@@@ -3012,331 -2412,272 +3029,333 @@@ msgid "
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
-"語法: gpgv [選項] [檔案]\n"
-"用已知的受信任金鑰來檢查簽章\n"
+#: g10/helptext.c:72
msgid "No help available"
-msgstr "沒有可用的說明"
+msgstr ""
+#: g10/helptext.c:82
#, c-format
msgid "No help available for '%s'"
-msgstr "'%s' 沒有可用的說明"
+msgstr ""
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
-msgstr "匯入標記為僅限本機使用的簽章"
+msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
-msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
+msgstr ""
- #: g10/import.c:110
-#, fuzzy
-#| msgid "do not update the trustdb after import"
++#: g10/import.c:140
msgid "do not clear the ownertrust values during import"
-msgstr "匯入後不要更新信任資料庫"
+msgstr ""
- #: g10/import.c:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
-msgstr "匯入後不要更新信任資料庫"
+msgstr ""
- #: g10/import.c:116
-#, fuzzy
-#| msgid "show key fingerprint"
++#: g10/import.c:146
+ msgid "show key during import"
-msgstr "顯示金鑰指紋"
++msgstr ""
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
-msgstr "祇接受既有金鑰的更新"
+msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
-msgstr "匯入後從金鑰中移除無法使用的部分"
+msgstr ""
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
-msgstr "匯入後盡可能地從金鑰中移除"
+msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
-msgstr "正在跳過 %d 型態的區塊\n"
+msgstr ""
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
-msgstr "目前已處理 %lu 把金鑰\n"
+msgstr ""
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
-msgstr "處理總量: %lu\n"
+msgstr ""
- #: g10/import.c:433
-#, fuzzy, c-format
-#| msgid " skipped new keys: %lu\n"
++#: g10/import.c:609
+#, c-format
msgid " skipped PGP-2 keys: %lu\n"
-msgstr " 已跳過的新金鑰: %lu\n"
+msgstr ""
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
-msgstr " 已跳過的新金鑰: %lu\n"
+msgstr ""
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
-msgstr " 沒有使用者的 ID: %lu\n"
+msgstr ""
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
-msgstr " 已匯入: %lu"
+msgstr ""
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
-msgstr " 未改變的: %lu\n"
+msgstr ""
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
-msgstr " 新的使用者 ID: %lu\n"
+msgstr ""
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
-msgstr " 新的子鑰: %lu\n"
+msgstr ""
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
-msgstr " 新的簽章: %lu\n"
+msgstr ""
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
-msgstr " 新的金鑰撤銷: %lu\n"
+msgstr ""
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
-msgstr " 已讀取的私鑰: %lu\n"
+msgstr ""
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
-msgstr " 已匯入的私鑰: %lu\n"
+msgstr ""
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
-msgstr " 未改變的私鑰: %lu\n"
+msgstr ""
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
-msgstr " 未被匯入: %lu\n"
+msgstr ""
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
-msgstr " 已清除的簽章: %lu\n"
+msgstr ""
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
-msgstr " 已清除的使用者 ID: %lu\n"
+msgstr ""
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
-msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
+msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
-msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
+msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
-msgstr " \"%s\": 摘要演算法 %s 的偏好設定\n"
+msgstr ""
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
-msgstr " \"%s\": 壓縮演算法 %s 的偏好設定\n"
+msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
-msgstr "我們強烈建議你更新偏好設定, 並重新\n"
+msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
-msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
+msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
+msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
-msgstr "金鑰 %s: 沒有使用者 ID\n"
+msgstr ""
- #: g10/import.c:988
++#: g10/import.c:1233
#, c-format
msgid "key %s: %s\n"
-msgstr "金鑰 %s: %s\n"
+msgstr ""
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
-msgstr "遭到匯入篩選程式駁回"
+msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
+msgstr ""
- #: g10/import.c:1035
++#: g10/import.c:1282
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
+msgstr ""
- #: g10/import.c:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
-msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
+msgstr ""
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
-msgstr "這可能肇因於遺失自我簽章所致\n"
+msgstr ""
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
-msgstr "金鑰 %s: 找不到公鑰: %s\n"
+msgstr ""
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
-msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
+msgstr ""
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
-msgstr "找不到可寫入的鑰匙圈: %s\n"
+msgstr ""
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr ""
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, c-format
msgid "error writing keyring '%s': %s\n"
-msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
-msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
+msgstr ""
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
-msgstr "金鑰 %s: 跟我們的副本不吻合\n"
+msgstr ""
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
+msgstr ""
- #: g10/import.c:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
-msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
+msgstr ""
- #: g10/import.c:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
+msgstr ""
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
+msgstr ""
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
+msgstr ""
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
+msgstr ""
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
+msgstr ""
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
+msgstr ""
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
+msgstr ""
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
+msgstr ""
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
+msgstr ""
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
+msgstr ""
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
-msgstr "金鑰 %s: \"%s\" 未改變\n"
+msgstr ""
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
-msgstr "金鑰 %s: 私鑰已匯入\n"
+msgstr ""
- #: g10/import.c:1570
++#: g10/import.c:1858
#, c-format
msgid "key %s: secret key already exists\n"
-msgstr "金鑰 %s: 私鑰已存在\n"
+msgstr ""
- #: g10/import.c:1578
++#: g10/import.c:1866
#, c-format
msgid "key %s: error sending to agent: %s\n"
-msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
+msgstr ""
- #: g10/import.c:1683
++#: g10/import.c:1971
#, c-format
msgid "secret key %s: %s\n"
-msgstr "私鑰 %s: %s\n"
+msgstr ""
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
-msgstr "未允許匯入私鑰\n"
+msgstr ""
- #: g10/import.c:1727
++#: g10/import.c:2015
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
+msgstr ""
#. TRANSLATORS: For smartcard, each private key on
#. host has a reference (stub) to a smartcard and
@@@ -3348,1233 -2689,1019 +3367,1243 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
-msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
+msgstr ""
- #: g10/import.c:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
+msgstr ""
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
+msgstr ""
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
-msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
+msgstr ""
- #: g10/import.c:2023
++#: g10/import.c:2308
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
+msgstr ""
- #: g10/import.c:2025
++#: g10/import.c:2310
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
+msgstr ""
- #: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
-msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+msgstr ""
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
-msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
+msgstr ""
- #: g10/import.c:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
-msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
+msgstr ""
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
-msgstr "金鑰 %s: 無效的附帶子鑰\n"
+msgstr ""
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
-msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
+msgstr ""
- #: g10/import.c:2108
++#: g10/import.c:2393
#, c-format
msgid "key %s: no subkey for key revocation\n"
-msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
+msgstr ""
- #: g10/import.c:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
-msgstr "金鑰 %s: 無效的子鑰撤銷\n"
+msgstr ""
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
-msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
+msgstr ""
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
+msgstr ""
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
-msgstr "金鑰 %s: 子鑰已跳過\n"
+msgstr ""
- #: g10/import.c:2233
-# here we violate the rfc a bit by still allowing
-# * to import non-exportable signature when we have the
-# * the secret key used to create this signature - it
-# * seems that this makes sense
++#: g10/import.c:2516
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
+msgstr ""
- #: g10/import.c:2244
++#: g10/import.c:2527
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
+msgstr ""
- #: g10/import.c:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
+msgstr ""
- #: g10/import.c:2276
++#: g10/import.c:2559
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
+msgstr ""
- #: g10/import.c:2284
++#: g10/import.c:2567
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
+msgstr ""
- #: g10/import.c:2413
++#: g10/import.c:2696
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
+msgstr ""
- #: g10/import.c:2477
++#: g10/import.c:2760
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
-msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
+msgstr ""
- #: g10/import.c:2493
++#: g10/import.c:2776
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
-msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
+msgstr ""
- #: g10/import.c:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
+msgstr ""
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
-msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
+msgstr ""
+#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
#, c-format
msgid "error creating keybox '%s': %s\n"
-msgstr "建立金鑰鑰匙盒 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/keydb.c:405 g10/keydb.c:432
#, c-format
msgid "error creating keyring '%s': %s\n"
-msgstr "建立鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
+#: g10/keydb.c:441 sm/keydb.c:229
#, c-format
msgid "keybox '%s' created\n"
-msgstr "鑰匙盒 '%s' 已建立\n"
+msgstr ""
+#: g10/keydb.c:443
#, c-format
msgid "keyring '%s' created\n"
-msgstr "鑰匙圈 '%s' 已建立\n"
+msgstr ""
+#: g10/keydb.c:822
#, c-format
msgid "keyblock resource '%s': %s\n"
-msgstr "金鑰區塊資源 '%s': %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "error opening '%s': %s\n"
+#: g10/keydb.c:907
+#, c-format
msgid "error opening key DB: %s\n"
-msgstr "開啟 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
-msgstr "重新建立鑰匙圈快取失敗: %s\n"
+msgstr ""
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[revocation]"
-msgstr "[撤銷]"
+msgstr ""
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
-msgstr "[自我簽章]"
+msgstr ""
- #: g10/keyedit.c:615
-#, fuzzy, c-format
-#| msgid "key %s: unsupported public key algorithm\n"
++#: g10/keyedit.c:618
+#, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-msgstr "金鑰 %s: 未支援的公鑰演算法\n"
+msgstr ""
- #: g10/keyedit.c:624
-#, fuzzy, c-format
-#| msgid "card does not support digest algorithm %s\n"
++#: g10/keyedit.c:627
+#, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr "卡片不支援 %s 摘要演算法\n"
+msgstr ""
- #: g10/keyedit.c:786
-#, fuzzy
-#| msgid "Good signature from"
++#: g10/keyedit.c:789
msgid " (reordered signatures follow)"
-msgstr "完好的簽章來自於"
+msgstr ""
- #: g10/keyedit.c:899
-#, fuzzy, c-format
-#| msgid "key %s: %s\n"
++#: g10/keyedit.c:902
+#, c-format
msgid "key %s:\n"
-msgstr "金鑰 %s: %s\n"
+msgstr ""
- #: g10/keyedit.c:902
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
++#: g10/keyedit.c:905
+#, c-format
msgid "%d duplicate signature removed\n"
msgid_plural "%d duplicate signatures removed\n"
-msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:905 g10/keylist.c:479
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to a missing key\n"
++#: g10/keyedit.c:908 g10/keylist.c:480
+#, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
-msgstr[0] "有 1 份簽章因為遺失金鑰而未被檢查\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:909 g10/keylist.c:475
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
++#: g10/keyedit.c:912 g10/keylist.c:476
+#, c-format
msgid "%d bad signature\n"
msgid_plural "%d bad signatures\n"
-msgstr[0] "%d 份損壞的簽章\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:913
-#, fuzzy, c-format
-#| msgid "Good signature from"
++#: g10/keyedit.c:916
+#, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
-msgstr[0] "完好的簽章來自於"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
"(by looking at passports, checking fingerprints from different sources, "
"etc.)\n"
msgstr ""
-"請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
-"(像是查對身份證, 或從不同的來源檢查指紋等...)的能力\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
-msgstr " %d = 我勉強信任\n"
+msgstr ""
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
-msgstr " %d = 我完全信任\n"
+msgstr ""
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
-"請輸入此信任簽章的深度.\n"
-"深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
-"同時也信任這把金鑰所簽署的信任簽章.\n"
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
+msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
-msgstr "使用者 ID \"%s\" 已撤銷."
+msgstr ""
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "你仍然想要簽署它嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
-msgstr " 無法簽署.\n"
+msgstr ""
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
-msgstr "使用者 ID \"%s\" 已過期."
+msgstr ""
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
-msgstr "使用者 ID \"%s\" 未經自我簽署."
+msgstr ""
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
-msgstr "使用者 ID \"%s\" 可被簽署."
+msgstr ""
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
-msgstr "是否要簽署? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
"is a PGP 2.x-style signature.\n"
msgstr ""
-"\"%s\" 裡的自我簽章\n"
-"是 PGP 2.x 型態的簽章.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr ""
-"你目前在 \"%s\" 的簽章\n"
-"已經過期了.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr ""
-"你目前在 \"%s\" 的簽章\n"
-"是一份本機簽章.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
+msgstr ""
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
+msgstr ""
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "你仍然想要再次簽署它嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
-msgstr "沒有東西可以讓金鑰 %s 簽署\n"
+msgstr ""
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
-msgstr "這把金鑰已經過期了!"
+msgstr ""
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
-msgstr "這把金鑰將在 %s 過期.\n"
+msgstr ""
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
+msgstr ""
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
"to the person named above? If you don't know what to answer, enter \"0\".\n"
msgstr ""
-"你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
-"如果你不知道這個問題的答案, 請輸入 \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
-msgstr " (0) 我不作答.%s\n"
+msgstr ""
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
-msgstr " (1) 我根本沒有檢查過.%s\n"
+msgstr ""
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
-msgstr " (2) 我隨意檢查過了.%s\n"
+msgstr ""
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
-msgstr " (3) 我非常小心地檢查過了.%s\n"
+msgstr ""
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
msgid "Your selection? (enter '?' for more information): "
-msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
+msgstr ""
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
"key \"%s\" (%s)\n"
msgstr ""
-"你真的確定要用你的金鑰 \"%s\" (%s)\n"
-"來簽署這把金鑰嗎\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
-msgstr "這將會是一份自我簽章.\n"
+msgstr ""
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
+msgstr ""
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
+msgstr ""
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
-msgstr "這份簽章會被標記成不可匯出.\n"
+msgstr ""
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
-msgstr "這份簽章會被標記成不可撤銷.\n"
+msgstr ""
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
-msgstr "我根本沒有檢查過這把金鑰.\n"
+msgstr ""
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
-msgstr "我隨意檢查過這把金鑰了.\n"
+msgstr ""
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
-msgstr "我非常小心地檢查過這把金鑰了.\n"
+msgstr ""
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
-msgstr "真的要簽署嗎? (y/N)"
+msgstr ""
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
-msgstr "簽署時失敗: %s\n"
+msgstr ""
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
-msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
+msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, c-format
msgid "key %s: error changing passphrase: %s\n"
-msgstr "金鑰 %s: 變更密語時出錯: %s\n"
+msgstr ""
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
-msgstr "儲存並離開"
+msgstr ""
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
-msgstr "顯示金鑰指紋"
+msgstr ""
- #: g10/keyedit.c:1859
-#, fuzzy
-#| msgid "Enter the keygrip: "
++#: g10/keyedit.c:1862
msgid "show the keygrip"
-msgstr "請輸入金鑰鑰柄: "
+msgstr ""
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
-msgstr "列出金鑰和使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
-msgstr "選擇使用者 ID N"
+msgstr ""
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
-msgstr "選擇子鑰 N"
+msgstr ""
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
-msgstr "檢查簽章"
+msgstr ""
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
-msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
+msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
-msgstr "僅在本機簽署所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
-msgstr "用信任簽章來簽署所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
-msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
-msgstr "增加使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
-msgstr "增加照片 ID"
+msgstr ""
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
-msgstr "刪除所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
-msgstr "增加子鑰"
+msgstr ""
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
-msgstr "將金鑰加到智慧卡"
+msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
-msgstr "將金鑰移動到智慧卡"
+msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
-msgstr "將備份金鑰移動到智慧卡"
+msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
-msgstr "刪除所選的子鑰"
+msgstr ""
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
-msgstr "增加撤銷金鑰"
+msgstr ""
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
-msgstr "從所選的使用者 ID 中刪除簽章"
+msgstr ""
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
-msgstr "變更金鑰或所選子鑰的使用期限"
+msgstr ""
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
-msgstr "把所選的使用者 ID 標為主要"
+msgstr ""
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
-msgstr "列出偏好 (專家模式)"
+msgstr ""
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
-msgstr "列出偏好 (囉唆模式)"
+msgstr ""
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
-msgstr "設定所選使用者 ID 的偏好清單"
+msgstr ""
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
+msgstr ""
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
-msgstr "為所選的使用者 ID 設定註記"
+msgstr ""
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
-msgstr "更改密語"
+msgstr ""
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
-msgstr "更改主觀信任"
+msgstr ""
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
-msgstr "撤銷所選使用者 ID 的簽章"
+msgstr ""
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
-msgstr "撤銷所選的使用者 ID"
+msgstr ""
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
-msgstr "撤銷金鑰或所選的子鑰"
+msgstr ""
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
-msgstr "啟用金鑰"
+msgstr ""
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
-msgstr "停用金鑰"
+msgstr ""
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
-msgstr "顯示所選的照片 ID"
+msgstr ""
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
-msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
+msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
-msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
+msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
-msgstr "私鑰可用.\n"
+msgstr ""
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
-msgstr "要有私鑰纔能這麼做.\n"
+msgstr ""
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
" a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
-"* 這個 'sign' 指令也可以在前面加上一個 'l' 字母, 來表示本機簽章 (lsign),\n"
-" 加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
-" (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
-msgstr "金鑰已撤銷."
+msgstr ""
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
-msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2252
-#, fuzzy
-#| msgid "Really sign all user IDs? (y/N) "
++#: g10/keyedit.c:2255
msgid "Really sign all text user IDs? (y/N) "
-msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
-msgstr "提示: 選擇使用者 ID 來加以簽署\n"
+msgstr ""
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, c-format
msgid "Unknown signature type '%s'\n"
-msgstr "未知的簽章種類 '%s'\n"
+msgstr ""
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, c-format
msgid "This command is not allowed while in %s mode.\n"
-msgstr "在 %s 模式中不允許使用這個指令.\n"
+msgstr ""
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
-msgstr "你至少得選擇一個使用者 ID.\n"
+msgstr ""
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
-msgstr "你不能刪除最後一個使用者 ID!\n"
+msgstr ""
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
-msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
msgid "Really remove this user ID? (y/N) "
-msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
+msgstr ""
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
-msgstr "真的要移動主鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
-msgstr "你一定祇得選擇一把金鑰.\n"
+msgstr ""
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
-msgstr "這項指令要拿一個檔名來當作引數\n"
+msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, c-format
msgid "Can't open '%s': %s\n"
-msgstr "無法開啟 '%s': %s\n"
+msgstr ""
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, c-format
msgid "Error reading backup key from '%s': %s\n"
-msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
+msgstr ""
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
-msgstr "你至少得選擇一把金鑰.\n"
+msgstr ""
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
-msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
-msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
msgid "Do you really want to revoke the entire key? (y/N) "
-msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
-msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
+msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
-msgstr "設定偏好清單至:\n"
+msgstr ""
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
-msgstr "真的要更新偏好設定嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
-msgstr "要儲存變更嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
-msgstr "要不儲存就離開嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
-msgstr "更新失敗: %s\n"
+msgstr ""
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
-msgstr "金鑰沒有變更所以不需要更新.\n"
+msgstr ""
- #: g10/keyedit.c:2963
-#, fuzzy, c-format
-#| msgid "Key generation failed: %s\n"
++#: g10/keyedit.c:3025
++#, c-format
+ msgid "User ID revocation failed: %s\n"
-msgstr "產生金鑰失敗: %s\n"
++msgstr ""
+
++#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
-msgstr "\"%s\" 不是指紋\n"
+msgstr ""
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
-msgstr "\"%s\" 不是主要指紋\n"
+msgstr ""
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
-#, fuzzy, c-format
-#| msgid "invalid value\n"
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
+#, c-format
msgid "Invalid user ID '%s': %s\n"
-msgstr "無效的數值\n"
+msgstr ""
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "No matching user IDs."
-msgstr "沒有相符的使用者 ID."
+msgstr ""
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "Nothing to sign.\n"
-msgstr "沒有東西可以簽署.\n"
+msgstr ""
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
-msgstr "摘要: "
+msgstr ""
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
-msgstr "特點: "
+msgstr ""
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
-msgstr "金鑰伺服器無修改"
+msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
-msgstr "偏好的金鑰伺服器: "
+msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
-msgstr "註記: "
+msgstr ""
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
+msgstr ""
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
-msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
+msgstr ""
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
#, c-format
msgid "This key may be revoked by %s key %s"
-msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
+msgstr ""
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
-msgstr "(機密)"
+msgstr ""
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
-msgstr "建立: %s"
+msgstr ""
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
-msgstr "撤銷: %s"
+msgstr ""
- #: g10/keyedit.c:3793 g10/keylist.c:1993
-# of subkey
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
-msgstr "過期: %s"
+msgstr ""
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
-# of subkey
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
-msgstr "到期: %s"
+msgstr ""
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
-msgstr "用途: %s"
+msgstr ""
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
-msgstr "卡片編號: "
+msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
-msgstr "信任: %s"
+msgstr ""
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
-msgstr "有效性: %s"
+msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
-msgstr "這把金鑰已經停用了"
+msgstr ""
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
-"請注意顯示出來的金鑰有效性不需要更正,\n"
-"除非你重新執行程式.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
-msgstr "已撤銷"
+msgstr ""
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
-msgstr "已過期"
+msgstr ""
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
-"警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
-" 導致不同的使用者 ID 被當成主要 ID.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
-msgstr "警告: 你的加密子鑰很快將到期.\n"
+msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
msgid "You may want to change its expiration date too.\n"
-msgstr "你可能也會想變更其使用期限.\n"
+msgstr ""
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
" of PGP to reject this key.\n"
msgstr ""
-"警告: 這是一把 PGP2 型態的金鑰.\n"
-" 增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
-msgstr "你確定仍然想要增加嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
+msgstr ""
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
-msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
+msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
-msgstr "刪除這份完好的簽章嗎? (y/N/q)"
+msgstr ""
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
-msgstr "刪除這份無效的簽章嗎? (y/N/q)"
+msgstr ""
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
-msgstr "刪除這份未知的簽章嗎? (y/N/q)"
+msgstr ""
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
-msgstr "真的要刪除這份自我簽章嗎? (y/N)"
+msgstr ""
- #: g10/keyedit.c:4342
-#, fuzzy, c-format
-#| msgid "Deleted %d signature.\n"
++#: g10/keyedit.c:4449
+#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
-msgstr[0] "已經刪除了 %d 份簽章.\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
-msgstr "沒有刪除任何東西.\n"
+msgstr ""
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
-msgstr "無效"
+msgstr ""
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
-msgstr "使用者 ID \"%s\" 已精簡: %s\n"
+msgstr ""
- #: g10/keyedit.c:4389
-#, fuzzy, c-format
-#| msgid "User ID \"%s\": %d signature removed\n"
++#: g10/keyedit.c:4496
+#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
-msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyedit.c:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
-msgstr "使用者 ID \"%s\": 已經最小化了\n"
+msgstr ""
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
-msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
+msgstr ""
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
" some versions of PGP to reject this key.\n"
msgstr ""
-"警告: 這是一把 PGP2 型態的金鑰.\n"
-" 增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
-msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
+msgstr ""
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
-msgstr "輸入指定撤銷者的使用者 ID: "
+msgstr ""
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
+msgstr ""
- #: g10/keyedit.c:4535
-# 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:4642
msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
+msgstr ""
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
msgid "this key has already been designated as a revoker\n"
-msgstr "已指定這把金鑰為撤銷者了\n"
+msgstr ""
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
+msgstr ""
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
-msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:4632
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
++#: g10/keyedit.c:4739
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
-msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
-msgstr "正在變更子鑰的使用期限.\n"
+msgstr ""
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
-msgstr "正在變更主鑰的使用期限.\n"
+msgstr ""
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
msgid "You can't change the expiration date of a v3 key\n"
-msgstr "你不能變更 v3 金鑰的使用期限\n"
+msgstr ""
- #: g10/keyedit.c:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
-msgstr "簽署子鑰 %s 已經交叉認證過了\n"
+msgstr ""
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
-msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
+msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
-msgstr "請祇選擇一個使用者 ID.\n"
+msgstr ""
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
+msgstr ""
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
-msgstr "請輸入你的偏好金鑰伺服器 URL: "
+msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
-msgstr "你確定要取代它嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
-msgstr "你確定要刪除它嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
-msgstr "請輸入註記: "
+msgstr ""
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
-msgstr "是否繼續? (y/N) "
+msgstr ""
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
-msgstr "索引 %d 沒有對應到使用者 ID\n"
+msgstr ""
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
-msgstr "雜湊 %s 沒有對應到使用者 ID\n"
+msgstr ""
- #: g10/keyedit.c:5716
-#, fuzzy, c-format
-#| msgid "No subkey with index %d\n"
++#: g10/keyedit.c:5823
+#, c-format
msgid "No subkey with key ID '%s'.\n"
-msgstr "索引 %d 沒有對應到子鑰\n"
+msgstr ""
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
-msgstr "索引 %d 沒有對應到子鑰\n"
+msgstr ""
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
-msgstr "使用者 ID: \"%s\"\n"
+msgstr ""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
-msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
+msgstr ""
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
-msgstr " (不可匯出)"
+msgstr ""
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
-msgstr "這份簽章已經在 %s 過期了.\n"
+msgstr ""
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "你確定仍然想要撤銷它嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
-msgstr "並非由你所簽署.\n"
+msgstr ""
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, c-format
msgid "You have signed these user IDs on key %s:\n"
-msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
+msgstr ""
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
-msgstr " (不可撤銷)"
+msgstr ""
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
-msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
+msgstr ""
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
-msgstr "你正要撤銷這些簽章:\n"
+msgstr ""
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
-msgstr "真的要建立撤銷憑證嗎? (y/N) "
+msgstr ""
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
-msgstr "沒有私鑰\n"
+msgstr ""
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
-msgstr "使用者 ID \"%s\" 已撤銷\n"
+msgstr ""
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
+msgstr ""
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
-msgstr "金鑰 %s 已撤銷.\n"
+msgstr ""
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
-msgstr "子鑰 %s 已撤銷.\n"
+msgstr ""
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
+msgstr ""
+#: g10/keygen.c:295
#, c-format
msgid "preference '%s' duplicated\n"
-msgstr "偏好設定 '%s' 重複了\n"
+msgstr ""
+#: g10/keygen.c:302
msgid "too many cipher preferences\n"
-msgstr "編密偏好過多\n"
+msgstr ""
+#: g10/keygen.c:304
msgid "too many digest preferences\n"
-msgstr "摘要偏好過多\n"
+msgstr ""
+#: g10/keygen.c:306
msgid "too many compression preferences\n"
-msgstr "壓縮偏好過多\n"
+msgstr ""
+#: g10/keygen.c:447
#, c-format
msgid "invalid item '%s' in preference string\n"
-msgstr "偏好字串中含有無效的項目 '%s'\n"
+msgstr ""
+#: g10/keygen.c:926
msgid "writing direct signature\n"
-msgstr "寫入直接簽章中\n"
+msgstr ""
+#: g10/keygen.c:972
msgid "writing self signature\n"
-msgstr "寫入自我簽章中\n"
+msgstr ""
+#: g10/keygen.c:1028
msgid "writing key binding signature\n"
-msgstr "寫入附鑰簽章中\n"
+msgstr ""
+#: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
+#: g10/keygen.c:1600 g10/keygen.c:1605
#, c-format
msgid "keysize invalid; using %u bits\n"
-msgstr "金鑰尺寸無效; 改用 %u 位元\n"
+msgstr ""
+#: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
#, c-format
msgid "keysize rounded up to %u bits\n"
-msgstr "金鑰尺寸增大到 %u 位元\n"
+msgstr ""
+#: g10/keygen.c:1493
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
-msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
+msgstr ""
+#: g10/keygen.c:1667
msgid "Sign"
-msgstr "簽署"
+msgstr ""
+#: g10/keygen.c:1670
msgid "Certify"
-msgstr "保證"
+msgstr ""
+#: g10/keygen.c:1673
msgid "Encrypt"
-msgstr "加密"
+msgstr ""
+#: g10/keygen.c:1676
msgid "Authenticate"
-msgstr "鑑定"
+msgstr ""
#. TRANSLATORS: Please use only plain ASCII characters for the
#. translation. If this is not possible use single digits. The
@@@ -4907,222 -3997,182 +4936,217 @@@ msgid "
"disks) during the prime generation; this gives the random number\n"
"generator a better chance to gain enough entropy.\n"
msgstr ""
-"我們需要產生大量的隨機位元組. 這個時候你可以多做一些事情\n"
-"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
-"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
-msgstr "產生金鑰失敗: %s\n"
+msgstr ""
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
" \"%s\"\n"
"\n"
msgstr ""
-"即將建立用於此之金鑰:\n"
-" \"%s\"\n"
-"\n"
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
-msgstr "是否繼續? (Y/n) "
+msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, c-format
msgid "A key for \"%s\" already exists\n"
-msgstr "\"%s\" 的金鑰已存在\n"
+msgstr ""
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
msgid "Create anyway? (y/N) "
-msgstr "無論如何還是要建立嗎? (y/N) "
+msgstr ""
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
msgid "creating anyway\n"
-msgstr "總之還是在建立\n"
+msgstr ""
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
-msgstr "請注意: 如需全能金鑰產生對話框請用 \"%s %s\".\n"
+msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
-msgstr "金鑰產生已取消.\n"
+msgstr ""
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, c-format
msgid "can't create backup file '%s': %s\n"
-msgstr "無法建立備份檔案 '%s': %s\n"
+msgstr ""
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
-msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
+msgstr ""
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, c-format
msgid "writing public key to '%s'\n"
-msgstr "正在寫入公鑰至 '%s'\n"
+msgstr ""
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
-msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
+msgstr ""
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, c-format
msgid "error writing public keyring '%s': %s\n"
-msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
+msgstr ""
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
-msgstr "公鑰和私鑰已建立及簽署.\n"
+msgstr ""
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
-"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
-"來產生加密用的子鑰.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
-msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
+msgstr ""
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
-msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
+msgstr ""
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
+msgstr ""
- #: g10/keygen.c:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
-msgstr "主鑰的私鑰部分無法取用.\n"
+msgstr ""
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
msgid "Secret parts of primary key are stored on-card.\n"
-msgstr "主鑰的私鑰部分存放於卡上.\n"
+msgstr ""
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
-msgstr "真的要建立嗎? (y/N) "
+msgstr ""
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
-msgstr "永遠不過期"
+msgstr ""
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
-msgstr "關鍵簽章原則: "
+msgstr ""
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
-msgstr "簽章原則: "
+msgstr ""
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
-msgstr "執意偏好的金鑰伺服器: "
+msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
-msgstr "關鍵簽章註記: "
+msgstr ""
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
-msgstr "簽章註記: "
+msgstr ""
- #: g10/keylist.c:471
-#, fuzzy, c-format
-#| msgid "%d bad signatures\n"
++#: g10/keylist.c:472
+#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
-msgstr[0] "%d 份損壞的簽章\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keylist.c:484
-#, fuzzy, c-format
-#| msgid "1 signature not checked due to an error\n"
++#: g10/keylist.c:485
+#, c-format
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
-msgstr[0] "有 1 份簽章因錯誤而未被檢查\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keylist.c:566
-#, fuzzy, c-format
-#| msgid "Warning: %lu key(s) skipped due to their large size\n"
++#: g10/keylist.c:567
+#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
-msgstr[0] "警告: %lu 把金鑰因尺寸太大已跳過\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
-msgstr "鑰匙圈"
+msgstr ""
- #: g10/keylist.c:936 g10/keyserver.c:1818 g10/skclist.c:196 g10/skclist.c:224
- #, c-format
- msgid "skipped \"%s\": %s\n"
- msgstr ""
-
- #: g10/keylist.c:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
-msgstr " 主鑰指紋:"
+msgstr ""
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
-msgstr " 子鑰指紋:"
+msgstr ""
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
-msgstr " 主鑰指紋:"
+msgstr ""
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
-msgstr " 子鑰指紋:"
+msgstr ""
- #: g10/keylist.c:1871 g10/keylist.c:1887
-# use tty
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
-msgstr " 金鑰指紋 ="
+msgstr ""
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
-msgstr " 卡片序號 ="
+msgstr ""
+#: g10/keyring.c:1489
#, c-format
msgid "caching keyring '%s'\n"
-msgstr "快取鑰匙圈 '%s' 中\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "%lu keys cached so far (%lu signatures)\n"
+#: g10/keyring.c: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[0] ""
+msgstr[1] ""
-#, 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[0] ""
+msgstr[1] ""
-#, 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[0] ""
+msgstr[1] ""
+#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
-msgstr "%s: 鑰匙圈已建立\n"
+msgstr ""
+#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
msgstr ""
@@@ -5138,351 -4185,284 +5162,356 @@@ msgstr "
msgid "override timeout options set for dirmngr"
msgstr ""
+#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
-msgstr "驗證簽章時自動取回金鑰"
+msgstr ""
+#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
-msgstr "尊重金鑰上所設定的偏好金鑰伺服器 URL"
+msgstr ""
+#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
-msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
+msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
msgid "disabled"
-msgstr "已停用"
+msgstr ""
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
+msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
+msgstr ""
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
-msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
+msgstr ""
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
-#, fuzzy, c-format
-#| msgid "refreshing %d keys from %s\n"
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
+#, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
-msgstr[0] "更新 %d 份金鑰中 (從 %s )\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/keyserver.c:1424
++#: g10/keyserver.c:1426
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
+msgstr ""
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
-msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
+msgstr ""
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
-msgstr "在金鑰伺服器上找不到金鑰\n"
+msgstr ""
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
-msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
+msgstr ""
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
-msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
+msgstr ""
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
-msgstr "正在請求金鑰 %s 自 %s\n"
+msgstr ""
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
-#, fuzzy
-#| msgid "invalid keyserver options\n"
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
msgid "no keyserver known\n"
-msgstr "無效的金鑰伺服器選項\n"
+msgstr ""
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
-msgstr "已跳過 \"%s\": %s\n"
++msgstr ""
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
-msgstr "遞送金鑰 %s 至 %s\n"
+msgstr ""
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, c-format
msgid "requesting key from '%s'\n"
-msgstr "正在向 '%s' 請求金鑰\n"
+msgstr ""
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "警告: 無法抓取 URI %s: %s\n"
+msgstr ""
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
-msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
+msgstr ""
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
-msgstr "%s 加密過的階段金鑰\n"
+msgstr ""
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "密語係以未知的 %d 摘要演算法所產生\n"
+msgstr ""
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
-msgstr "公鑰為 %s\n"
+msgstr ""
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
-msgstr "公鑰加密過的資料: 完好的 DEK\n"
+msgstr ""
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "已用 %u 位元長的 %s 金鑰, ID %s, 建立於 %s 所加密\n"
+msgstr ""
- #: g10/mainproc.c:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
-msgstr " \"%s\"\n"
+msgstr ""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
-msgstr "已用 %s 金鑰, ID %s 所加密\n"
+msgstr ""
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
-msgstr "公鑰解密失敗: %s\n"
+msgstr ""
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
-msgstr "已用 %lu 個密語加密了\n"
+msgstr ""
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
-msgstr "已用 1 個密語加密了\n"
+msgstr ""
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
-msgstr "假定 %s 為加密過的資料\n"
+msgstr ""
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
+msgstr ""
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
-msgstr "警告: 訊息未受到完整的保護\n"
+msgstr ""
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
-msgstr "解密成功\n"
+msgstr ""
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "警告: 加密過的訊息已經被變造了!\n"
+msgstr ""
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
-msgstr "解密失敗: %s\n"
+msgstr ""
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
-msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
+msgstr ""
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
-msgstr "原始的檔名 ='%.*s'\n"
+msgstr ""
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
-msgstr "警告: 看到了多份明文\n"
+msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
+msgstr ""
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
-msgstr "找不到簽章\n"
+msgstr ""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
-msgstr "*損壞* 的簽章來自於 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
-msgstr "過期的簽章來自於 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
-msgstr "完好的簽章來自於 \"%s\""
+msgstr ""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
-msgstr "簽章驗證已抑制\n"
+msgstr ""
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
-msgstr "無法處理這個不明確的簽章資料\n"
+msgstr ""
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
-msgstr "由 %s 建立的簽章\n"
+msgstr ""
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
-msgstr " 使用 %s 金鑰 %s\n"
+msgstr ""
- #: g10/mainproc.c:1727
++#: g10/mainproc.c:1725
#, c-format
msgid "Signature made %s using %s key ID %s\n"
-msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
+msgstr ""
- #: g10/mainproc.c:1746
++#: g10/mainproc.c:1744
msgid "Key available at: "
-msgstr "可用的金鑰於: "
+msgstr ""
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
-msgstr "[ 不確定 ]"
+msgstr ""
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
-msgstr " 亦即 \"%s\""
+msgstr ""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
-msgstr "這份簽署已經在 %s 過期了\n"
+msgstr ""
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
-msgstr "這份簽署將在 %s 到期\n"
+msgstr ""
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
-msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
+msgstr ""
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
msgid "binary"
-msgstr "二進制"
+msgstr ""
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
-msgstr "文字模式"
+msgstr ""
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
-msgstr "未知"
+msgstr ""
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
msgid ", key algorithm "
-msgstr ", 金鑰演算法 "
+msgstr ""
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
-msgstr "無法檢查簽章: %s\n"
+msgstr ""
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
-msgstr "不是一份分離的簽章\n"
+msgstr ""
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
-msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
+msgstr ""
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
-msgstr "等級 0x%02x 的獨立簽章\n"
+msgstr ""
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
-msgstr "舊型 (PGP 2.x) 簽章\n"
+msgstr ""
+#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
#, c-format
msgid "fstat of '%s' failed in %s: %s\n"
-msgstr "'%s' 的 fstat 失敗於 %s: %s\n"
+msgstr ""
+#: g10/misc.c:170
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
-msgstr "fstat(%d) 失敗於 %s: %s\n"
+msgstr ""
+#: g10/misc.c:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "警告: 正在使用實驗性的 %s 公鑰演算法\n"
+msgstr ""
+#: g10/misc.c:286
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
-msgstr "警告: 已不建議使用 Elgamal 簽署暨加密金鑰\n"
+msgstr ""
+#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
+msgstr ""
+#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
+msgstr ""
+#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "警告: 已不建議使用 %s 摘要演算法\n"
+msgstr ""
+#: g10/misc.c:353
#, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
-msgstr "請注意: 採用 %s 演算法的簽章已遭駁回\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "%s:%u: read error: %s\n"
+#: g10/misc.c:375
+#, c-format
msgid "(reported error: %s)\n"
-msgstr "%s:%u: 讀取錯誤: %s\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "read error in '%s': %s\n"
+#: g10/misc.c:378
+#, c-format
msgid "(reported error: %s <%s>)\n"
-msgstr "'%s' 讀取錯誤: %s\n"
+msgstr ""
+#: g10/misc.c:397
msgid "(further info: "
msgstr ""
@@@ -5515,103 -4489,83 +5544,103 @@@ msgstr "
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
-msgstr "警告: \"%s%s\" 是已廢棄的選項 - 除了對 %s 之外沒有效果\n"
+msgstr ""
+#: g10/misc.c:1147
msgid "Uncompressed"
-msgstr "未壓縮"
+msgstr ""
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1172
msgid "uncompressed|none"
-msgstr "uncompressed|none|未壓縮|無"
+msgstr ""
+#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
-msgstr "這個訊息對 %s 來說無法使用\n"
+msgstr ""
+#: g10/misc.c:1467
#, c-format
msgid "ambiguous option '%s'\n"
-msgstr "不明確的選項 '%s'\n"
+msgstr ""
+#: g10/misc.c:1492
#, c-format
msgid "unknown option '%s'\n"
-msgstr "未知的選項 '%s'\n"
+msgstr ""
+#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
-msgstr "ECDSA 公鑰應該要是 8 位元倍數的 SEC 編碼\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "Unknown signature type '%s'\n"
+#: g10/misc.c:1752
+#, c-format
msgid "unknown weak digest '%s'\n"
-msgstr "未知的簽章種類 '%s'\n"
+msgstr ""
+#: g10/openfile.c:84
#, c-format
msgid "File '%s' exists. "
-msgstr "檔案 '%s' 已存在. "
+msgstr ""
+#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
-msgstr "是否覆寫? (y/N) "
+msgstr ""
+#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
-msgstr "%s: 未知的副檔名\n"
+msgstr ""
+#: g10/openfile.c:147
msgid "Enter new filename"
-msgstr "請輸入新的檔名"
+msgstr ""
+#: g10/openfile.c:218
msgid "writing to stdout\n"
-msgstr "寫到標準輸出中\n"
+msgstr ""
+#: g10/openfile.c:366
#, c-format
msgid "assuming signed data in '%s'\n"
-msgstr "假設被簽署的資料在 '%s'\n"
+msgstr ""
+#: g10/openfile.c:457
#, c-format
msgid "new configuration file '%s' created\n"
-msgstr "新的組態檔案 '%s' 已建立\n"
+msgstr ""
+#: g10/openfile.c:498
#, c-format
msgid "WARNING: options in '%s' are not yet active during this run\n"
-msgstr "警告: 在 '%s' 裡的選項於這次執行期間並沒有被啟用\n"
+msgstr ""
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
-msgstr "無法操作 %d 公開金鑰演算法\n"
+msgstr ""
+#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
+msgstr ""
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
-msgstr "%d 類別的子封包設定了關鍵位元\n"
+msgstr ""
+#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
-msgstr "代理程式的問題: %s\n"
+msgstr ""
+#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
-msgstr " (主要金鑰 ID %s)"
+msgstr ""
+#: g10/passphrase.c:277
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@@ -5846,278 -4773,225 +5875,278 @@@ msgid "
"in the user ID. If you *really* know what you are doing,\n"
"you may answer the next question with yes.\n"
msgstr ""
-"這把金鑰並 *不* 確定屬於使用者 ID 裡的那個人.\n"
-"除非你 **真的** 知道自己在做甚麼,\n"
-"否則你最好在下一個問題回答 no\n"
+#: g10/pkclist.c:495
msgid "Use this key anyway? (y/N) "
-msgstr "無論如何還是使用這把金鑰嗎? (y/N) "
+msgstr ""
+#: g10/pkclist.c:545
msgid "WARNING: Using untrusted key!\n"
-msgstr "警告: 正在使用不被信任的金鑰!\n"
+msgstr ""
+#: g10/pkclist.c:552
msgid "WARNING: this key might be revoked (revocation key not present)\n"
-msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
+msgstr ""
+#: g10/pkclist.c:561
msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
+msgstr ""
+#: g10/pkclist.c:564
msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
+msgstr ""
+#: g10/pkclist.c:565
msgid " This could mean that the signature is forged.\n"
-msgstr " 這很有可能表示此簽章是偽造的.\n"
+msgstr ""
+#: g10/pkclist.c:571
msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
+msgstr ""
+#: g10/pkclist.c:576
msgid "Note: This key has been disabled.\n"
-msgstr "請注意: 這把金鑰已停用.\n"
+msgstr ""
+#: g10/pkclist.c:596
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
-msgstr "請注意: 已驗證的簽署者地址為 '%s'\n"
+msgstr ""
+#: g10/pkclist.c:603
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
-msgstr "請注意: 簽署者地址 '%s' 與 DNS 項目並不吻合\n"
+msgstr ""
+#: g10/pkclist.c:615
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
-msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n"
+msgstr ""
+#: g10/pkclist.c:623
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
-msgstr "信任等級因不良的 PKA 資訊而調整為 *永遠不會*\n"
+msgstr ""
+#: g10/pkclist.c:634
msgid "Note: This key has expired!\n"
-msgstr "請注意: 這把金鑰已經過期了!\n"
+msgstr ""
+#: g10/pkclist.c:645
msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
+msgstr ""
+#: g10/pkclist.c:647
msgid ""
" There is no indication that the signature belongs to the owner.\n"
-msgstr " 沒有證據指出這個簽章屬於這個持有者.\n"
+msgstr ""
+#: g10/pkclist.c:655
msgid "WARNING: We do NOT trust this key!\n"
-msgstr "警告: 我們 *不* 信任這把金鑰!\n"
+msgstr ""
+#: g10/pkclist.c:656
msgid " The signature is probably a FORGERY.\n"
-msgstr " 這個簽章很有可能是 *偽造的*.\n"
+msgstr ""
+#: g10/pkclist.c:664
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
+msgstr ""
+#: g10/pkclist.c:666
msgid " It is not certain that the signature belongs to the owner.\n"
-msgstr " 這份簽章並不屬於這個持有者\n"
+msgstr ""
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
-msgstr "%s: 已跳過: %s\n"
+msgstr ""
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: 已跳過: 公鑰已停用\n"
+msgstr ""
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
-msgstr "%s: 已跳過: 公鑰已存在\n"
+msgstr ""
- #: g10/pkclist.c:957
-#, fuzzy, c-format
-#| msgid "can't connect to '%s': %s\n"
++#: g10/pkclist.c:969
+#, c-format
msgid "can't encrypt to '%s'\n"
-msgstr "無法連接至 '%s': %s\n"
+msgstr ""
- #: g10/pkclist.c:972
-#, fuzzy, c-format
-#| msgid "line %d: invalid date given\n"
++#: g10/pkclist.c:984
+#, c-format
msgid "option '%s' given, but no valid default keys given\n"
-msgstr "第 %d 列: 無效的給定日期\n"
+msgstr ""
- #: g10/pkclist.c:979
-#, fuzzy, c-format
-#| msgid "line %d: invalid date given\n"
++#: g10/pkclist.c:991
+#, c-format
msgid "option '%s' given, but option '%s' not given\n"
-msgstr "第 %d 列: 無效的給定日期\n"
+msgstr ""
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
+msgstr ""
- #: g10/pkclist.c:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
-msgstr "目前的收件者:\n"
+msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
-"\n"
-"請輸入使用者 ID. 以空白列結束: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
-msgstr "沒有這個使用者 ID.\n"
+msgstr ""
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
-msgstr "已跳過: 公鑰已經被設成預設收件者\n"
+msgstr ""
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
-msgstr "公鑰已停用.\n"
+msgstr ""
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
-msgstr "已跳過: 公鑰已設過\n"
+msgstr ""
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
-msgstr "未知的預設收件者 \"%s\"\n"
+msgstr ""
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
-msgstr "沒有有效的地址\n"
+msgstr ""
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, c-format
msgid "Note: key %s has no %s feature\n"
-msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
+msgstr ""
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
-msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
+msgstr ""
+#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
+msgstr ""
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
-msgstr "分離的簽章.\n"
+msgstr ""
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
-msgstr "請輸入資料檔的名稱: "
+msgstr ""
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
-msgstr "正在讀取標準輸入中 ...\n"
+msgstr ""
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
-msgstr "沒有被簽署過的資料\n"
+msgstr ""
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, c-format
msgid "can't open signed data '%s'\n"
-msgstr "無法開啟被簽署過的資料 '%s'\n"
+msgstr ""
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
-msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
+msgstr ""
+#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
+msgstr ""
+#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
-msgstr "很好, 我們就是匿名收件者.\n"
+msgstr ""
+#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
-msgstr "不支援舊式的 DEK 編碼\n"
+msgstr ""
+#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "%d%s 編密演算法未知或已停用\n"
+msgstr ""
+#: g10/pubkey-enc.c:352
#, c-format
msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
+msgstr ""
+#: g10/pubkey-enc.c:377
#, c-format
msgid "Note: secret key %s expired at %s\n"
-msgstr "請注意: 私鑰 %s 已於 %s 過期\n"
+msgstr ""
+#: g10/pubkey-enc.c:384
msgid "Note: key has been revoked"
-msgstr "請注意: 金鑰已撤銷"
+msgstr ""
+#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
+#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
-msgstr "build_packet 失敗: %s\n"
+msgstr ""
+#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
-msgstr "金鑰 %s 沒有使用者 ID\n"
+msgstr ""
+#: g10/revoke.c:312
msgid "To be revoked by:\n"
-msgstr "將被撤銷:\n"
+msgstr ""
+#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
-msgstr "(這是把機密的撤銷金鑰)\n"
+msgstr ""
-#, fuzzy
-#| msgid "Secret key is available.\n"
+#: g10/revoke.c:322
msgid "Secret key is not available.\n"
-msgstr "私鑰可用.\n"
+msgstr ""
+#: g10/revoke.c:327
msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
+msgstr ""
+#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
-msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
+msgstr ""
+#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
-msgstr "make_keysig_packet 失敗: %s\n"
+msgstr ""
+#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
-msgstr "已建立撤銷憑證.\n"
+msgstr ""
+#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
-msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
+msgstr ""
+#: g10/revoke.c:551
msgid "This is a revocation certificate for the OpenPGP key:"
-msgstr "這把 OpenPGP 金鑰有一份撤銷憑證."
+msgstr ""
+#: g10/revoke.c:567
msgid ""
"A revocation certificate is a kind of \"kill switch\" to publicly\n"
"declare that a key shall not anymore be used. It is not possible\n"
@@@ -6177,91 -5064,83 +6206,91 @@@ msgid "
"your media become unreadable. But have some caution: The print system of\n"
"your machine might store the data and make it available to others!\n"
msgstr ""
-"已建立撤銷憑證.\n"
-"\n"
-"請把這個檔案搬移到另一個你能夠將之藏起來的媒介上;\n"
-"如果有人能夠取得這份憑證的話, 那麼他也能夠讓你的\n"
-"金鑰無法繼續使用. 把這份憑證列印出來再藏到別的地\n"
-"方也是很好的方法, 以免你的儲存媒介損毀而無法讀取.\n"
-"但是千萬小心: 你的機器上的列印系統可能會在列印過\n"
-"程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
+#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
-msgstr "請選擇撤銷的原因:\n"
+msgstr ""
+#: g10/revoke.c:779
msgid "Cancel"
-msgstr "取消"
+msgstr ""
+#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
-msgstr "(也許你會想要在這裡選擇 %d)\n"
+msgstr ""
+#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "請輸入選用的描述; 以空白列結束:\n"
+msgstr ""
+#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
-msgstr "撤銷原因: %s\n"
+msgstr ""
+#: g10/revoke.c:852
msgid "(No description given)\n"
-msgstr "(沒有給定描述)\n"
+msgstr ""
+#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
-msgstr "這樣可以嗎? (y/N) "
+msgstr ""
+#: g10/seskey.c:62 sm/encrypt.c:123
msgid "weak key created - retrying\n"
-msgstr "建立了弱金鑰 - 重試中\n"
+msgstr ""
+#: g10/seskey.c:66
#, c-format
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
+msgstr ""
+#: g10/seskey.c:306
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
-msgstr "%s 金鑰 %s 使用不安全 (%zu 位元) 的雜湊\n"
+msgstr ""
+#: g10/seskey.c:324
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
-msgstr "%s 金鑰 %s 需要 %zu 位元以上的雜湊 (雜湊為 %s)\n"
+msgstr ""
+#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
-msgstr "警告: 簽章摘要與訊息不一致\n"
+msgstr ""
+#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
+msgstr ""
+#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
-msgstr "請參考 %s 上進一步的資訊\n"
+msgstr ""
+#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
+msgstr ""
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
+#: g10/sig-check.c:277
+#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgid_plural "public key %s is %lu seconds newer than the signature\n"
-msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
+msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "public key %s is %lu second newer than the signature\n"
+#: g10/sig-check.c:286
+#, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
-msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/sig-check.c:300 g10/sign.c:250
-#, 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:251
+#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgid_plural ""
@@@ -6318,237 -5190,191 +6347,237 @@@ msgstr "
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
-msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
+msgstr ""
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s/%s 簽章來自: \"%s\"\n"
+msgstr ""
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
+msgstr ""
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
-msgstr "簽署:"
+msgstr ""
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
-msgstr "%s 加密將被採用\n"
+msgstr ""
+#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
+msgstr ""
+#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
-msgstr "已跳過 \"%s\": 重複了\n"
+msgstr ""
+#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
-msgstr "已跳過: 私鑰已經存在\n"
+msgstr ""
+#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
-msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
+msgstr ""
+#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
+msgstr ""
+#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
"# (Use \"gpg --import-ownertrust\" to restore them)\n"
msgstr ""
-"# 相對應的信任值清單被建立於 %s\n"
-"# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
+#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
#, c-format
msgid "error in '%s': %s\n"
-msgstr "在 '%s' 中出錯: %s\n"
+msgstr ""
+#: g10/tdbdump.c:162
msgid "line too long"
-msgstr "列太長"
+msgstr ""
+#: g10/tdbdump.c:170
msgid "colon missing"
-msgstr "冒號缺漏"
+msgstr ""
+#: g10/tdbdump.c:176
msgid "invalid fingerprint"
-msgstr "無效的指紋"
+msgstr ""
+#: g10/tdbdump.c:181
msgid "ownertrust value missing"
-msgstr "主觀信任值缺漏"
+msgstr ""
+#: g10/tdbdump.c:217
#, c-format
msgid "error finding trust record in '%s': %s\n"
-msgstr "在 '%s' 中尋找信任記錄時出錯: %s\n"
+msgstr ""
+#: g10/tdbdump.c:221
#, c-format
msgid "read error in '%s': %s\n"
-msgstr "'%s' 讀取錯誤: %s\n"
+msgstr ""
+#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
-msgstr "信任資料庫: 同步化失敗: %s\n"
+msgstr ""
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
-msgstr "無法為 '%s' 建立鎖定\n"
+msgstr ""
- #: g10/tdbio.c:145
++#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
-msgstr "無法鎖定 '%s'\n"
+msgstr ""
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
+msgstr ""
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
+msgstr ""
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
-msgstr "信任資料庫更動量過大\n"
+msgstr ""
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
-msgstr "%s: 目錄不存在!\n"
+msgstr ""
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
-msgstr "無法存取 '%s': %s\n"
+msgstr ""
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
-msgstr "%s: 建立版本記錄失敗: %s"
+msgstr ""
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
-msgstr "%s: 建立了無效的信任資料庫\n"
+msgstr ""
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
-msgstr "%s: 建立了信任資料庫\n"
+msgstr ""
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
-msgstr "請注意: 信任資料庫不可寫入\n"
+msgstr ""
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
-msgstr "%s: 無效的信任資料庫\n"
+msgstr ""
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: 建立雜湊表失敗: %s\n"
+msgstr ""
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
-msgstr "%s: 更新版本記錄時錯誤: %s\n"
+msgstr ""
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
-msgstr "%s: 讀取版本記錄時錯誤: %s\n"
+msgstr ""
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
-msgstr "%s: 寫入版本記錄時錯誤: %s\n"
+msgstr ""
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
-msgstr "信任資料庫: 本機搜尋失敗: %s\n"
+msgstr ""
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
+msgstr ""
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
-msgstr "%s: 不是一個信任資料庫檔案\n"
+msgstr ""
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
-msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
+msgstr ""
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
-msgstr "%s: 無效的檔案版本 %d\n"
+msgstr ""
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
-msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
+msgstr ""
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
-msgstr "%s: 寫入目錄記錄時出錯: %s\n"
+msgstr ""
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: 記錄歸零失敗: %s\n"
+msgstr ""
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
-msgstr "%s: 附加記錄失敗: %s\n"
+msgstr ""
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
-msgstr "錯誤: 信任資料庫已毀損.\n"
+msgstr ""
+#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
-msgstr "無法處理長於 %d 字符的文字列\n"
+msgstr ""
+#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
-msgstr "輸入列比 %d 字符還長\n"
+msgstr ""
-#, 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 ""
+#: g10/tofu.c:324 g10/tofu.c:345 g10/tofu.c:726
#, c-format
msgid "error committing transaction on TOFU database: %s\n"
msgstr ""
@@@ -6814,134 -5598,107 +6843,134 @@@ msgid_plural "
" %s\n"
"to mark it as being bad.\n"
msgstr[0] ""
+msgstr[1] ""
-#, fuzzy, c-format
-#| msgid "error sending data: %s\n"
+#: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
+#: g10/tofu.c:3058
+#, c-format
msgid "error opening TOFU database: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
+#: g10/trustdb.c:215
#, c-format
msgid "'%s' is not a valid long keyID\n"
-msgstr "'%s' 不是有效的長式金鑰 ID\n"
+msgstr ""
+#: g10/trustdb.c:241
#, c-format
msgid "key %s: accepted as trusted key\n"
-msgstr "金鑰 %s: 如受信任的金鑰般被接受了\n"
+msgstr ""
+#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
-msgstr "金鑰 %s 在信任資料庫中出現了不止一次\n"
+msgstr ""
+#: g10/trustdb.c:294
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
+msgstr ""
+#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
-msgstr "金鑰 %s 已標記成徹底信任了\n"
+msgstr ""
+#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "信任記錄 %lu, 請求類別 %d: 讀取失敗: %s\n"
+msgstr ""
+#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
-msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
+msgstr ""
+#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
-msgstr "你可以試著用下列指令來重建信任資料庫:\n"
+msgstr ""
+#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
-msgstr "如果行不通的話, 請查閱手冊\n"
+msgstr ""
+#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
-msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
+msgstr ""
+#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
-msgstr "正在使用 %s 信任模型\n"
+msgstr ""
+#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
-msgstr "不需要檢查信任資料庫\n"
+msgstr ""
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
-msgstr "下次信任資料庫檢查將於 %s 進行\n"
+msgstr ""
+#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
-msgstr "在 '%s' 信任模型中並不需要檢查信任資料庫\n"
+msgstr ""
+#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
-msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
+msgstr ""
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
-msgstr "找不到公鑰 %s: %s\n"
+msgstr ""
+#: g10/trustdb.c:965
msgid "please do a --check-trustdb\n"
-msgstr "請做一次 --check-trustdb\n"
+msgstr ""
+#: g10/trustdb.c:970
msgid "checking the trustdb\n"
-msgstr "正在檢查信任資料庫\n"
+msgstr ""
- #: g10/trustdb.c:1851
-#, fuzzy, c-format
-#| msgid "%lu keys processed so far\n"
++#: g10/trustdb.c:1853
+#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
-msgstr[0] "目前已處理 %lu 把金鑰\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/trustdb.c:1854
-#, fuzzy, c-format
-#| msgid "%d keys processed (%d validity counts cleared)\n"
++#: g10/trustdb.c:1856
+#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
-msgstr[0] "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
+msgstr[0] ""
+msgstr[1] ""
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
-msgstr "沒有找到任何徹底信任的金鑰\n"
+msgstr ""
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
-msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
+msgstr ""
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, 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"
+msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
+msgstr ""
+#: g10/trust.c:105
msgid "undefined"
msgstr ""
@@@ -7318,348 -6010,269 +7347,348 @@@ msgstr "
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
+#: scd/app-dinsig.c:529
msgid "|N|Initial New PIN"
-msgstr "|N|開始新增個人識別碼 (PIN)"
+msgstr ""
+#: scd/scdaemon.c:114
msgid "run in multi server mode (foreground)"
-msgstr "以多重伺服器模式執行 (前景)"
+msgstr ""
+#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
-msgstr "|等級|設定除錯等級為指定等級"
+msgstr ""
+#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
msgid "|FILE|write a log to FILE"
-msgstr "|檔案|將日誌寫入至指定檔案"
+msgstr ""
+#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
-msgstr "|N|從 N 埠連線至讀卡機"
+msgstr ""
+#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
-msgstr "|名稱|使用指定名稱做為 ct-API 驅動程式"
+msgstr ""
+#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
-msgstr "|名稱|使用指定名稱做為 PC/SC 驅動程式"
+msgstr ""
+#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
-msgstr "不要使用內部的 CCID 驅動程式"
+msgstr ""
+#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
-msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
+msgstr ""
+#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
-msgstr "不要使用讀卡機鍵盤"
+msgstr ""
+#: scd/scdaemon.c:155
msgid "deny the use of admin card commands"
-msgstr "禁用管理者卡片指令"
+msgstr ""
+#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
-msgstr "輸入 PIN 時在輸入區顯示成變動長度"
+msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
-msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
+msgstr ""
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
-"語法: scdaemon [選項] [指令 [引數]]\n"
-"@GNUPG@ 智慧卡服務\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
-msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
+msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
-msgstr "用於 fd %d 的經手程式已啟動\n"
+msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
-msgstr "用於 fd %d 的經手程式已終止\n"
+msgstr ""
+#: sm/base64.c:327
#, c-format
msgid "invalid radix64 character %02x skipped\n"
-msgstr "已跳過無效的 radix64 字符 %02x\n"
+msgstr ""
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
-#, fuzzy
-#| msgid "no gpg-agent running in this session\n"
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
-msgstr "在此階段中沒有執行中的 gpg-agent\n"
+msgstr ""
+#: sm/certchain.c:194
#, c-format
msgid "validation model requested by certificate: %s"
-msgstr "憑證所要求的驗證模型: %s"
+msgstr ""
+#: sm/certchain.c:195 sm/certchain.c:1919
msgid "chain"
-msgstr "chain"
+msgstr ""
+#: sm/certchain.c:196 sm/certchain.c:1919
msgid "shell"
-msgstr "shell"
+msgstr ""
+#: sm/certchain.c:256 dirmngr/validate.c:107
#, c-format
msgid "critical certificate extension %s is not supported"
-msgstr "未支援關鍵憑證擴充欄位 %s"
+msgstr ""
+#: sm/certchain.c:295 dirmngr/validate.c:205
msgid "issuer certificate is not marked as a CA"
-msgstr "發行者憑證並未標記為 CA"
+msgstr ""
+#: sm/certchain.c:333
msgid "critical marked policy without configured policies"
-msgstr "關鍵已標記原則沒有已組態的原則"
+msgstr ""
+#: sm/certchain.c:343
#, c-format
msgid "failed to open '%s': %s\n"
-msgstr "開啟 '%s' 失敗: %s\n"
+msgstr ""
+#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
msgid "Note: non-critical certificate policy not allowed"
-msgstr "請注意: 不允許非關鍵的憑證原則"
+msgstr ""
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
msgid "certificate policy not allowed"
-msgstr "未允許憑證原則"
+msgstr ""
+#: sm/certchain.c:527
msgid "looking up issuer at external location\n"
-msgstr "從外部位置尋找發行者\n"
+msgstr ""
+#: sm/certchain.c:546
#, c-format
msgid "number of issuers matching: %d\n"
-msgstr "吻合的發行者數量: %d\n"
+msgstr ""
+#: sm/certchain.c:590
msgid "looking up issuer from the Dirmngr cache\n"
-msgstr "從 Dirmngr 快取尋找發行者\n"
+msgstr ""
+#: sm/certchain.c:614
#, c-format
msgid "number of matching certificates: %d\n"
-msgstr "吻合的憑證數量: %d\n"
+msgstr ""
+#: sm/certchain.c:616
#, c-format
msgid "dirmngr cache-only key lookup failed: %s\n"
-msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
+msgstr ""
+#: sm/certchain.c:815 sm/certchain.c:1309 sm/certchain.c:1947 sm/decrypt.c:262
+#: sm/encrypt.c:342 sm/import.c:410 sm/keydb.c:1127 sm/keydb.c:1213
+#: sm/sign.c:337 sm/verify.c:114
msgid "failed to allocate keyDB handle\n"
-msgstr "配置 keyDB 代號失敗\n"
+msgstr ""
+#: sm/certchain.c:981
msgid "certificate has been revoked"
-msgstr "憑證已撤銷"
+msgstr ""
+#: sm/certchain.c:996
msgid "the status of the certificate is unknown"
-msgstr "憑證的狀態未知"
+msgstr ""
+#: sm/certchain.c:1003
msgid "please make sure that the \"dirmngr\" is properly installed\n"
-msgstr "請確認 \"dirmngr\" 已安裝妥善\n"
+msgstr ""
+#: sm/certchain.c:1009
#, c-format
msgid "checking the CRL failed: %s"
-msgstr "檢查 CRL 時失敗: %s"
+msgstr ""
+#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
#, c-format
msgid "certificate with invalid validity: %s"
-msgstr "有效性無效的憑證: %s"
+msgstr ""
+#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
msgid "certificate not yet valid"
-msgstr "憑證尚未生效"
+msgstr ""
+#: sm/certchain.c:1054 sm/certchain.c:1139
msgid "root certificate not yet valid"
-msgstr "根憑證尚未生效"
+msgstr ""
+#: sm/certchain.c:1055 sm/certchain.c:1140
msgid "intermediate certificate not yet valid"
-msgstr "媒介憑證尚未生效"
+msgstr ""
+#: sm/certchain.c:1068 dirmngr/validate.c:502
msgid "certificate has expired"
-msgstr "憑證已過期"
+msgstr ""
+#: sm/certchain.c:1069
msgid "root certificate has expired"
-msgstr "根憑證已過期"
+msgstr ""
+#: sm/certchain.c:1070
msgid "intermediate certificate has expired"
-msgstr "媒介憑證已過期"
+msgstr ""
+#: sm/certchain.c:1112
#, c-format
msgid "required certificate attributes missing: %s%s%s"
-msgstr "遺失所需的憑證屬性: %s%s%s"
+msgstr ""
+#: sm/certchain.c:1121
msgid "certificate with invalid validity"
-msgstr "有效性無效的憑證"
+msgstr ""
+#: sm/certchain.c:1158
msgid "signature not created during lifetime of certificate"
-msgstr "簽章並非在憑證生存時間內所造"
+msgstr ""
+#: sm/certchain.c:1160
msgid "certificate not created during lifetime of issuer"
-msgstr "憑證並非在發行者生存時間內所造"
+msgstr ""
+#: sm/certchain.c:1161
msgid "intermediate certificate not created during lifetime of issuer"
-msgstr "媒介憑證並非在發行者生存時間內所造"
+msgstr ""
+#: sm/certchain.c:1165
msgid " ( signature created at "
-msgstr " ( 簽章建立於 "
+msgstr ""
+#: sm/certchain.c:1166
msgid " (certificate created at "
-msgstr " ( 憑證建立於 "
+msgstr ""
+#: sm/certchain.c:1169
msgid " (certificate valid from "
-msgstr " (憑證有效自 "
+msgstr ""
+#: sm/certchain.c:1170
msgid " ( issuer valid from "
-msgstr " ( 發行者有效自 "
+msgstr ""
+#: sm/certchain.c:1200 dirmngr/validate.c:552
#, c-format
msgid "fingerprint=%s\n"
-msgstr "指紋=%s\n"
+msgstr ""
+#: sm/certchain.c:1209
msgid "root certificate has now been marked as trusted\n"
-msgstr "根憑證現在已標記為已信任\n"
+msgstr ""
+#: sm/certchain.c:1222
msgid "interactive marking as trusted not enabled in gpg-agent\n"
-msgstr "在 gpg-agent 中未啟用互動式標記為已信任\n"
+msgstr ""
+#: sm/certchain.c:1228
msgid "interactive marking as trusted disabled for this session\n"
-msgstr "互動式標記為已信任在此作業階段中已停用\n"
+msgstr ""
+#: sm/certchain.c:1286
msgid "WARNING: creation time of signature not known - assuming current time"
-msgstr "警告: 簽章創造時間未知 - 假設為此刻"
+msgstr ""
+#: sm/certchain.c:1350
msgid "no issuer found in certificate"
-msgstr "憑證中找不到發行者"
+msgstr ""
+#: sm/certchain.c:1428
msgid "self-signed certificate has a BAD signature"
-msgstr "自簽憑證有 不良 簽章"
+msgstr ""
+#: sm/certchain.c:1497 dirmngr/validate.c:550
msgid "root certificate is not marked trusted"
-msgstr "根憑證未標記為已信任"
+msgstr ""
+#: sm/certchain.c:1513
#, c-format
msgid "checking the trust list failed: %s\n"
-msgstr "檢查信任清單時失敗: %s\n"
+msgstr ""
+#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
msgid "certificate chain too long\n"
-msgstr "憑證鏈太長\n"
+msgstr ""
+#: sm/certchain.c:1556 dirmngr/validate.c:617
msgid "issuer certificate not found"
-msgstr "找不到發行者憑證"
+msgstr ""
+#: sm/certchain.c:1589 dirmngr/validate.c:643
msgid "certificate has a BAD signature"
-msgstr "憑證有 不良 簽章"
+msgstr ""
+#: sm/certchain.c:1621 dirmngr/validate.c:667
msgid "found another possible matching CA certificate - trying again"
-msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
+msgstr ""
+#: sm/certchain.c:1680 dirmngr/validate.c:692
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
-msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
+msgstr ""
+#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
msgid "certificate is good\n"
-msgstr "憑證完好\n"
+msgstr ""
+#: sm/certchain.c:1723
msgid "intermediate certificate is good\n"
-msgstr "媒介憑證良好\n"
+msgstr ""
+#: sm/certchain.c:1724
msgid "root certificate is good\n"
-msgstr "根憑證完好\n"
+msgstr ""
+#: sm/certchain.c:1906
msgid "switching to chain model"
-msgstr "切換至鏈模型"
+msgstr ""
+#: sm/certchain.c:1915
#, c-format
msgid "validation model used: %s"
-msgstr "已使用的驗證模型: %s"
+msgstr ""
+#: sm/certcheck.c:107
#, c-format
msgid "a %u bit hash is not valid for a %u bit %s key\n"
-msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
+msgstr ""
+#: sm/certcheck.c:244 sm/verify.c:202
msgid "(this is the MD2 algorithm)\n"
-msgstr "(這是 MD2 演算法)\n"
+msgstr ""
+#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
msgid "none"
-msgstr "無"
+msgstr ""
+#: sm/certdump.c:552 sm/certdump.c:617
msgid "[Error - invalid encoding]"
-msgstr "[錯誤 - 無效的編碼]"
+msgstr ""
+#: sm/certdump.c:560
msgid "[Error - out of core]"
-msgstr "[錯誤 - 超出核心]"
+msgstr ""
+#: sm/certdump.c:596
msgid "[Error - No name]"
-msgstr "[錯誤 - 沒有名稱]"
+msgstr ""
+#: sm/certdump.c:623
msgid "[Error - invalid DN]"
-msgstr "[錯誤 - 無效的 DN]"
+msgstr ""
+#: sm/certdump.c:833
#, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@@ -9150,855 -7464,672 +9179,855 @@@ msgid "
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
-"語法: @DIRMNGR@ [選項] [指令 [引數]]\n"
-"@GNUPG@ 的金鑰伺服器, CRL, OCSP 存取\n"
+#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
-msgstr "有效的除錯等級為: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, c-format
msgid "usage: %s [options] "
-msgstr "用法: %s [選項] "
+msgstr ""
+#: dirmngr/dirmngr.c:1123
msgid "colons are not allowed in the socket name\n"
-msgstr "socket 名稱內不允許使用冒號\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
-msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
+msgstr ""
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
-msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1594
#, c-format
msgid "%s:%u: line too long - skipped\n"
-msgstr "%s:%u: 列太長 - 已跳過\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
-msgstr "%s:%u: 偵測到無效的指紋\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
#, c-format
msgid "%s:%u: read error: %s\n"
-msgstr "%s:%u: 讀取錯誤: %s\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1740
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
-msgstr "%s:%u: 列尾的垃圾已忽略\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1807
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
-msgstr "收到 SIGHUP - 正在重新讀取組態並清除快取\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1834
msgid "SIGUSR2 received - no action defined\n"
-msgstr "收到 SIGUSR2 - 無定義行動\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
msgid "SIGTERM received - shutting down ...\n"
-msgstr "收到 SIGTERM - 正在關閉 ...\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1841
#, c-format
msgid "SIGTERM received - still %d active connections\n"
-msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
msgid "shutdown forced\n"
-msgstr "已強迫關閉\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1854
msgid "SIGINT received - immediate shutdown\n"
-msgstr "收到 SIGINT - 立即關閉\n"
+msgstr ""
+#: dirmngr/dirmngr.c:1861
#, c-format
msgid "signal %d received - no action defined\n"
-msgstr "收到訊號 %d - 無定義行動\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:138
msgid "return all values in a record oriented format"
-msgstr "以記錄導向格式傳回所有數值"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:141
msgid "|NAME|ignore host part and connect through NAME"
-msgstr "|名稱|忽略主機的部份並改以指定名稱連線"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:142
msgid "|NAME|connect to host NAME"
-msgstr "|名稱|連線至位於指定名稱的主機"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:143
msgid "|N|connect to port N"
-msgstr "|N|連線至 N 連接埠"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:144
msgid "|NAME|use user NAME for authentication"
-msgstr "|名字|使用指定名字做為認證用的使用者名稱"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:145
msgid "|PASS|use password PASS for authentication"
-msgstr "|密碼|使用指定密碼作為認證"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:147
msgid "take password from $DIRMNGR_LDAP_PASS"
-msgstr "從 $DIRMNGR_LDAP_PASS 取得密碼使用"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:148
msgid "|STRING|query DN STRING"
-msgstr "|字串|以只指定字串查詢 DN"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:149
msgid "|STRING|use STRING as filter expression"
-msgstr "|字串|以指定字串作為過濾器表示式"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:150
msgid "|STRING|return the attribute STRING"
-msgstr "|字串|以指定字串傳回屬性"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:209
msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
-msgstr "用法: dirmngr_ldap [選項] [網址] (或用 -h 求助)\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:212
msgid ""
"Syntax: dirmngr_ldap [options] [URL]\n"
"Internal LDAP helper for Dirmngr\n"
"Interface and options may change without notice\n"
msgstr ""
-"語法: dirmngr_ldap [選項] [網址]\n"
-"Dirmngr 的內部 LDAP 協助程式\n"
-"介面及選項均可能未經通知即變更\n"
+#: dirmngr/dirmngr_ldap.c:337
#, c-format
msgid "invalid port number %d\n"
-msgstr "無效的連接埠號碼 %d\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:413
#, c-format
msgid "scanning result for attribute '%s'\n"
-msgstr "正在掃描屬性 '%s' 之結果\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
+#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
+#: dirmngr/dirmngr_ldap.c:677
#, c-format
msgid "error writing to stdout: %s\n"
-msgstr "寫入標準輸出時出錯: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:437
#, c-format
msgid " available attribute '%s'\n"
-msgstr " 可用屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:475
#, c-format
msgid "attribute '%s' not found\n"
-msgstr "找不到屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:482
#, c-format
msgid "found attribute '%s'\n"
-msgstr "找到屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:591
#, c-format
msgid "processing url '%s'\n"
-msgstr "正在處理網址 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:593
#, c-format
msgid " user '%s'\n"
-msgstr " 使用者 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:595
#, c-format
msgid " pass '%s'\n"
-msgstr " 密碼 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:597
#, c-format
msgid " host '%s'\n"
-msgstr " 主機 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:598
#, c-format
msgid " port %d\n"
-msgstr " 連接埠 %d\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:600
#, c-format
msgid " DN '%s'\n"
-msgstr " 域名 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:602
#, c-format
msgid " filter '%s'\n"
-msgstr " 過濾器 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
#, c-format
msgid " attr '%s'\n"
-msgstr " 屬性 '%s'\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:616
#, c-format
msgid "no host name in '%s'\n"
-msgstr "'%s' 中沒有主機名稱\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:621
#, c-format
msgid "no attribute given for query '%s'\n"
-msgstr "查詢 '%s' 無給定屬性\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:627
msgid "WARNING: using first attribute only\n"
-msgstr "警告: 僅使用第一個屬性\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:636
#, c-format
msgid "LDAP init to '%s:%d' failed: %s\n"
-msgstr "LDAP 初始至 '%s:%d' 失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:659
#, c-format
msgid "binding to '%s:%d' failed: %s\n"
-msgstr "綁定至 '%s:%d' 時失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:686
#, c-format
msgid "searching '%s' failed: %s\n"
-msgstr "搜尋 '%s' 時失敗: %s\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:718
#, c-format
msgid "'%s' is not an LDAP URL\n"
-msgstr "'%s' 不是一個 LDAP 位址\n"
+msgstr ""
+#: dirmngr/dirmngr_ldap.c:724
#, c-format
msgid "'%s' is an invalid LDAP URL\n"
-msgstr "'%s' 是無效的 LDAP 網址\n"
+msgstr ""
+#: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
+#: dirmngr/ldap-wrapper.c:693
#, c-format
msgid "error allocating memory: %s\n"
-msgstr "配置記憶體時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:207
#, c-format
msgid "error printing log line: %s\n"
-msgstr "印出日誌記錄列時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:236
#, c-format
msgid "error reading log from ldap wrapper %d: %s\n"
-msgstr "從 ldap 封裝程式 %d 讀取日誌記錄時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:304
#, c-format
msgid "npth_select failed: %s - waiting 1s\n"
-msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:343
#, c-format
msgid "ldap wrapper %d ready"
-msgstr "ldap 封裝程式 %d 準備妥當"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:352
#, c-format
msgid "ldap wrapper %d ready: timeout\n"
-msgstr "ldap 封裝程式 %d 準備妥當: 逾時\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:355
#, c-format
msgid "ldap wrapper %d ready: exitcode=%d\n"
-msgstr "ldap 封裝程式 %d 準備妥當: 離開代碼=%d\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:364
#, c-format
msgid "waiting for ldap wrapper %d failed: %s\n"
-msgstr "等候 ldap 封裝程式 %d 時失敗: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:376
#, c-format
msgid "ldap wrapper %d stalled - killing\n"
-msgstr "ldap 封裝程式 %d 已卡住 - 正在中止\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:444
#, c-format
msgid "error spawning ldap wrapper reaper thread: %s\n"
-msgstr "繁衍 ldap 封裝程式收割執行緒時出錯: %s\n"
+msgstr ""
+#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
#, c-format
msgid "reading from ldap wrapper %d failed: %s\n"
-msgstr "從 ldap 封裝程式 %d 讀取時失敗: %s\n"
+msgstr ""
+#: dirmngr/ldap.c:91
#, c-format
msgid "invalid char 0x%02x in host name - not added\n"
-msgstr "主機名稱中有無效的字符 0x%02x - 不予加入\n"
+msgstr ""
+#: dirmngr/ldap.c:95
#, c-format
msgid "adding '%s:%d' to the ldap server list\n"
-msgstr "正在加入 '%s:%d' 至 ldap 伺服器清單\n"
+msgstr ""
+#: dirmngr/ldap.c:98 dirmngr/misc.c:502
#, c-format
msgid "malloc failed: %s\n"
-msgstr "動態記憶體配置失敗: %s\n"
+msgstr ""
+#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
-msgstr "start_cert_fetch: 無效的模式 '%s'\n"
+msgstr ""
+#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
-msgstr "ldap_search 達到伺服器的尺寸限制\n"
+msgstr ""
+#: dirmngr/misc.c:170
msgid "invalid canonical S-expression found\n"
-msgstr "發現無效的標準型 S-表示式\n"
+msgstr ""
+#: dirmngr/misc.c:194 dirmngr/misc.c:228
#, c-format
msgid "gcry_md_open failed: %s\n"
-msgstr "gcry_md_open 失敗: %s\n"
+msgstr ""
+#: dirmngr/misc.c:199 dirmngr/misc.c:233
#, c-format
msgid "oops: ksba_cert_hash failed: %s\n"
-msgstr "糟了: ksba_cert_hash 失敗: %s\n"
+msgstr ""
+#: dirmngr/misc.c:518
msgid "bad URL encoding detected\n"
-msgstr "偵測到不良的網址編碼\n"
+msgstr ""
+#: dirmngr/ocsp.c:80
#, c-format
msgid "error reading from responder: %s\n"
-msgstr "從回應程式讀取時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:98
#, c-format
msgid "response from server too large; limit is %d bytes\n"
-msgstr "來自伺服器的回應太大; 上限是 %d 位元組\n"
+msgstr ""
-#, fuzzy
-#| msgid "OCSP request not possible due to disabled HTTP\n"
+#: dirmngr/ocsp.c:139
msgid "OCSP request not possible due to Tor mode\n"
-msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
+msgstr ""
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
-msgstr "因為已經停用 HTTP 而不可能有 OCSP 請求\n"
+msgstr ""
+#: dirmngr/ocsp.c:152
#, c-format
msgid "error setting OCSP target: %s\n"
-msgstr "設定 OCSP 目標時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:170
#, c-format
msgid "error building OCSP request: %s\n"
-msgstr "建立 OCSP 請求時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:181
#, c-format
msgid "error connecting to '%s': %s\n"
-msgstr "連線至 '%s' 時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
#, c-format
msgid "error reading HTTP response for '%s': %s\n"
-msgstr "讀取 '%s' HTTP 回應時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:240
#, c-format
msgid "error accessing '%s': http status %u\n"
-msgstr "存取 '%s' 時出錯: http 狀態 %u\n"
+msgstr ""
+#: dirmngr/ocsp.c:265
#, c-format
msgid "error parsing OCSP response for '%s': %s\n"
-msgstr "剖析 '%s' OCSP 回應時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
#, c-format
msgid "OCSP responder at '%s' status: %s\n"
-msgstr "位於 '%s' 的 OSCP 回應程式狀態: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:293
#, c-format
msgid "hashing the OCSP response for '%s' failed: %s\n"
-msgstr "計算 '%s' OSCP 回應雜湊時失敗: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:328
msgid "not signed by a default OCSP signer's certificate"
-msgstr "並未由預設 OCSP 簽署者的憑證所簽署"
+msgstr ""
+#: dirmngr/ocsp.c:417
msgid "only SHA-1 is supported for OCSP responses\n"
-msgstr "OCSP 回應僅支援 SHA-1\n"
+msgstr ""
+#: dirmngr/ocsp.c:468
#, c-format
msgid "allocating list item failed: %s\n"
-msgstr "配置清單項目時失敗: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:483
#, c-format
msgid "error getting responder ID: %s\n"
-msgstr "取得回應程式 ID 時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:518
msgid "no suitable certificate found to verify the OCSP response\n"
-msgstr "找不到適合用來驗證 OCSP 回應的憑證\n"
+msgstr ""
+#: dirmngr/ocsp.c:557 dirmngr/validate.c:623
#, c-format
msgid "issuer certificate not found: %s\n"
-msgstr "找不到發行者憑證: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:567
msgid "caller did not return the target certificate\n"
-msgstr "叫用者未傳為目標憑證\n"
+msgstr ""
+#: dirmngr/ocsp.c:574
msgid "caller did not return the issuing certificate\n"
-msgstr "叫用者未傳回發行的憑證\n"
+msgstr ""
+#: dirmngr/ocsp.c:584
#, c-format
msgid "failed to allocate OCSP context: %s\n"
-msgstr "配置 OCSP 脈絡失敗: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:618
#, c-format
msgid "can't get authorityInfoAccess: %s\n"
-msgstr "無法取得 authorityInfoAccess: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:625
msgid "no default OCSP responder defined\n"
-msgstr "無定義預設 OCSP 回應程式\n"
+msgstr ""
+#: dirmngr/ocsp.c:631
msgid "no default OCSP signer defined\n"
-msgstr "未定義預設的 OCSP 簽署程式\n"
+msgstr ""
+#: dirmngr/ocsp.c:638
#, c-format
msgid "using default OCSP responder '%s'\n"
-msgstr "正在使用預設的 OCSP 回應程式 '%s'\n"
+msgstr ""
+#: dirmngr/ocsp.c:643
#, c-format
msgid "using OCSP responder '%s'\n"
-msgstr "正在使用 %s OCSP 回應程式\n"
+msgstr ""
+#: dirmngr/ocsp.c:650
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
-msgstr "對 OCSP 建立雜湊脈絡失敗: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:680
#, c-format
msgid "error getting OCSP status for target certificate: %s\n"
-msgstr "取得目標憑證 OCSP 狀態時出錯: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:705
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
-msgstr "憑證狀態為: %s (本次=%s 下次=%s)\n"
+msgstr ""
+#: dirmngr/ocsp.c:706
msgid "good"
-msgstr "良好"
+msgstr ""
+#: dirmngr/ocsp.c:712
#, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
-msgstr "憑證已撤銷於 %s 因: %s\n"
+msgstr ""
+#: dirmngr/ocsp.c:747
msgid "OCSP responder returned a status in the future\n"
-msgstr "OCSP 回應程式傳回未來的狀態\n"
+msgstr ""
+#: dirmngr/ocsp.c:759
msgid "OCSP responder returned a non-current status\n"
-msgstr "OCSP 回應程式傳回非當下的狀態\n"
+msgstr ""
+#: dirmngr/ocsp.c:774
msgid "OCSP responder returned an too old status\n"
-msgstr "OCSP 回應程式傳回老舊的狀態\n"
+msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
-msgstr "assuan_inquire(%s) 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
-msgstr "遺失 ldapserver"
+msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
-msgstr "憑證 ID 中遺失 serialno"
+msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, c-format
msgid "assuan_inquire failed: %s\n"
-msgstr "assuan_inquire 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
-msgstr "fetch_cert_by_url 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, c-format
msgid "error sending data: %s\n"
-msgstr "送出資料時出錯: %s\n"
+msgstr ""
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, c-format
msgid "start_cert_fetch failed: %s\n"
-msgstr "start_cert_fetch 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, c-format
msgid "fetch_next_cert failed: %s\n"
-msgstr "fetch_next_cert 失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
-msgstr "max_replies %d 已超出\n"
+msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, c-format
msgid "can't allocate control structure: %s\n"
-msgstr "無法配置控制結構: %s\n"
+msgstr ""
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, c-format
msgid "failed to allocate assuan context: %s\n"
-msgstr "配置 assuan 脈絡失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, c-format
msgid "failed to initialize the server: %s\n"
-msgstr "伺服器啟始失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
-msgstr "向 Assuan 註冊指令時失敗: %s\n"
+msgstr ""
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
-msgstr "Assuan 接受問題: %s\n"
+msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, c-format
msgid "Assuan processing failed: %s\n"
-msgstr "Assuan 處理時失敗: %s\n"
+msgstr ""
+#: dirmngr/validate.c:201
msgid "accepting root CA not marked as a CA"
-msgstr "接受未標示為 CA 的根 CA"
+msgstr ""
+#: dirmngr/validate.c:227
msgid "CRL checking too deeply nested\n"
-msgstr "檢查 CRL 時遭遇太深層次的巢狀結構\n"
+msgstr ""
+#: dirmngr/validate.c:245
msgid "not checking CRL for"
-msgstr "不對此檢查 CRL:"
+msgstr ""
+#: dirmngr/validate.c:250
msgid "checking CRL for"
-msgstr "檢查 CRL: "
+msgstr ""
+#: dirmngr/validate.c:388
msgid "running in compatibility mode - certificate chain not checked!\n"
-msgstr "正在以相容模式執行 - 憑證鏈未檢查!\n"
+msgstr ""
+#: dirmngr/validate.c:532
msgid "selfsigned certificate has a BAD signature"
-msgstr "自簽憑證有 不良 簽章"
+msgstr ""
+#: dirmngr/validate.c:565
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
-msgstr "檢查根憑證可信度時失敗: %s\n"
+msgstr ""
+#: dirmngr/validate.c:742
msgid "certificate chain is good\n"
-msgstr "憑證鏈完好\n"
+msgstr ""
+#: dirmngr/validate.c:972
msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
+msgstr ""
+#: dirmngr/validate.c:1120
msgid "certificate should not have been used for CRL signing\n"
-msgstr "憑證應該還未被用於 CRL 簽署\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
msgid "quiet"
-msgstr "安靜模式"
+msgstr ""
+#: tools/gpg-connect-agent.c:79
msgid "print data out hex encoded"
-msgstr "列印資料超出十六進制編碼範圍"
+msgstr ""
+#: tools/gpg-connect-agent.c:80
msgid "decode received data lines"
-msgstr "對已收到的資料列解碼"
+msgstr ""
+#: tools/gpg-connect-agent.c:81
msgid "connect to the dirmngr"
-msgstr "連線至 dirmngr"
+msgstr ""
+#: tools/gpg-connect-agent.c:84
msgid "|NAME|connect to Assuan socket NAME"
-msgstr "|名稱|連線至指定名稱的 Assuan socket"
+msgstr ""
+#: tools/gpg-connect-agent.c:86
msgid "|ADDR|connect to Assuan server at ADDR"
-msgstr "|ADDR|連線至位於 ADDR 的 Assuan 伺服器"
+msgstr ""
+#: tools/gpg-connect-agent.c:88
msgid "run the Assuan server given on the command line"
-msgstr "執行命令列所給定的 Assuan 伺服器"
+msgstr ""
+#: tools/gpg-connect-agent.c:90
msgid "do not use extended connect mode"
-msgstr "不要使用延伸連線模式"
+msgstr ""
+#: tools/gpg-connect-agent.c:92
msgid "|FILE|run commands from FILE on startup"
-msgstr "|檔案|啟動時執行指定檔案中的指令"
+msgstr ""
+#: tools/gpg-connect-agent.c:93
msgid "run /subst on startup"
-msgstr "啟動時執行 /subst"
+msgstr ""
+#: tools/gpg-connect-agent.c:205
msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
-msgstr "用法: @GPG at -connect-agent [選項] (或用 -h 求助)"
+msgstr ""
+#: tools/gpg-connect-agent.c:208
msgid ""
"Syntax: @GPG at -connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-"語法: @GPG at -connect-agent [選項]\n"
-"連線至運作中的代理程式並送出指令\n"
+#: tools/gpg-connect-agent.c:1247
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
-msgstr "\"%s\" 選項需要有程式及選用的引數\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
+#: tools/gpg-connect-agent.c:1270
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
-msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
#, c-format
msgid "receiving line failed: %s\n"
-msgstr "接收列時失敗: %s\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1458
msgid "line too long - skipped\n"
-msgstr "列太長 - 已跳過\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1462
msgid "line shortened due to embedded Nul character\n"
-msgstr "列因嵌入的 Nul 字符而縮短了\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1837
#, c-format
msgid "unknown command '%s'\n"
-msgstr "未知的指令 '%s'\n"
+msgstr ""
+#: tools/gpg-connect-agent.c:1855
#, c-format
msgid "sending line failed: %s\n"
-msgstr "送出列時失敗: %s\n"
+msgstr ""
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
-msgstr "送出標準選項時出錯: %s\n"
+msgstr ""
+#: tools/gpgconf-comp.c:479 tools/gpgconf-comp.c:608 tools/gpgconf-comp.c:683
+#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:856
msgid "Options controlling the diagnostic output"
-msgstr "控制著診斷性輸出的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
msgid "Options controlling the configuration"
-msgstr "控制著組態的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
+#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
msgid "Options useful for debugging"
-msgstr "對除錯有幫助的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
msgid "Options controlling the security"
-msgstr "控制著安全性的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:528
msgid "|N|expire SSH keys after N seconds"
-msgstr "|N|在 N 秒之後讓 SSH 金鑰過期"
+msgstr ""
+#: tools/gpgconf-comp.c:532
msgid "|N|set maximum PIN cache lifetime to N seconds"
-msgstr "|N|把個人識別碼 (PIN) 快取最大生存時間設成 N 秒"
+msgstr ""
+#: tools/gpgconf-comp.c:536
msgid "|N|set maximum SSH key lifetime to N seconds"
-msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
+msgstr ""
+#: tools/gpgconf-comp.c:560
msgid "Options enforcing a passphrase policy"
-msgstr "強制執行密語原則的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:563
msgid "do not allow to bypass the passphrase policy"
-msgstr "不允許略過密語原則"
+msgstr ""
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
-msgstr "|N|把新密語所需的最短長度設成 N"
+msgstr ""
+#: tools/gpgconf-comp.c:571
msgid "|N|require at least N non-alpha characters for a new passphrase"
-msgstr "|N|新密語至少要有 N 個非字母的字符"
+msgstr ""
+#: tools/gpgconf-comp.c:575
msgid "|FILE|check new passphrases against pattern in FILE"
-msgstr "|檔案|用指定檔案中的樣式來檢查新密語"
+msgstr ""
+#: tools/gpgconf-comp.c:579
msgid "|N|expire the passphrase after N days"
-msgstr "|N|在 N 天之後讓密語過期"
+msgstr ""
+#: tools/gpgconf-comp.c:583
msgid "do not allow the reuse of old passphrases"
-msgstr "不允許重複使用舊密語"
+msgstr ""
-#, fuzzy
-#| msgid "|N|set LDAP timeout to N seconds"
+#: tools/gpgconf-comp.c:587
msgid "|N|set the Pinentry timeout to N seconds"
-msgstr "|N|把 LDAP 逾時設成 N 秒"
+msgstr ""
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
msgid "|NAME|use NAME as default secret key"
-msgstr "|名字|使用指定名字做為預設私鑰"
+msgstr ""
+#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
msgid "|NAME|encrypt to user ID NAME as well"
-msgstr "|名字|也加密給指定名字的使用者 ID"
+msgstr ""
+#: tools/gpgconf-comp.c:704
msgid "|SPEC|set up email aliases"
-msgstr "|SPEC|設定電子郵件別名"
+msgstr ""
+#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
msgid "Configuration for Keyservers"
-msgstr "金鑰伺服器組態"
+msgstr ""
+#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
msgid "|URL|use keyserver at URL"
-msgstr "|URL|使用位於 URL 的金鑰伺服器"
+msgstr ""
+#: tools/gpgconf-comp.c:735
msgid "allow PKA lookups (DNS requests)"
-msgstr "允許 PKA 查找 (DNS 請求)"
+msgstr ""
+#: tools/gpgconf-comp.c:738
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
-msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地址找出金鑰"
+msgstr ""
+#: tools/gpgconf-comp.c:787
msgid "disable all access to the dirmngr"
-msgstr "停用所有的 dirmngr 存取"
+msgstr ""
+#: tools/gpgconf-comp.c:790
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
-msgstr "|名稱|將指定名稱的編碼用於 PKCS#12 密語"
+msgstr ""
+#: tools/gpgconf-comp.c:820
msgid "do not check CRLs for root certificates"
-msgstr "不要為根憑證檢查 CRL"
+msgstr ""
+#: tools/gpgconf-comp.c:869
msgid "Options controlling the format of the output"
-msgstr "控制著輸出格式的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:905
msgid "Options controlling the interactivity and enforcement"
-msgstr "控制著互動及強制執行的選項"
+msgstr ""
-#, fuzzy
-#| msgid "Options controlling the security"
+#: tools/gpgconf-comp.c:915
msgid "Options controlling the use of Tor"
-msgstr "控制著安全性的選項"
+msgstr ""
+#: tools/gpgconf-comp.c:929
msgid "Configuration for HTTP servers"
-msgstr "HTTP 伺服器組態"
+msgstr ""
+#: tools/gpgconf-comp.c:940
msgid "use system's HTTP proxy setting"
-msgstr "使用系統的 HTTP 代理伺服器設定"
+msgstr ""
+#: tools/gpgconf-comp.c:945
msgid "Configuration of LDAP servers to use"
-msgstr "要用的 LDAP 伺服器組態"
+msgstr ""
+#: tools/gpgconf-comp.c:974
msgid "LDAP server list"
-msgstr "LDAP 伺服器清單"
+msgstr ""
+#: tools/gpgconf-comp.c:982
msgid "Configuration for OCSP"
-msgstr "OCSP 組態"
+msgstr ""
+#: tools/gpgconf-comp.c:1063
msgid "GPG for OpenPGP"
-msgstr "OpenPGP 版 GPG"
+msgstr ""
+#: tools/gpgconf-comp.c:1064
msgid "GPG Agent"
-msgstr "GPG Agent"
+msgstr ""
+#: tools/gpgconf-comp.c:1065
msgid "Smartcard Daemon"
-msgstr "智慧卡服務"
+msgstr ""
+#: tools/gpgconf-comp.c:1066
msgid "GPG for S/MIME"
-msgstr "S/MIME 版 GPG"
+msgstr ""
+#: tools/gpgconf-comp.c:1067
msgid "Key Acquirer"
msgstr ""
@@@ -10084,20 -8195,18 +10113,20 @@@ msgid "
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
-"語法: @GPGCONF@ [選項]\n"
-"管理 @GNUPG@ 系統工具的組態選項\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
-msgstr "需要一個元件引數"
+msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
-msgstr "找不到元件"
+msgstr ""
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
-msgstr "未允許使用引數"
+msgstr ""
+#: tools/symcryptrun.c:154
msgid ""
"@\n"
"Commands:\n"
diff --cc po/hu.po
index 8b7833c,8505a8f..a7db457
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -401,10 -315,6 +401,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "b�besz�d� m�d"
@@@ -513,11 -398,6 +513,11 @@@ msgstr "nem t�mogatott
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "A hib�kat (angolul) a <gnupg-bugs at gnu.org> c�mre �rja meg!\n"
@@@ -533,55 -411,38 +533,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "\"%s\" opci�s f�jl: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s nem hozhat� l�tre: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -591,28 -451,22 +591,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
@@@ -640,7 -488,6 +640,7 @@@ msgstr "Bizalmi adatb�zis: olvas�s sike
msgid "can't use '%s' as home directory\n"
msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@@ -665,18 -508,14 +665,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: kihagyva: %s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
@@@ -692,8 -529,6 +692,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -536,6 +701,9 @@@ msgstr "
"@Parancsok:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -940,29 -729,22 +940,29 @@@ msgstr "Hiba a jelsz� l�trehoz�sakor: %
msgid "error creating a stream for a pipe: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@@ -977,32 -757,26 +977,32 @@@ msgstr "Hiba a(z) \"%s\" titkoskulcs-ka
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
msgid "problem setting the gpg-agent options\n"
msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
@@@ -1078,7 -837,6 +1078,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 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"
@@@ -1340,7 -1044,6 +1340,7 @@@ msgstr "Nem �ll rendelkez�sre seg�ts�g
msgid "ignoring garbage line"
msgstr "Hiba a z�r� sorban!\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "Ismeretlen m�d�"
@@@ -1480,94 -1156,74 +1480,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "P�nc�l: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "�rv�nytelen p�nc�lfejl�c: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "P�nc�lfejl�c: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "�rv�nytelen al��r�sfejl�c!\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "P�nc�lfejl�c: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "V�ratlan p�nc�l:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "�rv�nytelen k�t�jeles sor: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "Korai �llom�nyv�g (nincs CRC).\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "Hib�s form�j� CRC.\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC hiba; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "Hiba a z�r� sorban!\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "nem olvashat� forma"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1575,25 -1231,20 +1575,25 @@@ 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:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, 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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1603,7 -1254,6 +1603,7 @@@ 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:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
@@@ -1633,19 -1278,14 +1633,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "titkos kulcs nem �ll rendelkez�sre"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
@@@ -1660,10 -1298,6 +1660,10 @@@ msgstr "Ez a parancs %s m�dban nem enge
msgid "Reset Code not or not anymore available\n"
msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Mit v�laszt? "
@@@ -1730,148 -1350,115 +1730,149 @@@ msgstr "Nincs hozz� tartoz� nyilv�nos k
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "preferenci�k friss�t�se"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "megmutatja az ujjlenyomatot"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Kulcsgener�l�s sikertelen: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Milyen kulcsm�retet szeretne? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Milyen kulcsm�retet szeretne? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
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:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "Felkerek�tve %u bitre.\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1879,155 -1466,120 +1880,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (csak titkos�t�s)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "�rv�nytelen v�laszt�s.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Val�ban al��rja? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "kil�p�s ebb�l a men�b�l"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "megmutatja ezt a s�g�t"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "Kulcs tal�lhat�: "
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "lej�rat megv�ltoztat�sa"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
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:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
@@@ -2035,28 -1586,19 +2036,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
@@@ -2113,7 -1644,6 +2114,7 @@@ msgstr "Van egy titkos kulcs a \"%s\" n
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@@ -2133,7 -1660,6 +2134,7 @@@ msgstr "%s rejtjelez�st haszn�lok.\n
msgid "'%s' already compressed\n"
msgstr "\"%s\" m�r t�m�r�tett.\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2151,7 -1675,6 +2152,7 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2168,17 -1689,14 +2169,17 @@@ msgstr "A %s (%d) rejtjelez� haszn�lat
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s titkos�tott adat.\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
@@@ -2251,345 -1756,280 +2252,359 @@@ 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:78
++#: g10/export.c:102
#, 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:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "haszn�lhatatlan titkos kulcs"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: kihagyva: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "�rok a \"%s\" �llom�nyba.\n"
+
++#: g10/export.c:1660
+ #, 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:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "FIGYELEM: Semmit sem export�ltam.\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[ismeretlen kulcs]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "k�l�n�ll� al��r�s k�sz�t�se"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "adat titkos�t�sa"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "adat visszafejt�se (alap�rtelmez�s)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "al��r�s ellen�rz�se"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "kulcsok list�z�sa"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "kulcsok �s al��r�sok list�z�sa"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "kulcsal��r�sok ellen�rz�se"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "kulcsok �s ujjlenyomatok list�z�sa"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "titkos kulcsok list�z�sa"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "�j kulcsp�r l�trehoz�sa"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "�j kulcsp�r l�trehoz�sa"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "visszavon�si igazol�s k�sz�t�se"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "kulcs al��r�sa"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "kulcs al��r�sa helyileg"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "kulcs al��r�sa"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "kulcs al��r�sa helyileg"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "kulcs al��r�sa vagy szerkeszt�se"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "kulcsok export�l�sa"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "kulcsok export�l�sa kulcsszerverre"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "kulcsok import�l�sa kulcsszerverr�l"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "kulcsok keres�se kulcsszerveren"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "minden kulcs friss�t�se kulcsszerverr�l"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "kulcsok import�l�sa/�sszef�z�se"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "bizalmi adatb�zis friss�t�se"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 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:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "kanonikus sz�veges m�d haszn�lata"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|f�jl|b�v�t� modul bet�lt�se"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "ne csin�ljon semmi v�ltoztat�st"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "fel�l�r�s el�tt r�k�rdez�s"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2597,7 -2037,6 +2612,7 @@@ msgstr "
"@\n"
"(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2617,13 -2056,11 +2632,13 @@@ msgstr "
" --list-keys [nevek] kulcsok ki�rat�sa\n"
" --fingerprint [nevek] ujjlenyomatok ki�rat�sa\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2638,7 -2075,6 +2653,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:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2646,602 -2082,477 +2661,607 @@@ msgstr "
"\n"
"T�mogatott algoritmusok:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Nyilv�nos kulcs� (pubkey): "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Rejtjelez� (cipher): "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Kivonatol� (hash): "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "T�m�r�t� (compression): "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "Haszn�lat: gpg [opci�k] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, 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:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, 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:1904
#, 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:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "kulcs tilt�sa"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "�rv�nytelen import opci�k!\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, 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:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, 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:3276
++#: g10/gpg.c:3330
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �rtelmetlen %s mellett!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, 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:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [f�jln�v]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [f�jln�v]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [f�jln�v]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [f�jln�v]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [f�jln�v]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [f�jln�v]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [f�jln�v]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key felh-azonos�t�"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key felh-azonos�t�"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key felh-azonos�t� [parancsok]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key felh-azonos�t�"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, 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:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[f�jln�v]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti g�pelni az �zenetet...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
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:5000
++#: g10/gpg.c:5086
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:5033
++#: g10/gpg.c:5119
#, 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"
@@@ -3286,326 -2589,262 +3306,328 @@@ msgstr "Nem �ll rendelkez�sre seg�ts�g.
msgid "No help available for '%s'"
msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "bizalmi adatb�zis friss�t�se"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "bizalmi adatb�zis friss�t�se"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "megmutatja az ujjlenyomatot"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "haszn�lhatatlan titkos kulcs"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d t�pus� blokkot kihagyom.\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr " �sszesen feldolgoztam: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " �j kulcsok kihagyva: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " felh. azonos�t� n�lk�l: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " import�lva: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " v�ltozatlan: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " �j felh. azonos�t�k: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " �j alkulcsok: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " �j al��r�sok: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " �j kulcsvisszavon�sok: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " import�lt titkos kulcsok: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "v�ltozatlan titkos kulcsok: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nem import�lt: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " �j al��r�sok: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " olvasott titkos kulcsok: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, 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:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, 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:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, 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:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "�rok a \"%s\" �llom�nyba.\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, 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:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, 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:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, 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:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, fuzzy, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr ""
@@@ -3621,143 -2860,116 +3643,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, 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:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, 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:2108
++#: g10/import.c:2393
#, fuzzy, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, 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:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
@@@ -3794,48 -3000,39 +3816,48 @@@ msgstr "Hiba \"%s\" l�trehoz�sakor: %s\
msgid "error opening key DB: %s\n"
msgstr "Hiba \"%s\" olvas�sakor: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[visszavon�s]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[�nal��r�s]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "J� al��r�s a k�vetkez�t�l: \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "Kihagytam \"%s\"-t: %s.\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3843,7 -3040,6 +3865,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3851,21 -3047,18 +3873,21 @@@ 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:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "J� al��r�s a k�vetkez�t�l: \""
msgstr[1] "J� al��r�s a k�vetkez�t�l: \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3878,68 -3071,53 +3900,68 @@@ msgstr "
"k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = r�szlegesen megb�zom benne\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = teljesen megb�zom benne\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Nem tudom al��rni.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Val�ban al��rja? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3948,11 -3126,9 +3970,11 @@@ msgstr "
"\"%s\" �nal��r�sa\n"
"PGP 2.x st�lus�.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3961,11 -3137,9 +3983,11 @@@ msgstr "
"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
"kulcson lej�rt.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3974,43 -3148,34 +3996,43 @@@ msgstr "
"Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
"kulcson helyi al��r�s.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, 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:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "M�g egyszer al� akarja �rni? (i/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Ez a kulcs lej�rt!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Ez a kulcs lej�r: %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4019,32 -3184,26 +4041,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:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nem v�laszolok.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, 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:1470
++#: g10/keyedit.c:1473
#, 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:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Nagyon alaposan ellen�riztem.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4053,265 -3212,211 +4075,265 @@@ msgstr "
"Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
"az �n kulcs�val: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ez egy �nal��r�s lesz.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, 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:1544
++#: g10/keyedit.c:1547
#, 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:1551
++#: g10/keyedit.c:1554
#, 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:1556
++#: g10/keyedit.c:1559
#, 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:1561
++#: g10/keyedit.c:1564
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Val�ban al��rja? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "ment�s �s kil�p�s"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "megmutatja az ujjlenyomatot"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Al��r�s-jel�l�s: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "al��r�sok visszavon�sa"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "kulcs helyi al��r�sa"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, 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:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "fot�azonos�t� hozz�ad�sa"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "felhaszn�l�i azonos�t� t�rl�se"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "m�sodlagos kulcs t�rl�se"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "visszavon� kulcs hozz�ad�sa"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, 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:1901
++#: g10/keyedit.c:1904
#, 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:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "preferenci�k list�z�sa (szak�rt�)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "preferenci�k list�z�sa (r�szletes)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, 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:1912
++#: g10/keyedit.c:1915
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
#, 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:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "jelsz�v�ltoztat�s"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, 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:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "felhaszn�l�i azonos�t� visszavon�sa"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "m�sodlagos kulcs visszavon�sa"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "kulcs enged�lyez�se"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "kulcs tilt�sa"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "fot�azonos�t� megmutat�sa"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Titkos kulcs rendelkez�sre �ll.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4319,273 -3424,220 +4341,279 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "A kulcsot visszavont�k."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, 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:2260
++#: g10/keyedit.c:2263
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:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "ismeretlen al��r�soszt�ly"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
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:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
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:2325
++#: g10/keyedit.c:2328
#, 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:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, 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:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, 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:2503
++#: g10/keyedit.c:2506
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Val�ban t�rli ezt a kulcsot? "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
#, 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:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Val�ban visszavonja ezt a kulcsot? "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Val�ban visszavonja ezt a kulcsot? "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "preferencialista be�ll�t�sa"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, 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:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Val�ban friss�tsem a preferenci�kat? "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Mentsem a v�ltoztat�sokat? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Kil�pjek ment�s n�lk�l? "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "Friss�t�s sikertelen: %s.\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
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:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Kulcsgener�l�s sikertelen: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "�rv�nytelen �rt�k!\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Kivonat: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Jellemz�k: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Jel�l�s: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (�rz�keny)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s nem hozhat� l�tre: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[visszavont] "
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [lej�r: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [lej�r: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " bizalom: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " bizalom: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Ez a kulcs tiltott."
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4593,19 -3645,14 +4621,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[visszavont] "
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4613,17 -3660,14 +4641,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4633,35 -3677,27 +4661,35 @@@ msgstr "
"okozhatja,\n"
" hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4669,38 -3705,31 +4697,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:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Nem t�r�ltem semmit.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
#, fuzzy
msgid "invalid"
msgstr "�rv�nytelen p�nc�l"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, 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:4398
++#: g10/keyedit.c:4505
#, 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:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4710,203 -3739,165 +4738,208 @@@ msgstr "
" azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
"kulcsot!\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
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:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
#, 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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, 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:4637
++#: g10/keyedit.c:4744
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
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:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, 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:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Al��r�s-jel�l�s: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Fel�l�rjam (i/N)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "Felhaszn�l�azonos�t�: \""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, 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:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (nem export�lhat�)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " al��rva %08lX �ltal %s%s id�pontban.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (nem export�lhat�)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " visszavonva %08lX �ltal %s id�pontban.\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "Nincs titkos kulcs.\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, 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:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, 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:6291
++#: g10/keyedit.c:6432
#, 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:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5359,13 -4272,10 +5392,13 @@@ msgstr "
"a lemezeket) a pr�msz�m gener�l�sa alatt. Ez seg�ti a v�letlensz�m-\n"
"gener�tort, hogy entr�pi�t tudjon gy�jteni.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Kulcsgener�l�s sikertelen: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5373,68 -4283,55 +5406,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" m�r t�m�r�tett.\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "M�gis l�trehozzam? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "M�gis l�trehozzam? "
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
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:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5444,66 -4341,53 +5477,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"A kulcs %lu m�sodperccel a j�v�ben k�sz�lt. (Id�ugr�s vagy �raprobl�ma.)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
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:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, 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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Val�ban l�trehozzam? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "soha "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritikus al��r�si elj�r�sm�d: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Al��r�si elj�r�sm�d: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritikus al��r�s-jel�l�s: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Al��r�s-jel�l�s: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5511,7 -4395,6 +5544,7 @@@ 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:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5519,46 -4402,33 +5552,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 al��r�st nem ellen�riztem hiba miatt.\n"
msgstr[1] "1 al��r�st nem ellen�riztem hiba miatt.\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Kulcskarika"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Els�dlegeskulcs-ujjlenyomat:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr "Els�dlegeskulcs-ujjlenyomat:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Alkulcsujjlenyomat:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " Kulcs ujjlenyomata ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5623,303 -4481,246 +5651,308 @@@ msgstr "A megadott al��r�si elj�r�sm�d
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, 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:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "Kihagytam \"%s\"-t: %s.\n"
+
++#: g10/keyserver.c:1823
#, 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:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s titkos�tott munkafolyamatkulcs\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "Nyilv�nos kulcs: %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " azaz \""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "%lu jelsz�val rejtjelezve\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "1 jelsz�val rejtjelezve\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s titkos�tott adatot felt�telezek.\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "Visszafejt�s rendben.\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "Eredeti f�jln�v: '%.*s'.\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
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:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "J� al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "J� al��r�s a k�vetkez�t�l: \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, 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:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " azaz \""
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Kulcs tal�lhat�: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[bizonytalan]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " azaz \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Az al��r�s lej�rt: %s.\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Az al��r�s lej�r: %s.\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "Bin�ris"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "Sz�vegm�d�"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "Ismeretlen m�d�"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "ismeretlen nyilv�nos kulcs� algoritmus"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "Nem k�l�n�ll� al��r�s.\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, 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:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
@@@ -6100,7 -4867,6 +6133,7 @@@ msgid "WARNING: potentially insecure sy
msgstr ""
"FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
@@@ -6473,47 -5171,38 +6506,47 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nem biztos, hogy az al��r�s a tulajdonoshoz tartozik.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: kihagyva: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6521,38 -5210,30 +6554,38 @@@ msgstr "
"\n"
"Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "Nincsenek �rv�nyes c�mzettek!\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, 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:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
@@@ -6562,29 -5242,23 +6595,29 @@@ msgid "data not saved; use option \"--o
msgstr ""
"Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "K�l�n�ll� al��r�s.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "Olvasom a szabv�nyos bemenetet...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "Nincs al��rt adat.\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
@@@ -6832,7 -5461,6 +6865,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
msgstr[1] "A(z) %08lX nyilv�nos kulcs %lu m�sodperccel �jabb az al��r�sn�l!\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6906,12 -5525,10 +6939,12 @@@ msgstr "
"hossz�).\n"
"Kifejt�s n�lk�l haszn�lom.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, 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:861
++#: g10/sign.c:863
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6919,11 -5536,9 +6952,11 @@@ msgstr "
"%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
"a c�mzett preferenci�ival.\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "Al��rom:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s titkos�t�st fogok haszn�lni.\n"
@@@ -7003,133 -5604,106 +7036,133 @@@ msgstr "Olvas�si hiba: %s.\n
msgid "trustdb: sync failed: %s\n"
msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: K�nyvt�r nem l�tezik!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: Nem bizalmi adatb�zis.\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, 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:1800
++#: g10/tdbio.c:1804
#, 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:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
@@@ -7489,7 -6001,6 +7522,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
@@@ -7504,7 -6013,6 +7537,7 @@@ msgstr "Nincs sz�ks�g a bizalmi adatb�z
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
@@@ -7517,14 -6023,12 +7550,14 @@@ msgstr "K�rem, hajtson v�gre egy --chec
msgid "checking the trustdb\n"
msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "Eddig %lu kulcsot dolgoztam fel.\n"
msgstr[1] "Eddig %lu kulcsot dolgoztam fel.\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7532,22 -6036,18 +7565,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
msgstr[1] "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, 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"
@@@ -8010,27 -6415,22 +8043,27 @@@ msgstr "Egym�snak ellentmond� parancsok
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8040,7 -6439,6 +8073,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
@@@ -9914,8 -7925,6 +9947,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "Haszn�lat: gpg [opci�k] "
@@@ -9926,12 -7934,10 +9959,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
@@@ -10426,77 -8330,61 +10459,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, 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:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10636,7 -8494,6 +10669,7 @@@ msgstr "Ismeretlen alap�rtelmezett c�mz
msgid "sending line failed: %s\n"
msgstr "Al��r�s sikertelen: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
@@@ -10889,16 -8685,13 +10922,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "nyilv�nos kulcs nem tal�lhat�"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
diff --cc po/id.po
index e7f90a3,f1fbc44..903a10d
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -406,10 -320,6 +406,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detil"
@@@ -518,11 -403,6 +518,11 @@@ msgstr "tidak didukung
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Laporkan bug ke <gnupg-bugs at gnu.org>.\n"
@@@ -538,55 -416,38 +538,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "file pilihan `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "membaca pilihan dari `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -596,28 -456,22 +596,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "menulis kunci rahasia ke `%s'\n"
@@@ -645,7 -493,6 +645,7 @@@ msgstr "trustdb: read failed (n=%d): %s
msgid "can't use '%s' as home directory\n"
msgstr "%s: tidak dapat membuat direktori: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -670,18 -513,14 +670,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "gagal perbarui rahasia: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: dilewati: %s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@@ -697,8 -534,6 +697,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -706,9 -541,6 +706,9 @@@ msgstr "
"@Perintah:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -945,29 -734,22 +945,29 @@@ msgstr "kesalahan penciptaan passphrase
msgid "error creating a stream for a pipe: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "kesalahan membaca `%s': %s\n"
@@@ -982,32 -762,26 +982,32 @@@ msgstr "kesalahan menulis keyring rahas
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "tidak dapat terkoneksi ke `%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "masalah komunikasi dengan gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "dibatalkan oleh user\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
@@@ -1083,7 -842,6 +1083,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
@@@ -1345,7 -1049,6 +1345,7 @@@ msgstr "Tidak tersedia bantuan untuk `%
msgid "ignoring garbage line"
msgstr "kesalahan dalam garis trailer\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "tidak dikenal"
@@@ -1485,95 -1161,75 +1485,95 @@@ msgstr "kunci publik %08lX tidak ditemu
msgid "waiting for lock %s...\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armor: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "header armor tidak valid: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "header armor: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "header clearsig tidak valid\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "header armor: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "signature teks bersarang\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "armor tidak terduga:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "dash escaped line tidak valid: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "karakter radix64 tidak valid %02x dilewati\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "eof prematur (tanpa CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "eof prematur (dalam CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "CRC tidak tepat\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "kesalahan CRC; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "eof prematur (dalam Trailer)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "kesalahan dalam garis trailer\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armor tidak valid: baris melebihi %d karakter\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "tidak dapat dibaca manusia"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1581,25 -1237,20 +1581,25 @@@ msgstr "
"nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
"dan diakhiri dengan sebuah '='\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, 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:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
#, fuzzy
msgid "a notation name may not contain an '=' character\n"
msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1609,7 -1260,6 +1609,7 @@@ msgstr "
"nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
"dan diakhiri dengan sebuah '='\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
@@@ -1639,19 -1284,14 +1639,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "kunci rahasia tidak tersedia"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
@@@ -1666,10 -1304,6 +1666,10 @@@ msgstr "Perintah ini tidak dibolehkan s
msgid "Reset Code not or not anymore available\n"
msgstr "bagian kunci rahasia tidak tersedia\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Pilihan anda? "
@@@ -1736,148 -1356,115 +1736,149 @@@ msgstr "tidak ada kunci publik yang ses
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "perbarui preferensi"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "Karakter tidak valid dalam string preferensi\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "tampilkan fingerprint"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "tidak ditemukan data OpenPGP yang valid.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Keysize yang anda inginkan? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
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:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "dibulatkan hingga %u bit\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1885,155 -1472,120 +1886,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Silakan pilih kunci yang anda inginkan:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (hanya enkripsi)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Pilihan tidak valid.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Silakan pilih alasan untuk pembatalan:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "dilewati: kunci pribadi telah ada\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Ditandai? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "berhenti dari menu ini"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "tampilkan bantuan"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "Kunci tersedia di:"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "ubah tanggal kadaluarsa"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "ubah ownertrust"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "buat sepasang kunci baru"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "perintah saling konflik\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Perintah tidak valid (coba \"help\")\n"
@@@ -2041,28 -1592,19 +2042,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output tidak berfungsi untuk perintah ini\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "tidak dapat membuka `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "gagal membaca keyblock: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
@@@ -2119,7 -1650,6 +2120,7 @@@ msgstr "terdapat kunci rahasia untuk ku
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
@@@ -2139,7 -1666,6 +2140,7 @@@ msgstr "menggunakan cipher %s\n
msgid "'%s' already compressed\n"
msgstr "`%s' sudah dikompresi\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2157,7 -1681,6 +2158,7 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2174,17 -1695,14 +2175,17 @@@ msgstr "memaksa cipher simetrik %s (%d
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s dienkripsi untuk: %s\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s data terenkripsi\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
@@@ -2256,343 -1761,278 +2257,357 @@@ 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:78
++#: g10/export.c:102
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "kunci rahasia tidak dapat dipakai"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: dilewati: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "menulis ke `%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "PERINGATAN: tidak ada yang diekspor\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[User id tidak ditemukan]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opsi impor tidak valid\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "kesalahan penciptaan : `%s': %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "buat detached signature"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|buat signature teks"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "buat detached signature"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "enkripsi data"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "enkripsi hanya dengan symmetric cipher"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekripsi data (default)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifikasi signature"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "tampilkan kunci"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "tampilkan kunci dan signature"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "periksa signature kunci"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "tampilkan kunci dan fingerprint"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "tampilkan kunci rahasia"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "buat sepasang kunci baru"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "buat sepasang kunci baru"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "buat sertifikat revokasi"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "hapus kunci dari keyring publik"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "hapus kunci dari keyring pribadi"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "tandai kunci"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "tandai kunci secara lokal"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "tandai atau edit kunci"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "ubah passphrase"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "ekspor kunci"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "ekspor kunci ke keyserver"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "impor kunci dari keyserver"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "cari kunci di keyserver"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "update semua kunci dari keyserver"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "impor/gabung kunci"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "perbarui database trust"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [file]|cetak digest pesan"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ciptakan output ascii"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NAMA|enkripsi untuk NAMA"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "gunakan id-user ini untuk menandai/dekripsi"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|set tingkat kompresi N (0 tidak ada)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "gunakan mode teks kanonikal"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|muat modul ekstensi FILE"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "jangan buat perubahan"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "tanya sebelum menimpa"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2600,7 -2040,6 +2615,7 @@@ msgstr "
"@\n"
"(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2620,13 -2059,11 +2635,13 @@@ msgstr "
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2641,7 -2078,6 +2656,7 @@@ msgstr "
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2649,604 -2085,479 +2664,609 @@@ msgstr "
"\n"
"Algoritma yang didukung:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Kompresi: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pemakaian: gpg [pilihan] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "tampilkan keyring tempat kunci yang dipilih berada"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "tiadakan kunci"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "opsi impor tidak valid\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [namafile]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [namafile]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [namafile]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-user"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, 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:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "kesalahan penciptaan passphrase: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[namafile]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@@ -3291,326 -2594,262 +3311,328 @@@ msgstr "Tidak tersedia bantuan
msgid "No help available for '%s'"
msgstr "Tidak tersedia bantuan untuk `%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "perbarui database trust"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "perbarui database trust"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "tampilkan fingerprint"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "kunci rahasia tidak dapat dipakai"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "melewati blok tipe %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kunci telah diproses\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Jumlah yang telah diproses: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " lewati kunci baru: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " tanpa ID user: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " diimpor: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " tidak berubah: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " ID user baru: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " subkey baru: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " signature baru: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " pembatalan kunci baru: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " kunci rahasia diimpor: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " kunci rahasia tidak berubah: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " tidak diimpor: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signature baru: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " kunci rahasia dibaca: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s signature, algoritma digest %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "melewati `%s': %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "kunci %08lX: tidak ada ID user yang valid\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "kunci %08lX: kunci baru - dilewati\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "menulis ke `%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "kunci %08lX: \"%s\" %d signature baru\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "kunci %08lX: \"%s\" tidak berubah\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "kunci %08lX: kunci rahasia diimpor\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3625,141 -2864,114 +3647,141 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "kunci %08lX: subkey binding tidak valid\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "kunci %08lX: hapus subkey binding ganda\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "kunci %08lX: melewati ID user "
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "kunci %08lX: melewati subkey\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, fuzzy, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
@@@ -3796,48 -3002,39 +3818,48 @@@ msgstr "kesalahan penciptaan : `%s': %s
msgid "error opening key DB: %s\n"
msgstr "kesalahan membaca `%s': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[pembatalan]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[self-signature]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "Signature baik dari \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "melewati `%s': %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3845,7 -3042,6 +3867,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3853,21 -3049,18 +3875,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d signature yang buruk\n"
msgstr[1] "%d signature yang buruk\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Signature baik dari \""
msgstr[1] "Signature baik dari \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3880,68 -3073,53 +3902,68 @@@ msgstr "
"memeriksa fingerprint dari berbagai sumber...)?\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Saya cukup percaya\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Saya sangat percaya\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr "..Tidak dapat menandai.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "User ID \"%s\" kadaluwarsa."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "User ID \"%s\" bukan self-signed."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "User ID \"%s\" bukan self-signed."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Ditandai? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3950,11 -3128,9 +3972,11 @@@ msgstr "
"Self-signature pada \"%s\"\n"
"adalah signature bergaya PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3963,13 -3139,11 +3985,13 @@@ msgstr "
"Signature anda saat ini pada \"%s\"\n"
"telah habis berlaku.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3978,43 -3152,34 +4000,43 @@@ msgstr "
"Signature anda saat ini pada \"%s\"\n"
"adalah signature.lokal \n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Apakah anda ingin menandainya lagi? (y/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Kunci ini telah berakhir!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4024,32 -3189,26 +4046,32 @@@ msgstr "
"menandai benar benar milik\n"
"orang tersebut? Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Saya tidak akan menjawab.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Saya belum memeriksanya.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Saya telah melakukan pemeriksaan biasa.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4058,265 -3217,211 +4080,265 @@@ msgstr "
"Apakah anda yakin untuk menandai kunci ini \n"
"dengan kunci anda: "
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ini akan jadi self-signature.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat diekspor.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Saya belum memeriksa kunci ini sama sekali.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Saya telah memeriksa kunci ini.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, 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:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Ditandai? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "simpan dan berhenti"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "tampilkan fingerprint"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Notasi signature: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "tampilkan kunci dan ID user"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "pilih ID user N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "pilih ID user N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "batalkan signature"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "tandai kunci secara lokal"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "tambah sebuah ID user"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "tambah sebuah photo ID"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "hapus ID user"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "hapus kunci sekunder"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "tambah kunci pembatalan"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
#, 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:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "tandai ID user sebagai primer"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "tampilkan preferensi (ahli)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "tampilkan preferensi (verbose)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
#, fuzzy
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "ubah passphrase"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "ubah ownertrust"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Benar-benar hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "batalkan sebuah ID user"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "batalkan kunci sekunder"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "aktifkan kunci"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "tiadakan kunci"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "tampilkan photo ID"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Kunci rahasia tersedia.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4324,273 -3429,220 +4346,279 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Kunci dibatalkan"
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Tandai ID seluruh user? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Tandai ID seluruh user? "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "kelas signature tidak dikenal"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Hapus ID user ini? "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "kesalahan menulis keyring `%s': %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Anda harus memilih minimum satu kunci.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Anda ingin menghapus kunci terpilih ini? "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Anda ingin menghapus kunci ini? "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Benar-benar hapus seluruh ID user terpilih? "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Benar-benar hapus ID user ini? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Anda ingin membatalkan kunci ini? "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Anda ingin membatalkan kunci terpilih ini? "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Anda ingin membatalkan kunci ini? "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "set daftar preferensi"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, fuzzy
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "Perbarui preferensi untuk user ID terpilih?"
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Update preferensi?"
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Simpan perubahan? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Berhenti tanpa menyimpan? "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "gagal memperbarui: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Pembuatan kunci gagal: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "kesalahan: fingerprint tidak valid\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "nilai yang tidak valid\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Tidak ada ID user tersebut.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Fitur: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Notasi: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, fuzzy, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (sensitive)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revoked] "
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [berakhir: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [berakhir: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " trust: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " trust: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Kunci ini telah ditiadakan"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4598,19 -3650,14 +4626,19 @@@ msgstr "
"Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
"kecuali anda memulai kembali program.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revoked] "
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4618,17 -3665,14 +4646,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4638,35 -3682,27 +4666,35 @@@ msgstr "
"dapat menyebabkan beberapa versi\n"
" PGP menolak kunci ini.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Anda tetap ingin menambahkannya? (y/n) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Hapus signature baik ini? (y/T/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Hapus signature tidak valid ini? (y/T/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4674,38 -3710,31 +4702,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Menghapus %d signature.\n"
msgstr[1] "Menghapus %d signature.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Tidak ada yang dihapus.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
#, fuzzy
msgid "invalid"
msgstr "armor tidak valid"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "User ID \"%s\" dibatalkan."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4715,44 -3744,36 +4743,44 @@@ msgstr "
"designated dapat\n"
"............menyebabkan beberapa versi PGP menolak kunci ini.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
#, 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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4760,162 -3781,132 +4788,167 @@@
msgstr ""
"Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Merubah batas waktu untuk kunci sekunder.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Merubah batas waktu untuk kunci primer.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, fuzzy, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Anda harus memilih minimum satu ID user.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, 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:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Notasi signature: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Ditimpa (y/T)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Tidak ada ID user dengan index %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID user: "
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, 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:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (tidak dapat diekspor)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Kunci ini akan kadaluarsa pada %s \n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Anda tetap ingin membatalkannya? (y/n) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " ditandai oleh %08lX pada %s%s\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (tidak dapat diekspor)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " dibatalkan oleh %08lX pada %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Anda akan membatalkan signature ini:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "tidak ada kunci rahasia\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "User ID \"%s\" telah dibatalkan\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5364,13 -4277,10 +5397,13 @@@ msgstr "
"selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
"yang baik untuk memperoleh entropi.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Pembuatan kunci gagal: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5378,68 -4288,55 +5411,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' sudah dikompresi\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Tetap dibuat? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Tetap dibuat? "
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Pembuatan kunci dibatalkan.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5449,65 -4346,52 +5482,65 @@@ msgstr "
"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
"untuk tujuan ini.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Ingin diciptakan? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "tidak pernah..."
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kebijakan signature kritis: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Kebijakan signature: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notasi signature kritis: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notasi signature: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5515,7 -4399,6 +5548,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d signature yang buruk\n"
msgstr[1] "%d signature yang buruk\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5523,46 -4406,33 +5556,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signature tidak diperiksa karena kesalahan\n"
msgstr[1] "1 signature tidak diperiksa karena kesalahan\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Keyring"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Fingerprint kunci primer:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Fingerprint kunci primer ="
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Fingerprint subkunci ="
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint kunci ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5627,299 -4485,242 +5655,304 @@@ msgstr "URL signature kebijakan yang di
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "kunci '%s' tidak ditemukan: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "melewati `%s': %s\n"
+
++#: g10/keyserver.c:1823
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"ditandai dengan kunci anda %08lX pada %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "meminta kunci %08lX dari %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s kunci sesi enkripsi\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "kunci publik adalah %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "gagal dekripsi kunci publik: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "dienkripsi dengan passphrase %lu\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "dienkripsi dengan 1 passphrase\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "asumsikan %s data terenkripsi\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "dekripsi lancar\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "original file name='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "signature BURUK dari \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Signature kadaluarsa dari \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Signature baik dari \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "verifikasi signature tidak diabaikan\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "tidak dapat menangani banyak signature ini\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Kunci tersedia di:"
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[uncertain]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Signature kadaluwarsa %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Signature kadaluarsa pada %s \n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "biner"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "modeteks"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "tidak dikenal"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritma pubkey tidak dikenal"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Tidak dapat memeriksa signature: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "bukan detached signature\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "kelas signature mandiri 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "signature model lama (PGP 2.X)\n"
@@@ -6094,7 -4861,6 +6127,7 @@@ msgstr "tidak dapat menangani algoritm
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@@ -6466,46 -5164,37 +6499,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Tidak pasti signature milik pemilik.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: dilewati: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: dilewati: kunci publik dimatikan\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: dilewati: kunci publik telah ada\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6513,37 -5202,29 +6546,37 @@@ msgstr "
"\n"
"Masukkan user ID. Akhiri dengan baris kosong: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Tidak ada ID user tersebut.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Kunci publik dimatikan.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "dilewati: kunci publik telah diset\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "penerima baku tidak dikenal `%s'\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "tidak ada alamat yang valid\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "kunci %08lX: tidak ada ID user\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "kunci %08lX: tidak ada ID user\n"
@@@ -6552,29 -5232,23 +6585,29 @@@
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Menghapus signature.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Silakan masukkan nama file data: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "membaca stdin ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "tidak ada data tertandai\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "tidak dapat membuka data tertandai `%s'\n"
@@@ -6826,7 -5455,6 +6859,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
msgstr[1] "kunci publik %08lX adalah %lu detik lebih baru daripada signature\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6898,22 -5517,18 +6931,22 @@@ msgstr "
"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar). "
"Menggunakan yang tidak expand.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s signature dari: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, 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:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "menandai:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s enkripsi akan digunakan\n"
@@@ -6993,133 -5594,106 +7026,133 @@@ msgstr "kesalahan pembacaan: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: gagal sync: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "tidak dapat membuka `%s'\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek gagal: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "transaksi trustdb terlalu besar\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: direktori tidak ada!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: gagal membuat catatan versi: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: tercipta trustdb tidak valid\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: tercipta trustdb\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb tidak valid\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: kesalahan membaca catatan versi: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: kesalahan menulis catatan versi: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek gagal: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: bukan file trustdb\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: catatan versi dengan recnum %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versi file %d tidak valid\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: kesalahan membaca record bebas: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: kesalahan menulis dir record: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: gagal mengosongkan record: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: gagal menambahkan record: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: tercipta trustdb\n"
@@@ -7478,7 -5990,6 +7511,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "tidak perlu memeriksa trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "pemeriksaan trustdb berikutnya pada %s\n"
@@@ -7493,7 -6002,6 +7526,7 @@@ msgstr "tidak perlu memeriksa trustdb\n
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "tidak perlu memeriksa trustdb\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "kunci publik %08lX tidak ditemukan: %s\n"
@@@ -7506,14 -6012,12 +7539,14 @@@ msgstr "lakukanlah --check-trustdb\n
msgid "checking the trustdb\n"
msgstr "memeriksa trustdb\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu kunci telah diproses\n"
msgstr[1] "%lu kunci telah diproses\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7521,22 -6025,18 +7554,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d kunci diproses (%d hitungan validitas dihapus)\n"
msgstr[1] "%d kunci diproses (%d hitungan validitas dihapus)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, fuzzy, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@@ -7999,27 -6404,22 +8032,27 @@@ msgstr "perintah saling konflik\n
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8029,7 -6428,6 +8062,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "karakter radix64 tidak valid %02x dilewati\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@@ -9903,8 -7914,6 +9936,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "pemakaian: gpg [pilihan] "
@@@ -9915,12 -7923,10 +9948,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "gagal enarmoring: %s\n"
@@@ -10415,77 -8319,61 +10448,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "gagal menghapus keyblok: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, fuzzy, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "gagal membuat kembali cache keyring: %s\n"
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10625,7 -8483,6 +10658,7 @@@ msgstr "penerima baku tidak dikenal `%s
msgid "sending line failed: %s\n"
msgstr "gagal menandai: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "kesalahan mengirim ke `%s': %s\n"
@@@ -10878,16 -8674,13 +10911,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "kunci publik tidak ditemukan"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "menulis kunci rahasia ke `%s'\n"
diff --cc po/it.po
index 53d6332,3a0572b..7deaf19
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -401,10 -315,6 +401,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "prolisso"
@@@ -513,11 -398,6 +513,11 @@@ msgstr "non gestito
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Per favore segnala i bug a <gnupg-bugs at gnu.org>.\n"
@@@ -533,55 -411,38 +533,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "file con le opzioni `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "lettura delle opzioni da `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "impossibile creare %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -591,28 -451,22 +591,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent non � disponibile in questa sessione\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "scrittura della chiave segreta in `%s'\n"
@@@ -640,7 -488,6 +640,7 @@@ msgstr "trustdb: read fallita (n=%d): %
msgid "can't use '%s' as home directory\n"
msgstr "%s: impossibile creare la directory: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -665,18 -508,14 +665,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aggiornamento della chiave segreta fallito: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: saltata: %s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent non � disponibile in questa sessione\n"
@@@ -692,8 -529,6 +692,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -701,9 -536,6 +701,9 @@@ msgstr "
"@Comandi:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -940,29 -729,22 +940,29 @@@ msgstr "errore nella creazione della pa
msgid "error creating a stream for a pipe: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "errore leggendo `%s': %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "errore leggendo `%s': %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -977,32 -757,26 +977,32 @@@ msgstr "errore scrivendo il portachiav
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "impossibile connettersi a `%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "problema di comunicazione con gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "interrotto dall'utente\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "problema con l'agent: ha restituito 0x%lx\n"
@@@ -1078,7 -837,6 +1078,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
@@@ -1340,7 -1044,6 +1340,7 @@@ msgstr "Non � disponibile un aiuto per
msgid "ignoring garbage line"
msgstr "errore nella riga della coda\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "sconosciuto"
@@@ -1482,95 -1158,75 +1482,95 @@@ msgstr "chiave pubblica %08lX non trova
msgid "waiting for lock %s...\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armatura: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "header dell'armatura non valido: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "header dell'armatura: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "header della firma in chiaro non valido\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "header dell'armatura: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "firme in chiaro annidate\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "armatura inaspettata:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "riga protetta con il trattino non valida: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "Carattere radix64 non valido %02x saltato\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "eof prematura (nessun CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "eof prematura (nel CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "CRC malformato\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "errore nel CRC; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "eof prematura (nella coda)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "errore nella riga della coda\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "non leggibile"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1578,25 -1234,20 +1578,25 @@@ 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:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, 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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1606,7 -1257,6 +1606,7 @@@ 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:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
@@@ -1636,19 -1281,14 +1636,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "la chiave segreta non � disponibile"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "impossibile fare questo in modo batch\n"
@@@ -1663,10 -1301,6 +1663,10 @@@ msgstr "Questo comando non � permesso i
msgid "Reset Code not or not anymore available\n"
msgstr "parti della chiave segreta non sono disponibili\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Cosa scegli? "
@@@ -1734,148 -1354,115 +1734,149 @@@ msgstr "non c'� una chiave pubblica cor
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "errore scrivendo il portachiavi `%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "preferenze aggiornate"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "carattere non valido nella stringa delle preferenze\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "mostra le impronte digitali"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "Non sono stati trovati dati OpenPGP validi.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Di che dimensioni vuoi la chiave? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arrotondate a %u bit\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "saltata: chiave pubblica gi� presente\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1883,155 -1470,120 +1884,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Per favore scegli che tipo di chiave vuoi:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Firma scaduta il %s\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (cifra solo)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Scelta non valida.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Per favore scegli il motivo della revoca:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Questo comando non � permesso in modalit� %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "saltata: chiave pubblica gi� presente\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Firmo davvero? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "abbandona questo men�"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "mostra questo aiuto"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "Chiave disponibile presso: "
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "cambia la data di scadenza"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "cambia il valore di fiducia"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "genera una nuova coppia di chiavi"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "comandi in conflitto\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Comando non valido (prova \"help\")\n"
@@@ -2039,28 -1590,19 +2040,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output non funziona con questo comando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "impossibile aprire `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "chiave `%s' non trovata: %s\n"
@@@ -2117,7 -1648,6 +2118,7 @@@ msgstr "c'� una chiave segreta per la c
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
@@@ -2138,7 -1665,6 +2139,7 @@@ msgstr "uso il cifrario %s\n
msgid "'%s' already compressed\n"
msgstr "`%s' � gi� compresso\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2158,7 -1682,6 +2159,7 @@@ msgstr "
"forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
"del destinatario\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2179,17 -1700,14 +2180,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrato per: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "dati cifrati con %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrato con l'algoritmo sconosciuto %d\n"
@@@ -2263,343 -1768,278 +2264,357 @@@ 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:78
++#: g10/export.c:102
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr ""
"\n"
"La firma sar� marcata come irrevocabile.\n"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "non sono state trovate chiavi di revoca per `%s'\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "chiave segreta inutilizzabile"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: saltata: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "scrittura in `%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "ATTENZIONE: non � stato esportato nulla\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[User ID non trovato]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "errore creando `%s': %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "fai una firma separata"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifra dati"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "cifra solo con un cifrario simmetrico"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "decifra dati (predefinito)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifica una firma"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "elenca le chiavi"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "elenca le chiavi e le firme"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "controlla le firme delle chiavi"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "elenca le chiavi e le impronte digitali"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "elenca le chiavi segrete"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genera una nuova coppia di chiavi"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "genera una nuova coppia di chiavi"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "genera un certificato di revoca"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "rimuove le chiavi dal portachiavi pubblico"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "rimuove le chiavi dal portachiavi privato"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "firma una chiave"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "firma una chiave localmente"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "firma o modifica una chiave"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "cambia la passphrase"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "esporta delle chiavi"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "esporta le chiavi a un keyserver"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importa le chiavi da un keyserver"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "cerca delle chiavi su un keyserver"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "aggiorna tutte le chiavi da un keyserver"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importa/aggiungi delle chiavi"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "aggiorna il database della fiducia"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [files]|stampa tutti i message digests"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "crea un output ascii con armatura"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifra per NOME"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "usa questo user-id per firmare o decifrare"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|imposta il livello di compressione (0 disab.)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "usa il modo testo canonico"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FILE|carica il modulo di estensione FILE"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "non fa cambiamenti"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "chiede prima di sovrascrivere"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2607,7 -2047,6 +2622,7 @@@ msgstr "
"@\n"
"(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2627,13 -2066,11 +2642,13 @@@ msgstr "
" --list-keys [nomi] mostra le chiavi\n"
" --fingerprint [nomi] mostra le impronte digitali\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2648,7 -2085,6 +2663,7 @@@ msgstr "
"firma, controlla, cifra o decifra\n"
"l'operazione predefinita dipende dai dati di input\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2656,603 -2092,478 +2671,608 @@@ msgstr "
"\n"
"Algoritmi gestiti:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "A chiave pubblica: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifrari: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compressione: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [opzioni] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, fuzzy, c-format
msgid "unknown configuration item '%s'\n"
msgstr "elemento della configurazione sconosciuto \"%s\"\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, 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:1904
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "disabilita una chiave"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "impossibile fare il parsing dell'URI del keyserver\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "opzioni di importazione non valide\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un set di caratteri valido\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Non � permesso usare %s con %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "Non ha senso usare %s con %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non � valido\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non � valido\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [nomefile]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [nomefile]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [nomefile]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [nomefile]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nomefile]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nomefile]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [nomefile]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [nomefile]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [comandi]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al keyserver fallito: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal keyserver fallita: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave fallita: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel keyserver fallita: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento del keyserver fallito: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, 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:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "errore nella creazione della passhprase: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[nomefile]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Vai avanti e scrivi il messaggio...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non � valido\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL della politica di firma indicato non � valido\n"
@@@ -3297,326 -2600,262 +3317,328 @@@ msgstr "Non � disponibile un aiuto
msgid "No help available for '%s'"
msgstr "Non � disponibile un aiuto per `%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aggiorna il database della fiducia"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aggiorna il database della fiducia"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "mostra le impronte digitali"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chiave segreta inutilizzabile"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "salto un blocco di tipo %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "Per ora sono state esaminate %lu chiavi\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Numero totale esaminato: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " nuove chiavi saltate: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " senza user ID: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " non modificate: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nuovi user ID: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nuove subchiavi: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " nuove firme: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr "nuove revoche di chiavi: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "chiavi segrete importate: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chiavi segrete non cambiate: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " importate: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nuove firme: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chiavi segrete lette: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "Firma %s, algoritmo di digest %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "saltata `%s': %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, 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:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chiave %08lX: nessun user ID valido\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "questo pu� essere causato da una autofirma mancante\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chiave %08lX: nuova chiave - saltata\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "scrittura in `%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chiave %08lX: \"%s\" una nuova firma\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chiave %08lX: \"%s\" non cambiata\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chiave %08lX: chiave segreta importata\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chiave segreta `%s' non trovata: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "scrittura della chiave segreta in `%s'\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3631,144 -2870,117 +3653,144 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chiave %08lX: legame con la subchiave non valido:\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, fuzzy, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chiave %08lX: revoca della subchiave non valida\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, fuzzy, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chiave %08lX: saltato l'user ID '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chiave %08lX: saltata la subchiave\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
@@@ -3805,48 -3011,39 +3827,48 @@@ msgstr "errore creando `%s': %s\n
msgid "error opening key DB: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[revoca]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[autofirma]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "Firma valida da \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "saltata `%s': %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3854,7 -3051,6 +3876,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3862,21 -3058,18 +3884,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d firme non corrette\n"
msgstr[1] "%d firme non corrette\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Firma valida da \""
msgstr[1] "Firma valida da \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3889,68 -3082,53 +3911,68 @@@ msgstr "
"impronte digitali da diverse fonti...)?\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Mi fido marginalmente\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Mi fido completamente\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "L'user ID \"%s\" � stato revocato."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Impossibile firmarla.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "L'user ID \"%s\" � scaduto."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "L'user ID \"%s\" non � autofirmato."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "L'user ID \"%s\" non � autofirmato."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Firmo davvero? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3959,11 -3137,9 +3981,11 @@@ msgstr "
"L'autofirma su \"%s\"\n"
"� una firma in stile PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3972,11 -3148,9 +3994,11 @@@ msgstr "
"La tua firma attuale su \"%s\"\n"
"� scaduta\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3985,43 -3159,34 +4007,43 @@@ msgstr "
"La tua firma attuale su \"%s\"\n"
"� una firma locale.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, 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:1350
++#: g10/keyedit.c:1353
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:1372
++#: g10/keyedit.c:1375
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Niente da firmare con la chiave %08lX\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Questa chiave � scaduta!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Questa chiave scadr� il %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4031,32 -3196,26 +4053,32 @@@ msgstr "
"appartiene veramente alla persona indicata sopra?\n"
"Se non sai cosa rispondere digita \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Preferisco non rispondere.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, 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:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) L'ho controllata superficialmente.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) L'ho controllata molto attentamente.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4065,265 -3224,211 +4087,265 @@@ msgstr "
"Sei davvero sicuro di volere firmare questa chiave\n"
"con la tua chiave: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Questa sar� una autofirma.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
"\n"
"La firma sar� marcata come non esportabile.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
#, fuzzy
msgid "The signature will be marked as non-revocable.\n"
msgstr ""
"\n"
"La firma sar� marcata come irrevocabile.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"Non ho controllato per niente questa chiave.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Ho controllato questa chiave superficialmente.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Ho controllato questa chiave molto attentamente.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Firmo davvero? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "firma fallita: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "salva ed esci"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra le impronte digitali"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Annotazione della firma: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "elenca le chiavi e gli user ID"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "scegli l'user ID N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "scegli l'user ID N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "revoca firme"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "firma la chiave localmente"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "aggiungi un user ID"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "aggiungi un ID fotografico"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "cancella un user ID"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "cancella una chiave secondaria"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "aggiungi una chiave di revoca"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
#, 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:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "imposta l'user ID come primario"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "elenca le preferenze (per esperti)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "elenca le preferenze (prolisso)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
#, 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:1914
++#: g10/keyedit.c:1917
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "cambia la passphrase"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "cambia il valore di fiducia"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Revoco davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revoca un user ID"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoca una chiave secondaria"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "abilita una chiave"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "disabilita una chiave"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostra l'ID fotografico"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "� disponibile una chiave segreta.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Per fare questo serve la chiave segreta.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4331,273 -3436,220 +4353,279 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "La chiave � stata revocata."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Firmo davvero tutti gli user ID? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Firmo davvero tutti gli user ID? "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Suggerimento: seleziona gli user ID da firmare\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "classe della firma sconosciuta"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Devi selezionare almeno un user ID.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Non puoi cancellare l'ultimo user ID!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Tolgo davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Tolgo davvero questo user ID? "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "impossibile aprire `%s': %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "errore creando il portachiavi `%s': %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Devi selezionare almeno una chiave.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Vuoi davvero cancellare le chiavi selezionate? "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vuoi davvero cancellare questa chiave? "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Revoco davvero tutti gli user ID selezionati? "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Revoco davvero questo user ID? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Vuoi davvero revocare questa chiave? "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Vuoi davvero revocare le chiavi selezionate? "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vuoi davvero revocare questa chiave? "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "imposta la lista di preferenze"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, 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:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Aggiorno davvero le preferenze? "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Salvo i cambiamenti? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Esco senza salvare? "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "aggiornamento fallito: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Generazione della chiave fallita: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "errore: impronta digitale non valida\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "inizializzazione del trustdb fallita: %s\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valore non valido\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "User ID inesistente.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Niente da firmare con la chiave %08lX\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Caratteristiche: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Nota: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (sensibile)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "impossibile creare %s: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revocata]"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr "[scadenza: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[scadenza: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " fiducia: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " fiducia: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Questa chiave � stata disabilitata"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4606,19 -3658,14 +4634,19 @@@ msgstr "
"corretta\n"
"finch� non eseguirai di nuovo il programma.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revocata]"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4627,17 -3674,14 +4655,17 @@@ msgstr "
" potrebbe fare diventare un altro user ID il primario "
"predefinito.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4646,36 -3690,28 +4674,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Cancellare questa firma corretta? (s/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Cancellare questa firma non valida? (s/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Cancellare davvero questa autofirma? (s/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4683,38 -3719,31 +4711,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Cancellata %d firma.\n"
msgstr[1] "Cancellata %d firma.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Non � stato cancellato nulla.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
#, fuzzy
msgid "invalid"
msgstr "armatura non valida"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "L'user ID \"%s\" � stato revocato."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4724,46 -3753,38 +4752,46 @@@ msgstr "
" designato pu� causarne il rifiuto da parte di alcune versioni\n"
" di PGP.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Inserisci l'user ID del revocatore designato: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
#, 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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, fuzzy
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@@ -4771,165 -3792,135 +4799,170 @@@
msgstr ""
"Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Cambio la data di scadenza per la chiave primaria.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Devi selezionare esattamente un user ID.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, 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:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, fuzzy
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
#, fuzzy
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Sei sicuro di volerla usare? (s/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Annotazione della firma: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Sovrascrivo (s/N)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nessun user ID con l'indice %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "user ID: \""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, 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:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (non esportabile)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Questa chiave � scaduta il %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Creare un certificato di revoca per questa firma? (s/N) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " firmata da %08lX il %s%s\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (non esportabile)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revocata da %08lX il %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Stai per revocare queste firme:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Creare davvero i certificati di revoca? (s/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "manca la chiave segreta\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "l'user ID \"%s\" � gi� stato revocato\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5381,13 -4294,10 +5414,13 @@@ msgstr "
"dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
"numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generazione della chiave fallita: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5395,66 -4305,53 +5428,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' � gi� compresso\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Uso lo stesso questa chiave? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
msgid "creating anyway\n"
msgstr "genera una nuova coppia di chiavi"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Generazione della chiave annullata.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, fuzzy, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "NOTA: chiave %08lX scaduta il %s\n"
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "chiavi pubbliche e segrete create e firmate.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5464,7 -4361,6 +5497,7 @@@ msgstr "
"il comando \"--edit-key\" per generare una chiave secondaria per questo "
"scopo.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5472,7 -4368,6 +5505,7 @@@ msgstr "
"la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5480,51 -4375,40 +5513,51 @@@ msgstr "
"la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
"con l'orologio)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, fuzzy
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Parti della chiave segreta non sono disponibili.\n"
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Crea davvero? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "mai "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politica critica di firma: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politica di firma: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Annotazione critica della firma: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Annotazione della firma: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5532,7 -4416,6 +5565,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d firme non corrette\n"
msgstr[1] "%d firme non corrette\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5540,46 -4423,33 +5573,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "una firma non controllata a causa di un errore\n"
msgstr[1] "una firma non controllata a causa di un errore\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Portachiavi"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Impronta digitale della chiave primaria:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Impronta digitale della chiave primaria:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Impronta digitale della subchiave:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impronta digitale ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5644,67 -4502,58 +5672,72 @@@ msgstr "l'URL della politica di firma i
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "chiave `%s' non trovata: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "saltata `%s': %s\n"
+
++#: g10/keyserver.c:1823
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
@@@ -5712,231 -4561,183 +5745,231 @@@
"firmata con la tua chiave %08lX il %s\n"
"\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "richiedo la chiave %08lX a %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "chiave di sessione cifrata con %s\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "cifrato con l'algoritmo sconosciuto %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "la chiave pubblica � %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "Cifrato con la chiave %s con ID %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decifratura della chiave pubblica fallita: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifratto con %lu passphrase\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "cifratto con 1 passphrase\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "suppongo che i dati siano cifrati con %s\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "decifratura corretta\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifratura fallita: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome del file originale='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Firma valida da \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Firma NON corretta da \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Firma scaduta da \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Firma valida da \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "verifica della firma soppressa\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "impossibile gestire queste firme multiple\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " alias \""
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Chiave disponibile presso: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[incerta]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Firma scaduta il %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Questa firma scadr� il %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binario"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "modo testo"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "sconosciuto"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo della chiave pubblica sconosciuto"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Impossibile controllare la firma: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "non � una firma separata\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "firma solitaria di classe 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "firma vecchio stile (PGP 2.x)\n"
@@@ -6117,7 -4884,6 +6150,7 @@@ msgstr "
"ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
"non sicura\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@@ -6492,46 -5190,37 +6525,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Non � sicuro che la firma appartenga al proprietario.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: saltata: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: saltata: chiave pubblica disabilitata\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: saltata: chiave pubblica gi� presente\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritmo di hash non valido `%s'\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6539,37 -5228,29 +6572,37 @@@ msgstr "
"\n"
"Inserisci l'user ID. Termina con una riga vuota: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "User ID inesistente.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "La chiave pubblica � disabilitata.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "saltata: chiave pubblica gi� impostata\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatario predefinito `%s' sconosciuto\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "nessun indirizzo valido\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chiave %08lX: nessun user ID\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chiave %08lX: nessun user ID\n"
@@@ -6579,29 -5259,23 +6612,29 @@@ msgid "data not saved; use option \"--o
msgstr ""
"i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Firma separata.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Inserisci il nome del file di dati: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "viene letto stdin...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "non ci sono dati firmati\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "impossibile aprire i dati firmati `%s'\n"
@@@ -6856,7 -5485,6 +6889,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
msgstr[1] "la chiave pubblica %08lX � pi� recente della firma di %lu secondo\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6938,23 -5557,19 +6971,23 @@@ msgstr "
"lunga).\n"
"Usata inespansa.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "Firma %s da: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, 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:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "firma:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "sar� usato il cifrario %s\n"
@@@ -7034,133 -5635,106 +7067,133 @@@ msgstr "errore di lettura: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync fallita: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:355
#, fuzzy, c-format
msgid "can't create lock for '%s'\n"
msgstr "impossibile creare `%s': %s\n"
- #: g10/tdbio.c:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "impossibile aprire `%s'\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek fallita: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "transazione del trustdb troppo grande\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: la directory non esiste!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "impossibile chiudere `%s': %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: creazione del record della versione fallita: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: � stato creato un trustdb non valido\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: creato il trustdb\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "NOTA: il trustdb non � scrivibile\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb non valido\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, 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:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: errore durante la lettura del record di versione: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, 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:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek fallita: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read fallita (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: non � un file di trustdb\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: record di versione con recnum %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versione %d del file non valida\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: errore durante la lettura del record libero: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: errore durante la scrittura del dir record: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: azzeramento di un record fallito: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: accodatura a un record fallita: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: creato il trustdb\n"
@@@ -7520,7 -6032,6 +7553,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "non � necessario un controllo del trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "il prossimo controllo del trustdb sar� fatto il %s\n"
@@@ -7535,7 -6044,6 +7568,7 @@@ msgstr "non � necessario un controllo d
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "non � necessario un controllo del trustdb\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "chiave pubblica %08lX non trovata: %s\n"
@@@ -7548,14 -6054,12 +7581,14 @@@ msgstr "per favore usa --check-trustdb\
msgid "checking the trustdb\n"
msgstr "controllo il trustdb\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "Per ora sono state esaminate %lu chiavi\n"
msgstr[1] "Per ora sono state esaminate %lu chiavi\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7563,22 -6067,18 +7596,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d chiavi processate (%d conteggi di validit� azzerati)\n"
msgstr[1] "%d chiavi processate (%d conteggi di validit� azzerati)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, 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"
@@@ -8041,27 -6446,22 +8074,27 @@@ msgstr "comandi in conflitto\n
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8071,7 -6470,6 +8104,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "Carattere radix64 non valido %02x saltato\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent non � disponibile in questa sessione\n"
@@@ -9946,8 -7957,6 +9979,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [opzioni] "
@@@ -9958,12 -7966,10 +9991,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "Non � permesso usare %s con %s!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "creazione dell'armatura fallita: %s\n"
@@@ -10459,77 -8363,61 +10492,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "firma fallita: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "errore leggendo `%s': %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "cancellazione del keyblock fallita: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "impossibile creare `%s': %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: creazione della tabella hash fallita: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10669,7 -8527,6 +10702,7 @@@ msgstr "destinatario predefinito `%s' s
msgid "sending line failed: %s\n"
msgstr "firma fallita: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "errore leggendo `%s': %s\n"
@@@ -10922,16 -8718,13 +10955,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "chiave pubblica non trovata"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "scrittura della chiave segreta in `%s'\n"
diff --cc po/ja.po
index db69a75,51cfc72..5f8a001
--- a/po/ja.po
+++ b/po/ja.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.1.12\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+0200\n"
"PO-Revision-Date: 2016-06-07 14:12+0900\n"
"Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
"Language-Team: none\n"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, c-format
msgid "can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
@@@ -390,10 -304,6 +390,10 @@@ msgstr "デーモン・モードで実�
msgid "run in server mode (foreground)"
msgstr "サーバ・モードで実行 (フォアグラウンド)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "冗長"
@@@ -491,11 -376,6 +491,11 @@@ msgstr "puttyサポートを有功に�
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "バグは <@EMAIL@> までご報告ください。\n"
@@@ -511,51 -389,34 +511,51 @@@ msgstr "
"形式: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
"@GnuPG@の秘密鍵の管理\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s が古すぎます (%s が必要、現在 %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "*注意*: デフォルトのオプション・ファイル '%s' がありません\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, c-format
msgid "option file '%s': %s\n"
msgstr "オプション・ファイル '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, c-format
msgid "reading options from '%s'\n"
msgstr "'%s' からオプションを読み込みます\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "*注意*: '%s'はオプションとは考えられません\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "ソケットが作成できません: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "ソケット名'%s'は長すぎます\n"
@@@ -564,27 -424,21 +564,27 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agentは既に実行されています - 新しいものをスタートさせません\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "ソケットのナンス取得エラー\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "'%s'でソケットのバインドのエラー: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "'%s'の許可が設定できません: %s\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() に失敗しました: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, c-format
msgid "listening on socket '%s'\n"
msgstr "ソケット'%s'でlisten\n"
@@@ -611,7 -459,6 +611,7 @@@ msgstr "'%s'でstat()が失敗しまし
msgid "can't use '%s' as home directory\n"
msgstr "'%s'をホーム・ディレクトリに使えません\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %dでナンスの読み込みエラー: %s\n"
@@@ -636,18 -479,14 +636,18 @@@ msgstr "ssh ハンドラ0x%lx (fd %d �
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh ハンドラ0x%lx (fd %d に対する)が終了\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_pselectに失敗しました: %s - 一秒待ちます\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 停止しました\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "このセッションでgpg-agentは実行されていません\n"
@@@ -663,8 -500,6 +663,8 @@@ msgstr "
"形式: gpg-preset-passphrase [オプション] KEYGRIP\n"
"パスワードキャッシュの管理\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -672,9 -507,6 +672,9 @@@ msgstr "
"@コマンド:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -913,29 -702,22 +913,29 @@@ msgstr "パイプの作成エラー: %s
msgid "error creating a stream for a pipe: %s\n"
msgstr "パイプのストリーム作成エラー: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "プロセスforkエラー: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "プロセスの終了待ちが失敗: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "'%s'の実行エラー: おそらくインストールされていません\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "'%s'の実行エラー: exitステイタス %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, c-format
msgid "error running '%s': terminated\n"
msgstr "'%s'の実行エラー: 終了しました\n"
@@@ -950,28 -730,22 +950,28 @@@ msgstr "プロセス %d のexitコー�
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "プロセス%dの終了待ちが失敗: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "'%s'へ接続できません: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "gpg-agentとの通信障害\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
msgid "problem setting the gpg-agent options\n"
msgstr "gpg-agentオプションの設定の問題\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "ユーザによる取消し\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "エージェントに障害\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "エージェントに問題 (予期しない応答 \"%s\")\n"
@@@ -1046,7 -805,6 +1046,7 @@@ msgstr "%luバイトの確保におい�
msgid "out of core while allocating %lu bytes"
msgstr "%luバイトの確保においてメモリが足りません"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "十分なメモリの確保のエラー: %s\n"
@@@ -1284,7 -988,6 +1284,7 @@@ msgstr "'%s'のヘルプはありませ
msgid "ignoring garbage line"
msgstr "ガベージ行を無視します"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[未設定]"
@@@ -1412,118 -1088,92 +1412,118 @@@ msgstr "lock '%s' は作成されませ
msgid "waiting for lock %s...\n"
msgstr "lock %s を待ちます...\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "外装: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "無効な外装ヘッダー: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "外装ヘッダー: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "無効なクリア・テクスト署名ヘッダー\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "不明の外装ヘッダー: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "入れ子のクリア・テクスト署名\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "予期せぬ外装: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "無効なダッシュでエスケープされた行: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "無効な64進文字%02Xをスキップしました\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "ファイル末尾が早すぎます (CRCがありません)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "ファイル末尾が早すぎます (CRCの途中)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "CRCの書式が正しくありません\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRCエラー。%06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "ファイル末尾が早すぎます (後尾部の中にあります)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "後尾の行にエラーがあります\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "有効なOpenPGPデータが見つかりません。\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "無効な外装: 行の長さが%d文字を超えています\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"外装の中にquoted printable文字があります。おそらくバグのあるMTAが使われたので"
"しょう\n"
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
#, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "[ 人には読めません (%zuバイト: %s%s) ]"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
"注釈名には印字可能な文字か空白のみを使い、'='で終わらなければなりません\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "ユーザ注釈名は、'@'文字を含まなければなりません\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
msgid "a notation name must not contain more than one '@' character\n"
msgstr "ユーザ注釈名は、一つより大きい'@'文字を含んではなりません\n"
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "注釈名の値に制御文字を使ってはいけません\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
msgid "a notation name may not contain an '=' character\n"
msgstr "ユーザ注釈名は、'='の文字を含んではなりません\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
msgid "a notation name must have only printable characters or spaces\n"
msgstr "注釈名には印字可能な文字か空白のみを使わなければなりません\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "*警告*: 無効な注釈データを発見\n"
@@@ -1551,19 -1196,14 +1551,19 @@@ msgstr "サーバ'%s'はこちらより
msgid "WARNING: %s\n"
msgstr "*警告*: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGPカードが利用できません: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGPカードno. %sを検出\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "これはバッチ・モードではできません\n"
@@@ -1575,10 -1213,6 +1575,10 @@@ msgstr "このコマンドが使える�
msgid "Reset Code not or not anymore available\n"
msgstr "リセット・コードが(もはや)利用可能ではありません\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "あなたの選択は? "
@@@ -1640,84 -1260,63 +1640,85 @@@ msgstr "公開鍵を取得するURL:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "エラー: URLが長すぎます (上限%d文字)。\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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, c-format
msgid "error reading '%s': %s\n"
msgstr "'%s'の読み込みエラー: %s\n"
- #: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "'%s'の書き込みエラー: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "ログイン・データ (アカウント名): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "エラー: ログイン・データが長すぎます (上限%d文字)。\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "プライベート DO データ: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "エラー: プライベート DOが長すぎます (上限%d文字)。\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "言語の優先指定: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "エラー: 優先指定の文字列の長さが無効です。\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "エラー: 優先指定の文字列に無効な文字があります。\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性別 ((M)男、(F)女、または空白): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "エラー: 無効な応答。\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "CAのフィンガープリント: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "エラー: 無効な形式のフィンガープリント。\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "鍵は操作できません: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "OpenPGPカードでありません"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "現行鍵情報の取得エラー: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "既存の鍵を置き換えしますか? (y/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1727,55 -1326,43 +1728,55 @@@ msgstr "
" 鍵生成が成功しない場合、あなたのカードに関する技術文書を確認し、\n"
" 利用できる鍵長について確認ください。\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "署名鍵の鍵長は? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "暗号化鍵の鍵長は? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "認証鍵の鍵長は? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%uビットに切り上げます\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 鍵長は %u-%u の範囲でなければなりません\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "今、%uビットの鍵を生成するようにカードは再コンフィグされました\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "鍵%dの長さを%u bit に変更する際にエラー: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "暗号化鍵のカード外バックアップを作成しますか? (Y/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
msgid "Note: keys are already stored on the card!\n"
msgstr "*注意*: 秘密鍵はもうカードに保管してあります!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "既存の鍵を置き換えますか? (y/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1786,138 -1373,103 +1787,138 @@@ msgstr "
" PIN = '%s' 管理者PIN = '%s'\n"
"次のコマンドを使って変更すべきです --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "生成する鍵の型を選択してください:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) 署名鍵\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) 暗号化鍵\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) 認証鍵\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "無効な選択です。\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "鍵を保管する場所を選択してください:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "KEYTOCARDが失敗しました: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
msgid "This command is not supported by this card\n"
msgstr "このカードでは、このコマンドはサポートされていません。\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "*注意*: このコマンドはカードに保管してあるすべての鍵を破壊します!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
msgid "Continue? (y/N) "
msgstr "続けますか? (y/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "工場出荷リセットを行いますか? (本当なら \"yes\" と入力) "
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "このメニューを終了"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "管理コマンドを表示"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "このヘルプを表示"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "全有効データを表示"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "カード所有者の名前の変更"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "鍵を取得するURLの変更"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "カードURLで指定された鍵の取得"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "ログイン名の変更"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "言語の優先指定の変更"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "カード所有者の性別の変更"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "CAフィンガープリントの変更"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "署名強制PINフラグを反転"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "新しい鍵を生成"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "PINブロックの解除や変更のメニュー"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "PINを確認しすべてのデータを表示する"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "PINをリセット・コードでブロックを解除する"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr "すべての鍵とデータを破壊します"
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "管理者専用コマンド\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "管理者コマンドが許可されています\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "管理者コマンドは禁止されています\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "無効なコマンド (\"help\"を参照)\n"
@@@ -1925,27 -1476,18 +1926,27 @@@
msgid "--output doesn't work for this command\n"
msgstr "このコマンドで--outputは機能しません\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "'%s'が開けません\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "鍵\"%s\"が見つかりません: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "鍵ブロックの読み込みエラー: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, c-format
msgid "key \"%s\" not found\n"
msgstr "鍵\"%s\"が見つかりません\n"
@@@ -1997,7 -1528,6 +1998,7 @@@ msgstr "この公開鍵にたいする�
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "まず\"--delete-secret-keys\"オプションでこれを削除してください。\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "パスフレーズの作成エラー: %s\n"
@@@ -2016,7 -1543,6 +2017,7 @@@ msgstr "暗号方式 %s を使います
msgid "'%s' already compressed\n"
msgstr "'%s'はもう圧縮済みです\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "*警告*: '%s'は空のファイルです\n"
@@@ -2033,7 -1557,6 +2034,7 @@@ msgid "
msgstr ""
"*警告*: 共通鍵暗号方式 %s (%d) の強制が、受取人の優先指定をそむきます\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2051,17 -1572,14 +2052,17 @@@ msgstr "共通鍵暗号方式 %s (%d) �
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s暗号化 受信者:\"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s暗号化済みデータ\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "不明のアルゴリズム%dによる暗号化\n"
@@@ -2129,312 -1634,246 +2130,325 @@@ msgstr "*警告*: 一時ファイルを
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "*警告*: 一時ディレクトリ'%s'を削除できません: %s\n"
- #: g10/export.c:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "ローカルのみと指定された署名をエクスポートします"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "ユーザIDの属性(通常フォトID)をエクスポートします"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "\"sensitive\"(機密)と指定された失効鍵をエクスポートします"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "エクスポートの際、利用できない部分を除去する"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr "エクスポートの際、できるだけ除去する"
- #: g10/export.c:1144
++#: g10/export.c:1204
msgid " - skipped"
msgstr " - スキップされました"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, c-format
+ msgid "writing to '%s'\n"
+ msgstr "'%s'への書き込み\n"
+
++#: g10/export.c:1660
+ #, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr "鍵%s: 鍵はカード上にあります - スキップします\n"
+
++#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
msgstr "秘密鍵のエクスポートは認められません\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "鍵%s: PGP 2.x形式の鍵です - スキップします\n"
- #: g10/export.c:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "鍵%s: 鍵はカード上にあります - スキップします\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "*警告*: 何もエクスポートされていません\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "'%s'の作成エラー: %s\n"
- #: g10/getkey.c:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[ユーザIDが見つかりません]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(オプション'%s'の引数を確認ください)\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr "警告: '%s'は長い鍵IDかフィンガープリントであるべきです。\n"
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, c-format
msgid "error looking up: %s\n"
msgstr "検索のエラー: %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "警告: %sは鍵リングに%d回出現します\n"
- #: g10/getkey.c:1429
++#: g10/getkey.c:1431
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "'%s'を %s から自動取得\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "'%s'を %s から取得する際のエラー: %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "フィンガープリントがありません"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "警告: デフォルトの秘密鍵として '%s' を用いません: %s\n"
- #: g10/getkey.c:1694
++#: g10/getkey.c:1743
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "デフォルトの署名用の秘密鍵として\"%s\"を用います\n"
- #: g10/getkey.c:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "'%s'に渡されたすべての値は無視されました\n"
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uidで有効にされた無効な鍵%sです\n"
- #: g10/getkey.c:3323
++#: g10/getkey.c:3377
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "副鍵%s(主鍵%sではなく)を用います\n"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "署名を作成"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "クリア・テクスト署名を作成"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "分遣署名を作成"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "データを暗号化"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "暗号化には共通鍵暗号方式のみを使用"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "データを復号 (デフォルト)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "署名を検証"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "鍵の一覧"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "鍵と署名の一覧"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "鍵署名の検査と一覧"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "鍵とフィンガープリントの一覧"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "秘密鍵の一覧"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "新しい鍵ペアを生成"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
msgid "quickly generate a new key pair"
msgstr "すばやく新しい鍵ペアを生成"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "quickly add a new user-id"
msgstr "すばやく新しいユーザIDを追加"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "quickly add a new user-id"
+ msgid "quickly revoke a user-id"
+ msgstr "すばやく新しいユーザIDを追加"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr "全機能の鍵ペアを生成"
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "失効証明書を生成"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "公開鍵リングから鍵を削除"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "秘密鍵リングから鍵を削除"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
msgid "quickly sign a key"
msgstr "鍵にすばやく署名"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
msgid "quickly sign a key locally"
msgstr "鍵へすばやくローカルに署名"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "鍵に署名"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "鍵へローカルに署名"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "鍵への署名や編集"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "パスフレーズの変更"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "鍵をエクスポートする"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "鍵サーバに鍵をエクスポートする"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "鍵サーバから鍵をインポートする"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "鍵サーバの鍵を検索する"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "鍵サーバから鍵を全部更新する"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "鍵のインポート/マージ"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "カード・ステイタスを表示"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "カードのデータを変更"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "カードのPINを変更"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "信用データベースを更新"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "メッセージ・ダイジェストを表示"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "サーバ・モードで実行"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|TOFUポリシーを鍵に設定する"
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ASCII形式の外装を作成"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|USER-ID用に暗号化"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|署名や復号にこのUSER-IDを使用"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|圧縮レベルをNに設定 (0は非圧縮)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "正準テキスト・モードを使用"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|出力をFILEに書き出す"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "無変更"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "上書き前に確認"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "厳密なOpenPGPの振舞を採用"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2442,7 -1881,6 +2456,7 @@@ msgstr "
"@\n"
"(コマンドとオプション全部の一覧は、マニュアル・ページをご覧ください)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2462,11 -1900,9 +2476,11 @@@ msgstr "
" --list-keys [名前] 鍵を表示\n"
" --fingerprint [名前] フィンガープリントを表示\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "使い方: @GPG@ [オプション] [ファイル] (ヘルプは -h)"
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2476,7 -1912,6 +2490,7 @@@ msgstr "
"署名、検査、暗号化または復号\n"
"デフォルトの操作は、入力データに依存\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2484,576 -1919,452 +2498,582 @@@ msgstr "
"\n"
"サポートしているアルゴリズム:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "公開鍵: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "暗号方式: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "ハッシュ: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "圧縮: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "使い方: %s [オプション] %s\n"
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "対立するコマンド\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "=記号が、グループ定義'%s'内に見つかりません\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1524
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない所有\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1527
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない所有\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1530
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない所有\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1536
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない許可\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1539
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "*警告*: コンフィグレーション・ファイル'%s'の安全でない許可\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1542
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない許可\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1548
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1551
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ所有\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1560
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "*警告*: homedir '%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1563
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr ""
"*警告*: コンフィグレーション・ファイル'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "*警告*: 拡張'%s'の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1773
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "不明のコンフィグレーション項目'%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr "鍵の一覧時にフォトIDを表示する"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
msgid "show key usage information during key listings"
msgstr "鍵の一覧時に鍵の使い方の情報を表示する"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
msgid "show policy URLs during signature listings"
msgstr "署名の一覧時にポリシーURLを表示する"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "署名の一覧時にすべての注釈を表示する"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "署名の一覧時にIETF標準注釈を表示する"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "署名の一覧時にユーザの注釈を表示する"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
msgid "show preferred keyserver URLs during signature listings"
msgstr "署名の一覧時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
msgstr "鍵の一覧時にユーザIDの有効性を表示する"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
msgid "show the keyring name in key listings"
msgstr "鍵の一覧に鍵リングの名前を表示する"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
msgstr "署名の一覧時に有効期限の日付を表示する"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
msgid "available TOFU policies:\n"
msgstr "利用可能なTOFUポリシー:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "不明のTOFUポリシー'%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr "(選択肢の一覧には\"help\"を使ってください)\n"
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "不明のTOFU DBフォーマット'%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "*注意*: 以前デフォルトだったオプション・ファイル'%s'は、無視されます\n"
- #: g10/gpg.c:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt が古すぎます (必要 %s, 現在 %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "*注意*: 普通%sは使いません!\n"
- #: g10/gpg.c:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s'は、有効な署名表現ではありません\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無効な pinentry mode '%s'です\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s'は、有効な文字集合ではありません\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無効なインポート・オプションです\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "無効なインポート・オプションです\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "無効な一覧オプションです\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "無効なエクスポート・オプションです\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無効な一覧オプションです\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "無効な一覧オプションです\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "署名の検証時にフォトIDを表示する"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "署名の検証時にポリシーURLを表示する"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "署名の検証時にすべての注釈を表示する"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "署名の検証時にIETF標準注釈を表示する"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "署名の検証時にユーザの注釈を表示する"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
msgstr "署名の検証時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "署名の検証時にユーザIDの有効性を表示する"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
msgstr "署名の検証時に主なユーザIDだけをを表示する"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "PKAデータで署名を検証する"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "有効なPKAデータで署名の信用度を上昇させる"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無効な検証オプションです\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "無効な検証オプションです\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-pathを%sに設定不能\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "無効な auto-key-locate リストです\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "*警告*: %sは%sより優先\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%sは%sとともに使うことはできません!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%sは%sとともに使っても無意味です!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "*警告*: ニセモノのシステム時刻で実行しています: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s のため、セキュアでないメモリで実行しません\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "選択された暗号アルゴリズムは、無効です\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "選択された圧縮アルゴリズムは、無効です\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-neededは正の値が必要です\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neededは1より大きな値が必要です\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
- #: g10/gpg.c:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3604
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3608
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
- #: g10/gpg.c:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "無効なデフォルトの優先指定\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "無効な個人用暗号方式の優先指定\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "無効な個人用ダイジェストの優先指定\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "無効な個人用圧縮の優先指定\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%sは%sではまだ機能しません\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "暗号アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3642
++#: g10/gpg.c:3715
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "ダイジェスト・アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3647
++#: g10/gpg.c:3720
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "圧縮アルゴリズム'%s'を%sモードで使うことはできません\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信用データベースの初期化に失敗しました: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [ファイル名]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [ファイル名]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s'の共通鍵暗号に失敗しました: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [ファイル名]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [ファイル名]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [ファイル名]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ファイル名]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [ファイル名]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ファイル名]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [ファイル名]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [ファイル名]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key ユーザid"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key ユーザid"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key ユーザid [コマンド]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd <ユーザid>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "鍵サーバへの送信に失敗しました: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "鍵サーバからの受信に失敗しました: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "鍵のエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "ssh鍵としてのエクスポートに失敗しました: %s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "鍵サーバの検索に失敗しました: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "鍵サーバの更新に失敗しました: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "外装除去に失敗しました: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "外装に失敗しました: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無効なハッシュ・アルゴリズム'%s'です\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "鍵指定'%s'の構文解析エラー: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, 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:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[ファイル名]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "開始します。メッセージを打ってください ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "あたえられた証明書ポリシーURLは無効です\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "あたえられた署名ポリシーURLは無効です\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "指定された優先鍵サーバURLは無効です\n"
@@@ -3094,125 -2397,107 +3114,135 @@@ msgstr "ヘルプはありません
msgid "No help available for '%s'"
msgstr "'%s'のヘルプはありません"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "ローカルだけとマークされた署名をインポートします"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "インポートの際、にpksキーサーバからのダメージを修正します"
- #: g10/import.c:110
++#: g10/import.c:140
msgid "do not clear the ownertrust values during import"
msgstr "インポートの際、所有者信用の値をクリアしない"
- #: g10/import.c:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "インポート後、信用データベースを更新しない"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "鍵のフィンガープリントを表示"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "既存の鍵に対する更新のみ認めます"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "インポート後、利用できない部分を鍵から除去します"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr "インポート後、できるだけ除去します"
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "型%dのブロックをスキップします\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "これまで%lu個の鍵を処理\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr " 処理数の合計: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " スキップしたPGP-2鍵: %lu\n"
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " スキップした新しい鍵: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " ユーザIDなし: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " インポート: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 変更なし: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新しいユーザID: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新しい副鍵: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新しい署名: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新しい鍵の失効: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 秘密鍵の読み込み: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 秘密鍵のインポート: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 無変更の秘密鍵: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未インポート: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 掃除された署名: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 掃除されたユーザID: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3221,193 -2506,149 +3251,187 @@@ msgstr "
"*警告*: 鍵%sには、これらのユーザIDに対して使用不可のアルゴリズムの優先指定が"
"あります\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": 暗号アルゴリズムの優先指定 %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": ダイジェスト・アルゴリズムの優先指定 %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": 圧縮アルゴリズムの優先指定 %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "あなたの優先指定を更新し、この鍵を再配布することが強く推奨されます\n"
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "それによって、潜在的なアルゴリズム不一致の問題を避けられます\n"
- #: g10/import.c:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "鍵%s: ユーザIDがありません\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, c-format
msgid "key %s: %s\n"
msgstr "鍵 %s: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr "インポートの検査で拒否されました"
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "鍵%s: PKSの副鍵変造を修復\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "鍵%s: 受理した未自己署名のユーザID\"%s\"\n"
- #: g10/import.c:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "鍵%s: 有効なユーザIDがありません\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "これはおそらく自己署名のないせいでしょう\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "鍵%s: 公開鍵が見つかりません: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "鍵%s: 新しい鍵です - スキップします\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "書き込み可能な鍵リングが見つかりません: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr "'%s'への書き込み\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "鍵リング'%s'の書き込みエラー: %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "鍵%s: 公開鍵\"%s\"をインポートしました\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "鍵%s: こちらの複製と合いません\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックに位置づけできません: %s\n"
- #: g10/import.c:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "鍵%s: 元の鍵ブロックを読み込めません: %s\n"
- #: g10/import.c:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを1個\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "鍵%s: \"%s\" 新しいユーザIDを%d個\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "鍵%s: \"%s\" 新しい署名を1個\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "鍵%s: \"%s\" 新しい署名を%d個\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を1個\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "鍵%s: \"%s\" 新しい副鍵を%d個\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "鍵%s: \"%s\" %d個の署名をきれいにしました\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "鍵%s: \"%s\" %d個のユーザIDをきれいにしました\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "鍵%s:\"%s\"変更なし\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "鍵%s: 秘密鍵をインポートしました\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "鍵 %s: 秘密鍵はもうあります\n"
- #: g10/import.c:1578
++#: g10/import.c:1866
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "鍵 %s: エージェントへの送信エラー: %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, c-format
msgid "secret key %s: %s\n"
msgstr "秘密鍵 %s: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "秘密鍵のインポートは禁止です\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "鍵%s: 無効な暗号方式%dの秘密鍵です - スキップします\n"
@@@ -3422,137 -2663,110 +3446,137 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "'%s'の移行には、スマードカードそれぞれで、以下を実行してください: %s\n"
- #: g10/import.c:1848
++#: g10/import.c:2133
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "鍵%s: 公開鍵がありません - 失効証明書を適用できません\n"
- #: g10/import.c:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "鍵%s: 無効な失効証明書: %s - 拒否\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "鍵%s:\"%s\"失効証明書をインポートしました\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "鍵%s: 署名に対応するユーザIDがありません\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"のサポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:2025
++#: g10/import.c:2310
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "鍵%s: ユーザID\"%s\"の自己署名が、無効です\n"
- #: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "鍵%s: サポートしていない公開鍵アルゴリズムです\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "鍵%s: 無効な直接鍵署名\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "鍵%s: 鍵に対応する副鍵がありません\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "鍵%s: 無効な副鍵の対応です\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "鍵%s: 多重副鍵の対応を削除します\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "鍵%s: 鍵失効に対する副鍵がありません\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "鍵%s: 無効な副鍵失効です\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "鍵%s: 無効な副鍵の多重失効を削除します\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "鍵%s: スキップしたユーザID\"%s\"\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "鍵%s: スキップした副鍵\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "鍵%s: エクスポート不可な署名 (クラス0x%02X) - スキップします\n"
- #: g10/import.c:2244
++#: g10/import.c:2527
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "鍵%s: 失効証明書が誤って設定されています - スキップします\n"
- #: g10/import.c:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "鍵%s: 無効な失効証明書: %s - スキップします\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "鍵%s: 副鍵署名の場所が、誤っています - スキップします\n"
- #: g10/import.c:2284
++#: g10/import.c:2567
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "鍵%s: 予期せぬ署名クラス (0x%02X) - スキップします\n"
- #: g10/import.c:2413
++#: g10/import.c:2696
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "鍵%s: 重複したユーザIDの検出 - マージ\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sを取ってきます\n"
- #: g10/import.c:2493
++#: g10/import.c:2776
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "*警告*: 鍵%sは失効されたかもしれません: 失効鍵%sが存在しません。\n"
- #: g10/import.c:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "鍵%s:\"%s\"失効証明書の追加\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "鍵%s: 直接鍵署名を追加\n"
@@@ -3587,65 -2795,53 +3611,65 @@@ msgstr "keyblock リソース'%s': %s\n
msgid "error opening key DB: %s\n"
msgstr "鍵DBを開く際のエラー: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "鍵リング・キャッシュの再構築に失敗しました: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[revocation]"
msgstr "[失効]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[自己署名]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "サポートしていない公開鍵アルゴリズム(%d)の署名は確認できません: %s.\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
msgstr ""
"サポートしていないメッセージ・ダイジェスト(%d)の署名は確認できません: %s.\n"
- #: g10/keyedit.c:786
++#: g10/keyedit.c:789
msgid " (reordered signatures follow)"
msgstr "(順番を変えた署名が続きます)"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, c-format
msgid "key %s:\n"
msgstr "鍵 %s:\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, c-format
msgid "%d duplicate signature removed\n"
msgid_plural "%d duplicate signatures removed\n"
msgstr[0] "%d個の重複した署名が除去されました\n"
- #: g10/keyedit.c:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
msgstr[0] "鍵がないため%d個の署名は検査しません\n"
- #: g10/keyedit.c:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, c-format
msgid "%d bad signature\n"
msgid_plural "%d bad signatures\n"
msgstr[0] "%d個の不正な署名\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "%d個の正しい署名\n"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3654,7 -2850,6 +3678,7 @@@ msgstr "
"警告: エラーがあり、自己署名だけ確認しました。'%s'を実行してすべての署名を確"
"認ください。\n"
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3665,17 -2860,14 +3689,17 @@@ msgstr "
"(パスポートを見せてもらったり、他から得たフィンガープリントを検査したり、など"
"など)\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = まぁまぁ信用する\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 充分に信用する\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3684,50 -2876,38 +3708,50 @@@ msgstr "
"信用署名の深さを入力してください。\n"
"深さが1より大きいと、署名しようとしている鍵で信用署名を作れます。\n"
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "署名を制限するドメインを入力するか、空行を入力してください。\n"
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "ユーザID\"%s\"をスキップします、テキストのIDではありません。\n"
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ユーザID\"%s\"は、失効されています。"
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "それでもこの鍵に署名したいですか? (y/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " 署名不能。\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ユーザID \"%s\"は、期限切れです。"
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ユーザID \"%s\"は、自己署名されていません。"
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ユーザID \"%s\"は署名可能です。 "
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "署名しますか? (y/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3736,11 -2916,9 +3760,11 @@@ msgstr "
"\"%s\"にたいする自己署名は、\n"
"PGP 2.x形式の署名です。\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "OpenPGPの自己署名に格上げしたいですか? (y/N) "
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3749,11 -2927,9 +3773,11 @@@ msgstr "
"\"%s\"に対するあなたの今の署名\n"
"は期限切れです。\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "新しい署名を発行し、期限切れ署名と置き換えたいですか? (y/N) "
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3762,43 -2938,34 +3786,43 @@@ msgstr "
"\"%s\"にたいするあなたの今の署名\n"
"はローカルな署名です。\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "エクスポート可能な署名に格上げしたいですか? (y/N) "
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\"は鍵%sでもうローカルに署名してあります\n"
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\"は鍵%sでもう署名してあります\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "それでも再署名したいですか? (y/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "鍵%sで署名すべきものはありません\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "この鍵は期限切れです!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "この鍵は%sで期限が切れます。\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "同時に署名も期限切れとしたいですか? (Y/n) "
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3807,31 -2974,25 +3831,31 @@@ msgstr "
"署名しようとしている鍵が実際に上記の名前の人のものかどうか、どの程度\n"
"注意して検証しましたか? 答がわからなければ、\"0\"を入力してください。\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 答えません。%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 全然、検査していません。%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 一応、検査しました。%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) かなり注意して検査しました。%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
msgid "Your selection? (enter '?' for more information): "
msgstr "選択は? (詳細は '?'): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3840,220 -3001,166 +3864,220 @@@ msgstr "
"本当にこの鍵にあなたの鍵\"%s\"で署名してよいですか\n"
"(%s)\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "自己署名になるでしょう。\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "*警告*: 署名は、エクスポート不可に設定されません。\n"
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "*警告*: 署名は、失効不可に設定されません。\n"
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "署名は、エクスポート不可に設定されます。\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "署名は、失効不可に設定されます。\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "この鍵は全然、検査していません。\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "この鍵は一応、検査しました。\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "この鍵は、かなり注意して検査しました。\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "本当に署名しますか? (y/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "署名に失敗しました: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"鍵にはスタブあるいはカード上の項目しかありません - パスフレーズは変更されませ"
"ん。\n"
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "鍵 %s: パスフレーズの変更エラー: %s\n"
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "保存して終了"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "鍵のフィンガープリントを表示"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
msgid "show the keygrip"
msgstr "keygripを表示"
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "鍵とユーザIDの一覧"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "ユーザID Nの選択"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "副鍵Nの選択"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "署名の確認"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr "選択したユーザIDに署名する [* 以下の関連コマンドを参照 ]"
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "選択したユーザIDにローカルに署名"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "選択したユーザIDに信用署名を署名する"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr "選択したユーザIDに失効不可の署名をする"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "ユーザIDの追加"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "フォトIDの追加"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "選択したユーザIDの削除"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "副鍵を追加"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "スマートカードへ鍵の追加"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "鍵をスマートカードへ移動"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "バックアップ鍵をスマートカードへ移動"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "選択した副鍵の削除"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "失効鍵の追加"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "選択したユーザIDから署名を削除する"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
msgstr "鍵または選択した副鍵の有効期限を変更する"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "選択したユーザIDを主にする"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "優先指定の一覧 (エキスパート)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "優先指定の一覧 (冗長)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "選択したユーザIDに優先指定リストを設定"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "選択したユーザIDに優先鍵サーバのURLを設定"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "選択したユーザIDに注釈を設定する"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "パスフレーズの変更"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "所有者信用の変更"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "選択したユーザIDの署名を失効"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "選択したユーザIDの失効"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "鍵の失効または選択した副鍵の失効"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "鍵を有効にする"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "鍵を無効にする"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "選択したフォトIDを表示"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "使えないユーザIDをコンパクトにし、使えない署名を鍵から除去"
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "使えないユーザIDをコンパクトにし、すべての署名を鍵から除去"
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "秘密鍵が利用できます。\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "この実行には秘密鍵がいります。\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4064,250 -3171,197 +4088,256 @@@ msgstr "
" 't' で始まると信用署名 (tsign)、'nr' で始まると失効不可署名\n"
" (nrsign)、もしくはこれらの組み合わせ (ltsign, tnrsign, など)となります。\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "鍵は、失効されています。"
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "本当に全ユーザIDに署名しますか? (y/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
msgid "Really sign all text user IDs? (y/N) "
msgstr "本当に全てのテキストユーザIDに署名しますか? (y/N) "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "ヒント: まず署名するユーザIDを選択します\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "不明の署名タイプ'%s'\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%sモードでこのコマンドは禁止です。\n"
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "ユーザIDを少なくともひとつ選択してください。\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "('%s'コマンドを使用してください。)\n"
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "最後のユーザIDは削除できません!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr "選択した全ユーザIDを本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "この主鍵を本当に移動しますか? (y/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "鍵をきっかり1つ選択してください。\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "コマンドはファイル名の引数を期待します\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "'%s'が開けません: %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "バックアップ鍵を'%s'から読み込みする際のエラー: %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "鍵を少なくとも1本選択してください。\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "選択した鍵を本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "この鍵を本当に削除しますか? (y/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "選択した全ユーザIDを本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "このユーザIDを本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "この鍵全体を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "選択した副鍵を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "この副鍵を本当に失効しますか? (y/N) "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"ユーザが指定した信用データベースを利用中、所有者信用は設定できません。\n"
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "優先指定の一覧を設定:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "選択したユーザIDの優先指定を本当に更新しますか? (y/N) "
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "優先指定を本当に更新しますか? (y/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "変更を保存しますか? (y/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "保存せずに終了しますか? (y/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "更新に失敗しました: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "鍵は無変更なので更新は不要です。\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "鍵の生成に失敗しました: %s\n"
+
++#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\"はフィンガープリントではありません\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" はプライマリ・フィンガープリントではありません\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, c-format
msgid "Invalid user ID '%s': %s\n"
msgstr "無効なユーザID '%s': %s\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "No matching user IDs."
msgstr "マッチするユーザIDはありません。"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "Nothing to sign.\n"
msgstr "署名するものがありません。\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "ダイジェスト: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "機能: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "鍵サーバ 修正しない"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "優先鍵サーバ: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "注釈: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x形式ユーザIDの優先指定が、ありません。\n"
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "%sで%s鍵%sによって以下の鍵は、失効されました\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "この鍵は、%s鍵%sによって失効可能です"
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(機密指定)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "作成: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "失効: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "期限切れ: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "有効期限: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "利用法: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "カード番号: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "信用: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "有効性: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "この鍵は使用禁止に設定されています"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4315,17 -3369,12 +4345,17 @@@ msgstr "
"プログラムを再起動するまで、表示された鍵の有効性は正しくないかもしれない、\n"
"ということを念頭においてください。\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "失効"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "期限切れ"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4333,15 -3382,12 +4363,15 @@@ msgstr "
"*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
" ユーザIDが主になると仮定する場合があります。\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "*警告*: あなたの暗号副鍵はもうすぐ期限切れとなります。\n"
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
msgid "You may want to change its expiration date too.\n"
msgstr "その有効期限も変更したいでしょう\n"
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4351,70 -3397,55 +4381,70 @@@ msgstr "
"は、\n"
" この鍵を拒否するかもしれません。\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "それでも追加したいですか? (y/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "PGP2形式の鍵にはフォトIDを追加できません。\n"
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr "そういったユーザIDはすでにこの鍵に存在しています!\n"
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "この正しい署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "この無効な署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "この不明の署名を削除しますか? (y/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "この自己署名を本当に削除しますか? (y/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
msgstr[0] "%d個の署名を削除しました。\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "何も削除していません。\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "無効"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ユーザID \"%s\" は、コンパクトになりました: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
msgstr[0] "ユーザID \"%s\": %d の署名が除去されました\n"
- #: g10/keyedit.c:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ユーザID \"%s\": 既に最小化されています\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ユーザID \"%s\": 既にクリーンとなっています\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4424,190 -3455,152 +4454,195 @@@ msgstr "
"では、\n"
" この鍵を拒否するかもしれません。\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "PGP 2.x形式の鍵には指名失効者を追加できません。\n"
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "指名失効者のユーザIDを入力してください: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "PGP 2.x形式の鍵は、指名失効者に任命できません\n"
- #: g10/keyedit.c:4535
++#: g10/keyedit.c:4642
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "指名失効者には、その鍵自体を任命できません\n"
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
msgid "this key has already been designated as a revoker\n"
msgstr "この鍵は失効者としてもう指名されています\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "*警告*: ある鍵を指名失効者に設定すると、元に戻せません!\n"
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "本当にこの鍵を指名失効者に任命しますか? (y/N) "
- #: g10/keyedit.c:4632
++#: g10/keyedit.c:4739
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr "本当に複数の副鍵の失効期限を変更しますか? (y/N) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "副鍵の有効期限を変更します。\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "主鍵の有効期限を変更します。\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
msgid "You can't change the expiration date of a v3 key\n"
msgstr "v3鍵の有効期限は変更できません\n"
- #: g10/keyedit.c:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "署名する副鍵%sはすでに相互証明されています\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "副鍵 %s は署名をしないので、相互証明の必要はありません\n"
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "ユーザIDをきっかりひとつ選択してください。\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "ユーザID\"%s\"のv3自己署名をスキップします\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "優先鍵サーバURLを入力してください: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
msgstr "本当に置き換えたいですか? (y/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "本当に削除したいですか? (y/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "注釈を入力: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "進みますか? (y/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d番のユーザIDはありません\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "ハッシュ%sのユーザIDはありません\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "鍵ID'%s'の副鍵はありません\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "%d番の副鍵はありません\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ユーザID:\"%s\"\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%sで%s%s%sに署名されています\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (エクスポート不可)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "この署名は%sで期限切れです。\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "それでも本当に失効したいですか? (y/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "この署名に対する失効証明書を作成しますか? (y/N) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "あなたによって署名されていません。\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "これらのユーザIDに鍵%sで署名しました:\n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (失効不可)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "あなたの鍵%sで%sに失効されています\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "これらの署名を失効しようとしています:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "失効証明書を本当に作成しますか? (y/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "秘密鍵がありません\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ユーザID\"%s\"は、もう失効されています\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "*警告*: ユーザID署名が、%d秒未来です\n"
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "鍵 %s は、もう失効されています。\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "副鍵 %s は、もう失効されています。\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "%s (大きさ%ld) の鍵%s (uid %d) のフォトIDとして表示\n"
@@@ -5041,13 -3956,10 +5076,13 @@@ msgstr "
"す、ディスクにアクセスするなどの他の操作を素数生成の間に行うことで、乱数生\n"
"成器に十分なエントロピーを供給する機会を与えることができます。\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "鍵の生成に失敗しました: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5058,62 -3970,49 +5093,62 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr "続けますか? (Y/n) "
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" の鍵はもうあります\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
msgid "Create anyway? (y/N) "
msgstr "それでも鍵を作成しますか? (y/N) "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
msgid "creating anyway\n"
msgstr "いずれにしろ鍵を作成\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "注意: 全機能の鍵生成には \"%s %s\" を使います。\n"
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "鍵の生成が取り消されました。\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "バックアップ・ファイル'%s'が作成できません: %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "*注意*: カード鍵のバックアップが'%s'へ保存されます\n"
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, c-format
msgid "writing public key to '%s'\n"
msgstr "'%s'へ公開鍵を書き込みます\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "書き込み可能な公開鍵リングが見つかりません: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "公開鍵リング'%s'の書き込みエラー: %s\n"
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "公開鍵と秘密鍵を作成し、署名しました。\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5121,108 -4020,81 +5156,103 @@@ msgstr "
"この鍵は暗号化には使用できないことに注意してください。暗号化を行うには、\n"
"\"--edit-key\"コマンドを使って副鍵を生成してください。\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "鍵は%lu秒未来にできました (時間歪曲か時計の障害でしょう)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "*注意*: v3鍵に対する副鍵の作成は、OpenPGPに適合しません\n"
- #: g10/keygen.c:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "主鍵の秘密部分が利用できません。\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鍵の秘密部分はカード上に保存されています。\n"
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "本当に作成しますか? (y/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "無期限 "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "クリティカルな署名ポリシー: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "署名ポリシー: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "クリティカルな優先鍵サーバ: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "クリティカルな署名注釈: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "署名注釈: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
msgstr[0] "正しい署名%d個\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, c-format
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
msgstr[0] "エラーのため%d個の署名を検査しません\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] "*警告*: %lu個の鍵がその大きさのためスキップされました\n"
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "鍵リング"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr " 主鍵フィンガープリント:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " 副鍵フィンガープリント:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " 主鍵フィンガープリント:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " 副鍵フィンガープリント:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " フィンガープリント ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " カードシリアル番号 ="
@@@ -5282,286 -4142,229 +5312,291 @@@ msgstr "鍵に設定される優先鍵�
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "鍵に設定されたPKAレコードを鍵の取得時に与える"
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "使用禁止"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "番号(s)、N)次、またはQ)中止を入力してください >"
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無効な鍵サーバ・プロトコルです (us %d!=handler %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\"鍵IDではありません: スキップします\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
msgstr[0] "%d本の鍵を%sから更新\n"
- #: g10/keyserver.c:1424
++#: g10/keyserver.c:1426
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "*警告*: 鍵%sを%s経由で更新できません: %s\n"
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "鍵\"%s\"が鍵サーバに見つかりません\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "鍵が鍵サーバに見つかりません\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "既知の鍵サーバがありません (オプション--keyserverを使いましょう)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "鍵%sを%sからサーバ%sに要求\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "鍵%sを%sに要求\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
msgid "no keyserver known\n"
msgstr "鍵サーバがわかりません\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "\"%s\"をスキップしました: %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "鍵%sを%sへ送信\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, c-format
msgid "requesting key from '%s'\n"
msgstr "鍵を'%s'から要求\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "*警告*: URI %s からデータを取れません: %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "変な長さの暗号化済みセッション鍵 (%d)\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 暗号化済みセッション鍵\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "不明のダイジェスト・アルゴリズムで生成されたパスフレーズ %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "公開鍵は%sです\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "公開鍵による暗号化済みデータ: 正しいDEKです\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "%u-ビット%s鍵, ID %s, 日付%sに暗号化されました\n"
- #: g10/mainproc.c:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "%s鍵, ID %sで暗号化されました\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公開鍵の復号に失敗しました: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "%lu 個のパスフレーズで暗号化\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "1 個のパスフレーズで暗号化\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s暗号化済みデータを仮定\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA暗号方式は利用不能なので、楽天的ですが%sで代用しようとしています\n"
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "*警告*: メッセージの完全性は保護されていません\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "復号に成功\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "*警告*: 暗号化されたメッセージは改竄されています!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "復号に失敗しました: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "*注意*: 送信者は\"極秘とする\"ように求めています\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "元のファイル名='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "*警告*: 複数のプレインテクストが見られます\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "スタンドアロン失効 - \"gpg --import\"を使って適用してください\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "署名が見つかりません\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\"からの*不正な*署名"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\"からの期限切れの署名"
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\"からの正しい署名"
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "署名の検証を省略\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "このあいまいな署名データは取り扱えません\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "%sに施された署名\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " %s鍵%sを使用\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "以下に鍵があります: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[不確定]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " 別名\"%s\""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "期限切れの署名 %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "この署名は%sで期限切れとなります\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s署名、ダイジェスト・アルゴリズム %s%s%s\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "バイナリ"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "テキストモード"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "不明の"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
msgid ", key algorithm "
msgstr "、鍵アルゴリズム "
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
"*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "署名を検査できません: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "分遣署名でありません\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "*警告*: 多重署名の検出。最初のものだけ検査します。\n"
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "クラス0x%02xのスタンドアロン署名\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "古い形式 (PGP 2.x) の署名\n"
@@@ -5732,7 -4501,6 +5767,7 @@@ msgstr "公開鍵のアルゴリズム%
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "*警告*: 潜在的にセキュアでない共通鍵暗号化セッション鍵です\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "型%dの下位パケットにクリティカル・ビットを発見\n"
@@@ -6085,46 -4785,37 +6120,46 @@@ msgstr "*警告*: この鍵は十分に
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " この署名が所有者のものかどうか確信できません。\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: スキップ: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: スキップ: 公開鍵は使用禁止です\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: スキップ: 公開鍵はもうあります\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "'%s'に暗号化できません\n"
- #: g10/pkclist.c:972
++#: g10/pkclist.c:984
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr ""
"オプション'%s'が与えられましたが、有効なデフォルト鍵が与えられていません\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "オプション'%s'が与えられましたが、オプション'%s'は与えられていません\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "ユーザIDを指定していません (\"-r\"を使いましょう) 。\n"
- #: g10/pkclist.c:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "今の受取人:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6132,37 -4823,29 +6167,37 @@@ msgstr "
"\n"
"ユーザIDを入力。空行で終了: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "そのユーザIDはありません。\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "スキップ: 公開鍵はデフォルトの受取人としてもう設定済みです\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "公開鍵は使用禁止です。\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "スキップ: 公開鍵はもう設定済みです\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "デフォルトの受取人\"%s\"が不明です\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "有効な宛先がありません\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "注意: 鍵%sには %s の機能がありません\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "注意: 鍵%sには%sに対する優先指定がありません\n"
@@@ -6172,28 -4854,22 +6207,28 @@@ msgid "data not saved; use option \"--o
msgstr ""
"データは保存されていません。保存には\"--output\"オプションを使ってください\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "分遣署名。\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "データ・ファイルの名前を入力: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "標準入力より読み込み中 ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "署名されたデータがありません\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "署名されたデータ'%s'が開けません\n"
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "署名されたデータ fd=%d が開けません: %s\n"
@@@ -6441,7 -5072,6 +6476,7 @@@ msgid "public key %s is %lu day newer t
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "公開鍵%sは、署名よりも%lu日、新しいものです\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6499,12 -5120,10 +6534,12 @@@ msgid "
"unexpanded.\n"
msgstr "*警告*: 優先鍵サーバURLを%%拡張不能 (大きすぎ)。拡張せずに使用。\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s署名。署名者:\"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6512,11 -5131,9 +6547,11 @@@ msgstr "
"*警告*: ダイジェスト・アルゴリズム %s (%d) の強制が、受取人の優先指定と対立し"
"ます\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "署名:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s暗号化を使用します\n"
@@@ -6590,131 -5193,104 +6625,131 @@@ msgstr "'%s'で読み込みエラー: %
msgid "trustdb: sync failed: %s\n"
msgstr "信用データベース: 同期に失敗しました: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "'%s'のロックを作成できません\n"
- #: g10/tdbio.c:145
++#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
msgstr "'%s'がロックできません\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信用データベース レコード%lu: シークに失敗しました: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信用データベース レコード%lu: 書き込みに失敗しました (n=%d): %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "信用データベースのトランザクションが大きすぎます\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: ディレクトリがありません!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "'%s'にアクセスできません: %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: バージョン・レコードの作成に失敗しました: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: 無効な信用データベースを作成\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: 信用データベースができました\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
msgstr "*注意*: 信用データベースが、書き込み不能です\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: 無効な信用データベース\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: ハッシュ表の作成に失敗しました: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: バージョン・レコードの更新エラー: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: バージョン・レコードの読み込みエラー: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: バージョン・レコードの書き込みエラー: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信用データベース: シークに失敗しました: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信用データベース: 読み込みに失敗しました (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: 信用データベース・ファイルではありません\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: レコード番号%lu番のバージョン・レコード\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: 無効なファイル・バージョン%d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: 空きレコードの読み込みエラー: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: ディレクトリ・レコードの書き込みエラー: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: レコードの初期化に失敗しました: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: レコードの追加に失敗しました: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "エラー: 信用データベースが壊れています。\n"
@@@ -7064,7 -5578,6 +7099,7 @@@ msgstr "%s信用モデルを使用\n
msgid "no need for a trustdb check\n"
msgstr "信用データベースの検査は、不要です\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "次回の信用データベース検査は、%sです\n"
@@@ -7079,7 -5590,6 +7114,7 @@@ msgstr "信用モデル'%s'で信用デ
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "信用モデル'%s'で信用データベースの更新は、不要です\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "公開鍵%sが見つかりません: %s\n"
@@@ -7092,34 -5600,28 +7127,34 @@@ msgstr "--check-trustdbを実行して�
msgid "checking the trustdb\n"
msgstr "信用データベースの検査\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%d個の鍵を処理"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] " (うち%d本の有効性数をクリア)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "究極的に信用する鍵が見つかりません\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "究極的に信用する鍵%sの公開鍵が見つかりません\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, 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:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7558,11 -5965,9 +7593,11 @@@ msgstr "管理カード・コマンド�
msgid "use variable length input for pinpad"
msgstr "ピンパッドの可変長入力を使う"
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "使い方: @SCDAEMON@ [オプション] (ヘルプは -h)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7570,18 -5975,15 +7605,18 @@@ msgstr "
"形式: scdaemon [オプション] [コマンド [引数]]\n"
"@GNUPG@のSmartcardデーモン\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"'--daemon'オプションを使って、プログラムをバックグラウンドで実行してくださ"
"い\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %dのハンドラが開始されました\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %dのハンドラが終了しました\n"
@@@ -7591,7 -5992,6 +7626,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "無効な64進文字%02Xをスキップしました\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
msgstr "このセッションでdirmngrは実行されていません\n"
@@@ -9395,8 -7408,6 +9430,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "有効なdebugレベルは: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, c-format
msgid "usage: %s [options] "
msgstr "使い方: %s [オプション] "
@@@ -9405,12 -7415,10 +9440,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "コロンはソケット名に許されません\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの取得の失敗: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "'%s'からCRLの処理に失敗: %s\n"
@@@ -9885,76 -7791,60 +9920,76 @@@ msgstr "OSCPレスポンダは現在で
msgid "OCSP responder returned an too old status\n"
msgstr "OSCPレスポンダは古すぎるステイタスを返しました\n"
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s)が失敗しました: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr "ldapserverがありません"
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr "serialnoがcert IDにありません"
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquireに失敗しました: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url が失敗しました: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, c-format
msgid "error sending data: %s\n"
msgstr "データ送信エラー: %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch が失敗しました: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert が失敗しました: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d を越えました\n"
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "制御構造を確保できません: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "assuanコンテクストの確保に失敗しました: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "サーバの初期化に失敗しました: %s\n"
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "Assuanで登録コマンドに失敗しました: %s\n"
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan accept の問題: %s\n"
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuanの処理が失敗しました: %s\n"
@@@ -10086,7 -7946,6 +10121,7 @@@ msgstr "不明のコマンド'%s'\n
msgid "sending line failed: %s\n"
msgstr "行の送信に失敗しました: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "標準オプションを送信エラー: %s\n"
@@@ -10332,15 -8130,12 +10367,15 @@@ msgstr "
"形式: @GPGCONF@ [オプション]\n"
"@GNUPG@システムのツールに対しコンフィグレーション・オプションを管理する\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "一つコンポーネント引数が必要です"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "コンポーネントが見つかりません"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "引数は許可されていません"
diff --cc po/nb.po
index 7aecb79,db163f2..f5df2e1
--- a/po/nb.po
+++ b/po/nb.po
@@@ -8,21 -9,22 +9,24 @@@
#
msgid ""
msgstr ""
- "Project-Id-Version: gnupg 1.4.3\n"
+ "Project-Id-Version: GNU gnupg 2.1.13\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-06-16 17:27+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"
++"POT-Creation-Date: 2016-07-14 16:03+0200\n"
+ "PO-Revision-Date: 2016-07-09 22:31+0100\n"
+ "Last-Translator: Åka Sikrom <a4 at hush.com>\n"
+ "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-1\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+ "X-Launchpad-Export-Date: 2016-06-15 11:29+0000\n"
+ "X-Generator: Poedit 1.5.4\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: agent/call-pinentry.c:257
- #, fuzzy, c-format
+ #, c-format
msgid "failed to acquire the pinentry lock: %s\n"
- msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+ msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
#. TRANSLATORS: These are labels for buttons etc used in
#. Pinentries. An underscore indicates that the next letter
@@@ -30,52 -32,37 +34,47 @@@
#. a literal one. The actual to be translated text starts after
#. the second vertical bar. Note that gpg-agent has been set to
#. utf-8 so that the strings are in the expected encoding.
+#: agent/call-pinentry.c:447
msgid "|pinentry-label|_OK"
- msgstr ""
+ msgstr "|pinentry-label|_OK"
+#: agent/call-pinentry.c:448
msgid "|pinentry-label|_Cancel"
- msgstr ""
+ msgstr "|pinentry-label|_Avbryt"
+#: agent/call-pinentry.c:449
msgid "|pinentry-label|_Yes"
- msgstr ""
+ msgstr "|pinentry-label|_Ja"
+#: agent/call-pinentry.c:450
msgid "|pinentry-label|_No"
- msgstr ""
+ msgstr "|pinentry-label|_Nei"
+#: agent/call-pinentry.c:451
msgid "|pinentry-label|PIN:"
- msgstr ""
+ msgstr "|pinentry-label|PIN:"
+#: agent/call-pinentry.c:452
msgid "|pinentry-label|_Save in password manager"
- msgstr ""
+ msgstr "|pinentry-label|_Lagre i passordbehandler"
+#: agent/call-pinentry.c:453
- #, fuzzy
- #| msgid "Do you really want to delete the selected keys? (y/N) "
msgid "Do you really want to make your passphrase visible on the screen?"
- msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
+ msgstr "Er du sikker på at du vil gjøre passordfrasen synlig på skjermen?"
+#: agent/call-pinentry.c:455
msgid "|pinentry-tt|Make passphrase visible"
- msgstr ""
+ msgstr "|pinentry-tt|Gjør passordfrase synlig"
+#: agent/call-pinentry.c:456
- #, fuzzy
- #| msgid "invalid passphrase"
msgid "|pinentry-tt|Hide passphrase"
- msgstr "ugyldig passfrase"
+ msgstr "|pinentry-tt|Skjul passordfrase"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
+#: agent/call-pinentry.c:736
- #, fuzzy
msgid "Quality:"
- msgstr "gyldighet: %s"
+ msgstr "Kvalitet:"
#. TRANSLATORS: This string is a tooltip, shown by pinentry when
#. hovering over the quality bar. Please use an appropriate
@@@ -83,623 -70,440 +82,593 @@@
#. 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 ""
+ "Kvaliteten på teksten overfor. Spør administrator for mer informasjon om "
+ "hvordan kvaliteten vurderes."
+#: agent/call-pinentry.c:868
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
+ "Skriv inn PIN-kode slik at hemmelig nøkkel kan låses opp for denne økta"
+#: agent/call-pinentry.c:871
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr ""
+ "Skriv inn passordfrasen din, slik at hemmelig nøkkel kan låses opp for "
+ "gjeldende økt"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
msgid "PIN:"
- msgstr ""
+ msgstr "PIN:"
+#: agent/call-pinentry.c:909 agent/call-pinentry.c:1093
+#: agent/protect-tool.c:721 tools/symcryptrun.c:443
- #, fuzzy
msgid "Passphrase:"
- msgstr "ugyldig passfrase"
+ msgstr "Passordfrase:"
+#: 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 ""
+ msgstr "feil. Prøv igjen"
#. TRANSLATORS: The string is appended to an error message in
#. the pinentry. The %s is the actual error message, the
#. two %d give the current and maximum number of tries.
+#: agent/call-pinentry.c:959
#, c-format
msgid "SETERROR %s (try %d of %d)"
- msgstr ""
+ msgstr "SETERROR %s (forsøk %d av %d)"
+#: agent/call-pinentry.c:971
msgid "Repeat:"
- msgstr ""
+ msgstr "Gjenta:"
+#: agent/call-pinentry.c:1001 agent/call-pinentry.c:1013
- #, fuzzy
msgid "PIN too long"
- msgstr "for lang linje"
+ msgstr "For lang PIN"
+#: agent/call-pinentry.c:1002
- #, fuzzy
msgid "Passphrase too long"
- msgstr "for lang linje"
+ msgstr "For lang passordfrase"
+#: agent/call-pinentry.c:1010
- #, fuzzy
msgid "Invalid characters in PIN"
- msgstr "Ugyldig tegn i navn\n"
+ msgstr "Ugyldig tegn i PIN"
+#: agent/call-pinentry.c:1015
msgid "PIN too short"
- msgstr ""
+ msgstr "Koden er for kort"
+#: agent/call-pinentry.c:1028
- #, fuzzy
msgid "Bad PIN"
- msgstr "ugyldig MPI"
+ msgstr "Ugyldig PIN"
+#: agent/call-pinentry.c:1028
- #, fuzzy
msgid "Bad Passphrase"
- msgstr "ugyldig passfrase"
+ msgstr "Ugyldig passordfrase"
+#: agent/command-ssh.c:651 agent/command-ssh.c:746
#, c-format
msgid "ssh keys greater than %d bits are not supported\n"
- msgstr ""
+ msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
- #: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:838
- #: g10/exec.c:484 g10/gpg.c:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
- #, fuzzy, c-format
- #| msgid "can't create `%s': %s\n"
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
+ #, c-format
msgid "can't create '%s': %s\n"
- msgstr "kan ikke opprette �%s�: %s\n"
+ msgstr "klarte ikke å lage «%s»: %s\n"
- #: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:792
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
- #, fuzzy, c-format
- #| msgid "can't open `%s': %s\n"
+ #, c-format
msgid "can't open '%s': %s\n"
- msgstr "kan ikke �pne �%s�: %s\n"
+ msgstr "klarte ikke å åpne «%s»: %s\n"
+#: agent/command-ssh.c:2535 agent/command-ssh.c:2553
- #, fuzzy, c-format
+ #, c-format
msgid "error getting serial number of card: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av kort-serienummer: %s\n"
+#: agent/command-ssh.c:2539
#, c-format
msgid "detected card with S/N: %s\n"
- msgstr ""
+ msgstr "oppdaget kort med serienummer %s\n"
+#: agent/command-ssh.c:2544
- #, fuzzy, c-format
+ #, c-format
msgid "no authentication key for ssh on card: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "ingen ssh-autentiseringnøkkel på kort: %s\n"
+#: agent/command-ssh.c:2564
- #, fuzzy, c-format
+ #, c-format
msgid "no suitable card key found: %s\n"
- msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
+ msgstr "fant ingen passende kortnøkkel: %s\n"
+#: agent/command-ssh.c:2614
- #, fuzzy, c-format
+ #, c-format
msgid "shadowing the key failed: %s\n"
- msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+ msgstr "skyggelegging av nøkkel mislyktes: %s\n"
+#: agent/command-ssh.c:2629
- #, fuzzy, c-format
+ #, c-format
msgid "error writing key: %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under skriving av nøkkel: %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 ""
+ "En ssh-prosess ber om tillatelse til å brukt nøkkel%%0A %s%%0A (%s)%%0AVil "
+ "du tillate dette?"
+#: agent/command-ssh.c:2919
msgid "Allow"
- msgstr ""
+ msgstr "Tillat"
+#: agent/command-ssh.c:2919
msgid "Deny"
- msgstr ""
+ msgstr "Avvis"
+#: agent/command-ssh.c:2928
- #, fuzzy, c-format
+ #, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
- msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
+ msgstr "Skriv inn passordfrase for ssh-nøkkel%%0A %F%%0A (%c)"
+#: agent/command-ssh.c:3167 agent/genkey.c:351
- #, fuzzy
msgid "Please re-enter this passphrase"
- msgstr "endre passfrasen"
+ msgstr "Skriv inn denne passordfrasen på nytt"
+#: agent/command-ssh.c:3192
- #, fuzzy, c-format
+ #, c-format
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"
+ "Skriv inn passordfrase som skal brukes til å beskytte mottatt hemmelig nøkkel"
+ "%%0A %s%%0A %s%%0Ai nøkkellageret for gpg-agent"
+#: agent/command-ssh.c:3712
- #, fuzzy, c-format
+ #, c-format
msgid "failed to create stream from socket: %s\n"
- msgstr "klarte ikke � lagre n�kkelen: %s\n"
+ msgstr "klarte ikke å lage strøm av sokkel: %s\n"
+#: agent/divert-scd.c:92 g10/call-agent.c:1268
- #, 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"
+ msgstr "Sett inn kort med serienummer"
+#: agent/divert-scd.c:93 g10/call-agent.c:1269
- #, fuzzy
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"
+ msgstr "Fjern gjeldende kort og sett inn kort med serienummer"
+#: agent/divert-scd.c:204
- #, fuzzy
msgid "Admin PIN"
- msgstr "|A|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 ""
+ msgstr "PUK"
+#: agent/divert-scd.c:216
msgid "Reset Code"
- msgstr ""
+ msgstr "Tilbakestillingskode"
+#: agent/divert-scd.c:242
#, c-format
msgid "%s%%0A%%0AUse the reader's pinpad for input."
- msgstr ""
+ msgstr "%s%%0A%%0ABruk leserens kodeplate til å skrive."
+#: agent/divert-scd.c:291
- #, fuzzy
msgid "Repeat this Reset Code"
- msgstr "Gjenta denne PIN: "
+ msgstr "Gjenta tilbakestillingskode"
+#: agent/divert-scd.c:293
- #, fuzzy
msgid "Repeat this PUK"
- msgstr "Gjenta denne PIN: "
+ msgstr "Gjenta PUK"
+#: agent/divert-scd.c:294
- #, fuzzy
msgid "Repeat this PIN"
- msgstr "Gjenta denne PIN: "
+ msgstr "Gjenta PIN"
+#: agent/divert-scd.c:299
- #, fuzzy
msgid "Reset Code not correctly repeated; try again"
- msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
+ msgstr "Tilbakestillingskode ble ikke gjentatt korrekt. Prøv igjen"
+#: agent/divert-scd.c:301
- #, fuzzy
msgid "PUK not correctly repeated; try again"
- msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
+ msgstr "PUK-kode ble ikke gjentatt korrekt. Prøv igjen"
+#: agent/divert-scd.c:302
msgid "PIN not correctly repeated; try again"
- msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
+ msgstr "PIN ble ikke gjentatt korrekt. Prøv igjen"
+#: agent/divert-scd.c:314
- #, fuzzy, c-format
+ #, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "Skriv inn PIN-kode%s%s%s for å låse opp kort"
+#: agent/genkey.c:110 sm/certreqgen-ui.c:394
- #, fuzzy, c-format
+ #, c-format
msgid "error creating temporary file: %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under oppretting av midlertidig fil: %s\n"
+#: agent/genkey.c:117
- #, fuzzy, c-format
+ #, c-format
msgid "error writing to temporary file: %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under skriving til midlertidig fil: %s\n"
+#: agent/genkey.c:158 agent/genkey.c:164
- #, fuzzy
msgid "Enter new passphrase"
- msgstr "Tast inn passfrase\n"
+ msgstr "Skriv inn ny passordfrase"
+#: agent/genkey.c:172
- #, fuzzy
msgid "Take this one anyway"
- msgstr "Bruke denne n�kkelen likevel? (j/N) "
+ msgstr "Bruk denne likevel"
+#: agent/genkey.c:202
#, c-format
msgid ""
"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
msgstr ""
+ "Du har ikke skrevet inn en passordfrase.%0ATom passordfrase er ikke tillatt."
+#: 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 ""
+ "Du har ikke skrevet inn en passordfrase. Dette er generelt ikke lurt."
+ "%0ABekreft at du ikke vil beskytte nøkkelen."
+#: agent/genkey.c:216
msgid "Yes, protection is not needed"
- msgstr ""
+ msgstr "Ja, beskyttelse er unødvendig"
+#: agent/genkey.c:233
- #, fuzzy, c-format
- #| msgid "Name must be at least 5 characters long\n"
+ #, 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] "Navnet m� v�re minst 5 tegn langt\n"
- msgstr[1] "Navnet m� v�re minst 5 tegn langt\n"
+ msgstr[0] "Passordfraser skal bestå av minst %u tegn."
+ msgstr[1] "Passordfraser skal bestå av minst %u tegn."
+#: 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] ""
- msgstr[1] ""
+ msgstr[0] "Passordfraser bør inneholde minst %u siffer eller%%0Aspesialtegn."
+ msgstr[1] "Passordfraser bør inneholde minst %u sifre eller%%0Aspesialtegn."
+#: agent/genkey.c:278
#, c-format
msgid "A passphrase may not be a known term or match%%0Acertain pattern."
- msgstr ""
+ msgstr "Ikke bruk kjente ord, uttrykk eller kjente mønster%%0Ai passordfraser."
+#: agent/genkey.c:293
msgid "Warning: You have entered an insecure passphrase."
- msgstr ""
+ msgstr "Advarsel: du har skrevet inn en svak passordfrase."
+#: agent/genkey.c:480
- #, fuzzy, c-format
+ #, 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"
+ msgstr "Skriv inn passordfrase for å%0Abeskytte ny nøkkel"
+#: agent/genkey.c:606
- #, fuzzy
msgid "Please enter the new passphrase"
- msgstr "endre passfrasen"
+ msgstr "Skriv inn ny passordfrase"
+#: agent/gpg-agent.c:149 agent/preset-passphrase.c:73 scd/scdaemon.c:110
+#: tools/gpg-check-pattern.c:69
- #, fuzzy
msgid ""
"@Options:\n"
" "
msgstr ""
- "@\n"
- "Valg:\n"
+ "@Valg:\n"
" "
+#: agent/gpg-agent.c:151 scd/scdaemon.c:115 dirmngr/dirmngr.c:157
msgid "run in daemon mode (background)"
- msgstr ""
+ msgstr "kjør som bakgrunnsprosess («daemon»)"
+#: agent/gpg-agent.c:152 scd/scdaemon.c:112 dirmngr/dirmngr.c:156
msgid "run in server mode (foreground)"
- msgstr ""
+ msgstr "kjør i tjenermodus (forgrunn)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
- msgstr "fyldig output"
+ msgstr "detaljert utskrift"
+#: agent/gpg-agent.c:154 g10/gpgv.c:73 kbx/kbxutil.c:89 scd/scdaemon.c:117
+#: sm/gpgsm.c:300 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr_ldap.c:136
msgid "be somewhat more quiet"
- msgstr "v�re noenlunde stille"
+ msgstr "være noenlunde stille"
+#: agent/gpg-agent.c:155 scd/scdaemon.c:118 dirmngr/dirmngr.c:173
msgid "sh-style command output"
- msgstr ""
+ msgstr "sh-utdata for kommandoer"
+#: agent/gpg-agent.c:156 scd/scdaemon.c:119 dirmngr/dirmngr.c:174
msgid "csh-style command output"
- msgstr ""
+ msgstr "csh-utdata for kommandoer"
+#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
- #, fuzzy
msgid "|FILE|read options from FILE"
- msgstr "leser valg fra �%s�\n"
+ msgstr "|FIL|les valg fra valgt FIL"
+#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
- msgstr ""
+ msgstr "ikke løsne fra konsoll"
+#: agent/gpg-agent.c:167
msgid "do not grab keyboard and mouse"
- msgstr ""
+ msgstr "ikke bruk tastatur og mus"
+#: 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"
+ msgstr "bruk loggfil for tjeneren"
+#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
- msgstr ""
+ msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
+#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
- msgstr ""
+ msgstr "|PGM|bruk PGN som SCdaemon-program"
+#: agent/gpg-agent.c:177
- #, fuzzy
msgid "do not use the SCdaemon"
- msgstr "ikke oppdat�r tillitsdatabasen etter import"
+ msgstr "ikke bruk SCdaemon"
+#: agent/gpg-agent.c:181
- #, fuzzy
msgid "|NAME|accept some commands via NAME"
- msgstr "|NAVN|kryptere for NAVN"
+ msgstr "|NAME|godta enkelte kommandoer via «NAME»"
+#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
- msgstr ""
+ msgstr "ignorer forespørsler om å bytte TTY"
+#: agent/gpg-agent.c:199
msgid "ignore requests to change the X display"
- msgstr ""
+ msgstr "ignorer forespørsler om å bytte X-skjerm"
+#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
- msgstr ""
+ msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
+#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
- msgstr ""
+ msgstr "ikke bruk PIN-hurtiglager under signering"
+#: agent/gpg-agent.c:218
- #, fuzzy
msgid "disallow the use of an external password cache"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
+#: agent/gpg-agent.c:220
msgid "disallow clients to mark keys as \"trusted\""
- msgstr ""
+ msgstr "ikke la klienter tillitsmarkere nøkler"
+#: agent/gpg-agent.c:223
- #, fuzzy
msgid "allow presetting passphrase"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "tillat valg av passordfrase på forhånd"
+#: agent/gpg-agent.c:225
msgid "disallow caller to override the pinentry"
- msgstr ""
+ msgstr "ikke la kaller overstyre PIN-inntasting"
+#: agent/gpg-agent.c:228
msgid "allow passphrase to be prompted through Emacs"
- msgstr ""
+ msgstr "la brukeren skrive inn passordfrase via Emacs"
+#: agent/gpg-agent.c:230
msgid "enable ssh support"
- msgstr ""
+ msgstr "slå på ssh-støtte"
+#: agent/gpg-agent.c:233
msgid "enable putty support"
- msgstr ""
+ msgstr "slå på støtte for putty"
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
- #, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
- msgstr "Vennligst rapporter feil til <gnupg-bugs at gnu.org>.\n"
+ msgstr "Rapporter programfeil til <@EMAIL@>.\n"
+#: agent/gpg-agent.c:482
- #, fuzzy
msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
+#: agent/gpg-agent.c:484
msgid ""
"Syntax: @GPG_AGENT@ [options] [command [args]]\n"
"Secret key management for @GNUPG@\n"
msgstr ""
+ "Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
+ "Håndtering av hemmelige nøkler for @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
- msgstr ""
+ msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
- msgstr ""
+ msgstr "%s er for gammel (krever %s, har %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
- #, fuzzy, c-format
- #| msgid "NOTE: no default option file `%s'\n"
+ #, c-format
msgid "Note: no default option file '%s'\n"
- msgstr "MERK: ingen standard valgfil �%s�\n"
+ msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
- #, fuzzy, c-format
- #| msgid "option file `%s': %s\n"
+ #, c-format
msgid "option file '%s': %s\n"
- msgstr "valgfil �%s�: %s\n"
+ msgstr "valgfil «%s»: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
- #, fuzzy, c-format
- #| msgid "reading options from `%s'\n"
+ #, c-format
msgid "reading options from '%s'\n"
- msgstr "leser valg fra �%s�\n"
+ msgstr "leser valg fra «%s»\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, c-format
msgid "Note: '%s' is not considered an option\n"
- msgstr ""
+ msgstr "Merk: «%s» regnes ikke som et valg\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
- #, fuzzy, c-format
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
+ #, c-format
msgid "can't create socket: %s\n"
- msgstr "kan ikke opprette �%s�: %s\n"
+ msgstr "klarte ikke å lage sokkel: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
- msgstr ""
+ msgstr "sokkelnavnet «%s» er for langt\n"
+#: agent/gpg-agent.c:1844
msgid "a gpg-agent is already running - not starting a new one\n"
- msgstr ""
+ msgstr "en gpg-agent kjører allerede. Lar være å starte en ny\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
- #, fuzzy
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av sokkel-anledning\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
- #, fuzzy, c-format
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
+ #, c-format
msgid "error binding socket to '%s': %s\n"
- msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+ msgstr "feil under knytning av sokkel til «%s»: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
- #, fuzzy, c-format
+ #, c-format
msgid "can't set permissions of '%s': %s\n"
- msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
+ msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
- #, fuzzy, c-format
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
+ #, c-format
msgid "listen() failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "listen() mislyktes: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
- #, fuzzy, c-format
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
+ #, c-format
msgid "listening on socket '%s'\n"
- msgstr "skriver hemmelig n�kkel til �%s�\n"
+ msgstr "lytter på sokkel «%s»\n"
+#: agent/gpg-agent.c:1900 agent/gpg-agent.c:1943 g10/exec.c:199
+#: g10/openfile.c:488 g10/openfile.c:517 g10/tofu.c:903 sm/keydb.c:97
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
+ #, c-format
msgid "can't create directory '%s': %s\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "klarte ikke å lage mappa «%s»: %s\n"
+#: agent/gpg-agent.c:1903 agent/gpg-agent.c:1948 g10/openfile.c:491
+#: g10/openfile.c:520 sm/keydb.c:100
- #, fuzzy, c-format
- #| msgid "directory `%s' created\n"
+ #, c-format
msgid "directory '%s' created\n"
- msgstr "katalogen �%s� ble opprettet\n"
+ msgstr "mappa «%s» er opprettet\n"
+#: agent/gpg-agent.c:1954
- #, fuzzy, c-format
+ #, c-format
msgid "stat() failed for '%s': %s\n"
- msgstr "fstat(%d) mislyktes in %s: %s\n"
+ msgstr "stat() mislyktes for «%s»: %s\n"
+#: agent/gpg-agent.c:1958
- #, fuzzy, c-format
+ #, c-format
msgid "can't use '%s' as home directory\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "«%s» kan ikke brukes som hjemmemappe\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
- #, fuzzy, c-format
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
+ #, c-format
msgid "error reading nonce on fd %d: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av anledning på fd %d: %s\n"
+#: agent/gpg-agent.c:2307
#, c-format
msgid "handler 0x%lx for fd %d started\n"
- msgstr ""
+ msgstr "startet behandler 0x%lx for fd %d\n"
+#: agent/gpg-agent.c:2312
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
- msgstr ""
+ msgstr "avsluttet behandler 0x%lx for fd %d\n"
+#: agent/gpg-agent.c:2385
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
- msgstr ""
+ msgstr "startet ssh-behandler 0x%lx for fd %d\n"
+#: agent/gpg-agent.c:2390
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
- msgstr ""
+ msgstr "avsluttet ssh-behandler 0x%lx for fd %d\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
- #, fuzzy, c-format
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
+ #, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
- msgstr "oppdatering av hemmelig mislyktes: %s\n"
+ msgstr "npth_pselect mislyktes: %s - venter 1s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
- #, fuzzy, c-format
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
+ #, c-format
msgid "%s %s stopped\n"
- msgstr "%s: hoppet over: %s\n"
+ msgstr "%s %s stoppet\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
- msgstr ""
+ msgstr "ingen gpg-agent kjører i gjeldende økt\n"
+#: agent/preset-passphrase.c:99
- #, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: gpg-preset-passphrase [valg] NØKKELGREP («-h» for hjelp)\n"
+#: agent/preset-passphrase.c:102
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
+ "Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
+ "Vedlikehold av hurtiglager for passord\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -707,9 -511,6 +676,9 @@@ msgstr "
"@Kommandoer:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -719,85 -520,72 +688,88 @@@ msgstr "
"Valg:\n"
" "
+#: agent/protect-tool.c:154
- #, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: gpg-protect-tool [valg] («-h» for hjelp)\n"
+#: agent/protect-tool.c:156
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
+ "Syntaks: gpg-protect-tool [valg] [arg]\n"
+ "Håndteringsverktøy for hemmelige nøkler\n"
+#: agent/protect-tool.c:700
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
- msgstr ""
+ msgstr "Skriv inn passordfrase for å låse opp PKCS#12-objekt."
+#: agent/protect-tool.c:705
msgid "Please enter the passphrase to protect the new PKCS#12 object."
- msgstr ""
+ msgstr "Skriv inn passordfrase for å låse nytt PKCS#12-objekt."
+#: agent/protect-tool.c:711
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
+ "Skriv inn passordfrase for å låse nytt importert objekt i GnuPG-systemet."
+#: agent/protect-tool.c:716
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr ""
+ "Skriv inn passordfrase eller PIN-kode som\n"
+ "\vkreves for å fullføre gjeldende handling."
+#: agent/protect-tool.c:727 tools/symcryptrun.c:454
- #, fuzzy
msgid "cancelled\n"
- msgstr "cancel|cancel"
+ msgstr "avbrutt\n"
+#: agent/protect-tool.c:729 tools/symcryptrun.c:450
- #, fuzzy, c-format
+ #, c-format
msgid "error while asking for the passphrase: %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under spørring etter passordfrase: %s\n"
+#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1579
- #, fuzzy, c-format
+ #, c-format
msgid "error opening '%s': %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under åpning av «%s»: %s\n"
+#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
- #, fuzzy, c-format
+ #, c-format
msgid "file '%s', line %d: %s\n"
- msgstr "valgfil �%s�: %s\n"
+ msgstr "fil «%s», linje %d: %s\n"
+#: agent/trustlist.c:192 agent/trustlist.c:200
- #, fuzzy, c-format
+ #, c-format
msgid "statement \"%s\" ignored in '%s', line %d\n"
- msgstr "lesefeil ved �%s�: %s\n"
+ msgstr "uttrykk «%s» ignorert i «%s», linje %d\n"
+#: agent/trustlist.c:206
- #, fuzzy, c-format
+ #, c-format
msgid "system trustlist '%s' not available\n"
- msgstr "hemmelig n�kkel er ikke tilgjengelig"
+ msgstr "system-tillitsliste «%s» er ikke tilgjengelig\n"
+#: agent/trustlist.c:250
- #, fuzzy, c-format
+ #, c-format
msgid "bad fingerprint in '%s', line %d\n"
- msgstr "lesefeil ved �%s�: %s\n"
+ msgstr "ugyldig fingeravtrykk i «%s», linje %d\n"
+#: agent/trustlist.c:275 agent/trustlist.c:282
- #, fuzzy, c-format
+ #, c-format
msgid "invalid keyflag in '%s', line %d\n"
- msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+ msgstr "ugyldig nøkkelvalg i «%s», linje %d\n"
+#: agent/trustlist.c:316 common/helpfile.c:136
- #, fuzzy, c-format
+ #, c-format
msgid "error reading '%s', line %d: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av «%s», linje %d: %s\n"
+#: agent/trustlist.c:434 agent/trustlist.c:503
msgid "error reading list of trusted root certificates\n"
- msgstr ""
+ msgstr "feil under lesing av liste over tillitsmerkede rotsertifikater\n"
#. TRANSLATORS: This prompt is shown by the Pinentry
#. and has one special property: A "%%0A" is used by
@@@ -813,16 -600,14 +785,17 @@@ msgid "
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
+ "Stoler du fullstendig på at%%0A «%s»%%0Asertifiserer brukersertifikater "
+ "korrekt?"
+#: agent/trustlist.c:673 common/audit.c:467
- #, fuzzy
msgid "Yes"
- msgstr "ja"
+ msgstr "Ja"
+#: agent/trustlist.c:673 agent/findkey.c:1453 agent/findkey.c:1467
+#: common/audit.c:469
msgid "No"
- msgstr ""
+ msgstr "Nei"
#. TRANSLATORS: This prompt is shown by the Pinentry and has
#. one special property: A "%%0A" is used by Pinentry to
@@@ -842,187 -626,149 +815,190 @@@ msgstr "Kontroller at sertifikatet%%0
#. TRANSLATORS: "Correct" is the label of a button and intended
#. to be hit if the fingerprint matches the one of the CA. The
#. other button is "the default "Cancel" of the Pinentry.
+#: agent/trustlist.c:721
msgid "Correct"
- msgstr ""
+ msgstr "Riktig"
+#: agent/trustlist.c:721
msgid "Wrong"
- msgstr ""
+ msgstr "Feil"
+#: agent/findkey.c:252
#, c-format
msgid "Note: This passphrase has never been changed.%0APlease change it now."
msgstr ""
+ "Merk: denne passordfrasen har aldri blitt endret.%0AEndre den umiddelbart."
+#: agent/findkey.c:268
#, c-format
msgid ""
"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change "
"it now."
msgstr ""
+ "Denne passordfrasen har ikke blitt endret%%0Asiden %.4s-%.2s-%.2s. Endre den "
+ "umiddelbart."
+#: agent/findkey.c:282 agent/findkey.c:289
- #, fuzzy
msgid "Change passphrase"
- msgstr "endre passfrasen"
+ msgstr "Endre passordfrase"
+#: agent/findkey.c:290
msgid "I'll change it later"
- msgstr ""
+ msgstr "Jeg endrer senere"
+#: agent/findkey.c:1429
- #, fuzzy, c-format
- #| msgid "Do you really want to delete the selected keys? (y/N) "
+ #, c-format
msgid ""
"Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C"
"%%0A?"
- msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
+ msgstr ""
+ "Er du sikker på at du vil slette nøkkel med nøkkelgrep%%0A %s%%0A %%C%%0A?"
+#: agent/findkey.c:1453 agent/findkey.c:1467
- #, fuzzy
- #| msgid "enable key"
msgid "Delete key"
- msgstr "innkoble en n�kkel"
+ msgstr "Slett nøkkel"
+#: agent/findkey.c:1464
msgid ""
"Warning: This key is also listed for use with SSH!\n"
"Deleting the key might remove your ability to access remote machines."
msgstr ""
+ "Advarsel: denne nøkkelen brukes også som SSH-nøkkel.\n"
+ "Hvis du sletter nøkkelen, kan du miste tilgang til én eller flere eksterne "
+ "maskiner."
+#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
- msgstr ""
+ msgstr "DSA krever at kontrollsummen er multipliserbar med 8 bit\n"
+#: agent/pksign.c:187 sm/certcheck.c:97
#, c-format
msgid "%s key uses an unsafe (%u bit) hash\n"
- msgstr ""
+ msgstr "%s nøkkel bruker utrygg kontrollsum (%u bit)\n"
+#: agent/pksign.c:204
#, c-format
msgid "a %zu bit hash is not valid for a %u bit %s key\n"
- msgstr ""
+ msgstr "kontrollsum på %zu bit er ugyldig for %u-bits %s-nøkler\n"
+#: agent/pksign.c:512
#, c-format
msgid "checking created signature failed: %s\n"
- msgstr ""
+ msgstr "kontroll av opprettet signatur mislyktes. %s\n"
+#: agent/cvt-openpgp.c:338
msgid "secret key parts are not available\n"
- msgstr ""
+ msgstr "hemmelige nøkkeldeler er ikke tilgjenglig\n"
+#: agent/cvt-openpgp.c:344
- #, fuzzy, c-format
+ #, c-format
msgid "public key algorithm %d (%s) is not supported\n"
- msgstr "ikke st�ttet"
+ msgstr "offentlig nøkkelalgoritme %d (%s) støttes ikke\n"
+#: agent/cvt-openpgp.c:448
- #, fuzzy, c-format
+ #, c-format
msgid "protection algorithm %d (%s) is not supported\n"
- msgstr "kryptert med en ukjent algoritme %d\n"
+ msgstr "beskyttelsesalgoritme %d (%s) støttes ikke\n"
+#: agent/cvt-openpgp.c:455
- #, fuzzy, c-format
+ #, c-format
msgid "protection hash algorithm %d (%s) is not supported\n"
- msgstr "ikke st�ttet"
+ msgstr "kontrollsum-algoritme for beskyttelse %d (%s) støttes ikke\n"
+#: common/exechelp-posix.c:361 common/exechelp-w32.c:406
+#: common/exechelp-w32.c:430 common/exechelp-w32.c:460
+#: dirmngr/ldap-wrapper.c:710
- #, fuzzy, c-format
+ #, c-format
msgid "error creating a pipe: %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under opprettelse av datarør: %s\n"
+#: common/exechelp-posix.c:374 common/exechelp-w32.c:416
+#: common/exechelp-w32.c:440 common/exechelp-w32.c:470
- #, fuzzy, c-format
+ #, c-format
msgid "error creating a stream for a pipe: %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under opprettelse av strøm for datarør: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
- #, fuzzy, c-format
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
+ #, c-format
msgid "error forking process: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under kopiering av prosess: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
- #, fuzzy, c-format
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
+ #, c-format
msgid "waiting for processes to terminate failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "venting på avslutning av prosesser mislyktes: %s\n"
- #: common/exechelp-posix.c:651
- #, fuzzy, c-format
++#: common/exechelp-posix.c:652
+ #, c-format
msgid "error running '%s': probably not installed\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr ""
+ "feil under kjøring av «%s». Programmet er sannsynligvis ikke installert\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
- #, fuzzy, c-format
+ #, c-format
msgid "error running '%s': exit status %d\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under kjøring av «%s». Avslutningskode %d\n"
- #: common/exechelp-posix.c:666
- #, fuzzy, c-format
++#: common/exechelp-posix.c:667
+ #, c-format
msgid "error running '%s': terminated\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under kjøring av «%s». Avsluttet\n"
+#: common/exechelp-w32.c:746 common/exechelp-w32ce.c:775
- #, fuzzy, c-format
+ #, 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 "feil under henting av avslutningskode for prosess %d: %s\n"
+#: common/exechelp-w32ce.c:767
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
- msgstr ""
+ msgstr "prosessen %d avsluttet ikke i tide. %s\n"
- #: common/simple-pwquery.c:376
- #, fuzzy, c-format
- #| msgid "can't close `%s': %s\n"
++#: common/simple-pwquery.c:379
+ #, c-format
msgid "can't connect to '%s': %s\n"
- msgstr "kan ikke lukke �%s�: %s\n"
+ msgstr "klarte ikke å koble til «%s»: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
- msgstr ""
+ msgstr "kommunikasjonsproblemer med gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
msgid "problem setting the gpg-agent options\n"
- msgstr ""
+ msgstr "klarte ikke å sette opp valg for gpg-agent\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
- msgstr ""
+ msgstr "avbrutt av bruker\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
- msgstr ""
+ msgstr "problemer med agent\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
- msgstr ""
+ msgstr "problemer med agent (uventet svar: «%s»)\n"
+#: common/sysutils.c:124
#, c-format
msgid "can't disable core dumps: %s\n"
- msgstr ""
+ msgstr "klarte ikke å slå av kjernedump: %s\n"
+#: common/sysutils.c:219
- #, fuzzy, c-format
+ #, c-format
msgid "Warning: unsafe ownership on %s \"%s\"\n"
- msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
+ msgstr "Advarsel: utrygt eierskap til %s «%s»\n"
+#: common/sysutils.c:251
- #, fuzzy, c-format
+ #, c-format
msgid "Warning: unsafe permissions on %s \"%s\"\n"
- msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
+ msgstr "Advarsel: utrygge tillatelser til %s «%s»\n"
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: common/yesno.c:45 common/yesno.c:82
msgid "yes"
msgstr "ja"
@@@ -1066,596 -803,427 +1042,556 @@@ msgstr "oO
msgid "cC"
msgstr "cC"
+#: common/miscellaneous.c:86
#, c-format
msgid "out of core in secure memory while allocating %lu bytes"
- msgstr ""
+ msgstr "kjernen i sikkert minne ble full under tildeling av %lu byte"
+#: common/miscellaneous.c:89
#, c-format
msgid "out of core while allocating %lu bytes"
- msgstr ""
+ msgstr "kjernen ble full under tildeling av %lu byte"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
- #, fuzzy, c-format
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
+ #, c-format
msgid "error allocating enough memory: %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under tildeling av minne. %s\n"
+#: common/miscellaneous.c:143
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
- msgstr ""
+ msgstr "%s:%u: valget «%s» er utgått, og har nå ingen effekt\n"
+#: common/miscellaneous.c:146
#, c-format
msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n"
- msgstr ""
+ msgstr "ADVARSEL: valget «%s%s» er utgått, og har ingen effekt\n"
+#: common/miscellaneous.c:490
#, c-format
msgid "unknown debug flag '%s' ignored\n"
- msgstr ""
+ msgstr "unknown debug flag '%s' ignored\n"
+#: common/asshelp.c:417
#, c-format
msgid "no running gpg-agent - starting '%s'\n"
- msgstr ""
+ msgstr "ingen kjørende gpg-agent. Starter «%s»\n"
+#: common/asshelp.c:477
#, c-format
msgid "waiting for the agent to come up ... (%ds)\n"
- msgstr ""
+ msgstr "venter på at agent skal dukke opp … (%ds)\n"
+#: common/asshelp.c:485
msgid "connection to agent established\n"
- msgstr ""
+ msgstr "koblet til agent\n"
+#: common/asshelp.c:525
- #, fuzzy
- #| msgid "can't do this in batch mode\n"
msgid "connection to agent is in restricted mode\n"
- msgstr "kan ikke gj�re dette i batchmodus\n"
+ msgstr "kobler til agent i begrenset modus\n"
+#: common/asshelp.c:606
#, c-format
msgid "no running Dirmngr - starting '%s'\n"
- msgstr ""
+ msgstr "ingen kjørende Dirmngr. Starter «%s»\n"
+#: common/asshelp.c:663
#, c-format
msgid "waiting for the dirmngr to come up ... (%ds)\n"
- msgstr ""
+ msgstr "venter på at dirmngr skal dukke opp … (%ds)\n"
+#: common/asshelp.c:672
msgid "connection to the dirmngr established\n"
- msgstr ""
+ msgstr "koblet til dirmngr\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 ""
+ msgstr "|audit-log-result|Bra"
+#: common/audit.c:477
msgid "|audit-log-result|Bad"
- msgstr ""
+ msgstr "|audit-log-result|Dårlig"
+#: common/audit.c:479
msgid "|audit-log-result|Not supported"
- msgstr ""
+ msgstr "|audit-log-result|Støttes ikke"
+#: common/audit.c:481
- #, fuzzy
msgid "|audit-log-result|No certificate"
- msgstr "ugyldig sertifikat"
+ msgstr "|audit-log-result|Ingen sertifikat"
+#: common/audit.c:483
- #, fuzzy
msgid "|audit-log-result|Not enabled"
- msgstr "ugyldig sertifikat"
+ msgstr "|audit-log-result|Ikke i bruk"
+#: common/audit.c:485
msgid "|audit-log-result|Error"
- msgstr ""
+ msgstr "|audit-log-result|Feil"
+#: common/audit.c:487
- #, fuzzy
msgid "|audit-log-result|Not used"
- msgstr "ugyldig sertifikat"
+ msgstr "|audit-log-result|Ikke brukt"
+#: common/audit.c:489
- #, fuzzy
msgid "|audit-log-result|Okay"
- msgstr "ugyldig sertifikat"
+ msgstr "|audit-log-result|Ok"
+#: common/audit.c:491
- #, fuzzy
msgid "|audit-log-result|Skipped"
- msgstr "ugyldig sertifikat"
+ msgstr "|audit-log-result|Hoppet over"
+#: common/audit.c:493
- #, fuzzy
msgid "|audit-log-result|Some"
- msgstr "ugyldig sertifikat"
+ msgstr "|audit-log-result|Noe"
+#: common/audit.c:726
- #, fuzzy
msgid "Certificate chain available"
- msgstr "ugyldig sertifikat"
+ msgstr "Sertifikatkjede tilgjengelig"
+#: common/audit.c:733
- #, fuzzy
msgid "root certificate missing"
- msgstr "ugyldig sertifikat"
+ msgstr "rotsertifikat mangler"
+#: common/audit.c:759
msgid "Data encryption succeeded"
- msgstr ""
+ msgstr "Datakryptering fullført"
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
- #, fuzzy
msgid "Data available"
- msgstr "vis alle tilgjengelige data"
+ msgstr "Data tilgjengelig"
+#: common/audit.c:767
- #, fuzzy
msgid "Session key created"
- msgstr "n�kkelknippet �%s� ble opprettet\n"
+ msgstr "Øktnøkkel opprettet"
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
- #, fuzzy, c-format
+ #, c-format
msgid "algorithm: %s"
- msgstr "gyldighet: %s"
+ msgstr "algoritme: %s"
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
+#: scd/app-openpgp.c:2885
- #, fuzzy, c-format
+ #, c-format
msgid "unsupported algorithm: %s"
- msgstr ""
- "\n"
- "St�ttede algoritmer:\n"
+ msgstr "ustøttet algoritme: %s"
+#: common/audit.c:778 common/audit.c:925
- #, fuzzy
msgid "seems to be not encrypted"
- msgstr "ikke kryptert"
+ msgstr "ser ikke ut til å være kryptert"
+#: common/audit.c:784 common/audit.c:933
msgid "Number of recipients"
- msgstr ""
+ msgstr "Antall mottakere"
+#: common/audit.c:792 common/audit.c:956
#, c-format
msgid "Recipient %d"
- msgstr ""
+ msgstr "Mottaker %d"
+#: common/audit.c:825
msgid "Data signing succeeded"
- msgstr ""
+ msgstr "Datasignering fullført"
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
- #, fuzzy, c-format
+ #, c-format
msgid "data hash algorithm: %s"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "summeringsalgoritme for data: %s"
+#: common/audit.c:862
- #, fuzzy, c-format
+ #, c-format
msgid "Signer %d"
- msgstr "Signatur opprettet %s\n"
+ msgstr "Undertegnet %d"
+#: common/audit.c:866 common/audit.c:1065
- #, fuzzy, c-format
+ #, c-format
msgid "attr hash algorithm: %s"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "summeringsalgoritme for attributter: %s"
+#: common/audit.c:901
msgid "Data decryption succeeded"
- msgstr ""
+ msgstr "Datadekryptering fullført"
+#: common/audit.c:910
- #, fuzzy
msgid "Encryption algorithm supported"
- msgstr "kryptert med en ukjent algoritme %d\n"
+ msgstr "Krypteringsalgoritme støttes"
+#: common/audit.c:993
msgid "Data verification succeeded"
- msgstr ""
+ msgstr "Databekreftelse vellykket"
+#: common/audit.c:1002
- #, fuzzy
msgid "Signature available"
- msgstr "Signatur opprettet %s\n"
+ msgstr "Signatur tilgjengelig"
+#: common/audit.c:1024
- #, fuzzy
msgid "Parsing data succeeded"
- msgstr "ingen signatur ble funnet\n"
+ msgstr "Datatolkning fullført"
+#: common/audit.c:1036
- #, fuzzy, c-format
+ #, c-format
msgid "bad data hash algorithm: %s"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "ugyldig summeringsalgoritme for data: %s"
+#: common/audit.c:1051
- #, fuzzy, c-format
+ #, c-format
msgid "Signature %d"
- msgstr "Signatur opprettet %s\n"
+ msgstr "Signatur %d"
+#: common/audit.c:1079
- #, fuzzy
msgid "Certificate chain valid"
- msgstr "Denne n�kkelen er utg�tt!"
+ msgstr "Sertifikatkjede gyldig"
+#: common/audit.c:1090
- #, fuzzy
msgid "Root certificate trustworthy"
- msgstr "ugyldig sertifikat"
+ msgstr "Rotsertifikat regnes som troverdig"
+#: common/audit.c:1111 sm/certchain.c:991
- #, fuzzy
msgid "no CRL found for certificate"
- msgstr "ugyldig sertifikat"
+ msgstr "fant ingen sertifikat-CRL"
+#: common/audit.c:1114 sm/certchain.c:1001
- #, fuzzy
msgid "the available CRL is too old"
- msgstr "N�kkel tilgjengelig ved: "
+ msgstr "tilgjengelig CRL er for gammel"
+#: common/audit.c:1119
- #, fuzzy
msgid "CRL/OCSP check of certificates"
- msgstr "ugyldig sertifikat"
+ msgstr "CRL-/OCSP-sertifikatkontroll"
+#: common/audit.c:1139
- #, fuzzy
msgid "Included certificates"
- msgstr "ugyldig sertifikat"
+ msgstr "Inkluderte sertifikater"
+#: common/audit.c:1194
msgid "No audit log entries."
- msgstr ""
+ msgstr "Ingen elementer i revisjonslogg."
+#: common/audit.c:1243
- #, fuzzy
msgid "Unknown operation"
- msgstr "ukjent versjon"
+ msgstr "Ukjent handling"
+#: common/audit.c:1261
msgid "Gpg-Agent usable"
- msgstr ""
+ msgstr "Gpg-Agent kan brukes"
+#: common/audit.c:1271
msgid "Dirmngr usable"
- msgstr ""
+ msgstr "Dirmngr kan brukes"
+#: common/audit.c:1307
#, c-format
msgid "No help available for '%s'."
- msgstr ""
+ msgstr "Ingen hjelp tilgjengelig for «%s»"
+#: common/helpfile.c:90
- #, fuzzy
msgid "ignoring garbage line"
- msgstr "feil i trailerlinje\n"
+ msgstr "ignorerer ubrukelig linje"
- #: common/gettime.c:860
- #, fuzzy
++#: common/gettime.c:893
msgid "[none]"
- msgstr "[ikke satt]"
+ msgstr "[ingen]"
+#: common/argparse.c:365
- #, fuzzy
msgid "argument not expected"
- msgstr "Admin-kommandoer er ikke tillatt\n"
+ msgstr "uforventet argument"
+#: common/argparse.c:367
- #, fuzzy
msgid "read error"
- msgstr "feil ved lesing av fil"
+ msgstr "lesefeil"
+#: common/argparse.c:369
- #, fuzzy
msgid "keyword too long"
- msgstr "for lang linje"
+ msgstr "nøkkelord er for langt"
+#: common/argparse.c:371
- #, fuzzy
msgid "missing argument"
- msgstr "ugydig argument"
+ msgstr "argument mangler"
+#: common/argparse.c:373
- #, fuzzy
- #| msgid "invalid armor"
msgid "invalid argument"
- msgstr "ugyldig beskyttelse"
+ msgstr "ugydig argument"
+#: common/argparse.c:375
- #, fuzzy
msgid "invalid command"
- msgstr "Admin-reservert kommando\n"
+ msgstr "ugyldig kommando"
+#: common/argparse.c:377
- #, fuzzy
msgid "invalid alias definition"
- msgstr "ugyldige listevalg\n"
+ msgstr "ugyldig aliasdefinisjon"
+#: common/argparse.c:379
- #, fuzzy
msgid "out of core"
- msgstr "ikke tvunget"
+ msgstr "kjernen er full"
+#: common/argparse.c:381
- #, fuzzy
msgid "invalid option"
- msgstr "ugyldige listevalg\n"
+ msgstr "ugyldig valg"
+#: common/argparse.c:389
#, c-format
msgid "missing argument for option \"%.50s\"\n"
- msgstr ""
+ msgstr "valget «%.50s» mangler et argument\n"
+#: common/argparse.c:391
- #, fuzzy, c-format
+ #, c-format
msgid "invalid argument for option \"%.50s\"\n"
- msgstr "ugyldige listevalg\n"
+ msgstr "ugyldig argument for valget «%.50s»\n"
+#: common/argparse.c:393
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
- msgstr ""
+ msgstr "valget «%.50s» skal ikke brukes med argumenter\n"
+#: common/argparse.c:395
- #, fuzzy, c-format
+ #, c-format
msgid "invalid command \"%.50s\"\n"
- msgstr "Ugyldig kommando (pr�v �help�)\n"
+ msgstr "kommandoen «%.50s» er ugyldig\n"
+#: common/argparse.c:397
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
- msgstr ""
+ msgstr "valget «%.50s» er flertydig\n"
+#: common/argparse.c:399
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
- msgstr ""
+ msgstr "kommandoen «%.50s» er flertydig\n"
+#: common/argparse.c:401 dirmngr/dirmngr.c:1234
- #, fuzzy
msgid "out of core\n"
- msgstr "ikke tvunget"
+ msgstr "kjernen er full\n"
+#: common/argparse.c:403
- #, fuzzy, c-format
+ #, c-format
msgid "invalid option \"%.50s\"\n"
- msgstr "ugyldige listevalg\n"
+ msgstr "valget «%.50s» er ugyldig\n"
+#: common/utf8conv.c:123
- #, fuzzy, c-format
+ #, c-format
msgid "conversion from '%s' to '%s' not available\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "konvertering fra «%s» til «%s» er ikke tilgjengelig\n"
+#: common/utf8conv.c:131
- #, fuzzy, c-format
+ #, c-format
msgid "iconv_open failed: %s\n"
- msgstr "signering mislyktes: %s\n"
+ msgstr "iconv_open mislyktes: %s\n"
+#: common/utf8conv.c:385 common/utf8conv.c:651
- #, fuzzy, c-format
+ #, c-format
msgid "conversion from '%s' to '%s' failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "konvertering fra «%s» til «%s» mislyktes: %s\n"
+#: common/dotlock.c:707
- #, fuzzy, c-format
+ #, c-format
msgid "failed to create temporary file '%s': %s\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "klarte ikke å lage midlertidig fil «%s»: %s\n"
+#: common/dotlock.c:771
- #, fuzzy, c-format
+ #, c-format
msgid "error writing to '%s': %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under skriving til «%s»: %s\n"
+#: common/dotlock.c:1116
#, c-format
msgid "removing stale lockfile (created by %d)\n"
- msgstr ""
+ msgstr "fjerner ødelagt låsfil (laget av %d)\n"
+#: common/dotlock.c:1152
- #, fuzzy, c-format
+ #, c-format
msgid "waiting for lock (held by %d%s) %s...\n"
- msgstr "venter p� l�sing av �%s� ...\n"
+ msgstr "venter på lås (holdt igjen av %d%s) %s …\n"
+#: common/dotlock.c:1153
msgid "(deadlock?) "
- msgstr ""
+ msgstr "(vranglås?) "
+#: common/dotlock.c:1192
- #, fuzzy, c-format
+ #, c-format
msgid "lock '%s' not made: %s\n"
- msgstr "fant ikke offentlig n�kkel %s: %s\n"
+ msgstr "lås «%s» ikke opprettet: %s\n"
+#: common/dotlock.c:1219
- #, fuzzy, c-format
+ #, c-format
msgid "waiting for lock %s...\n"
- msgstr "venter p� l�sing av �%s� ...\n"
+ msgstr "venter på lås %s …\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armor: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "ugyldig armorheader: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "armorheader: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "ugyldig clearsigheader\n"
- #: g10/armor.c:493
- #, fuzzy
++#: g10/armor.c:500
msgid "unknown armor header: "
- msgstr "armorheader: "
+ msgstr "ukjent skjold-hode: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
- msgstr "n�stede klartekstsignaturer\n"
+ msgstr "nøstede klartekst-signaturer\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
- msgstr "uforventet armering:"
+ msgstr "uforventet armering: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "ugyldig bindestrekbeskyttet linje: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "hoppet over ugyldig radix64-tegn %02x\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "for tidlig eof (ingen CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "for tidlig eof (i CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
- msgstr "misdannet CRC\n"
+ msgstr "feilformatert CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-feil; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
- msgstr "for tidlig eof (i trailer)\n"
+ msgstr "for tidlig eof (på sluttlinje)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
- msgstr "feil i trailerlinje\n"
+ msgstr "feil på etterfølgende linje\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
- msgstr "ingen gyldig OpenPGP-data funnet.\n"
+ msgstr "fant ingen gyldig OpenPGP-data.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "ugyldig armor: linje lengre enn %d tegn\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
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"
+ "anført utskrivbart tegn i armor. Noen har antakeligvis brukt en feiloppsatt "
+ "e-posttjener\n"
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
#, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
- msgstr ""
+ msgstr "[ ikke menneskevennlig (%zu byte: %s%s) ]"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
+ "notatnavn kan bare inneholde utskrivbare tegn og mellomrom, og må slutte med "
+ "«=»\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
- msgstr ""
+ msgstr "bruker-notatnavn må inneholde tegnet «@»\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
msgid "a notation name must not contain more than one '@' character\n"
- msgstr ""
+ msgstr "notatnavn kan ikke inneholde flere enn ett «@»-tegn\n"
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
- msgstr ""
+ msgstr "notatverdier kan ikke inneholde kontrolltegn\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
msgid "a notation name may not contain an '=' character\n"
- msgstr ""
+ msgstr "notatnavn kan ikke inneholde tegnet «=»\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
msgid "a notation name must have only printable characters or spaces\n"
- msgstr ""
+ msgstr "notatnavn skal bare inneholde utskrivbare tegn og evt. mellomrom\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
- #, fuzzy
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
- msgstr "ingen gyldig OpenPGP-data funnet.\n"
+ msgstr "ADVARSEL: fant ugyldig notatdata\n"
+#: g10/call-agent.c:151 sm/call-agent.c:199
#, c-format
msgid "failed to proxy %s inquiry to client\n"
- msgstr ""
+ msgstr "klarte ikke å videresende %s forespørsel til klient\n"
+#: g10/call-agent.c:176
msgid "Enter passphrase: "
- msgstr "Tast inn passfrase: "
+ msgstr "Skriv inn passordfrase: "
+#: 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"
+ #, c-format
msgid "error getting version from '%s': %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under henting av versjon fra «%s»: %s\n"
+#: g10/call-agent.c:272 sm/call-agent.c:104 sm/call-dirmngr.c:170
#, c-format
msgid "server '%s' is older than us (%s < %s)"
- msgstr ""
+ msgstr "tjener «%s» er eldre enn oss (%s < %s)"
+#: g10/call-agent.c:278 sm/call-agent.c:110 sm/call-dirmngr.c:176
- #, fuzzy, c-format
- #| msgid "WARNING: %s overrides %s\n"
+ #, c-format
msgid "WARNING: %s\n"
- msgstr "ADVARSEL: %s overstyrere %s\n"
+ msgstr "ADVARSEL: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
- msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
+ msgstr "OpenPGP-kort er ikke tilgjengelig. %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kortnummer %s oppdaget\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
- msgstr "kan ikke gj�re dette i batchmodus\n"
+ msgstr "du kan ikke gjøres dette i buntmodus\n"
+#: 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"
+ msgstr "Denne kommandoen er bare tilgjengelig for kort av versjon 2\n"
+#: g10/card-util.c:109 scd/app-openpgp.c:2259
msgid "Reset Code not or not anymore available\n"
- msgstr ""
+ msgstr "Tilbakestillingskode er ikke tilgjengelig\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ditt valg? "
+#: g10/card-util.c:279 g10/card-util.c:330
msgid "[not set]"
- msgstr "[ikke satt]"
+ msgstr "[ikke valgt]"
+#: g10/card-util.c:533
msgid "male"
msgstr "mann"
@@@ -1675,15 -1239,12 +1611,15 @@@ msgstr "ikke tvunget
msgid "forced"
msgstr "tvunget"
+#: 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 "Feil: Bare ren ASCII er foreløpig tillatt.\n"
+#: g10/card-util.c:638
msgid "Error: The \"<\" character may not be used.\n"
- msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
+ msgstr "Feil: tegnet «<» kan ikke brukes.\n"
+#: g10/card-util.c:640
msgid "Error: Double spaces are not allowed.\n"
msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
@@@ -1695,462 -1254,340 +1631,446 @@@ msgstr "Kortholders etternavn:
msgid "Cardholder's given name: "
msgstr "Kortholders fornavn: "
+#: 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 "Feil: Det kombinerte navnet er for langt (grensa går ved %d tegn).\n"
+#: g10/card-util.c:698
msgid "URL to retrieve public key: "
- msgstr "URL for � hente offentlig n�kkel: "
+ msgstr "Adresse for henting av offentlig nøkkel: "
+#: 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 "Feil: Adressen er for lang (grensa er %d tegn).\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:1617
- #, fuzzy, c-format
- #| msgid "error reading `%s': %s\n"
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
+ #, c-format
msgid "error reading '%s': %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av «%s»: %s\n"
- #: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
- #, fuzzy, c-format
+ #, c-format
msgid "error writing '%s': %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under skriving av «%s»: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Logindata (kontonavn): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, 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 "Feil: Logindata er for langt (grensa går ved %d tegn).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Privat DO-data: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, 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 "Feil: Privat DO for lang (grensa går ved %d tegn).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
- msgstr "Spr�kpreferanser:"
+ msgstr "Språkoppsett: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
- msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
+ msgstr "Feil: oppsettsstreng har ugyldig lengde.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
- msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
+ msgstr "Feil: oppsettsstreng inneholder ugyldige tegn.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
- msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
+ msgstr "Kjønn ((M)askulint, (F)eminint eller mellomrom): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
- msgstr "Feil: ugyldig respons.\n"
+ msgstr "Feil: ugyldig svar.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "CA-fingeravtrykk: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
- msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+ msgstr "Feil: feilformatert fingeravtrykk.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
- msgstr "n�kkeloperasjonen er umulig: %s\n"
+ msgstr "nøkkelhåndtering er umulig. %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "ikke et OpenPGP-kort"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under henting av info om gjeldende nøkkel. %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
- msgstr "Erstatte eksisterende n�kkel? (j/N) "
+ msgstr "Erstatte eksisterende nøkkel? (j/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
+ "MERK: Det er ingen garanti for at kortet støtter forespurt størrelse.\n"
+ " Se dokumentasjon for kortet du bruker og finn ut hvilke størrelser \n"
+ " det tillater hvis nøkkelgenerering mislykkes.\n"
- #: g10/card-util.c:1301
- #, fuzzy, c-format
++#: g10/card-util.c:1291
+ #, c-format
msgid "What keysize do you want for the Signature key? (%u) "
- msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+ msgstr "Hvor stor skal signaturnøkkelen være? (%u) "
- #: g10/card-util.c:1303
- #, fuzzy, c-format
++#: g10/card-util.c:1293
+ #, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
- msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+ msgstr "Hvor stor skal krypteringsnøkkelen være? (%u) "
- #: g10/card-util.c:1304
- #, fuzzy, c-format
++#: g10/card-util.c:1294
+ #, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
- msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+ msgstr "Hvor stor skal autentiseringsnøkkelen være? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
- msgstr "rundet opp til %u bits\n"
+ msgstr "rundet opp til %u bit\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
- msgstr ""
+ msgstr "%s nøkkelstørrelser må ligge i rekkevidden %u-%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
- msgstr ""
+ msgstr "Kortet blir nå satt opp på nytt for å lage nøkkel på %u bit\n"
- #: g10/card-util.c:1348
- #, fuzzy, c-format
++#: g10/card-util.c:1338
+ #, c-format
msgid "error changing size of key %d to %u bits: %s\n"
- msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+ msgstr "feil under endring av størrelse på nøkkel %d til %u bit. %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
- msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
+ msgstr "Lage sikkerhetskopi av krypteringsnøkler utenfor kortet? (J/n) "
- #: g10/card-util.c:1386
- #, fuzzy
++#: g10/card-util.c:1376
msgid "Note: keys are already stored on the card!\n"
- msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
+ msgstr "MERK: det ligger allerede nøkler på kortet.\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
- msgstr "Erstatte eksisterende n�kler? (j/N) "
+ msgstr "Erstatte eksisterende nøkler? (j/N) "
- #: g10/card-util.c:1401
- #, fuzzy, c-format
- #| msgid ""
- #| "Please note that the factory settings of the PINs are\n"
- #| " PIN = `%s' Admin PIN = `%s'\n"
- #| "You should change them using the command --change-pin\n"
++#: g10/card-util.c:1391
+ #, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
" PIN = '%s' Admin PIN = '%s'\n"
"You should change them using the command --change-pin\n"
msgstr ""
- "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"
+ "PIN-koder fra fabrikk:\n"
+ " PIN = «%s» Admin-PIN = «%s»\n"
+ "Du bør endre disse med kommandoen «--change-pin»\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
- msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
+ msgstr "Velg hvilken type nøkkel du vil lage:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
- msgstr " (1) Signaturn�kkel\n"
+ msgstr " (1) Signaturnøkkel\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
- msgstr " (2) Krypteringsn�kkel\n"
+ msgstr " (2) Krypteringsnøkkel\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
- msgstr " (3) Autentiseringsn�kkel\n"
+ msgstr " (3) Autentiseringsnøkkel\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Ugyldig valg.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
- msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
+ msgstr "velg hvor nøkkelen skal lagres:\n"
- #: g10/card-util.c:1614
- #, fuzzy, c-format
++#: g10/card-util.c:1604
+ #, c-format
msgid "KEYTOCARD failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "KEYTOCARD mislyktes: %s\n"
- #: g10/card-util.c:1710
- #, fuzzy
- #| msgid "This command is not allowed while in %s mode.\n"
++#: g10/card-util.c:1700
msgid "This command is not supported by this card\n"
- msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
+ msgstr "Denne kommandoen støttes ikke av dette kortet\n"
- #: g10/card-util.c:1715
- #, fuzzy
++#: g10/card-util.c:1705
msgid "Note: This command destroys all keys stored on the card!\n"
- msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
+ msgstr "Merk: denne kommandoen ødelegger alle nøkler på kortet.\n"
- #: g10/card-util.c:1718
- #, fuzzy
- #| msgid "Sign it? (y/N) "
++#: g10/card-util.c:1708
msgid "Continue? (y/N) "
- msgstr "Signere den? (j/N) "
+ msgstr "Vil du fortsette? (j/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
- msgstr ""
+ msgstr "Er du sikker på at du vil gjenopprette fabrikkoppsett? (skriv «ja») "
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
- msgstr "avslutte denne menyen"
+ msgstr "gå ut av denne menyen"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
- msgstr "vise admin-kommandoer"
+ msgstr "vis admin-kommandoer"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
- msgstr "vise denne hjelpen"
+ msgstr "vis denne hjelpeteksten"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "vis alle tilgjengelige data"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "endre kortholders navn"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
- msgstr "endre URL for � hente n�kkel"
+ msgstr "endre adresse for å hente nøkkel"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
- msgstr "hente n�kkelen angitt i URL som er lagret i kortet"
+ msgstr "hent nøkkel som ligger i kortets adresse"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
- msgstr "endre loginnavnet"
+ msgstr "endre brukernavn"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
- msgstr "endre spr�kpreferansene"
+ msgstr "endre språkoppsett"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
- msgstr "endre kortholders kj�nn"
+ msgstr "endre kortholders kjønn"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
- msgstr "vise et CA-fingeravtrykk"
+ msgstr "endre CA-fingeravtrykk"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
- msgstr "veksle tving-signatur-PIN-flagget"
+ msgstr "slå av på tvungen bruk av signatur-PIN"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
- msgstr "generere nye n�kler"
+ msgstr "lag nye nøkler"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
- msgstr "meny for � endre eller fjerne blokkering av PIN"
+ msgstr "meny for å endre eller fjerne blokkering av PIN"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "bekrefte PIN og vise alle data"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
- msgstr ""
+ msgstr "fjern PIN-blokkering med en tilbakestillingskode"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
- msgstr ""
+ msgstr "ødelegg alle nøkler og data"
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
- msgstr ""
+ msgstr "gpg/kort> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "Admin-reservert kommando\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Admin-kommandoer er tillatt\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "Admin-kommandoer er ikke tillatt\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
- msgstr "Ugyldig kommando (pr�v �help�)\n"
+ msgstr "Ugyldig kommando (prøv «help»)\n"
+#: 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 "«--output» virker ikke med denne kommandoen\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
- #, fuzzy, c-format
- #| msgid "can't open `%s'\n"
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
+ #, c-format
msgid "can't open '%s'\n"
- msgstr "kan ikke �pne �%s�\n"
+ msgstr "klarte ikke å åpne «%s»\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
- msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
+ msgstr "fant ikke nøkkelen «%s». %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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 "feil under lesing av nøkkelblokk. %s\n"
- #: g10/delkey.c:118 g10/getkey.c:574
- #, fuzzy, c-format
- #| msgid "key \"%s\" not found: %s\n"
++#: g10/delkey.c:118 g10/getkey.c:579
+ #, c-format
msgid "key \"%s\" not found\n"
- msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
+ msgstr "fant ikke nøkkelen «%s»\n"
+#: 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 "(med mindre du oppgir nøkkel ved hjelp av fingeravtrykk)\n"
+#: 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 "du må bruke «--yes» for å gjøre dette i buntmodus\n"
+#: g10/delkey.c:148
msgid "Delete this key from the keyring? (y/N) "
- msgstr "Slette denne n�kkelen fra n�kkelknippet? (j/N)"
+ msgstr "Vil du slette denne nøkkelen fra nøkkelknippet? (j/N) "
+#: 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 ""
+ "Dette er en hemmelig nøkkel. Er du sikker på at du vil slette den? (j/N) "
+#: g10/delkey.c:201
- #, fuzzy, c-format
+ #, c-format
msgid "deleting secret %s failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "sletting av hemmelig nøkkel %s mislyktes: %s\n"
+#: g10/delkey.c:203
- #, fuzzy
- #| msgid "bad key"
msgid "key"
- msgstr "ugyldig n�kkel"
+ msgstr "nøkkel"
+#: g10/delkey.c:203
- #, fuzzy
- #| msgid "Pubkey: "
msgid "subkey"
- msgstr "Offentlig n�kkel: "
+ msgstr "undernøkkel"
+#: g10/delkey.c:226
#, c-format
msgid "deleting keyblock failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "sletting av nøkkelblokk mislyktes: %s\n"
+#: g10/delkey.c:239
msgid "ownertrust information cleared\n"
- msgstr "nullstilt informasjon om eiertillit\n"
+ msgstr "informasjon om eiertillit er fjernet\n"
+#: g10/delkey.c:275
#, 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 "det finnes en hemmelig nøkkel for offentlig nøkkel «%s».\n"
+#: g10/delkey.c:277
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
- msgstr "bruk valget �--delete-secret-keys� for � slette den f�rst.\n"
+ msgstr "bruk valget «--delete-secret-keys» for å slette den først.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under opprettelse av passordfrase. %s\n"
+#: 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 "klarte ikke å bruke symmetrisk ESK-pakke på grunn av S2K-modus\n"
+#: g10/encrypt.c:254
#, c-format
msgid "using cipher %s\n"
- msgstr "bruker cipher %s\n"
+ msgstr "bruker krypteringsmetode %s\n"
+#: g10/encrypt.c:264 g10/encrypt.c:625
- #, fuzzy, c-format
- #| msgid "`%s' already compressed\n"
+ #, c-format
msgid "'%s' already compressed\n"
- msgstr "�%s� er allerede komprimert\n"
+ msgstr "«%s» er allerede komprimert\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
- #, fuzzy, c-format
- #| msgid "WARNING: `%s' is an empty file\n"
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
+ #, c-format
msgid "WARNING: '%s' is an empty file\n"
- msgstr "ADVARSEL: �%s� er en tom fil\n"
+ msgstr "ADVARSEL: «%s» er en tom fil\n"
+#: g10/encrypt.c:558
- #, fuzzy, c-format
- #| msgid "reading from `%s'\n"
+ #, c-format
msgid "reading from '%s'\n"
- msgstr "leser fra �%s�\n"
+ msgstr "leser fra «%s»\n"
+#: 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"
+ "ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
+ "mottakers oppsett\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, 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"
+ "ADVARSEL: tvungen bruk av komprimeringsalgoritme %s (%d) bryter med "
+ "mottakers oppsett\n"
+#: 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"
+ msgstr "tvungen bruk av krypt.metode %s (%d) bryter med mottakers oppsett\n"
+#: g10/encrypt.c:904
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
- msgstr "%s/%s kryptert for: \"%s\"\n"
+ msgstr "%s/%s kryptert for: «%s»\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, c-format
msgid "you may not use %s while in %s mode\n"
- msgstr "du kan ikke bruke %s i %s modus\n"
+ msgstr "du kan ikke bruke «%s» i «%s»-modus\n"
- #: g10/decrypt-data.c:93 g10/mainproc.c:306
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s krypterte data\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "kryptert med en ukjent algoritme %d\n"
@@@ -2159,408 -1595,302 +2079,394 @@@
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"
+ "ADVARSEL: meldinga ble kryptert med svak nøkkel for symmetrisk "
+ "krypteringsmetode.\n"
+#: g10/decrypt-data.c:176
msgid "problem handling encrypted packet\n"
- msgstr "problem ved h�ndtering av kryptert pakke\n"
+ msgstr "problem ved håndtering av kryptert pakke\n"
+#: g10/exec.c:60
msgid "no remote program execution supported\n"
- msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
+ msgstr "fjernutføring av programmer er ikke støttet\n"
+#: 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"
+ "eksterne programkall er slått av på grunn av utrygge tillatelser til "
+ "oppsettsfil\n"
+#: g10/exec.c:349
msgid "this platform requires temporary files when calling external programs\n"
msgstr ""
- "denne plattformen krever midlertidige filer ved kall p� eksterne programmer\n"
+ "denne plattformen krever midlertidige filer ved kall på eksterne programmer\n"
+#: g10/exec.c:427
- #, fuzzy, c-format
- #| msgid "unable to execute program `%s': %s\n"
+ #, c-format
msgid "unable to execute program '%s': %s\n"
- msgstr "kunne ikke utf�re program �%s�: %s\n"
+ msgstr "klarte ikke å kjøre «%s»: %s\n"
+#: g10/exec.c:430
- #, fuzzy, c-format
- #| msgid "unable to execute shell `%s': %s\n"
+ #, c-format
msgid "unable to execute shell '%s': %s\n"
- msgstr "kunne ikke utf�re skallet �%s�: %s\n"
+ msgstr "klarte ikke å kjøre skallet «%s»: %s\n"
+#: 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 "systemfeil under kall på eksternt program: %s\n"
+#: g10/exec.c:532 g10/exec.c:599
msgid "unnatural exit of external program\n"
msgstr "unaturlig avslutning av eksternt program\n"
+#: g10/exec.c:547
msgid "unable to execute external program\n"
- msgstr "klarte ikke � kj�re eksternt program\n"
+ msgstr "klarte ikke å kjøre eksternt program\n"
+#: 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 "klarte ikke å lese reponsen fra eksternt program: %s\n"
+#: g10/exec.c:610 g10/exec.c:617
- #, fuzzy, c-format
- #| msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+ #, c-format
msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
- msgstr "ADVARSEL: klarte ikke � fjerne midlertidig fil (%s) �%s�: %s\n"
+ msgstr "ADVARSEL: klarte ikke å fjerne midlertidig fil (%s) «%s»: %s\n"
+#: g10/exec.c:622
- #, fuzzy, c-format
- #| msgid "WARNING: unable to remove temp directory `%s': %s\n"
+ #, c-format
msgid "WARNING: unable to remove temp directory '%s': %s\n"
- msgstr "ADVARSEL: klarte ikke � fjerne midlertidig katalog �%s�: %s\n"
+ msgstr "ADVARSEL: klarte ikke å fjerne midlertidig mappe «%s»: %s\n"
- #: g10/export.c:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "eksportere signaturer som er markert som bare-lokale"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
- msgstr ""
+ msgstr "eksporter bruker-id-er (generelt foto-id-er)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
- msgstr ""
+ msgstr "eksporter opphevelsesnøkler markert som «sensitive»"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
- msgstr ""
+ msgstr "fjern ubrukelige deler fra nøkkelen under eksportering"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
- msgstr ""
+ msgstr "fjern så mye som mulig fra nøkkelen under eksportering"
- #: g10/export.c:1144
- #, fuzzy
- #| msgid "%s: skipped: %s\n"
++#: g10/export.c:1204
msgid " - skipped"
- msgstr "%s: hoppet over: %s\n"
-
- #: g10/export.c:1225
- msgid "exporting secret keys not allowed\n"
- msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
+ msgstr ". Hoppet over"
- #: g10/export.c:1303
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
#, 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"
+ msgid "writing to '%s'\n"
+ msgstr "skriver til «%s»\n"
- #: g10/export.c:1490
++#: g10/export.c:1660
#, c-format
msgid "key %s: key material on-card - skipped\n"
- msgstr "n�kkel %s: n�kkelmateriell p� kort - hoppet over\n"
+ msgstr "nøkkel %s: nøkkelmateriell på kort - hoppet over\n"
+
++#: g10/export.c:1846
+ msgid "exporting secret keys not allowed\n"
+ msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
+
++#: g10/export.c:1923
+ #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "ADVARSEL: ingenting eksportert\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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"
+ #, c-format
msgid "error creating '%s': %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under oppretting av «%s»: %s\n"
- #: g10/getkey.c:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
- msgstr "[Brukerid ikke funnet]"
+ msgstr "[Fant ikke bruker-ID]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
- #, fuzzy, c-format
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
+ #, c-format
msgid "(check argument of option '%s')\n"
- msgstr "ugyldige listevalg\n"
+ msgstr "(kontroller argument for valget «%s»)\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
- msgstr ""
+ msgstr "Advarsel: «%s» må være en lang nøkkel-ID eller et fingeravtrykk\n"
- #: g10/getkey.c:541
- #, fuzzy, c-format
++#: g10/getkey.c:546
+ #, c-format
msgid "error looking up: %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under oppslag av %s\n"
- #: g10/getkey.c:631
- #, fuzzy, c-format
- #| msgid "error creating keyring `%s': %s\n"
++#: g10/getkey.c:636
+ #, c-format
msgid "Warning: %s appears in the keyring %d times\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "Advarsel: %s står oppført på nøkkelknippet %d ganger\n"
- #: g10/getkey.c:1429
- #, fuzzy, c-format
++#: g10/getkey.c:1431
+ #, c-format
msgid "automatically retrieved '%s' via %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "hentet «%s» via %s automatisk\n"
- #: g10/getkey.c:1435
- #, fuzzy, c-format
++#: g10/getkey.c:1437
+ #, c-format
msgid "error retrieving '%s' via %s: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under henting av «%s» via %s: %s\n"
- #: g10/getkey.c:1437
- #, fuzzy
++#: g10/getkey.c:1439
msgid "No fingerprint"
- msgstr "CA-fingeravtrykk: "
+ msgstr "Ingen fingeravtrykk"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "fant ikke hemmelig nøkkel «%s». %s\n"
- #: g10/getkey.c:1686
- #, fuzzy, c-format
- #| msgid "unusable secret key"
++#: g10/getkey.c:1735
+ #, c-format
msgid "Warning: not using '%s' as default key: %s\n"
- msgstr "ubrukelig hemmelig n�kkel"
+ msgstr "Advarsel: bruker ikke «%s» som forvalgt nøkkel: %s\n"
- #: g10/getkey.c:1694
- #, fuzzy, c-format
- #| msgid "unusable secret key"
++#: g10/getkey.c:1743
+ #, c-format
msgid "using \"%s\" as default secret key for signing\n"
- msgstr "ubrukelig hemmelig n�kkel"
+ msgstr "bruker «%s» som forvalgt hemmelig signeringsnøkkel\n"
- #: g10/getkey.c:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
- msgstr ""
+ msgstr "alle verdier som sendes til «%s» blir ignorert\n"
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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 "Ugyldig nøkkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
- #: g10/getkey.c:3323
++#: g10/getkey.c:3377
#, 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 "bruker undernøkkel %s i stedet for primærnøkkel %s\n"
- #: g10/gpg.c:409 sm/gpgsm.c:198
- #, fuzzy
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
- msgstr "|[fil]|lage en signatur"
+ msgstr "lag signatur"
- #: g10/gpg.c:410
- #, fuzzy
++#: g10/gpg.c:418
msgid "make a clear text signature"
- msgstr "|[fil]|lage en klartekstsignatur"
+ msgstr "lag klartekst-signatur"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
- msgstr "lage en adskilt signatur"
+ msgstr "lag adskilt signatur"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
- msgstr "kryptere data"
+ msgstr "krypter data"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
- msgstr "kryptering med bare symmetrisk cipher"
+ msgstr "krypter data (symmetrisk)"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
- msgstr "dekryptere data (standard)"
+ msgstr "dekrypter data (forvalgt)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
- msgstr "bekrefte en signatur"
+ msgstr "bekreft signatur"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
- msgstr "liste n�kler"
+ msgstr "vis nøkler"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
- msgstr "liste n�kler og signaturer"
+ msgstr "vis nøkler og signaturer"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
- msgstr "vise og sjekke n�kkelsignaturer"
+ msgstr "vis og kontroller nøkkelsignaturer"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
- msgstr "liste n�kler og fingeravtrykk"
+ msgstr "vis nøkler og fingeravtrykk"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
- msgstr "liste hemmelige n�kler"
+ msgstr "vis hemmelige nøkler"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
- msgstr "generere et nytt n�kkelpar"
+ msgstr "lag nytt nøkkelpar"
- #: g10/gpg.c:429
- #, fuzzy
- #| msgid "generate a new key pair"
++#: g10/gpg.c:437
msgid "quickly generate a new key pair"
- msgstr "generere et nytt n�kkelpar"
+ msgstr "lag nytt nøkkelpar raskt"
- #: g10/gpg.c:431
- #, fuzzy
- #| msgid "generate a new key pair"
++#: g10/gpg.c:439
msgid "quickly add a new user-id"
- msgstr "generere et nytt n�kkelpar"
+ msgstr "legg til en ny bruker-ID raskt"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "quickly add a new user-id"
+ msgid "quickly revoke a user-id"
+ msgstr "legg til en ny bruker-ID raskt"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
- msgstr ""
+ msgstr "fullverdig generering av nøkkelpar"
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
- msgstr "generere et opphevingssertifikat"
+ msgstr "lag opphevelsessertifikat"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
- msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
+ msgstr "fjern nøkler fra offentlig nøkkelknippe"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
- msgstr "fjerne n�kler fra det hemmelige n�kkelknippet"
+ msgstr "fjern nøkler fra hemmelig nøkkelknippe"
- #: g10/gpg.c:441
- #, fuzzy
- #| msgid "sign a key"
++#: g10/gpg.c:451
msgid "quickly sign a key"
- msgstr "signere en n�kkel"
+ msgstr "hurtigsigner nøkkel"
- #: g10/gpg.c:443
- #, fuzzy
- #| msgid "sign a key locally"
++#: g10/gpg.c:453
msgid "quickly sign a key locally"
- msgstr "signere en n�kkel lokalt"
+ msgstr "hurtigsigner nøkkel lokalt"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
- msgstr "signere en n�kkel"
+ msgstr "signer nøkkel"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
- msgstr "signere en n�kkel lokalt"
+ msgstr "signer nøkkel lokalt"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
- msgstr "signere eller redigere en n�kkel"
+ msgstr "signer eller rediger nøkkel"
- #: g10/gpg.c:448 sm/gpgsm.c:231
- #, fuzzy
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
- msgstr "endre passfrasen"
+ msgstr "endre passordfrase"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
- msgstr "eksportere n�kler"
+ msgstr "eksporter nøkler"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
- msgstr "eksportere n�kler til en n�kkelserver"
+ msgstr "eksporter nøkler til nøkkeltjener"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
- msgstr "importere n�kler fra en n�kkelserver"
+ msgstr "importer nøkler fra nøkkeltjener"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
- msgstr "s�ke etter n�kler p� en n�kkelserver"
+ msgstr "søk etter nøkler på nøkkeltjener"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
- msgstr "oppdatere alle n�klene fra en n�kkelserver"
+ msgstr "oppdater alle nøkler fra nøkkeltjener"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
- msgstr "importere/flette n�kler"
+ msgstr "importer/slå sammen nøkler"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
- msgstr "vis kortets status"
+ msgstr "vis kortstatus"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
- msgstr "endre data p� et kort"
+ msgstr "endre data på kort"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
- msgstr "endre PIN p� et kort"
+ msgstr "endre PIN på kort"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
- msgstr "oppdatere tillitsdatabasen"
+ msgstr "oppdater tillitsdatabase"
- #: g10/gpg.c:488
- #, fuzzy
++#: g10/gpg.c:498
msgid "print message digests"
- msgstr "|algo [filer]|skrive meldingsdigester"
+ msgstr "skriv ut kontrollsum av melding"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
- msgstr ""
+ msgstr "kjør i tjenermodus"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
- msgstr ""
+ msgstr "|VERDI|endre TOFU-regler for nøkkel"
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
- msgstr "lage ASCII-beskyttet output"
+ msgstr "lag ASCII-beskyttet utdata"
- #: g10/gpg.c:500 sm/gpgsm.c:260
- #, fuzzy
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
- msgstr "|NAVN|kryptere for NAVN"
+ msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
- #: g10/gpg.c:514 sm/gpgsm.c:296
- #, fuzzy
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
- msgstr "bruke denne brukeriden for signering eller dekryptering"
+ msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
- #: g10/gpg.c:519
- #, fuzzy
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
- msgstr "|N|sette kompresjonsniv� til N (0 sl�r av kompresjon)"
+ msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "bruk kanonisk tekstmodus"
- #: g10/gpg.c:542 sm/gpgsm.c:298
- #, fuzzy
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
- msgstr "leser valg fra �%s�\n"
+ msgstr "|FILE|skriv utdata til valgt FIL"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
- msgstr "ikke gj�r noen endringer"
+ msgstr "ikke utfør valgte endringer"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
- msgstr "sp�r f�r overskriving"
+ msgstr "spør før overskriving"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
- msgstr "bruk streng OpenPGP-oppf�rsel"
+ msgstr "bruk streng OpenPGP-oppførsel"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 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"
+ "(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2574,1020 -1904,769 +2480,976 @@@ 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"
+ " -se -r Bob [fil] signer og krypter for brukeren Bob\n"
+ " --clearsign [fil] lag klartekst-signatur\n"
+ " --detach-sign [fil] lag adskilt signatur\n"
+ " --list-keys [navn] vis nøkler\n"
+ " --fingerprint [navn] vis fingeravtrykk\n"
- #: g10/gpg.c:996
- #, fuzzy
- #| msgid "Usage: gpg [options] [files] (-h for help)"
++#: g10/gpg.c:1013
msgid "Usage: @GPG@ [options] [files] (-h for help)"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
- #: g10/gpg.c:999
- #, fuzzy
- #| msgid ""
- #| "Syntax: gpg [options] [files]\n"
- #| "sign, check, encrypt or decrypt\n"
- #| "default operation depends on the input data\n"
++#: g10/gpg.c:1016
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"
+ "Syntaks: gpg [valg] [filer]\n"
+ "Signer, kontroller, krypter eller dekrypter.\n"
+ "Forvalgt handling avhenger av inndata.\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
msgstr ""
"\n"
- "St�ttede algoritmer:\n"
+ "Støttede algoritmer:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
- msgstr "Offentlig n�kkel: "
+ msgstr "Off. nøkkel: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
- msgstr "Cipher: "
+ msgstr "Kryptering: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
- msgstr "Kompresjon: "
+ msgstr "Komprimering: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
- #, fuzzy, c-format
++#: g10/gpg.c:1120 sm/gpgsm.c:659
+ #, c-format
msgid "usage: %s [options] %s\n"
- msgstr "bruksm�te: gpg [valg] "
+ msgstr "bruk: %s [valg] %s\n"
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
- #: g10/gpg.c:1309
- #, fuzzy, c-format
- #| msgid "no = sign found in group definition `%s'\n"
++#: g10/gpg.c:1326
+ #, c-format
msgid "no = sign found in group definition '%s'\n"
- msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
+ msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
- #: g10/gpg.c:1507
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
++#: g10/gpg.c:1524
+ #, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
- msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
+ msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
- #: g10/gpg.c:1510
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
++#: g10/gpg.c:1527
+ #, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
- msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
+ msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
- #: g10/gpg.c:1513
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe ownership on extension `%s'\n"
++#: g10/gpg.c:1530
+ #, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
- msgstr "ADVARSEL: utrygt eierskap p� utvidelsen �%s�\n"
+ msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
- #: g10/gpg.c:1519
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
++#: g10/gpg.c:1536
+ #, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
- msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
+ msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
- #: g10/gpg.c:1522
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
++#: g10/gpg.c:1539
+ #, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
- msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
+ msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
- #: g10/gpg.c:1525
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe permissions on extension `%s'\n"
++#: g10/gpg.c:1542
+ #, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
- msgstr "ADVARSEL: utrygge rettigheter p� utvidelsen �%s�\n"
+ msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
- #: g10/gpg.c:1531
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
++#: g10/gpg.c:1548
+ #, 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"
+ msgstr "ADVARSEL: utrgt eierskap til foreldermapper av hjemmemappe «%s»\n"
- #: g10/gpg.c:1534
- #, fuzzy, c-format
- #| msgid ""
- #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
++#: g10/gpg.c:1551
+ #, 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"
+ msgstr "ADVARSEL: utrgt eierskap til foreldermapper av oppsettsfil «%s»\n"
- #: g10/gpg.c:1537
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
++#: g10/gpg.c:1554
+ #, 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"
+ msgstr "ADVARSEL: utrgt eierskap til foreldermapper av utvidelse «%s»\n"
- #: g10/gpg.c:1543
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
++#: g10/gpg.c:1560
+ #, 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"
+ msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av hjemmemappe «%s»\n"
- #: g10/gpg.c:1546
- #, fuzzy, c-format
- #| msgid ""
- #| "WARNING: unsafe enclosing directory permissions on configuration file `"
- #| "%s'\n"
++#: g10/gpg.c:1563
+ #, 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"
+ msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av oppsettsfil «%s»\n"
- #: g10/gpg.c:1549
- #, fuzzy, c-format
- #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
++#: g10/gpg.c:1566
+ #, 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"
+ msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av utvidelse «%s»\n"
- #: g10/gpg.c:1756
- #, fuzzy, c-format
- #| msgid "unknown configuration item `%s'\n"
++#: g10/gpg.c:1773
+ #, c-format
msgid "unknown configuration item '%s'\n"
- msgstr "ukjent konfigurasjonspunkt �%s�\n"
+ msgstr "oppsettselementet «%s» er ukjent\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
- msgstr ""
+ msgstr "vis foto-id-er i nøkkelvisning"
- #: g10/gpg.c:1865
- #, fuzzy
- #| msgid "show the keyring name in key listings"
++#: g10/gpg.c:1882
msgid "show key usage information during key listings"
- msgstr "vise navnet til n�kkelknippene i n�kkellister"
+ msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
msgid "show policy URLs during signature listings"
- msgstr ""
+ msgstr "vis regeladresser i signaturvisning"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
- msgstr ""
+ msgstr "vis alle notater i signaturvisning"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
- msgstr ""
+ msgstr "vis IETF-standardnotater under signaturvisning"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
- msgstr ""
+ msgstr "vis brukervalgte notater under signaturvisning"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
msgid "show preferred keyserver URLs during signature listings"
- msgstr ""
+ msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
- msgstr ""
+ msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
- msgstr ""
+ msgstr "vis opphevede og utgåtte bruker-id-er i nøkkelvisning"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
- msgstr ""
+ msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
msgid "show the keyring name in key listings"
- msgstr "vise navnet til n�kkelknippene i n�kkellister"
+ msgstr "vis nøkkelknippe-navn i nøkkelvisning"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
- msgstr ""
+ msgstr "vis utløpsdatoer i nøkkelvisning"
- #: g10/gpg.c:1989
- #, fuzzy
++#: g10/gpg.c:2006
msgid "available TOFU policies:\n"
- msgstr "utkoble en n�kkel"
+ msgstr "tilgjengelige TOFU-regler:\n"
- #: g10/gpg.c:2000
- #, fuzzy, c-format
- #| msgid "unknown option `%s'\n"
++#: g10/gpg.c:2017
+ #, c-format
msgid "unknown TOFU policy '%s'\n"
- msgstr "ukjent valg �%s�\n"
+ msgstr "«%s» er et ukjent TOFU-regelverk\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
- msgstr ""
+ msgstr "(bruk «help» for å vise valg)\n"
- #: g10/gpg.c:2024
- #, fuzzy, c-format
++#: g10/gpg.c:2041
+ #, c-format
msgid "unknown TOFU DB format '%s'\n"
- msgstr "ukjent valg �%s�\n"
+ msgstr "«%s» er et ukjent TOFU DB-format\n"
- #: g10/gpg.c:2091
- #, fuzzy, c-format
- #| msgid "NOTE: old default options file `%s' ignored\n"
++#: g10/gpg.c:2109
+ #, c-format
msgid "Note: old default options file '%s' ignored\n"
- msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
+ msgstr "Merk: gammel standardvalgfil «%s» ble ignorert\n"
- #: g10/gpg.c:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
- msgstr ""
+ msgstr "libgcrypt er for gammelt (krever %s, har %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
- #, fuzzy, c-format
- #| msgid "NOTE: %s is not for normal use!\n"
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
+ #, c-format
msgid "Note: %s is not for normal use!\n"
- msgstr "MERK: %s er ikke for vanlig bruk!\n"
+ msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
- # Tenk litt p� denne du, Trond.
- #: g10/gpg.c:2863 g10/gpg.c:2875
- #, fuzzy, c-format
- #| msgid "`%s' is not a valid signature expiration\n"
++#: g10/gpg.c:2907 g10/gpg.c:2919
+ #, c-format
msgid "'%s' is not a valid signature expiration\n"
- msgstr "�%s� er ikke en gyldig signaturutg�else\n"
+ msgstr "«%s» er en ugyldig signatur-utløpstid\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
- #, fuzzy, c-format
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
+ #, c-format
msgid "invalid pinentry mode '%s'\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
- #: g10/gpg.c:2969
- #, fuzzy, c-format
- #| msgid "`%s' is not a valid character set\n"
++#: g10/gpg.c:3013
+ #, c-format
msgid "'%s' is not a valid character set\n"
- msgstr "�%s� er ikke et gyldig tegnsett\n"
+ msgstr "«%s» er ikke et gyldig tegnsett\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
- msgstr "kunne ikke parse n�kkelserverens URL\n"
+ msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
- msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
+ msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
- msgstr "ugyldige valg for n�kkelserver\n"
+ msgstr "ugyldige nøkkeltjener-valg\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
- msgstr "%s:%d: ugyldige importvalg\n"
+ msgstr "%s:%d: ugyldige importeringsvalg\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
- msgstr "ugyldige importvalg\n"
+ msgstr "ugyldige importeringsvalg\n"
+
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "ugyldige listevalg\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
- msgstr "%s:%d: ugyldige eksportvalg\n"
+ msgstr "%s:%d: ugyldige eksporteringsvalg\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
- msgstr "ugyldige eksportvalg\n"
+ msgstr "ugyldige eksporteringsvalg\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listevalg\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "ugyldige listevalg\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
- msgstr ""
+ msgstr "vis bruker-ID under signaturbekreftelse"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
- msgstr ""
+ msgstr "vis adresser til retningslinjer under signaturbekreftelse"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
- msgstr ""
+ msgstr "vis alle merknader under signaturbekreftelse"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
- msgstr ""
+ msgstr "vis IETF-standardnotater under signaturbekreftelse"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
- msgstr ""
+ msgstr "vis selvvalgte merknader under signaturbekreftelse"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
- msgstr ""
+ msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
- msgstr ""
+ msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
- msgstr ""
+ msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
- msgstr ""
+ msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
- msgstr ""
+ msgstr "kontroller signaturer som har PKA-data"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
- msgstr ""
+ msgstr "øk tillitsnivå for signaturer med gyldige PKA-data"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
- msgstr "%s:%d: ugyldige valg for bekreftelse\n"
+ msgstr "%s:%d: ugyldige kontrollvalg\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
- msgstr "ugyldige valg for bekreftelse\n"
+ msgstr "ugyldige kontrollvalg\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
- msgstr "kunne ikke sette exec-path til %s\n"
+ msgstr "klarte ikke å endre «exec»-sti til %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
- msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
+ msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
- msgstr ""
+ msgstr "ugyldig «auto-key-locate»-liste\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
- msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
+ msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
- msgstr "%s er ikke tillatt sammen med %s!\n"
+ msgstr "du kan ikke bruke %s med %s.\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
- msgstr "%s er ikke fornuftig med %s!\n"
+ msgstr "%s gir ikke mening med %s.\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
- msgstr ""
+ msgstr "ADVARSEL: kjører med falsk systemtid: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, c-format
msgid "will not run with insecure memory due to %s\n"
- msgstr ""
+ msgstr "lar være å kjøre med usikret minne pga. %s\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
- msgstr "valg digestalgoritme er ugyldig\n"
+ msgstr "valg kontrollsum-algoritme er ugyldig\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
- msgstr "valgt kompresjonsalgoritme er ugyldig\n"
+ msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
- msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
+ msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
- msgstr "completes-needed m� v�re st�rre enn 0\n"
+ msgstr "«completes-needed» må være større enn 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
- msgstr "marginals-neede m� v�re st�rre enn 1\n"
+ msgstr "«marginals-needed» må være større enn 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
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 "«max-cert-depth» må være mellom 1 og 255\n"
- #: g10/gpg.c:3526
++#: g10/gpg.c:3599
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 "ugyldig «default-cert-level» (må være 0, 1, 2 eller 3)\n"
- #: g10/gpg.c:3528
++#: g10/gpg.c:3601
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 "ugyldig «min-cert-level» (må være 0, 1, 2 eller 3)\n"
- #: g10/gpg.c:3531
- #, fuzzy
- #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
++#: g10/gpg.c:3604
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
- msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
+ msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3608
msgid "invalid S2K mode; must be 0, 1 or 3\n"
- msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
+ msgstr "ugyldig S2K-modus (må være 0, 1 eller 3)\n"
- #: g10/gpg.c:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
- msgstr "ugyldig standard preferanser\n"
+ msgstr "ugyldig standardoppsett\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
- msgstr "ugyldig personlig cipherpreferanser\n"
+ msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
- msgstr "ugyldig personlig digestpreferanser\n"
+ msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
- msgstr "ugyldig personlig kompresjonspreferanser\n"
+ msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
- msgstr "%s virker ikke enn� med %s\n"
+ msgstr "%s virker ikke enda med %s\n"
- #: g10/gpg.c:3637
- #, fuzzy, c-format
- #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
++#: g10/gpg.c:3710
+ #, 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 "du kan ikke bruke krypteringsalgoritme «%s» i %s-modus\n"
- #: g10/gpg.c:3642
- #, fuzzy, c-format
- #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
++#: g10/gpg.c:3715
+ #, 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 "du kan ikke bruke summeringsalgoritme «%s» i %s-modus\n"
- #: g10/gpg.c:3647
- #, fuzzy, c-format
- #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
++#: g10/gpg.c:3720
+ #, 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 "du kan ikke bruke komprimeringsalgoritme «%s» i «%s»-modus\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
- msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
+ msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
msgid "WARNING: recipients (-r) given without using public key encryption\n"
- msgstr ""
- "ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
+ msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3822
- #, fuzzy, c-format
- #| msgid "symmetric encryption of `%s' failed: %s\n"
++#: g10/gpg.c:3897
+ #, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
- msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
+ msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
- msgstr ""
+ msgstr "du kan ikke bruke «--symmetric --encrypt» og «--s2k-mode 0» samtidig\n"
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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 "du kan ikke velge «--symmtric» og «--encrypt» i «%s»-modus\n"
- #: g10/gpg.c:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
+ "du kan ikke bruke «--symmetric --sign --encrypt» og «--s2k-mode 0» samtidig\n"
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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 "du kan ikke velge «--symmtric», «--sign» og «--encrypt» i «%s»-modus\n"
- #: g10/gpg.c:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
- msgstr "--sign-key brukerid"
+ msgstr "--sign-key bruker-ID"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
- msgstr "--lsign-key brukerid"
+ msgstr "--lsign-key bruker-ID"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
- msgstr "--edit-key brukerid [kommandoer]"
+ msgstr "--edit-key bruker-ID [kommandoer]"
- #: g10/gpg.c:4048
- #, fuzzy
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
- msgstr "--sign-key brukerid"
+ msgstr "--passwd <bruker-id>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
- msgstr "sending til n�kkelserver mislyktes: %s\n"
+ msgstr "sending til nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
- msgstr "mottak fra n�kkelserver mislyktes: %s\n"
+ msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
- msgstr "n�kkeleksport mislyktes: %s\n"
+ msgstr "nøkkeleksport mislyktes: %s\n"
- #: g10/gpg.c:4256
- #, fuzzy, c-format
- #| msgid "key export failed: %s\n"
++#: g10/gpg.c:4343
+ #, c-format
msgid "export as ssh key failed: %s\n"
- msgstr "n�kkeleksport mislyktes: %s\n"
+ msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
- msgstr "s�k p� n�kkelserver mislyktes: %s\n"
+ msgstr "søk på nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
- msgstr "refresh p� n�kkelserver mislyktes: %s\n"
+ msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
- #: g10/gpg.c:4451
- #, fuzzy, c-format
- #| msgid "invalid hash algorithm `%s'\n"
++#: g10/gpg.c:4538
+ #, c-format
msgid "invalid hash algorithm '%s'\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "«%s» er en ugyldig summeringsalgoritme\n"
- #: g10/gpg.c:4595
- #, fuzzy, c-format
++#: g10/gpg.c:4682
+ #, c-format
msgid "error parsing key specification '%s': %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
+ "«%s» ser hverken ut til å være en gyldig nøkkel-ID, fingeravtrykk eller "
+ "nøkkelgrep\n"
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
- msgstr "Sett i gang og tast inn meldingen din ...\n"
+ msgstr "Skriv inn melding …\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
- msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
+ msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
- msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
+ msgstr "valgt adresse for signaturregler er ugyldig\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
- msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
+ msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
+#: g10/gpgv.c:75
- #, fuzzy
msgid "|FILE|take the keys from the keyring FILE"
- msgstr "hent n�klene fra dette n�kkelknippet"
+ msgstr "|FIL|hent nøkler fra valgt nøkkelknippe-FIL"
+#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
- msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
+ msgstr "la konflikter mellom tidsstempler bare være en advarsel"
+#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
msgstr "|FD|skrive statusinfo til denne FD"
+#: g10/gpgv.c:83
msgid "|ALGO|reject signatures made with ALGO"
- msgstr ""
+ msgstr "|ALGO|avvis signaturer som er laget med valgt ALGOritme"
+#: g10/gpgv.c:120
msgid "Usage: gpgv [options] [files] (-h for help)"
- msgstr "Bruksm�te: gpgv [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: gpgv [valg] [filer] (-h for hjelp)"
+#: g10/gpgv.c:122
- #, fuzzy
msgid ""
"Syntax: gpgv [options] [files]\n"
"Check signatures against known trusted keys\n"
msgstr ""
- "Bruksm�te: gpgv [valg] [filer]\n"
- "Sjekke signaturer mot kjente betrodde n�kler\n"
+ "Syntaks: gpgv [valg] [filer]\n"
+ "Kontroller signaturer mot kjente troverdige nøkler\n"
+#: g10/helptext.c:72
msgid "No help available"
- msgstr ""
+ msgstr "Ingen hjelp tilgjengelig"
+#: g10/helptext.c:82
#, c-format
msgid "No help available for '%s'"
- msgstr ""
+ msgstr "Ingen hjelp tilgjengelig for «%s»"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
- msgstr ""
+ msgstr "importer signaturer som er merket som kun lokale"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
- msgstr ""
+ msgstr "reparer skader fra pks-nøkkeltjener under importering"
- #: g10/import.c:110
- #, fuzzy
- #| msgid "do not update the trustdb after import"
++#: g10/import.c:140
msgid "do not clear the ownertrust values during import"
- msgstr "ikke oppdat�r tillitsdatabasen etter import"
+ msgstr "ikke tøm «ownertrust»-verdier under importering"
- #: g10/import.c:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
- msgstr "ikke oppdat�r tillitsdatabasen etter import"
+ msgstr "ikke oppdater tillitsdatabase etter importering"
+
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "vise nøkkelens fingeravtrykk"
- #: g10/import.c:116
++#: g10/import.c:149
msgid "only accept updates to existing keys"
- msgstr ""
+ msgstr "bare godta oppdateringer av nøkler som finnes allerede"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
- msgstr ""
+ msgstr "fjern ubrukelige deler av nøkkel etter importering"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
+ msgstr "fjern så mye som mulig fra nøkkel etter importering"
+
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "hopper over blokk av typen %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
- msgstr "%lu n�kler behandlet hittil\n"
+ msgstr "%lu nøkler behandlet hittil\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antall behandlet: %lu\n"
- #: g10/import.c:433
- #, fuzzy, c-format
- #| msgid " skipped new keys: %lu\n"
++#: g10/import.c:609
+ #, c-format
msgid " skipped PGP-2 keys: %lu\n"
- msgstr "nye n�kler som ble hoppet over: %lu\n"
+ msgstr " hopper over PGP 2-nøkler: %lu\n"
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
- msgstr "nye n�kler som ble hoppet over: %lu\n"
+ msgstr " nye nøkler som ble hoppet over: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
- msgstr " uten brukerider: %lu\n"
+ msgstr " uten bruker-id-er: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
- msgstr " importert: %lu"
+ msgstr " importert: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
- msgstr " uendret: %lu\n"
+ msgstr " uendret: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
- msgstr " nye brukerider: %lu\n"
+ msgstr " nye bruker-id-er: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
- msgstr " nye undern�kler: %lu\n"
+ msgstr " nye undernøkler: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
- msgstr " nye signaturer: %lu\n"
+ msgstr " nye signaturer: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
- msgstr " nye n�kkelopphevinger: %lu\n"
+ msgstr " nye nøkkelopphevinger: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
- msgstr " leste hemmelige n�kler: %lu\n"
+ msgstr " leste hemmelige nøkler: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
- msgstr " importerte hemmelige n�kler: %lu\n"
+ msgstr " importerte hemmelige nøkler: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
- msgstr " uforandrede hemmelige n�kler: %lu\n"
+ msgstr " uforandrede hemmelige nøkler: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
- msgstr " ikke importert: %lu\n"
+ msgstr " ikke importert: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
- msgstr " oppryddete signaturer: %lu\n"
+ msgstr " oppryddete signaturer: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
- msgstr " oppryddete brukerider: %lu\n"
+ msgstr " tømte bruker-id-er: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
+ "ADVARSEL: nøkkelen %s inneholder innstillinger for\n"
+ "utilgjengelige algoritmer på følgende bruker-id-er:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
- msgstr ""
+ msgstr " «%s»: innstilling for krypteringsalgoritme %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
- msgstr " �%s� preferanse for digestalgoritme %s\n"
+ msgstr " «%s»: oppsett for kontrollsum-algoritme %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
- msgstr ""
+ msgstr " «%s»: oppsett av komprimeringsalgoritme %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
- msgstr ""
+ msgstr "du anbefales på det sterkeste å endre oppsett og\n"
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
+ "dele ut denne nøkkelen på nytt for å unngå potensielle problemer med "
+ "algoritme-samsvar\n"
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
+ "oppdater oppsettet med følgende kommando: gpg --edit-key %s updpref save\n"
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
- msgstr "n�kkel %s: ingen brukerid\n"
+ msgstr "nøkkel %s: ingen bruker-ID\n"
- #: g10/import.c:988
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
++#: g10/import.c:1233
+ #, c-format
msgid "key %s: %s\n"
- msgstr "hoppet over �%s�: %s\n"
+ msgstr "nøkkel %s: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
- msgstr ""
+ msgstr "avvist av importeringskontrollør"
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
- msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
+ msgstr "nøkkel %s: PKS-undernøkkel reparert\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
- msgstr "n�kkel %s: akseptert ikke-selvsignert brukerid �%s�\n"
+ msgstr "nøkkel %s: akseptert ikke-selvsignert bruker-ID «%s»\n"
- #: g10/import.c:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
- msgstr "n�kkel %s: ingen gyldig brukerid\n"
+ msgstr "nøkkel %s: ingen gyldig bruker-id-er\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
- msgstr "dette kan skyldes en manglende selvsignatur\n"
+ msgstr "dette kan skyldes manglende selvsignatur\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
- msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
+ msgstr "nøkkel %s: fant ikke offentlig nøkkel. %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
- msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
+ msgstr "nøkkel %s: ny nøkkel. Hoppet over\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
- msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
-
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "skriver til �%s�\n"
+ msgstr "fant ikke skrivbart nøkkelknippe. %s\n"
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
- #, fuzzy, c-format
- #| msgid "error writing keyring `%s': %s\n"
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
+ #, c-format
msgid "error writing keyring '%s': %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under skriving av nøkkelknippe «%s»: %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
- msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
+ msgstr "nøkkel %s: offentlig nøkkel «%s» importert\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
- msgstr "n�kkel %s: stemmer ikke med v�r kopi\n"
+ msgstr "nøkkel %s: stemmer ikke med vår kopi\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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 "nøkkel %s: finner ikke original nøkkelblokk: %s\n"
- #: g10/import.c:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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 "nøkkel %s: klarte ikke å lese opprinnelig nøkkelblokk. %s\n"
- #: g10/import.c:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
- msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
+ msgstr "nøkkel %s: «%s» 1 ny bruker-ID\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
- msgstr "n�kkel %s: �%s� %d nye brukerider\n"
+ msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
- msgstr "n�kkel %s: �%s� 1 ny signatur\n"
+ msgstr "nøkkel %s: «%s» 1 ny signatur\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
- msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+ msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
- msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
+ msgstr "nøkkel %s: «%s» 1 ny undernøkkel\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
- msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
+ msgstr "nøkkel %s: «%s» %d nye undernøkler\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
- msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+ msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
- msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
+ msgstr "nøkkel: %s: «%s» %d nye signaturer\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
- msgstr "n�kkel %s: �%s� %d nye brukerider\n"
+ msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
- msgstr "n�kkel %s: �%s� %d nye brukerider\n"
+ msgstr "nøkkel %s: «%s» %d nye bruker-id-er\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
- msgstr "n�kkel %s: �%s� ikke endret\n"
+ msgstr "nøkkel %s: «%s» ikke endret\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
- msgstr "n�kkel %s: hemmelig n�kkel importert\n"
+ msgstr "nøkkel %s: hemmelig nøkkel importert\n"
- #: g10/import.c:1570
- #, fuzzy, c-format
- #| msgid "key %s: secret key imported\n"
++#: g10/import.c:1858
+ #, c-format
msgid "key %s: secret key already exists\n"
- msgstr "n�kkel %s: hemmelig n�kkel importert\n"
+ msgstr "nøkkel %s: hemmelig nøkkel finnes allerede\n"
- #: g10/import.c:1578
- #, fuzzy, c-format
++#: g10/import.c:1866
+ #, c-format
msgid "key %s: error sending to agent: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "nøkkel %s: feil under sending til agent: %s\n"
- #: g10/import.c:1683
- #, fuzzy, c-format
- #| msgid "secret key \"%s\" not found: %s\n"
++#: g10/import.c:1971
+ #, c-format
msgid "secret key %s: %s\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "hemmelig nøkkel %s: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
- msgstr "import av hemmelig n�kkel er ikke tillatt\n"
+ msgstr "importering av hemmelig nøkkel er ikke tillatt\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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 ""
+ "nøkkel %s: hemmelig nøkkel med ugyldig krypteringsmetode %d - hoppet over\n"
#. TRANSLATORS: For smartcard, each private key on
#. host has a reference (stub) to a smartcard and
@@@ -3599,1243 -2678,993 +3461,1258 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
- msgstr ""
+ msgstr "Kjør følgende kommando for å flytte «%s»: %s\n"
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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"
+ "nøkkel %s: offentlig nøkkel mangler. Klarte ikke å bruke "
+ "opphevelsessertifikat\n"
- #: g10/import.c:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
- msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+ msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
- msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
+ msgstr "nøkkel %s: «%s» opphevingssertifikat importert\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
- msgstr "n�kkel %s: ingen brukerid for signatur\n"
+ msgstr "nøkkel %s: ingen bruker-ID for signatur\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, 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 ""
+ "nøkkel %s: offentlig nøkkelalgoritme for bruker-ID («%s») støttes ikke\n"
- #: g10/import.c:2025
++#: g10/import.c:2310
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
- msgstr "n�kkel %s: ugyldig selvsignatur for brukerid �%s�\n"
+ msgstr "nøkkel %s: ugyldig selvsignatur for bruker-ID «%s»\n"
- #: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
- msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
+ msgstr "nøkkel %s: ustøttet offentlig nøkkelalgoritme\n"
- #: g10/import.c:2043
- #, fuzzy, c-format
++#: g10/import.c:2328
+ #, c-format
msgid "key %s: invalid direct key signature\n"
- msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
+ msgstr "nøkkel %s: ugyldig direkte nøkkelsignatur\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
- msgstr "n�kkel %s: ingen undern�kkel for n�kkelbinding\n"
+ msgstr "nøkkel %s: ingen undernøkkel for nøkkelbinding\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
- msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
+ msgstr "nøkkel %s: ugyldig undernøkkelbinding\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
- msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
+ msgstr "nøkkel %s: fjernet flere undernøkkelbindinger\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, c-format
msgid "key %s: no subkey for key revocation\n"
- msgstr "n�kkel %s: ingen undern�kkel for n�kkeloppheving\n"
+ msgstr "nøkkel %s: ingen undernøkkel for nøkkeloppheving\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
- msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
+ msgstr "nøkkel %s: ugyldig undernøkkeloppheving\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
- msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
+ msgstr "nøkkel %s: fjernet flere undernøkkelopphevinger\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
- msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
+ msgstr "nøkkel %s: hoppet over bruker-ID «%s»\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
- msgstr "n�kkel %s: hoppet over undern�kkel\n"
+ msgstr "nøkkel %s: hoppet over undernøkkel\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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 "nøkkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
- #: g10/import.c:2244
++#: g10/import.c:2527
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
- msgstr "n�kkel %s: opphevingssertifikat p� feil plass - hoppet over\n"
+ msgstr "nøkkel %s: opphevingssertifikat på feil plass - hoppet over\n"
- #: g10/import.c:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
- msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
+ msgstr "nøkkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, 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 "nøkkel %s: undernøkkelsignatur på feil plass - hoppet over\n"
- #: g10/import.c:2284
++#: g10/import.c:2567
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
- msgstr "n�kkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
+ msgstr "nøkkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
- #: g10/import.c:2413
++#: g10/import.c:2696
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
- msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
+ msgstr "nøkkel %s: oppdaget duplisert bruker-ID. Slått sammen\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, 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 "ADVARSEL: nøkkel %s kan være opphevet: henter opphevingsnøkkel %s\n"
- #: g10/import.c:2493
++#: g10/import.c:2776
#, 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"
+ "ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
- #: g10/import.c:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
- msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
+ msgstr "nøkkel %s: «%s» opphevingssertifikat lagt til\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
- msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
+ msgstr "nøkkel %s: direkte nøkkelsignatur lagt til\n"
+#: g10/keydb.c:402 g10/keydb.c:429 sm/keydb.c:210 sm/keydb.c:223
- #, fuzzy, c-format
+ #, c-format
msgid "error creating keybox '%s': %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under opprettelse av nøkkelskrin «%s»: %s\n"
+#: g10/keydb.c:405 g10/keydb.c:432
- #, fuzzy, c-format
- #| msgid "error creating keyring `%s': %s\n"
+ #, c-format
msgid "error creating keyring '%s': %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under opprettelse av nøkkelknippe «%s»: %s\n"
+#: g10/keydb.c:441 sm/keydb.c:229
- #, fuzzy, c-format
+ #, c-format
msgid "keybox '%s' created\n"
- msgstr "n�kkelknippet �%s� ble opprettet\n"
+ msgstr "nøkkelskrin «%s» er opprettet\n"
+#: g10/keydb.c:443
- #, fuzzy, c-format
- #| msgid "keyring `%s' created\n"
+ #, c-format
msgid "keyring '%s' created\n"
- msgstr "n�kkelknippet �%s� ble opprettet\n"
+ msgstr "nøkkelknippe «%s» er opprettet\n"
+#: g10/keydb.c:822
- #, fuzzy, c-format
- #| msgid "keyblock resource `%s': %s\n"
+ #, c-format
msgid "keyblock resource '%s': %s\n"
- msgstr "n�kkelblokkressurs �%s�: %s\n"
+ msgstr "nøkkelblokkressurs «%s»: %s\n"
+#: g10/keydb.c:907
- #, fuzzy, c-format
+ #, c-format
msgid "error opening key DB: %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under åpning av nøkkeldatabase: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
- msgstr ""
+ msgstr "klarte ikke å bygge hurtiglager for nøkkelknippe på nytt. %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[revocation]"
msgstr "[oppheving]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[selvsignatur]"
- #: g10/keyedit.c:615
- #, fuzzy, c-format
- #| msgid "key %s: unsupported public key algorithm\n"
++#: g10/keyedit.c:618
+ #, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
- msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
+ msgstr ""
+ "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
+ "offentlig nøkkel (%d): %s.\n"
- #: g10/keyedit.c:624
- #, fuzzy, c-format
- #| msgid "card does not support digest algorithm %s\n"
++#: g10/keyedit.c:627
+ #, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
- msgstr "kortet st�tter ikke digestalgoritme %s\n"
+ msgstr ""
+ "klarte ikke å kontrollere signatur på grunn av ustøttet algoritme for "
+ "meldingssum (%d): %s.\n"
- #: g10/keyedit.c:786
- #, fuzzy
++#: g10/keyedit.c:789
msgid " (reordered signatures follow)"
- msgstr "God signatur fra �%s�"
+ msgstr " (omsorterte signaturer følger)"
- #: g10/keyedit.c:899
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
++#: g10/keyedit.c:902
+ #, c-format
msgid "key %s:\n"
- msgstr "hoppet over �%s�: %s\n"
+ msgstr "nøkkel %s:\n"
- #: g10/keyedit.c:902
- #, fuzzy, c-format
++#: g10/keyedit.c:905
+ #, 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] "%d duplikatsignatur fjernet\n"
+ msgstr[1] "%d duplikatsignaturer fjernet\n"
- #: g10/keyedit.c:905 g10/keylist.c:479
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to a missing key\n"
++#: g10/keyedit.c:908 g10/keylist.c:480
+ #, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
- msgstr[0] "1 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] "%d signatur ble ikke kontrollert på grunn av manglende nøkkel\n"
+ msgstr[1] "%d signaturer ble ikke kontrollert på grunn av manglende nøkkel\n"
- #: g10/keyedit.c:909 g10/keylist.c:475
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
++#: g10/keyedit.c:912 g10/keylist.c:476
+ #, c-format
msgid "%d bad signature\n"
msgid_plural "%d bad signatures\n"
- msgstr[0] "%d ubrukelige signaturer\n"
+ msgstr[0] "%d ubrukelig signatur\n"
msgstr[1] "%d ubrukelige signaturer\n"
- #: g10/keyedit.c:913
- #, fuzzy, c-format
++#: g10/keyedit.c:916
+ #, c-format
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] "%d signatur omsortert\n"
+ msgstr[1] "%d signaturer omsortert\n"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
+ "Advarsel: fant feil og kontrollerte bare selvsignaturer. Kjør «%s» for å "
+ "kontrollere alle signaturer.\n"
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
"(by looking at passports, checking fingerprints from different sources, "
"etc.)\n"
msgstr ""
- "Vennligst bestem hvor mye du tiltror denne brukeren korrekt � bekrefte\n"
- "andre brukeres n�kler (ved � se p� pass, sjekke fingeravtrykk fra\n"
+ "Velg hvor mye du stoler på at denne brukeren kan bekrefte\n"
+ "andre brukeres nøkler (ved å se på pass, sjekke fingeravtrykk fra\n"
"forskjellige kilder, osv.)\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Jeg stoler marginalt\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Jeg stoler fullt\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
+ "Skriv inn dybden av tillit du vil erklære med denne signaturen.\n"
+ "En dybde på over 1 tillater at nøkkelen du signerer\n"
+ "lager tillitssignaturer på dine vegne.\n"
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
+ "Skriv inn et domene som denne signaturen skal begrenses til, eller trykk "
+ "enter hvis ingen.\n"
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
- msgstr ""
+ msgstr "Hopper over bruker-ID «%s», som ikke er en tekst-iD.\n"
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
- msgstr "Brukerid �%s� er opphevet."
+ msgstr "Bruker-ID «%s» er opphevet."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
- msgstr "Er du fortsatt sikker p� at du vil signerere den? (j/N) "
+ msgstr "Er du sikker på at du vil signerere den? (j/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
- msgstr " Kunne ikke signere.\n"
+ msgstr " Klarte ikke å signere.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
- msgstr "Brukerid �%s� er utg�tt."
+ msgstr "Bruker-ID «%s» er utgått."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
- msgstr "Brukeriden �%s� er ikke selvsignert."
+ msgstr "Bruker-ID «%s» er ikke selvsignert."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
- msgstr "Brukeriden �%s� er signerbar."
+ msgstr "Bruker-ID «%s» er signerbar. "
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Signere den? (j/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
"is a PGP 2.x-style signature.\n"
msgstr ""
- "Selvsignaturen p� �%s�\n"
+ "Selvsignaturen på «%s»\n"
"er en PGP 2.x-aktig signatur.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, 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"
+ "Gjeldende signatur på «%s»\n"
+ "er utgått.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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 "Vil du utstede en ny signatur for å erstatte den som er utgått? (j/N) "
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr ""
- "Din n�v�rede signatur p� �%s�\n"
+ "Din nåværede signatur på «%s»\n"
"er en lokal signatur.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
- msgstr "�%s� var allerede lokalt signert av n�kkelen %s\n"
+ msgstr "«%s» var allerede lokalt signert med nøkkelen %s\n"
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
- msgstr "�%s� var allerede signert av n�kkelen %s\n"
+ msgstr "«%s» var allerede signert med nøkkelen %s\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
- msgstr "Vil du likevel signere den igjen? (j/N) "
+ msgstr "Vil du signere den på nytt likevel? (j/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
- msgstr "Ingenting � signere med n�kkelen %s\n"
+ msgstr "Ingenting å signere med nøkkelen %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
- msgstr "Denne n�kkelen er utg�tt!"
+ msgstr "Denne nøkkelen er utgått."
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
- msgstr "Denne n�kkelen utg�r den %s.\n"
+ msgstr "Denne nøkkelen utgår %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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 "Vil du at signaturen skal utgå på samme tidspunkt? (J/n) "
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
"to the person named above? If you don't know what to answer, enter \"0\".\n"
msgstr ""
- "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"
+ "Hvor nøyaktig har du bekreftet at nøkkelen du skal signere faktisk\n"
+ "tilhører den overnevnte personen? Skriv «0» hvis du ikke vet\n"
"svaret.\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jeg vil ikke svare.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, 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:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jeg har gjort en vanlig sjekk.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
- msgstr " (3) Jeg har sjekket veldig n�ye.%s\n"
+ msgstr " (3) Jeg har sjekket veldig nøye.%s\n"
- #: g10/keyedit.c:1480
- #, fuzzy
- #| msgid "Your selection? (enter `?' for more information): "
++#: g10/keyedit.c:1483
msgid "Your selection? (enter '?' for more information): "
- msgstr "Ditt valg? (angi �?� for mer informasjon): "
+ msgstr "Hva velger du? (skriv «?» for mer informasjon): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
"key \"%s\" (%s)\n"
msgstr ""
- "Er du virkelig sikker p� at du vil signerere denne n�kkelen med din\n"
- "n�kkel �%s� (%s)\n"
+ "Er du sikker på at du vil signerere denne nøkkelen med\n"
+ "nøkkelen «%s» (%s)\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
- msgstr "Dette vil v�re en selvsignatur.\n"
+ msgstr "Dette skal være en selvsignatur.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-exportable.\n"
- msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-eksporterbar.\n"
+ msgstr "ADVARSEL: signaturen blir ikke markert som ikke-eksporterbar.\n"
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
msgid "WARNING: the signature will not be marked as non-revocable.\n"
- msgstr "ADVARSEL: signaturen vil ikke bli markert som ikke-opphevbar.\n"
+ msgstr "ADVARSEL: signaturen blir ikke markert som ikke-opphevbar.\n"
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
- msgstr "Signaturen vil bli markert som ikke-eksporterbar.\n"
+ msgstr "Signaturen blir markert som ikke-eksporterbar.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
- msgstr "Signaturen vil bli markert som ikke-opphevbar.\n"
+ msgstr "Signaturen blir markert som ikke-opphevbar.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
- msgstr "Jeg har ikke sjekket denne n�kkelen i det hele tatt.\n"
+ msgstr "Jeg har ikke sjekket denne nøkkelen i det hele tatt.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
- msgstr "Jeg har sjekket denne n�kkelen p� vanlig m�te.\n"
+ msgstr "Jeg har sjekket denne nøkkelen på vanlig måte.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
- msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
+ msgstr "Jeg har sjekket denne nøkkelen veldig nøye.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
- msgstr "Virkelig signere? (j/N) "
+ msgstr "Er du sikker på at du vil signere? (j/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "signering mislyktes: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
+ "Nøkkelen har bare stubbe- eller kortnøkkel-elementer. Ingen passordfrase å "
+ "endre.\n"
- #: g10/keyedit.c:1741
- #, fuzzy, c-format
- #| msgid "error creating passphrase: %s\n"
++#: g10/keyedit.c:1744
+ #, c-format
msgid "key %s: error changing passphrase: %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "nøkkel %s: feil under endring av passordfrase: %s\n"
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "lagre og avslutte"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
- msgstr "vise n�kkelens fingeravtrykk"
+ msgstr "vise nøkkelens fingeravtrykk"
- #: g10/keyedit.c:1859
- #, fuzzy
- #| msgid "show this help"
++#: g10/keyedit.c:1862
msgid "show the keygrip"
- msgstr "vise denne hjelpen"
+ msgstr "vis nøkkelgrep"
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
- msgstr "liste n�kler og brukerider"
+ msgstr "vis nøkler og bruker-id-er"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
- msgstr "velger brukerid N"
+ msgstr "velger bruker-ID N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
- msgstr "velger brukerid N"
+ msgstr "velger bruker-ID N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "sjekke signaturer"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
- msgstr ""
+ msgstr "signer valgte bruker-id-er [* se nedenfor for relevante kommandoer]"
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
- msgstr "signerere utvalgte brukerider lokalt"
+ msgstr "signerer valgte bruker-id-er lokalt"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
- msgstr "signere utvalgte brukerider med en tillitssignatur"
+ msgstr "signer valgte bruker-id-er med tillitssignatur"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
+ "signer valgte bruker-id-er med en signatur som ikke kan trekkes tilbake"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
- msgstr "legge til en brukerid"
+ msgstr "legg til bruker-ID"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
- msgstr "legge til en fotoid"
+ msgstr "legg til foto-ID"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
- msgstr "slette utvalgte brukerider"
+ msgstr "slett valgte bruker-id-er"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
- msgstr "legge til en undern�kkel"
+ msgstr "legg til undernøkkel"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
- msgstr ""
+ msgstr "legg til nøkkel på et smartkort"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
- msgstr ""
+ msgstr "flytt nøkkel til et smartkort"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
- msgstr ""
+ msgstr "flytt en sikkerhetskopi-nøkkel til et smartkort"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
- msgstr "slette utvalgte undern�kler"
+ msgstr "slett valgte undernøkler"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
- msgstr "legge til en opphevingsn�kkel"
+ msgstr "legg til opphevingsnøkkel"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
- msgstr "slette signaturene fra de utvalgte brukeridene"
+ msgstr "slett signaturer fra valgte bruker-id-er"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
- msgstr ""
+ msgstr "endre utløpsdato for nøkkelen eller valgte undernøkler"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
- msgstr "markere den valgte brukeriden som den prim�re"
+ msgstr "marker valgt bruker-ID som primær"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
- msgstr "liste preferanser (ekspert)"
+ msgstr "vis innstillinger (avansert)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
- msgstr "liste preferanser (fyldig)"
+ msgstr "vis innstillinger (detaljert)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
- msgstr "sette preferanseliste for de valgte brukeridene"
+ msgstr "velg oppsettsliste for valgte bruker-id-er"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
msgid "set the preferred keyserver URL for the selected user IDs"
- msgstr "sette URL for foretrukket n�kkelserver for de valgte brukeridene"
+ msgstr "endre adresse til foretrukket nøkkeltjener for valgte bruker-id-er"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
- msgstr "sette en notasjon for de valgte brukeridene"
+ msgstr "endre notat for valgte bruker-id-er"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
- msgstr "endre passfrasen"
+ msgstr "endre passordfrase"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
- msgstr "endre eiertilliten"
+ msgstr "endre eiertillit"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
- msgstr "oppheve signaturene p� de valgte brukeridene"
+ msgstr "opphev signaturer på valgte bruker-id-er"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
- msgstr "oppheve utvalgte brukerider"
+ msgstr "opphev valgte bruker-id-er"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
- msgstr "oppheve n�kkel eller utvalgte undern�kler"
+ msgstr "opphev nøkkel eller valgte undernøkler"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
- msgstr "innkoble en n�kkel"
+ msgstr "ta nøkkel i bruk"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
- msgstr "utkoble en n�kkel"
+ msgstr "ta nøkkel ut av bruk"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
- msgstr "vise utvalgte fotoider"
+ msgstr "vis valgte foto-id-er"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
+ "pakkk sammen ubrukelige bruker-id-er og fjern ubrukelige signaturer fra "
+ "nøkkel"
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
+ "pakkk sammen ubrukelige bruker-id-er og fjern alle signaturer fra nøkkel"
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
- msgstr "Hemmelig n�kkel er tilgjengelig\n"
+ msgstr "Hemmelig nøkkel er tilgjengelig.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
- msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
+ msgstr "Du trenger tilhørende hemmelig nøkkel for å gjøre dette.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
" a 't' for trust signatures (tsign), an 'nr' for non-revocable signatures\n"
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
+ "* Kommandoen «sign» kan brukes med prefiks «l» for lokale signaturer "
+ "(lsign),\n"
+ " «t» for tillitssignaturer (tsign), «nr» for signaturer som ikke kan "
+ "oppheves\n"
+ " (nrsign), eller hvilken som helst kombinasjon av disse (ltsign, tnrsign, "
+ "osv.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
- msgstr "N�kkelen er opphevet."
+ msgstr "Nøkkelen er opphevet."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
- msgstr "Virkelig signerere alle brukerider? (j/N) "
+ msgstr "Er du sikekr på at du vil signerere alle bruker-id-er? (j/N) "
- #: g10/keyedit.c:2252
- #, fuzzy
- #| msgid "Really sign all user IDs? (y/N) "
++#: g10/keyedit.c:2255
msgid "Really sign all text user IDs? (y/N) "
- msgstr "Virkelig signerere alle brukerider? (j/N) "
+ msgstr "Er du sikker på at du vil signerere alle bruker-id-er? (j/N) "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
- msgstr "Tips: Velg brukeriden som skal signeres\n"
+ msgstr "Tips: Velg bruker-id-en(e) du vil signere\n"
- #: g10/keyedit.c:2271
- #, fuzzy, c-format
- #| msgid "Unknown signature type `%s'\n"
++#: g10/keyedit.c:2274
+ #, c-format
msgid "Unknown signature type '%s'\n"
- msgstr "Ukjent signaturtype �%s�\n"
+ msgstr "«%s» er en ukjent signaturtype\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
- msgstr "Du m� velge minst en brukerid.\n"
+ msgstr "Du må velge minst én bruker-ID.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
- msgstr ""
+ msgstr "(Bruk kommandoen «%s».)\n"
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
- msgstr "Du kan ikke slette den siste brukeriden!\n"
+ msgstr "Du kan ikke slette siste bruker-ID.\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
- msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
+ msgstr "Er du sikker på at du vil fjerne alle valgte bruker-id-er? (j/N) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
msgid "Really remove this user ID? (y/N) "
- msgstr "Virkelig fjerne denne brukeriden? (j/N) "
+ msgstr "Er du sikker på at du vil fjerne valgt bruker-ID? (j/N) "
#. TRANSLATORS: Please take care: This is about
#. moving the key and not about removing it.
- #: g10/keyedit.c:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
- msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
+ msgstr "Er du sikker på at du vil flytte primærnøkkelen? (j/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
- msgstr "Du m� velge minst en n�kkel.\n"
+ msgstr "Du må velge minst én nøkkel.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
- msgstr ""
+ msgstr "Kommandoen forventer et filnavn-argument\n"
- #: g10/keyedit.c:2443
- #, fuzzy, c-format
- #| msgid "Can't open `%s': %s\n"
++#: g10/keyedit.c:2446
+ #, c-format
msgid "Can't open '%s': %s\n"
- msgstr "Kan ikke �pne �%s�: %s\n"
+ msgstr "Klarte ikke å åpne «%s»: %s\n"
- #: g10/keyedit.c:2460
- #, fuzzy, c-format
- #| msgid "Error reading backup key from `%s': %s\n"
++#: g10/keyedit.c:2463
+ #, c-format
msgid "Error reading backup key from '%s': %s\n"
- msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
+ msgstr "Feil under lesing av sikkerhetskopi-nøkkel fra «%s»: %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
- msgstr "Du m� velge minst en n�kkel.\n"
+ msgstr "Du må velge minst én nøkkel.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
msgid "Do you really want to delete the selected keys? (y/N) "
- msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
+ msgstr "Er du sikker på at du vil slette valgt nøkkel? (j/N) "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
- msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
+ msgstr "Er du sikker på at du vil slette denne nøkkelen? (j/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
- msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
+ msgstr "Er du sikker på at du vil oppheve alle valgte bruker-id-er? (j/N) "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
- msgstr "Virkelig oppheve denne brukeriden? (j/N) "
+ msgstr "Er du sikker på at du vil oppheve denne bruker-id-en? (j/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
msgid "Do you really want to revoke the entire key? (y/N) "
- msgstr "Vil du virkelig oppheve hele n�kkelen? (j/N) "
+ msgstr "Er du sikker på at du vil oppheve hele nøkkelen? (j/N) "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
msgid "Do you really want to revoke the selected subkeys? (y/N) "
- msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
+ msgstr "Er du sikker på at du vil oppheve valgte undernøkler? (j/N) "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
- msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
+ msgstr "Er du sikker på at du vil oppheve denne undernøkkelen? (j/N) "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
+ "Du kan ikke justere eiertillit når du bruker selvvalgt tillitsdatabase\n"
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
- msgstr "sette preferanseliste til:\n"
+ msgstr "Bytt oppsettsliste til:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
msgid "Really update the preferences for the selected user IDs? (y/N) "
- msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
+ msgstr ""
+ "Er du sikker på at du vil oppdatere oppsett for valgte bruker-id-er? (j/N) "
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
- msgstr "Virkelig oppdatere preferansene? (j/N) "
+ msgstr "Er du sikker på at du vil oppdatere oppsett? (j/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
- msgstr "Lagre endringene? (j/N) "
+ msgstr "Vil du lagre endringer? (j/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
- msgstr "Avslutte uten � lagre? (j/N) "
+ msgstr "Vil du avslutte uten å lagre? (j/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "oppdatering mislyktes: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
- msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
+ msgstr "Nøkkelen ble ikke endret, så ingen oppdatering er nødvendig.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
#, fuzzy, c-format
- #| msgid "invalid fingerprint"
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Nøkkelgenerering mislyktes: %s\n"
+
++#: g10/keyedit.c:3070
+ #, c-format
msgid "\"%s\" is not a fingerprint\n"
- msgstr "ugyldig fingeravtrykk"
+ msgstr "«%s» er ikke et fingeravtrykk\n"
- #: g10/keyedit.c:2992
- #, fuzzy, c-format
++#: g10/keyedit.c:3099
+ #, c-format
msgid "\"%s\" is not the primary fingerprint\n"
- msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+ msgstr "«%s» er ikke primært fingeravtrykk\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
- #, fuzzy, c-format
- #| msgid "invalid value\n"
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
+ #, c-format
msgid "Invalid user ID '%s': %s\n"
- msgstr "ugyldig verdi\n"
+ msgstr "Bruker-ID «%s» er ugyldig: %s\n"
- #: g10/keyedit.c:3134
- #, fuzzy
- #| msgid "No such user ID.\n"
++#: g10/keyedit.c:3241
msgid "No matching user IDs."
- msgstr "Det finnes ingen slik brukerid.\n"
+ msgstr "Ingen treff på bruker-id-er."
- #: g10/keyedit.c:3134
- #, fuzzy
- #| msgid "Nothing to sign with key %s\n"
++#: g10/keyedit.c:3241
msgid "Nothing to sign.\n"
- msgstr "Ingenting � signere med n�kkelen %s\n"
+ msgstr "Ingenting å signere.\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
- msgstr "Digest: "
+ msgstr "Kontrollsum: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
- msgstr "S�rtrekk: "
+ msgstr "Funksjoner: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
- msgstr ""
+ msgstr "Nøkkeltjener no-modify"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
- msgstr ""
+ msgstr "Foretrukket nøkkeltjener: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Notasjoner: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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 "PGP 2.x-brukere har ingen oppsettsmuligheter.\n"
- #: g10/keyedit.c:3716
- #, fuzzy, c-format
++#: g10/keyedit.c:3823
+ #, 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 "Følgende nøkkel ble opphevet %s av %s med nøkkelen %s\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
#, 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 "Denne nøkkelen kan bli opphevet av %s med nøkkelen %s"
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(sensitiv)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "opprettet: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "opphevet: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "utgikk: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
- msgstr "utg�r: %s"
+ msgstr "utgår: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
- msgstr "bruksm�te: %s"
+ msgstr "bruk: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
- msgstr ""
+ msgstr "kortnr.: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "tillit: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "gyldighet: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
- msgstr "Denne n�kkelen har blitt utkoblet"
+ msgstr "Denne nøkkelen er ikke i bruk"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr ""
+ "Merk: du bør starte programmet på nytt for å sikre at nøkkel-gyldigheten\n"
+ "som vises her er riktig.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "opphevet"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
- msgstr "utg�tt"
+ msgstr "utgått"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
+ "ADVARSEL: ingen bruker-ID er merket som primær. Denne kommandoen kan\n"
+ " føre til at en annen bruker-ID blir brukt som primærbruker.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
- msgstr ""
+ msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
msgid "You may want to change its expiration date too.\n"
- msgstr ""
+ msgstr "Du bør vurdere å endre utløpsdato samtidig.\n"
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
" of PGP to reject this key.\n"
msgstr ""
+ "ADVARSEL: Dette er en PGP2-nøkkel. Hvis du legger til et foto-ID, kan det "
+ "føre til at\n"
+ " enkelte PGP-versjoner avviser nøkkelen.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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 "Er du sikker på at du vil legge den til? (j/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
msgid "You may not add a photo ID to a PGP2-style key.\n"
- msgstr ""
+ msgstr "Du kan ikke knytte foto-ID til PGP2-nøkler.\n"
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
- msgstr ""
+ msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Slette denne gode signaturen? (j/N/a)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
- msgstr ""
+ msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
- msgstr ""
+ msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
- msgstr ""
+ msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
- #: g10/keyedit.c:4342
- #, fuzzy, c-format
- #| msgid "Deleted %d signature.\n"
++#: g10/keyedit.c:4449
+ #, 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[1] "Slettet %d signaturer.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Ingen ble slettet.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "ugyldig"
- #: g10/keyedit.c:4383
- #, fuzzy, c-format
++#: g10/keyedit.c:4490
+ #, c-format
msgid "User ID \"%s\" compacted: %s\n"
- msgstr "brukerid �%s�: allerede renset\n"
+ msgstr "Bruker-ID «%s» pakket sammen: %s\n"
- #: g10/keyedit.c:4389
- #, fuzzy, c-format
++#: g10/keyedit.c:4496
+ #, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
- msgstr[0] "n�kkel: %s: �%s� %d nye signaturer\n"
- msgstr[1] "n�kkel: %s: �%s� %d nye signaturer\n"
+ msgstr[0] "Bruker-ID «%s»: %d signatur fjernet\n"
+ msgstr[1] "Bruker-ID «%s»: %d signaturer fjernet\n"
- #: g10/keyedit.c:4397
- #, fuzzy, c-format
++#: g10/keyedit.c:4504
+ #, c-format
msgid "User ID \"%s\": already minimized\n"
- msgstr "brukerid �%s�: allerede renset\n"
+ msgstr "Bruker-ID «%s»: allerede minimert\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
- msgstr "brukerid �%s�: allerede renset\n"
+ msgstr "Bruker-ID «%s»: allerede renset\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
" some versions of PGP to reject this key.\n"
msgstr ""
+ "ADVARSEL: Dette er en PGP 2.x-nøkkel. Hvis du legger til en opphever,\n"
+ " kan dette føre til at enkelte PGP-versjoner ikke vil kunne bruke "
+ "nøkkelen.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
- msgstr ""
+ msgstr "Du kan ikke knytte opphevere til PGP 2.x-nøkler.\n"
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
- msgstr ""
+ msgstr "Skriv inn oppheverens bruker-ID: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
- msgstr ""
+ msgstr "du kan ikke bruke PGP 2.x-nøkler som opphevere\n"
- #: g10/keyedit.c:4535
++#: g10/keyedit.c:4642
msgid "you cannot appoint a key as its own designated revoker\n"
- msgstr ""
+ msgstr "du kan ikke bruke en nøkkel som opphevelsesnøkkel for seg selv\n"
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
msgid "this key has already been designated as a revoker\n"
- msgstr ""
+ msgstr "denne nøkkelen er allerede i bruk som opphevelsesnøkkel\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
+ "ADVARSEL: du kan ikke angre tildeling av opphevelsesrolle til en nøkkel.\n"
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
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) "
+ msgstr "Er du sikker på at du vil gjøre denne nøkkelen til en opphever? (j/N) "
- #: g10/keyedit.c:4632
- #, fuzzy
- #| msgid ""
- #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
++#: g10/keyedit.c:4739
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
msgstr ""
- "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
- "N) "
+ "Er du sikker på at du vil endre utløpstid for flere undernøkler? (j/N) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
- msgstr ""
+ msgstr "Endrer utløpstid for undernøkkel.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
- msgstr ""
+ msgstr "Endrer utløpstid for primærnøkkel.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
msgid "You can't change the expiration date of a v3 key\n"
- msgstr ""
+ msgstr "Du kan ikke endre utløpsdato for v3-nøkler\n"
- #: g10/keyedit.c:4864
- #, fuzzy, c-format
++#: g10/keyedit.c:4971
+ #, c-format
msgid "signing subkey %s is already cross-certified\n"
- msgstr "Undern�kkel %s er allerede opphevet.\n"
+ msgstr "signerings-undernøkkel %s er allerede kryssertifisert\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
+ "undernøkkel %s signerer ikke, og behøver derfor ikke å bli kryssertifisert\n"
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
- msgstr ""
+ msgstr "Velg én bruker-ID.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
- msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
+ msgstr "hopper over v3-selvsignatur for bruker-ID «%s»\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
- msgstr ""
+ msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
- msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
+ msgstr "Er du sikker på at du vil erstatte den? (j/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
- msgstr "Er du sikker p� at du vil slette den? (j/N) "
+ msgstr "Er du sikker på at du vil slette den? (j/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
- msgstr ""
+ msgstr "Skriv inn notat: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
- msgstr ""
+ msgstr "Vil du fortsette? (j/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
- msgstr ""
+ msgstr "Ingen bruker-ID med indeks %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
- msgstr ""
+ msgstr "Ingen bruker-ID med kontrollsum %s\n"
- #: g10/keyedit.c:5716
- #, fuzzy, c-format
- #| msgid "Nothing to sign with key %s\n"
++#: g10/keyedit.c:5823
+ #, c-format
msgid "No subkey with key ID '%s'.\n"
- msgstr "Ingenting � signere med n�kkelen %s\n"
+ msgstr "Ingen undernøkkel med ID «%s».\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
- msgstr ""
+ msgstr "Ingen undernøkkel med indeks %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
- msgstr ""
+ msgstr "bruker-ID: «%s»\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
- msgstr ""
+ msgstr "signert med nøkkelen %s %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (ikke-eksporterbar)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
- msgstr "Denne signaturen utgikk den %s.\n"
+ msgstr "Denne signaturen utgikk %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
- msgstr ""
+ msgstr "Er du sikker på at du vil oppheve den? (j/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
- msgstr ""
+ msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
- msgstr ""
+ msgstr "Ikke signert av deg.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, c-format
msgid "You have signed these user IDs on key %s:\n"
- msgstr ""
+ msgstr "Du har signert disse bruker-id-ene med nøkkelen %s:\n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
- msgstr " (ikke-opphevbar)"
+ msgstr " (kan ikke oppheves)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
- msgstr ""
+ msgstr "opphevet med nøkkelen %s %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
- msgstr ""
+ msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
- msgstr ""
+ msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
- msgstr "ingen hemmelig n�kkel\n"
+ msgstr "ingen hemmelig nøkkel\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
- msgstr "brukerid �%s� er allerede opphevet\n"
+ msgstr "bruker-ID «%s» er allerede opphevet\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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 "ADVARSEL: en bruker-id-signatur er datert %d sekunder i fremtiden\n"
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
- msgstr "N�kkelen %s er allerede opphevet.\n"
+ msgstr "Nøkkelen %s er allerede opphevet.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
- msgstr "Undern�kkel %s er allerede opphevet.\n"
+ msgstr "Undernøkkel %s er allerede opphevet.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
- msgstr ""
+ msgstr "Viser %s foto-ID av størrelsen %ld for nøkkel %s (uid %d)\n"
+#: g10/keygen.c:295
- #, fuzzy, c-format
- #| msgid "preference `%s' duplicated\n"
+ #, c-format
msgid "preference '%s' duplicated\n"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "innstilling «%s» er duplisert\n"
+#: g10/keygen.c:302
msgid "too many cipher preferences\n"
- msgstr "for mange cipher-preferanser\n"
+ msgstr "for mange krypteringsinnstillinger\n"
+#: g10/keygen.c:304
msgid "too many digest preferences\n"
- msgstr "for mange digest-preferanser\n"
+ msgstr "for mange kontrollsum-innstillinger\n"
+#: g10/keygen.c:306
msgid "too many compression preferences\n"
- msgstr "for mange kompresjons-preferanser\n"
+ msgstr "for mange komprimeringsinnstillinger\n"
+#: g10/keygen.c:447
- #, fuzzy, c-format
- #| msgid "invalid item `%s' in preference string\n"
+ #, c-format
msgid "invalid item '%s' in preference string\n"
- msgstr "ugyldig oppf�ring �%s� i preferansestreng\n"
+ msgstr "«%s» er et ugyldig oppsettsvalg\n"
+#: g10/keygen.c:926
msgid "writing direct signature\n"
msgstr "skriver direkte signatur\n"
@@@ -4843,27 -3671,23 +4720,29 @@@
msgid "writing self signature\n"
msgstr "skriver selvsignatur\n"
+#: g10/keygen.c:1028
msgid "writing key binding signature\n"
- msgstr "skriver n�kkelbindende signatur\n"
+ msgstr "skriver nøkkelbindende signatur\n"
+#: g10/keygen.c:1391 g10/keygen.c:1396 g10/keygen.c:1448 g10/keygen.c:1453
+#: g10/keygen.c:1600 g10/keygen.c:1605
#, c-format
msgid "keysize invalid; using %u bits\n"
- msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
+ msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
+#: g10/keygen.c:1402 g10/keygen.c:1459 g10/keygen.c:1467 g10/keygen.c:1611
#, c-format
msgid "keysize rounded up to %u bits\n"
- msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
+ msgstr "nøkkelstørrelse rundet opp til %u bit\n"
+#: g10/keygen.c:1493
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
+ "ADVARSEL: noen OpenPGP-programmer klarer ikke å behandle DSA-nøkler med "
+ "denne kontrollsum-størrelsen\n"
+#: g10/keygen.c:1667
msgid "Sign"
msgstr "Signere"
@@@ -4897,50 -3717,40 +4776,50 @@@ msgstr "Autentisere
msgid "SsEeAaQq"
msgstr "SsKkAaQq"
+#: g10/keygen.c:1722
#, c-format
msgid "Possible actions for a %s key: "
- msgstr ""
+ msgstr "Mulige handlinger med en %s-nøkkel: "
+#: g10/keygen.c:1728
msgid "Current allowed actions: "
- msgstr ""
+ msgstr "Tillatte handlinger: "
+#: g10/keygen.c:1733
#, c-format
msgid " (%c) Toggle the sign capability\n"
- msgstr ""
+ msgstr " (%c) Slå av/på signeringsfunksjon\n"
+#: g10/keygen.c:1736
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
- msgstr ""
+ msgstr " (%c) Slå av/på krypteringsfunksjon\n"
+#: g10/keygen.c:1739
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
- msgstr ""
+ msgstr " (%c) Slå av/på autentiseringsfunksjon\n"
+#: g10/keygen.c:1742
#, c-format
msgid " (%c) Finished\n"
- msgstr ""
+ msgstr " (%c) Ferdig\n"
+#: g10/keygen.c:1871 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 "Velg hvilken type nøkkel du vil ha:\n"
+#: g10/keygen.c:1875
- #, fuzzy, c-format
+ #, c-format
msgid " (%d) RSA and RSA (default)\n"
- msgstr " (%d) DSA og ElGamal (standard)\n"
+ msgstr " (%d) RSA og RSA (standard)\n"
+#: g10/keygen.c:1879
- #, fuzzy, c-format
+ #, c-format
msgid " (%d) DSA and Elgamal\n"
- msgstr " (%d) DSA og ElGamal (standard)\n"
+ msgstr " (%d) DSA og Elgamal\n"
+#: g10/keygen.c:1881
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (bare signering)\n"
@@@ -4970,79 -3775,58 +4849,73 @@@ msgstr " (%d) DSA (sette dine egne mu
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (sette dine egne muligheter)\n"
+#: g10/keygen.c:1903
- #, fuzzy, c-format
+ #, c-format
msgid " (%d) ECC and ECC\n"
- msgstr " (%d) DSA og ElGamal (standard)\n"
+ msgstr " (%d) ECC og ECC\n"
+#: g10/keygen.c:1905
- #, fuzzy, c-format
- #| msgid " (%d) DSA (sign only)\n"
+ #, c-format
msgid " (%d) ECC (sign only)\n"
- msgstr " (%d) DSA (bare signering)\n"
+ msgstr " (%d) ECC (kun signering)\n"
+#: g10/keygen.c:1907
- #, fuzzy, c-format
- #| msgid " (%d) DSA (set your own capabilities)\n"
+ #, c-format
msgid " (%d) ECC (set your own capabilities)\n"
- msgstr " (%d) DSA (sette dine egne muligheter)\n"
+ msgstr " (%d) ECC (velg funksjoner selv)\n"
+#: g10/keygen.c:1909
- #, fuzzy, c-format
- #| msgid " (%d) RSA (encrypt only)\n"
+ #, c-format
msgid " (%d) ECC (encrypt only)\n"
- msgstr " (%d) RSA (bare kryptering)\n"
+ msgstr " (%d) ECC (kun kryptering)\n"
+#: g10/keygen.c:1913
- #, fuzzy, c-format
+ #, c-format
msgid " (%d) Existing key\n"
- msgstr " (2) Krypteringsn�kkel\n"
+ msgstr " (%d) Nøkkel\n"
+#: g10/keygen.c:2003 sm/certreqgen-ui.c:206
msgid "Enter the keygrip: "
- msgstr ""
+ msgstr "Skriv inn nøkkelgrep: "
+#: g10/keygen.c:2016 sm/certreqgen-ui.c:214
msgid "Not a valid keygrip (expecting 40 hex digits)\n"
- msgstr ""
+ msgstr "Ugyldig nøkkelgrep (forventer 40 heks-sifre)\n"
+#: g10/keygen.c:2018 sm/certreqgen-ui.c:216
msgid "No key with this keygrip\n"
- msgstr ""
+ msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
+#: g10/keygen.c:2092 g10/keygen.c:2106
- #, fuzzy, c-format
- #| msgid "rounded up to %u bits\n"
+ #, c-format
msgid "rounded to %u bits\n"
- msgstr "rundet opp til %u bits\n"
+ msgstr "rundet av til %u bit\n"
+#: g10/keygen.c:2147
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
- msgstr ""
+ msgstr "%s-nøkler må være mellom %u og %u bit lange.\n"
+#: g10/keygen.c:2155
- #, fuzzy, c-format
+ #, c-format
msgid "What keysize do you want for the subkey? (%u) "
- msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+ msgstr "Hvor stor vil du at undernøkkelen skal være? (%u) "
+#: g10/keygen.c:2158 sm/certreqgen-ui.c:183
#, c-format
msgid "What keysize do you want? (%u) "
- msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+ msgstr "Hvor stor skal nøkkelen være? (%u) "
+#: g10/keygen.c:2172 sm/certreqgen-ui.c:193
#, c-format
msgid "Requested keysize is %u bits\n"
- msgstr "�nsket n�kkelst�rrelse er %u bits\n"
+ msgstr "Forespurt nøkkelstørrelse er %u bit\n"
+#: g10/keygen.c:2217
- #, 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"
+ msgstr "Velg elliptisk kurve:\n"
+#: g10/keygen.c:2382
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@@ -5051,14 -3835,13 +4924,14 @@@
" <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"
+ "Velg hvor lenge nøkkelen skal være gyldig.\n"
+ " 0 = nøkkelen utgår ikke\n"
+ " <n> = nøkkelen utgår om n days\n"
+ " <n>w = nøkkelen utgår om n weeks\n"
+ " <n>m = nøkkelen utgår om n months\n"
+ " <n>y = nøkkelen utgår om n years\n"
+#: g10/keygen.c:2393
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@@ -5067,18 -3850,16 +4940,18 @@@
" <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"
+ "Velg hvor lenge signaturen skal være gyldig.\n"
+ " 0 = signaturen utgår ikke\n"
+ " <n> = signaturen utgår om n days\n"
+ " <n>w = signaturen utgår om n weeks\n"
+ " <n>m = signaturen utgår om n months\n"
+ " <n>y = signaturen utgår om n years\n"
+#: g10/keygen.c:2416
msgid "Key is valid for? (0) "
- msgstr "N�kkelen er gyldig for? (0) "
+ msgstr "Nøkkelen er gyldig for? (0) "
+#: g10/keygen.c:2421
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "Signaturen er gyldig for? (%s) "
@@@ -5087,33 -3867,27 +4960,33 @@@
msgid "invalid value\n"
msgstr "ugyldig verdi\n"
+#: g10/keygen.c:2447
msgid "Key does not expire at all\n"
- msgstr "N�kkel utg�r ikke i det hele tatt\n"
+ msgstr "Nøkkel utgår ikke i det hele tatt\n"
+#: g10/keygen.c:2448
msgid "Signature does not expire at all\n"
- msgstr "Signaturen utg�r ikke i det hele tatt\n"
+ msgstr "Signaturen utgår ikke i det hele tatt\n"
+#: g10/keygen.c:2453
#, c-format
msgid "Key expires at %s\n"
- msgstr "N�kkel utg�r den %s\n"
+ msgstr "Nøkkel utgår %s\n"
+#: g10/keygen.c:2454
#, c-format
msgid "Signature expires at %s\n"
- msgstr "Signaturen utg�r den %s\n"
+ msgstr "Signaturen utgår %s\n"
+#: g10/keygen.c:2458
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
msgstr ""
- "Systemet ditt kan ikke vise datoer etter 2038.\n"
- "Likevel vil det bli h�ndtert korrekt opp til 2106.\n"
+ "Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
+ "Likevel håndteres det korrekt frem til 2106.\n"
+#: g10/keygen.c:2471
msgid "Is this correct? (y/N) "
msgstr "Er dette korrekt (j/N)? "
@@@ -5138,13 -3913,12 +5014,13 @@@ msgid "
"\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"
+ "Du trenger en bruker-ID for å identifisere nøkkelen din.\n"
+ "Programmet lageren bruker-ID ut fra fullt navn, kommentar og\n"
+ "e-postadresse, som f.keks. dette:\n"
+ " «Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>»\n"
"\n"
+#: g10/keygen.c:2573
msgid "Real name: "
msgstr "Fullt navn: "
@@@ -5152,28 -3925,22 +5028,28 @@@
msgid "Invalid character in name\n"
msgstr "Ugyldig tegn i navn\n"
+#: g10/keygen.c:2583
#, c-format
msgid "The characters '%s' and '%s' may not appear in name\n"
- msgstr ""
+ msgstr "Tegnene «%s» og «%s» kan ikke brukes i navn\n"
+#: g10/keygen.c:2587
msgid "Name may not start with a digit\n"
- msgstr "Navnet kan ikke starte med et siffer\n"
+ msgstr "Navn kan ikke begynne med siffer\n"
+#: g10/keygen.c:2590
msgid "Name must be at least 5 characters long\n"
- msgstr "Navnet m� v�re minst 5 tegn langt\n"
+ msgstr "Navnet må bestå av minst 5 tegn\n"
+#: g10/keygen.c:2600
msgid "Email address: "
- msgstr "Epostadresse: "
+ msgstr "E-postadresse: "
+#: g10/keygen.c:2606
msgid "Not a valid email address\n"
- msgstr "Ikke en gyldig epostadresse\n"
+ msgstr "Ugyldig e-postadresse\n"
+#: g10/keygen.c:2615
msgid "Comment: "
msgstr "Kommentar: "
@@@ -5181,27 -3947,22 +5057,25 @@@
msgid "Invalid character in comment\n"
msgstr "Ugyldig tegn i kommentar\n"
+#: g10/keygen.c:2657
- #, fuzzy, c-format
- #| msgid "You are using the `%s' character set.\n"
+ #, c-format
msgid "You are using the '%s' character set.\n"
- msgstr "Du bruker tegnsettet �%s�.\n"
+ msgstr "Du bruker tegnsettet «%s».\n"
+#: g10/keygen.c:2663
#, c-format
msgid ""
"You selected this USER-ID:\n"
" \"%s\"\n"
"\n"
msgstr ""
- "Du valgte denne brukeriden:\n"
- " �%s�\n"
+ "Du valgte denne bruker-id-en («USER-ID»):\n"
+ " «%s»\n"
"\n"
+#: g10/keygen.c:2668
msgid "Please don't put the email address into the real name or the comment\n"
- msgstr ""
- "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n"
+ msgstr "Ikk bruk e-postadresse som navn eller kommentar\n"
#. TRANSLATORS: These are the allowed answers in
#. lower and uppercase. Below you will find the matching
@@@ -5226,786 -3984,596 +5100,750 @@@ msgstr "Endre (N)avn, (K)ommentar, (E)p
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:2709
- #, 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? "
+ msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
+#: g10/keygen.c:2710
- #, 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? "
+ msgstr "Endre (N)avn, (E)postadresse eller (R)iktig/(A)vslutt? "
+#: g10/keygen.c:2729
msgid "Please correct the error first\n"
- msgstr "Vennligst korriger feilen f�rst\n"
+ msgstr "Rett opp feilen først\n"
+#: g10/keygen.c:2775
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
"disks) during the prime generation; this gives the random number\n"
"generator a better chance to gain enough entropy.\n"
msgstr ""
- "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"
+ "Vi må lage ganske mye vilkårlighetsdata. Du bør jobbe med\n"
+ "andre ting (skrive på tastaturet, flytte på musa, la\n"
+ "diskene jobbe) mens dette pågår. Da får\n"
+ "tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
- msgstr "N�kkelgenerering mislyktes: %s\n"
+ msgstr "Nøkkelgenerering mislyktes: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
" \"%s\"\n"
"\n"
msgstr ""
+ "Lager nøkkel for:\n"
+ " «%s»\n"
+ "\n"
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
- msgstr ""
+ msgstr "Vil du fortsette? (J/n) "
- #: g10/keygen.c:3599
- #, fuzzy, c-format
- #| msgid "key already exists\n"
++#: g10/keygen.c:3600
+ #, c-format
msgid "A key for \"%s\" already exists\n"
- msgstr "n�kkel finnes allerede\n"
+ msgstr "Det finnes allerede en nøkkel for «%s»\n"
- #: g10/keygen.c:3604
- #, fuzzy
- #| msgid "Use this key anyway? (y/N) "
++#: g10/keygen.c:3605
msgid "Create anyway? (y/N) "
- msgstr "Bruke denne n�kkelen likevel? (j/N) "
+ msgstr "Vil du lage nøkkel likevel? (j/N) "
- #: g10/keygen.c:3609
- #, fuzzy
- #| msgid "generating new key\n"
++#: g10/keygen.c:3610
msgid "creating anyway\n"
- msgstr "generere en ny n�kkel\n"
+ msgstr "lager likevel\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
+ "Merk: Bruk «%s %s» for å se et fullverdig dialogvindu for nøkkelgenerering.\n"
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
- msgstr "N�kkelgenereringen ble avbrutt.\n"
+ msgstr "Nøkkelgenerering ble avbrutt.\n"
- #: g10/keygen.c:3989
- #, fuzzy, c-format
- #| msgid "can't create backup file `%s': %s\n"
++#: g10/keygen.c:3996
+ #, c-format
msgid "can't create backup file '%s': %s\n"
- msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+ msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
- msgstr ""
+ msgstr "Merk: sikkerhetskopi av kortnøkkel lagret på «%s»\n"
- #: g10/keygen.c:4160 g10/keygen.c:4308
- #, fuzzy, c-format
- #| msgid "writing public key to `%s'\n"
++#: g10/keygen.c:4167 g10/keygen.c:4315
+ #, c-format
msgid "writing public key to '%s'\n"
- msgstr "skriver offentlig n�kkel til �%s�\n"
+ msgstr "skriver offentlig nøkkel til «%s»\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
- msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
+ msgstr "fant ikke skrivbart offentlig nøkkelknippe. %s\n"
- #: g10/keygen.c:4316
- #, fuzzy, c-format
- #| msgid "error writing public keyring `%s': %s\n"
++#: g10/keygen.c:4323
+ #, c-format
msgid "error writing public keyring '%s': %s\n"
- msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
+ msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
- msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
+ msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
msgstr ""
- "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"
+ "Merk at denne nøkkelen ikke kan brukes til kryptering. Du bør\n"
+ "vurdere å bruke kommandoen «--edit-key» for å lage en\n"
+ "undernøkkel til dette formålet.\n"
- # Er dette entallsformen av denne strengen?
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
- "n�kkel har blitt opprettet %lu sekund i fremtiden (time warp eller "
+ "nøkkel har blitt opprettet %lu sekund i fremtiden (time warp- eller "
"klokkeproblem)\n"
- # Er dette flertallsformen av denne og den forrige strengen?
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr ""
- "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
+ "nøkkel har blitt opprettet %lu sekunder i fremtiden (time warp- eller "
"klokkeproblem)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
- #, fuzzy
- #| msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
++#: g10/keygen.c:4580 g10/keygen.c:4754
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"
+ "Merk: det strider med OpenPGP-standarden å lage undernøkler for v3-nøkler\n"
- #: g10/keygen.c:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
- msgstr "Hemmelige deler av prim�rn�kkelen er ikke tilgjengelig.\n"
+ msgstr "Hemmelige deler av primærnøkkelen er ikke tilgjengelig.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
+ msgstr "Hemmelige deler av primærnøkkelen er lagret på kort.\n"
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
- msgstr "Virkelig opprette? (j/N)"
+ msgstr "Er du sikker på at du vil fortsette? (j/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
- msgstr ""
+ msgstr "aldri "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
- msgstr ""
+ msgstr "Regler for kritisk signatur: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
- msgstr ""
+ msgstr "Regler for signatur: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
- msgstr ""
+ msgstr "Kritisk foretrukket nøkkeltjener: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
- msgstr ""
+ msgstr "Kritisk signaturnotat: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
- msgstr ""
+ msgstr "Signaturnotat: "
- #: g10/keylist.c:471
- #, fuzzy, c-format
- #| msgid "%d bad signatures\n"
++#: g10/keylist.c:472
+ #, 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] "%d gyldig signatur\n"
+ msgstr[1] "%d gyldige signaturer\n"
- #: g10/keylist.c:484
- #, fuzzy, c-format
- #| msgid "1 signature not checked due to an error\n"
++#: g10/keylist.c:485
+ #, c-format
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
- msgstr[0] "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] "%d signatur ble ikke kontrollert på grunn av feil\n"
+ msgstr[1] "%d signaturer ble ikke kontrollert på grunn av feil\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "Advarsel: hoppet over %lu nøkkel pga. for høy størrelse\n"
+ msgstr[1] "Advarsel: hoppet over %lu nøkler pga. for høy størrelse\n"
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
- msgstr "N�kkelknippe"
-
- #: g10/keylist.c:936 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 "Nøkkelknippe"
- #: g10/keylist.c:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
- msgstr "Fingeravtrykk for prim�rn�kkel:"
+ msgstr "Fingeravtrykk for primærnøkkel:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
- msgstr " Fingeravtrykk for undern�kkel:"
+ msgstr " Fingeravtrykk for undernøkkel:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
- msgstr " Fingeravtrykk for prim�rn�kkel:"
+ msgstr " Fingeravtrykk for primærnøkkel:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
- msgstr " Fingeravstrykk for undern�kkel:"
+ msgstr " Fingeravstrykk for undernøkkel:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
- msgstr " N�kkelfingeravtrykk ="
+ msgstr " Nøkkelfingeravtrykk ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " Serienummer for kort ="
+#: g10/keyring.c:1489
- #, fuzzy, c-format
- #| msgid "caching keyring `%s'\n"
+ #, c-format
msgid "caching keyring '%s'\n"
- msgstr "cacher n�kkelknippet �%s�\n"
+ msgstr "hurtiglagrer nøkkelknippe «%s»\n"
+#: g10/keyring.c:1566
- #, fuzzy, c-format
- #| msgid "%lu keys cached so far (%lu signatures)\n"
+ #, c-format
msgid "%lu keys cached so far (%lu signature)\n"
msgid_plural "%lu keys cached so far (%lu signatures)\n"
- msgstr[0] "%lu n�kler cachet s� langt (%lu signaturer)\n"
- msgstr[1] "%lu n�kler cachet s� langt (%lu signaturer)\n"
+ msgstr[0] "%lu nøkler hurtiglagret så langt (%lu signatur)\n"
+ msgstr[1] "%lu nøkler hurtiglagret så langt (%lu signaturer)\n"
+#: g10/keyring.c:1582
#, c-format
msgid "%lu key cached"
msgid_plural "%lu keys cached"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "%lu nøkkel hurtiglagret"
+ msgstr[1] "%lu nøkler hurtiglagret"
+#: g10/keyring.c:1584
- #, fuzzy, c-format
- #| msgid "1 bad signature\n"
+ #, 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] " (%lu signatur)\n"
+ msgstr[1] " (%lu signaturer)\n"
+#: g10/keyring.c:1659
#, c-format
msgid "%s: keyring created\n"
- msgstr ""
+ msgstr "%s: laget nøkkelknippe\n"
+#: g10/keyserver.c:90
msgid "override proxy options set for dirmngr"
- msgstr ""
+ msgstr "overstyr mellomtjener-oppsett for dirmngr"
+#: g10/keyserver.c:92
msgid "include revoked keys in search results"
- msgstr ""
+ msgstr "ta med opphevede nøkler som søketreff"
+#: g10/keyserver.c:93
msgid "include subkeys when searching by key ID"
- msgstr ""
+ msgstr "ta med undernøkler ved søk på nøkkel-ID"
+#: g10/keyserver.c:95
msgid "override timeout options set for dirmngr"
- msgstr ""
+ msgstr "overstyr tidsavbrudd-oppsett for dirmngr"
+#: g10/keyserver.c:99
msgid "automatically retrieve keys when verifying signatures"
- msgstr ""
+ msgstr "hent nøkler automatisk ved bekreftelse av signaturer"
+#: g10/keyserver.c:101
msgid "honor the preferred keyserver URL set on the key"
- msgstr ""
+ msgstr "bruk nøklers foretrukne nøkkeltjener-adresse"
+#: g10/keyserver.c:103
msgid "honor the PKA record set on a key when retrieving keys"
- msgstr ""
+ msgstr "bruk nøklers PKA-oppføring når du henter dem"
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
msgid "disabled"
- msgstr "utkoblet"
+ msgstr "ikke i bruk"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
- msgstr ""
+ msgstr "Skriv inn tall, N)este, eller Q)uit (Avslutt) > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
- msgstr ""
+ msgstr "ugyldig nøkkeltjener-protokoll (us %d!=håndteringsprogram %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
- msgstr ""
+ msgstr "«%s» er ikke en nøkkel-ID, og blir hoppet over\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
- #, fuzzy, c-format
- #| msgid "refreshing %d keys from %s\n"
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
+ #, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
- msgstr[0] "oppfrisker %d n�kler fra %s\n"
- msgstr[1] "oppfrisker %d n�kler fra %s\n"
+ msgstr[0] "oppdaterer %d nøkkel fra %s\n"
+ msgstr[1] "oppdaterer %d nøkler fra %s\n"
- #: g10/keyserver.c:1424
++#: g10/keyserver.c:1426
#, 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 "ADVARSEL: klarte ikke å oppdatere nøkkel %s via %s: %s\n"
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
- msgstr "n�kkelen �%s� ble ikke funnet p� n�kkelserveren\n"
+ msgstr "fant ikke nøkkelen «%s» på nøkkeltjener\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
- msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
+ msgstr "fant ikke nøkkelen på nøkkeltjener\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
- msgstr ""
+ msgstr "ingen kjent nøkkeltjener (bruk valget «--keyserver»)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
- msgstr "ber om n�kkelen %s fra %s server %s\n"
+ msgstr "ber om nøkkelen %s fra %s tjener %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
- msgstr "ber om n�kkel %s fra %s\n"
+ msgstr "ber om nøkkelen %s fra %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
- #, fuzzy
- #| msgid "no keyserver action!\n"
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
msgid "no keyserver known\n"
- msgstr "ingen handling for n�kkelserver!\n"
+ msgstr "ingen kjent nøkkeltjener\n"
+
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "hoppet over «%s»: %s\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
- msgstr ""
+ msgstr "sender nøkkelen %s til %s\n"
- #: g10/keyserver.c:1862
- #, fuzzy, c-format
- #| msgid "requesting key %s from %s\n"
++#: g10/keyserver.c:1864
+ #, c-format
msgid "requesting key from '%s'\n"
- msgstr "ber om n�kkel %s fra %s\n"
+ msgstr "ber om nøkkel fra «%s»\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
- msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
+ msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
- msgstr "merkelig st�rrelse for en kryptert sesjonsn�kkel (%d)\n"
+ msgstr "merkelig størrelse for en kryptert sesjonsnøkkel (%d)\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
- msgstr ""
+ msgstr "%s kryptert øktnøkkel\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "passfrase er generert med en ukjent digest-algoritme %d\n"
+ msgstr "passordfrase generert med ukjent summeringsalgoritme %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
- msgstr "offentlig n�kkel er %s\n"
+ msgstr "offentlig nøkkel er %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
- msgstr "offentlig n�kkel-kryptert data: god DEK\n"
+ msgstr "offentlig nøkkel-kryptert data: god DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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 "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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
- msgstr " �%s�\n"
+ msgstr " «%s»\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
- msgstr "kryptert med %s-n�kkel, ID %s\n"
+ msgstr "kryptert med %s-nøkkel, ID %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
- msgstr "offentlig n�kkel-dekryptering mislyktes: %s\n"
+ msgstr "offentlig nøkkel-dekryptering mislyktes: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
- msgstr ""
+ msgstr "kryptert med %lu passordfraser\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
- msgstr ""
+ msgstr "kryptert med 1 passordfrase\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
- msgstr ""
+ msgstr "antar %s kryptert data\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
- msgstr ""
+ msgstr "IDEA-kryptering er utilgjengelig. Prøver å bruke %s i stedet\n"
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
- msgstr ""
+ msgstr "ADVARSEL: meldinga var ikke integritetsbeskyttet\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
- msgstr ""
+ msgstr "dekryptering ok\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
- msgstr ""
+ msgstr "ADVARSEL: kryptert melding er blitt manipulert.\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekryptering mislyktes: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
- msgstr ""
+ msgstr "Merk: senderen spesifiserte «kun for dine øyne»\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
- msgstr "opprinnelig filnavn=�%.*s�\n"
+ msgstr "opprinnelig filnavn=«%.*s»\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
- msgstr ""
+ msgstr "ADVARSEL: fant flere elementer i ren tekst\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
- msgstr ""
+ msgstr "selvstendig opphevelse - bruk «gpg --import» for å ta i bruk\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
- msgstr "ingen signatur ble funnet\n"
+ msgstr "fant ikke signatur\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
- msgstr "D�RLIG signatur fra �%s�"
+ msgstr "DÅRLIG signatur fra «%s»"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
- msgstr "Utg�tt signatur fra �%s�"
+ msgstr "Utgått signatur fra «%s»"
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
- msgstr "God signatur fra �%s�"
+ msgstr "God signatur fra «%s»"
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
- msgstr ""
+ msgstr "signaturbekreftelse ble hindret\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
- msgstr ""
+ msgstr "disse flertydige signaturdataene kan ikke behandles\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur opprettet %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
- msgstr " bruker %s n�kkel %s\n"
+ msgstr " bruker %s nøkkel %s\n"
- #: g10/mainproc.c:1727
++#: 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 "Signatur laget %s ved hjelp av %s-nøkkel ID %s\n"
- #: g10/mainproc.c:1746
++#: g10/mainproc.c:1744
msgid "Key available at: "
- msgstr "N�kkel tilgjengelig ved: "
+ msgstr "Nøkkel tilgjengelig ved: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[usikker]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
- msgstr " aka �%s�"
+ msgstr " aka «%s»"
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
- msgstr "Signatur utg�tt %s\n"
+ msgstr "Signatur utgått %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
- msgstr "Signatur utg�r %s\n"
+ msgstr "Signatur utgår %s\n"
- #: g10/mainproc.c:2118
- #, fuzzy, c-format
- #| msgid "%s signature, digest algorithm %s\n"
++#: g10/mainproc.c:2123
+ #, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
- msgstr "%s signatur, digestalgoritme %s\n"
+ msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
msgid "binary"
- msgstr "bin�r"
+ msgstr "binær"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "tekstmodus"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "ukjent"
- #: g10/mainproc.c:2122
- #, fuzzy
- #| msgid "unknown pubkey algorithm"
++#: g10/mainproc.c:2127
msgid ", key algorithm "
- msgstr "ukjent pubkey-algoritme"
+ msgstr ", nøkkelalgoritme"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
- msgstr ""
+ msgstr "ADVARSEL: ikke en separat signatur. Fila «%s» er IKKE bekreftet.\n"
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
- msgstr ""
+ msgstr "Klarte ikke å kontrollere signatur: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
- msgstr ""
+ msgstr "ikke en separat signatur\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
- msgstr ""
+ msgstr "ADVARSEL: fant flere signaturer. Kontrollerer bare den første.\n"
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
- msgstr ""
+ msgstr "separat signatur av klasse 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
- msgstr ""
+ msgstr "gammeldags (PGP 2.x) signatur\n"
+#: g10/misc.c:101 g10/misc.c:131 g10/misc.c:207
- #, fuzzy, c-format
- #| msgid "fstat(%d) failed in %s: %s\n"
+ #, c-format
msgid "fstat of '%s' failed in %s: %s\n"
- msgstr "fstat(%d) mislyktes in %s: %s\n"
+ msgstr "fstat på «%s» mislyktes i %s: %s\n"
+#: 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:279
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
- msgstr "ADVARSEL: bruker eksperimentell offentlig n�kkel-algoritme %s\n"
+ msgstr "ADVARSEL: bruker eksperimentell offentlig nøkkel-algoritme %s\n"
+#: g10/misc.c:286
- #, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
- msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
+ msgstr "ADVARSEL: «Elgamal»-nøkler er utgått\n"
+#: g10/misc.c:300
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
- msgstr "ADVARSEL: bruker eksperimentell cipheralgoritme %s\n"
+ msgstr "ADVARSEL: bruker eksperimentell krypteringsalgoritme %s\n"
+#: g10/misc.c:319
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
- msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
+ msgstr "ADVARSEL: bruker eksperimentell kontrollsum-algoritme %s\n"
+#: g10/misc.c:328
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
- msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
+ msgstr "ADVARSEL: kontrollsum-algoritmen «%s» er utgått\n"
+#: g10/misc.c:353
- #, fuzzy, c-format
- #| msgid "%s signature, digest algorithm %s\n"
+ #, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
- msgstr "%s signatur, digestalgoritme %s\n"
+ msgstr "Merk: signaturer som bruker algoritmen %s blir avvist\n"
+#: g10/misc.c:375
- #, fuzzy, c-format
- #| msgid "read error in `%s': %s\n"
+ #, c-format
msgid "(reported error: %s)\n"
- msgstr "lesefeil ved �%s�: %s\n"
+ msgstr "(rapportert feil: %s)\n"
+#: g10/misc.c:378
- #, fuzzy, c-format
- #| msgid "read error in `%s': %s\n"
+ #, c-format
msgid "(reported error: %s <%s>)\n"
- msgstr "lesefeil ved �%s�: %s\n"
+ msgstr "(rapportert feil: %s <%s>)\n"
+#: g10/misc.c:397
msgid "(further info: "
- msgstr ""
+ msgstr "(mer info: "
+#: g10/misc.c:1056
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
- msgstr ""
+ msgstr "%s:%d: valget «%s» er utgått\n"
+#: g10/misc.c:1060
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
- msgstr ""
+ msgstr "ADVARSEL: valget «%s» er utgått\n"
+#: g10/misc.c:1062
#, c-format
msgid "please use \"%s%s\" instead\n"
- msgstr ""
+ msgstr "bruk heller «%s%s»\n"
+#: g10/misc.c:1069
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
- msgstr ""
+ msgstr "ADVARSEL: «%s» er en utgått kommando. Ikke bruk den\n"
+#: g10/misc.c:1079
#, c-format
msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
- msgstr ""
+ msgstr "%s:%u: «%s» er utgått i denne fila, og påvirker bare %s\n"
+#: g10/misc.c:1083
#, c-format
msgid ""
"WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
- msgstr ""
+ msgstr "ADVARSEL: valget «%s%s» er utgått, og påvirker bare %s\n"
+#: g10/misc.c:1147
msgid "Uncompressed"
- msgstr ""
+ msgstr "Ukomprimert"
#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:1172
msgid "uncompressed|none"
- msgstr ""
+ msgstr "ukomprimert|ingen"
+#: g10/misc.c:1292
#, c-format
msgid "this message may not be usable by %s\n"
- msgstr ""
+ msgstr "denne meldinga kan kanskje ikke brukes av %s\n"
+#: g10/misc.c:1467
- #, fuzzy, c-format
- #| msgid "ambiguous option `%s'\n"
+ #, c-format
msgid "ambiguous option '%s'\n"
- msgstr "flertydig valg �%s�\n"
+ msgstr "«%s» er et flertydig valg\n"
+#: g10/misc.c:1492
- #, fuzzy, c-format
- #| msgid "unknown option `%s'\n"
+ #, c-format
msgid "unknown option '%s'\n"
- msgstr "ukjent valg �%s�\n"
+ msgstr "«%s» er et ukjent valg\n"
+#: g10/misc.c:1730
msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
msgstr ""
+ "Offentlig ECDSA-nøkler forventes i SEC-koding som kan ganges med 8 bit\n"
+#: g10/misc.c:1752
- #, fuzzy, c-format
- #| msgid "Unknown signature type `%s'\n"
+ #, c-format
msgid "unknown weak digest '%s'\n"
- msgstr "Ukjent signaturtype �%s�\n"
+ msgstr "«%s» er en ukjent svak summeringsmetode\n"
+#: g10/openfile.c:84
- #, fuzzy, c-format
- #| msgid "File `%s' exists. "
+ #, c-format
msgid "File '%s' exists. "
- msgstr "Fila �%s� finnes. "
+ msgstr "Fila «%s» finnes. "
+#: g10/openfile.c:88
msgid "Overwrite? (y/N) "
msgstr "Overskrive (j/N) "
+#: g10/openfile.c:123
#, c-format
msgid "%s: unknown suffix\n"
- msgstr ""
+ msgstr "%s: ukjent suffiks\n"
+#: g10/openfile.c:147
msgid "Enter new filename"
- msgstr "Tast inn nytt filnavn"
+ msgstr "Skriv inn nytt filnavn"
+#: g10/openfile.c:218
msgid "writing to stdout\n"
msgstr "skriver til stdout\n"
+#: g10/openfile.c:366
- #, fuzzy, c-format
- #| msgid "assuming signed data in `%s'\n"
+ #, c-format
msgid "assuming signed data in '%s'\n"
- msgstr "antar at signert data er i �%s�\n"
+ msgstr "antar signert data i «%s»\n"
+#: g10/openfile.c:457
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
+ #, c-format
msgid "new configuration file '%s' created\n"
- msgstr "ny konfigurasjonsfil �%s� ble opprettet\n"
+ msgstr "ny oppsettsfil «%s» opprettet\n"
+#: g10/openfile.c:498
- #, fuzzy, c-format
- #| msgid "WARNING: options in `%s' are not yet active during this run\n"
+ #, 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 "ADVARSEL: valgene i «%s» trer ikke i kraft for gjeldende programøkt\n"
+#: g10/parse-packet.c:257
#, c-format
msgid "can't handle public key algorithm %d\n"
- msgstr ""
+ msgstr "klarte ikke å håndtere offentlig nøkkelalgoritme %d\n"
+#: g10/parse-packet.c:1113
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
- msgstr ""
+ msgstr "ADVARSEL: det er usikkert å kryptere øktnøkkel symmetrisk\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
- msgstr ""
+ msgstr "underpakke %d er merket som kritisk\n"
+#: g10/passphrase.c:73 g10/passphrase.c:331 g10/passphrase.c:393
#, c-format
msgid "problem with the agent: %s\n"
- msgstr ""
+ msgstr "problem med agent: %s\n"
+#: g10/passphrase.c:270 g10/passphrase.c:504 g10/passphrase.c:658
#, c-format
msgid " (main key ID %s)"
- msgstr " (hovedn�kkelid %s)"
+ msgstr " (hovednøkkelid %s)"
+#: g10/passphrase.c:277
- #, fuzzy, c-format
+ #, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
"certificate:\n"
@@@ -6013,89 -4581,67 +5851,80 @@@
"%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"
+ "Skriv inn passordfrase for å låse opp hemmelig nøkkel til OpenPGP-"
+ "sertifikat:\n"
+ "«%.*s»\n"
+ "%u-bit %s-nøkkel, ID %s,\n"
+ "opprettet %s%s.\n"
+#: g10/passphrase.c:296
msgid "Enter passphrase\n"
- msgstr "Tast inn passfrase\n"
+ msgstr "Skriv inn passordfrase\n"
+#: g10/passphrase.c:325
msgid "cancelled by user\n"
- msgstr ""
+ msgstr "avbrutt av bruker\n"
+#: g10/passphrase.c:483
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr ""
- "Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
- "brukeren: �%s�\n"
+ "Du trenger en passordfrase for å låse opp hemmelig nøkkel for\n"
+ "brukeren «%s»\n"
+#: 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 "%u-bit %s-nøkkel, ID %s, opprettet %s"
+#: g10/passphrase.c:500
#, c-format
msgid " (subkey on main key ID %s)"
- msgstr ""
+ msgstr " (undernøkkel av hovednøkkel-ID %s)"
+#: 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"
+ msgstr "Skriv inn passordfrase for å låse opp hemmelig OpenPGP-nøkkel:"
+#: 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"
+ msgstr "Skriv inn passordfrase for å importere hemmelig OpenPGP-nøkkel:"
+#: 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"
+ msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-undernøkkel:"
+#: 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"
+ msgstr "Skriv inn passordfrase for å eksportere hemmelig OpenPGP-nøkkel:"
+#: 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) "
+ msgstr ""
+ "Er du sikker på at du vil slette følgende hemmelige OpenPGP-undernøkkel:"
+#: 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) "
+ msgstr "Er du sikker på at du vil slette følgende hemmelige OpenPGP-nøkkel:"
+#: g10/passphrase.c:694
- #, fuzzy, c-format
- #| msgid "%u-bit %s key, ID %s, created %s"
+ #, c-format
msgid ""
"%s\n"
"\"%.*s\"\n"
"%u-bit %s key, ID %s,\n"
"created %s%s.\n"
"%s"
- msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
+ msgstr ""
+ "%s\n"
+ "«%.*s»\n"
+ "%u-bit %s-nøkkel, ID %s,\n"
+ "opprettet %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"
@@@ -6103,61 -4649,51 +5932,64 @@@
"very large picture, your key will become very large as well!\n"
"Keeping the image close to 240x288 is a good size to use.\n"
msgstr ""
+ "\n"
+ "Velg et bilde som skal brukes som foto-ID. Bildet må være i JPEG-format.\n"
+ "Husk at bildet lagres som en del av den offentlige nøkkelen, og at\n"
+ "nøkkelstørrelsen derfor påvirkes av hvor stort bildet er.\n"
+ "En oppløsning på rundt 240x288 piksler er et godt utgangspunkt.\n"
+#: g10/photoid.c:99
msgid "Enter JPEG filename for photo ID: "
- msgstr ""
+ msgstr "Skriv inn JPEG-filnavn for foto-ID: "
+#: g10/photoid.c:120
- #, fuzzy, c-format
- #| msgid "unable to open JPEG file `%s': %s\n"
+ #, c-format
msgid "unable to open JPEG file '%s': %s\n"
- msgstr "kan ikke �pne JPEG-fil �%s�: %s\n"
+ msgstr "klarte ikke å åpne JPEG-fil «%s»: %s\n"
+#: g10/photoid.c:131
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
- msgstr ""
+ msgstr "Denne JPEG-fila er veldig stor (%d byte).\n"
+#: g10/photoid.c:133
msgid "Are you sure you want to use it? (y/N) "
- msgstr "Er du sikker p� at du vil bruke den? (j/N) "
+ msgstr "Er du sikker på at du vil bruke den? (j/N) "
+#: g10/photoid.c:149
- #, fuzzy, c-format
- #| msgid "`%s' is not a JPEG file\n"
+ #, c-format
msgid "'%s' is not a JPEG file\n"
- msgstr "�%s� er ikke et JPEG-fil\n"
+ msgstr "«%s» er ikke en JPEG-fil\n"
+#: g10/photoid.c:168
msgid "Is this photo correct (y/N/q)? "
- msgstr ""
+ msgstr "Er dette bildet riktig (j/N/q)? "
+#: g10/photoid.c:380
msgid "unable to display photo ID!\n"
- msgstr ""
+ msgstr "klarte ikke å vise foto-ID.\n"
+#: g10/pkclist.c:72 g10/revoke.c:757
msgid "No reason specified"
- msgstr "Ingen grunn er angitt"
+ msgstr "Ingen grunn oppgitt"
+#: g10/pkclist.c:74 g10/revoke.c:759
msgid "Key is superseded"
- msgstr "N�kkelen er overg�tt"
+ msgstr "Nøkkelen er overgått"
+#: g10/pkclist.c:76 g10/revoke.c:758
msgid "Key has been compromised"
- msgstr "N�kkelen har blitt kompromittert"
+ msgstr "Nøkkelen har blitt kompromittert"
+#: g10/pkclist.c:78 g10/revoke.c:760
msgid "Key is no longer used"
- msgstr "N�kkelen er ikke lengre i bruk"
+ msgstr "Nøkkelen er ikke lengre i bruk"
+#: g10/pkclist.c:80 g10/revoke.c:761
msgid "User ID is no longer valid"
- msgstr "Brukerid er ikke lengre gyldig"
+ msgstr "Bruker-ID er ikke lenger gyldig"
+#: g10/pkclist.c:84
msgid "reason for revocation: "
msgstr "grunnen for opphevelse: "
@@@ -6183,42 -4716,33 +6015,41 @@@ msgstr "iImMqQsS
msgid "No trust value assigned to:\n"
msgstr "Ingen tillitsverdi tilordnet til:\n"
+#: g10/pkclist.c:257
#, c-format
msgid " aka \"%s\"\n"
- msgstr " aka �%s�\n"
+ msgstr " aka «%s»\n"
+#: g10/pkclist.c:267
msgid ""
"How much do you trust that this key actually belongs to the named user?\n"
msgstr ""
- "Hvor mye stoler du p� at denne n�kkelen faktisk tilh�rer den angitte "
- "brukeren?\n"
+ "Hvor mye stoler du på at denne nøkkelen faktisk tilhører navngitt bruker?\n"
+#: g10/pkclist.c:282
#, 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:284
#, c-format
msgid " %d = I do NOT trust\n"
- msgstr " %d = Jeg stoler IKKE p� den\n"
+ msgstr " %d = Jeg stoler IKKE på den\n"
+#: g10/pkclist.c:290
#, c-format
msgid " %d = I trust ultimately\n"
- msgstr " %d = Jeg stoler fullstendig p� den\n"
+ msgstr " %d = Jeg stoler fullstendig på den\n"
+#: g10/pkclist.c:296
msgid " m = back to the main menu\n"
msgstr " m = tilbake til hovedmenyen\n"
+#: g10/pkclist.c:299
msgid " s = skip this key\n"
- msgstr " s = hopp over denne n�kkelen\n"
+ msgstr " s = hopp over denne nøkkelen\n"
+#: g10/pkclist.c:300
msgid " q = quit\n"
msgstr " q = avslutt\n"
@@@ -6228,122 -4751,98 +6059,123 @@@ msgid "
"The minimum trust level for this key is: %s\n"
"\n"
msgstr ""
+ "Laveste tillitsnivå for denne nøkkelen er: %s\n"
+ "\n"
+#: g10/pkclist.c:310 g10/revoke.c:786
msgid "Your decision? "
- msgstr "Valget ditt? "
+ msgstr "Hva velger du? "
+#: g10/pkclist.c:331
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 "Er du sikker på at du vil gi denne nøkkelen fullstendig tillit? (j/N) "
+#: g10/pkclist.c:345
msgid "Certificates leading to an ultimately trusted key:\n"
- msgstr "Sertifikater som f�rer til en fullstendig betrodd n�kkel:\n"
+ msgstr "Sertifikater som fører til en fullstendig betrodd nøkkel:\n"
+#: g10/pkclist.c:434
#, 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"
+ "%s: Det finnes ingen indikasjon på at denne nøkkelen faktisk tilhører "
+ "navngitt bruker\n"
+#: g10/pkclist.c:439
#, 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"
+ "%s: Det er begrenset indikasjon på at denne nøkkelen faktisk tilhører "
+ "navngitt bruker\n"
+#: g10/pkclist.c:445
msgid "This key probably belongs to the named user\n"
- msgstr "Denne n�kkelen tilh�rer sannsynligvis den angitte eieren\n"
+ msgstr "Denne nøkkelen tilhører sannsynligvis navngitt bruker\n"
+#: g10/pkclist.c:450
msgid "This key belongs to us\n"
- msgstr "denne n�kkelen tilh�rer oss\n"
+ msgstr "denne nøkkelen tilhører oss\n"
+#: g10/pkclist.c:476
msgid ""
"It is NOT certain that the key belongs to the person named\n"
"in the user ID. If you *really* know what you are doing,\n"
"you may answer the next question with yes.\n"
msgstr ""
- "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"
+ "Det er IKKE sikkert at nøkkelen tilhører personen som er navngitt i\n"
+ "bruker-id-en. Hvis du *virkelig* vet hva du gjør, kan du svare ja\n"
+ "på neste spørsmål.\n"
+#: g10/pkclist.c:495
msgid "Use this key anyway? (y/N) "
- msgstr "Bruke denne n�kkelen likevel? (j/N) "
+ msgstr "Vil du bruke denne nøkkelen likevel? (j/N) "
+#: g10/pkclist.c:545
msgid "WARNING: Using untrusted key!\n"
- msgstr "ADVARSEL: Bruker ubetrodd n�kkel!\n"
+ msgstr "ADVARSEL: du bruker en upålitelig nøkkel.\n"
+#: g10/pkclist.c:552
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"
+ "ADVARSEL: nøkkel %s kan være opphevet: opphevingsnøkkel %s ikke tilstede.\n"
+#: g10/pkclist.c:561
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"
+ msgstr "ADVARSEL: denne nøkkelen er opphevet.\n"
+#: g10/pkclist.c:564
msgid "WARNING: This key has been revoked by its owner!\n"
- msgstr "ADVARSEL: Denne n�kkelen har blitt opphevet av dens eier!\n"
+ msgstr "ADVARSEL: denne nøkkelen er opphevet av eieren.\n"
+#: g10/pkclist.c:565
msgid " This could mean that the signature is forged.\n"
msgstr " Dette kan bety at signaturen er falsk.\n"
+#: g10/pkclist.c:571
msgid "WARNING: This subkey has been revoked by its owner!\n"
- msgstr "ADVARSEL: Denne undern�kkelen har blitt opphevet av eieren!\n"
+ msgstr "ADVARSEL: denne undernøkkelen er opphevet av eieren.\n"
+#: g10/pkclist.c:576
msgid "Note: This key has been disabled.\n"
- msgstr "Merk: Denne n�kkelen har blitt utkoblet.\n"
+ msgstr "Merk: Denne nøkkelen er ikke i bruk.\n"
+#: g10/pkclist.c:596
#, c-format
msgid "Note: Verified signer's address is '%s'\n"
- msgstr ""
+ msgstr "Merk: Bekreftet signeringsadresse er «%s»\n"
+#: g10/pkclist.c:603
#, c-format
msgid "Note: Signer's address '%s' does not match DNS entry\n"
- msgstr ""
+ msgstr "Merk: Signeringsadresse «%s» samsvarer ikke med DNS-oppslag\n"
+#: g10/pkclist.c:615
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
- msgstr ""
+ msgstr "tillitsnivå oppjustert til «FULL» pga. gyldig PKA-info\n"
+#: g10/pkclist.c:623
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
- msgstr ""
+ msgstr "tillitsnivå nedjustert til «NEVER» (aldri) pga. ugyldig PKA-info\n"
+#: g10/pkclist.c:634
msgid "Note: This key has expired!\n"
- msgstr "Merk: Denne n�kkelen er utg�tt!\n"
+ msgstr "Merk: denne nøkkelen er utgått.\n"
+#: g10/pkclist.c:645
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"
+ "ADVARSEL: denne nøkkelen er ikke sertifisert med en tillitsverdig signatur.\n"
+#: g10/pkclist.c:647
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 " Det er ingen indikasjon på at signaturen tilhører eieren.\n"
+#: g10/pkclist.c:655
msgid "WARNING: We do NOT trust this key!\n"
- msgstr "ADVARSEL: Vi stoler IKKE p� denne n�kkelen!\n"
+ msgstr "ADVARSEL: vi stoler IKKE på denne nøkkelen.\n"
+#: g10/pkclist.c:656
msgid " The signature is probably a FORGERY.\n"
msgstr " Signaturen er sannsynligvis et FALSKNERI.\n"
@@@ -6351,221 -4849,170 +6183,216 @@@
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"
+ "ADVARSEL: denne nøkkelen er ikke sertifisert med tilstrekkelig "
+ "tillitsverdige signaturer.\n"
+#: g10/pkclist.c:666
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 " Det er ikke sikkert at signaturen tilhører brukeren.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppet over: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
- msgstr "%s: hoppet over: offentlig n�kkel er utkoblet\n"
+ msgstr "%s: hoppet over. Offentlig nøkkel er ikke i bruk\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
- msgstr "%s: hoppet over: offentlig n�kkel er allerede tilstede\n"
+ msgstr "%s: hoppet over: offentlig nøkkel er allerede tilstede\n"
- #: g10/pkclist.c:957
- #, fuzzy, c-format
- #| msgid "can't close `%s': %s\n"
++#: g10/pkclist.c:969
+ #, c-format
msgid "can't encrypt to '%s'\n"
- msgstr "kan ikke lukke �%s�: %s\n"
+ msgstr "klarte ikke å kryptere til «%s»\n"
- #: g10/pkclist.c:972
- #, fuzzy, c-format
++#: g10/pkclist.c:984
+ #, c-format
msgid "option '%s' given, but no valid default keys given\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "valgt «%s», men mangler gyldig forvalgt nøkkel\n"
- #: g10/pkclist.c:979
- #, fuzzy, c-format
++#: g10/pkclist.c:991
+ #, c-format
msgid "option '%s' given, but option '%s' not given\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "valgt «%s», men mangler valget «%s»\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
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 "Du skrev ikke inn en bruker-ID. (bruk evt. «-r»)\n"
- #: g10/pkclist.c:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
- msgstr ""
+ msgstr "Gjeldende mottakere:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
msgstr ""
"\n"
- "Tast inn brukeriden. Avslutt med en blank linje: "
+ "Skriv inn bruker-ID og avslutt med tom linje: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
- msgstr "Det finnes ingen slik brukerid.\n"
+ msgstr "Bruker-id-en finnes ikke.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
- msgstr "hoppet over: offentlig n�kkel allerede satt som standard mottaker\n"
+ msgstr "hoppet over: offentlig nøkkel allerede valgt som standardmottaker\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
- msgstr "Offentlig n�kkel er utkoblet.\n"
+ msgstr "Offentlig nøkkel er ikke i bruk.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
- msgstr "hoppet over: offentlig n�kkel er allerede satt\n"
+ msgstr "hoppet over: offentlig nøkkel er allerede valgt\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
- msgstr "ukjent standardmottaker �%s�\n"
+ msgstr "«%s» er en ukjent standardmottaker\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
- msgstr "ingen gyldige adressater\n"
+ msgstr "ingen gyldige mottakere\n"
- #: g10/pkclist.c:1611
- #, fuzzy, c-format
++#: g10/pkclist.c:1624
+ #, c-format
msgid "Note: key %s has no %s feature\n"
- msgstr "n�kkel %s: ingen brukerid\n"
+ msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
- #: g10/pkclist.c:1636
- #, fuzzy, c-format
++#: g10/pkclist.c:1649
+ #, c-format
msgid "Note: key %s has no preference for %s\n"
- msgstr "n�kkel %s: ingen brukerid\n"
+ msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
+#: g10/plaintext.c:84
msgid "data not saved; use option \"--output\" to save it\n"
- msgstr ""
+ msgstr "data ble ikke lagret. Bruk valget «--output» for å lagre\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
- msgstr ""
+ msgstr "Adskilt signatur.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
- msgstr ""
+ msgstr "Skriv inn navn på datafil: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
- msgstr ""
+ msgstr "leser std.innkanal …\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
- msgstr ""
+ msgstr "ingen signerte data\n"
- #: g10/plaintext.c:699
- #, fuzzy, c-format
++#: g10/plaintext.c:706
+ #, c-format
msgid "can't open signed data '%s'\n"
- msgstr "kan ikke �pne �%s�: %s\n"
+ msgstr "klarte ikke å åpne signert data «%s»\n"
- #: g10/plaintext.c:734
- #, fuzzy, c-format
++#: g10/plaintext.c:741
+ #, c-format
msgid "can't open signed data fd=%d: %s\n"
- msgstr "kan ikke �pne �%s�: %s\n"
+ msgstr "klarte ikke å åpne signert data fd=%d: «%s»\n"
+#: g10/pubkey-enc.c:116
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr ""
+ msgstr "anonym mottaker. prøver hemmelig nøkkel %s …\n"
+#: g10/pubkey-enc.c:123
msgid "okay, we are the anonymous recipient.\n"
- msgstr ""
+ msgstr "ok, det er du som er den anonyme mottakeren.\n"
+#: g10/pubkey-enc.c:282
msgid "old encoding of the DEK is not supported\n"
- msgstr ""
+ msgstr "gammel DEK-koding støttes ikke\n"
+#: g10/pubkey-enc.c:310
#, c-format
msgid "cipher algorithm %d%s is unknown or disabled\n"
- msgstr ""
+ msgstr "krypteringsalgoritme %d%s er ukjent eller slått av\n"
+#: 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"
+ msgstr "ADVARSEL: fant ikke krypteringsalgoritme %s i mottakers oppsett\n"
+#: g10/pubkey-enc.c:377
- #, fuzzy, c-format
- #| msgid "NOTE: secret key %s expired at %s\n"
+ #, c-format
msgid "Note: secret key %s expired at %s\n"
- msgstr "NOTIS: hemmelig n�kkel %s utgikk den %s\n"
+ msgstr "Merk: hemmelig nøkkel %s utgått %s\n"
+#: g10/pubkey-enc.c:384
- #, fuzzy
msgid "Note: key has been revoked"
- msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
+ msgstr "Merk: nøkkelen er opphevet"
+#: g10/revoke.c:101 g10/revoke.c:127 g10/revoke.c:173 g10/revoke.c:185
+#: g10/revoke.c:500
#, c-format
msgid "build_packet failed: %s\n"
- msgstr ""
+ msgstr "build_packet mislyktes. %s\n"
+#: g10/revoke.c:144
#, c-format
msgid "key %s has no user IDs\n"
- msgstr "n�kkel %s: ingen brukerid\n"
+ msgstr "nøkkel %s: ingen bruker-ID\n"
+#: g10/revoke.c:312
msgid "To be revoked by:\n"
- msgstr ""
+ msgstr "Skal oppheves av:\n"
+#: g10/revoke.c:316
msgid "(This is a sensitive revocation key)\n"
- msgstr ""
+ msgstr "(Dette er en privat opphevelsesnøkkel)\n"
+#: 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"
+ msgstr "Hemmelig nøkkel er ikke tilgjengelig.\n"
+#: 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 "Vil du lage et utpekt opphevelsessertifikat for denne nøkkelen? (j/N) "
+#: g10/revoke.c:336 g10/revoke.c:727
msgid "ASCII armored output forced.\n"
- msgstr ""
+ msgstr "Tvunget ASCII-armert utdata.\n"
+#: g10/revoke.c:352 g10/revoke.c:479
#, c-format
msgid "make_keysig_packet failed: %s\n"
- msgstr ""
+ msgstr "make_keysig_packet mislyktes: %s\n"
+#: g10/revoke.c:415
msgid "Revocation certificate created.\n"
- msgstr ""
+ msgstr "Opphevelsessertifikat opprettet.\n"
+#: g10/revoke.c:421
#, c-format
msgid "no revocation keys found for \"%s\"\n"
- msgstr ""
+ msgstr "fant ingen opphevelsesnøkler for «%s»\n"
+#: 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) "
+ msgstr "Dette er et opphevelsessertifikat for følgende OpenPGP-nøkkel:"
+#: 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 ""
+ "Et opphevelsessertifikat er en slags nødknapp som lar deg\n"
+ "\verklære offentlig at en nøkkel ikke skal brukes mer. Det er ikke mulig\n"
+ "å trekke tilbake en oppheving straks den er blitt publisert."
+#: g10/revoke.c:570
msgid ""
"Use it to revoke this key in case of a compromise or loss of\n"
"the secret key. However, if the secret key is still accessible,\n"
@@@ -6573,45 -5020,44 +6400,51 @@@
"a reason for the revocation. For details see the description of\n"
"of the gpg command \"--gen-revoke\" in the GnuPG manual."
msgstr ""
+ "Bruk det for å oppheve denne nøkkelen hvis den blir kompromittert\n"
+ "eller hvis du mister den hemmelige nøkkelen. Hvis du fremdeles har\n"
+ "tilgang til den hemmelige nøkkelen, er det lurt å heller lage et nytt\n"
+ "\vopphevelsessertifikat og oppgi en grunn til opphevelsen.\n"
+ "\vSe beskrivelse av kommandoen «--gen-revoke» i GnuPG-\n"
+ "bruksanvisninga for detaljer."
+#: g10/revoke.c:575
msgid ""
"To avoid an accidental use of this file, a colon has been inserted\n"
"before the 5 dashes below. Remove this colon with a text editor\n"
"before importing and publishing this revocation certificate."
msgstr ""
+ "Et kolontegn er satt inn før 5 streker nedenfor.\n"
+ "Fjern dette kolonet med en tekstbehandler før du importerer og\n"
+ "publiserer opphevelsessertifikatet."
+#: g10/revoke.c:590
- #, fuzzy, c-format
- #| msgid "key %s: \"%s\" revocation certificate imported\n"
+ #, c-format
msgid "revocation certificate stored as '%s.rev'\n"
- msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
+ msgstr "opphevelsessertifikat lagret som «%s.rev»\n"
+#: g10/revoke.c:634
- #, fuzzy, c-format
- #| msgid "secret key \"%s\" not found: %s\n"
+ #, c-format
msgid "secret key \"%s\" not found\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "fant ikke hemmelig nøkkel «%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:661
#, c-format
msgid "'%s' matches multiple secret keys:\n"
- msgstr ""
+ msgstr "«%s» samsvarer med flere hemmelige nøkler:\n"
+#: g10/revoke.c:688
- #, fuzzy, c-format
- #| msgid "error creating keyring `%s': %s\n"
+ #, c-format
msgid "error searching the keyring: %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under søk på nøkkelknippe: %s\n"
+#: 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 "Vil du lage et opphevelsessertifikat for denne nøkkelen? (j/N) "
+#: g10/revoke.c:735
msgid ""
"Revocation certificate created.\n"
"\n"
@@@ -6621,233 -5067,200 +6454,241 @@@
"your media become unreadable. But have some caution: The print system of\n"
"your machine might store the data and make it available to others!\n"
msgstr ""
+ "Opphevelsessertifikat opprettet.\n"
+ "\n"
+ "Flytt dette til et medium du kan holde utenfor andres rekkevidde. Hvis "
+ "Mallory\n"
+ "får tak i dette sertifikatet, kan han bruke det til å gjøre nøkkelen din "
+ "ubrukelig.\n"
+ "Det er lurt å skrive ut dette sertifikatet fysisk og sette det på et lager i "
+ "tilfelle\n"
+ "datalagringsmediet blir uleselig. Men vær forsiktig. Datamaskinens\n"
+ "utskriftssystem kan være satt opp til å lagre utskriftsdata og dermed gjøre\n"
+ "det mulig for andre å lese sertifikatet.\n"
+#: g10/revoke.c:769
msgid "Please select the reason for the revocation:\n"
- msgstr ""
+ msgstr "Velg grunn for opphevelse:\n"
+#: g10/revoke.c:779
msgid "Cancel"
- msgstr ""
+ msgstr "Avbryt"
+#: g10/revoke.c:781
#, c-format
msgid "(Probably you want to select %d here)\n"
- msgstr ""
+ msgstr "(Normalt bør du velge %d her)\n"
+#: g10/revoke.c:822
msgid "Enter an optional description; end it with an empty line:\n"
- msgstr ""
+ msgstr "Skriv inn en beskrivelse hvis du vil, og avslutt med tom linje:\n"
+#: g10/revoke.c:850
#, c-format
msgid "Reason for revocation: %s\n"
- msgstr ""
+ msgstr "Grunnlag for opphevelse: %s\n"
+#: g10/revoke.c:852
msgid "(No description given)\n"
- msgstr ""
+ msgstr "(Ingen beskrivelse oppgitt)\n"
+#: g10/revoke.c:857
msgid "Is this okay? (y/N) "
msgstr "Er dette i orden? (j/N) "
+#: 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 "nøkkelen ble svak. Prøver på nytt\n"
+#: 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"
+ "klarte ikke å unngå svak nøkkel for symmetrisk krypteringsalgorime. Prøvde "
+ "%d ganger.\n"
+#: g10/seskey.c:306
#, c-format
msgid "%s key %s uses an unsafe (%zu bit) hash\n"
- msgstr ""
+ msgstr "%s-nøkkel %s bruker usikker kontrollsum (%zu bit)\n"
+#: g10/seskey.c:324
#, c-format
msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
msgstr ""
+ "%s-nøkkel %s krever kontrollsum på %zu eller flere bit (gjeldende sum: %s)\n"
+#: g10/sig-check.c:116
msgid "WARNING: signature digest conflict in message\n"
- msgstr ""
+ msgstr "ADVARSEL: konflikt med signatur-kontrollsum i melding\n"
+#: g10/sig-check.c:143
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
- msgstr ""
+ msgstr "ADVARSEL: undernøkkel %s for signering er ikke kryssertifisert\n"
+#: g10/sig-check.c:145
#, c-format
msgid "please see %s for more information\n"
- msgstr "vennligst se %s for mer informasjon\n"
+ msgstr "se %s for mer informasjon\n"
+#: g10/sig-check.c:155
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr ""
+ "ADVARSEL: undernøkkel %s for signering er kryssertifisert på ugyldig "
+ "grunnlag\n"
+#: g10/sig-check.c: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] ""
+ msgstr[0] "offentlig nøkkel %s er %lu sekund nyere enn signaturen\n"
+ msgstr[1] "offentlig nøkkel %s er %lu sekunder nyere enn signaturen\n"
+#: g10/sig-check.c:286
- #, fuzzy, c-format
- #| msgid "key %s: \"%s\" %d new signatures\n"
+ #, c-format
msgid "public key %s is %lu day newer than the signature\n"
msgid_plural "public key %s is %lu days newer than the signature\n"
- msgstr[0] "n�kkel: %s: �%s� %d nye signaturer\n"
- msgstr[1] "n�kkel: %s: �%s� %d nye signaturer\n"
+ msgstr[0] "offentlig nøkkel %s er %lu dag nyere enn signaturen\n"
+ msgstr[1] "offentlig nøkkel %s er %lu dager nyere enn signaturen\n"
- # Er dette entallsformen av denne strengen?
- #: g10/sig-check.c:300 g10/sign.c:250
- #, 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:251
+ #, 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 "
+ "nøkkel %s ble opprettet %lu sekund i fremtiden (tidsforskyvnings- eller "
"klokkeproblem)\n"
msgstr[1] ""
- "n�kkel %s ble opprettet %lu sekund i fremtiden (time warp eller "
+ "nøkkel %s ble opprettet %lu sekunder i fremtiden (tidsforskyvnings- eller "
"klokkeproblem)\n"
- # Er dette entallsformen av denne strengen?
+#: g10/sig-check.c:309
- #, fuzzy, c-format
- #| msgid ""
- #| "key %s was created %lu second in the future (time warp or clock problem)\n"
+ #, c-format
msgid "key %s was created %lu day in the future (time warp or clock problem)\n"
msgid_plural ""
"key %s was created %lu days in the future (time warp or clock problem)\n"
msgstr[0] ""
- "n�kkel %s ble opprettet %lu sekund i fremtiden (time warp eller "
+ "nøkkel %s ble opprettet %lu dag i fremtiden (tidsforskyvnings- eller "
"klokkeproblem)\n"
msgstr[1] ""
- "n�kkel %s ble opprettet %lu sekund i fremtiden (time warp eller "
+ "nøkkel %s ble opprettet %lu dager i fremtiden (tidsforskyvnings- eller "
"klokkeproblem)\n"
+#: g10/sig-check.c:326
- #, fuzzy, c-format
- #| msgid "NOTE: signature key %s expired %s\n"
+ #, c-format
msgid "Note: signature key %s expired %s\n"
- msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
+ msgstr "Merk: signaturnøkkel %s utgått %s\n"
+#: g10/sig-check.c:337
- #, fuzzy, c-format
+ #, c-format
msgid "Note: signature key %s has been revoked\n"
- msgstr "NOTIS: signaturn�kkelen %s utgikk %s\n"
+ msgstr "Merk: signaturnøkkel %s er opphevet\n"
+#: g10/sig-check.c:471
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
- msgstr ""
+ msgstr "antatt ugyldig signatur fra nøkkel %s pga. ukjent «kritisk»-bit\n"
+#: g10/sig-check.c:1048
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
- msgstr "n�kkel %s: ingen undern�kkel for undern�kkelopphevingssignatur\n"
+ msgstr "nøkkel %s: ingen undernøkkel for undernøkkelopphevingssignatur\n"
+#: g10/sig-check.c:1051
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
- msgstr "n�kkel %s: ingen undern�kkel for undern�kkelbindingssignatur\n"
+ msgstr "nøkkel %s: ingen undernøkkel for undernøkkelbindingssignatur\n"
+#: g10/sign.c:88
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
- msgstr ""
+ msgstr "ADVARSEL: klarte ikke å %%-utvide notasjon (for lang).\n"
+#: g10/sign.c:114
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
- msgstr ""
+ msgstr "ADVARSEL: klarte ikke å %%-utvide regelverkadresse (for lang).\n"
+#: g10/sign.c:137
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr ""
+ "ADVARSEL: klarte ikke å %%-utvide foretrukket nøkkeltjener-adresse (for "
+ "lang).\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
- msgstr "%s/%s-signatur fra: �%s�\n"
+ msgstr "%s/%s-signatur fra: «%s»\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, 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"
+ msgstr "ADVARSEL: tvungen bruk av %s (%d) bryter med mottakerens oppsett\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
- msgstr ""
+ msgstr "signerer:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
- msgstr ""
+ msgstr "bruker %s-kryptering\n"
+#: g10/skclist.c:155 g10/skclist.c:236
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
- msgstr ""
+ msgstr "nøkkel er ikke merket som usikker, og kan ikke brukes med falsk RNG.\n"
+#: g10/skclist.c:187
#, c-format
msgid "skipped \"%s\": duplicated\n"
- msgstr "hoppet over �%s�: er duplikat\n"
+ msgstr "hoppet over «%s»: er duplikat\n"
+#: g10/skclist.c:206
msgid "skipped: secret key already present\n"
- msgstr ""
+ msgstr "hoppet over, fordi hemmelig nøkkel allerede er tilstede\n"
+#: g10/skclist.c:225
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
+ "dette er en PGP-generelt Elgamal-nøkkel, og egner seg ikke til signering."
+#: g10/tdbdump.c:57 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
- msgstr ""
+ msgstr "tillitsoppføring %lu, type %d: skriving mislyktes. %s\n"
+#: g10/tdbdump.c:105
#, c-format
msgid ""
"# List of assigned trustvalues, created %s\n"
"# (Use \"gpg --import-ownertrust\" to restore them)\n"
msgstr ""
+ "# Liste over tildelte tillitsverdier, opprettet %s\n"
+ "# (Bruk «gpg --import-ownertrust» for å gjenopprette disse)\n"
+#: g10/tdbdump.c:162 g10/tdbdump.c:170 g10/tdbdump.c:175 g10/tdbdump.c:180
- #, fuzzy, c-format
- #| msgid "error in `%s': %s\n"
+ #, c-format
msgid "error in '%s': %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil i «%s»: %s\n"
+#: g10/tdbdump.c:162
msgid "line too long"
msgstr "for lang linje"
+#: g10/tdbdump.c:170
msgid "colon missing"
- msgstr ""
+ msgstr "kolon mangler"
+#: g10/tdbdump.c:176
msgid "invalid fingerprint"
msgstr "ugyldig fingeravtrykk"
@@@ -6855,309 -5267,241 +6696,300 @@@
msgid "ownertrust value missing"
msgstr "verdi for eiertillit mangler"
+#: g10/tdbdump.c:217
- #, fuzzy, c-format
- #| msgid "error finding trust record in `%s': %s\n"
+ #, c-format
msgid "error finding trust record in '%s': %s\n"
- msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+ msgstr "feil under søk etter tillitspost i «%s»: %s\n"
+#: g10/tdbdump.c:221
- #, fuzzy, c-format
- #| msgid "read error in `%s': %s\n"
+ #, c-format
msgid "read error in '%s': %s\n"
- msgstr "lesefeil ved �%s�: %s\n"
+ msgstr "lesefeil i «%s»: %s\n"
+#: g10/tdbdump.c:230 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
- msgstr ""
+ msgstr "trustdb: synk mislyktes. %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
- #, fuzzy, c-format
- #| msgid "can't create lock for `%s'\n"
++#: g10/tdbio.c:141 sm/keydb.c:355
+ #, c-format
msgid "can't create lock for '%s'\n"
- msgstr "kan ikke opprette l�s for �%s�\n"
+ msgstr "klarte ikke å lage lås for «%s»\n"
- #: g10/tdbio.c:145
- #, fuzzy, c-format
- #| msgid "can't lock `%s'\n"
++#: g10/tdbio.c:146
+ #, c-format
msgid "can't lock '%s'\n"
- msgstr "kan ikke l�se �%s�\n"
+ msgstr "klarte ikke å låse «%s»\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
- msgstr ""
+ msgstr "trustdb-oppf. %lu: lseek mislyktes. %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
- msgstr ""
+ msgstr "trustdb-oppf. %lu: skriving mislyktes (n=%d). %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
- msgstr ""
+ msgstr "trustdb-transaksjon er for stor\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
- msgstr ""
+ msgstr "%s: mappa finnes ikke.\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
- #, fuzzy, c-format
- #| msgid "can't access `%s': %s\n"
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
+ #, c-format
msgid "can't access '%s': %s\n"
- msgstr "kan ikke aksere �%s�: %s\n"
+ msgstr "fikk ikke tilgang til «%s»: %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
- msgstr ""
+ msgstr "%s: klarte ikke å lage versjonsoppføring. %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
- msgstr ""
+ msgstr "%s: laget ugyldig trustdb\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
- msgstr ""
+ msgstr "%s: trustdb opprettet\n"
- #: g10/tdbio.c:782
- #, fuzzy
++#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
- msgstr "hemmelig n�kkel er ikke tilgjengelig"
+ msgstr "Merk: trustdb er ikke skrivbar\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
- msgstr ""
+ msgstr "%s: ugyldig trustdb\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
- msgstr ""
+ msgstr "%s: klarte ikke å lage kontrollsum-tabell. %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
- msgstr ""
+ msgstr "%s: feil under oppdatering av versjonsoppføring. %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
- msgstr ""
+ msgstr "%s: feil under lesing av versjonsoppføring. %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
- msgstr ""
+ msgstr "%s: feil under skriving av versjonsoppføring. %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
- msgstr ""
+ msgstr "trustdb: lseek mislyktes. %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
- msgstr ""
+ msgstr "trustdb: lesing mislyktes (n=%d). %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
- msgstr ""
+ msgstr "%s: ikke en trustdb-fil\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
- msgstr ""
+ msgstr "%s: versjonsoppføring nr. %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
- msgstr ""
+ msgstr "%s: %d er en ugyldig filversjon\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
- msgstr ""
+ msgstr "%s: feil under lesing av «free»-oppføring. %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
- msgstr ""
+ msgstr "%s: feil under skriving av «dir»-oppføring. %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
- msgstr ""
+ msgstr "%s: klarte ikke å nullstille oppføring. %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
- msgstr ""
+ msgstr "%s: klarte ikke å legge til oppføring. %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
- msgstr ""
+ msgstr "Error: trustdb er skadet.\n"
+#: g10/textfilter.c:146
#, c-format
msgid "can't handle text lines longer than %d characters\n"
- msgstr ""
+ msgstr "tekstlinjer som er lengre enn %d tegn kan ikke behandles\n"
+#: g10/textfilter.c:241
#, c-format
msgid "input line longer than %d characters\n"
- msgstr ""
+ msgstr "inndata-linje er lengre enn %d tegn\n"
+#: g10/tofu.c:270 g10/tofu.c:289 g10/tofu.c:536
- #, fuzzy, c-format
+ #, c-format
msgid "error beginning transaction on TOFU database: %s\n"
- msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+ msgstr "feil under transaksjonsstart i TOFU-database: %s\n"
+#: 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 "feil under ferdigstillelse av transaksjon i TOFU-database: %s\n"
+#: g10/tofu.c:375 g10/tofu.c:715
#, c-format
msgid "error rolling back transaction on TOFU database: %s\n"
- msgstr ""
+ msgstr "feil under reversering av transaksjon i TOFU-database: %s\n"
+#: g10/tofu.c:512
- #, fuzzy, c-format
+ #, c-format
msgid "unsupported TOFU database version: %s\n"
- msgstr ""
- "\n"
- "St�ttede algoritmer:\n"
+ msgstr "TOFU-databaseversjon støttes ikke: %s\n"
+#: g10/tofu.c:549 g10/tofu.c:1532 g10/tofu.c:1547 g10/tofu.c:1559
+#: g10/tofu.c:1572 g10/tofu.c:2156 g10/tofu.c:2473 g10/tofu.c:2763
- #, fuzzy, c-format
+ #, c-format
msgid "error reading TOFU database: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av TOFU-database: %s\n"
+#: g10/tofu.c:577 g10/tofu.c:585
- #, fuzzy, c-format
- #| msgid "error writing secret keyring `%s': %s\n"
+ #, c-format
msgid "error determining TOFU database's version: %s\n"
- msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
+ msgstr "klarte ikke å kontrollere versjon av TOFU-database: %s\n"
+#: g10/tofu.c:598 g10/tofu.c:611 g10/tofu.c:672 g10/tofu.c:702
- #, fuzzy, c-format
+ #, c-format
msgid "error initializing TOFU database: %s\n"
- msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+ msgstr "feil under oppstart av TOFU-database: %s\n"
+#: g10/tofu.c:761
- #, fuzzy, c-format
+ #, c-format
msgid "error opening TOFU database '%s': %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under åpning av TOFU-database «%s»: %s\n"
+#: g10/tofu.c:1027
msgid "Warning: Home directory contains both tofu.db and tofu.d.\n"
- msgstr ""
+ msgstr "Advarsel: Hjemmemappe inneholder både «tofu.db» og «tofu.d».\n"
+#: g10/tofu.c:1029
msgid "Using split format for TOFU database\n"
- msgstr ""
+ msgstr "Bruker splittformat for TOFU-database\n"
+#: g10/tofu.c:1278 g10/tofu.c:1305 g10/tofu.c:2813
- #, fuzzy, c-format
+ #, c-format
msgid "error updating TOFU database: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under oppdatering av TOFU-database: %s\n"
+#: g10/tofu.c:1626
#, c-format
msgid "The binding %s is NOT known."
- msgstr ""
+ msgstr "Tilknytning %s er ukjent."
+#: g10/tofu.c:1636
#, c-format
msgid ""
"The key with fingerprint %s raised a conflict with the binding %s. Since "
"this binding's policy was 'auto', it was changed to 'ask'."
msgstr ""
+ "Nøkkel med fingeravtrykk %s forårsaket konflikt med tilknytning %s. Siden "
+ "regelen var «auto» er den nå endret til «ask» (spør)."
+#: g10/tofu.c:1648
#, 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 ""
+ "Oppgi hvorvidt du tror tilknytninga %s%ser sannferdig (dvs.: at nøkkelen "
+ "tilhører personen som hevder å eie den) eller falsk."
+#: g10/tofu.c:1737
- #, fuzzy, c-format
- #| msgid "error getting new PIN: %s\n"
+ #, c-format
msgid "error gathering other user IDs: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av andre bruker-id-er: %s\n"
+#: g10/tofu.c:1747
msgid "Known user IDs associated with this key:\n"
- msgstr ""
+ msgstr "Kjente bruker-id-er tilknyttet denne nøkkelen:\n"
+#: g10/tofu.c:1766 g10/tofu.c:1861 g10/tofu.c:2565
- #, fuzzy, c-format
- #| msgid "validity: %s"
+ #, c-format
msgid "policy: %s"
- msgstr "gyldighet: %s"
+ msgstr "regelverk: %s"
+#: g10/tofu.c:1817
- #, fuzzy, c-format
+ #, c-format
msgid "error gathering signature stats: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av signaturstatistikk: %s\n"
+#: g10/tofu.c:1821
#, 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[0] "E-postadressen «%s» er tilknyttet %d nøkkel:\n"
+ msgstr[1] "E-postadressen «%s» er tilknyttet %d nøkler:\n"
+#: g10/tofu.c:1845
#, c-format
msgid "Statistics for keys with the email address \"%s\":\n"
- msgstr ""
+ msgstr "Statistikk for nøkler med e-postadresse «%s»:\n"
+#: g10/tofu.c:1859
- #, fuzzy
- #| msgid "list keys"
msgid "this key"
- msgstr "liste n�kler"
+ msgstr "denne nøkkelen"
+#: g10/tofu.c:1869
#, c-format
msgid "%ld message signed in the future."
msgid_plural "%ld messages signed in the future."
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "%ld melding signert i fremtid."
+ msgstr[1] "%ld meldinger signert i fremtid."
+#: g10/tofu.c:1878
- #, fuzzy, c-format
+ #, 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] "%ld melding signert"
+ msgstr[1] "%ld meldinger signert"
+#: g10/tofu.c:1884
#, c-format
msgid " over the past %ld day."
msgid_plural " over the past %ld days."
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] " i løpet av gårsdagen (%ld)."
+ msgstr[1] " i løpet av de %ld siste dagene."
+#: g10/tofu.c:1888
#, c-format
msgid " over the past %ld week."
msgid_plural " over the past %ld weeks."
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] " i løpet av den siste uka (%ld)."
+ msgstr[1] " i løpet av de siste %ld ukene."
+#: g10/tofu.c:1892
#, c-format
msgid " over the past %ld month."
msgid_plural " over the past %ld months."
@@@ -7167,30 -5511,25 +6999,30 @@@ msgstr[1] " i løpet av de siste %ld m�
#. TRANSLATORS: Please translate the text found in the source
#. * file below. We don't directly internationalize that text so
#. * that we can tweak it without breaking translations.
+#: g10/tofu.c:1909
msgid "TOFU detected a binding conflict"
- msgstr ""
+ msgstr "TOFU oppdaget en tilknytningskonflikt"
#. TRANSLATORS: Two letters (normally the lower and upper case
#. * version of the hotkey) for each of the five choices. If
#. * there is only one choice in your language, repeat it.
+#: g10/tofu.c:1947
msgid "gGaAuUrRbB"
- msgstr ""
+ msgstr "gGaAuUnNdD"
+#: g10/tofu.c:1953
msgid "(G)ood, (A)ccept once, (U)nknown, (R)eject once, (B)ad? "
- msgstr ""
+ msgstr "(G)od, (A)ksepter én gang, (U)kjent, (N)ekt én gang, (D)årlig? "
+#: g10/tofu.c:2070 g10/tofu.c:2185 g10/tofu.c:2214
- #, fuzzy, c-format
+ #, c-format
msgid "error setting TOFU binding's trust level to %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under endring av tillitsnivå for TOFU-tilknytning til %s\n"
+#: g10/tofu.c:2259
- #, fuzzy, c-format
+ #, c-format
msgid "error changing TOFU policy: %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under endring av TOFU-regler: %s\n"
#. TRANSLATORS: The tilde ('~') is used here to indicate a
#. * non-breakable space
@@@ -7198,62 -5536,55 +7030,64 @@@
#, c-format
msgid "%d~year"
msgid_plural "%d~years"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "%d~år"
+ msgstr[1] "%d~år"
+#: g10/tofu.c:2360
#, c-format
msgid "%d~month"
msgid_plural "%d~months"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "%d~måned"
+ msgstr[1] "%d~måneder"
+#: g10/tofu.c:2369
#, c-format
msgid "%d~day"
msgid_plural "%d~days"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "%d~dag"
+ msgstr[1] "%d~dager"
+#: g10/tofu.c:2378
#, c-format
msgid "%d~hour"
msgid_plural "%d~hours"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "%d~time"
+ msgstr[1] "%d~timer"
+#: g10/tofu.c:2387
#, c-format
msgid "%d~minute"
msgid_plural "%d~minutes"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "%d~minutt"
+ msgstr[1] "%d~minutter"
+#: g10/tofu.c:2396
#, c-format
msgid "%d~second"
msgid_plural "%d~seconds"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "%d~sekund"
+ msgstr[1] "%d~sekunder"
+#: g10/tofu.c:2484
#, c-format
msgid "Have never verified a message signed by key %s!\n"
- msgstr ""
+ msgstr "Har aldri bekreftet en melding som er signert av nøkkel %s.\n"
+#: g10/tofu.c:2513
#, c-format
msgid ""
"Failed to collect signature statistics for \"%s\"\n"
"(key %s)\n"
msgstr ""
+ "Klarte ikke å samle inn signaturstatistikk for «%s»\n"
+ "(nøkkel %s)\n"
+#: g10/tofu.c:2533
- #, fuzzy, c-format
+ #, c-format
msgid "Verified %ld messages signed by \"%s\"."
- msgstr "|algo [filer]|skrive meldingsdigester"
+ msgstr "Bekreftet %ld meldinger signert av «%s»."
+#: g10/tofu.c:2544
#, c-format
msgid ""
"Verified %ld message signed by \"%s\"\n"
@@@ -7262,22 -5593,25 +7096,29 @@@ msgid_plural "
"Verified %ld messages signed by \"%s\"\n"
"in the past %s."
msgstr[0] ""
+ "Bekreftet %ld melding signert av «%s»\n"
+ "siste %s."
msgstr[1] ""
+ "Bekreftet %ld meldinger signert av «%s»\n"
+ "siste %s."
+#: g10/tofu.c:2555
#, c-format
msgid "The most recent message was verified %s ago."
- msgstr ""
+ msgstr "Nyeste melding ble bekreftet for %s siden."
+#: g10/tofu.c:2603
msgid "Warning: we've have yet to see a message signed by this key!\n"
msgstr ""
+ "Advarsel: vi har enda ikke sett en melding som er signert av denne "
+ "nøkkelen.\n"
+#: g10/tofu.c:2606
msgid "Warning: we've only seen a single message signed by this key!\n"
msgstr ""
+ "Advarsel: vi har bare sett én melding som er signert av denne nøkkelen.\n"
+#: g10/tofu.c:2614
#, c-format
msgid ""
"Warning: if you think you've seen more than %ld message signed by this key, "
@@@ -7292,154 -5626,135 +7133,166 @@@ msgid_plural "
" %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] ""
+ "Advarsel: hvis du tror du har sett flere enn %ld meldinger som er signert av "
+ "denne nøkkelen, kan det bety at den er forfalsket! Undersøk e-postadressen "
+ "nøye og se etter små variasjoner i navnet.\n"
+ "Bruk %s \n"
+ "for å markere nøkkelen som ugyldig hvis den virker mistenkelig.\n"
+#: g10/tofu.c:2703 g10/tofu.c:2736 g10/tofu.c:2930 g10/tofu.c:2980
+#: g10/tofu.c:3058
- #, fuzzy, c-format
+ #, c-format
msgid "error opening TOFU database: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under åpning av TOFU-database: %s\n"
+#: g10/trustdb.c:215
- #, fuzzy, c-format
- #| msgid "`%s' is not a valid character set\n"
+ #, c-format
msgid "'%s' is not a valid long keyID\n"
- msgstr "�%s� er ikke et gyldig tegnsett\n"
+ msgstr "«%s» er en ugyldig lang nøkkel-ID\n"
+#: 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 "nøkkel %s: godtatt som betrodd nøkkel\n"
+#: g10/trustdb.c:279
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
- msgstr ""
+ msgstr "nøkkel %s forekommer flere enn én gang i trustdb\n"
+#: 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 "nøkkel %s: ingen offentlig nøkkel for betrodd nøkkel - hoppet over\n"
+#: g10/trustdb.c:304
#, c-format
msgid "key %s marked as ultimately trusted\n"
- msgstr "n�kkel %s markert som endelig betrodd.\n"
+ msgstr "nøkkel %s markert som endelig betrodd.\n"
+#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
- msgstr ""
+ msgstr "tillitsoppføring %lu, foresp.type %d: lesing mislyktes. %s\n"
+#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
- msgstr ""
+ msgstr "tillitsoppføring %lu er ikke av forespurt type (%d)\n"
+#: g10/trustdb.c:421
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
+ "Du kan prøve å gjenskape trustdb ved å skrive inn følgende kommandoer:\n"
+#: g10/trustdb.c:430
msgid "If that does not work, please consult the manual\n"
- msgstr ""
+ msgstr "Se bruksanvisning hvis dette ikke hjelper\n"
+#: g10/trustdb.c:467
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr ""
+ "Klarte ikke å bruke ukjent tillitsmodell (%d). Prøver tillitsmodell %s\n"
+#: g10/trustdb.c:473
#, c-format
msgid "using %s trust model\n"
- msgstr ""
+ msgstr "bruker tillitsmodell %s\n"
+#: g10/trustdb.c:510
msgid "no need for a trustdb check\n"
- msgstr ""
+ msgstr "kontroll av trustdb er ikke nødvendig\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
- msgstr ""
+ msgstr "neste kontroll av trustdb planlagt %s\n"
+#: g10/trustdb.c:525
#, c-format
msgid "no need for a trustdb check with '%s' trust model\n"
- msgstr ""
+ msgstr "trustdb behøver ikke kontroll ved bruk av tillitsmodell «%s»\n"
+#: g10/trustdb.c:541
#, c-format
msgid "no need for a trustdb update with '%s' trust model\n"
- msgstr ""
+ msgstr "trustdb behøver ikke oppdatering ved bruk av tillitsmodell «%s»\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
- msgstr "fant ikke offentlig n�kkel %s: %s\n"
+ msgstr "fant ikke offentlig nøkkel %s: %s\n"
+#: g10/trustdb.c:965
msgid "please do a --check-trustdb\n"
- msgstr ""
+ msgstr "kjør «--check-trustdb»\n"
+#: g10/trustdb.c:970
msgid "checking the trustdb\n"
- msgstr ""
+ msgstr "kontrollerer trustdb\n"
- #: g10/trustdb.c:1851
- #, fuzzy, c-format
- #| msgid "%lu keys processed so far\n"
++#: g10/trustdb.c:1853
+ #, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
- msgstr[0] "%lu n�kler behandlet hittil\n"
- msgstr[1] "%lu n�kler behandlet hittil\n"
+ msgstr[0] "%d nøkkel behandlet"
+ msgstr[1] "%d nøkler behandlet"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
- msgstr[0] ""
- msgstr[1] ""
+ msgstr[0] "(%d gyldighetsantall klarert)\n"
+ msgstr[1] "(%d gyldighetsantall klarert)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
- msgstr ""
+ msgstr "fant ingen nøkler med absolutt («ultimat») pålitelighet\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
- msgstr ""
+ msgstr "fant ikke offentlig nøkkel for absolutt pålitelig nøkkel %s\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
+ "dybde: %d gyldig: %3d signert: %3d tillit: %d-, %dq, %dn, %dm, %df, %du\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
+ "klarte ikke å oppdatere trustdb-versjonsoppføring. Skriving mislyktes. %s\n"
+#: g10/trust.c:105
msgid "undefined"
- msgstr ""
+ msgstr "udefinert"
+#: g10/trust.c:106
msgid "never"
- msgstr ""
+ msgstr "aldri"
+#: g10/trust.c:107
msgid "marginal"
- msgstr ""
+ msgstr "marginal"
+#: g10/trust.c:108
msgid "full"
- msgstr ""
+ msgstr "full"
+#: g10/trust.c:109
msgid "ultimate"
- msgstr ""
+ msgstr "ultimat"
#. TRANSLATORS: these strings are similar to those in
#. trust_value_to_string(), but are a fixed length. This is needed to
@@@ -7449,199 -5764,155 +7302,198 @@@
#. It gets passed to atoi() so everything after the number is
#. essentially a comment and need not be translated. Either key and
#. uid are both NULL, or neither are NULL.
+#: g10/trust.c:146
msgid "10 translator see trust.c:uid_trust_string_fixed"
- msgstr ""
+ msgstr "11 translator see trustdb.c:uid_trust_string_fixed"
+#: g10/trust.c:149
msgid "[ revoked]"
msgstr "[ opphevet]"
+#: g10/trust.c:151 g10/trust.c:157
msgid "[ expired]"
- msgstr "[ utg�tt]"
+ msgstr "[ utgått]"
+#: g10/trust.c:156
msgid "[ unknown]"
- msgstr "[ ukjent]"
+ msgstr "[ ukjent]"
+#: g10/trust.c:158
msgid "[ undef ]"
- msgstr "[ udef ]"
+ msgstr "[ udef ]"
+#: g10/trust.c:159
msgid "[ never ]"
- msgstr ""
+ msgstr "[ aldri ]"
+#: g10/trust.c:160
msgid "[marginal]"
- msgstr ""
+ msgstr "[ marginal]"
+#: g10/trust.c:161
msgid "[ full ]"
- msgstr ""
+ msgstr "[ full ]"
+#: g10/trust.c:162
msgid "[ultimate]"
- msgstr ""
+ msgstr "[ fullst.]"
+#: 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 ""
+ "klarte ikke å bekrefte signatur.\n"
+ "Husk at signaturfil (.sig eller .asc)\n"
+ "skal være første filargument på kommandolinja.\n"
+#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
- msgstr ""
+ msgstr "inndatalinje %u er for lang eller mangler LF\n"
+#: g10/verify.c:253
- #, fuzzy, c-format
+ #, c-format
msgid "can't open fd %d: %s\n"
- msgstr "kan ikke �pne �%s�: %s\n"
+ msgstr "klarte ikke å åpne fd %d: %s\n"
+#: kbx/kbxutil.c:92
msgid "set debugging flags"
- msgstr ""
+ msgstr "endre feilsøkingsvalg"
+#: kbx/kbxutil.c:93
msgid "enable full debugging"
- msgstr ""
+ msgstr "slå på full feilsøking"
+#: kbx/kbxutil.c:117
- #, fuzzy
msgid "Usage: kbxutil [options] [files] (-h for help)"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: kbxutil [valg] [filer] (-h for hjelp)"
+#: kbx/kbxutil.c:120
- #, fuzzy
msgid ""
"Syntax: kbxutil [options] [files]\n"
"List, export, import Keybox data\n"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr ""
+ "Syntaks: kbxutil [valg] [filer]\n"
+ "Vis, eksporter eller importer 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 mangler eller har ikke en st�rrelse p� %d bits\n"
+ msgstr "RSA-modulus mangler eller er av annen størrelse enn %d bit\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 "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
+ msgstr "offentlig RSA-eksponent mangler eller er større enn %d bit\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 returnerte en feil: %s\n"
+#: scd/app-nks.c:835
msgid "the NullPIN has not yet been changed\n"
- msgstr ""
+ msgstr "NullPIN er ikke blitt endret enda\n"
+#: scd/app-nks.c:1096
- #, fuzzy
msgid "|N|Please enter a new PIN for the standard keys."
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "|N|Skriv inn ny PIN-kode for standardnøkler."
+#: scd/app-nks.c:1097
- #, fuzzy
msgid "||Please enter the PIN for the standard keys."
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "||Skriv inn PIN-kode for standardnøkler."
+#: scd/app-nks.c:1103
- #, fuzzy
msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "|NP|Skriv inn ny PIN-opplåsingskode (PUK) for standardnøkler."
+#: scd/app-nks.c:1105
- #, fuzzy
msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "|P|Skriv inn PIN-opplåsingskode (PUK) for standardnøkler."
+#: scd/app-nks.c:1113
msgid "|N|Please enter a new PIN for the key to create qualified signatures."
- msgstr ""
+ msgstr "|N|Skriv inn ny PIN for å la nøkkelen lage kvalifiserte signaturer."
+#: scd/app-nks.c:1115
msgid "||Please enter the PIN for the key to create qualified signatures."
- msgstr ""
+ msgstr "||Skriv inn PIN for å la nøkkelen lage kvalifiserte signaturer."
+#: scd/app-nks.c:1123
msgid ""
"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
"qualified signatures."
msgstr ""
+ "|NP|Skriv inn ny PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
+#: scd/app-nks.c:1125
msgid ""
"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
"qualified signatures."
- msgstr ""
+ msgstr "|P|Skriv inn PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
+#: 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 "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av ny PIN: %s\n"
+#: scd/app-openpgp.c:805
#, c-format
msgid "failed to store the fingerprint: %s\n"
- msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+ msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
+#: scd/app-openpgp.c:818
#, c-format
msgid "failed to store the creation date: %s\n"
- msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
+ msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
+#: scd/app-openpgp.c:1286
#, c-format
msgid "reading public key failed: %s\n"
- msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+ msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
+#: scd/app-openpgp.c:1294 scd/app-openpgp.c:3605
msgid "response does not contain the public key data\n"
- msgstr "respons inneholder ikke data om offentlig n�kkel\n"
+ msgstr "svar inneholder ikke offentlig nøkkeldata\n"
+#: scd/app-openpgp.c:1304 scd/app-openpgp.c:3613
msgid "response does not contain the RSA modulus\n"
- msgstr "respons inneholder ikke RSA-modulus\n"
+ msgstr "svar inneholder ikke RSA-modulus\n"
+#: scd/app-openpgp.c:1312 scd/app-openpgp.c:3623
msgid "response does not contain the RSA public exponent\n"
- msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
+ msgstr "svar inneholder ikke offentlig RSA-eksponent\n"
+#: scd/app-openpgp.c:1322
- #, fuzzy
- #| msgid "response does not contain the RSA public exponent\n"
msgid "response does not contain the EC public point\n"
- msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
+ msgstr "svar inneholder ikke offentlig EC-punkt\n"
+#: scd/app-openpgp.c:1708
#, c-format
msgid "using default PIN as %s\n"
- msgstr ""
+ msgstr "bruker forvalgt PIN som %s\n"
+#: scd/app-openpgp.c:1715
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
+ "klarte ikke å bruke forvalgt PIN som %s. %s. Lar være å bruke forvalgt PIN "
+ "senere\n"
+#: scd/app-openpgp.c:1730
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "||Skriv inn PIN%%0A[signaturer utført: %lu]"
+#: scd/app-openpgp.c:1741 scd/app-openpgp.c:2216
- #, fuzzy
msgid "||Please enter the PIN"
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "||Skriv inn PIN-kode"
+#: 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 er for kort; minum lengde er %d\n"
@@@ -7652,17 -5921,13 +7504,16 @@@
msgid "verify CHV%d failed: %s\n"
msgstr "bekreftelse av CHV%d mislyktes: %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 "feil ved henting av CHV-status fra kort\n"
+ msgstr "feil under henting av CHV-status fra kort\n"
+#: scd/app-openpgp.c:1870 scd/app-openpgp.c:4360
msgid "card is permanently locked!\n"
- msgstr "kort er permanent l�st!\n"
+ msgstr "kortet er låst for godt.\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"
@@@ -7671,38 -5936,29 +7522,36 @@@ msgstr[1] "%d Admin-PIN-forsøk gjenst�
#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
#. the start of the string. Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1887
- #, fuzzy, c-format
+ #, c-format
msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "|A|Skriv inn admin-PIN%%0A[gjenstående forsøk: %d]"
+#: scd/app-openpgp.c:1891
- #, fuzzy
msgid "|A|Please enter the Admin PIN"
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "|A|Skriv inn admin-PIN"
+#: scd/app-openpgp.c:1912
msgid "access to admin commands is not configured\n"
msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
+#: scd/app-openpgp.c:2265
- #, fuzzy
msgid "||Please enter the Reset Code for the card"
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "||Skriv inn tilbakestillingskode for kortet"
+#: scd/app-openpgp.c:2275 scd/app-openpgp.c:2329
- #, fuzzy, c-format
+ #, c-format
msgid "Reset Code is too short; minimum length is %d\n"
- msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
+ msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %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 ""
+ msgstr "|RN|Ny tilbakestillingskode"
+#: scd/app-openpgp.c:2299
msgid "|AN|New Admin PIN"
msgstr "|AN|Ny Admin PIN"
@@@ -7710,480 -5965,347 +7559,452 @@@
msgid "|N|New PIN"
msgstr "|N|Ny PIN"
+#: scd/app-openpgp.c:2370
- #, fuzzy
msgid "||Please enter the Admin PIN and New Admin PIN"
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "||Skriv inn admin-PIN og ny admin-PIN"
+#: scd/app-openpgp.c:2371
- #, fuzzy
msgid "||Please enter the PIN and New PIN"
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "||Skriv inn PIN-kode og ny PIN-kode"
+#: scd/app-openpgp.c:2427 scd/app-openpgp.c:3696
msgid "error reading application data\n"
- msgstr "feil ved lesing av applikasjonsdata\n"
+ msgstr "feil under lesing av programdata\n"
+#: scd/app-openpgp.c:2433 scd/app-openpgp.c:3703
msgid "error reading fingerprint DO\n"
- msgstr "feil ved lesing av fingeravtrykk DO\n"
+ msgstr "feil under lesing av fingeravtrykk DO\n"
+#: scd/app-openpgp.c:2443
msgid "key already exists\n"
- msgstr "n�kkel finnes allerede\n"
+ msgstr "nøkkelen finnes allerede\n"
+#: scd/app-openpgp.c:2447
msgid "existing key will be replaced\n"
- msgstr "eksisterende n�kkel vil bli erstattet\n"
+ msgstr "gjeldende nøkkel blir erstattet\n"
+#: scd/app-openpgp.c:2449
msgid "generating new key\n"
- msgstr "generere en ny n�kkel\n"
+ msgstr "lager ny nøkkel\n"
+#: scd/app-openpgp.c:2451
- #, fuzzy
msgid "writing new key\n"
- msgstr "generere en ny n�kkel\n"
+ msgstr "skriver ny nøkkel\n"
+#: scd/app-openpgp.c:2975 scd/app-openpgp.c:3326
msgid "creation timestamp missing\n"
msgstr "tidsstempel for opprettelse mangler\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-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
+ msgstr "RSA-primtall %s mangler eller er av annen størrelse enn %d bit\n"
+#: scd/app-openpgp.c:3158 scd/app-openpgp.c:3418
#, c-format
msgid "failed to store the key: %s\n"
- msgstr "klarte ikke � lagre n�kkelen: %s\n"
+ msgstr "klarte ikke å lagre nøkkel. %s\n"
+#: scd/app-openpgp.c:3320
- #, fuzzy
- #| msgid "unsupported URI"
msgid "unsupported curve\n"
- msgstr "ust�ttet URI"
+ msgstr "ustøttet kurve\n"
+#: scd/app-openpgp.c:3577
msgid "please wait while key is being generated ...\n"
- msgstr "vennligst vent mens n�kkel blir generert ...\n"
+ msgstr "vent mens nøkkel blir generert …\n"
+#: scd/app-openpgp.c:3590
msgid "generating key failed\n"
- msgstr "n�kkelgenerering mislyktes\n"
+ msgstr "nøkkelgenerering mislyktes\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] "n�kkelgenerering fullf�rt (%d sekunder)\n"
- msgstr[1] "n�kkelgenerering fullf�rt (%d sekunder)\n"
+ msgstr[0] "nøkkelgenerering fullført (%d sekund)\n"
+ msgstr[1] "nøkkelgenerering fullført (%d sekunder)\n"
+#: scd/app-openpgp.c:3661
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
+#: scd/app-openpgp.c:3711
msgid "fingerprint on card does not match requested one\n"
- msgstr ""
+ msgstr "fingeravtrykk på kort samsvarer ikke med forespurt avtrykk\n"
+#: scd/app-openpgp.c:3827
#, c-format
msgid "card does not support digest algorithm %s\n"
- msgstr "kortet st�tter ikke digestalgoritme %s\n"
+ msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
+#: scd/app-openpgp.c:3912
#, c-format
msgid "signatures created so far: %lu\n"
- msgstr "signaturer opprettet s� langt: %lu\n"
+ msgstr "signaturer opprettet så langt: %lu\n"
+#: scd/app-openpgp.c:4365
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
- msgstr "bekrefting av Admin PIN er forel�pig nektet gjennom denne kommandoen\n"
+ msgstr "bekrefting av Admin PIN er foreløpig nektet gjennom denne kommandoen\n"
+#: scd/app-openpgp.c:4659 scd/app-openpgp.c:4670
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
- msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
+ msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
+#: scd/app-dinsig.c:299
- #, fuzzy
msgid "||Please enter your PIN at the reader's pinpad"
- msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
+ msgstr "||Skriv inn PIN-koden på leserens kodetastatur"
#. 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
- #, fuzzy
msgid "|N|Initial New PIN"
msgstr "|N|Ny PIN"
+#: scd/scdaemon.c:114
msgid "run in multi server mode (foreground)"
- msgstr ""
+ msgstr "kjør i multi-tjenermodus (forgrunn)"
+#: scd/scdaemon.c:124 sm/gpgsm.c:334 dirmngr/dirmngr.c:177
msgid "|LEVEL|set the debugging level to LEVEL"
- msgstr ""
+ msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
+#: scd/scdaemon.c:132 tools/gpgconf-comp.c:655
- #, fuzzy
msgid "|FILE|write a log to FILE"
- msgstr "leser valg fra �%s�\n"
+ msgstr "|FIL|skriv logg til valgt FIL"
+#: scd/scdaemon.c:134
msgid "|N|connect to reader at port N"
- msgstr ""
+ msgstr "|N|koble til leser via port N"
+#: scd/scdaemon.c:136
msgid "|NAME|use NAME as ct-API driver"
- msgstr ""
+ msgstr "|NAVN|bruk valgt NAVN som ct-API-driver"
+#: scd/scdaemon.c:138
msgid "|NAME|use NAME as PC/SC driver"
- msgstr ""
+ msgstr "|NAME|bruk valgt NAVN som PC-/SC-driver"
+#: scd/scdaemon.c:141
msgid "do not use the internal CCID driver"
- msgstr ""
+ msgstr "ikke bruk intern CCID-driver"
+#: scd/scdaemon.c:147
msgid "|N|disconnect the card after N seconds of inactivity"
- msgstr ""
+ msgstr "|N|koble fra kort etter N antall sekunder uten aktivitet"
+#: scd/scdaemon.c:150
msgid "do not use a reader's pinpad"
- msgstr ""
+ msgstr "ikke bruk kodetastatur"
+#: scd/scdaemon.c:155
- #, fuzzy
msgid "deny the use of admin card commands"
- msgstr "vise admin-kommandoer"
+ msgstr "avvis bruk av admin-kortkommandoer"
+#: scd/scdaemon.c:158
msgid "use variable length input for pinpad"
- msgstr ""
+ msgstr "bruk inndata av vairabel lengde for kodetastatur"
- #: scd/scdaemon.c:286
- #, fuzzy
++#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: @SCDAEMON@ [valg] (-h for hjelp)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
+ "Syntaks: scdaemon [valg] [kommando [arg]]\n"
+ "Smartcard-bakgrunnsprogram for @GNUPG@\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
- msgstr ""
+ msgstr "bruk valget «--daemon» for å kjøre programmet i bakgrunnen\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
- msgstr ""
+ msgstr "startet håndteringsprogram for fd %d\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
- msgstr ""
+ msgstr "avsluttet håndteringsprogram for fd %d\n"
+#: sm/base64.c:327
- #, fuzzy, c-format
+ #, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "hoppet over ugyldig radix64-tegn %02x\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
- msgstr ""
+ msgstr "ingen dirmngr kjører i gjeldende økt\n"
+#: sm/certchain.c:194
#, c-format
msgid "validation model requested by certificate: %s"
- msgstr ""
+ msgstr "kontrollmodell forespurt av sertifikat: %s"
+#: sm/certchain.c:195 sm/certchain.c:1919
msgid "chain"
- msgstr ""
+ msgstr "kjede"
+#: sm/certchain.c:196 sm/certchain.c:1919
msgid "shell"
- msgstr ""
+ msgstr "skall"
+#: sm/certchain.c:256 dirmngr/validate.c:107
#, c-format
msgid "critical certificate extension %s is not supported"
- msgstr ""
+ msgstr "kritisk sertifikatutvidelse %s støttes ikke"
+#: sm/certchain.c:295 dirmngr/validate.c:205
msgid "issuer certificate is not marked as a CA"
- msgstr ""
+ msgstr "utsteders sertifikat er ikke merket som CA"
+#: sm/certchain.c:333
msgid "critical marked policy without configured policies"
- msgstr ""
+ msgstr "regelsett merket som kritisk uten oppsatte regler"
+#: sm/certchain.c:343
- #, fuzzy, c-format
+ #, c-format
msgid "failed to open '%s': %s\n"
- msgstr "Kan ikke �pne �%s�: %s\n"
+ msgstr "klarte ikke å åpne «%s»: %s\n"
+#: sm/certchain.c:351 sm/certchain.c:380 dirmngr/validate.c:167
- #, fuzzy
msgid "Note: non-critical certificate policy not allowed"
- msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
+ msgstr "Merk: ukritisk sertifikat-regelsett er ikke tillatt"
+#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:172
- #, fuzzy
msgid "certificate policy not allowed"
- msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
+ msgstr "sertifikatregelverk tillates ikke"
+#: sm/certchain.c:527
msgid "looking up issuer at external location\n"
- msgstr ""
+ msgstr "slår opp utsteder på ekstern plassering\n"
+#: sm/certchain.c:546
#, c-format
msgid "number of issuers matching: %d\n"
- msgstr ""
+ msgstr "antall ustedere funnet: %d\n"
+#: sm/certchain.c:590
msgid "looking up issuer from the Dirmngr cache\n"
- msgstr ""
+ msgstr "slår opp utsteder fra Dirmngr-hurtiglager\n"
+#: sm/certchain.c:614
- #, fuzzy, c-format
+ #, c-format
msgid "number of matching certificates: %d\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "antall treff på sertifikater: %d\n"
+#: sm/certchain.c:616
- #, fuzzy, c-format
+ #, c-format
msgid "dirmngr cache-only key lookup failed: %s\n"
- msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+ msgstr "nøkkeloppslag i dirmngr-hurtiglager 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: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"
+ msgstr "klarte ikke å tildele nøkkeldatabase-verdi\n"
+#: sm/certchain.c:981
msgid "certificate has been revoked"
- msgstr ""
+ msgstr "sertifikatet er opphevet"
+#: sm/certchain.c:996
msgid "the status of the certificate is unknown"
- msgstr ""
+ msgstr "sertifikatet har ukjent status"
+#: sm/certchain.c:1003
msgid "please make sure that the \"dirmngr\" is properly installed\n"
- msgstr ""
+ msgstr "kontroller at «dirmngr» er installert skikkelig\n"
+#: sm/certchain.c:1009
- #, fuzzy, c-format
+ #, c-format
msgid "checking the CRL failed: %s"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "kontroll av CRL mislyktes: %s"
+#: sm/certchain.c:1038 sm/certchain.c:1106 dirmngr/validate.c:473
#, c-format
msgid "certificate with invalid validity: %s"
- msgstr ""
+ msgstr "sertifikat med ugyldig gyldighetsverdi: %s"
+#: sm/certchain.c:1053 sm/certchain.c:1138 dirmngr/validate.c:491
msgid "certificate not yet valid"
- msgstr ""
+ msgstr "sertifikatet er ikke gyldig enda"
+#: sm/certchain.c:1054 sm/certchain.c:1139
- #, fuzzy
msgid "root certificate not yet valid"
- msgstr "eksportering av hemmelige n�kler er ikke tillatt\n"
+ msgstr "rotsertifikat er ikke gyldig enda"
+#: sm/certchain.c:1055 sm/certchain.c:1140
msgid "intermediate certificate not yet valid"
- msgstr ""
+ msgstr "mellomsertifikat er ikke gyldig enda"
+#: sm/certchain.c:1068 dirmngr/validate.c:502
- #, fuzzy
msgid "certificate has expired"
- msgstr "Denne n�kkelen er utg�tt!"
+ msgstr "sertifikatet er utgått"
+#: sm/certchain.c:1069
- #, fuzzy
msgid "root certificate has expired"
- msgstr "Denne n�kkelen er utg�tt!"
+ msgstr "rotsertifikat er utgått"
+#: sm/certchain.c:1070
- #, fuzzy
msgid "intermediate certificate has expired"
- msgstr "Denne n�kkelen er utg�tt!"
+ msgstr "mellomsertifikat er utgått"
+#: sm/certchain.c:1112
#, c-format
msgid "required certificate attributes missing: %s%s%s"
- msgstr ""
+ msgstr "påkrevde sertifikategenskaper mangler: %s%s%s"
+#: sm/certchain.c:1121
- #, fuzzy
msgid "certificate with invalid validity"
- msgstr "Denne n�kkelen er utg�tt!"
+ msgstr "sertifikat med ugyldig gyldighetsverdi"
+#: sm/certchain.c:1158
msgid "signature not created during lifetime of certificate"
- msgstr ""
+ msgstr "signatur ikke laget innenfor sertifikatets levetid"
+#: sm/certchain.c:1160
msgid "certificate not created during lifetime of issuer"
- msgstr ""
+ msgstr "sertifikat ikke laget innenfor utsteders levetid"
+#: sm/certchain.c:1161
msgid "intermediate certificate not created during lifetime of issuer"
- msgstr ""
+ msgstr "mellomsertifikat ikke laget innenfor utsteders levetid"
+#: sm/certchain.c:1165
- #, fuzzy
msgid " ( signature created at "
- msgstr " oppryddete signaturer: %lu\n"
+ msgstr " ( signatur opprettet "
+#: sm/certchain.c:1166
- #, fuzzy
msgid " (certificate created at "
- msgstr "preferansen %s er duplisert\n"
+ msgstr " (sertifikat opprettet "
+#: sm/certchain.c:1169
- #, fuzzy
msgid " (certificate valid from "
- msgstr "ugyldig sertifikat"
+ msgstr " (sertifikat gyldig fra "
+#: sm/certchain.c:1170
- #, fuzzy
msgid " ( issuer valid from "
- msgstr " Serienummer for kort ="
+ msgstr " ( utsteder gyldig fra "
+#: sm/certchain.c:1200 dirmngr/validate.c:552
- #, fuzzy, c-format
+ #, c-format
msgid "fingerprint=%s\n"
- msgstr "CA-fingeravtrykk: "
+ msgstr "fingeravtrykk=%s\n"
+#: sm/certchain.c:1209
msgid "root certificate has now been marked as trusted\n"
- msgstr ""
+ msgstr "rotsertifikat er nå merket som troverdig\n"
+#: sm/certchain.c:1222
msgid "interactive marking as trusted not enabled in gpg-agent\n"
- msgstr ""
+ msgstr "interaktiv tillitsmerking er ikke slått på i gpg-agent\n"
+#: sm/certchain.c:1228
msgid "interactive marking as trusted disabled for this session\n"
- msgstr ""
+ msgstr "interaktiv tillitsmarkering er slått av for gjeldende økt\n"
+#: sm/certchain.c:1286
msgid "WARNING: creation time of signature not known - assuming current time"
msgstr ""
+ "ADVARSEL: opprettelsestid for signatur er ukjent. Antar gjeldende tidspunkt"
+#: sm/certchain.c:1350
- #, fuzzy
msgid "no issuer found in certificate"
- msgstr "generere et opphevingssertifikat"
+ msgstr "fant ingen utsteder i sertifikat"
+#: sm/certchain.c:1428
msgid "self-signed certificate has a BAD signature"
- msgstr ""
+ msgstr "selvsignert sertifikat har ugyldig signatur"
+#: sm/certchain.c:1497 dirmngr/validate.c:550
msgid "root certificate is not marked trusted"
- msgstr ""
+ msgstr "rotsertifikat er ikke merket som troverdig"
+#: sm/certchain.c:1513
- #, fuzzy, c-format
+ #, c-format
msgid "checking the trust list failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "kontroll av tillitsliste mislyktes: %s\n"
+#: sm/certchain.c:1544 sm/import.c:176 dirmngr/validate.c:605
msgid "certificate chain too long\n"
- msgstr ""
+ msgstr "sertifikatkjede er for langt\n"
+#: sm/certchain.c:1556 dirmngr/validate.c:617
msgid "issuer certificate not found"
- msgstr ""
+ msgstr "fant ikke utstedersertifikat"
+#: sm/certchain.c:1589 dirmngr/validate.c:643
- #, fuzzy
msgid "certificate has a BAD signature"
- msgstr "bekrefte en signatur"
+ msgstr "sertifikatet har ugyldig signatur"
+#: sm/certchain.c:1621 dirmngr/validate.c:667
msgid "found another possible matching CA certificate - trying again"
- msgstr ""
+ msgstr "fant et annet CA-sertifikat som kan fungere. Prøver igjen"
+#: sm/certchain.c:1680 dirmngr/validate.c:692
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
- msgstr ""
+ msgstr "sertifikatkjede er lengre enn CA tillater (%d)"
+#: sm/certchain.c:1722 sm/certchain.c:2018 dirmngr/validate.c:722
- #, fuzzy
msgid "certificate is good\n"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "sertifikatet er gyldig\n"
+#: sm/certchain.c:1723
- #, fuzzy
msgid "intermediate certificate is good\n"
- msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+ msgstr "mellomsertifikat er ok\n"
+#: sm/certchain.c:1724
- #, fuzzy
msgid "root certificate is good\n"
- msgstr "ugyldig sertifikat"
+ msgstr "rotsertifikat er gyldig\n"
+#: sm/certchain.c:1906
msgid "switching to chain model"
- msgstr ""
+ msgstr "bytter til kjedemodell"
+#: sm/certchain.c:1915
#, c-format
msgid "validation model used: %s"
- msgstr ""
+ msgstr "gyldighetsmodell: %s"
+#: sm/certcheck.c:107
#, c-format
msgid "a %u bit hash is not valid for a %u bit %s key\n"
- msgstr ""
+ msgstr "kontrollsum på %u bit er ugyldig for en %u-bit %s-nøkkel\n"
+#: sm/certcheck.c:244 sm/verify.c:202
msgid "(this is the MD2 algorithm)\n"
- msgstr ""
+ msgstr "(dette er algortime MD2)\n"
+#: sm/certdump.c:60 sm/certdump.c:143 dirmngr/ocsp.c:709
- #, fuzzy
msgid "none"
- msgstr "nei"
+ msgstr "ingen"
+#: sm/certdump.c:552 sm/certdump.c:617
- #, fuzzy
msgid "[Error - invalid encoding]"
- msgstr "Feil: ugyldig respons.\n"
+ msgstr "[Feil - utgyldig koding]"
+#: sm/certdump.c:560
msgid "[Error - out of core]"
- msgstr ""
+ msgstr "[feil - kjernen er full]"
+#: sm/certdump.c:596
msgid "[Error - No name]"
- msgstr ""
+ msgstr "[feil - ingen navn]"
+#: sm/certdump.c:623
- #, fuzzy
msgid "[Error - invalid DN]"
- msgstr "Feil: ugyldig respons.\n"
+ msgstr "[feil - ugyldig DN]"
+#: sm/certdump.c:833
- #, fuzzy, c-format
+ #, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
"certificate:\n"
@@@ -8191,579 -6313,437 +8012,556 @@@
"S/N %s, ID 0x%08lX,\n"
"created %s, expires %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"
+ "Skriv inn passordfrase for å låse opp hemmelig nøkkel til følgende X.509-"
+ "sertifikat:\n"
+ "«%s»\n"
+ "S/N %s, ID 0x%08lX,\n"
+ "opprettet %s, utgår %s.\n"
+#: sm/certlist.c:122 dirmngr/validate.c:1079
msgid "no key usage specified - assuming all usages\n"
- msgstr ""
+ msgstr "ingen bruksområder for nøkler valgt. Antar alle bruksområder\n"
+#: sm/certlist.c:132 sm/keylist.c:274 dirmngr/validate.c:1089
- #, fuzzy, c-format
+ #, c-format
msgid "error getting key usage information: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under henting av informasjon om nøkkelbruk: %s\n"
+#: sm/certlist.c:142 dirmngr/validate.c:1099
msgid "certificate should not have been used for certification\n"
- msgstr ""
+ msgstr "sertifikatet skulle ikke vært brukt til sertifisering\n"
+#: sm/certlist.c:154 dirmngr/validate.c:1111
msgid "certificate should not have been used for OCSP response signing\n"
- msgstr ""
+ msgstr "sertifikatet skulle ikke vært brukt til OCSP-responssignering\n"
+#: sm/certlist.c:165 dirmngr/validate.c:1131
msgid "certificate should not have been used for encryption\n"
- msgstr ""
+ msgstr "sertifikatet skulle ikke vært brukt til kryptering\n"
+#: sm/certlist.c:166 dirmngr/validate.c:1133
msgid "certificate should not have been used for signing\n"
- msgstr ""
+ msgstr "sertifikatet skulle ikke vært brukt til signering\n"
+#: sm/certlist.c:167 dirmngr/validate.c:1134
msgid "certificate is not usable for encryption\n"
- msgstr ""
+ msgstr "sertifikatet egner seg ikke til kryptering\n"
+#: sm/certlist.c:168 dirmngr/validate.c:1135
msgid "certificate is not usable for signing\n"
- msgstr ""
+ msgstr "sertifikatet egner seg ikke til signering\n"
+#: sm/certreqgen.c:464
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: invalid algorithm\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "linje %d: ugyldig algoritme\n"
+#: sm/certreqgen.c:478
#, c-format
msgid "line %d: invalid key length %u (valid are %d to %d)\n"
- msgstr ""
+ msgstr "linje %d: nøkkellengden %u er ugyldig (skal være mellom %d og %d)\n"
+#: sm/certreqgen.c:496
#, c-format
msgid "line %d: no subject name given\n"
- msgstr ""
+ msgstr "linje %d: emnenavn mangler\n"
+#: sm/certreqgen.c:505
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: invalid subject name label '%.*s'\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "linje %d: emne-etikett«%.*s» er ugyldig\n"
+#: sm/certreqgen.c:508
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: invalid subject name '%s' at pos %d\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "linje %d: emnenavn «%s» ved posisjon %d er ugyldig\n"
+#: sm/certreqgen.c:525
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: not a valid email address\n"
- msgstr "Ikke en gyldig epostadresse\n"
+ msgstr "linje %d: ugyldig e-postadresse\n"
+#: sm/certreqgen.c:544
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: invalid serial number\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "linje %d: ugyldig serienummer\n"
+#: sm/certreqgen.c:560
#, c-format
msgid "line %d: invalid issuer name label '%.*s'\n"
- msgstr ""
+ msgstr "linje %d: utsteder-etikett «%.*s» er ugyldig\n"
+#: sm/certreqgen.c:563
#, c-format
msgid "line %d: invalid issuer name '%s' at pos %d\n"
- msgstr ""
+ msgstr "linje %d: utstedernavn «%s» ved posisjon %d er ugyldig\n"
+#: sm/certreqgen.c:575 sm/certreqgen.c:586
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: invalid date given\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "linje %d: ugyldig dato\n"
+#: sm/certreqgen.c:599
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: error getting signing key by keygrip '%s': %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr ""
+ "linje %d: feil under henting av signeringsnøkkel ved nøkkelgrep «%s»: %s\n"
+#: sm/certreqgen.c:618
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: invalid hash algorithm given\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "linje %d: ugyldig summeringsalgoritme\n"
+#: sm/certreqgen.c:633
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: invalid authority-key-id\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "linje %d: ugyldig «authority-key-id»\n"
+#: sm/certreqgen.c:648
- #, fuzzy, c-format
- #| msgid "key %s: invalid subkey binding\n"
+ #, c-format
msgid "line %d: invalid subject-key-id\n"
- msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
+ msgstr "linje %d: ugyldig «subject-key-id»\n"
+#: sm/certreqgen.c:686
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: invalid extension syntax\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "linje %d: ugyldig utvidelsessyntaks\n"
+#: sm/certreqgen.c:699
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: error reading key '%s' from card: %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "linje %d: fiel under lesing av nøkkel «%s» fra kort: %s\n"
+#: sm/certreqgen.c:712
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: error getting key by keygrip '%s': %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "linje %d: feil under henting av nøkkel av nøkkelgrep «%s»: %s\n"
+#: sm/certreqgen.c:729
- #, fuzzy, c-format
+ #, c-format
msgid "line %d: key generation failed: %s <%s>\n"
- msgstr "N�kkelgenerering mislyktes: %s\n"
+ msgstr "linje %d: nøkkelgenerering mislyktes: %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 ""
+ "Skriv inn passordfrasen for nøkkelen én gang til for å fullføre denne "
+ "sertifikat-forespørselen.\n"
+#: sm/certreqgen-ui.c:162
- #, fuzzy, c-format
+ #, c-format
msgid " (%d) RSA\n"
- msgstr " (%d) RSA (bare signering)\n"
+ msgstr " (%d) RSA\n"
+#: sm/certreqgen-ui.c:163
- #, fuzzy, c-format
+ #, c-format
msgid " (%d) Existing key\n"
- msgstr " (2) Krypteringsn�kkel\n"
+ msgstr " (%d) Nøkkel\n"
+#: sm/certreqgen-ui.c:164
#, c-format
msgid " (%d) Existing key from card\n"
- msgstr ""
+ msgstr " (%d) Nøkkel fra kort\n"
+#: sm/certreqgen-ui.c:234 sm/certreqgen-ui.c:243
- #, fuzzy, c-format
+ #, c-format
msgid "error reading the card: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av kort: %s\n"
+#: sm/certreqgen-ui.c:237
- #, fuzzy, c-format
+ #, c-format
msgid "Serial number of the card: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "Kortets serienummer: %s\n"
+#: sm/certreqgen-ui.c:249
- #, fuzzy
msgid "Available keys:\n"
- msgstr "utkoble en n�kkel"
+ msgstr "Tilgjengelige nøkler:\n"
+#: sm/certreqgen-ui.c:280
#, c-format
msgid "Possible actions for a %s key:\n"
- msgstr ""
+ msgstr "Mulige handlinger for %s-nøkler:\n"
+#: sm/certreqgen-ui.c:281
- #, fuzzy, c-format
+ #, c-format
msgid " (%d) sign, encrypt\n"
- msgstr " (%d) DSA (bare signering)\n"
+ msgstr " (%d) signer, krypter\n"
+#: sm/certreqgen-ui.c:282
- #, fuzzy, c-format
+ #, c-format
msgid " (%d) sign\n"
- msgstr " (%d) DSA (bare signering)\n"
+ msgstr " (%d) signer\n"
+#: sm/certreqgen-ui.c:283
- #, fuzzy, c-format
+ #, c-format
msgid " (%d) encrypt\n"
- msgstr " (%d) RSA (bare kryptering)\n"
+ msgstr " (%d) krypter\n"
+#: sm/certreqgen-ui.c:307
msgid "Enter the X.509 subject name: "
- msgstr ""
+ msgstr "Skriv inn X.509-emnenavn: "
+#: sm/certreqgen-ui.c:311
msgid "No subject name given\n"
- msgstr ""
+ msgstr "Ingen emnenavn oppgitt\n"
+#: sm/certreqgen-ui.c:315
- #, fuzzy, c-format
+ #, c-format
msgid "Invalid subject name label '%.*s'\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "Emneetikett «%.*s» er ugyldig\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
- #, fuzzy, c-format
+ #, c-format
msgid "Invalid subject name '%s'\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "Emnenavnet «%s» er ugyldig\n"
+#: sm/certreqgen-ui.c:326
msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
- msgstr ""
+ msgstr "12"
+#: sm/certreqgen-ui.c:338
- #, fuzzy
msgid "Enter email addresses"
- msgstr "Epostadresse: "
+ msgstr "Skriv inn e-postadresser"
+#: sm/certreqgen-ui.c:339
- #, fuzzy
msgid " (end with an empty line):\n"
- msgstr ""
- "\n"
- "Tast inn brukeriden. Avslutt med en blank linje: "
+ msgstr " (avslutt med tom linje):\n"
+#: sm/certreqgen-ui.c:343
- #, fuzzy
msgid "Enter DNS names"
- msgstr "Tast inn nytt filnavn"
+ msgstr "Skriv inn DNS-navn"
+#: sm/certreqgen-ui.c:344 sm/certreqgen-ui.c:349
- #, fuzzy
msgid " (optional; end with an empty line):\n"
- msgstr ""
- "\n"
- "Tast inn brukeriden. Avslutt med en blank linje: "
+ msgstr " (valgfritt. Avslutt med tom linje):\n"
+#: sm/certreqgen-ui.c:348
- #, fuzzy
msgid "Enter URIs"
- msgstr "Tast inn PIN: "
+ msgstr "Skriv inn adresser"
+#: sm/certreqgen-ui.c:355
- #, fuzzy
- #| msgid "Create a designated revocation certificate for this key? (y/N) "
msgid "Create self-signed certificate? (y/N) "
- msgstr "Lage et utpekt opphevingssertifikat for denne n�kkelen? (j/N) "
+ msgstr "Vil du lage selvsignert sertifikat? (y/N) "
+#: sm/certreqgen-ui.c:382
msgid "These parameters are used:\n"
- msgstr ""
+ msgstr "Følgende parametre brukes:\n"
+#: sm/certreqgen-ui.c:400
msgid "Now creating self-signed certificate. "
- msgstr ""
+ msgstr "Lager selvsignert sertifikat."
+#: sm/certreqgen-ui.c:402
- #, fuzzy
msgid "Now creating certificate request. "
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "Lager sertifikatforespørsel. "
+#: sm/certreqgen-ui.c:403
msgid "This may take a while ...\n"
- msgstr ""
+ msgstr "Dette kan ta en stund …\n"
+#: sm/certreqgen-ui.c:414
msgid "Ready.\n"
- msgstr ""
+ msgstr "Ferdig.\n"
+#: sm/certreqgen-ui.c:417
msgid "Ready. You should now send this request to your CA.\n"
msgstr ""
+ "Ferdig. Du kan nå sende denne forespørselen til aktuell sertifikatutsteder "
+ "(CA).\n"
+#: sm/certreqgen-ui.c:423
msgid "resource problem: out of core\n"
- msgstr ""
+ msgstr "ressursproblem: oppbrukt kjerne\n"
+#: sm/decrypt.c:330
msgid "(this is the RC2 algorithm)\n"
- msgstr ""
+ msgstr "(dette er algoritme RC2)\n"
+#: sm/decrypt.c:332
msgid "(this does not seem to be an encrypted message)\n"
- msgstr ""
+ msgstr "(dette ser ikke ut som en kryptert melding)\n"
+#: sm/delete.c:51 sm/delete.c:112
- #, fuzzy, c-format
+ #, c-format
msgid "certificate '%s' not found: %s\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "fant ikke sertifikatet «%s»: %s\n"
+#: sm/delete.c:122 sm/keydb.c:1223 sm/keydb.c:1321
- #, fuzzy, c-format
+ #, c-format
msgid "error locking keybox: %s\n"
- msgstr "feil ved lesing av n�kkelblokk: %s\n"
+ msgstr "feil under låsing av nøkkelskrin: %s\n"
+#: sm/delete.c:143
- #, fuzzy, c-format
+ #, c-format
msgid "duplicated certificate '%s' deleted\n"
- msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+ msgstr "duplikatsertifikat «%s» slettet\n"
+#: sm/delete.c:145
- #, fuzzy, c-format
+ #, c-format
msgid "certificate '%s' deleted\n"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "sertifikat «%s» slettet\n"
+#: sm/delete.c:175
- #, fuzzy, c-format
+ #, c-format
msgid "deleting certificate \"%s\" failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "sletting av sertifikat «%s» mislyktes: %s\n"
+#: sm/encrypt.c:328
- #, fuzzy
msgid "no valid recipients given\n"
- msgstr "ingen gyldige adressater\n"
+ msgstr "ingen gyldige mottakere valgt\n"
+#: sm/gpgsm.c:207
- #, fuzzy
msgid "list external keys"
- msgstr "liste hemmelige n�kler"
+ msgstr "vis eksterne nøkler"
+#: sm/gpgsm.c:209
- #, fuzzy
msgid "list certificate chain"
- msgstr "ugyldig sertifikat"
+ msgstr "vis sertifikatkjede "
+#: sm/gpgsm.c:216
- #, fuzzy
msgid "import certificates"
- msgstr "ugyldig sertifikat"
+ msgstr "importer sertifikater"
+#: sm/gpgsm.c:217
- #, fuzzy
msgid "export certificates"
- msgstr "ugyldig sertifikat"
+ msgstr "eksporter sertifikater"
+#: sm/gpgsm.c:225
msgid "register a smartcard"
- msgstr ""
+ msgstr "registrer smartkort"
+#: sm/gpgsm.c:228
msgid "pass a command to the dirmngr"
- msgstr ""
+ msgstr "send en kommando til dirmngr"
+#: sm/gpgsm.c:230
msgid "invoke gpg-protect-tool"
- msgstr ""
+ msgstr "kall gpg-protect-tool"
+#: sm/gpgsm.c:246
- #, fuzzy
msgid "create base-64 encoded output"
- msgstr "lage ASCII-beskyttet output"
+ msgstr "lag base64-kodet utdata"
+#: sm/gpgsm.c:254
msgid "assume input is in PEM format"
- msgstr ""
+ msgstr "forvent inndata i «PEM»-format"
+#: sm/gpgsm.c:256
msgid "assume input is in base-64 format"
- msgstr ""
+ msgstr "forvent inndata i «base-64»-format"
+#: sm/gpgsm.c:258
msgid "assume input is in binary format"
- msgstr ""
+ msgstr "forvent inndata i binærformat"
+#: sm/gpgsm.c:265
msgid "never consult a CRL"
- msgstr ""
+ msgstr "aldri spør CRL"
+#: sm/gpgsm.c:275
msgid "check validity using OCSP"
- msgstr ""
+ msgstr "kontroller gyldighet med OCSP"
+#: sm/gpgsm.c:280
msgid "|N|number of certificates to include"
- msgstr ""
+ msgstr "|N|antall sertifikater som skal være med"
+#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
- msgstr ""
+ msgstr "|FIL|hent regler fra valgt FIL"
+#: sm/gpgsm.c:286
msgid "do not check certificate policies"
- msgstr ""
+ msgstr "ikke kontroller sertifikatregler"
+#: sm/gpgsm.c:290
msgid "fetch missing issuer certificates"
- msgstr ""
+ msgstr "hent manglende utstedersertifikat"
+#: sm/gpgsm.c:301
msgid "don't use the terminal at all"
- msgstr ""
+ msgstr "ikke bruk terminal i det hele tatt"
+#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
- msgstr ""
+ msgstr "|FIL|lagre en tjenermodus-logg i valgt FIL"
+#: sm/gpgsm.c:308
- #, fuzzy
msgid "|FILE|write an audit log to FILE"
- msgstr "leser valg fra �%s�\n"
+ msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
+#: sm/gpgsm.c:311
msgid "batch mode: never ask"
- msgstr ""
+ msgstr "buntmodus: aldri spør"
+#: sm/gpgsm.c:312
msgid "assume yes on most questions"
- msgstr ""
+ msgstr "svar automatisk ja på de fleste spørsmål"
+#: sm/gpgsm.c:313
msgid "assume no on most questions"
- msgstr ""
+ msgstr "svar automatisk nei på de fleste spørsmål"
+#: sm/gpgsm.c:316
- #, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
- msgstr "hent n�klene fra dette n�kkelknippet"
+ msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
+#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
- msgstr ""
+ msgstr "|BRUKER-ID|bruk valgt BRUKER-ID som forvalgt hemmelig nøkkel"
+#: sm/gpgsm.c:329 tools/gpgconf-comp.c:793
msgid "|SPEC|use this keyserver to lookup keys"
- msgstr ""
+ msgstr "|SPEC|bruk valgt nøkkeltjener til å slå opp nøkler"
+#: sm/gpgsm.c:346
- #, fuzzy
msgid "|NAME|use cipher algorithm NAME"
- msgstr "ukjent kryptoalgoritme"
+ msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
+#: sm/gpgsm.c:348
- #, fuzzy
msgid "|NAME|use message digest algorithm NAME"
- msgstr "%s signatur, digestalgoritme %s\n"
+ msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
+#: 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)"
+ msgstr "Bruk: @GPGSM@ [valg] [filer] (-h for hjelp)"
+#: sm/gpgsm.c:567
- #, fuzzy
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"
+ "Syntaks: gpg [valg] [filer]\n"
+ "Signer, kontroller, krypter eller dekrypter.\n"
+ "Forvalgt handling avhenger av inndata.\n"
+#: sm/gpgsm.c:771
- #, fuzzy, c-format
+ #, c-format
msgid "Note: won't be able to encrypt to '%s': %s\n"
- msgstr "kan ikke opprette �%s�: %s\n"
+ msgstr "Merk: det er ikke mulig å kryptere til «%s». %s\n"
+#: sm/gpgsm.c:782
- #, fuzzy, c-format
+ #, c-format
msgid "unknown validation model '%s'\n"
- msgstr "ukjent valg �%s�\n"
+ msgstr "«%s» er en ukjent kontrollmodell\n"
+#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
#, c-format
msgid "%s:%u: no hostname given\n"
- msgstr ""
+ msgstr "%s:%u: vertsnavn mangler\n"
+#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
#, c-format
msgid "%s:%u: password given without user\n"
- msgstr ""
+ msgstr "%s:%u: passord skrevet inn uten brukernavn\n"
+#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
- #, fuzzy, c-format
+ #, c-format
msgid "%s:%u: skipping this line\n"
- msgstr " s = hopp over denne n�kkelen\n"
+ msgstr "%s:%u: hopper over denne linja\n"
+#: sm/gpgsm.c:1433
- #, fuzzy
msgid "could not parse keyserver\n"
- msgstr "kunne ikke parse n�kkelserverens URL\n"
+ msgstr "klarte ikke å tolke nøkkeltjener\n"
+#: sm/gpgsm.c:1632
- #, fuzzy, c-format
+ #, c-format
msgid "importing common certificates '%s'\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "importerer sertifikat «%s»\n"
+#: sm/gpgsm.c:1673
- #, fuzzy, c-format
+ #, c-format
msgid "can't sign using '%s': %s\n"
- msgstr "kan ikke aksere �%s�: %s\n"
+ msgstr "klarte ikke å signere med «%s»: %s\n"
+#: sm/gpgsm.c:2029
msgid "invalid command (there is no implicit command)\n"
- msgstr ""
+ msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
+#: sm/import.c:127
- #, fuzzy, c-format
+ #, c-format
msgid "total number processed: %lu\n"
- msgstr "Totalt antall behandlet: %lu\n"
+ msgstr "totalt antall behandlet: %lu\n"
+#: sm/import.c:246
- #, fuzzy
msgid "error storing certificate\n"
- msgstr "generere et opphevingssertifikat"
+ msgstr "feil under lagring av sertifikat\n"
+#: sm/import.c:254
msgid "basic certificate checks failed - not imported\n"
- msgstr ""
+ msgstr "enkel sertifikatkontroll mislyktes. Ikke importert\n"
+#: sm/import.c:467 sm/keydb.c:1243 sm/keydb.c:1333
- #, fuzzy, c-format
+ #, c-format
msgid "error getting stored flags: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av lagrede valg: %s\n"
+#: sm/import.c:526 sm/import.c:558
- #, fuzzy, c-format
+ #, c-format
msgid "error importing certificate: %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under importering av sertifikat: %s\n"
+#: sm/import.c:746 tools/gpg-connect-agent.c:1433
- #, fuzzy, c-format
+ #, c-format
msgid "error reading input: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av inndata: %s\n"
+#: sm/keydb.c:1120 sm/keydb.c:1206
- #, fuzzy
msgid "failed to get the fingerprint\n"
- msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
+ msgstr "klarte ikke å hente fingeravtrykk\n"
+#: sm/keydb.c:1162
#, c-format
msgid "problem looking for existing certificate: %s\n"
- msgstr ""
+ msgstr "klarte ikke å søke etter sertifikat: %s\n"
+#: sm/keydb.c:1174
- #, fuzzy, c-format
+ #, c-format
msgid "error finding writable keyDB: %s\n"
- msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+ msgstr "feil under søk etter skrivbar nøkkeldatabase: %s\n"
+#: sm/keydb.c:1182
- #, fuzzy, c-format
+ #, c-format
msgid "error storing certificate: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under lagring av sertifikat: %s\n"
+#: sm/keydb.c:1234
#, c-format
msgid "problem re-searching certificate: %s\n"
- msgstr ""
+ msgstr "det oppstod en feil under nytt søk etter sertifikat: %s\n"
+#: sm/keydb.c:1255 sm/keydb.c:1344
- #, fuzzy, c-format
+ #, c-format
msgid "error storing flags: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lagring av valg: %s\n"
+#: sm/keylist.c:658
msgid "Error - "
- msgstr ""
+ msgstr "Feil - "
+#: sm/misc.c:58
msgid "GPG_TTY has not been set - using maybe bogus default\n"
- msgstr ""
+ msgstr "GPG_TTY har ingen verdi. Bruker forvalgt verdi som kan være ugyldig\n"
+#: sm/qualified.c:105
- #, fuzzy, c-format
+ #, c-format
msgid "invalid formatted fingerprint in '%s', line %d\n"
- msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+ msgstr "feilformatert fingeravtrykk i «%s», linje %d\n"
+#: sm/qualified.c:123
- #, fuzzy, c-format
+ #, c-format
msgid "invalid country code in '%s', line %d\n"
- msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+ msgstr "ugyldig landskode i «%s», linje %d\n"
+#: sm/qualified.c:206
#, c-format
msgid ""
"You are about to create a signature using your certificate:\n"
@@@ -8773,2177 -6753,1644 +8571,2102 @@@
"\n"
"%s%sAre you really sure that you want to do this?"
msgstr ""
+ "Du er i ferd med å lage en signatur med følgende sertifikat:\n"
+ "«%s»\n"
+ "Dette fører til en signatur som lovmessig kan tilsvare håndskrevede "
+ "signaturer.\n"
+ "\n"
+ "%s%sEr du sikker på at du vil gjøre dette?"
+#: 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 ""
+ "Merk: dette programmet er ikke offisielt godkjent for å lage eller bekrefte "
+ "slike signaturer.\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 ""
+ "Du er i ferd med å lage en signatur med følgende sertifikat:\n"
+ "«%s»\n"
+ "Merk: dette sertifikatet lager ikke «kvalifiserte» signaturer."
+#: sm/sign.c:451
#, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr ""
+ "kontrollsum-algoritme %d (%s) for undertegnet %d støttes ikke. Bruker %s\n"
+#: sm/sign.c:465
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
- msgstr ""
+ msgstr "kontrollsum-algoritme brukt av undertegnet %d: %s (%s)\n"
+#: sm/sign.c:517
#, c-format
msgid "checking for qualified certificate failed: %s\n"
- msgstr ""
+ msgstr "søk etter godkjent sertifikat mislyktes: %s\n"
+#: sm/verify.c:450
- #, fuzzy
msgid "Signature made "
- msgstr "Signatur opprettet %s\n"
+ msgstr "Signatur fullført"
+#: sm/verify.c:454
msgid "[date not given]"
- msgstr ""
+ msgstr "[dato ikke oppgitt]"
+#: sm/verify.c:455
- #, fuzzy, c-format
+ #, c-format
msgid " using certificate ID 0x%08lX\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr " ved bruk av sertifikat-ID 0x%08lX\n"
+#: sm/verify.c:474
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
+ "ugyldig signatur. Kontrollsum-attributt for melding samsvarer ikke med "
+ "attributt for utregnet sum\n"
+#: sm/verify.c:595
- #, fuzzy
msgid "Good signature from"
- msgstr "God signatur fra �%s�"
+ msgstr "Gyldig signatur fra"
+#: sm/verify.c:596
- #, fuzzy
msgid " aka"
- msgstr " aka �%s�"
+ msgstr " også kjent som"
+#: sm/verify.c:614
- #, fuzzy
msgid "This is a qualified signature\n"
- msgstr "Dette vil v�re en selvsignatur.\n"
+ msgstr "Dette er en godkjent signatur\n"
+#: dirmngr/certcache.c:106
#, c-format
msgid "can't initialize certificate cache lock: %s\n"
- msgstr ""
+ msgstr "klarte ikke å starte låsing av sertifikat-hurtiglager. %s\n"
+#: dirmngr/certcache.c:117
#, c-format
msgid "can't acquire read lock on the certificate cache: %s\n"
- msgstr ""
+ msgstr "klarte ikke å sperre sertifikat-hurtiglager for lesing. %s\n"
+#: dirmngr/certcache.c:128
#, c-format
msgid "can't acquire write lock on the certificate cache: %s\n"
- msgstr ""
+ msgstr "klarte ikke å sperre sertifikat-hurtiglager for skriving. %s\n"
+#: dirmngr/certcache.c:139
#, c-format
msgid "can't release lock on the certificate cache: %s\n"
- msgstr ""
+ msgstr "klarte ikke å låse opp sertifikat-hurtiglager. %s\n"
+#: dirmngr/certcache.c:267
#, c-format
msgid "dropping %u certificates from the cache\n"
- msgstr ""
+ msgstr "fjerner %u sertifikater fra hurtiglager\n"
+#: dirmngr/certcache.c:352
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
+ #, c-format
msgid "can't access directory '%s': %s\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "fikk ikke tilgang til mappa «%s»: %s\n"
+#: dirmngr/certcache.c:390
- #, fuzzy, c-format
- #| msgid "can't create `%s': %s\n"
+ #, c-format
msgid "can't parse certificate '%s': %s\n"
- msgstr "kan ikke opprette �%s�: %s\n"
+ msgstr "klarte ikke å tolke sertifikat «%s»: %s\n"
+#: dirmngr/certcache.c:398
- #, fuzzy, c-format
+ #, c-format
msgid "certificate '%s' already cached\n"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "sertifikat «%s» ligger allerede i hurtiglager\n"
+#: dirmngr/certcache.c:402
- #, fuzzy, c-format
+ #, c-format
msgid "trusted certificate '%s' loaded\n"
- msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+ msgstr "lastet inn tillitsmerket sertifikat «%s»\n"
+#: dirmngr/certcache.c:404
- #, fuzzy, c-format
+ #, c-format
msgid "certificate '%s' loaded\n"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "lastet inn sertifikat «%s»\n"
+#: dirmngr/certcache.c:408
- #, fuzzy, c-format
+ #, c-format
msgid " SHA1 fingerprint = %s\n"
- msgstr "CA-fingeravtrykk: "
+ msgstr " SHA1-fingeravtrykk = %s\n"
+#: dirmngr/certcache.c:411
msgid " issuer ="
- msgstr ""
+ msgstr " utsteder ="
+#: dirmngr/certcache.c:412
msgid " subject ="
- msgstr ""
+ msgstr " emne ="
+#: dirmngr/certcache.c:416
- #, fuzzy, c-format
+ #, c-format
msgid "error loading certificate '%s': %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under innlasting av sertifikat «%s»: %s\n"
+#: dirmngr/certcache.c:492
- #, fuzzy, c-format
+ #, c-format
msgid "permanently loaded certificates: %u\n"
- msgstr "ugyldig sertifikat"
+ msgstr "permanent innlastede sertifikater: %u\n"
+#: dirmngr/certcache.c:494
- #, fuzzy, c-format
+ #, c-format
msgid " runtime cached certificates: %u\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr " hurtiglagrede sertifikater: %u\n"
+#: dirmngr/certcache.c:509 dirmngr/dirmngr-client.c:385
- #, fuzzy
msgid "certificate already cached\n"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "sertifikat allerede hurtiglagret\n"
+#: dirmngr/certcache.c:511
- #, fuzzy
msgid "certificate cached\n"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "sertifikat hurtiglagret\n"
+#: dirmngr/certcache.c:513 dirmngr/certcache.c:533
+#: dirmngr/dirmngr-client.c:389
- #, fuzzy, c-format
+ #, c-format
msgid "error caching certificate: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under hurtiglagring av sertifikat: %s\n"
+#: dirmngr/certcache.c:596
- #, fuzzy, c-format
- #| msgid "invalid fingerprint"
+ #, c-format
msgid "invalid SHA1 fingerprint string '%s'\n"
- msgstr "ugyldig fingeravtrykk"
+ msgstr "«%s» er et ugyldig SHA1-fingeravtrykk\n"
+#: dirmngr/certcache.c:1042 dirmngr/certcache.c:1051
- #, fuzzy, c-format
+ #, c-format
msgid "error fetching certificate by S/N: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under henting av sertifikat etter S/N: %s\n"
+#: dirmngr/certcache.c:1205 dirmngr/certcache.c:1214
- #, fuzzy, c-format
+ #, c-format
msgid "error fetching certificate by subject: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under henting av sertifikat etter emne: %s\n"
+#: dirmngr/certcache.c:1318 dirmngr/validate.c:459
- #, fuzzy
msgid "no issuer found in certificate\n"
- msgstr "generere et opphevingssertifikat"
+ msgstr "fant ingen utsteder av sertifikat\n"
+#: dirmngr/certcache.c:1328
- #, fuzzy, c-format
+ #, c-format
msgid "error getting authorityKeyIdentifier: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av «authorityKeyIdentifier»: %s\n"
+#: dirmngr/crlcache.c:213
- #, fuzzy, c-format
- #| msgid "can't create directory `%s': %s\n"
+ #, c-format
msgid "creating directory '%s'\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "lager mappe «%s»\n"
+#: dirmngr/crlcache.c:217
- #, fuzzy, c-format
+ #, c-format
msgid "error creating directory '%s': %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under oppretting av mappa «%s»: %s\n"
+#: dirmngr/crlcache.c:245
- #, fuzzy, c-format
+ #, c-format
msgid "ignoring database dir '%s'\n"
- msgstr "feil i trailerlinje\n"
+ msgstr "ignorerer databasemappe «%s»\n"
+#: dirmngr/crlcache.c:254
- #, fuzzy, c-format
+ #, c-format
msgid "error reading directory '%s': %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av mappa «%s»: %s\n"
+#: dirmngr/crlcache.c:275
- #, fuzzy, c-format
+ #, c-format
msgid "removing cache file '%s'\n"
- msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+ msgstr "fjerner hurtiglager-fil «%s»\n"
+#: dirmngr/crlcache.c:284
- #, fuzzy, c-format
- #| msgid "enarmoring failed: %s\n"
+ #, c-format
msgid "not removing file '%s'\n"
- msgstr "enarmoring failed: %s\n"
+ msgstr "lar være å fjerne «%s»\n"
+#: dirmngr/crlcache.c:373 dirmngr/crlcache.c:1119 dirmngr/crlcache.c:2207
- #, fuzzy, c-format
+ #, c-format
msgid "error closing cache file: %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under lukking av hurtiglager-fil: %s\n"
+#: dirmngr/crlcache.c:411 dirmngr/crlcache.c:795
- #, fuzzy, c-format
+ #, c-format
msgid "failed to open cache dir file '%s': %s\n"
- msgstr "Kan ikke �pne �%s�: %s\n"
+ msgstr "klarte ikke å åpne hurtiglagermappe-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:421
- #, fuzzy, c-format
+ #, c-format
msgid "error creating new cache dir file '%s': %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under oppretting av ny hurtiglagermappe-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:428
- #, fuzzy, c-format
- #| msgid "error writing secret keyring `%s': %s\n"
+ #, c-format
msgid "error writing new cache dir file '%s': %s\n"
- msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
+ msgstr "feil under skriving av ny hurtiglagermappe-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:435
- #, fuzzy, c-format
+ #, c-format
msgid "error closing new cache dir file '%s': %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under lukking av ny hurtiglagermappe-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:440
- #, fuzzy, c-format
- #| msgid "new configuration file `%s' created\n"
+ #, c-format
msgid "new cache dir file '%s' created\n"
- msgstr "ny konfigurasjonsfil �%s� ble opprettet\n"
+ msgstr "ny hurtiglagermappe-fil «%s» opprettet\n"
+#: dirmngr/crlcache.c:445
- #, fuzzy, c-format
+ #, c-format
msgid "failed to re-open cache dir file '%s': %s\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "klarte ikke å åpne hurtiglagermappe-fil «%s» på nytt: %s\n"
+#: dirmngr/crlcache.c:473
#, c-format
msgid "first record of '%s' is not the version\n"
- msgstr ""
+ msgstr "første forekomst av «%s» står ikke i versjonspesifikasjon\n"
+#: dirmngr/crlcache.c:488
msgid "old version of cache directory - cleaning up\n"
- msgstr ""
+ msgstr "hurtiglager-mappe er av gammel versjon. Rydder opp\n"
+#: dirmngr/crlcache.c:504
msgid "old version of cache directory - giving up\n"
- msgstr ""
+ msgstr "hurtiglager-mappe er av gammel versjon. Gir opp\n"
+#: dirmngr/crlcache.c:615
#, c-format
msgid "extra field detected in crl record of '%s' line %u\n"
- msgstr ""
+ msgstr "fant ekstrafelt i crl-oppføring i «%s» på linje %u\n"
+#: dirmngr/crlcache.c:623
- #, fuzzy, c-format
+ #, c-format
msgid "invalid line detected in '%s' line %u\n"
- msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+ msgstr "fant ugyldig linje i «%s» på linje %u\n"
+#: dirmngr/crlcache.c:632
- #, fuzzy, c-format
+ #, c-format
msgid "duplicate entry detected in '%s' line %u\n"
- msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
+ msgstr "fant duplikat i «%s» på linje %u\n"
+#: dirmngr/crlcache.c:647
#, c-format
msgid "unsupported record type in '%s' line %u skipped\n"
- msgstr ""
+ msgstr "hoppet over ugyldig elementtype i «%s», linje %u\n"
+#: dirmngr/crlcache.c:673
- #, fuzzy, c-format
+ #, c-format
msgid "invalid issuer hash in '%s' line %u\n"
- msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+ msgstr "ugyldig utsteder-kontrollsum i «%s», linje %u\n"
+#: dirmngr/crlcache.c:679
- #, fuzzy, c-format
+ #, c-format
msgid "no issuer DN in '%s' line %u\n"
- msgstr "lesefeil ved �%s�: %s\n"
+ msgstr "ingen utsteder-DN i «%s», linje %u\n"
+#: dirmngr/crlcache.c:686
- #, fuzzy, c-format
+ #, c-format
msgid "invalid timestamp in '%s' line %u\n"
- msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+ msgstr "ugyldig tidsstempel i «%s» på linje %u\n"
+#: dirmngr/crlcache.c:692
- #, fuzzy, c-format
- #| msgid "WARNING: invalid size of random_seed file - not used\n"
+ #, c-format
msgid "WARNING: invalid cache file hash in '%s' line %u\n"
- msgstr "ADVARSEL: ugyldig st�rrelse p� random_seed-fila - ikke brukt\n"
+ msgstr "ADVARSEL: ugyldig kontrollsum av hurtiglager-fil i %s», linje %u\n"
+#: dirmngr/crlcache.c:698
msgid "detected errors in cache dir file\n"
- msgstr ""
+ msgstr "fant feil i oppsettsfil for hurtiglager-mappe\n"
+#: dirmngr/crlcache.c:699
msgid "please check the reason and manually delete that file\n"
- msgstr ""
+ msgstr "kontroller årsaken og slett fila manuelt\n"
+#: dirmngr/crlcache.c:827 dirmngr/crlcache.c:841
- #, fuzzy, c-format
+ #, c-format
msgid "failed to create temporary cache dir file '%s': %s\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "klarte ikke å lage midlertidig hurtiglagermappe-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:937
- #, fuzzy, c-format
+ #, c-format
msgid "error closing '%s': %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under lukking av «%s»: %s\n"
+#: dirmngr/crlcache.c:949
- #, fuzzy, c-format
- #| msgid "error reading `%s': %s\n"
+ #, c-format
msgid "error renaming '%s' to '%s': %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
+#: dirmngr/crlcache.c:1003
- #, fuzzy, c-format
- #| msgid "can't access `%s': %s\n"
+ #, c-format
msgid "can't hash '%s': %s\n"
- msgstr "kan ikke aksere �%s�: %s\n"
+ msgstr "klarte ikke å summere «%s»: %s\n"
+#: dirmngr/crlcache.c:1011
- #, fuzzy, c-format
+ #, c-format
msgid "error setting up MD5 hash context: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under oppsett av MD5-summeringskontekst: %s\n"
+#: dirmngr/crlcache.c:1027
- #, fuzzy, c-format
- #| msgid "error in `%s': %s\n"
+ #, c-format
msgid "error hashing '%s': %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under summering av «%s»: %s\n"
+#: dirmngr/crlcache.c:1055
- #, fuzzy, c-format
+ #, c-format
msgid "invalid formatted checksum for '%s'\n"
- msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
+ msgstr "feilformatert kontrollsum av «%s»\n"
+#: dirmngr/crlcache.c:1108
msgid "too many open cache files; can't open anymore\n"
- msgstr ""
+ msgstr "for mange åpne hurtiglager-filer\n"
+#: dirmngr/crlcache.c:1126
- #, fuzzy, c-format
+ #, c-format
msgid "opening cache file '%s'\n"
- msgstr "signering mislyktes: %s\n"
+ msgstr "åpner hurtiglager-fil «%s»\n"
+#: dirmngr/crlcache.c:1145
- #, fuzzy, c-format
+ #, c-format
msgid "error opening cache file '%s': %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under åpning av hurtiglager-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:1154
#, c-format
msgid "error initializing cache file '%s' for reading: %s\n"
- msgstr ""
+ msgstr "feil under åpning av hurtiglager-fil «%s» for lesing. %s\n"
+#: dirmngr/crlcache.c:1175
msgid "calling unlock_db_file on a closed file\n"
- msgstr ""
+ msgstr "utfører «unlock_db_file» på en lukket fil\n"
+#: dirmngr/crlcache.c:1177
msgid "calling unlock_db_file on an unlocked file\n"
- msgstr ""
+ msgstr "utfører «unlock_db_file» på en fil som ikke er låst\n"
+#: dirmngr/crlcache.c:1231
- #, fuzzy, c-format
+ #, c-format
msgid "failed to create a new cache object: %s\n"
- msgstr "klarte ikke � lagre n�kkelen: %s\n"
+ msgstr "klarte ikke å lage nytt huritglager-objekt: %s\n"
+#: dirmngr/crlcache.c:1286
#, c-format
msgid "no CRL available for issuer id %s\n"
- msgstr ""
+ msgstr "ingen CRL tilgjengelig for utsteder-ID %s\n"
+#: dirmngr/crlcache.c:1293
#, c-format
msgid "cached CRL for issuer id %s too old; update required\n"
- msgstr ""
+ msgstr "hurtiglagret CRL for utsteder-ID %s er for gammel, og må oppdateres\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» er slått på og %d minutter er gått for utsteder-ID %s. "
+ "Oppdater hurtiglager.\n"
+#: dirmngr/crlcache.c:1315
#, c-format
msgid "force-crl-refresh active for issuer id %s; update required\n"
msgstr ""
+ "«force-crl-refresh» er slått på for utsteder-ID %s. Oppdater hurtiglager.\n"
+#: dirmngr/crlcache.c:1324
#, c-format
msgid "available CRL for issuer ID %s can't be used\n"
- msgstr ""
+ msgstr "tilgjengelig CRL for utsteder-ID %s kan ikke brukes\n"
+#: dirmngr/crlcache.c:1335
#, c-format
msgid "cached CRL for issuer id %s tampered; we need to update\n"
msgstr ""
+ "hurtiglagret CRL for utsteder-ID %s er endret. Hurtiglager må oppdateres\n"
+#: dirmngr/crlcache.c:1347
msgid "WARNING: invalid cache record length for S/N "
- msgstr ""
+ msgstr "ADVARSEL: ugyldig S/N-lengde på oppføring i hurtiglager"
+#: dirmngr/crlcache.c:1357
- #, fuzzy, c-format
- #| msgid "Error reading backup key from `%s': %s\n"
+ #, c-format
msgid "problem reading cache record for S/N %s: %s\n"
- msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
+ msgstr "feil under lesing av hurtiglager-oppføring 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 ""
+ msgstr "S/N %s er ugyldig. grunn=%02X dato=%.15s\n"
+#: dirmngr/crlcache.c:1371
#, c-format
msgid "S/N %s is valid, it is not listed in the CRL\n"
- msgstr ""
+ msgstr "S/N %s er gyldig, men står ikke i CRL\n"
+#: dirmngr/crlcache.c:1379
- #, fuzzy, c-format
+ #, c-format
msgid "error getting data from cache file: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av data fra hurtiglager-fil: %s\n"
+#: dirmngr/crlcache.c:1542 dirmngr/validate.c:882
- #, fuzzy, c-format
- #| msgid "invalid hash algorithm `%s'\n"
+ #, c-format
msgid "unknown hash algorithm '%s'\n"
- msgstr "ugyldig hashalgoritme �%s�\n"
+ msgstr "«%s» er en ugyldig summeringsalgoritme\n"
+#: dirmngr/crlcache.c:1549
#, c-format
msgid "gcry_md_open for algorithm %d failed: %s\n"
- msgstr ""
+ msgstr "«gcry_md_open» for algoritme %d mislyktes. %s\n"
+#: dirmngr/crlcache.c:1586 dirmngr/crlcache.c:1605
msgid "got an invalid S-expression from libksba\n"
- msgstr ""
+ msgstr "fikk ugyldig S-uttrykk fra libksba\n"
+#: dirmngr/crlcache.c:1593 dirmngr/crlcache.c:1612 dirmngr/misc.c:174
- #, fuzzy, c-format
+ #, c-format
msgid "converting S-expression failed: %s\n"
- msgstr "signering mislyktes: %s\n"
+ msgstr "konvertering av S-uttrykk mislyktes: %s\n"
+#: dirmngr/crlcache.c:1627 dirmngr/ocsp.c:425
- #, fuzzy, c-format
+ #, c-format
msgid "creating S-expression failed: %s\n"
- msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+ msgstr "oppretting av S-uttrykk mislyktes: %s\n"
+#: dirmngr/crlcache.c:1699
- #, fuzzy, c-format
- #| msgid "keyserver send failed: %s\n"
+ #, c-format
msgid "ksba_crl_parse failed: %s\n"
- msgstr "sending til n�kkelserver mislyktes: %s\n"
+ msgstr "ksba_crl_parse mislyktes: %s\n"
+#: dirmngr/crlcache.c:1714
- #, fuzzy, c-format
+ #, c-format
msgid "error getting update times of CRL: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av CRL-oppdateringstid: %s\n"
+#: dirmngr/crlcache.c:1721
#, c-format
msgid "update times of this CRL: this=%s next=%s\n"
- msgstr ""
+ msgstr "oppdateringstider for gjeldende CRL: denne=%s neste=%s\n"
+#: dirmngr/crlcache.c:1725
msgid "nextUpdate not given; assuming a validity period of one day\n"
- msgstr ""
+ msgstr "«nextUpdate» ikke oppgitt. Antar én dags gyldighet\n"
+#: dirmngr/crlcache.c:1745
- #, fuzzy, c-format
- #| msgid "error getting new PIN: %s\n"
+ #, c-format
msgid "error getting CRL item: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av CRL-element: %s\n"
+#: dirmngr/crlcache.c:1760
- #, fuzzy, c-format
+ #, c-format
msgid "error inserting item into temporary cache file: %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under innsetting av element i midlertidig hurtiglager-fil: %s\n"
+#: dirmngr/crlcache.c:1787
- #, fuzzy, c-format
+ #, c-format
msgid "no CRL issuer found in CRL: %s\n"
- msgstr "generere et opphevingssertifikat"
+ msgstr "fant ingen CRL-utsteder i CRL: %s\n"
+#: dirmngr/crlcache.c:1802
msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
- msgstr ""
+ msgstr "finner CRL-utstedersertifikat med «authorityKeyIdentifier»\n"
+#: dirmngr/crlcache.c:1847
- #, fuzzy, c-format
- #| msgid "Key generation failed: %s\n"
+ #, c-format
msgid "CRL signature verification failed: %s\n"
- msgstr "N�kkelgenerering mislyktes: %s\n"
+ msgstr "CRL-signaturbekreftelse mislyktes: %s\n"
+#: dirmngr/crlcache.c:1858
- #, fuzzy, c-format
+ #, c-format
msgid "error checking validity of CRL issuer certificate: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under kontroll av gyldighet for CRL-utstedersertifikat: %s\n"
+#: dirmngr/crlcache.c:2001
- #, fuzzy, c-format
+ #, c-format
msgid "ksba_crl_new failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "ksba_crl_new mislyktes: %s\n"
+#: dirmngr/crlcache.c:2008
- #, fuzzy, c-format
+ #, c-format
msgid "ksba_crl_set_reader failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "ksba_crl_set_reader mislyktes: %s\n"
+#: dirmngr/crlcache.c:2042
- #, fuzzy, c-format
+ #, c-format
msgid "removed stale temporary cache file '%s'\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "fjernet ødelagt midlertidig hurtiglager-fil «%s»\n"
+#: dirmngr/crlcache.c:2046
- #, fuzzy, c-format
+ #, c-format
msgid "problem removing stale temporary cache file '%s': %s\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "feil under fjerning av ødelagt midlertidig hurtiglager-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:2056
- #, fuzzy, c-format
+ #, c-format
msgid "error creating temporary cache file '%s': %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under opprettelse av midlertidig hurtiglager-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:2066
- #, fuzzy, c-format
- #| msgid "update secret failed: %s\n"
+ #, c-format
msgid "crl_parse_insert failed: %s\n"
- msgstr "oppdatering av hemmelig mislyktes: %s\n"
+ msgstr "crl_parse_insert mislyktes: %s\n"
+#: dirmngr/crlcache.c:2076
- #, fuzzy, c-format
+ #, c-format
msgid "error finishing temporary cache file '%s': %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under ferdigstillelse av midlertidig hurtiglager-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:2083
- #, fuzzy, c-format
+ #, c-format
msgid "error closing temporary cache file '%s': %s\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "feil under lukking av midlertidig hurtiglager-fil «%s»: %s\n"
+#: dirmngr/crlcache.c:2108
#, c-format
msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
msgstr ""
+ "ADVARSEL: ny CRL er fremdeles for gammel (utgått %s). Laster inn likevel\n"
+#: dirmngr/crlcache.c:2112
#, c-format
msgid "new CRL still too old; it expired on %s\n"
- msgstr ""
+ msgstr "ny CRL er fremdeles for gammel (utgått %s)\n"
+#: dirmngr/crlcache.c:2128
#, c-format
msgid "unknown critical CRL extension %s\n"
- msgstr ""
+ msgstr "%s er en ukjent kritisk CRL-utvidelse\n"
+#: dirmngr/crlcache.c:2138
- #, fuzzy, c-format
+ #, c-format
msgid "error reading CRL extensions: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av CRL-utvidelser: %s\n"
+#: dirmngr/crlcache.c:2189
- #, fuzzy, c-format
+ #, c-format
msgid "creating cache file '%s'\n"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "lager hurtiglager-fil «%s»\n"
+#: dirmngr/crlcache.c:2221
- #, fuzzy, c-format
- #| msgid "renaming `%s' to `%s' failed: %s\n"
+ #, c-format
msgid "problem renaming '%s' to '%s': %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "klarte ikke å endre navn på «%s» til «%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 ""
+ "oppdatering av DIR-fil mislyktes. Hurtiglager-oppføring går tapt neste gang "
+ "programmet starter\n"
+#: dirmngr/crlcache.c:2272
#, c-format
msgid "Begin CRL dump (retrieved via %s)\n"
- msgstr ""
+ msgstr "Start CRL-utskrift (hentet 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 ""
+ " FEIL: CRL blir ikke brukt fordi den fremdeles var for gammel etter "
+ "oppdatering.\n"
+#: dirmngr/crlcache.c:2298
msgid ""
" ERROR: The CRL will not be used due to an unknown critical extension!\n"
- msgstr ""
+ msgstr " FEIL: CRL blir ikke brukt fordi en kritisk utvidelse er ukjent.\n"
+#: dirmngr/crlcache.c:2301
msgid " ERROR: The CRL will not be used\n"
- msgstr ""
+ msgstr " FEIL: CRL blir ikke brukt\n"
+#: dirmngr/crlcache.c:2308
msgid " ERROR: This cached CRL may have been tampered with!\n"
- msgstr ""
+ msgstr " FEIL: Huriglagret CRL kan ha blitt endret av uvedkommende.\n"
+#: dirmngr/crlcache.c:2326
- #, fuzzy
- #| msgid "WARNING: invalid size of random_seed file - not used\n"
msgid " WARNING: invalid cache record length\n"
- msgstr "ADVARSEL: ugyldig st�rrelse p� random_seed-fila - ikke brukt\n"
+ msgstr " ADVARSEL: ugyldig lengde på oppføring i hurtiglager\n"
+#: dirmngr/crlcache.c:2333
- #, fuzzy, c-format
+ #, c-format
msgid "problem reading cache record: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "klarte ikke å lese hurtiglager-oppføring: %s\n"
+#: dirmngr/crlcache.c:2344
- #, fuzzy, c-format
- #| msgid "error reading keyblock: %s\n"
+ #, c-format
msgid "problem reading cache key: %s\n"
- msgstr "feil ved lesing av n�kkelblokk: %s\n"
+ msgstr "klarte ikke å lese hurtiglager-nøkkel: %s\n"
+#: dirmngr/crlcache.c:2375
- #, fuzzy, c-format
+ #, c-format
msgid "error reading cache entry from db: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av hurtiglager-oppføring fra db: %s\n"
+#: dirmngr/crlcache.c:2378
msgid "End CRL dump\n"
- msgstr ""
+ msgstr "Avslutt CRL-utskrift\n"
+#: dirmngr/crlcache.c:2499
- #, fuzzy, c-format
+ #, c-format
msgid "crl_fetch via DP failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "crl_fetch via DP mislyktes: %s\n"
+#: dirmngr/crlcache.c:2510
- #, fuzzy, c-format
+ #, c-format
msgid "crl_cache_insert via DP failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "crl_cache_insert via DP mislyktes: %s\n"
+#: dirmngr/crlcache.c:2570
- #, fuzzy, c-format
+ #, c-format
msgid "crl_cache_insert via issuer failed: %s\n"
- msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+ msgstr "crl_cache_insert via utsteder mislyktes: %s\n"
+#: dirmngr/crlfetch.c:74
msgid "reader to file mapping table full - waiting\n"
- msgstr ""
+ msgstr "tilknytningstabell for overføring fra leser til fil er full. Venter\n"
+#: dirmngr/crlfetch.c:182
msgid "using \"http\" instead of \"https\"\n"
- msgstr ""
+ msgstr "bruker «http» i stedet for «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 ""
+ msgstr "Ingen CRL-tilgang fordi %s er slått av\n"
+#: dirmngr/crlfetch.c:223 dirmngr/ldap-wrapper-ce.c:488
+#: dirmngr/ldap-wrapper.c:742 dirmngr/misc.c:563
- #, fuzzy, c-format
+ #, c-format
msgid "error initializing reader object: %s\n"
- msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+ msgstr "feil under innlasting av leserobjekt: %s\n"
+#: dirmngr/crlfetch.c:249 dirmngr/ocsp.c:218
#, c-format
msgid "URL '%s' redirected to '%s' (%u)\n"
- msgstr ""
+ msgstr "Videresendt fra adresse «%s» til «%s» (%u)\n"
+#: dirmngr/crlfetch.c:268 dirmngr/ocsp.c:235
- #, fuzzy
- #| msgid "too many cipher preferences\n"
msgid "too many redirections\n"
- msgstr "for mange cipher-preferanser\n"
+ msgstr "for mange videresendinger\n"
+#: dirmngr/crlfetch.c:274
- #, fuzzy, c-format
+ #, c-format
msgid "error retrieving '%s': %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under henting av «%s»: %s\n"
+#: dirmngr/crlfetch.c:279
- #, fuzzy, c-format
+ #, c-format
msgid "error retrieving '%s': http status %u\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under henting av «%s»: http-status %u\n"
+#: dirmngr/crlfetch.c:296 dirmngr/crlfetch.c:322 dirmngr/crlfetch.c:354
+#: dirmngr/crlfetch.c:381
- #, fuzzy
msgid "CRL access not possible due to Tor mode\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "Ingen CRL-tilgang i Tor-modus\n"
+#: dirmngr/crlfetch.c:386
- #, fuzzy, c-format
+ #, c-format
msgid "certificate search not possible due to disabled %s\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "sertifikatsøk ikke tilgjengelig fordi %s er slått av\n"
+#: dirmngr/dirmngr-client.c:71
msgid "use OCSP instead of CRLs"
- msgstr ""
+ msgstr "bruk OCSP i stedet for CRL"
+#: dirmngr/dirmngr-client.c:72
msgid "check whether a dirmngr is running"
- msgstr ""
+ msgstr "kontroller om en dirmngr kjører"
+#: dirmngr/dirmngr-client.c:73
- #, fuzzy
msgid "add a certificate to the cache"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "legg til sertifikat i hurtiglager"
+#: dirmngr/dirmngr-client.c:74
- #, fuzzy
msgid "validate a certificate"
- msgstr "ugyldig sertifikat"
+ msgstr "kontroller sertifikat"
+#: dirmngr/dirmngr-client.c:75
- #, fuzzy
msgid "lookup a certificate"
- msgstr "ugyldig sertifikat"
+ msgstr "slå opp sertifikat"
+#: dirmngr/dirmngr-client.c:76
- #, fuzzy
msgid "lookup only locally stored certificates"
- msgstr "ugyldig sertifikat"
+ msgstr "bare slå opp lokalt lagrede sertifikater"
+#: dirmngr/dirmngr-client.c:77
msgid "expect an URL for --lookup"
- msgstr ""
+ msgstr "forvent nettadresse for «--lookup»"
+#: dirmngr/dirmngr-client.c:78
msgid "load a CRL into the dirmngr"
- msgstr ""
+ msgstr "last inn CRL i dirmngr"
+#: dirmngr/dirmngr-client.c:79
msgid "special mode for use by Squid"
- msgstr ""
+ msgstr "spesialmodus til bruk med Squid"
+#: dirmngr/dirmngr-client.c:80
- #, fuzzy
msgid "expect certificates in PEM format"
- msgstr "ugyldig sertifikat"
+ msgstr "forvent sertifikater i PEM-format"
+#: dirmngr/dirmngr-client.c:82
msgid "force the use of the default OCSP responder"
- msgstr ""
+ msgstr "tving bruk av forvalgt OCSP-svartjeneste"
+#: 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)"
+ msgstr "Bruk: dirmngr-client [valg] [sert-fil|mønster] (-h for hjelp)\n"
+#: dirmngr/dirmngr-client.c:173
msgid ""
"Syntax: dirmngr-client [options] [certfile|pattern]\n"
"Test an X.509 certificate against a CRL or do an OCSP check\n"
"The process returns 0 if the certificate is valid, 1 if it is\n"
"not valid and other error codes for general failures\n"
msgstr ""
+ "Syntaks: dirmngr-client [valg] [sert-fil|mønster]\n"
+ "Kontroller X.509-sertifikat mot CRL eller utfør OCSP-kontroll.\n"
+ "Avslutningskode er 0 hvis sertifikatet er gyldig, 1 hvis\n"
+ "ugyldig og annet for generelle programfeil\n"
+#: dirmngr/dirmngr-client.c:274 dirmngr/dirmngr-client.c:904
- #, fuzzy, c-format
+ #, c-format
msgid "error reading certificate from stdin: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under lesing av sertifikat fra stdin: %s\n"
+#: dirmngr/dirmngr-client.c:281
- #, fuzzy, c-format
+ #, c-format
msgid "error reading certificate from '%s': %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av sertifikat fra «%s»: %s\n"
+#: dirmngr/dirmngr-client.c:295
msgid "certificate too large to make any sense\n"
- msgstr ""
+ msgstr "sertifikatet er for stort til at det gir mening\n"
+#: dirmngr/dirmngr-client.c:310
- #, fuzzy, c-format
+ #, c-format
msgid "can't connect to the dirmngr: %s\n"
- msgstr "kan ikke �pne n�kkelknippet"
+ msgstr "klarte ikke å koble til dirmngr: %s\n"
+#: dirmngr/dirmngr-client.c:332
- #, fuzzy, c-format
- #| msgid "update failed: %s\n"
+ #, c-format
msgid "lookup failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "oppslag mislyktes: %s\n"
+#: dirmngr/dirmngr-client.c:347
- #, fuzzy, c-format
- #| msgid "renaming `%s' to `%s' failed: %s\n"
+ #, c-format
msgid "loading CRL '%s' failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "innlasting av CRL «%s» mislyktes: %s\n"
+#: dirmngr/dirmngr-client.c:375
msgid "a dirmngr daemon is up and running\n"
- msgstr ""
+ msgstr "dirmngr kjører i bakgrunnen\n"
+#: dirmngr/dirmngr-client.c:397
- #, fuzzy, c-format
+ #, c-format
msgid "validation of certificate failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "kontroll av sertifikat mislyktes: %s\n"
+#: dirmngr/dirmngr-client.c:404 dirmngr/dirmngr-client.c:915
- #, fuzzy
msgid "certificate is valid\n"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "sertifikatet er gyldig\n"
+#: dirmngr/dirmngr-client.c:410 dirmngr/dirmngr-client.c:923
- #, fuzzy
msgid "certificate has been revoked\n"
- msgstr "Denne n�kkelen er utg�tt!"
+ msgstr "sertifikatet er opphevet\n"
+#: dirmngr/dirmngr-client.c:415 dirmngr/dirmngr-client.c:925
- #, fuzzy, c-format
+ #, c-format
msgid "certificate check failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "sertifikatkontroll mislyktes: %s\n"
+#: dirmngr/dirmngr-client.c:428
- #, fuzzy, c-format
- #| msgid "can't stat `%s': %s\n"
+ #, c-format
msgid "got status: '%s'\n"
- msgstr "kan ikke stat() �%s�: %s\n"
+ msgstr "fikk status: «%s»\n"
+#: dirmngr/dirmngr-client.c:443
- #, fuzzy, c-format
- #| msgid "error writing secret keyring `%s': %s\n"
+ #, c-format
msgid "error writing base64 encoding: %s\n"
- msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
+ msgstr "feil under skriving av base64-koding: %s\n"
+#: dirmngr/dirmngr-client.c:701
- #, fuzzy, c-format
+ #, c-format
msgid "unsupported inquiry '%s'\n"
- msgstr ""
- "\n"
- "St�ttede algoritmer:\n"
+ msgstr "spørringa «%s» støttes ikke\n"
+#: dirmngr/dirmngr-client.c:803
msgid "absolute file name expected\n"
- msgstr ""
+ msgstr "forventet fullstendig filsti\n"
+#: dirmngr/dirmngr-client.c:848
#, c-format
msgid "looking up '%s'\n"
- msgstr ""
+ msgstr "slår opp «%s»\n"
+#: dirmngr/dirmngr.c:159
msgid "run as windows service (background)"
- msgstr ""
+ msgstr "kjør som windows-tjeneste (i bakgrunnen)"
+#: dirmngr/dirmngr.c:161
msgid "list the contents of the CRL cache"
- msgstr ""
+ msgstr "vis innhold i CRL-hurtiglager"
+#: dirmngr/dirmngr.c:162
- #, fuzzy
msgid "|FILE|load CRL from FILE into cache"
- msgstr "leser valg fra �%s�\n"
+ msgstr "|FIL|last inn CRL fra valgt FIL i hurtiglager"
+#: dirmngr/dirmngr.c:163
msgid "|URL|fetch a CRL from URL"
- msgstr ""
+ msgstr "|ADR|hent CRL fra valgt nettADResse"
+#: dirmngr/dirmngr.c:164
msgid "shutdown the dirmngr"
- msgstr ""
+ msgstr "slå av dirmngr"
+#: dirmngr/dirmngr.c:165
msgid "flush the cache"
- msgstr ""
+ msgstr "tøm hurtiglager"
+#: 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 ""
+ msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
+#: dirmngr/dirmngr.c:181
- #, fuzzy
- #| msgid "Quit without saving? (y/N) "
msgid "run without asking a user"
- msgstr "Avslutte uten � lagre? (j/N) "
+ msgstr "kjør uten å spørre bruker"
+#: dirmngr/dirmngr.c:182
msgid "force loading of outdated CRLs"
- msgstr ""
+ msgstr "tving innlasting av utdatert CRL"
+#: dirmngr/dirmngr.c:183
msgid "allow sending OCSP requests"
- msgstr ""
+ msgstr "tillat sending av OCSP-forespørsler"
+#: dirmngr/dirmngr.c:184
msgid "inhibit the use of HTTP"
- msgstr ""
+ msgstr "hindre bruk av HTTP"
+#: dirmngr/dirmngr.c:185
msgid "inhibit the use of LDAP"
- msgstr ""
+ msgstr "hindre bruk av LDAP"
+#: dirmngr/dirmngr.c:187
msgid "ignore HTTP CRL distribution points"
- msgstr ""
+ msgstr "ignorer HTTP CRL-distribusjonspunkter"
+#: dirmngr/dirmngr.c:189
msgid "ignore LDAP CRL distribution points"
- msgstr ""
+ msgstr "ignorer LDAP CRL-distribusjonspunkter"
+#: dirmngr/dirmngr.c:191
msgid "ignore certificate contained OCSP service URLs"
- msgstr ""
+ msgstr "ignorer OSCP-tjenesteadresser som følger sertifikater"
+#: dirmngr/dirmngr.c:194
msgid "|URL|redirect all HTTP requests to URL"
- msgstr ""
+ msgstr "|ADR|videresend alle HTTP-forespørsler til valgt nettADResse"
+#: dirmngr/dirmngr.c:196
msgid "|HOST|use HOST for LDAP queries"
- msgstr ""
+ msgstr "|VERT|bruk valgt VERT til LDAP-oppslag"
+#: dirmngr/dirmngr.c:198
msgid "do not use fallback hosts with --ldap-proxy"
- msgstr ""
+ msgstr "ikke bruk tilbakefallsverter ved bruk av valget «--ldap-proxy»"
+#: dirmngr/dirmngr.c:201
- #, fuzzy
msgid "|FILE|read LDAP server list from FILE"
- msgstr "leser valg fra �%s�\n"
+ msgstr "|FIL|les LDAP-tjenerliste fra valgt FIL"
+#: dirmngr/dirmngr.c:203
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
+ "legg til tjenere i tjenerliste som blir oppdaget via CRL-distribusjonspunkter"
+#: dirmngr/dirmngr.c:206 dirmngr/dirmngr_ldap.c:137
msgid "|N|set LDAP timeout to N seconds"
- msgstr ""
+ msgstr "|N|endre LDAP-tidsavbrudd til N antall sekunder"
+#: dirmngr/dirmngr.c:209
- #, fuzzy
msgid "|URL|use OCSP responder at URL"
- msgstr "kunne ikke parse n�kkelserverens URL\n"
+ msgstr "|ADR|bruk OCSP-svartjeneste ved valgt nettADResse"
+#: dirmngr/dirmngr.c:211
msgid "|FPR|OCSP response signed by FPR"
- msgstr ""
+ msgstr "|FPR|OCSP-svartjeneste signert av FPR"
+#: dirmngr/dirmngr.c:217
msgid "|N|do not return more than N items in one query"
- msgstr ""
+ msgstr "|N|ikke vis flere enn N antall elementer per spørring"
+#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
- msgstr ""
+ msgstr "|FIL|bruk CA-sertifikater i valgt FIL til HKP via TLS"
+#: dirmngr/dirmngr.c:224
msgid "route all network traffic via Tor"
- msgstr ""
+ msgstr "kjør all nettverkstrafikk gjennom Tor"
+#: dirmngr/dirmngr.c:241
- #, fuzzy
- #| msgid ""
- #| "@\n"
- #| "(See the man page for a complete listing of all commands and options)\n"
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
"options)\n"
msgstr ""
"@\n"
- "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
+ "Se «info»-bruksanvisning for fullstendig liste over alle kommandoer og valg\n"
+#: dirmngr/dirmngr.c:353
- #, fuzzy
msgid "Usage: @DIRMNGR@ [options] (-h for help)"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: @DIRMNGR@ [valg] (-h for hjelp)"
+#: dirmngr/dirmngr.c:355
msgid ""
"Syntax: @DIRMNGR@ [options] [command [args]]\n"
"Keyserver, CRL, and OCSP access for @GNUPG@\n"
msgstr ""
+ "Syntaks: @DIRMNGR@ [valg] [kommando [arg]]\n"
+ "Tilgang til nøkkeltjener, CRL og OCSP for @GNUPG@\n"
+#: dirmngr/dirmngr.c:435
#, c-format
msgid "valid debug levels are: %s\n"
- msgstr ""
+ msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
- #, fuzzy, c-format
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
+ #, c-format
msgid "usage: %s [options] "
- msgstr "bruksm�te: gpg [valg] "
+ msgstr "bruk: %s [valg] "
+#: dirmngr/dirmngr.c:1123
- #, fuzzy
- #| msgid "%s not allowed with %s!\n"
msgid "colons are not allowed in the socket name\n"
- msgstr "%s er ikke tillatt sammen med %s!\n"
+ msgstr "kolon tillates ikke i sokkelnavn\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
- #, fuzzy, c-format
- #| msgid "renaming `%s' to `%s' failed: %s\n"
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
+ #, c-format
msgid "fetching CRL from '%s' failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "henting av CRL fra «%s» mislyktes: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
- #, fuzzy, c-format
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
+ #, c-format
msgid "processing CRL from '%s' failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
+#: dirmngr/dirmngr.c:1594
- #, fuzzy, c-format
+ #, c-format
msgid "%s:%u: line too long - skipped\n"
- msgstr "for lang linje"
+ msgstr "%s:%u: for lang linje. Hoppet over\n"
+#: dirmngr/dirmngr.c:1649 dirmngr/dirmngr.c:1733
- #, fuzzy, c-format
- #| msgid "invalid fingerprint"
+ #, c-format
msgid "%s:%u: invalid fingerprint detected\n"
- msgstr "ugyldig fingeravtrykk"
+ msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
+#: dirmngr/dirmngr.c:1685 dirmngr/dirmngr.c:1711
- #, fuzzy, c-format
- #| msgid "read error in `%s': %s\n"
+ #, c-format
msgid "%s:%u: read error: %s\n"
- msgstr "lesefeil ved �%s�: %s\n"
+ msgstr "%s:%u: lesefeil: %s\n"
+#: dirmngr/dirmngr.c:1740
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
- msgstr ""
+ msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
+#: dirmngr/dirmngr.c:1807
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
- msgstr ""
+ msgstr "SIGHUP mottatt. Leser inn oppsett på nytt og tømmer hurtiglagre\n"
+#: dirmngr/dirmngr.c:1834
msgid "SIGUSR2 received - no action defined\n"
- msgstr ""
+ msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
+#: dirmngr/dirmngr.c:1839 dirmngr/dirmngr.c:1930
msgid "SIGTERM received - shutting down ...\n"
- msgstr ""
+ msgstr "SIGTERM mottatt. Slår av …\n"
+#: dirmngr/dirmngr.c:1841
#, c-format
msgid "SIGTERM received - still %d active connections\n"
- msgstr ""
+ msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
+#: dirmngr/dirmngr.c:1846 dirmngr/dirmngr.c:1933
- #, fuzzy
- #| msgid "not forced"
msgid "shutdown forced\n"
- msgstr "ikke tvunget"
+ msgstr "slår av under tvang\n"
+#: dirmngr/dirmngr.c:1854
msgid "SIGINT received - immediate shutdown\n"
- msgstr ""
+ msgstr "SIGINT mottatt. Slår av umiddelbart\n"
+#: dirmngr/dirmngr.c:1861
#, c-format
msgid "signal %d received - no action defined\n"
- msgstr ""
+ msgstr "signal %d mottatt. Ingen handling definert\n"
+#: dirmngr/dirmngr_ldap.c:138
msgid "return all values in a record oriented format"
- msgstr ""
+ msgstr "vis alle verdier i oppføringsorientert format"
+#: dirmngr/dirmngr_ldap.c:141
msgid "|NAME|ignore host part and connect through NAME"
- msgstr ""
+ msgstr "|NAVN|ignorer vertsdel og koble til med NAVN"
+#: dirmngr/dirmngr_ldap.c:142
- #, fuzzy
msgid "|NAME|connect to host NAME"
- msgstr "|NAVN|kryptere for NAVN"
+ msgstr "|NAVN|koble til valgt vertsNAVN"
+#: dirmngr/dirmngr_ldap.c:143
msgid "|N|connect to port N"
- msgstr ""
+ msgstr "|N|koble til port N"
+#: dirmngr/dirmngr_ldap.c:144
msgid "|NAME|use user NAME for authentication"
- msgstr ""
+ msgstr "|NAVN|bruk valgt brukerNAVN til autentisering"
+#: dirmngr/dirmngr_ldap.c:145
msgid "|PASS|use password PASS for authentication"
- msgstr ""
+ msgstr "|PASS|bruk valgt PASSord til autentisering "
+#: dirmngr/dirmngr_ldap.c:147
msgid "take password from $DIRMNGR_LDAP_PASS"
- msgstr ""
+ msgstr "hent passord fra $DIRMNGR_LDAP_PASS"
+#: dirmngr/dirmngr_ldap.c:148
msgid "|STRING|query DN STRING"
- msgstr ""
+ msgstr "|STRENG|utfør spørring med valgt DN-STRENG"
+#: dirmngr/dirmngr_ldap.c:149
msgid "|STRING|use STRING as filter expression"
- msgstr ""
+ msgstr "|STRENG|bruk valgt STRENG som filteruttrykk"
+#: dirmngr/dirmngr_ldap.c:150
msgid "|STRING|return the attribute STRING"
- msgstr ""
+ msgstr "|STRENG|vis attributt valgt med STRENG"
+#: dirmngr/dirmngr_ldap.c:209
- #, fuzzy
- #| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: dirmngr_ldap [options] [URL] (-h for help)\n"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: dirmngr_ldap [valg] [ADR] (-h for hjelp)\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 ""
+ "Syntaks: dirmngr_ldap [valg] [ADR]\n"
+ "Internt LDAP-hjelpeverktøy for Dirmngr\n"
+ "Grensesnitt og valgmuligheter kan endres uten varsel\n"
+#: dirmngr/dirmngr_ldap.c:337
- #, fuzzy, c-format
- #| msgid "invalid import options\n"
+ #, c-format
msgid "invalid port number %d\n"
- msgstr "ugyldige importvalg\n"
+ msgstr "portnummer %d er ugyldig\n"
+#: dirmngr/dirmngr_ldap.c:413
#, c-format
msgid "scanning result for attribute '%s'\n"
- msgstr ""
+ msgstr "ser gjennom treff for attributt «%s»\n"
+#: dirmngr/dirmngr_ldap.c:420 dirmngr/dirmngr_ldap.c:503
+#: dirmngr/dirmngr_ldap.c:527 dirmngr/dirmngr_ldap.c:539
+#: dirmngr/dirmngr_ldap.c:677
- #, fuzzy, c-format
+ #, c-format
msgid "error writing to stdout: %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under skriving til std.utkanal: %s\n"
+#: dirmngr/dirmngr_ldap.c:437
#, c-format
msgid " available attribute '%s'\n"
- msgstr ""
+ msgstr " tilgjengelig attributt «%s»\n"
+#: dirmngr/dirmngr_ldap.c:475
- #, fuzzy, c-format
+ #, c-format
msgid "attribute '%s' not found\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "fant ikke attributt «%s»\n"
+#: dirmngr/dirmngr_ldap.c:482
#, c-format
msgid "found attribute '%s'\n"
- msgstr ""
+ msgstr "fant attributt «%s»\n"
+#: dirmngr/dirmngr_ldap.c:591
- #, fuzzy, c-format
- #| msgid "reading from `%s'\n"
+ #, c-format
msgid "processing url '%s'\n"
- msgstr "leser fra �%s�\n"
+ msgstr "behandler adresse «%s»\n"
+#: dirmngr/dirmngr_ldap.c:593
- #, fuzzy, c-format
- #| msgid " w/o user IDs: %lu\n"
+ #, c-format
msgid " user '%s'\n"
- msgstr " uten brukerider: %lu\n"
+ msgstr " bruker «%s»\n"
+#: dirmngr/dirmngr_ldap.c:595
- #, fuzzy, c-format
- #| msgid " aka \"%s\""
+ #, c-format
msgid " pass '%s'\n"
- msgstr " aka �%s�"
+ msgstr " passord «%s»\n"
+#: dirmngr/dirmngr_ldap.c:597
- #, fuzzy, c-format
- #| msgid " w/o user IDs: %lu\n"
+ #, c-format
msgid " host '%s'\n"
- msgstr " uten brukerider: %lu\n"
+ msgstr " vert «%s»\n"
+#: dirmngr/dirmngr_ldap.c:598
- #, fuzzy, c-format
- #| msgid " not imported: %lu\n"
+ #, c-format
msgid " port %d\n"
- msgstr " ikke importert: %lu\n"
+ msgstr " port %d\n"
+#: dirmngr/dirmngr_ldap.c:600
- #, fuzzy, c-format
- #| msgid " aka \"%s\""
+ #, c-format
msgid " DN '%s'\n"
- msgstr " aka �%s�"
+ msgstr " DN «%s»\n"
+#: dirmngr/dirmngr_ldap.c:602
#, c-format
msgid " filter '%s'\n"
- msgstr ""
+ msgstr " filter «%s»\n"
+#: dirmngr/dirmngr_ldap.c:607 dirmngr/dirmngr_ldap.c:610
- #, fuzzy, c-format
- #| msgid " aka \"%s\""
+ #, c-format
msgid " attr '%s'\n"
- msgstr " aka �%s�"
+ msgstr " attr «%s»\n"
+#: dirmngr/dirmngr_ldap.c:616
#, c-format
msgid "no host name in '%s'\n"
- msgstr ""
+ msgstr "ingen vertsnavn i «%s»\n"
+#: dirmngr/dirmngr_ldap.c:621
#, c-format
msgid "no attribute given for query '%s'\n"
- msgstr ""
+ msgstr "ingen attributt oppgitt for spørring «%s»\n"
+#: dirmngr/dirmngr_ldap.c:627
- #, fuzzy
- #| msgid "WARNING: using insecure memory!\n"
msgid "WARNING: using first attribute only\n"
- msgstr "ADVARSEL: bruker usikkert minne!\n"
+ msgstr "ADVARSEL: bruker bare første attributt\n"
+#: dirmngr/dirmngr_ldap.c:636
- #, fuzzy, c-format
- #| msgid "renaming `%s' to `%s' failed: %s\n"
+ #, c-format
msgid "LDAP init to '%s:%d' failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "LDAP-init til «%s:%d» mislyktes: %s\n"
+#: dirmngr/dirmngr_ldap.c:659
- #, fuzzy, c-format
- #| msgid "renaming `%s' to `%s' failed: %s\n"
+ #, c-format
msgid "binding to '%s:%d' failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "tilknytning til «%s:%d» mislyktes: %s\n"
+#: dirmngr/dirmngr_ldap.c:686
- #, fuzzy, c-format
- #| msgid "dearmoring failed: %s\n"
+ #, c-format
msgid "searching '%s' failed: %s\n"
- msgstr "dearmoring failed: %s\n"
+ msgstr "søk etter «%s» mislyktes: %s\n"
+#: dirmngr/dirmngr_ldap.c:718
- #, fuzzy, c-format
- #| msgid "`%s' is not a JPEG file\n"
+ #, c-format
msgid "'%s' is not an LDAP URL\n"
- msgstr "�%s� er ikke et JPEG-fil\n"
+ msgstr "«%s» er ikke en LDAP-adresse\n"
+#: dirmngr/dirmngr_ldap.c:724
#, c-format
msgid "'%s' is an invalid LDAP URL\n"
- msgstr ""
+ msgstr "«%s» er en ugyldig LDAP-adresse\n"
+#: dirmngr/ldap-wrapper-ce.c:389 dirmngr/ldap-wrapper.c:676
+#: dirmngr/ldap-wrapper.c:693
- #, fuzzy, c-format
+ #, c-format
msgid "error allocating memory: %s\n"
- msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under tildeling av minne. %s\n"
+#: dirmngr/ldap-wrapper.c:207
- #, fuzzy, c-format
+ #, c-format
msgid "error printing log line: %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under utskrift av logglinje: %s\n"
+#: dirmngr/ldap-wrapper.c:236
- #, fuzzy, c-format
+ #, c-format
msgid "error reading log from ldap wrapper %d: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av logg fra ldap-grensesnitt %d: %s\n"
+#: dirmngr/ldap-wrapper.c:304
- #, fuzzy, c-format
+ #, c-format
msgid "npth_select failed: %s - waiting 1s\n"
- msgstr "oppdatering av hemmelig mislyktes: %s\n"
+ msgstr "npth_select mislyktes: %s - venter 1s\n"
+#: dirmngr/ldap-wrapper.c:343
#, c-format
msgid "ldap wrapper %d ready"
- msgstr ""
+ msgstr "ldap-grensesnitt %d klart"
+#: dirmngr/ldap-wrapper.c:352
#, c-format
msgid "ldap wrapper %d ready: timeout\n"
- msgstr ""
+ msgstr "ldap-grensesnitt %d klart: tidsavbrudd\n"
+#: dirmngr/ldap-wrapper.c:355
#, c-format
msgid "ldap wrapper %d ready: exitcode=%d\n"
- msgstr ""
+ msgstr "ldap-grensesnitt %d klart: avslutningskode=%d\n"
+#: dirmngr/ldap-wrapper.c:364
- #, fuzzy, c-format
+ #, c-format
msgid "waiting for ldap wrapper %d failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "venting på ldap-grensesnitt %d mislyktes: %s\n"
+#: dirmngr/ldap-wrapper.c:376
#, c-format
msgid "ldap wrapper %d stalled - killing\n"
- msgstr ""
+ msgstr "ldap-grensesnitt %d steilet - dreper prosess\n"
+#: dirmngr/ldap-wrapper.c:444
#, c-format
msgid "error spawning ldap wrapper reaper thread: %s\n"
- msgstr ""
+ msgstr "feil under oppbygging av «reaper»-tråd for ldap-grensesnitt: %s\n"
+#: dirmngr/ldap-wrapper.c:496 dirmngr/ldap-wrapper.c:517
- #, fuzzy, c-format
- #| msgid "reading public key failed: %s\n"
+ #, c-format
msgid "reading from ldap wrapper %d failed: %s\n"
- msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+ msgstr "lesing fra ldap-grensesnitt %d mislyktes: %s\n"
+#: dirmngr/ldap.c:91
#, c-format
msgid "invalid char 0x%02x in host name - not added\n"
- msgstr ""
+ msgstr "vertsnavn inneholder ugyldig tegn 0x%02x, og ble ikke lagt til\n"
+#: dirmngr/ldap.c:95
#, c-format
msgid "adding '%s:%d' to the ldap server list\n"
- msgstr ""
+ msgstr "legger til «%s:%d» i ldap-tjenerliste\n"
+#: dirmngr/ldap.c:98 dirmngr/misc.c:502
- #, fuzzy, c-format
+ #, c-format
msgid "malloc failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "malloc mislyktes: %s\n"
+#: dirmngr/ldap.c:627
#, c-format
msgid "start_cert_fetch: invalid pattern '%s'\n"
- msgstr ""
+ msgstr "start_cert_fetch: mønsteret «%s» er ugyldig\n"
+#: dirmngr/ldap.c:840
msgid "ldap_search hit the size limit of the server\n"
- msgstr ""
+ msgstr "ldap_search overskred tjenerens størrelsesgrense\n"
+#: dirmngr/misc.c:170
msgid "invalid canonical S-expression found\n"
- msgstr ""
+ msgstr "fant ugyldig generelt S-uttrykk\n"
+#: dirmngr/misc.c:194 dirmngr/misc.c:228
- #, fuzzy, c-format
+ #, c-format
msgid "gcry_md_open failed: %s\n"
- msgstr "signering mislyktes: %s\n"
+ msgstr "«gcry_md_open» mislyktes: %s\n"
+#: dirmngr/misc.c:199 dirmngr/misc.c:233
- #, fuzzy, c-format
- #| msgid "update secret failed: %s\n"
+ #, c-format
msgid "oops: ksba_cert_hash failed: %s\n"
- msgstr "oppdatering av hemmelig mislyktes: %s\n"
+ msgstr "obs: «ksba_cert_hash» mislyktes: %s\n"
+#: dirmngr/misc.c:518
msgid "bad URL encoding detected\n"
- msgstr ""
+ msgstr "oppdaget ugyldig URL-koding\n"
+#: dirmngr/ocsp.c:80
- #, fuzzy, c-format
+ #, c-format
msgid "error reading from responder: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing fra svartjeneste: %s\n"
+#: dirmngr/ocsp.c:98
- #, fuzzy, c-format
- #| msgid "Error: Private DO too long (limit is %d characters).\n"
+ #, c-format
msgid "response from server too large; limit is %d bytes\n"
- msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
+ msgstr "for store responsdata fra tjener (grense: %d byte)\n"
+#: dirmngr/ocsp.c:139
- #, fuzzy
msgid "OCSP request not possible due to Tor mode\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "OCSP-forespørsel ikke mulig i Tor-modus\n"
+#: dirmngr/ocsp.c:145
msgid "OCSP request not possible due to disabled HTTP\n"
- msgstr ""
+ msgstr "OCSP-forespørsel ikke mulig når HTTP er slått av\n"
+#: dirmngr/ocsp.c:152
- #, fuzzy, c-format
+ #, c-format
msgid "error setting OCSP target: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under endring av OCSP-mål: %s\n"
+#: dirmngr/ocsp.c:170
- #, fuzzy, c-format
+ #, c-format
msgid "error building OCSP request: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under bygging av OCSP-forespørsel: %s\n"
+#: dirmngr/ocsp.c:181
- #, fuzzy, c-format
+ #, c-format
msgid "error connecting to '%s': %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under tilkobling til «%s»: %s\n"
+#: dirmngr/ocsp.c:207 dirmngr/ocsp.c:255
- #, fuzzy, c-format
+ #, c-format
msgid "error reading HTTP response for '%s': %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing av HTTP-svar for «%s»: %s\n"
+#: dirmngr/ocsp.c:240
- #, fuzzy, c-format
+ #, c-format
msgid "error accessing '%s': http status %u\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "fikk ikke tilgang til «%s»: http-status %u\n"
+#: dirmngr/ocsp.c:265
- #, fuzzy, c-format
+ #, c-format
msgid "error parsing OCSP response for '%s': %s\n"
- msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+ msgstr "feil under tolking av OCSP-svar for «%s»: %s\n"
+#: dirmngr/ocsp.c:288 dirmngr/ocsp.c:298
#, c-format
msgid "OCSP responder at '%s' status: %s\n"
- msgstr ""
+ msgstr "Status for OCSP-svartjeneste ved «%s»: %s\n"
+#: dirmngr/ocsp.c:293
- #, fuzzy, c-format
+ #, c-format
msgid "hashing the OCSP response for '%s' failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "summering av OCSP-svar for «%s» mislyktes: %s\n"
+#: dirmngr/ocsp.c:328
msgid "not signed by a default OCSP signer's certificate"
- msgstr ""
+ msgstr "ikke signert av sertifikat som tilhører en forvalgt OCSP-fullmektig"
+#: dirmngr/ocsp.c:417
msgid "only SHA-1 is supported for OCSP responses\n"
- msgstr ""
+ msgstr "OSCP-svar skal bare bruke SHA-1\n"
+#: dirmngr/ocsp.c:468
- #, fuzzy, c-format
+ #, c-format
msgid "allocating list item failed: %s\n"
- msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+ msgstr "tildeling av listeelement mislyktes: %s\n"
+#: dirmngr/ocsp.c:483
- #, fuzzy, c-format
- #| msgid "error getting new PIN: %s\n"
+ #, c-format
msgid "error getting responder ID: %s\n"
- msgstr "feil ved henting av ny PIN: %s\n"
+ msgstr "feil under henting av svartjeneste-ID: %s\n"
+#: dirmngr/ocsp.c:518
msgid "no suitable certificate found to verify the OCSP response\n"
- msgstr ""
+ msgstr "fant ingen sertifikat som egner seg til å bekrefte OCSP-svar\n"
+#: dirmngr/ocsp.c:557 dirmngr/validate.c:623
- #, fuzzy, c-format
+ #, c-format
msgid "issuer certificate not found: %s\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "fant ikke utstedersertifikat: %s\n"
+#: dirmngr/ocsp.c:567
msgid "caller did not return the target certificate\n"
- msgstr ""
+ msgstr "klient sendte ikke målsertifikat\n"
+#: dirmngr/ocsp.c:574
- #, fuzzy
msgid "caller did not return the issuing certificate\n"
- msgstr "generere et opphevingssertifikat"
+ msgstr "klient sendte ikke utstedersertifikat\n"
+#: dirmngr/ocsp.c:584
- #, fuzzy, c-format
+ #, c-format
msgid "failed to allocate OCSP context: %s\n"
- msgstr "klarte ikke � lagre n�kkelen: %s\n"
+ msgstr "klarte ikke å tildele OCSP-kontekst: %s\n"
+#: dirmngr/ocsp.c:618
- #, fuzzy, c-format
- #| msgid "can't access `%s': %s\n"
+ #, c-format
msgid "can't get authorityInfoAccess: %s\n"
- msgstr "kan ikke aksere �%s�: %s\n"
+ msgstr "klarte ikke å hente «authorityInfoAccess»: %s\n"
+#: dirmngr/ocsp.c:625
msgid "no default OCSP responder defined\n"
- msgstr ""
+ msgstr "ingen forvalgt OCSP-svartjeneste\n"
+#: dirmngr/ocsp.c:631
- #, fuzzy
- #| msgid "no default secret keyring: %s\n"
msgid "no default OCSP signer defined\n"
- msgstr "ingen standard hemmelig n�kkelknippe: %s\n"
+ msgstr "ingen OCSP-undertegner er definert som standard\n"
+#: dirmngr/ocsp.c:638
#, c-format
msgid "using default OCSP responder '%s'\n"
- msgstr ""
+ msgstr "bruker forvalgt OCSP-svartjeneste «%s»\n"
+#: dirmngr/ocsp.c:643
- #, fuzzy, c-format
- #| msgid "using cipher %s\n"
+ #, c-format
msgid "using OCSP responder '%s'\n"
- msgstr "bruker cipher %s\n"
+ msgstr "bruker OCSP-svartjeneste «%s»\n"
+#: dirmngr/ocsp.c:650
#, c-format
msgid "failed to establish a hashing context for OCSP: %s\n"
- msgstr ""
+ msgstr "klarte ikke å sette opp kontrollsum-kontekst for OCSP: %s\n"
+#: dirmngr/ocsp.c:680
- #, fuzzy, c-format
+ #, c-format
msgid "error getting OCSP status for target certificate: %s\n"
- msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
+ msgstr "feil under henting av OCSP-status for målsertifikat: %s\n"
+#: dirmngr/ocsp.c:705
#, c-format
msgid "certificate status is: %s (this=%s next=%s)\n"
- msgstr ""
+ msgstr "sertifikatstatus er: %s (dette=%s neste=%s)\n"
+#: dirmngr/ocsp.c:706
msgid "good"
- msgstr ""
+ msgstr "bra"
+#: dirmngr/ocsp.c:712
- #, fuzzy, c-format
+ #, c-format
msgid "certificate has been revoked at: %s due to: %s\n"
- msgstr "hemmelig n�kkel �%s� ble ikke funnet: %s\n"
+ msgstr "sertifikat opphevet %s med følgende begrunnelse: %s\n"
+#: dirmngr/ocsp.c:747
msgid "OCSP responder returned a status in the future\n"
- msgstr ""
+ msgstr "OCSP-svartjeneste sendte status datert i fremtid\n"
+#: dirmngr/ocsp.c:759
msgid "OCSP responder returned a non-current status\n"
- msgstr ""
+ msgstr "OCSP-svartjeneste sendte status som ikke er datert i nåtid\n"
+#: dirmngr/ocsp.c:774
msgid "OCSP responder returned an too old status\n"
- msgstr ""
+ msgstr "OCSP-svartjeneste sendte for gammel status\n"
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
- #, fuzzy, c-format
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
+ #, c-format
msgid "assuan_inquire(%s) failed: %s\n"
- msgstr "signering mislyktes: %s\n"
+ msgstr "«assuan_inquire»(%s) mislyktes: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
- msgstr ""
+ msgstr "ldapserver mangler"
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
- msgstr ""
+ msgstr "serienummer mangler i sertifikat-ID"
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
- #, fuzzy, c-format
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
+ #, c-format
msgid "assuan_inquire failed: %s\n"
- msgstr "signering mislyktes: %s\n"
+ msgstr "«assuan_inquire» mislyktes: %s\n"
- #: dirmngr/server.c:1223
- #, fuzzy, c-format
++#: dirmngr/server.c:1232
+ #, c-format
msgid "fetch_cert_by_url failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "«fetch_cert_by_url» mislyktes: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
- #, fuzzy, c-format
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
+ #, c-format
msgid "error sending data: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under sending av data: %s\n"
- #: dirmngr/server.c:1373
- #, fuzzy, c-format
++#: dirmngr/server.c:1382
+ #, c-format
msgid "start_cert_fetch failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "«start_cert_fetch» mislyktes: %s\n"
- #: dirmngr/server.c:1406
- #, fuzzy, c-format
++#: dirmngr/server.c:1415
+ #, c-format
msgid "fetch_next_cert failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "«fetch_next_cert» mislyktes: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
- msgstr ""
+ msgstr "max_replies %d overskredet\n"
- #: dirmngr/server.c:2395
- #, fuzzy, c-format
++#: dirmngr/server.c:2404
+ #, c-format
msgid "can't allocate control structure: %s\n"
- msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+ msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
- #: dirmngr/server.c:2406
- #, fuzzy, c-format
++#: dirmngr/server.c:2415
+ #, c-format
msgid "failed to allocate assuan context: %s\n"
- msgstr "klarte ikke � lagre n�kkelen: %s\n"
+ msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
- #: dirmngr/server.c:2427
- #, fuzzy, c-format
- #| msgid "failed to initialize the TrustDB: %s\n"
++#: dirmngr/server.c:2436
+ #, c-format
msgid "failed to initialize the server: %s\n"
- msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
+ msgstr "klarte ikke å starte opp tjener: %s\n"
- #: dirmngr/server.c:2435
- #, fuzzy, c-format
- #| msgid "failed to store the creation date: %s\n"
++#: dirmngr/server.c:2444
+ #, c-format
msgid "failed to the register commands with Assuan: %s\n"
- msgstr "klarte ikke � lagre opprettelsesdatoen: %s\n"
+ msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
- msgstr ""
+ msgstr "Assuan-godkjenningsproblem: %s\n"
- #: dirmngr/server.c:2485
- #, fuzzy, c-format
- #| msgid "signing failed: %s\n"
++#: dirmngr/server.c:2494
+ #, c-format
msgid "Assuan processing failed: %s\n"
- msgstr "signering mislyktes: %s\n"
+ msgstr "Assuan-behandling mislyktes: %s\n"
+#: dirmngr/validate.c:201
msgid "accepting root CA not marked as a CA"
- msgstr ""
+ msgstr "godtar rot-CA som ikke er merket som CA"
+#: dirmngr/validate.c:227
msgid "CRL checking too deeply nested\n"
- msgstr ""
+ msgstr "for mange nivåer av CRL-kontroll\n"
+#: dirmngr/validate.c:245
msgid "not checking CRL for"
- msgstr ""
+ msgstr "lar være å kontrollere CRL for"
+#: dirmngr/validate.c:250
- #, fuzzy
msgid "checking CRL for"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "kontrollerer CRL for"
+#: dirmngr/validate.c:388
msgid "running in compatibility mode - certificate chain not checked!\n"
- msgstr ""
+ msgstr "kjører i kompatiblitetsmodus. Sertifikatkjede ikke kontrollert.\n"
+#: dirmngr/validate.c:532
- #, fuzzy
msgid "selfsigned certificate has a BAD signature"
- msgstr "bekrefte en signatur"
+ msgstr "selvsignert sertifikat har ugyldig signatur"
+#: dirmngr/validate.c:565
- #, fuzzy, c-format
+ #, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
- msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
+ msgstr "troverdighetssjekk av rotsertifikat mislyktes: %s\n"
+#: dirmngr/validate.c:742
- #, fuzzy
msgid "certificate chain is good\n"
- msgstr "preferansen %s er duplisert\n"
+ msgstr "sertifikatkjede er funnet i orden\n"
+#: dirmngr/validate.c:972
msgid "DSA requires the use of a 160 bit hash algorithm\n"
- msgstr "DSA krever bruk av en 160-bit hashalgoritme\n"
+ msgstr "DSA krever kontrollsum på 160 bit\n"
+#: dirmngr/validate.c:1120
msgid "certificate should not have been used for CRL signing\n"
- msgstr ""
+ msgstr "sertifikat skulle ikke vært brukt til CRL-signering\n"
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:91 tools/symcryptrun.c:167
- #, fuzzy
msgid "quiet"
- msgstr "avslutt"
+ msgstr "stille"
+#: tools/gpg-connect-agent.c:79
msgid "print data out hex encoded"
- msgstr ""
+ msgstr "kod utdata i heksadesimaler"
+#: tools/gpg-connect-agent.c:80
msgid "decode received data lines"
- msgstr ""
+ msgstr "dekod mottatte datalinjer"
+#: tools/gpg-connect-agent.c:81
msgid "connect to the dirmngr"
- msgstr ""
+ msgstr "koble til dirmngr"
+#: tools/gpg-connect-agent.c:84
msgid "|NAME|connect to Assuan socket NAME"
- msgstr ""
+ msgstr "|NAVN|koble til valgt Assuan-sokkelNAVN"
+#: tools/gpg-connect-agent.c:86
msgid "|ADDR|connect to Assuan server at ADDR"
- msgstr ""
+ msgstr "|ADR|koble til Assuan-tjener på valgt nettADResse"
+#: tools/gpg-connect-agent.c:88
msgid "run the Assuan server given on the command line"
- msgstr ""
+ msgstr "kjør valgt Assuan-tjener"
+#: tools/gpg-connect-agent.c:90
msgid "do not use extended connect mode"
- msgstr ""
+ msgstr "ikke bruk utvidet tilkoblingsmodus"
+#: tools/gpg-connect-agent.c:92
- #, fuzzy
msgid "|FILE|run commands from FILE on startup"
- msgstr "leser valg fra �%s�\n"
+ msgstr "|FIL|kjør kommandoer fra valgt FIL ved oppstart"
+#: tools/gpg-connect-agent.c:93
msgid "run /subst on startup"
- msgstr ""
+ msgstr "kjør /subst ved oppstart"
+#: tools/gpg-connect-agent.c:205
- #, fuzzy
msgid "Usage: @GPG at -connect-agent [options] (-h for help)"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: @GPG at -connect-agent [vlag] (-h for hjelp)"
+#: tools/gpg-connect-agent.c:208
msgid ""
"Syntax: @GPG at -connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
+ "Syntaks: @GPG at -connect-agent [valg]\n"
+ "Koble til kjørende agent og send kommandoer\n"
+#: tools/gpg-connect-agent.c:1247
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
- msgstr ""
+ msgstr "valget «%s» krever et program som argument\n"
+#: tools/gpg-connect-agent.c:1258 tools/gpg-connect-agent.c:1264
+#: tools/gpg-connect-agent.c:1270
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
- msgstr ""
+ msgstr "ignorerer valget «%s» pga. «%s»\n"
+#: tools/gpg-connect-agent.c:1368 tools/gpg-connect-agent.c:1863
- #, fuzzy, c-format
+ #, c-format
msgid "receiving line failed: %s\n"
- msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
+ msgstr "linjemottak mislyktes: %s\n"
+#: tools/gpg-connect-agent.c:1458
- #, fuzzy
msgid "line too long - skipped\n"
- msgstr "for lang linje"
+ msgstr "hoppet over for lang linje\n"
+#: tools/gpg-connect-agent.c:1462
msgid "line shortened due to embedded Nul character\n"
- msgstr ""
+ msgstr "linje forkortet pga. innebygget Nul-tegn\n"
+#: tools/gpg-connect-agent.c:1837
- #, fuzzy, c-format
+ #, c-format
msgid "unknown command '%s'\n"
- msgstr "ukjent valg �%s�\n"
+ msgstr "«%s» er en ukjent kommando\n"
+#: tools/gpg-connect-agent.c:1855
- #, fuzzy, c-format
+ #, c-format
msgid "sending line failed: %s\n"
- msgstr "signering mislyktes: %s\n"
+ msgstr "sending av linje mislyktes: %s\n"
- #: tools/gpg-connect-agent.c:2241
- #, fuzzy, c-format
++#: tools/gpg-connect-agent.c:2251
+ #, c-format
msgid "error sending standard options: %s\n"
- msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
+ msgstr "feil under sending av standardvalg: %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 ""
+ msgstr "Styring av diagnostikk-utdata"
+#: tools/gpgconf-comp.c:492 tools/gpgconf-comp.c:621 tools/gpgconf-comp.c:696
+#: tools/gpgconf-comp.c:773 tools/gpgconf-comp.c:879
msgid "Options controlling the configuration"
- msgstr ""
+ msgstr "Oppsettsvalg"
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:650 tools/gpgconf-comp.c:717
+#: tools/gpgconf-comp.c:802 tools/gpgconf-comp.c:886
msgid "Options useful for debugging"
- msgstr ""
+ msgstr "Nyttige feilsøkingsvalg"
+#: tools/gpgconf-comp.c:521 tools/gpgconf-comp.c:660 tools/gpgconf-comp.c:815
msgid "Options controlling the security"
- msgstr ""
+ msgstr "Sikkerhetsvalg"
+#: tools/gpgconf-comp.c:528
msgid "|N|expire SSH keys after N seconds"
- msgstr ""
+ msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
+#: tools/gpgconf-comp.c:532
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
+ "|N|endre maksimal livstid for PIN-koder i hurtiglager til N antall sekunder"
+#: tools/gpgconf-comp.c:536
msgid "|N|set maximum SSH key lifetime to N seconds"
- msgstr ""
+ msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
+#: tools/gpgconf-comp.c:560
msgid "Options enforcing a passphrase policy"
- msgstr ""
+ msgstr "Valg som håndhever passordfrase-regler"
+#: tools/gpgconf-comp.c:563
msgid "do not allow to bypass the passphrase policy"
- msgstr ""
+ msgstr "ikke tillat overstyring av passordfrase-regler"
+#: tools/gpgconf-comp.c:567
msgid "|N|set minimal required length for new passphrases to N"
- msgstr ""
+ msgstr "|N|endre minimal passordfrase-lengde til N"
+#: tools/gpgconf-comp.c:571
msgid "|N|require at least N non-alpha characters for a new passphrase"
- msgstr ""
+ msgstr "|N|krev at passordfraser inneholder minst N antall spesialtegn og tall"
+#: tools/gpgconf-comp.c:575
msgid "|FILE|check new passphrases against pattern in FILE"
- msgstr ""
+ msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
+#: tools/gpgconf-comp.c:579
msgid "|N|expire the passphrase after N days"
- msgstr ""
+ msgstr "|N|regn passord som ugyldig etter N antall dager"
+#: tools/gpgconf-comp.c:583
- #, fuzzy
msgid "do not allow the reuse of old passphrases"
- msgstr "feil ved opprettelse av passfrase: %s\n"
+ msgstr "ikke tillat gjenbruk av gamle passordfraser"
+#: tools/gpgconf-comp.c:587
msgid "|N|set the Pinentry timeout to N seconds"
- msgstr ""
+ msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
+#: tools/gpgconf-comp.c:698 tools/gpgconf-comp.c:775
msgid "|NAME|use NAME as default secret key"
- msgstr ""
+ msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
+#: tools/gpgconf-comp.c:701 tools/gpgconf-comp.c:778
- #, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
- msgstr "|NAVN|kryptere for NAVN"
+ msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
+#: tools/gpgconf-comp.c:704
msgid "|SPEC|set up email aliases"
- msgstr ""
+ msgstr "|SPES|sett opp e-post-alias"
+#: tools/gpgconf-comp.c:730 tools/gpgconf-comp.c:922
msgid "Configuration for Keyservers"
- msgstr ""
+ msgstr "Oppsett for nøkkeltjenere"
+#: tools/gpgconf-comp.c:732 tools/gpgconf-comp.c:924
- #, fuzzy
msgid "|URL|use keyserver at URL"
- msgstr "kunne ikke parse n�kkelserverens URL\n"
+ msgstr "|ADR|bruk nøkkeltjener på valgt nettADResse"
+#: tools/gpgconf-comp.c:735
msgid "allow PKA lookups (DNS requests)"
- msgstr ""
+ msgstr "tillat PKA-oppslag (DNS-forespørsler)"
+#: tools/gpgconf-comp.c:738
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
- msgstr ""
+ msgstr "|MEKANISMER|bruk valgte MEKANISME til å finne nøkler med e-postadresse"
+#: tools/gpgconf-comp.c:787
msgid "disable all access to the dirmngr"
- msgstr ""
+ msgstr "slå av all tilgang til dirmngr"
+#: tools/gpgconf-comp.c:790
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
- msgstr ""
+ msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
+#: tools/gpgconf-comp.c:820
msgid "do not check CRLs for root certificates"
- msgstr ""
+ msgstr "ikke se etter rotsertifikater i CRL"
+#: tools/gpgconf-comp.c:869
msgid "Options controlling the format of the output"
- msgstr ""
+ msgstr "Valg som styrer utdata-format"
+#: tools/gpgconf-comp.c:905
msgid "Options controlling the interactivity and enforcement"
- msgstr ""
+ msgstr "Valg som styrer grensesnitt og håndheving av regler"
+#: tools/gpgconf-comp.c:915
msgid "Options controlling the use of Tor"
- msgstr ""
+ msgstr "Valg som styrer bruk av Tor"
+#: tools/gpgconf-comp.c:929
msgid "Configuration for HTTP servers"
- msgstr ""
+ msgstr "Oppsett for HTTP-tjenere"
+#: tools/gpgconf-comp.c:940
msgid "use system's HTTP proxy setting"
- msgstr ""
+ msgstr "bruk systemets innstilling for HTTP-mellomtjener"
+#: tools/gpgconf-comp.c:945
msgid "Configuration of LDAP servers to use"
- msgstr ""
+ msgstr "Oppsett for bruk av LDAP-tjenere"
+#: tools/gpgconf-comp.c:974
msgid "LDAP server list"
- msgstr ""
+ msgstr "LDAP-tjenerliste"
+#: tools/gpgconf-comp.c:982
msgid "Configuration for OCSP"
- msgstr ""
+ msgstr "Oppsett for OCSP"
+#: tools/gpgconf-comp.c:1063
msgid "GPG for OpenPGP"
- msgstr ""
+ msgstr "GPG for OpenPGP"
+#: tools/gpgconf-comp.c:1064
msgid "GPG Agent"
- msgstr ""
+ msgstr "GPG Agent"
+#: tools/gpgconf-comp.c:1065
msgid "Smartcard Daemon"
- msgstr ""
+ msgstr "Smartcard-bakgrunnsprosess"
+#: tools/gpgconf-comp.c:1066
msgid "GPG for S/MIME"
- msgstr ""
+ msgstr "GPG for S/MIME"
+#: tools/gpgconf-comp.c:1067
msgid "Key Acquirer"
- msgstr ""
+ msgstr "Nøkkelhenter"
+#: tools/gpgconf-comp.c:1068
- #, fuzzy
msgid "PIN and Passphrase Entry"
- msgstr "ugyldig passfrase"
+ msgstr "Skriving av PIN og passordfrase"
+#: tools/gpgconf-comp.c:1182
- #, fuzzy
msgid "Component not suitable for launching"
- msgstr "fant ikke offentlig n�kkel"
+ msgstr "Komponent egner seg ikke for oppstart"
+#: tools/gpgconf-comp.c:3240
#, c-format
msgid "External verification of component %s failed"
- msgstr ""
+ msgstr "Ekstern bekreftelse av komponent %s mislyktes"
+#: tools/gpgconf-comp.c:3391
msgid "Note that group specifications are ignored\n"
- msgstr ""
+ msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
+#: tools/gpgconf.c:68
msgid "list all components"
- msgstr ""
+ msgstr "vis alle komponenter"
+#: tools/gpgconf.c:69
msgid "check all programs"
- msgstr ""
+ msgstr "kontroller alle programmer"
+#: tools/gpgconf.c:70
msgid "|COMPONENT|list options"
- msgstr ""
+ msgstr "|KOMPONENT|vis valg"
+#: tools/gpgconf.c:71
msgid "|COMPONENT|change options"
- msgstr ""
+ msgstr "|KOMPONENT|endre valg"
+#: tools/gpgconf.c:72
msgid "|COMPONENT|check options"
- msgstr ""
+ msgstr "|KOMPONENT|kontroller valg"
+#: tools/gpgconf.c:74
msgid "apply global default values"
- msgstr ""
+ msgstr "bruk globale standardverdier"
+#: tools/gpgconf.c:76
msgid "get the configuration directories for @GPGCONF@"
- msgstr ""
+ msgstr "hent oppsettsmapper for @GPGCONF@"
+#: tools/gpgconf.c:78
- #, fuzzy
msgid "list global configuration file"
- msgstr "ukjent konfigurasjonspunkt �%s�\n"
+ msgstr "vis global oppsettsfil"
+#: tools/gpgconf.c:80
- #, fuzzy
msgid "check global configuration file"
- msgstr "ukjent konfigurasjonspunkt �%s�\n"
+ msgstr "kontroller global oppsettsfil"
+#: tools/gpgconf.c:81
msgid "reload all or a given component"
- msgstr ""
+ msgstr "last inn én eller alle komponenter på nytt"
+#: tools/gpgconf.c:82
msgid "launch a given component"
- msgstr ""
+ msgstr "last inn valgt komponent"
+#: tools/gpgconf.c:83
msgid "kill a given component"
- msgstr ""
+ msgstr "drep valgt komponent"
+#: tools/gpgconf.c:89
msgid "use as output file"
- msgstr "bruk som outputfil"
+ msgstr "bruk som utdatafil"
+#: tools/gpgconf.c:93
msgid "activate changes at runtime, if possible"
- msgstr ""
+ msgstr "ta i bruk endringer under kjøring, hvis mulig"
+#: tools/gpgconf.c:116
- #, fuzzy
msgid "Usage: @GPGCONF@ [options] (-h for help)"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: @GPGCONF@ [valg] (-h for hjelp)"
+#: tools/gpgconf.c:119
msgid ""
"Syntax: @GPGCONF@ [options]\n"
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
+ "Syntaks: @GPGCONF@ [valg]\n"
+ "Behandle oppsettsvalg for verktøy i @GNUPG at -systemet\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
- msgstr ""
+ msgstr "Komponent-argument mangler"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
- #, fuzzy
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
- msgstr "fant ikke offentlig n�kkel"
+ msgstr "Fant ikke komponent"
- #: tools/gpgconf.c:348
- #, fuzzy
++#: tools/gpgconf.c:406
msgid "No argument allowed"
- msgstr "Admin-kommandoer er ikke tillatt\n"
+ msgstr "Ingen argumenter tillatt"
+#: tools/symcryptrun.c:154
- #, fuzzy
msgid ""
"@\n"
"Commands:\n"
" "
msgstr ""
- "@Kommandoer:\n"
+ "@\n"
+ "Kommandoer:\n"
" "
+#: tools/symcryptrun.c:156
- #, fuzzy
msgid "decryption modus"
- msgstr "dekryptering mislyktes: %s\n"
+ msgstr "dekrypteringsmodus"
+#: tools/symcryptrun.c:157
- #, fuzzy
msgid "encryption modus"
- msgstr "kryptere data"
+ msgstr "krypteringsmodus"
+#: tools/symcryptrun.c:161
msgid "tool class (confucius)"
- msgstr ""
+ msgstr "verktøyklasse (confucius)"
+#: tools/symcryptrun.c:162
- #, fuzzy
msgid "program filename"
- msgstr "--store [filnavn]"
+ msgstr "programfil-navn"
+#: tools/symcryptrun.c:164
msgid "secret key file (required)"
- msgstr ""
+ msgstr "hemmelig nøkkelfil (påkrevet)"
+#: tools/symcryptrun.c:165
msgid "input file name (default stdin)"
- msgstr ""
+ msgstr "inndata-filnavn (forvalgt: standard innkanal)"
+#: tools/symcryptrun.c:209
- #, fuzzy
msgid "Usage: symcryptrun [options] (-h for help)"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: symcryptrun [valg] (-h for hjelp)"
+#: 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 ""
+ "Syntaks: symcryptrun --class KLASSE --program PROGRAM --keyfile NØKKELFIL "
+ "[valg …] KOMMANDO [inndatafil]\n"
+ "Bruk et enkelt symmetrisk krypteringsverktøy\n"
+#: tools/symcryptrun.c:281
- #, fuzzy, c-format
+ #, c-format
msgid "%s on %s aborted with status %i\n"
- msgstr "%s er ikke tillatt sammen med %s!\n"
+ msgstr "%s på %s avbrøt med status %i\n"
+#: tools/symcryptrun.c:288
- #, fuzzy, c-format
+ #, c-format
msgid "%s on %s failed with status %i\n"
- msgstr "%s er ikke tillatt sammen med %s!\n"
+ msgstr "%s på %s mislyktes med status %i\n"
+#: tools/symcryptrun.c:320
- #, fuzzy, c-format
+ #, c-format
msgid "can't create temporary directory '%s': %s\n"
- msgstr "kan ikke opprette katalogen �%s�: %s\n"
+ msgstr "klarte ikke å lage midlertidig mappe «%s»: %s\n"
+#: tools/symcryptrun.c:360 tools/symcryptrun.c:377
#, c-format
msgid "could not open %s for writing: %s\n"
- msgstr ""
+ msgstr "klarte ikke å åpne %s for skriving: %s\n"
+#: tools/symcryptrun.c:388
- #, fuzzy, c-format
+ #, c-format
msgid "error writing to %s: %s\n"
- msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
+ msgstr "feil under skriving til %s: %s\n"
+#: tools/symcryptrun.c:395
- #, fuzzy, c-format
+ #, c-format
msgid "error reading from %s: %s\n"
- msgstr "feil ved lesing av �%s�: %s\n"
+ msgstr "feil under lesing fra %s: %s\n"
+#: tools/symcryptrun.c:402 tools/symcryptrun.c:409
- #, fuzzy, c-format
+ #, c-format
msgid "error closing %s: %s\n"
- msgstr "feil med �%s�: %s\n"
+ msgstr "feil under lukking av %s: %s\n"
+#: tools/symcryptrun.c:494
- #, fuzzy
msgid "no --program option provided\n"
- msgstr "fjernutf�ring av programmer er ikke st�ttet\n"
+ msgstr "valget «--program» er ikke brukt\n"
+#: tools/symcryptrun.c:500
msgid "only --decrypt and --encrypt are supported\n"
- msgstr ""
+ msgstr "programmet støtter bare «--decrypt» og «--encrypt»\n"
+#: tools/symcryptrun.c:506
msgid "no --keyfile option provided\n"
- msgstr ""
+ msgstr "valget «--keyfile» mangler\n"
+#: tools/symcryptrun.c:517
msgid "cannot allocate args vector\n"
- msgstr ""
+ msgstr "klarte ikke å tildele argumentvektor\n"
+#: tools/symcryptrun.c:535
- #, fuzzy, c-format
+ #, c-format
msgid "could not create pipe: %s\n"
- msgstr "kan ikke opprette �%s�: %s\n"
+ msgstr "klarte ikke å lage datarør: %s\n"
+#: tools/symcryptrun.c:542
- #, fuzzy, c-format
+ #, c-format
msgid "could not create pty: %s\n"
- msgstr "kan ikke opprette �%s�: %s\n"
+ msgstr "klarte ikke å lage pty: %s\n"
+#: tools/symcryptrun.c:558
#, c-format
msgid "could not fork: %s\n"
- msgstr ""
+ msgstr "klarte ikke å lage underprosess: %s\n"
+#: tools/symcryptrun.c:586
- #, fuzzy, c-format
+ #, c-format
msgid "execv failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "«execv» mislyktes: %s\n"
+#: tools/symcryptrun.c:615
- #, fuzzy, c-format
+ #, c-format
msgid "select failed: %s\n"
- msgstr "sleting av n�kkelblokk mislyktes: %s\n"
+ msgstr "«select» mislyktes: %s\n"
+#: tools/symcryptrun.c:632
- #, fuzzy, c-format
+ #, c-format
msgid "read failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "«read» mislyktes: %s\n"
+#: tools/symcryptrun.c:684
- #, fuzzy, c-format
+ #, c-format
msgid "pty read failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "«pty»-lesing mislyktes: %s\n"
+#: tools/symcryptrun.c:736
- #, fuzzy, c-format
+ #, c-format
msgid "waitpid failed: %s\n"
- msgstr "oppdatering mislyktes: %s\n"
+ msgstr "«waitpid» mislyktes: %s\n"
+#: tools/symcryptrun.c:750
#, c-format
msgid "child aborted with status %i\n"
- msgstr ""
+ msgstr "underprosess ble avbrutt med status %i\n"
+#: tools/symcryptrun.c:805
- #, fuzzy, c-format
+ #, c-format
msgid "cannot allocate infile string: %s\n"
- msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+ msgstr "klarte ikke å tildele inndatafil-streng: %s\n"
+#: tools/symcryptrun.c:818
- #, fuzzy, c-format
+ #, c-format
msgid "cannot allocate outfile string: %s\n"
- msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
+ msgstr "klarte ikke å tildele utdatafil-streng: %s\n"
+#: tools/symcryptrun.c:991
#, c-format
msgid "either %s or %s must be given\n"
- msgstr ""
+ msgstr "du må velge enten %s eller %s\n"
+#: tools/symcryptrun.c:1018
msgid "no class provided\n"
- msgstr ""
+ msgstr "ingen klasse valgt\n"
+#: tools/symcryptrun.c:1027
- #, fuzzy, c-format
+ #, c-format
msgid "class %s is not supported\n"
- msgstr "ikke st�ttet"
+ msgstr "klassen %s støttes ikke\n"
+#: tools/gpg-check-pattern.c:144
- #, fuzzy
msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
- msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
+ msgstr "Bruk: gpg-check-pattern [valg] mønsterfil (-h for hjelp)\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"
diff --cc po/pl.po
index b7de5df,74cd6d9..643101d
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -428,10 -342,6 +428,10 @@@ msgstr "uruchomienie w trybie demona (
msgid "run in server mode (foreground)"
msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "z dodatkowymi informacjami"
@@@ -535,11 -420,6 +535,11 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "B��dy prosimy zg�asza� na adres <@EMAIL@>.\n"
@@@ -561,56 -439,39 +561,56 @@@ msgstr "
"Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
"Zarz�dzanie kluczem tajnym dla GnuPG\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "biblioteka %s jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "nie mo�na utworzy� gniazda: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
@@@ -620,29 -480,23 +620,29 @@@ msgstr "nazwa gniazda `%s' zbyt d�uga\n
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent ju� dzia�a - nie uruchamianie nowego\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "b��d podczas pobierania nonce z gniazda\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "b��d podczas przypisywania gniazda do ,,%s'': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Ostrze�enie: niebezpieczne prawa dost�pu do %s ,,%s''\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() nie powiod�o si�: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
@@@ -674,7 -522,6 +674,7 @@@ msgstr "stat() nie powiod�o si� dla ,,%
msgid "can't use '%s' as home directory\n"
msgstr "nie mo�na u�y� ,,%s'' jako katalogu domowego\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "b��d odczytu nonce z fd %d: %s\n"
@@@ -699,19 -542,15 +699,19 @@@ msgstr "obs�uga ssh 0x%lx dla fd %d uru
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "obs�uga ssh 0x%lx dla fd %d zako�czona\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
#| msgid "pth_select failed: %s - waiting 1s\n"
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "pth_select nie powiod�o si�: %s - czekanie 1s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s zatrzymany\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
@@@ -728,8 -565,6 +728,8 @@@ msgstr "
"Sk�adnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
"Utrzymuwanie pami�ci hase�\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -737,9 -572,6 +737,9 @@@ msgstr "
"@Polecenia:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -990,32 -779,25 +990,32 @@@ msgstr "b��d tworzenia potoku: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "b��d tworzenia potoku: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "b��d podczas tworzenia procesu: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, 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:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1031,29 -811,23 +1031,29 @@@ msgstr "b��d odczytu kodu zako�czenia p
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "problem z komunikacj� z gpg-agentem\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "anulowano przez u�ytkownika\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "problem z agentem\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
#| msgid "problem with the agent: %s\n"
msgid "problem with the agent (unexpected response \"%s\")\n"
@@@ -1129,7 -888,6 +1129,7 @@@ msgstr "brak miejsca w bezpiecznej pami
msgid "out of core while allocating %lu bytes"
msgstr "brak miejsca podczas przydzielania %lu bajt�w"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 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"
@@@ -1375,7 -1079,6 +1375,7 @@@ msgstr "Brak pomocy dla ,,%s''.
msgid "ignoring garbage line"
msgstr "zignorowano b��dn� lini�"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[brak]"
@@@ -1511,92 -1187,72 +1511,92 @@@ msgstr "blokada ,,%s'' nie za�o�ona: %s
msgid "waiting for lock %s...\n"
msgstr "oczekiwanie na blokad� %s...\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "opakowanie: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "niepoprawny nag��wek opakowania: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "nag��wek opakowania: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "nieznany nag��wek opakowania: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "nieoczekiwane opakowanie: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "niepoprawne oznaczenie linii minusami: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "niew�a�ciwy znak formatu radix64 ,,%02X'' zosta� pomini�ty\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "przedwczesny koniec pliku (brak CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "przedwczesny koniec pliku (w CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "b��d formatu CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "B��d sumy CRC; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "b��d w linii ko�cz�cej\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "nieczytelne dla cz�owieka"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1604,25 -1260,20 +1604,25 @@@ msgstr "
"nazwa adnotacji musi zawiera� tylko znaki drukowalne lub spacje i ko�czy� "
"si� znakiem ,,=''\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "nazwa adnotacji u�ytkownika musi zawiera� znak ,,@''\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1632,7 -1283,6 +1632,7 @@@ msgstr "
"nazwa adnotacji musi zawiera� tylko znaki drukowalne lub spacje i ko�czy� "
"si� znakiem ,,=''\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "OSTRZE�ENIE: napotkano b��dne dane adnotacji\n"
@@@ -1664,19 -1309,14 +1664,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Karta OpenPGP niedost�pna: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Wykryto kart� OpenPGP nr %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "nie dzia�a w trybie wsadowym\n"
@@@ -1688,10 -1326,6 +1688,10 @@@ msgstr "To polecenie jest dost�pne tylk
msgid "Reset Code not or not anymore available\n"
msgstr "Kod resetuj�cy nie jest (ju� lub w og�le) dost�pny\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Tw�j wyb�r? "
@@@ -1753,86 -1373,65 +1753,87 @@@ 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: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "b��d zapisu ,,%s'': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Dane logowania (nazwa konta): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "B��d: dane logowania zbyt d�ugie (limit to %d znak�w).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Prywatne dane DO: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "B��d: prywatne DO zbyt d�ugie (limit to %d znak�w).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Preferowane j�zyki: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "B��d: niew�a�ciwa d�ugo�� tekstu preferencji.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "B��d: niew�a�ciwe znaki w tek�cie preferencji.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "P�e� (M - m�czyzna, F - kobieta lub spacja): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "B��d: niew�a�ciwa odpowied�.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "Odcisk CA:"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "B��d: niew�a�ciwie sformatowany odcisk.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "operacja na kluczu niewykonalna: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "to nie jest karta OpenPGP"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "b��d podczas odczytu aktualnych informacji o kluczu: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Zast�pi� istniej�cy klucz? (t/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1847,57 -1446,45 +1848,57 @@@ msgstr "
" Je�li tworzenie klucza nie powiedzie si�, prosz� sprawdzi�\n"
" dokumentacj� karty, aby pozna� dozwolone rozmiary.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Jakiej d�ugo�ci klucz do podpisywania wygenerowa�? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Jakiej d�ugo�ci klucz do szyfrowania wygenerowa�? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Jakiej d�ugo�ci klucz do uwierzytelniania wygenerowa�? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokr�glono do %u bit�w\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "Rozmiary kluczy %s musz� by� z przedzia�u %u-%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Karta zostanie przekonfigurowana do tworzenia klucza %u-bitowego\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "b��d podczas zmiany rozmiaru klucza %d na %u bit�w: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Stworzy� poza kart� kopi� zapasow� klucza szyfruj�cego? (T/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "UWAGA: klucze s� ju� zapisane na karcie!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "Zast�pi� istniej�ce klucze? (t/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1912,145 -1499,110 +1913,145 @@@ msgstr "
" PIN = ,,%s'' PIN administracyjny = ,,%s''\n"
"Nale�y je zmieni� przy u�yciu polecenia --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Prosz� wybra� rodzaj klucza do wygenerowania:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Klucz do podpis�w\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Klucz do szyfrowania\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) Klucz do uwierzytelniania\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Niew�a�ciwy wyb�r.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Prosz� wybra� gdzie zapisa� klucz:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "odczyt nie powi�d� si�: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "UWAGA: klucze s� ju� zapisane na karcie!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Podpisa� go? (t/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "wyj�cie z tego menu"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "pokazanie polece� administratora"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "ten tekst pomocy"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "wypisanie wszystkich dost�pnych danych"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "zmiana nazwy posiadacza karty"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "zmiana URL-a do odczytu klucza"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "pobranie klucza okre�lonego w URL-u karty"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "zmiana nazwy logowania"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "zmiana preferowanych j�zyk�w"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "zmiana p�ci posiadacza karty"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "zmiana odcisku CA"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "wygenerowanie nowych kluczy"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "menu do zmiany lub odblokowania PIN-u"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "odblokowanie PIN-u przy u�yciu kodu resetuj�cego"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/karta> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "Polecenie tylko dla administratora\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Polecenia dla administratora s� dozwolone\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "Polecenia dla administratora nie s� dozwolone\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Niepoprawne polecenie (spr�buj ,,help'')\n"
@@@ -2058,28 -1609,19 +2059,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "opcja --output nie dzia�a z tym poleceniem\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nie mo�na otworzy� ,,%s''\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2135,7 -1666,6 +2136,7 @@@ msgstr "dla klucza publicznego ,,%s'' i
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "aby go usun�� nale�y najpierw u�y� opcji \"--delete-secret-key\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "b��d podczas tworzenia has�a: %s\n"
@@@ -2156,7 -1683,6 +2157,7 @@@ msgstr "szyfrem %s\n
msgid "'%s' already compressed\n"
msgstr ",,%s'' ju� jest skompresowany\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2176,7 -1700,6 +2177,7 @@@ msgstr "
"OSTRZE�ENIE: wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami "
"adresata\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2195,17 -1716,14 +2196,17 @@@ msgstr "wymuszone u�ycie szyfru %s (%d
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "dane zaszyfrowano za pomoc� %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
@@@ -2278,333 -1783,268 +2279,347 @@@ 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:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "eksport podpis�w oznaczonych jako tylko lokalne"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "eksport atrybut�w ID u�ytkownika (og�lnie ID zdj��)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "eksport kluczy uniewa�niaj�cych oznaczonych jako ,,poufne''"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "usuni�cie bezu�ytecznych cz�ci z klucza przy eksporcie"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr "usuni�cie jak najwi�kszej cz�ci klucza przy eksporcie"
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: pomini�ty: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "zapis do ,,%s''\n"
+
++#: g10/export.c:1660
+ #, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr "klucz %s: zawarto�� klucza na karcie - pomini�to\n"
+
++#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
msgstr "eksport kluczy tajnych nie jest dozwolony\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "klucz %s: zawarto�� klucza na karcie - pomini�to\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[brak identyfikatora u�ytkownika]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, 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:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, 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:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, 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:1435
++#: g10/getkey.c:1437
#, 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:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "Brak odcisku"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "z�o�enie podpisu"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "z�o�enie podpisu pod dokumentem"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "z�o�enie podpisu oddzielonego od dokumentu"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "szyfrowanie danych"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "szyfrowanie tylko szyfrem symetrycznym"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "odszyfrowywanie danych (domy�lne)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "sprawdzenie podpisu"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "lista kluczy"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "lista kluczy i podpis�w"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "wypisanie i sprawdzenie podpis�w kluczy"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "lista kluczy i ich odcisk�w"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "lista kluczy prywatnych"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generacja nowej pary kluczy"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "generacja nowej pary kluczy"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "tworzenie certyfikatu uniewa�nienia klucza"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "z�o�enie podpisu na kluczu"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "z�o�enie prywatnego podpisu na kluczu"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "z�o�enie podpisu na kluczu"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "z�o�enie prywatnego podpisu na kluczu"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "podpisanie lub modyfikacja klucza"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "zmiana has�a"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "eksport kluczy do pliku"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "eksport kluczy do serwera kluczy"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "import kluczy z serwera kluczy"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "szukanie kluczy na serwerze"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "od�wie�enie wszystkich kluczy z serwera"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "import/do��czenie kluczy"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "wy�wietlenie stanu karty"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "zmiana danych na karcie"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "zmiana PIN-u karty"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "uaktualnienie bazy zaufania"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "wypisanie skr�t�w wiadomo�ci"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "uruchomienie w trybie serwera"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "opakowanie ASCII pliku wynikowego"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|U�YTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|U�YTKOWNIK|u�ycie tego identyfikatora u�ytkownika do podpisania lub "
"odszyfrowania"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "kanoniczny format tekstowy"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|PLIK|zapis wyj�cia do PLIKU"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "pozostawienie bez zmian"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "pytanie przed nadpisaniem plik�w"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "�cis�e zachowanie OpenPGP"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2612,7 -2052,6 +2627,7 @@@ msgstr "
"@\n"
"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2634,13 -2073,11 +2649,13 @@@ msgstr "
" --list-keys [nazwy] pokazanie klucze\n"
" --fingerprint [nazwy] pokazanie odcisk�w kluczy\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2655,7 -2092,6 +2670,7 @@@ msgstr "
"Podpisywanie, sprawdzanie podpis�w, szyfrowanie, rozszyfrowywanie\n"
"Domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2663,78 -2099,64 +2678,78 @@@ msgstr "
"\n"
"Obs�ugiwane algorytmy:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Asymetryczne: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Symetryczne: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Skr�t�w: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Kompresji: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 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:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2742,7 -2164,6 +2757,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1551
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2752,7 -2173,6 +2767,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2760,7 -2180,6 +2775,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1560
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2768,7 -2187,6 +2783,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego katalog "
"domowy ,,%s''\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1563
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2779,7 -2197,6 +2794,7 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego plik "
"konfiguracyjny ,,%s''\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2787,511 -2204,406 +2802,517 @@@ msgstr "
"OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu zawieraj�cego "
"rozszerzenie ,,%s''\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
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:1896
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:1898
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:1900
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:1902
msgid "show the keyring name in key listings"
msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Dost�pne klucze:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "nieznane polecenie ,,%s''\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
"biblioteka libgcrypt jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, 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:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "niezrozumia�y URL serwera kluczy\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "niepoprawne opcje wypisywania\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "niepoprawne opcje wypisywania\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
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:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "sprawdzanie podpis�w z danymi PKA"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, 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:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "Niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno u�ywa� %s z %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w po��czeniu z %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm kompresji jest niepoprawny\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "niew�a�ciwe domy�lne ustawienia\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "niew�a�ciwe ustawienia szyfr�w\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "niew�a�ciwe ustawienia skr�t�w\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie dzia�a z %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [plik]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, 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:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [plik]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
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:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [plik]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [plik]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
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:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [plik]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key nazwa u�ytkownika"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa u�ytkownika"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa u�ytkownika [polecenia]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd <id-u�ytkownika>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powi�d� si�: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, 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:4595
++#: g10/gpg.c:4682
#, 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:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[nazwa pliku]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@@ -3333,128 -2637,110 +3354,138 @@@ msgstr "Pomoc niedost�pna
msgid "No help available for '%s'"
msgstr "Brak pomocy o ,,%s''"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "import podpis�w oznaczonych jako tylko lokalne"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "naprawienie uszkodze� z serwera pks przy imporcie"
- #: g10/import.c:110
++#: g10/import.c:140
#, 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:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "nie uaktualnianie bazy zaufania po imporcie"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "okazanie odcisku klucza"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "przyjmowanie tylko uaktualnie� istniej�cych kluczy"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "usuwanie bezu�ytecznych cz�ci kluczy po imporcie"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr "usuwanie jak najwi�kszej cz�ci kluczy po imporcie"
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d zostaje pomini�ty\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu kluczy przetworzonych do tej chwili\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Og�em przetworzonych kluczy: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " pomini�tych nowych kluczy: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identyfikatora: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " do��czono do zbioru: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmian: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nowych identyfikator�w: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nowych podkluczy: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " nowych podpis�w: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nowych uniewa�nie� kluczy: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " tajnych kluczy wczytanych: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " tajnych kluczy dodanych: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajnych kluczy bez zmian: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " nie w��czono do zbioru: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " podpis�w wyczyszczonych: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr "ID u�ytkownika wyczyszczonych: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3463,200 -2749,155 +3494,193 @@@ msgstr "
"OSTRZE�ENIE: klucz %s zawiera preferencje dla niedost�pnych\n"
"algorytm�w dla tych ID u�ytkownika:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " ,,%s'': preferowany szyfr %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " ,,%s'': preferowany algorytm skr�tu %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " ,,%s'': preferowany algorytm kompresji %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "zdecydowanie sugerowane jest uaktualnienie ustawie� i ponowne\n"
- #: g10/import.c:893
++#: g10/import.c:1069
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:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "klucz %s: brak identyfikatora u�ytkownika\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "pomini�ty ,,%s'': %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "klucz %s: podklucz uszkodzony przez serwer zosta� naprawiony\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "klucz %s: brak poprawnych identyfikator�w u�ytkownika\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "klucz %s: brak klucza publicznego: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "klucz %s: nowy klucz - pomini�ty\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "zapis do ,,%s''\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "klucz %s: nie zgadza si� z lokaln� kopi�\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
- #: g10/import.c:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "klucz %s: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "klucz %s: ,,%s'' %d nowych podpis�w\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "klucz %s: ,,%s'' %d podpis�w wyczyszczonych\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "klucz %s: ,,%s'' %d identyfikator u�ytkownika wyczyszczony\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "klucz %s: ,,%s'' bez zmian\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, 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:1683
++#: g10/import.c:1971
#, 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:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3671,145 -2912,118 +3695,145 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "klucz %s: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "klucz %s: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "klucz %s: brak identyfikatora u�ytkownika do podpisu\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "klucz %s: nieobs�ugiwany algorytm asymetryczny\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "klucz %s: nieprawid�owy bezpo�redni podpis\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "klucz %s: brak podklucza do dowi�zania\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "klucz %s: niepoprawne dowi�zanie podklucza\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "klucz %s: usuni�to wielokrotne dowi�zanie podklucza\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "klucz %s: niepoprawne uniewa�nienie podklucza\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "klucz %s: usuni�to wielokrotne uniewa�nienie podklucza\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "klucz %s: pomini�to identyfikator u�ytkownika ,,%s''\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "klucz %s: podklucz pomini�ty\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "klucz %s: ,,%s'' dodany certyfikat uniewa�nienia\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "klucz %s: dodano bezpo�redni podpis\n"
@@@ -3850,45 -3058,37 +3874,45 @@@ msgstr "zas�b bloku klucza `%s': %s\n
msgid "error opening key DB: %s\n"
msgstr "b��d podczas otwierania ,,%s'': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[uniewa�nienie]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[podpis klucza nim samym]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "klucz %s: nieobs�ugiwany algorytm asymetryczny\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
#| msgid "Good signature from"
msgid " (reordered signatures follow)"
msgstr "Poprawny podpis z�o�ony przez"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s:\n"
msgstr "pomini�ty ,,%s'': %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "%d duplicate signature removed\n"
@@@ -3897,7 -3097,6 +3921,7 @@@ 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3906,7 -3105,6 +3930,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3915,7 -3113,6 +3939,7 @@@ msgstr[0] "%d niepoprawnych podpis�w\n
msgstr[1] "%d niepoprawnych podpis�w\n"
msgstr[2] "%d niepoprawnych podpis�w\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
#| msgid "Good signature from"
msgid "%d signature reordered\n"
@@@ -3924,14 -3121,12 +3948,14 @@@ msgstr[0] "Poprawny podpis z�o�ony prze
msgstr[1] "Poprawny podpis z�o�ony przez"
msgstr[2] "Poprawny podpis z�o�ony przez"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3942,17 -3137,14 +3966,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:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = mam ograniczone zaufanie\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = mam pe�ne zaufanie\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3962,50 -3154,38 +3986,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:1018
++#: g10/keyedit.c:1021
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:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Czy na pewno chcesz podpisa�? (t/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Nie da si� z�o�y� podpisu.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Identyfikator u�ytkownika ,,%s'' jest podpisywalny. "
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Podpisa� go? (t/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4014,11 -3194,9 +4038,11 @@@ msgstr "
"Podpis klucza nim samym na ,,%s''\n"
"jest podpisem z�o�onym przez PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4027,11 -3205,9 +4051,11 @@@ msgstr "
"Tw�j podpis na ,,%s''\n"
"przekroczy� dat� wa�no�ci.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4040,45 -3216,36 +4064,45 @@@ msgstr "
"Tw�j podpis na ,,%s''\n"
"jest podpisem prywatnym (lokalnym).\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr ",,%s'' jest ju� lokalnie podpisany kluczem %s\n"
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr ",,%s'' jest ju� podpisany kluczem %s\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
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:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nie ma nic do podpisania kluczem %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Data wa�no�ci tego klucza up�yn�a!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Wa�no�� tego klucza wygasa %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4087,33 -3254,27 +4111,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:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nie odpowiem na to pytanie. %s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) W og�le nie.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Pobie�nie.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Bardzo dok�adnie.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, 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:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4122,238 -3283,184 +4146,238 @@@ msgstr "
"Czy jeste� naprawd� pewien, �e chcesz podpisa� ten klucz\n"
"swoim kluczem ,,%s'' (%s)\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "To b�dzie podpis klucza nim samym.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
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:1527
++#: g10/keyedit.c:1530
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:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
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:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Czy na pewno podpisa�? (t/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
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:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "zapis zmian i wyj�cie"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "okazanie odcisku klucza"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Uchwyt klucza: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "lista kluczy i identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "wyb�r identyfikatora u�ytkownika N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "wyb�r podklucza N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "sprawdzenie podpis�w"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
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:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr ""
"z�o�enie prywatnego (lokalnego) podpisu na wybranych identyfikatorach "
"u�ytkownika"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "podpisanie wybranych identyfikator�w u�ytkownika sygnatur� zaufania"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
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:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "dodanie zdj�cia u�ytkownika do klucza"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "usuni�cie wybranych identyfikator�w u�ytkownika z klucza"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "dodanie podklucza"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "dodanie klucza do karty procesorowej"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "przeniesienie klucza na kart� procesorow�"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "przeniesienie klucza zapasowego na kart� procesorow�"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "usuni�cie wybranych podkluczy"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "dodanie klucza uniewa�niaj�cego"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "usuni�cie podpis�w z wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
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:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "oznaczenie wybranego identyfikatora u�ytkownika jako g��wnego"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "ustawienia (zaawansowane)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "rozbudowana lista ustawie�"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "ustawienie listy preferencji dla wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
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:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "ustawienie adnotacji dla wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "zmiana has�a klucza"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "zmiana zaufania w�a�ciciela"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "uniewa�nienie podpis�w na wybranych identyfikatorach u�ytkownika"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "uniewa�nienie wybranych identyfikator�w u�ytkownika"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "uniewa�nienie klucza lub wybranych podkluczy"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "w��czenie klucza do u�ycia"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "wy��czenie klucza z u�ycia"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "okazanie wybranych identyfikator�w - zdj��"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
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:1936
++#: g10/keyedit.c:1939
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:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Dost�pny jest klucz tajny.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4373,266 -3480,213 +4397,272 @@@ msgstr "
"(ltsign,\n"
" tnrsign itd.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Klucz uniewa�niony."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "Czy na pewno podpisa� wszystkie identyfikatory u�ytkownika? (t/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, 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:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Nieznany rodzaj podpisu ,,%s''\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr ""
"Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? (t/N) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "Czy na pewno przenie�� g��wny klucz (t/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Musisz wybra� dok�adnie jeden klucz.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "Polecenie oczekuje argumentu b�d�cego nazw� pliku\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, 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:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Musisz wybra� co najmniej jeden klucz.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
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:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "Czy na pewno chcesz usun�� ten klucz? (t/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
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:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? (t/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
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:2571
++#: g10/keyedit.c:2574
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:2573
++#: g10/keyedit.c:2576
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:2631
++#: g10/keyedit.c:2634
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:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Ustawienie listy ustawie� na:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
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:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Czy na pewno uaktualni� ustawienia? (t/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Zapisa� zmiany? (t/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Wyj�� bez zapisania zmian? (t/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "zapis zmian nie powi�d� si�: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
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:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Generacja klucza nie powiod�a si�: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "niew�a�ciwy odcisk"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, 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:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "niepoprawna warto��\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Brak takiego identyfikatora u�ytkownika.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, 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:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Skr�t: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Ustawienia: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "no-modify dla serwera kluczy"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Preferowany serwer kluczy: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Adnotacje: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(poufne)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "utworzono: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "uniewa�niono: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "wygas�: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "wygasa: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "u�ycie: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "nr-karty: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "zaufanie: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "poprawno��: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Ten klucz zosta� wy��czony z u�ytku"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4640,17 -3694,12 +4670,17 @@@ msgstr "
"Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
"dop�ki program nie zostanie uruchomiony ponownie.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "uniewa�niony"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "wygas�"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4659,17 -3708,14 +4689,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4678,35 -3724,27 +4708,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Czy dalej chcesz je doda�? (t/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
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:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Usun�� ten poprawny podpis? (t/N/w) "
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Usun�� ten nieznany podpis? (t/N/w) "
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4715,20 -3753,16 +4745,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:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Nic nie zosta�o usuni�te.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "niepoprawny"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Identyfikator u�ytkownika ,,%s'' upakowany: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4737,17 -3771,14 +4767,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:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Identyfikator u�ytkownika ,,%s'': ju� zmniejszony.\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Identyfikator u�ytkownika ,,%s'': ju� czysty.\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4757,37 -3788,29 +4787,37 @@@ msgstr "
" uniewa�niaj�cego spowoduje, �e niekt�re wersje PGP przestan�\n"
" go rozumie�.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
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:4632
++#: g10/keyedit.c:4739
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4796,159 -3819,129 +4826,164 @@@ msgid "
"N) "
msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Zmiana daty wa�no�ci podklucza.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, 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:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Podaj preferowany URL serwera kluczy: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Czy na pewno chcesz go zast�pi�? (t/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Czy na pewno chcesz go usun��? (t/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Adnotacje: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "Kontynuowa�? (t/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Brak identyfikatora u�ytkownika o skr�cie %s\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "Brak podklucza o numerze %d.\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "identyfikator u�ytkownika: ,,%s''\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "podpisany twoim kluczem %s w %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (podpis nieeksportowalny) "
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Wa�no�� tego klucza wygas�a %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "Nie podpisane przez ciebie.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (podpis nieuniewa�nialny) "
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, 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:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "brak klucza tajnego\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Klucz %s jest ju� uniewa�niony.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Podklucz %s jest ju� uniewa�niony.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5410,13 -4325,10 +5445,13 @@@ msgstr "
"ilo�ci\n"
"entropii.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generacja klucza nie powiod�a si�: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5424,71 -4336,58 +5459,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "klucz ju� istnieje\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, 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:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "generowanie nowego klucza\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Procedura generacji klucza zosta�a anulowana.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5496,7 -4395,6 +5531,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5504,7 -4402,6 +5539,7 @@@ msgstr "
"klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5512,50 -4409,39 +5547,50 @@@ msgstr "
"klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
"czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Czy na pewno utworzy�? (t/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "nigdy "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Krytyczny regulamin podpisu: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Regulamin podpisu: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Krytyczny preferowany serwer kluczy: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Krytyczne adnotacje podpisu: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Adnotacje podpisu: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5564,7 -4450,6 +5599,7 @@@ msgstr[0] "%d niepoprawnych podpis�w\n
msgstr[1] "%d niepoprawnych podpis�w\n"
msgstr[2] "%d niepoprawnych podpis�w\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5573,7 -4458,6 +5608,7 @@@ msgstr[0] "1 podpis nie zosta� sprawdzo
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:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@@ -5581,38 -4465,26 +5616,33 @@@ msgstr[0] "
msgstr[1] ""
msgstr[2] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Zbi�r kluczy"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Odcisk klucza g��wnego:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Odcisk klucza g��wnego:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Odcisk podklucza:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Odcisk klucza ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " Nr seryjny karty ="
@@@ -5681,25 -4541,20 +5711,25 @@@ msgstr "honorowanie URL-a preferowaneg
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:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "wy��czony"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Wprowad� numer(y), N)ast�pny lub Q)uit > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "niepoprawny protok� serwera kluczy (nasz %d != modu� obs�ugi %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ",,%s'' nie jest identyfikatorem klucza - pomini�to\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5708,272 -4563,220 +5738,277 @@@ 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "klucz ,,%s'' nie zosta� odnaleziony na serwerze kluczy\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "klucz nie zosta� odnaleziony na serwerze kluczy\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "zapytanie o klucz %s z serwera %s %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "zapytanie o klucz %s z %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "brak akcji serwera kluczy!\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "pomini�ty ,,%s'': %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "wysy�anie klucza %s na %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, 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:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "klucz sesyjny zaszyfrowany %s\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "has�o wygenerowane nieznanym algorytmem skr�tu %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "klucz publiczny to %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " ,,%s''\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "zaszyfrowane za pomoc� %lu hase�\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "zaszyfrowane jednym has�em\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "odszyfrowanie poprawne\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "b��d odszyfrowywania: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "pierwotna nazwa pliku='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "OSTRZE�ENIE: widziano wiele czystych tekst�w\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
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:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "nie znaleziono podpisu\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "NIEPOPRAWNY podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Przeterminowany podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "Poprawny podpis z�o�ony przez ,,%s''"
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "nie mo�na obs�u�y� tych wieloznacznych danych podpisu\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Podpisano w %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " przy u�yciu klucza %s %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Klucz dost�pny w: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[niepewne]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " alias ,,%s''"
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Wa�no�� podpisu wygas�a %s.\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Wa�no�� podpisu wygasa %s.\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binarny"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "tekstowy"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "nieznany"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algorytm: %s"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "nie jest oddzielonym podpisem.\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "oddzielony podpis klasy 0x%02x.\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis starego typu (PGP 2.x).\n"
@@@ -6160,7 -4929,6 +6195,7 @@@ msgstr "
"OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
"bezpieczny\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@@ -6532,48 -5232,39 +6567,48 @@@ msgstr "
" Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
"podpis.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: pomini�ty: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, 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:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Aktualni odbiorcy:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6581,37 -5272,29 +6616,37 @@@ msgstr "
"\n"
"Identyfikator u�ytkownika (pusta linia oznacza koniec): "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Brak takiego identyfikatora u�ytkownika.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Klucz publiczny wy��czony z u�ycia.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nieznany domy�lny adresat ,,%s''\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "brak poprawnych adresat�w\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Uwaga: klucz %s nie ma cechy %s\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
@@@ -6621,29 -5303,23 +6656,29 @@@ msgid "data not saved; use option \"--o
msgstr ""
"dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Podpis oddzielony od danych.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Nazwa pliku danych: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "czytam strumie� standardowego wej�cia\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "brak podpisanych danych\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nie mo�na otworzy� podpisanych danych z fd=%d: %s\n"
@@@ -6904,7 -5535,6 +6939,7 @@@ msgstr[0] "klucz publiczny %s jest o %l
msgstr[1] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
msgstr[2] "klucz publiczny %s jest o %lu sekund� m�odszy od podpisu\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6992,12 -5613,10 +7027,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:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "podpis %s/%s z�o�ony przez: ,,%s''\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7005,11 -5624,9 +7040,11 @@@ msgstr "
"OSTRZE�ENIE: wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami "
"adresata\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "podpis:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "zostanie u�yty szyfr %s\n"
@@@ -7088,136 -5691,109 +7123,136 @@@ msgstr "b��d odczytu w ,,%s'': %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "baza zaufania: synchronizacja nie powiod�a si� %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, 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:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, 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:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: katalog nie istnieje!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: baza zaufania utworzona\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: niepoprawny plik bazy zaufania\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, 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:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: b��d odczytu numeru wersji: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: b��d zapisu numeru wersji: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "baza zaufania: funkcja lseek() zawiod�a: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "baza zaufania: funkcja read() (n=%d) zawiod�a: %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: to nie jest plik bazy zaufania\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: wpis wersji z numerem %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: niew�a�ciwa wersja pliku %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: b��d odczytu pustego wpisu: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "B��d: uszkodzona baza zaufania.\n"
@@@ -7600,7 -6114,6 +7635,7 @@@ msgstr "u�ycie modelu zaufania %s\n
msgid "no need for a trustdb check\n"
msgstr "sprawdzanie bazy jest niepotrzebne\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
@@@ -7617,7 -6128,6 +7652,7 @@@ msgstr "sprawdzanie bazy jest niepotrze
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "aktualizacja bazy jest niepotrzebna przy modelu zaufania ,,%s''\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "klucz publiczny %s nie odnaleziony: %s\n"
@@@ -7630,7 -6138,6 +7665,7 @@@ msgstr "nale�y uruchomi� gpg z opcj� ,,
msgid "checking the trustdb\n"
msgstr "sprawdzanie bazy zaufania\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7639,7 -6146,6 +7674,7 @@@ msgstr[0] "%lu kluczy przetworzonych d
msgstr[1] "%lu kluczy przetworzonych do tej chwili\n"
msgstr[2] "%lu kluczy przetworzonych do tej chwili\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7648,16 -6154,13 +7683,16 @@@ msgstr[0] "przetworzono %d kluczy (rozw
msgstr[1] "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
msgstr[2] "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "brak absolutnie zaufanych kluczy\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "klucz publiczny absolutnie zaufanego klucza %s nie odnaleziony\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7665,7 -6168,6 +7700,7 @@@ msgstr "
"poziom: %d poprawnych: %3d podpisanych: %3d zaufanie: %d-,%dq,%dn,%dm,%df,"
"%du\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8129,13 -6536,11 +8164,13 @@@ msgstr "zabronienie u�ywania polece� ka
msgid "use variable length input for pinpad"
msgstr "u�ycie wej�cia z klawiatury czytnika o zmiennej d�ugo�ci"
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Wywo�anie: gpgconf [opcje] (-h podaje pomoc)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8147,19 -6552,16 +8182,19 @@@ msgstr "
"Sk�adnia: scdaemon [opcje] [polecenie [argumenty]]\n"
"Demon kart procesorowych dla GnuPG\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "prosz� u�y� opcji ,,--daemon'' do uruchomienia programu w tle\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "obs�uga fd %d uruchomiona\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "obs�uga fd %d zako�czona\n"
@@@ -8169,7 -6570,6 +8204,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "niew�a�ciwy znak formatu radix64 %02x zosta� pomini�ty\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
#| msgid "no gpg-agent running in this session\n"
msgid "no dirmngr running in this session\n"
@@@ -10152,8 -8165,6 +10187,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
@@@ -10165,13 -8175,11 +10200,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:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10712,86 -8618,70 +10747,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, 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:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, 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:1223
++#: dirmngr/server.c:1232
#, 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:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, 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:1373
++#: dirmngr/server.c:1382
#, 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:1406
++#: dirmngr/server.c:1415
#, 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:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, 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:2406
++#: dirmngr/server.c:2415
#, 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:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10948,7 -8808,6 +10983,7 @@@ msgstr "nieznane polecenie ,,%s''\n
msgid "sending line failed: %s\n"
msgstr "wysy�anie linii nie powiod�o si�: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "b��d wysy�ania standardowych opcji: %s\n"
@@@ -11219,15 -9017,12 +11254,15 @@@ msgstr "
"Sk�adnia: gpgconf [opcje]\n"
"Zarz�dzanie opcjami konfiguracji dla narz�dzi z systemu GnuPG\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Wymagany jest jeden argument komponentu"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Nie znaleziono komponentu"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "Argument nie jest dozwolony"
diff --cc po/pt.po
index 62acc03,beee02b..783e787
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -404,10 -318,6 +404,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "detalhado"
@@@ -518,11 -403,6 +518,11 @@@ msgstr "n�o suportado
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Por favor comunique bugs para <gnupg-bugs at gnu.org>.\n"
@@@ -538,55 -416,38 +538,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "ficheiro de op��es `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "a ler op��es de `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "imposs�vel criar %s: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -596,28 -456,22 +596,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "a escrever chave privada para `%s'\n"
@@@ -644,7 -492,6 +644,7 @@@ msgstr "base de dados de confian�a: lei
msgid "can't use '%s' as home directory\n"
msgstr "%s: imposs�vel criar directoria: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -669,18 -512,14 +669,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: ignorado: %s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
@@@ -696,8 -533,6 +696,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -705,9 -540,6 +705,9 @@@ msgstr "
"@Comandos:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -944,29 -733,22 +944,29 @@@ msgstr "erro na cria��o da frase secret
msgid "error creating a stream for a pipe: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "erro na leitura de `%s': %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "erro na leitura de `%s': %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "erro na leitura de `%s': %s\n"
@@@ -981,32 -761,26 +981,32 @@@ msgstr "erro ao escrever no porta-chave
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "imposs�vel ligar a `%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "problemas na comunica��o com o gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "cancelado pelo utilizador\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "problema com o agente: o agente returnou 0x%lx\n"
@@@ -1083,7 -842,6 +1083,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
@@@ -1345,7 -1049,6 +1345,7 @@@ msgstr "Nenhuma ajuda dispon�vel para `
msgid "ignoring garbage line"
msgstr "erro na �ltima linha\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "vers�o desconhecida"
@@@ -1485,95 -1161,75 +1485,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armadura: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "cabe�alho de armadura inv�lido: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "cabe�alho de armadura: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "cabe�alho de armadura: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "assinaturas em texto puro aninhadas\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "armadura inesperada:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "linha com h�fen inv�lida: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, fuzzy, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter radix64 inv�lido %02x ignorado\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "fim de ficheiro prematuro (sem CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "fim de ficheiro prematuro (no CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "CRC malformado\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "erro de CRC; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "erro na �ltima linha\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armadura inv�lida: linha maior que %d caracteres\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, 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:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1581,25 -1237,20 +1581,25 @@@ msgstr "
"um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
"terminar com um '='\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, 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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1609,7 -1260,6 +1609,7 @@@ msgstr "
"um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
"terminar com um '='\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
@@@ -1639,19 -1284,14 +1639,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "chave secreta n�o dispon�vel"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
@@@ -1666,10 -1304,6 +1666,10 @@@ msgstr "Este comando n�o � permitido n
msgid "Reset Code not or not anymore available\n"
msgstr "partes da chave secreta n�o dispon�veis\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Op��o? "
@@@ -1736,148 -1356,115 +1736,149 @@@ msgstr "a escrever chave p�blica para `
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "erro na escrita do porta-chaves `%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "prefer�ncias actualizadas"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "mostra impress�o digital"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Qual o tamanho de chave desejado? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "arredondado para %u bits\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1885,155 -1472,120 +1886,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Por favor selecione o tipo de chave desejado:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (apenas cifragem)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Op��o inv�lida.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "motivo da revoca��o: "
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Este comando n�o � permitido no modo %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "ignorado: a chave secreta j� est� presente\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Realmente assinar? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "sair deste menu"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "mostra esta ajuda"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "Nenhuma ajuda dispon�vel"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "muda a data de validade"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "muda os valores de confian�a"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "mostra impress�o digital"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "gerar um novo par de chaves"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "comandos em conflito\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Comando inv�lido (tente \"help\")\n"
@@@ -2041,28 -1592,19 +2042,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output n�o funciona para este comando\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "imposs�vel abrir `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "chave `%s' n�o encontrada: %s\n"
@@@ -2119,7 -1650,6 +2120,7 @@@ msgstr "h� uma chave secreta para a cha
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
@@@ -2139,7 -1666,6 +2140,7 @@@ msgstr "assinatura falhou: %s\n
msgid "'%s' already compressed\n"
msgstr "%s' j� comprimido\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2158,7 -1682,6 +2159,7 @@@ msgid "
msgstr ""
"ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2178,17 -1699,14 +2179,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrado para: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "dados cifrados com %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrado com algoritmo desconhecido %d\n"
@@@ -2256,346 -1761,281 +2257,360 @@@ 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:78
++#: g10/export.c:102
#, 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:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr ""
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "chave secreta n�o utiliz�vel"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: ignorado: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "a escrever para `%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "AVISO: nada exportado\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[Utilizador n�o encontrado]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "erro ao criar `%s': %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "mostra impress�o digital"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "fazer uma assinatura separada"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifrar dados"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "cifrar apenas com cifra sim�trica"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "decifrar dados (ac��o por omiss�o)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verificar uma assinatura"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "listar as chaves"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "listar as chaves e as assinaturas"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "verificar as assinaturas das chaves"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "listar as chaves e as impress�es digitais"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "listar as chaves secretas"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "gerar um novo par de chaves"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "gerar um novo par de chaves"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "gerar um certificado de revoga��o"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "remover chaves do porta-chaves p�blico"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "remover chaves do porta-chaves secreto"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "assinar uma chave"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "assinar uma chave localmente"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "assinar ou editar uma chave"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "muda a frase secreta"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "exportar chaves"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "exportar chaves para um servidor de chaves"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importar chaves de um servidor de chaves"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "procurar chaves num servidor de chaves"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "actualizar todas as chaves a partir de um servidor de chaves"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importar/fundir chaves"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "actualizar a base de dados de confian�a"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "criar sa�da com armadura ascii"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NOME|cifrar para NOME"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"usar este identificador de utilizador para\n"
"assinar ou decifrar"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|estabelecer n�vel de compress�o N\n"
"(0 desactiva)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "usar modo de texto can�nico"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "n�o fazer altera��es"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "perguntar antes de sobrep�r"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2603,7 -2043,6 +2618,7 @@@ msgstr "
"@\n"
"(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2623,13 -2062,11 +2638,13 @@@ msgstr "
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2644,7 -2081,6 +2659,7 @@@ msgstr "
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2652,601 -2088,476 +2667,606 @@@ msgstr "
"\n"
"Algoritmos suportados:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Chave p�blica: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Dispers�o: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compress�o: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "uso: gpg [op��es] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, 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:1904
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "desactiva uma chave"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "op��es de importa��o inv�lidas\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, 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:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, 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:3276
++#: g10/gpg.c:3330
#, 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:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
#, 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:3528
++#: g10/gpg.c:3601
#, 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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "prefer�ncias por omiss�o inv�lidas\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, 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:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-utilizador"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, fuzzy, c-format
msgid "export as ssh key failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, 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:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "erro na cria��o da frase secreta: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
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:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@@ -3292,326 -2595,262 +3312,328 @@@ msgstr "Nenhuma ajuda dispon�vel
msgid "No help available for '%s'"
msgstr "Nenhuma ajuda dispon�vel para `%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualizar a base de dados de confian�a"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualizar a base de dados de confian�a"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "mostra impress�o digital"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "chave secreta n�o utiliz�vel"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "ignorando bloco do tipo %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chaves processadas at� agora\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "N�mero total processado: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " ignorei novas chaves: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " sem IDs de utilizadores: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importados: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " n�o modificados: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " novos IDs de utilizadores: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " novas subchaves: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " novas assinaturas: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " novas revoga��es de chaves: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chaves secretas importadas: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " chaves secretas n�o modificadas: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " n�o importadas: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " novas assinaturas: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chaves secretas lidas: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "ignorado `%s': %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, fuzzy, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, fuzzy, c-format
msgid "key %s: no valid user IDs\n"
msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, 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:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "chave %08lX: chave nova - ignorada\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "a escrever para `%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, 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:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, 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:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "chave %08lX: \"%s\" n�o modificada\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "chave %08lX: chave secreta importada\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "a escrever chave privada para `%s'\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3626,144 -2865,117 +3648,144 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, 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:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "chave %08lX: liga��o de subchave inv�lida\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, 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:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, 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:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "chave %08lX: ignorado ID de utilizador '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "chave %08lX: subchave ignorada\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, fuzzy, c-format
msgid "key %s: direct key signature added\n"
msgstr "chave %08lX: assinatura directa de chave adicionada\n"
@@@ -3800,48 -3006,39 +3822,48 @@@ msgstr "erro ao criar `%s': %s\n
msgid "error opening key DB: %s\n"
msgstr "erro na leitura de `%s': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[revoga��o]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[auto-assinatura]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "Assinatura correcta de \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "ignorado `%s': %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3849,7 -3046,6 +3871,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3857,21 -3053,18 +3879,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d assinaturas incorrectas\n"
msgstr[1] "%d assinaturas incorrectas\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Assinatura correcta de \""
msgstr[1] "Assinatura correcta de \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3884,68 -3077,53 +3906,68 @@@ msgstr "
"(vendo passaportes, verificando impress�es digitais...)?\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Confio moderadamente\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Confio plenamente\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " N�o foi poss�vel assinar.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, fuzzy, c-format
msgid "User ID \"%s\" is expired."
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, 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:1239
++#: g10/keyedit.c:1242
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Realmente assinar? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3954,11 -3132,9 +3976,11 @@@ msgstr "
"A sua auto-assinatura em \"%s\"\n"
"� uma assinatura do tipo PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, fuzzy, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3967,12 -3143,10 +3989,12 @@@ msgstr "
"A sua assinatura actual em \"%s\"\n"
"� uma assinatura local.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
#, 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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3981,44 -3155,35 +4003,44 @@@ msgstr "
"A sua assinatura actual em \"%s\"\n"
"� uma assinatura local.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, fuzzy, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
#, 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:1372
++#: g10/keyedit.c:1375
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nada para assinar com a chave %08lX\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Esta chave expirou!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Esta chave vai expirar em %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4028,32 -3193,26 +4050,32 @@@ msgstr "
"pertence\n"
"� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) N�o vou responder.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) N�o verifiquei.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Verifiquei por alto.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Verifiquei com bastante cuidado.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr " i = mostrar mais informa��es\n"
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4062,268 -3221,214 +4084,268 @@@ msgstr "
"Voc� tem certeza de que quer assinar esta chave com\n"
"a sua chave: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Isto ser� uma auto-assinatura.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, 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:1544
++#: g10/keyedit.c:1547
#, 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:1551
++#: g10/keyedit.c:1554
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"N�o verifiquei esta chave.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"Verifiquei por alto esta chave.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Verifiquei esta chave com muito cuidado.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Realmente assinar? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "gravar e sair"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "mostra impress�o digital"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Nota��o de assinatura: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "lista chave e identificadores de utilizadores"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "seleciona ID de utilizador N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "seleciona ID de utilizador N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "revoga assinaturas"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "assina a chave localmente"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, fuzzy
msgid "sign selected user IDs with a trust signature"
msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "adiciona um novo ID de utilizador"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "adiciona um identificador fotogr�fico"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "remove ID de utilizador"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "remove uma chave secund�ria"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "adiciona uma chave de revoca��o"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
#, 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:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "seleccionar o identificador do utilizador como prim�rio"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "lista prefer�ncias (perito)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "lista prefer�ncias (detalhadamente)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, fuzzy
msgid "set preference list for the selected user IDs"
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
#, 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:1914
++#: g10/keyedit.c:1917
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr ""
"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "muda a frase secreta"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "muda os valores de confian�a"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revocar um ID de utilizador"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revoga uma chave secund�ria"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "activa uma chave"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "desactiva uma chave"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "mostrar identificador fotogr�fico"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Chave secreta dispon�vel.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "A chave secreta � necess�ria para fazer isto.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4331,274 -3436,221 +4353,280 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "A chave est� revogada."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Realmente assinar todos os IDs de utilizador? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Realmente assinar todos os IDs de utilizador? "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "classe de assinatura desconhecida"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
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:2325
++#: g10/keyedit.c:2328
#, fuzzy
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Realmente remover este ID de utilizador? "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, fuzzy, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "erro ao criar porta-chaves `%s': %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Voc� deve selecionar pelo menos uma chave.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Voc� quer realmente remover as chaves selecionadas? "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Voc� quer realmente remover esta chave? "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Realmente revocar este ID de utilizador? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Voc� quer realmente revogar esta chave? "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Voc� quer realmente revogar as chaves selecionadas? "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Voc� quer realmente revogar esta chave? "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "configurar lista de prefer�ncias"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, 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:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Realmente actualizar as prefer�ncias?"
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Gravar altera��es? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Sair sem gravar? "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "actualiza��o falhou: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "A gera��o de chaves falhou: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, 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:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valor inv�lido\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Identificador de utilizador inexistente.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Nada para assinar com a chave %08lX\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "'Digest': "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Caracter�sticas: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Nota��o: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr " (sens�vel)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "imposs�vel criar %s: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "revkey"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr "[expira: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr "[expira: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " confian�a: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " confian�a: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Esta chave foi desactivada"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4606,35 -3658,27 +4634,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "revkey"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4643,36 -3687,28 +4671,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Apagar esta assinatura v�lida? (s/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Realmente remover esta auto-assinatura? (s/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4680,38 -3716,31 +4708,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d assinatura removida.\n"
msgstr[1] "%d assinatura removida.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Nada removido.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
#, fuzzy
msgid "invalid"
msgstr "armadura inv�lida"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Utilizador \"%s\" est� revocado."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4720,202 -3749,164 +4748,207 @@@ 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:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Insira o ID de utilizador do revogador escolhido: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
#, 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:4575
++#: g10/keyedit.c:4682
#, 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:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, 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:4637
++#: g10/keyedit.c:4744
#, 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:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Modificar a data de validade para uma chave prim�ria.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Seleccione exactamente um identificador de utilizador.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, 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:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, 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:5277
++#: g10/keyedit.c:5384
#, 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:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Nota��o de assinatura: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Escrever por cima (s/N)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Nenhum ID de utilizador com �ndice %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID de utilizador: \""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, 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:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (n�o-export�vel)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " assinado por %08lX em %s%s\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, fuzzy, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Assinou estes identificadores de utilizadores:\n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (n�o-export�vel)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revogado por %08lX em %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Est� prestes a revogar estas assinaturas:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Realmente criar os certificados de revoga��o? (s/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "nenhuma chave secreta\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5370,13 -4283,10 +5403,13 @@@ msgstr "
"gera��o dos n�meros primos; isso d� ao gerador de n�meros aleat�rios\n"
"uma hip�tese maior de ganhar entropia suficiente.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5384,68 -4294,55 +5417,68 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "%s' j� comprimido\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Criar mesmo assim?"
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Criar mesmo assim?"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Gera��o de chave cancelada.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, 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:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "chaves p�blica e privada criadas e assinadas.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5454,7 -4351,6 +5487,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5462,7 -4358,6 +5495,7 @@@ msgstr "
"a chave foi criada %lu segundo no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5470,51 -4365,40 +5503,51 @@@ msgstr "
"a chave foi criada %lu segundos no futuro\n"
"(viagem no tempo ou problema no rel�gio)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
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:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, 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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Realmente criar? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr ""
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politica de assinatura cr�tica: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politica de assinatura: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Nota��o de assinatura cr�tica: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Nota��o de assinatura: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5522,7 -4406,6 +5555,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d assinaturas incorrectas\n"
msgstr[1] "%d assinaturas incorrectas\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5530,46 -4413,33 +5563,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 assinatura n�o verificada devido a um erro\n"
msgstr[1] "1 assinatura n�o verificada devido a um erro\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Porta-chaves"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Impress�o da chave prim�ria:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Impress�o da subchave:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr "Impress�o da chave prim�ria:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Impress�o da subchave:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " Impress�o da chave ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5634,302 -4492,245 +5662,307 @@@ msgstr "a URL de pol�tica de assinatur
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "chave `%s' n�o encontrada: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "ignorado `%s': %s\n"
+
++#: g10/keyserver.c:1823
#, fuzzy, c-format
msgid "sending key %s to %s\n"
msgstr ""
"\"\n"
"assinado com a sua chave %08lX em %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "a pedir a chave %08lX de %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, fuzzy, c-format
msgid "%s encrypted session key\n"
msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "cifrado com algoritmo desconhecido %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "a chave p�blica � %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " ou \""
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrado com chave %s, ID %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decifragem de chave p�blica falhou: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, fuzzy, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "Repita a frase secreta\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
#, fuzzy
msgid "encrypted with 1 passphrase\n"
msgstr "Repita a frase secreta\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "a assumir dados cifrados %s\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "decifragem correcta\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nome do ficheiro original='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "Assinatura INCORRECTA de \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Assinatura expirada de \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Assinatura correcta de \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "verifica��o de assinatura suprimida\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, fuzzy, c-format
msgid " using %s key %s\n"
msgstr " ou \""
- #: g10/mainproc.c:1727
++#: 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:1744
#, fuzzy
msgid "Key available at: "
msgstr "Nenhuma ajuda dispon�vel"
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[incerto]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " ou \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, fuzzy, c-format
msgid "Signature expired %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, fuzzy, c-format
msgid "Signature expires %s\n"
msgstr "Esta assinatura expirou em %s.\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, fuzzy, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
#, fuzzy
msgid "binary"
msgstr "primary"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr ""
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
#, fuzzy
msgid "unknown"
msgstr "vers�o desconhecida"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritmo de chave p�blica desconhecido"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Imposs�vel verificar assinatura: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "n�o � uma assinatura separada\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "assinatura de classe 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "formato de assinatura antigo (PGP2.x)\n"
@@@ -6108,7 -4875,6 +6141,7 @@@ msgstr "imposs�vel manipular algoritmo
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr ""
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@@ -6480,46 -5178,37 +6513,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " N�o se tem certeza de que a assinatura pertence ao dono.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: ignorado: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6527,37 -5216,29 +6560,37 @@@ msgstr "
"\n"
"Insira o identificador do utilizador. Termine com uma linha vazia: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Identificador de utilizador inexistente.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "A chave p�blica est� desativada.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "ignorado: a chave p�blica j� est� presente\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "nenhum endere�o v�lido\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "chave %08lX: sem ID de utilizador\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "chave %08lX: sem ID de utilizador\n"
@@@ -6566,29 -5246,23 +6599,29 @@@
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:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Assinatura separada.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Por favor digite o nome do ficheiro de dados: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "lendo do \"stdin\" ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "n�o h� dados assinados\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "imposs�vel abrir dados assinados `%s'\n"
@@@ -6833,7 -5462,6 +6866,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
msgstr[1] "a chave p�blica %08lX � %lu segundo mais nova que a assinatura\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6909,12 -5528,10 +6942,12 @@@ msgstr "
"AVISO: imposs�vel expandir-%% a url de pol�tica (demasiado grande).\n"
"A utilizar n�o expandida.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "assinatura %s de: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, fuzzy, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6922,11 -5539,9 +6955,11 @@@ msgstr "
"for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
"destinat�rio\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "a assinar:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "ser� utilizada a cifragem %s\n"
@@@ -7003,133 -5604,106 +7036,133 @@@ msgstr "armadura: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "base de dados de confian�a: sincroniza��o falhou: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "imposs�vel abrir `%s'\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, 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:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "transa��o de base de dados de confian�a muito grande\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: diretoria inexistente!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "imposs�vel fechar `%s': %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: falha ao criar registo de vers�o: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: base de dados de confian�a inv�lida criada\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: base de dados de confian�a criada\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de dados de confian�a inv�lida\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: erro a actualizar registo de vers�o: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: erro ao ler registo de vers�o: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: erro ao escrever registo de vers�o: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de dados de confian�a: lseek falhou: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, 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:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: n�o � um base de dados de confian�a\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: registo de vers�o com recnum %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: erro ao ler registo livre: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: falha ao zerar um registo: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: falha ao anexar um registo: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: base de dados de confian�a criada\n"
@@@ -7490,7 -6002,6 +7523,7 @@@ msgstr "
msgid "no need for a trustdb check\n"
msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
@@@ -7505,7 -6014,6 +7538,7 @@@ msgstr "n�o � necess�ria uma verifica��
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "chave p�blica %08lX n�o encontrada: %s\n"
@@@ -7518,39 -6024,33 +7551,39 @@@ msgstr "
msgid "checking the trustdb\n"
msgstr "a verificar a base de dados de confian�a\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu chaves processadas at� agora\n"
msgstr[1] "%lu chaves processadas at� agora\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
#, fuzzy
msgid "no ultimately trusted keys found\n"
msgstr ""
"chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr ""
"chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, 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"
@@@ -8011,27 -6416,22 +8044,27 @@@ msgstr "comandos em conflito\n
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8041,7 -6440,6 +8074,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "caracter radix64 inv�lido %02x ignorado\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
@@@ -9915,8 -7926,6 +9948,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "uso: gpg [op��es] "
@@@ -9927,12 -7935,10 +9960,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "%s n�o � permitido com %s!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
@@@ -10428,77 -8332,61 +10461,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "remo��o do bloco de chave falhou: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, 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:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10638,7 -8496,6 +10671,7 @@@ msgstr "destinat�rio por omiss�o descon
msgid "sending line failed: %s\n"
msgstr "assinatura falhou: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "erro ao enviar para `%s': %s\n"
@@@ -10893,16 -8689,13 +10926,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "chave p�blica n�o encontrada"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "a escrever chave privada para `%s'\n"
diff --cc po/ro.po
index 2ca3e45,71435aa..d8c1b50
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -416,10 -330,6 +416,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "locvace"
@@@ -528,11 -413,6 +528,11 @@@ msgstr "nu este suportat(�)
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Raporta�i bug-uri la <gnupg-bugs at gnu.org>.\n"
@@@ -548,55 -426,38 +548,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "fi�ier op�iuni `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "citesc op�iuni din `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "nu pot crea `%s': %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -606,28 -466,22 +606,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "eroare la ob�inere noului PIN: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "scriu cheia secret� �n `%s'\n"
@@@ -656,7 -504,6 +656,7 @@@ msgstr "fstat(%d) a e�uat �n %s: %s\n
msgid "can't use '%s' as home directory\n"
msgstr "%s: nu pot crea director: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "eroare la citire `%s': %s\n"
@@@ -681,18 -524,14 +681,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "actualizarea secretului a e�uat: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: s�rit�: %s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
@@@ -708,8 -545,6 +708,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -717,9 -552,6 +717,9 @@@ msgstr "
"@Comenzi:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -961,29 -750,22 +961,29 @@@ msgstr "eroare la crearea frazei-parol�
msgid "error creating a stream for a pipe: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "eroare la citire `%s': %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "eroare la citire `%s': %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "eroare la citire `%s': %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "eroare la citire `%s': %s\n"
@@@ -998,32 -778,26 +998,32 @@@ msgstr "eroare la ob�inerea informa�ie
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "nu m� pot conecta la `%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "probleme de comunicare cu gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "anulat� de utilizator\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
@@@ -1098,7 -857,6 +1098,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 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"
@@@ -1362,7 -1066,6 +1362,7 @@@ msgstr "Nici un disponibil disponibil p
msgid "ignoring garbage line"
msgstr "eroare linia de trailer\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "[nesetat(�)]"
@@@ -1502,93 -1178,73 +1502,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "armur�: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "header armur� invalid: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "header armur�: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "header clearsig invalid\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "header armur�: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "semn�turi text �n clar �ncuib�rite\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "armur� nea�teptat�: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "linie cu liniu�� escape invalid�: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "caracter radix64 invalid %02X s�rit\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "eof prematur (nici un CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "eof prematur (�n CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "CRC anormal\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "eroare CRC; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "eof prematur (�n trailer)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "eroare linia de trailer\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "ilizibil"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1596,26 -1252,21 +1596,26 @@@ 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:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1625,7 -1276,6 +1625,7 @@@ 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:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
@@@ -1655,19 -1300,14 +1655,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "AVERTISMENT: "
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "cardul OpenPGP nu e disponibil: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "cardul OpenPGP nr. %s detectat\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "nu pot face acest lucru �n modul batch\n"
@@@ -1681,10 -1319,6 +1681,10 @@@ msgstr "Aceast� comand� nu este permis
msgid "Reset Code not or not anymore available\n"
msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Selec�ia d-voastr�? "
@@@ -1746,141 -1366,108 +1746,142 @@@ 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: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "eroare la scrierea inelului de chei `%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Date login (nume cont): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Date DO personale: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Preferin�e limb�: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Eroare: r�spuns invalid.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "Amprenta CA: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Eroare: amprent� formatat� invalid.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "opera�ia pe cheie nu e posibil�: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "nu este un card OpenPGP"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "�nlocuiesc cheia existent�? (d/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Ce lungime de cheie dori�i? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Ce lungime de cheie dori�i? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Ce lungime de cheie dori�i? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "rotunjit� prin adaos la %u bi�i\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "dimensiunile cheii %s trebuie s� fie �n intervalul %u-%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "cheia secret� deja stocat� pe un card\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "�nlocuiesc cheile existente? (d/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1895,143 -1482,108 +1896,143 @@@ msgstr "
" PIN = `%s' PIN Admin = `%s'\n"
"Ar trebui s� le schimba�i folosind comanda --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Cheie de semnare\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Cheie de cifrare\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) Cheie de autentificare\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Selec�ie invalid�.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "cheia secret� deja stocat� pe un card\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Dori�i s�-l semna�i? (d/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "ie�i din acest meniu"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "arat� comenzi administrare"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "afi�eaz� acest mesaj"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "afi�eaz� toate datele disponibile"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "schimb� numele purt�torului cardului"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "schimb� URL-ul de unde s� fie adus� cheia"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "adu cheia specificat� de URL-ul de pe card"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "schimb� numele de login"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "schimb� preferin�ele de limb�"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "schimb� sexul purt�torului cardului"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "schimb� o amprent� CA"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "comut� fanionul PIN de for�are a semn�turii"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "genereaz� noi chei"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "meniu pentru a schimba sau debloca PIN-ul"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "verific� PIN-ul �i listeaz� toate datele"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "Comand� numai-administrare\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Sunt permise comenzi administrare\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "Nu sunt permise comenzi administrare\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Comand� invalid� (�ncerca�i \"ajutor\")\n"
@@@ -2039,28 -1590,19 +2040,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output nu merge pentru aceast� comand�\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nu pot deschide `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2117,7 -1648,6 +2118,7 @@@ msgstr "
"folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
"�nt�i.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "eroare la crearea frazei-parol�: %s\n"
@@@ -2137,7 -1664,6 +2138,7 @@@ msgstr "folosesc cifrul %s\n
msgid "'%s' already compressed\n"
msgstr "`%s' deja compresat\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2157,7 -1681,6 +2158,7 @@@ msgstr "
"AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
"destinatarului\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2176,17 -1697,14 +2177,17 @@@ msgstr "for��nd cifrul simetric %s (%d
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s cifrat pentru: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s date cifrate\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "cifrat cu un algoritm necunoscut %d\n"
@@@ -2260,338 -1765,273 +2261,352 @@@ 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:78
++#: g10/export.c:102
#, fuzzy
msgid "export signatures that are marked as local-only"
msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "cheie secret� de nefolosit"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: s�rit�: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "scriu �n `%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
msgid "exporting secret keys not allowed\n"
msgstr "exportul cheilor secrete nu este permis\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "AVERTISMENT: nimic exportat\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[ID utilizator nu a fost g�sit]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "op�iuni enumerare invalide\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "eroare �n `%s': %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "eroare la creearea `%s': %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "Amprenta CA: "
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[fi�ier]|creaz� o semn�tur�"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "creaz� o semn�tur� deta�at�"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "cifreaz� datele"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "cifreaz� numai cu cifru simetric"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "decripteaz� datele (implicit)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verific� o semn�tur�"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "enumer� chei"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "enumer� chei �i semn�turi"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "enumer� �i verific� semn�turile cheii"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "enumer� chei �i amprente"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "enumer� chei secrete"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "genereaz� o nou� perechi de chei"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "genereaz� o nou� perechi de chei"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "genereaz� un certificat de revocare"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "�terge chei de pe inelul de chei public"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "�terge chei de pe inelul de chei secret"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "semneaz� o cheie"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "semneaz� o cheie local"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "semneaz� o cheie"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "semneaz� o cheie local"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "semneaz� sau editeaz� o cheie"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "schimb� fraza-parol�"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "export� chei"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "export� chei pentru un server de chei"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "import� chei de la un server de chei"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "caut� pentru chei pe un server de chei"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "actualizeaz� toate cheile de la un server de chei"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "import�/combin� chei"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "afi�eaz� starea cardului"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "schimb� data de pe card"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "schimb� PIN-ul unui card"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "actualizeaz� baza de date de �ncredere"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "creaz� ie�ire �n armur� ascii"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|NUME|cifrare pentru NUME"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "folose�te modul text canonic"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "nu face nici o schimbare"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "�ntreab� �nainte de a suprascrie"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "folose�te comportament strict OpenPGP"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2599,7 -2039,6 +2614,7 @@@ msgstr "
"@\n"
"(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2619,13 -2058,11 +2634,13 @@@ msgstr "
" --list-keys [nume] arat� chei\n"
" --fingerprint [nume] arat� amprente\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2640,7 -2077,6 +2655,7 @@@ msgstr "
"sign, check, encrypt sau decrypt\n"
"opera�iunea implicit� depinde de datele de intrare\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2648,78 -2084,64 +2663,78 @@@ msgstr "
"\n"
"Algoritmuri suportate:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Cifru: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Compresie: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "folosire: gpg [op�iuni] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "comenzi �n conflict\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@@ -2727,7 -2149,6 +2742,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1551
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2737,7 -2158,6 +2752,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
"configurare `%s'\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@@ -2745,7 -2165,6 +2760,7 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1560
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@@ -2753,7 -2172,6 +2768,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1563
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2764,7 -2182,6 +2779,7 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
"configurare `%s'\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, fuzzy, c-format
#| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@@ -2772,510 -2189,405 +2787,516 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"extensia `%s'\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, 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:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, 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:1904
#, 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:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "deactiveaz� cheia"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "op�iune necunoscut� `%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op�iuni server de chei invalide\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "op�iuni server de chei invalide\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op�iuni import invalide\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "op�iuni import invalide\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "op�iuni enumerare invalide\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op�iuni export invalide\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "op�iuni export invalide\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op�iuni enumerare invalide\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "op�iuni enumerare invalide\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "`%s' nu este expirare de semn�tur� valid�\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "op�iuni verificare invalide\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execu�ie ca %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: op�iuni verificare invalide\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm compresie selectat este invalid\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "preferin�e implicite invalide\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "preferin�e cifrare personale invalide\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "preferin�e rezumat personale invalide\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "preferin�e compresie personale invalide\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge �nc� cu %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [nume_fi�ier]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [nume_fi�ier]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, 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:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [nume_fi�ier]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
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:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [nume_fi�ier]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
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:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nume_fi�ier]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [nume_fi�ier]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [nume_fi�ier]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizator"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizator"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizator [comenzi]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id-utilizator"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei e�uat�: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recep�ie server de chei e�uat�: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie e�uat: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "c�utare server de chei e�uat�: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei e�uat�: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a e�uat: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a e�uat: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "eroare la ob�inerea num�rului serial: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[nume_fi�ier]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@@ -3319,330 -2623,267 +3340,333 @@@ msgstr "Nici un ajutor disponibil
msgid "No help available for '%s'"
msgstr "Nici un disponibil disponibil pentru `%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "actualizeaz� baza de date de �ncredere"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "actualizeaz� baza de date de �ncredere"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "afi�eaz� amprenta cheii"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "cheie secret� de nefolosit"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "bloc de tip %d s�rit\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu chei procesate p�n� acum\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Num�r total procesate: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " chei noi s�rite: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " f�r� ID-uri utilizator: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importate: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " neschimbate: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " noi ID-uri utilizator: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " noi subchei: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " noi semn�turi: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " noi revoc�ri de chei: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " chei secrete citite: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " chei secrete importate: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr "chei secrete neschimbate: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " ne importate: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "semn�turi create p�n� acum: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " chei secrete citite: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, 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:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm de cifrare %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm rezumat %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": preferin�� pentru algoritm compresie %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
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:893
++#: g10/import.c:1069
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:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "cheia %s: nici un ID utilizator\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "s�rit� \"%s\": %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "cheia %s: nici un ID utilizator valid\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, 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:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "cheia %s: cheie nou� - s�rit�\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, 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:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "scriu �n `%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "cheia %s: cheia public� \"%s\" importat�\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, 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:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "cheia %s: \"%s\" %d noi subchei\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "cheia %s: cheie secret� importat�\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, 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:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "importul de chei secrete nu este permis\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3657,142 -2898,115 +3681,142 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, 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:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "cheia %s: legare subcheie invalid�\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "cheia %s: revocare de subcheie invalid�\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "cheia %s: am s�rit subcheia\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
@@@ -3830,51 -3038,42 +3854,51 @@@ msgstr "resurs� keyblock `%s': %s\n
msgid "error opening key DB: %s\n"
msgstr "eroare �n `%s': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[revocare]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[auto-semn�tur�]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
#| msgid "revoke signatures"
msgid " (reordered signatures follow)"
msgstr "revoc� semn�turi"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s:\n"
msgstr "s�rit� \"%s\": %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3882,7 -3081,6 +3906,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3890,21 -3088,18 +3914,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d semn�turi incorecte\n"
msgstr[1] "%d semn�turi incorecte\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Semn�tur� bun� din \"%s\""
msgstr[1] "Semn�tur� bun� din \"%s\""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3915,17 -3110,14 +3939,17 @@@ msgstr "
"pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
"verific�nd amprentele din diferite surse, etc.)\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Am o �ncredere marginal�\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Am toat� �ncrederea\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3935,52 -3127,40 +3959,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:1018
++#: g10/keyedit.c:1021
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:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Nu pot semna.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "ID utilizator \"%s\" este expirat."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID-ul utilizator \"%s\" poate fi semnat. "
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Dori�i s�-l semna�i? (d/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3989,11 -3169,9 +4013,11 @@@ msgstr "
"Auto-semn�tura pe \"%s\"\n"
"este o semn�tur� stil PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4002,12 -3180,10 +4026,12 @@@ msgstr "
"Semn�tura d-voastr� curent� pe \"%s\"\n"
"a expirat.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4016,43 -3192,34 +4040,43 @@@ msgstr "
"Semn�tura d-voastr� curent� pe \"%s\"\n"
"semn�tur� local�.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
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:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Nimic de semnat cu cheia %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Aceast� cheie a expirat!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Aceast� cheie va expira pe %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4063,33 -3230,27 +4087,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:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Nu voi r�spunde.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Nu am verificat deloc.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, 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:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
#, 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:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4098,228 -3259,174 +4122,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:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Aceasta va fi o auto-semn�tur�.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
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:1527
++#: g10/keyedit.c:1530
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:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "Nu am verificat aceast� cheie deloc.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "Am verificat aceast� cheie superficial.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "Am verificat aceast� cheie foarte atent.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
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:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "salveaz� �i termin�"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "afi�eaz� amprenta cheii"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Notare semn�tur�: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "enumer� chei �i ID-uri utilizator"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "selecteaz� ID utilizator N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "selecteaz� subcheia N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "verific� semn�turi"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
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:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
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:1878
++#: g10/keyedit.c:1881
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:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "adaug� un ID utilizator"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "adaug� o poz� ID"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "�terge ID-urile utilizator selectate"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "adaug� o subcheie"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "adaug� o cheie la un smartcard"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "mut� o cheie pe un smartcard"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "mut� o cheie de rezerv� pe un smartcard"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "�terge subcheile selectate"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "adaug� o cheie de revocare"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "marcheaz� ID-ul utilizator selectat ca primar"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "enumer� preferin�ele (expert)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "afi�eaz� preferin�ele (detaliat)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
#, 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:1914
++#: g10/keyedit.c:1917
#, fuzzy
msgid "set a notation for the selected user IDs"
msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "schimb� fraza-parol�"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "schimb� �ncrederea pentru proprietar"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "revoc� ID-urile utilizator selectate"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "revoc� cheia sau subcheile selectate"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "activeaz� cheia"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "deactiveaz� cheia"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "arat� pozele pentru ID-urile utilizator selectate"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Cheia secret� este disponibil�.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4338,266 -3445,213 +4362,272 @@@ msgstr "
" pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
" (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Cheia este revocat�."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, 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:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, 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:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
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:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
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:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Trebuie s� selecta�i exact o cheie.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, 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:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
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:2503
++#: g10/keyedit.c:2506
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:2541
++#: g10/keyedit.c:2544
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:2542
++#: g10/keyedit.c:2545
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:2560
++#: g10/keyedit.c:2563
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:2571
++#: g10/keyedit.c:2574
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:2573
++#: g10/keyedit.c:2576
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:2631
++#: g10/keyedit.c:2634
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:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Seteaz� lista de preferin�e ca:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
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:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Salva�i schimb�rile? (d/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Termina�i f�r� a salva? (d/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "actualizarea a e�uat: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
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:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Generarea cheii a e�uat: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "amprent� invalid�"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "am e�uat s� stochez amprenta: %s\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "valoare invalid�\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Nu exist� acest ID utilizator.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, 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:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Rezumat: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Capabilit��i: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Server de chei no-modify"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Server de chei preferat: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Nota�ie:"
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr " (senzitiv)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "creat�: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "revocat�: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "expirat�: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "expir�: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "folosire: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "nr-card: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "�ncredere: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "validitate: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Aceast� cheie a fost deactivat�"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4606,17 -3660,12 +4636,17 @@@ msgstr "
"corect� dac� nu reporni�i programul.\n"
#
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "revocat�"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "expirat�"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4625,17 -3674,14 +4655,17 @@@ msgstr "
" Aceast� comand� poate cauza ca un alt ID utilizator\n"
" s� devin� ID-ul utilizator primar presupus.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4644,35 -3690,27 +4674,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4680,37 -3718,30 +4710,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:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Nu am �ters nimic.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "invalid(�)"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID utilizator \"%s\" a fost revocat."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4720,40 -3751,32 +4750,40 @@@ msgstr "
" desemnat poate face ca unele versiuni de PGP s� resping� "
"cheia.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
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:4632
++#: g10/keyedit.c:4739
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4764,161 -3787,132 +4794,167 @@@ msgstr "
"Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
"desemnat? (d/N) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Schimb timpul de expirare pentru o subcheie.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Introduce�i URL-ul serverului de chei preferat: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
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:5277
++#: g10/keyedit.c:5384
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:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Notare semn�tur�: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Suprascriu? (d/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Nici un ID utilizator cu indicele %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Nici un ID utilizator cu hash-ul %s\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "Nici o subcheie cu indicele %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID utilizator: \"%s\"\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (non-exportabil�)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Aceast� semn�tur� a expirat pe %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (non-revocabil�)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "revocat� de cheia d-voastr� %s pe %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
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:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "nici o cheie secret�\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, fuzzy, c-format
+ #| msgid "revoke a user ID"
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr "revoc� un ID utilizator"
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Cheia %s este deja revocat�.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Subcheia %s este deja revocat�.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5364,13 -4280,10 +5400,13 @@@ msgstr "
"�n timpul gener�rii numerelor prime; aceasta d� o �ans� generatorului de\n"
"numere aleatoare o �ans� mai bun� de a aduna destul� entropie.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Generarea cheii a e�uat: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5378,71 -4291,58 +5414,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "cheia exist� deja\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
#| msgid "Create anyway? "
msgid "Create anyway? (y/N) "
msgstr "Crea�i oricum? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "Create anyway? "
msgid "creating anyway\n"
msgstr "Crea�i oricum? "
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Generarea cheii a fost anulat�.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, 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:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "cheile secret� �i public� au fost create �i semnate.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5452,7 -4352,6 +5488,7 @@@ msgstr "
"s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
"pentru acest scop.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5460,7 -4359,6 +5496,7 @@@ msgstr "
"cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5468,49 -4366,38 +5504,49 @@@ msgstr "
"cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
"ceasul)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
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:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Crea�i �ntr-adev�r? (d/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "niciodat� "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Politic� de semn�turi critic�: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Politic� de semn�turi: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Server de chei preferat critic: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Notare semn�tur� critic�: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Notare semn�tur�: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5518,7 -4405,6 +5554,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d semn�turi incorecte\n"
msgstr[1] "%d semn�turi incorecte\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5526,45 -4412,32 +5562,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
msgstr[1] "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Inel de chei"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Amprent� cheie primar�:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Amprent� subcheie:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Amprent� cheie primar�:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Amprent� subcheie:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Amprent� cheie ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " Card nr. serie ="
@@@ -5631,25 -4492,20 +5662,25 @@@ msgstr "Introduce�i URL-ul serverului d
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "deactivat(�)"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5657,272 -4513,220 +5688,277 @@@ 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, 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:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "cer cheia %s de la serverul %s %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "cer cheia %s de la %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "nici o ac�iune pentru serverul de chei!\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "s�rit� \"%s\": %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "trimit cheia %s lui %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, 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:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s cheie de sesiune cifrat�\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, 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:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "cheia public� este %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "date cigrate cu cheie public�: DEK bun\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "cifrat cu cheia %s, ID %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "decriptarea cu cheie public� a e�uat: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "cifrat� cu %lu fraze-parol�\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "cifrat� cu 1 fraz�-parol�\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "presupunem date cifrate %s\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "decriptare OK\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "decriptarea a e�uat: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "nume fi�ier original='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Semn�tur� bun� din \"%s\""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "Semn�tur� INCORECT� din \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Semn�tur� expirat� din \"%s\""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "Semn�tur� bun� din \"%s\""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "verificare semn�tur� eliminat�\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "nu pot m�nui aceste semn�turi multiple\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Semn�tur� f�cut� %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " folosind cheia %s %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Cheie disponibil� la: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[nesigur]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " aka \"%s\""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Semn�tur� expirat� %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Semn�tura expir� %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binar"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "modtext"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "necunoscut"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "algoritm pubkey necunoscut"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nu pot verifica semn�tura: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "nu o semn�tur� deta�at�\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, 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:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
@@@ -6105,7 -4875,6 +6141,7 @@@ msgstr "
"AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
"(insecure)\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "subpachetul de tip %d are bitul critic setat\n"
@@@ -6482,46 -5183,37 +6518,46 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nu este sigur c� semn�tura apar�ine proprietarului.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: s�rit�: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: s�rit�: cheia public� este deactivat�\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Destinatari curen�i:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6529,37 -5221,29 +6565,37 @@@ msgstr "
"\n"
"Introduce�i ID-ul utilizator. Termina�i cu o linie nou�: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Nu exist� acest ID utilizator.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Cheia public� este deactivat�.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "s�rit�: cheia public� setat� deja\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "destinatar implicit necunoscut \"%s\"\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "nici un destinatar valid\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, 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:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "cheia %s nu are nici un ID utilizator\n"
@@@ -6569,29 -5252,23 +6605,29 @@@ msgid "data not saved; use option \"--o
msgstr ""
"datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Semn�tur� deta�at�.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "V� rug�m introduce�i numele fi�ierului de date: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "citesc stdin ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "nici o dat� semnat�\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nu pot deschide date semnate `%s'\n"
@@@ -6845,7 -5477,6 +6881,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
msgstr[1] "cheie public� %s este mai nou� cu %lu secund� dec�t semn�tura\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6925,12 -5547,10 +6961,12 @@@ msgstr "
"AVERTISMENT: nu pot %%-expanda URL-ul serverului de chei (prea mare). �l "
"folosesc neexpandat.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s semn�tur� de la: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6938,11 -5558,9 +6974,11 @@@ msgstr "
"AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
"destinatarului\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "semnare:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "va fi folosit� cifrarea %s\n"
@@@ -7019,136 -5623,109 +7055,136 @@@ msgstr "eroare citire �n `%s': %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sincronizarea a e�uat: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, 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:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek a e�uat: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "tranzac�ia trustdb prea mare\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: directorul nu exist�!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: am e�uat s� creez �nregistrare versiune: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: a fost creat trustdb invalid\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: a fost creat trustdb\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb invalid\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: am e�uat s� creez hashtable: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: eroare actualizare �nregistrare versiune: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: eroare citire �nregistrare versiune: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: eroare scriere �nregistrare versiune: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek a e�uat: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: nu e un fi�ier trustdb\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: �nregistrare versiune cu recnum %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versiune fi�ier invalid� %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: eroare citire �nregistrare liber�: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: eroare scriere �nregistrare dir: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, 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:1800
++#: g10/tdbio.c:1804
#, 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:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: a fost creat trustdb\n"
@@@ -7509,7 -6024,6 +7545,7 @@@ msgstr "folosesc model de �ncredere %s\
msgid "no need for a trustdb check\n"
msgstr "nu e nevoie de o verificare trustdb\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "urm�toarea verificare trustdb programat� pe %s\n"
@@@ -7526,7 -6038,6 +7562,7 @@@ msgstr "nu e nevoie de o verificare tru
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "cheia public� %s nu a fost g�sit�: %s\n"
@@@ -7539,7 -6048,6 +7575,7 @@@ msgstr "v� rug�m face�i un --check-trus
msgid "checking the trustdb\n"
msgstr "verific trustdb\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7547,7 -6055,6 +7583,7 @@@ msgid_plural "%d keys processed
msgstr[0] "%lu chei procesate p�n� acum\n"
msgstr[1] "%lu chei procesate p�n� acum\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7555,23 -6062,19 +7591,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d chei procesate (%d num�r�tori valide anulate)\n"
msgstr[1] "%d chei procesate (%d num�r�tori valide anulate)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, 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:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8037,27 -6445,22 +8073,27 @@@ msgstr "arat� comenzi administrare
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8067,7 -6469,6 +8103,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "caracter radix64 invalid %02X s�rit\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
@@@ -9959,8 -7973,6 +9995,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "folosire: gpg [op�iuni] "
@@@ -9971,13 -7982,11 +10007,13 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "%s nu este permis cu %s!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
@@@ -10486,78 -8393,62 +10522,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "stergere keyblock a e�uat: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, 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:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: am e�uat s� creez hashtable: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10697,7 -8558,6 +10733,7 @@@ msgstr "op�iune necunoscut� `%s'\n
msgid "sending line failed: %s\n"
msgstr "semnarea a e�uat: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "eroare trimitere la `%s': %s\n"
@@@ -10951,16 -8750,13 +10987,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "cheia public� nu a fost g�sit�"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "Nu sunt permise comenzi administrare\n"
diff --cc po/ru.po
index f0b6920,57c4045..8b1a9b0
--- 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-06-16 17:27+0200\n"
- "PO-Revision-Date: 2016-01-27 17:17+0000\n"
++"POT-Creation-Date: 2016-07-14 16:03+0200\n"
+ "PO-Revision-Date: 2016-06-20 17:17+0000\n"
"Last-Translator: Ineiev <ineiev at gnu.org>\n"
"Language-Team: Russian <gnupg-ru at gnupg.org>\n"
"Language: ru\n"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не могу открыть '%s': %s\n"
@@@ -400,10 -314,6 +400,10 @@@ msgstr "запуск в режиме д
msgid "run in server mode (foreground)"
msgstr "запуск в режиме сервера (нефоновый режим)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "подробно"
@@@ -502,11 -387,6 +502,11 @@@ msgstr "включить поддерж
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Об ошибках в программе сообщайте по адресу <@EMAIL@>.\n"
@@@ -522,51 -400,34 +522,51 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
"Управление секретными ключами для @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "запрошен недопустимый уровень отладки '%s'\n"
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "слишком старая версия %s (нужно %s, есть %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметров '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, c-format
msgid "reading options from '%s'\n"
msgstr "чтение параметров из '%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "Замечание: '%s' не считается параметром\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "не могу создать сокет: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "слишком длинное имя сокета '%s'\n"
@@@ -575,27 -435,21 +575,27 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "ошибка получения разового кода для сокета\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "ошибка связывания сокета с '%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "не удалось задать права доступа для '%s': %s\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "сбой listen(): %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, c-format
msgid "listening on socket '%s'\n"
msgstr "слушаем сокет '%s'\n"
@@@ -622,7 -470,6 +622,7 @@@ msgstr "сбой stat() для '%s': %s
msgid "can't use '%s' as home directory\n"
msgstr "невозможно использовать '%s' как домашний каталог\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "ошибка чтения разового кода из файлового дескриптора %d: %s\n"
@@@ -647,18 -490,14 +647,18 @@@ msgstr "обработчик ssh 0x%lx
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обработчик ssh 0x%lx для файлового дескриптора %d завершился\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "сбой npth_pselect: %s - жду 1 секунду\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s остановлен\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "в этом сеансе агент gpg не работает\n"
@@@ -675,8 -512,6 +675,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметры] КОД_КЛЮЧА\n"
"Работа с буфером паролей\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -684,9 -519,6 +684,9 @@@ msgstr "
"@Команды:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -924,29 -713,22 +924,29 @@@ msgstr "ошибка при созда�
msgid "error creating a stream for a pipe: %s\n"
msgstr "ошибка при создании потока для канала конвейера: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "ошибка при дублировании процесса: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "сбой при ожидании завершения процесса: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "ошибка выполнения '%s': возможно, не установлен\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "ошибка выполнения '%s': статус завершения %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, c-format
msgid "error running '%s': terminated\n"
msgstr "ошибка выполнения '%s': прервано\n"
@@@ -961,28 -741,22 +961,28 @@@ msgstr "ошибка получени�
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "сбой при ожидании завершения процесса %d: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "не могу подключиться к '%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "проблема связи с агентом gpg\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
msgid "problem setting the gpg-agent options\n"
msgstr "проблема задания параметров агента gpg\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "прервано пользователем\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "проблема с агентом\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "проблема с агентом (неожиданный ответ \"%s\")\n"
@@@ -1057,7 -816,6 +1057,7 @@@ msgstr "выход за предел б
msgid "out of core while allocating %lu bytes"
msgstr "выход за границы при размещении %lu байтов"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "ошибка выделения достаточной памяти: %s\n"
@@@ -1293,7 -997,6 +1293,7 @@@ msgstr "Нет справки для '%
msgid "ignoring garbage line"
msgstr "игнорируем дефектную строку"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[отсутствует]"
@@@ -1421,91 -1097,71 +1421,91 @@@ msgstr "блокировка '%s' не
msgid "waiting for lock %s...\n"
msgstr "ожидаю снятия блокировки %s...\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "текстовый формат: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "недопустимый текстовый заголовок: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "текстовый заголовок: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "недопустимый заголовок текстовой подписи\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "неизвестный текстовый заголовок: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "вложенные текстовые подписи\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "неожиданный текстовый формат: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "недопустимая строка, выделенная дефисами: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "недопустимый символ radix64 %02X (игнорируется)\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "преждевременный конец файла (нет контрольной суммы)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "преждевременный конец файла (в контрольной сумме)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "поврежденная контрольная сумма\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "ошибка контрольной суммы; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "преждевременный конец файла (в дополнении)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "ошибка в строке дополнения\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "не найдено данных формата OpenPGP.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "недопустимый текстовый формат: строка длиннее %d символов\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"символ quoted printable в текстовом формате - испорчено почтовой "
"программой?\n"
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
#, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "[ не для чтения человеком (%zu байт: %s%s) ]"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1513,27 -1169,21 +1513,27 @@@ msgstr "
"имя замечания должно содержать только печатные символы или пробелы и "
"заканчиваться знаком '='\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "имя замечания должно содержать символ '@'\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
msgid "a notation name must not contain more than one '@' character\n"
msgstr "имя замечания не должно содержать более одного символа '@'\n"
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "в тексте замечания не должно быть управляющих символов\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
msgid "a notation name may not contain an '=' character\n"
msgstr "имя примечания не должно содержать символа '='\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
msgid "a notation name must have only printable characters or spaces\n"
msgstr "имя замечания должно содержать только печатные символы или пробелы\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "Внимание: найдена недопустимая форма записи замечания\n"
@@@ -1561,19 -1206,14 +1561,19 @@@ msgstr "сервер '%s' старше
msgid "WARNING: %s\n"
msgstr "Внимание: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Карта OpenPGP недоступна: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Обнаружена карта OpenPGP номер %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "в пакетном режиме это действие невозможно\n"
@@@ -1585,10 -1223,6 +1585,10 @@@ msgstr "Эта команда дост�
msgid "Reset Code not or not anymore available\n"
msgstr "Код сброса (больше) не доступен\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ваш выбор? "
@@@ -1650,85 -1270,64 +1650,86 @@@ msgstr "URL для получения �
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Ошибка: Слишком длинный URL (предел - %d символов).\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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, c-format
msgid "error reading '%s': %s\n"
msgstr "ошибка чтения '%s': %s\n"
- #: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "ошибка записи '%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Учетная запись (имя): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
"Ошибка: Слишком длинные данные учетной записи (предел - %d символов).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Секретные данные DO:"
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Ошибка: Слишком много секретных данных DO (предел - %d символов).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Предпочтительный язык: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Пол ((M) мужской, (F) женский или пробел): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Ошибка: недопустимый ответ.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "отпечаток удостоверяющего центра: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Ошибка: недопустимый формат отпечатка.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "операция с ключом невозможна: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "это не карта OpenPGP"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "ошибка при считывании информации ключа: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Заменить существующий ключ? (y/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1738,55 -1337,43 +1739,55 @@@ msgstr "
" Если создать ключ не удастся, сверьтесь с документацией\n"
" на карту и выясните, какие размеры допустимы.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Какой Вам нужен размер ключа для подписей? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Какой Вам нужен размер ключа для шифрования? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Какой Вам нужен размер ключа для аутентификации? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлен до %u бит\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "размер ключей %s должен быть в пределах %u-%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "Теперь карта будет перенастроена на генерацию ключа длиной %u бит\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "ошибка изменения размера ключа %d до %u бит: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Сделать вне карты архивную копию ключа шифрования? (Y/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
msgid "Note: keys are already stored on the card!\n"
msgstr "Замечание: ключи уже хранятся на карте!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "Заменить существующие ключи? (y/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1797,138 -1384,103 +1798,138 @@@ msgstr "
" PIN = '%s' Админ. PIN = '%s'\n"
"Вам следует изменить их командой --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Выберите тип создаваемого ключа:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Ключ подписи\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Ключ шифрования\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) Ключ аутентификации\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Неправильный выбор.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Выберите, где хранить ключ:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "сбой записи ключа на карту: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
msgid "This command is not supported by this card\n"
msgstr "Данная команда этой картой не поддерживается.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "Замечание: эта команда сотрет с карты все ключи!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
msgid "Continue? (y/N) "
msgstr "Продолжить? (y/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr "Подтвердите сброс к заводским установкам (введите \"yes\") "
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "выйти из этого меню"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "показать административные команды"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "показать данную справку"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "вывести все доступные данные"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "изменить имя владельца карты"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "изменить URL получения ключа"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "запросить ключ по заданному картой URL"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "изменить имя учетной записи"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "изменить языковые предпочтения"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "изменить пол владельца карты"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "сменить отпечаток удостоверяющего центра"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "переключить признак 'подпись требует PIN'"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "создать новые ключи"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "меню изменения или разблокировки PIN"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "проверить PIN и показать все данные"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "разблокировать PIN с помощью кода сброса"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr "уничтожить все ключи и данные"
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/card> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "Команды администрирования\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Команды администрирования разрешены\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "Команды администрирования не разрешены\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Недопустимая команда (список команд: \"help\")\n"
@@@ -1936,27 -1487,18 +1937,27 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output для данной команды не работает\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "не могу открыть '%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ \"%s\" не найден: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "ошибка чтения блока ключей: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, c-format
msgid "key \"%s\" not found\n"
msgstr "ключ \"%s\" не найден\n"
@@@ -2008,7 -1539,6 +2009,7 @@@ msgstr "имеется секретны
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "сначала удалите его командой \"--delete-secret-keys\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "ошибка при создании фразы-пароля: %s\n"
@@@ -2027,7 -1554,6 +2028,7 @@@ msgstr "используется сим
msgid "'%s' already compressed\n"
msgstr "'%s' уже сжат\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "Внимание: файл '%s' пуст\n"
@@@ -2045,7 -1569,6 +2046,7 @@@ msgstr "
"Внимание: принудительное использование симметричного шифра %s (%d)\n"
" нарушает предпочтения получателя\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2064,17 -1585,14 +2065,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "данные зашифрованы алгоритмом %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "зашифровано неизвестным алгоритмом %d\n"
@@@ -2143,317 -1648,251 +2144,330 @@@ msgstr "Внимание: не мог�
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "Внимание: не могу удалить временный каталог '%s': %s\n"
- #: g10/export.c:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "экспортировать подписи, помеченные как 'только локальные'"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "экспортировать атрибутные ID пользователя (обычно фотоидентификаторы)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "экспортировать ключи отзыва, помеченные как 'особо важные'"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "удалить при экспорте непригодные части ключа"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr "при экспорте удалить из ключа как можно больше"
- #: g10/export.c:1144
++#: g10/export.c:1204
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, c-format
+ msgid "writing to '%s'\n"
+ msgstr "сохраняю в '%s'\n"
+
++#: g10/export.c:1660
+ #, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr "ключ %s: материал ключа на карте - пропущен\n"
+
++#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
msgstr "экспорт секретных ключей не разрешен\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ типа PGP 2.x - пропущен\n"
- #: g10/export.c:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "ключ %s: материал ключа на карте - пропущен\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "Внимание: нечего экспортировать\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "ошибка создания '%s': %s\n"
- #: g10/getkey.c:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[ID пользователя не найден]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(проверьте аргумент параметра '%s')\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
"Внимание: '%s' должно быть должно быть длинным идентификатором или "
"отпечатком ключа\n"
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, c-format
msgid "error looking up: %s\n"
msgstr "ошибка поиска: %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "Внимание: %s включено в таблицу ключей %d раз\n"
- #: g10/getkey.c:1429
++#: g10/getkey.c:1431
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "автоматически получили '%s' через %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "ошибка получения '%s' через %s: %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "Нет отпечатка"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "секретный ключ \"%s\" не найден: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "Внимание: '%s' не используется в качестве основного ключа: %s\n"
- #: g10/getkey.c:1694
++#: g10/getkey.c:1743
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr ""
"\"%s\" используется в качестве основного секретного ключа для подписи\n"
- #: g10/getkey.c:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "все значения, переданные в '%s', игнорируются\n"
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Параметр --allow-non-selfsigned-uid сделал недостоверный ключ %s "
"достоверным\n"
- #: g10/getkey.c:3323
++#: g10/getkey.c:3377
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "использую подключ %s вместо первичного ключа %s\n"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "создать подпись"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "создать текстовую подпись"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "создать отделенную подпись"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "зашифровать данные"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "шифрование только симметричным шифром"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "расшифровать данные (по умолчанию)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "проверить подпись"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "вывести список ключей"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "вывести список ключей и подписей"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "вывести и проверить подписи ключей"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "вывести список секретных ключей"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
msgid "quickly generate a new key pair"
msgstr "быстро создать новую пару ключей"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "quickly add a new user-id"
msgstr "быстро добавить новый ID пользователя"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "quickly add a new user-id"
+ msgid "quickly revoke a user-id"
+ msgstr "быстро добавить новый ID пользователя"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr "создание полноценной пары ключей"
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "создать сертификат отзыва"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "удалить ключи из таблицы секретных ключей"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
msgid "quickly sign a key"
msgstr "быстро подписать ключ"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
msgid "quickly sign a key locally"
msgstr "быстро подписать ключ локально"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "подписать ключ"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "подписать ключ локально"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "подписать или редактировать ключ"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "сменить фразу-пароль"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "экспортировать ключи"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "экспортировать ключи на сервер ключей"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "импортировать ключи с сервера ключей"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "искать ключи на сервере ключей"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "обновить все ключи с сервера ключей"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "импортировать/объединить ключи"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "показать состояние карты"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "изменить данные на карте"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "сменить PIN карты"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "обновить таблицу доверия"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "вывести хеши сообщений"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "запуск в режиме сервера"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|установить правила TOFU для ключа"
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "вывод в текстовом формате"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифровать для пользователя USER-ID"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|USER-ID|использовать ключ USER-ID для подписи и расшифровки"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|установить уровень сжатия N (0 - без сжатия)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "использовать канонический текстовый режим"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|выводить данные в файл FILE"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "не делать никаких изменений"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "спросить перед перезаписью"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "строго следовать стандарту OpenPGP"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2461,7 -1900,6 +2475,7 @@@ msgstr "
"@\n"
"(Полный список команд и параметров см. на странице man)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2481,11 -1919,9 +2495,11 @@@ msgstr "
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Вызов: @GPG@ [параметры] [файлы] (-h для подсказки)"
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2495,7 -1931,6 +2509,7 @@@ msgstr "
"Подписи и их проверка, шифрование и расшифровка\n"
"Действие по умолчанию зависит от входных данных\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2503,94 -1938,76 +2517,94 @@@ msgstr "
"\n"
"Поддерживаются следующие алгоритмы:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "С открытым ключом: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Симметричные шифры: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Хеш-функции: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "вызов: %s [параметры] %s\n"
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "в определении группы '%s' отсутствует знак =\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1524
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "Внимание: небезопасный владелец домашнего каталога '%s'\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1527
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "Внимание: небезопасный владелец файла настроек '%s'\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1530
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "Внимание: небезопасный владелец файла модуля расширения '%s'\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1536
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "Внимание: небезопасные права доступа к домашнему каталогу '%s'\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1539
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу настроек '%s'\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1542
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "Внимание: небезопасные права доступа к файлу модуля расширения '%s'\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1548
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего домашний каталог '%s'\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1551
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога, содержащего файл настроек '%s'\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"Внимание: небезопасный владелец каталога,\n"
" содержащего модуль расширения '%s'\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1560
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему домашний каталог '%s'\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1563
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2598,493 -2015,387 +2612,499 @@@ msgstr "
"ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
" содержащему файл настроек '%s'\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"Внимание: небезопасные права доступа к каталогу,\n"
" содержащему файл модуля расширения '%s'\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1773
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "неизвестный элемент в файле настроек '%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr "показать в списке ключей фотоидентификаторы"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
msgid "show key usage information during key listings"
msgstr "показать в списке ключей сведения о назначении ключа"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
msgid "show policy URLs during signature listings"
msgstr "показать в списке подписей URL правил"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "показать в списке подписей все замечания"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "показать в списке подписей замечания стандарта IETF"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "показать в списке подписей пользовательские замечания"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
msgid "show preferred keyserver URLs during signature listings"
msgstr "показать в списке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
msgstr "показать в списке ключей действительность ID пользователей"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr "показать в списке ключей отозванные и просроченные ID пользователей"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr "показать в списке ключей отозванные и просроченные подключи"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
msgid "show the keyring name in key listings"
msgstr "показать в списке ключей название таблицы ключей"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
msgstr "показать в списке подписей сроки действия"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
msgid "available TOFU policies:\n"
msgstr "Доступные правила TOFU:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "неизвестные правила TOFU '%s'\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr "(\"help\" выведет список вариантов)\n"
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "неизвестный формат базы данных TOFU '%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "Замечание: старый основной файл параметров '%s' проигнорирован\n"
- #: g10/gpg.c:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "слишком старая версия libcrypt (нужно %s, есть %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "Замечание: %s не предназначен для нормального применения!\n"
- #: g10/gpg.c:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' - не допустимый срок действия подписи\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "недопустимый режим ввода пароля '%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' - не допустимая таблица символов\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "не могу интерпретировать URL сервера ключей\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры сервера ключей\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "недопустимые параметры списка\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимые параметры списка\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "недопустимые параметры списка\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "показать при проверке подписи фотоидентификаторы"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "показать при проверке подписи URL правил"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "показать при проверке подписей все замечания"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "показать при проверке подписей замечания стандарта IETF"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "показать при проверке подписей пользовательские замечания"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "показать при проверке подписей действительность ID пользователей"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показать при проверке подписей отозванные и просроченные ID пользователя"
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
msgstr "показать при проверке подписей только первичный ID пользователя"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "проверить подписи по данным PKA"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "поднять доверие подписей по действительным данным PKA"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры проверки\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "недопустимые параметры проверки\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "Внимание: возможно создание файла образа памяти!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Внимание: %s отменяет %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s с %s недопустимо!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s с %s не имеет смысла!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "Внимание: работаем с фальшивым системным временем: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не будет работать с небезопасной памятью из-за %s\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм шифрования\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "выбрана недопустимая хеш-функция\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "выбран недопустимый алгоритм сжатия\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "выбрана недопустимая хеш-функция для сертификации\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
- #: g10/gpg.c:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3604
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "Замечание: простой режим S2K (0) строго противопоказан\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3608
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
- #: g10/gpg.c:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые личные предпочтения шифра\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "недопустимые личные предпочтения хеш-функции\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "недопустимые личные предпочтения алгоритмов сжатия\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s!\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "шифрование '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3642
++#: g10/gpg.c:3715
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "хеш-функцию '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3647
++#: g10/gpg.c:3720
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "сжатие '%s' в режиме %s использовать нельзя\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверия: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [файл]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [файл]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "сбой симметричного шифрования '%s': %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [файл]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [файл]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encrypt нельзя использовать совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --encrypt\n"
- #: g10/gpg.c:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [файл]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [файл]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [файл]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "в режиме %s нельзя использовать --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [файл]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [файл]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [файл]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key <ID пользователя>"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key <ID пользователя>"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key <ID пользователя> [команды]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd <ID пользователя>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "сбой при отправке на сервер ключей: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "сбой при получении с сервера ключей: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "сбой при экспорте ключа: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "сбой при экспорте в виде ключа ssh: %s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "сбой при поиске на сервере ключей: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "сбой при обновлении с сервера ключей: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из текстового формата: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в текстовый формат: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "недопустимая хеш-функция '%s'\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "ошибка синтаксического анализа спецификации ключа '%s': %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "'%s' не является идентификатором, отпечатком или кодом ключа\n"
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[файл]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Пишите сообщение ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL правил сертификации неверен\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL правил подписи неверен\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL предпочтительного сервера ключей неверен\n"
@@@ -3100,11 -2408,9 +3120,11 @@@ msgstr "при несоответств
msgid "|FD|write status info to this FD"
msgstr "|FD|выводить информацию в файл с дескриптором FD"
+#: g10/gpgv.c:83
msgid "|ALGO|reject signatures made with ALGO"
- msgstr ""
+ msgstr "|ALGO|отвергать подписи, сделанные по данному алгоритму"
+#: g10/gpgv.c:120
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Вызов: gpgv [параметры] [файлы] (-h для подсказки)"
@@@ -3125,125 -2428,107 +3145,135 @@@ msgstr "Справки нет
msgid "No help available for '%s'"
msgstr "Нет справки для '%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "импортировать подписи, обозначенные как 'только локальные'"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "устранить при импорте повреждения от сервера ключей pks"
- #: g10/import.c:110
++#: g10/import.c:140
msgid "do not clear the ownertrust values during import"
msgstr "не сбрасывать уровни доверия владельцам после импорта"
- #: g10/import.c:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "не обновлять таблицу доверия после импорта"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "показать отпечаток ключа"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "обновлять только существующие ключи"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "удалить после импорта непригодные части ключа"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr "удалить после импорта из ключа как можно больше"
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "пропущен блок типа %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "обработано %lu ключей\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Всего обработано: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " пропущено ключей PGP-2: %lu\n"
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " пропущено новых ключей: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " без ID пользователя: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " импортировано: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " неизмененных: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " новых ID пользователя: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " новых подключей: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " новых подписей: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " новых отзывов ключей: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " прочитано секретных ключей: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "импортировано секретных ключей: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " неизмененных секретных ключей: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " не импортировано: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " очищено подписей: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " очищено ID пользователей: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3252,195 -2537,151 +3282,189 @@@ msgstr "
"Внимание: ключ %s содержит предпочтения для недоступных\n"
"алгоритмов для следующих ID пользователей:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": предпочитает шифр %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": предпочитает хеш-функцию %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": предпочитает алгоритм сжатия %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "крайне желательно, чтобы Вы обновили свои предпочтения и\n"
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"распространили этот ключ во избежание возможных нестыковок алгоритмов\n"
- #: g10/import.c:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: нет ID пользователя\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, c-format
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr "исключен фильтром импорта"
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ключ %s: повреждение подключа PKS исправлено\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ключ %s: принят без самозаверенного ID пользователя \"%s\"\n"
- #: g10/import.c:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ключ %s: нет действительных ID пользователя\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "может быть, из-за отсутствия самоподписи\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не найден открытый ключ: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новый ключ - пропущен\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "нет доступной для записи таблицы ключей: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr "сохраняю в '%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "ошибка записи таблицы ключей '%s': %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не совпадает с нашей копией\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
- #: g10/import.c:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: оригинальный блок ключей не читается: %s\n"
- #: g10/import.c:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: \"%s\" 1 новый ID пользователя\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: \"%s\" %d новых ID пользователя\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: \"%s\" 1 новая подпись\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: \"%s\" %d новых подписей\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: \"%s\" 1 новый подключ\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: \"%s\" %d новых подключей\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: \"%s\" %d подпись очищена\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: \"%s\" %d подписей очищено\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: \"%s\" %d ID пользователя очищен\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: \"%s\" %d ID пользователя очищено\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: \"%s\" не изменен\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: импортирован секретный ключ\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "ключ %s: секретный ключ уже имеется\n"
- #: g10/import.c:1578
++#: g10/import.c:1866
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: ошибка отправки в агент: %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, c-format
msgid "secret key %s: %s\n"
msgstr "секретный ключ %s: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "импорт секретного ключа не допускается\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
@@@ -3455,139 -2696,112 +3479,139 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr "Для переноса '%s' выполните на каждой криптографической карте: %s\n"
- #: g10/import.c:1848
++#: g10/import.c:2133
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
- #: g10/import.c:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - отвергнут\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: сертификат отзыва \"%s\" импортирован\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: нет ID пользователя для подписи\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: алгоритм с открытым ключом у ID пользователя \"%s\" не "
"поддерживается\n"
- #: g10/import.c:2025
++#: g10/import.c:2310
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: неправильная самоподпись на ID пользователя \"%s\"\n"
- #: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: алгоритм с открытым ключом не поддерживается\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: недействительная прямая подпись ключа\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: нет подключа для связывания ключей\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: недопустимая связь подключей\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: удалено многократное связывание подключей\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: нет подключа для отзыва ключа\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: неверный отзыв подключа\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: удален многократный отзыв подключей\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущен ID пользователя \"%s\"\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущен подключ\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: неэкспортируемая подпись (класс 0x%02X) - пропущена\n"
- #: g10/import.c:2244
++#: g10/import.c:2527
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
- #: g10/import.c:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: недействительный сертификат отзыва: %s - пропущен\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
- #: g10/import.c:2284
++#: g10/import.c:2567
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неожиданный класс подписи (0x%02X) - пропущена\n"
- #: g10/import.c:2413
++#: g10/import.c:2696
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: обнаружено дублирование ID пользователя - объединены\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "Внимание: ключ %s, возможно, отозван: запрашиваю ключ отзыва %s\n"
- #: g10/import.c:2493
++#: g10/import.c:2776
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "Внимание: ключ %s, возможно, отозван: ключ отзыва %s отсутствует.\n"
- #: g10/import.c:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: добавлен сертификат отзыва \"%s\"\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: добавлена прямая подпись ключа\n"
@@@ -3622,42 -2830,34 +3646,42 @@@ msgstr "источник блока к�
msgid "error opening key DB: %s\n"
msgstr "ошибка открытия базы данных ключей: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "сбой пересоставления буфера таблицы ключей: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[revocation]"
msgstr "[отзыв]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[самоподпись]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr ""
"не удалось проверить подпись: алгоритм с открытым ключом %d не "
"поддерживается: %s.\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
msgstr "не удалось проверить подпись: хеш-функция %d не поддерживается: %s.\n"
- #: g10/keyedit.c:786
++#: g10/keyedit.c:789
msgid " (reordered signatures follow)"
msgstr "(порядок подписей изменен)"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, c-format
msgid "key %s:\n"
msgstr "ключ %s:\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, c-format
msgid "%d duplicate signature removed\n"
msgid_plural "%d duplicate signatures removed\n"
@@@ -3665,7 -2865,6 +3689,7 @@@ msgstr[0] "%d повторная под
msgstr[1] "%d повторные подписи удалены\n"
msgstr[2] "%d повторных подписей удалено\n"
- #: g10/keyedit.c:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
@@@ -3673,7 -2872,6 +3697,7 @@@ msgstr[0] "%d подпись не пр�
msgstr[1] "%d подписи не проверены за отсутствием ключа\n"
msgstr[2] "%d подписей не проверено за отсутствием ключа\n"
- #: g10/keyedit.c:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, c-format
msgid "%d bad signature\n"
msgid_plural "%d bad signatures\n"
@@@ -3681,7 -2879,6 +3705,7 @@@ msgstr[0] "%d плохая подпис
msgstr[1] "%d плохих подписи\n"
msgstr[2] "%d плохих подписей\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
@@@ -3689,7 -2886,6 +3713,7 @@@ msgstr[0] "Порядок %d подпи
msgstr[1] "Порядок %d подписей изменен\n"
msgstr[2] "Порядок %d подписей изменен\n"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3698,7 -2894,6 +3722,7 @@@ msgstr "
"Внимание: обнаружены ошибки, проверялись только самоподписи; для проверки "
"всех подписей выполните '%s'.\n"
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3709,17 -2904,14 +3733,17 @@@ msgstr "
"достоверности ключей других пользователей (проверяет паспорт,\n"
"сверяет отпечатки ключей из разных источников и т.п.)\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Доверяю ограниченно\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Полностью доверяю\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3729,52 -2921,40 +3753,52 @@@ msgstr "
"позволяет ключу, который Вы подписываете, делать подписи доверия\n"
"от Вашего имени.\n"
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Введите домен, ограничивающий использование данной подписи, или пустую "
"строку, если нет ограничений.\n"
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "ID пользователя \"%s\" пропущен: это не текстовый ID.\n"
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "ID пользователя \"%s\" отозван."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Вы все равно хотите его подписать? (y/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Не могу подписать.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Срок действия ID пользователя \"%s\" истек."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "ID пользователя \"%s\" не самозаверен."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "ID пользователя \"%s\" можно подписать."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Подписать его? (y/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3783,11 -2963,9 +3807,11 @@@ msgstr "
"Самоподпись у \"%s\" -\n"
"это подпись типа PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "Вы хотите преобразовать ее в самоподпись OpenPGP? (y/N) "
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3796,11 -2974,9 +3820,11 @@@ msgstr "
"Ваша текущая подпись на \"%s\"\n"
"просрочена.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3809,44 -2985,35 +3833,44 @@@ msgstr "
"Ваша текущая подпись на \"%s\"\n"
"является локальной.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "Вы хотите преобразовать ее в полную экспортируемую подпись? (y/N) "
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" уже локально подписан ключом %s\n"
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" уже подписан ключом %s\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Вы все равно хотите снова подписать его? (y/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Нечего подписывать ключом %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Данный ключ просрочен!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Срок действия данного ключа истекает %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr ""
"Вы хотите, чтобы Ваша подпись была действительна до того же времени? (Y/n) "
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3855,31 -3022,25 +3879,31 @@@ msgstr "
"Насколько хорошо Вы проверили, что ключ действительно принадлежит\n"
"указанному выше человеку? Если не знаете, что ответить, введите \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Не буду отвечать.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Никакой проверки не было.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Была частичная проверка.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Проверка была очень тщательной.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
msgid "Your selection? (enter '?' for more information): "
msgstr "Ваш выбор? (введите '?' для получения информации): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3888,222 -3049,168 +3912,222 @@@ msgstr "
"Вы уверены, что хотите подписать этот ключ\n"
"своим ключом \"%s\" (%s)?\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Это будет самоподпись.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "Внимание: подпись не будет помечена как неэкспортируемая.\n"
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "Внимание: подпись не будет помечена как неотзываемая.\n"
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "Подпись будет помечена как неэкспортируемая.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "Подпись будет помечена как неотзываемая.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "Этот ключ мной никак не проверялся.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "Мной проведена поверхностная проверка этого ключа.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "Этот ключ проверен мной очень тщательно.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Действительно подписать? (y/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "подписать не удалось: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"В ключе только заготовка или элементы для карты -\n"
"фразы-пароля для изменения нет.\n"
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "ключ %s: ошибка изменения фразы-пароля: %s\n"
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "сохранить и выйти"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "показать отпечаток ключа"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
msgid "show the keygrip"
msgstr "показать код ключа"
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "вывести список ключей и ID пользователя"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "выбрать ID пользователя N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "выбрать подключ N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "проверка подписей"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr "подписать выбранные ID пользователя [* описание команд см. ниже]"
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "локально подписать выбранные ID пользователя"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "подписать выбранные ID пользователя подписью доверия"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr "подписать выбранные ID пользователя без возможности отзыва"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "добавить ID пользователя"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "добавить фотоидентификатор"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "удалить выбранные ID пользователя"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "добавить подключ"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "добавить ключ на криптографическую карту"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "переместить ключ на криптографическую карту"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "переместить архивный ключ на криптографическую карту"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "удалить выбранные подключи"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "добавить ключ отзыва"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "удалить подписи с выбранных ID пользователя"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
msgstr "сменить срок действия ключа или выбранных подключей"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "пометить выбранный ID пользователя как первичный"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "список предпочтений (экспертам)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "список предпочтений (подробный)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "установить список предпочтений для выбранных ID пользователя"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"установить URL предпочтительного сервера ключей для выбранных ID пользователя"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "установить замечание для выбранных ID пользователя"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "сменить фразу-пароль"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "изменить уровень доверия владельцу"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "отозвать подписи у выбранных ID пользователя"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "отозвать выбранные ID пользователя"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "отозвать ключ или выбранные подключи"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "подключить ключ"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "отключить ключ"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "показать выбранные фотоидентификаторы"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"сжать непригодные ID пользователей и удалить непригодные подписи из ключа"
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "сжать непригодные ID пользователей и удалить все подписи из ключа"
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Секретный ключ доступен.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Для данного действия нужен секретный ключ.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4114,224 -3221,177 +4138,230 @@@ msgstr "
" 't' (подписи доверия, tsign), 'nr' (неотзываемые, \n"
" nrsign) или любое их сочетание (ltsign, tnrsign и т.д.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Ключ отозван."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "Действительно подписать все ID пользователя? (y/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
msgid "Really sign all text user IDs? (y/N) "
msgstr "Действительно подписать все текстовые ID пользователя? (y/N) "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Подсказка: Выберите ID пользователей, которые нужно подписать\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Неизвестный тип подписи '%s'\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Данная команда в режиме %s недопустима.\n"
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Вы должны выбрать хотя бы один ID пользователя.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Команда '%s'.)\n"
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Вы не можете удалить последний ID пользователя!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Действительно удалить все выбранные ID пользователей? (y/N) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "Действительно переместить первичный ключ? (y/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "Команде нужен аргумент-имя файла\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Не могу открыть '%s': %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Ошибка чтения архивного ключа из '%s': %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Вы должны выбрать хотя бы один ключ.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Вы действительно хотите удалить выбранные ключи? (y/N) "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "Вы действительно хотите удалить данный ключ? (y/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Действительно отозвать все выбранные ID пользователей? (y/N) "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "Действительно отозвать данный ID пользователя? (y/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Вы действительно хотите отозвать ключ целиком? (y/N) "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N) "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Вы действительно хотите отозвать данный подключ? (y/N) "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Нельзя присваивать степень доверия, когда таблица доверия указана "
"пользователем\n"
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Установить предпочтения в:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Действительно обновить предпочтения для выбранных ID пользователей? (y/N) "
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Действительно обновить предпочтения? (y/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Сохранить изменения? (y/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Выйти без сохранения? (y/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "сбой при обновлении: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не изменялся - обновление не нужно.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Сбой при создании ключа: %s\n"
+
++#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" - не отпечаток\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" - не первичный отпечаток\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, c-format
msgid "Invalid user ID '%s': %s\n"
msgstr "Недопустимый ID пользователя '%s': %s\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "No matching user IDs."
msgstr "Нет подходящих ID пользователей."
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "Nothing to sign.\n"
msgstr "Подписывать нечего.\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Хеш: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Характеристики: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Не изменять на сервере"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Предпочтительный сервер ключей: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Замечания: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "В ID пользователя типа PGP 2.x не может быть предпочтений.\n"
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(особо важный)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr " создан: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr " отозван: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "просрочен с: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr " годен до: %s"
@@@ -4339,30 -3399,24 +4369,30 @@@
# perhaps this should be somewhere in help/man
# (S - подпись, C - сертификация, E - шифрование, A - аутентификация)
# too long for repeating messages.
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "назначение: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "номер карты: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "доверие: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "достоверность: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Данный ключ отключен"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4370,18 -3424,13 +4400,18 @@@ msgstr "
"Учтите, что показанная достоверность ключа может быть неверной,\n"
"пока Вы не перезапустите программу.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "отозван"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "просрочен"
# check it
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4390,15 -3439,12 +4420,15 @@@ msgstr "
" привести к тому, что первичным станет считаться другой\n"
" ID пользователя.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "Внимание: Срок действия Вашего подключа для шифрования истекает.\n"
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
msgid "You may want to change its expiration date too.\n"
msgstr "Возможно, надо поменять также срок действия.\n"
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4407,35 -3453,27 +4437,35 @@@ msgstr "
"Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
" в некоторых версиях PGP вызвать отбраковку ключа.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Вы уверены, что хотите добавить это? (y/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Нельзя добавить фотоидентификатор в ключ типа PGP2.\n"
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr "Такой ID пользователя на этом ключе уже есть!\n"
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Удалить данную действительную подпись? (y/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Удалить данную недействительную подпись? (y/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Удалить данную неизвестную подпись? (y/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Действительно удалить данную самоподпись? (y/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
@@@ -4443,20 -3481,16 +4473,20 @@@ msgstr[0] "Удалена %d подпи
msgstr[1] "Удалены %d подписи.\n"
msgstr[2] "Удалено %d подписей.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Ничего не удалено.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "недопустимый"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "ID пользователя \"%s\" сжат: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
@@@ -4464,17 -3498,14 +4494,17 @@@ msgstr[0] "ID пользователя
msgstr[1] "ID пользователя \"%s\": %d подписи удалены\n"
msgstr[2] "ID пользователя \"%s\": %d подписей удалено\n"
- #: g10/keyedit.c:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "ID пользователя \"%s\" уже минимизирован\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "ID пользователя \"%s\": уже очищен\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4483,36 -3514,28 +4513,36 @@@ msgstr "
"Внимание: Это ключ типа PGP 2.x. Добавление особого отзывающего ключа\n"
" может в некоторых версиях PGP вызвать выбраковку ключа.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Нельзя добавить особый отзывающий ключ в ключ типа PGP 2.x.\n"
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Укажите ID пользователя ключа, назначенного отзывающим: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "нельзя назначить отзывающим ключ типа PGP 2.x\n"
- #: g10/keyedit.c:4535
++#: g10/keyedit.c:4642
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "ключ не может быть назначен отзывающим самого себя\n"
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
msgid "this key has already been designated as a revoker\n"
msgstr "этот ключ уже назначен отзывающим\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
- #: g10/keyedit.c:4632
++#: g10/keyedit.c:4739
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
@@@ -4520,155 -3543,125 +4550,160 @@@ msgstr "
"Вы уверены, что хотите изменить срок действия сразу нескольких подключей? (y/"
"N) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Смена срока действия подключа.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Смена срока действия первичного ключа.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Нельзя изменить срок действия ключа v3\n"
- #: g10/keyedit.c:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "подписывающий подключ %s уже перекрестно заверен\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "подключ %s не для подписей, он не нуждается в перекрестном заверении\n"
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Выберите ровно один ID пользователя.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропуск самоподписи v3 на ID пользователя \"%s\"\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Введите URL предпочтительного сервера ключей: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Вы действительно хотите заменить его? (y/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Вы действительно хотите удалить его? (y/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Введите замечание: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "Продолжить? (y/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Нет ID пользователя с индексом %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Нет ID пользователя с хешем %s\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Нет подключа с ID ключа '%s'.\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "Нет подключа с индексом %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "ID пользователя: \"%s\"\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "подписано Вашим ключом %s %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (неэкспортируемая)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Срок действия подписи истек %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Вы уверены, что хотите отозвать? (y/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "Вами не подписано.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Вы подписали эти ID пользователей на ключе %s:\n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (неотзываемая)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "отозвано Вашим ключом %s %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Вы отзываете следующие подписи:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Действительно создать сертификат отзыва? (y/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "нет секретного ключа\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID пользователя \"%s\" уже отозван\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "Внимание: подпись ID пользователя датирована %d секундами в будущем\n"
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Ключ %s уже отозван.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Подключ %s уже отозван.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ фотоидентификатора %s размера %ld для ключа %s (uid %d)\n"
@@@ -5105,13 -4020,10 +5140,13 @@@ msgstr "
"случайных чисел больше возможностей получить достаточное количество "
"энтропии.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Сбой при создании ключа: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5122,63 -4034,50 +5157,63 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr "Продолжить? (Y/n) "
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ключ для \"%s\" уже существует\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
msgid "Create anyway? (y/N) "
msgstr "Все равно создать новый? (y/N) "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
msgid "creating anyway\n"
msgstr "принудительное создание\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Замечание: \"%s %s\" вызывает полнофункциональный диалог создания ключа.\n"
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Создание ключа прервано.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "не могу создать архивную копию, файл '%s': %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "Замечание: архивная копия ключа с карты сохранена в '%s'\n"
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, c-format
msgid "writing public key to '%s'\n"
msgstr "сохранение открытого ключа в '%s'\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей '%s': %s\n"
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "открытый и секретный ключи созданы и подписаны.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5186,7 -4085,6 +5221,7 @@@ msgstr "
"Учтите, что данный ключ не может использоваться для шифрования. Вы можете\n"
"воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5194,7 -4092,6 +5229,7 @@@ msgstr "
"ключ создан на %lu секунду в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5202,47 -4099,36 +5237,47 @@@ msgstr "
"ключ создан на %lu секунд в будущем (петля во времени или проблемы с "
"часами)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "Замечание: создание подключей для ключей v3 не совместимо с OpenPGP\n"
- #: g10/keygen.c:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Секретные части первичного ключа отсутствуют.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Секретные части первичного ключа хранятся на карте.\n"
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Действительно создать? (y/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "никогда "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Критические правила подписи: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Правила подписи: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Критический предпочтительный сервер ключей: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Критическое замечание к подписи: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Замечание к подписи: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
@@@ -5250,7 -4136,6 +5285,7 @@@ msgstr[0] "%d хорошая подпи
msgstr[1] "%d хороших подписи\n"
msgstr[2] "%d хороших подписей\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, c-format
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
@@@ -5258,7 -4143,6 +5293,7 @@@ msgstr[0] "%d подпись не пр�
msgstr[1] "%d подписи не проверены из-за ошибки\n"
msgstr[2] "%d подписей не проверено из-за ошибки\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@@ -5266,38 -4150,26 +5301,33 @@@ msgstr[0] "Внимание: %lu клю
msgstr[1] "Внимание: %lu ключа пропущены из-за большого размера\n"
msgstr[2] "Внимание: %lu ключей пропущено из-за большого размера\n"
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Таблица ключей"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Отпечаток первичного ключа:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Отпечаток первичного ключа:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Отпечаток подключа:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Отпечаток ключа ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " серийный номер карты ="
@@@ -5363,25 -4223,20 +5393,25 @@@ msgstr "учитывать набор U
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "учитывать набор записей PKA при получении ключей"
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "отключен"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Введите числа, N) Следующее или Q) Выход> "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "недопустимый протокол сервера ключей (ожидается %d, получено %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" - не ID ключа: пропущен\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
@@@ -5389,262 -4244,210 +5419,267 @@@ msgstr[0] "обновление %d кл
msgstr[1] "обновление %d ключей из %s\n"
msgstr[2] "обновление %d ключей из %s\n"
- #: g10/keyserver.c:1424
++#: g10/keyserver.c:1426
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "Внимание: невозможно обновить ключ %s с %s: %s\n"
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "ключ \"%s\" не найден на сервере ключей\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "ключ не найден на сервере ключей\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "не заданы серверы ключей (используйте --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "запрашиваю ключ %s с сервера %s %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "получение ключа %s с %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
msgid "no keyserver known\n"
msgstr "ни один сервер ключей не известен\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "пропущено \"%s\": %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "отправка ключа %s на %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, c-format
msgid "requesting key from '%s'\n"
msgstr "запрос ключа из '%s'\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "Внимание: невозможно получить URI %s: %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "сеансовый ключ зашифрован по %s\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "фраза-пароль создана с незнакомой хеш-функцией %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "открытый ключ - %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "данные зашифрованы открытым ключом: хороший DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "зашифровано %u-битным ключом %s с ID %s, созданным %s\n"
- #: g10/mainproc.c:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "зашифровано ключом %s с ID %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "сбой расшифровки с открытым ключом: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "зашифровано %lu фразами-паролями\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "зашифровано одной фразой-паролем\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "предполагаются данные, зашифрованные по %s\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "шифр IDEA недоступен, попробую вместо него %s\n"
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "Внимание: целостность сообщения не защищена\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "расшифровано нормально\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "Внимание: зашифрованное сообщение было изменено!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "сбой расшифровки: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "Замечание: отправитель запросил \"только между нами\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "первоначальное имя файла='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "Внимание: наблюдается несколько текстов\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "отдельный сертификат отзыва: задействуется командой \"gpg --import\"\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "подпись не найдена\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПЛОХАЯ подпись пользователя \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Просроченная подпись пользователя \"%s\""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "Действительная подпись пользователя \"%s\""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "проверка подписи подавлена\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "не могу обработать эти неоднозначные данные подписи\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Подпись сделана %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " ключом %s с ID %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Ключ доступен на: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[сомнительно]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " или \"%s\""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Подпись просрочена %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Подпись действительна до %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "формат подписи: %s, хеш-функция %s%s%s\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "двоичный"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "текстовый"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "неизвестно"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "Внимание: не отделенная подпись; файл '%s' НЕ был проверен!\n"
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не могу проверить подпись: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "не отделенная подпись\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr ""
"Внимание: обнаружено несколько подписей. Проверена будет только первая.\n"
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "отдельная подпись класса 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "подпись старого типа (PGP 2.x)\n"
@@@ -5818,7 -4587,6 +5853,7 @@@ msgstr "
"Внимание: потенциально небезопасный сеансовый ключ,\n"
" зашифрованный симметричным шифром\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "в подпакете типа %d установлен критический бит\n"
@@@ -6175,45 -4875,36 +6210,45 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Нет уверенности в том, что подпись принадлежит владельцу.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: открытый ключ отключен\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: открытый ключ уже существует\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "не могу зашифровать для '%s'\n"
- #: g10/pkclist.c:972
++#: g10/pkclist.c:984
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "задан параметр '%s', но не заданы ключи по умолчанию\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "задан параметр '%s', но параметр '%s' не задан\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "Не задан ID пользователя (можно использовать \"-r\").\n"
- #: g10/pkclist.c:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Текущие получатели:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6221,37 -4912,29 +6256,37 @@@ msgstr "
"\n"
"Введите ID пользователя. Завершите пустой строкой: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Нет такого ID пользователя.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Открытый ключ отключен.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "пропущено: открытый ключ уже установлен\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "неизвестный получатель по умолчанию \"%s\"\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "нет пригодных адресов\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Замечание: у ключа %s нет функции %s\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Замечание: у ключа %s нет предпочтения для %s\n"
@@@ -6260,28 -4942,22 +6295,28 @@@
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Отделенная подпись.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Введите имя файла с данными: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "читаю stdin ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "нет подписанных данных\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "не могу открыть подписанные данные '%s'\n"
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "не могу открыть подписанные данные fd=%d: %s\n"
@@@ -6532,7 -5163,6 +6567,7 @@@ msgstr[0] "открытый ключ %
msgstr[1] "открытый ключ %s на %lu дня новее подписи\n"
msgstr[2] "открытый ключ %s на %lu дней новее подписи\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6613,12 -5234,10 +6648,12 @@@ msgstr "
"Внимание: невозможно развернуть %% в URL предпочтительного сервера ключей "
"(слишком длинный). Использую неразвернутым.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "подпись %s/%s пользователя \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6626,11 -5245,9 +6661,11 @@@ msgstr "
"Внимание: использование хеш-функции %s (%d) нарушает предпочтения "
"получателя\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "подпись:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "будет использовано шифрование по %s\n"
@@@ -6705,131 -5308,104 +6740,131 @@@ msgstr "ошибка чтения в '%
msgid "trustdb: sync failed: %s\n"
msgstr "таблица доверия: сбой синхронизации: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "невозможно создать блокировку для '%s'\n"
- #: g10/tdbio.c:145
++#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
msgstr "невозможно заблокировать '%s'\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "таблица доверия, запись %lu: сбой lseek: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "таблица доверия, запись %lu: сбой записи (n=%d): %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "слишком большая операция над таблицей доверия\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: каталог не существует!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "нет доступа к '%s': %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: сбой создания записи о версии: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: создана недопустимая таблица доверия\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: создана таблица доверия\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
msgstr "Замечание: таблица доверия недоступна для записи\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: недопустимая таблица доверия\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: сбой создания таблицы хешей: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: ошибка обновления записи о версии: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: ошибка чтения записи о версии: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: ошибка сохранения записи о версии: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "таблица доверия: сбой lseek: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "таблица доверия: сбой чтения (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: не является файлом таблицы доверия\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: запись о версии с номером записи %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: неправильная версия файла %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: ошибка чтения свободной записи: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: ошибка сохранения записи каталога: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: сбой обнуления записи: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: сбой добавления записи: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "Ошибка: таблица доверия повреждена.\n"
@@@ -7232,7 -5746,6 +7267,7 @@@ msgstr "использую модел�
msgid "no need for a trustdb check\n"
msgstr "проверка таблицы доверия не нужна\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "срок следующей проверки таблицы доверия %s\n"
@@@ -7247,7 -5758,6 +7282,7 @@@ msgstr "проверять таблиц
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "обновлять таблицу доверия при модели доверия '%s' не нужно\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "открытый ключ %s не найден: %s\n"
@@@ -7260,7 -5768,6 +7295,7 @@@ msgstr "выполните --check-trus
msgid "checking the trustdb\n"
msgstr "проверка таблицы доверия\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
@@@ -7268,7 -5775,6 +7303,7 @@@ msgstr[0] "обработан %d клю
msgstr[1] "обработаны %d ключа"
msgstr[2] "обработано %d ключей"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
@@@ -7276,16 -5782,13 +7311,16 @@@ msgstr[0] " (сброшен %d счет
msgstr[1] " (сброшены %d счетчика достоверности)\n"
msgstr[2] " (сброшено %d счетчиков достоверности)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "абсолютно доверенных ключей не найдено\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "открытый ключ для абсолютно доверенного ключа %s не найден\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7293,7 -5796,6 +7328,7 @@@ msgstr "
"глубина: %d достоверных: %3d подписанных: %3d доверие: %d-, %dq, %dn, "
"%dm, %df, %du\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -7347,13 -5839,9 +7382,11 @@@ msgstr "[ неизвестно ]
msgid "[ undef ]"
msgstr "[неопределено]"
+#: g10/trust.c:159
- #, fuzzy
- #| msgid "never"
msgid "[ never ]"
- msgstr "никогда"
+ msgstr "[ никогда ]"
+#: g10/trust.c:160
msgid "[marginal]"
msgstr "[ ограничено ]"
@@@ -7743,11 -6148,9 +7776,11 @@@ msgstr "не позволять исп�
msgid "use variable length input for pinpad"
msgstr "использовать входные данные переменой длины для клавиатуры считывателя"
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Вызов: @SCDAEMON@ [параметры] (-h для подсказки)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7755,17 -6158,14 +7788,17 @@@ msgstr "
"Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
"Демон криптографических карт для @GNUPG@\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"используйте параметр '--daemon' для запуска приложения в фоновом режиме\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "обработчик fd %d запущен\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "обработчик fd %d остановлен\n"
@@@ -7775,7 -6174,6 +7808,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "недопустимый символ radix64 %02x пропущен\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
msgstr "в этом сеансе dirmngr не работает\n"
@@@ -9615,8 -7626,6 +9648,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "допустимые уровни отладки: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, c-format
msgid "usage: %s [options] "
msgstr "вызов: %s [параметры] "
@@@ -9625,12 -7633,10 +9658,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "двоеточия в имени сокета недопустимы\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "сбой при получении списка отозванных сертификатов из '%s': %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "сбой обработки списка отозванных сертификатов из '%s': %s\n"
@@@ -10105,76 -8009,60 +10138,76 @@@ msgstr "ответчик OCSP возв�
msgid "OCSP responder returned an too old status\n"
msgstr "ответчик OCSP возвратил слишком старый статус\n"
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "сбой assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr "нет сервера LDAP"
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr "в ID сертификата нет серийного номера"
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "сбой assuan_inquire: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "сбой fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, c-format
msgid "error sending data: %s\n"
msgstr "ошибка отправки данных: %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "сбой start_cert_fetch: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "сбой fetch_next_cert: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "превышено max_replies %d\n"
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "сбой при выделении памяти под управляющую структуру: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "сбой размещения контекста Assuan: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "сбой инициализации сервера: %s\n"
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "сбой регистрации команд с помощью Assuan: %s\n"
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема с приемом Assuan: %s\n"
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "сбой обработки Assuan: %s\n"
@@@ -10309,7 -8167,6 +10342,7 @@@ msgstr "неизвестная кома
msgid "sending line failed: %s\n"
msgstr "сбой отправки строки: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "ошибка отправки стандартных параметров: %s\n"
@@@ -10556,15 -8352,12 +10589,15 @@@ msgstr "
"Синтаксис: @GPGCONF@ [параметры]\n"
"Управляет параметрами настроек инструментария @GNUPG@\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Требуется однокомпонентный аргумент"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Компонент не найден"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "Аргументы не разрешены"
diff --cc po/sk.po
index b3670cc,8dda2be..6f9548e
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -404,10 -318,6 +404,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "s dodato�n�mi inform�ciami"
@@@ -516,11 -401,6 +516,11 @@@ msgstr "nepodporovan�
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@@ -538,55 -416,38 +538,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "s�bor s mo�nos�ami `%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "��tam mo�nosti z `%s'\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "%s: nem�em vytvori�: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -596,28 -456,22 +596,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
@@@ -645,7 -493,6 +645,7 @@@ msgstr "datab�za d�very: proced�ra read
msgid "can't use '%s' as home directory\n"
msgstr "%s: nem�em vytvori� adres�r: %s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@@ -670,18 -513,14 +670,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s: presko�en�: %s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
@@@ -697,8 -534,6 +697,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -706,9 -541,6 +706,9 @@@ msgstr "
"@Pr�kazy:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -945,29 -734,22 +945,29 @@@ msgstr "chyba pri vytv�ran� hesla: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "chyba pri ��tan� `%s': %s\n"
@@@ -982,32 -762,26 +982,32 @@@ msgstr "chyba pri z�pise do s�boru tajn
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "nem�em sa pripoji� k `%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "probl�m v komunik�cii s gpg-agentom\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
#, fuzzy
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "zru�en� u��vate�om\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "probl�m s agentom: agent vracia 0x%lx\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "probl�m s agentom: agent vracia 0x%lx\n"
@@@ -1083,7 -842,6 +1083,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 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"
@@@ -1345,7 -1049,6 +1345,7 @@@ msgstr "Pomoc nie je dostupn� pre '%s'
msgid "ignoring garbage line"
msgstr "chyba v p�ti�ke\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "nezn�me"
@@@ -1485,95 -1161,75 +1485,95 @@@ msgstr "verejn� k��� %08lX nebol n�jden
msgid "waiting for lock %s...\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII k�dovanie: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "neplatn� hlavi�ka ASCII k�dovania: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "ASCII hlavi�ka: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "ASCII hlavi�ka: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "vnoren� podpisy v �itate�nom form�tu\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
#, fuzzy
msgid "unexpected armor: "
msgstr "neo�ak�van� k�dovanie ASCII:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "nespr�vne ozna�enie riadku m�nusmi: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, 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:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "pred�asn� koniec s�boru (v CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "nespr�vny form�t CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, fuzzy, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "Chyba CRC; %06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
#, fuzzy
msgid "premature eof (in trailer)\n"
msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "chyba v p�ti�ke\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, 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:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1581,25 -1237,20 +1581,25 @@@ msgstr "
"meno m�e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
"kon�i� s '='\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "hodnota mus� obsahova� znak '@'\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "hodnota mus� obsahova� znak '@'\n"
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
#, fuzzy
msgid "a notation name may not contain an '=' character\n"
msgstr "hodnota mus� obsahova� znak '@'\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1609,7 -1260,6 +1609,7 @@@ msgstr "
"meno m�e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
"kon�i� s '='\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
@@@ -1639,19 -1284,14 +1639,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "VAROVANIE: %s prep�e %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, fuzzy, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "tajn� k��� nie je dostupn�"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr ""
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
#, fuzzy
msgid "can't do this in batch mode\n"
msgstr "nemo�no previes� v d�vkovom m�de\n"
@@@ -1666,10 -1304,6 +1666,10 @@@ msgstr "Tento pr�kaz nie je v m�doch %
msgid "Reset Code not or not anymore available\n"
msgstr "tajn� �asti k���a nie s� dostupn�\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "V� v�ber? "
@@@ -1736,148 -1356,115 +1736,149 @@@ msgstr "�iadny zodpovedaj�ci verejn� k�
msgid "Error: URL too long (limit is %d characters).\n"
msgstr ""
- #: 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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "chyba pri z�pise s�boru k���ov (keyring) `%s': %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr ""
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr ""
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
#, fuzzy
msgid "Language preferences: "
msgstr "aktualizova� predvo�by"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
#, fuzzy
msgid "Error: invalid length of preference string.\n"
msgstr "neplatn� znak v re�azci s predvo�bami\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
#, fuzzy
msgid "Error: invalid characters in preference string.\n"
msgstr "neplatn� znak v re�azci s predvo�bami\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr ""
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
#, fuzzy
msgid "Error: invalid response.\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
#, fuzzy
msgid "CA fingerprint: "
msgstr "vyp�sa� fingerprint"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
#, fuzzy
msgid "Error: invalid formatted fingerprint.\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, fuzzy, c-format
msgid "key operation not possible: %s\n"
msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
#, fuzzy
msgid "not an OpenPGP card"
msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, fuzzy, c-format
msgid "error getting current key info: %s\n"
msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr ""
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Ak� ve�kos� k���a si prajete? (1024) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "zaokr�hlen� na %u bitov\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr ""
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr ""
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr ""
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1885,155 -1472,120 +1886,155 @@@
"You should change them using the command --change-pin\n"
msgstr ""
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
#, fuzzy
msgid "Please select the type of key to generate:\n"
msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
#, fuzzy
msgid " (1) Signature key\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
#, fuzzy
msgid " (2) Encryption key\n"
msgstr " (%d) RSA (len na �ifrovanie)\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr ""
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Neplatn� v�ber.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
#, fuzzy
msgid "Please select where to store the key:\n"
msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
msgid "Continue? (y/N) "
msgstr "Skuto�ne podp�sa�? "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "ukon�i� toto menu"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
#, fuzzy
msgid "show admin commands"
msgstr "konfliktn� pr�kazy\n"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "uk�za� t�to pomoc"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
#, fuzzy
msgid "list all available data"
msgstr "K��� k dispoz�cii na: "
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr ""
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr ""
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr ""
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
#, fuzzy
msgid "change the login name"
msgstr "zmeni� dobu platnosti"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
#, fuzzy
msgid "change the language preferences"
msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr ""
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
#, fuzzy
msgid "change a CA fingerprint"
msgstr "vyp�sa� fingerprint"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr ""
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
#, fuzzy
msgid "generate new keys"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr ""
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr ""
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
#, fuzzy
msgid "Admin-only command\n"
msgstr "konfliktn� pr�kazy\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
#, fuzzy
msgid "Admin commands are allowed\n"
msgstr "konfliktn� pr�kazy\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
#, fuzzy
msgid "Admin commands are not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
@@@ -2041,28 -1592,19 +2042,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output pre tento pr�kaz nefunguje\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "nemo�no otvori� `%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, fuzzy, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
msgid "key \"%s\" not found\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
@@@ -2119,7 -1650,6 +2120,7 @@@ msgstr "existuje tajn� k��� pre tento v
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
@@@ -2139,7 -1666,6 +2140,7 @@@ msgstr "pou�it� �ifra %s\n
msgid "'%s' already compressed\n"
msgstr "`%s' je u� skomprimovan�\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2157,7 -1681,6 +2158,7 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, fuzzy, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2175,19 -1696,16 +2176,19 @@@ msgstr "vy�iadan� symetrick� �ifra %s (
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s za�ifrovan� pre: %s\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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/decrypt-data.c:93 g10/mainproc.c:306
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s za�ifrovan� d�ta\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
@@@ -2259,349 -1764,284 +2260,363 @@@ 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:78
++#: g10/export.c:102
#, 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:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
- #: g10/export.c:82
++#: g10/export.c:106
#, fuzzy
msgid "export revocation keys marked as \"sensitive\""
msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
- #: g10/export.c:84
++#: g10/export.c:108
#, fuzzy
msgid "remove unusable parts from key during export"
msgstr "nepou�ite�n� tajn� k���"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr ""
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: presko�en�: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "zapisujem do '%s'\n"
+
++#: g10/export.c:1660
+ #, 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:1846
#, fuzzy
msgid "exporting secret keys not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, 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:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
#, fuzzy
msgid "[User ID not found]"
msgstr "[User id not found]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "chyba pri vytv�ran� `%s': %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "vyp�sa� fingerprint"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 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:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
# c-format
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "vytvori� podpis oddelen� od dokumentu"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "�ifrova� d�ta"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "�ifrovanie len so symetrickou �ifrou"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "de�ifrova� d�ta (implicitne)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "verifikova� podpis"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "vyp�sa� zoznam k���ov"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "vyp�sa� zoznam k���ov a podpisov"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
#, fuzzy
msgid "list and check key signatures"
msgstr "skontrolova� podpisy k���ov"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "vyp�sa� zoznam k���ov a fingerprintov"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "vyp�sa� zoznam tajn�ch k���ov"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "vytvori� nov� p�r k���ov"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "vytvori� revoka�n� certifik�t"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "podp�sa� k���"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "podp�sa� k��� lok�lne"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "podp�sa� k���"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "podp�sa� k��� lok�lne"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "podp�sa� alebo modifikova� k���"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "zmeni� heslo"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "exportova� k���e"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "exportova� k���e na server k���ov"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importova� k���e zo servera k���ov"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "vyh�ada� k���e na serveri k���ov"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "aktualizova� v�etky k���e zo servera k���ov"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importova�/zl��i� k���e"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr ""
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr ""
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr ""
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "aktualizova� datab�zu d�very"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|algo [s�bory]|vyp� hash"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|MENO|�ifrova� pre MENO"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"pou�i� toto id u��vate�a na podp�sanie\n"
" alebo de�ifrovanie"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr ""
"|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
" komprim�cia)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "pou�i� k�nonick� textov� m�d"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "nevykona� �iadne zmeny"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "vy�iada� potvrdenie pred prep�san�m"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr ""
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2610,7 -2050,6 +2625,7 @@@ msgstr "
"(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
"mo�nost�)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2630,13 -2069,11 +2645,13 @@@ msgstr "
" --list-keys [men�] vyp�sa� k���e\n"
" --fingerprint [men�] vyp�sa� fingerprinty\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2651,7 -2088,6 +2666,7 @@@ msgstr "
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2659,607 -2095,482 +2674,612 @@@ msgstr "
"\n"
"Podporovan� algoritmy:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Verejn� k���e: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "�ifry: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Kompresia: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "pou�itie: gpg [mo�nosti] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "konfliktn� pr�kazy\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, 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:1554
#, 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:1560
#, 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:1563
#, 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:1566
#, 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:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
#, 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:1888
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
#, 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:1896
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
#, 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:1904
#, 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:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "nastavi� k��� ako neplatn� (disable)"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, fuzzy, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, fuzzy, c-format
msgid "'%s' is not a valid character set\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "neplatn� parameter pre import\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program m�e vytvori� s�bor core!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prep�e %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�va s %s zmysel!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
#, 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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� predvo�by\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s e�te nepracuje s %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [meno s�boru]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [meno s�boru]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, fuzzy, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [meno s�boru]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [meno s�boru]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [meno s�boru]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [meno s�boru]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [meno s�boru]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key id u��vate�a"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key id u��vate�a"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u��vate�a [pr�kazy]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key id u��vate�a"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo posla� k��� na server: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa n�js� server: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualiz�cia servera zlyhala: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "chyba pri vytv�ran� hesla: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[meno s�boru]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Za�nite p�sa� svoju spr�vu ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@@ -3304,328 -2607,264 +3324,330 @@@ msgstr "Pomoc nie je k dispoz�cii
msgid "No help available for '%s'"
msgstr "Pomoc nie je dostupn� pre '%s'"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr ""
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr ""
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
msgid "do not clear the ownertrust values during import"
msgstr "aktualizova� datab�zu d�very"
- #: g10/import.c:113
++#: g10/import.c:143
#, fuzzy
msgid "do not update the trustdb after import"
msgstr "aktualizova� datab�zu d�very"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ msgid "show key during import"
+ msgstr "vyp�sa� fingerprint"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr ""
- #: g10/import.c:119
++#: g10/import.c:152
#, fuzzy
msgid "remove unusable parts from key after import"
msgstr "nepou�ite�n� tajn� k���"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr ""
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "blok typu %d bol presko�en�\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, fuzzy, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu k���e boli doteraz spracovan�\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Celkovo spracovan�ch k���ov: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " presko�en� nov� k���e: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " bez identifik�torov: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importovan�: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " bez zmien: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nov� id u��vate�ov: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nov� podk���e: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " nov� podpisy: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nov� revok�cie k���ov: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " pre��tan� tajn� k���e: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importovan� tajn� k���e: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " tajn� k���e nezmenen�: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " neimportovan�: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr " nov� podpisy: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " pre��tan� tajn� k���e: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr ""
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr ""
- #: g10/import.c:866
++#: g10/import.c:1042
#, fuzzy, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr "%s podpis, hashovac� algoritmus %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr ""
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr ""
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
- #: g10/import.c:918
++#: g10/import.c:1094
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr ""
- #: g10/import.c:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, fuzzy, c-format
msgid "key %s: no user ID\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
msgid "key %s: %s\n"
msgstr "presko�en� `%s': %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, 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:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, 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:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, fuzzy, c-format
msgid "key %s: public key not found: %s\n"
msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, fuzzy, c-format
msgid "key %s: new key - skipped\n"
msgstr "k��� %08lX: nov� k��� - presko�en�\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "zapisujem do '%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, fuzzy, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, fuzzy, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, 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:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, fuzzy, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, fuzzy, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, fuzzy, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "k��� %08lX: \"%s\" bez zmeny\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, fuzzy, c-format
msgid "key %s: secret key imported\n"
msgstr "k��� %08lX: tajn� k��� importovan�\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
msgid "secret key %s: %s\n"
msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
#, fuzzy
msgid "importing secret keys not allowed\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3640,144 -2879,117 +3662,144 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, fuzzy, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, 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:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, fuzzy, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, 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:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, fuzzy, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, 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:2181
++#: g10/import.c:2463
#, fuzzy, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, fuzzy, c-format
msgid "key %s: skipped subkey\n"
msgstr "k��� %08lX: podk��� presko�en�\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, fuzzy, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, 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"
@@@ -3814,48 -3020,39 +3836,48 @@@ msgstr "chyba pri vytv�ran� `%s': %s\n
msgid "error opening key DB: %s\n"
msgstr "chyba pri ��tan� `%s': %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[revok�cia]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[podpis k���a n�m sam�m]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "Dobr� podpis od \""
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
msgid "key %s:\n"
msgstr "presko�en� `%s': %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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,7 -3060,6 +3885,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3871,21 -3067,18 +3893,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d zl�ch podpisov\n"
msgstr[1] "%d zl�ch podpisov\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "Dobr� podpis od \""
msgstr[1] "Dobr� podpis od \""
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
#, fuzzy
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
@@@ -3898,68 -3091,53 +3920,68 @@@ msgstr "
"kontrolou fingerprintov z r�znych zdrojov...)?\n"
"\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, fuzzy, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = D�verujem �iasto�ne\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, fuzzy, c-format
msgid " %d = I trust fully\n"
msgstr " %d = D�verujem �plne\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
"trust signatures on your behalf.\n"
msgstr ""
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Nemo�no podp�sa�.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, 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:1239
++#: g10/keyedit.c:1242
#, 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:1241
++#: g10/keyedit.c:1244
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "Skuto�ne podp�sa�? "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3968,11 -3146,9 +3990,11 @@@ msgstr "
"Podpis k���a \"%s\" n�m sam�m je\n"
"podpis vo form�te PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3982,11 -3158,9 +4004,11 @@@ msgstr "
"je len lok�lny.\n"
"\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3996,43 -3170,34 +4018,43 @@@ msgstr "
"je len lok�lny.\n"
"\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, 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:1350
++#: g10/keyedit.c:1353
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:1372
++#: g10/keyedit.c:1375
#, fuzzy, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Ni� na podp�sanie k���om %08lX\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Platnos� k���a vypr�ala!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Platnos� k���a vypr�� %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4042,32 -3207,26 +4064,32 @@@ msgstr "
"patr� vy��ie uvedenej osobe?\n"
"Pokia� nepozn�te odpove�, zadajte \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Neodpoviem.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, 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:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) �iasto�ne som to overil(a).%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
#, fuzzy
msgid "Your selection? (enter '?' for more information): "
msgstr "V� v�ber? ('?' - viac inform�ci�): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, fuzzy, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4076,28 -3235,24 +4098,28 @@@ msgstr "
"Ste si ist�, �e chcete podp�sa� tento k���\n"
"svoj�m k���om: \""
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
#, fuzzy
msgid "This will be a self-signature.\n"
msgstr ""
"\n"
"Ide o podpis k���a n�m sam�m\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
#, 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:1527
++#: g10/keyedit.c:1530
#, 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:1537
++#: g10/keyedit.c:1540
#, fuzzy
msgid "The signature will be marked as non-exportable.\n"
msgstr ""
@@@ -4105,237 -3260,187 +4127,237 @@@
"Podpis bude ozna�en� ako neexportovate�n�.\n"
"\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
#, 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:1551
++#: g10/keyedit.c:1554
#, fuzzy
msgid "I have not checked this key at all.\n"
msgstr ""
"\n"
"V�bec som tento k��� neoveril.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
#, fuzzy
msgid "I have checked this key casually.\n"
msgstr ""
"\n"
"�iasto�ne som overil tento k���.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
#, fuzzy
msgid "I have checked this key very carefully.\n"
msgstr ""
"\n"
"Velmi d�kladne som overil tento k���.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
#, fuzzy
msgid "Really sign? (y/N) "
msgstr "Skuto�ne podp�sa�? "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "ulo�i� a ukon�i�"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
#, fuzzy
msgid "show key fingerprint"
msgstr "vyp�sa� fingerprint"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Podpisov� not�cia: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "vyberte identifik�tor u��vate�a N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
#, fuzzy
msgid "select subkey N"
msgstr "vyberte identifik�tor u��vate�a N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
#, fuzzy
msgid "check signatures"
msgstr "revokova� podpisy"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
#, fuzzy
msgid "sign selected user IDs locally"
msgstr "podp�sa� k��� lok�lne"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
#, 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:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "prida� identifik�tor u��vate�a"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "prida� fotografick� ID"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
#, fuzzy
msgid "delete selected user IDs"
msgstr "zmaza� identifik�tor u��vate�a"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
#, fuzzy
msgid "add a subkey"
msgstr "addkey"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr ""
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
#, fuzzy
msgid "delete selected subkeys"
msgstr "zmaza� sekund�rny k���"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "prida� revoka�n� k���"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
#, fuzzy
msgid "delete signatures from the selected user IDs"
msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
#, 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:1903
++#: g10/keyedit.c:1906
#, fuzzy
msgid "flag the selected user ID as primary"
msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "vyp�sa� zoznam predvolieb (podrobne)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
#, 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:1912
++#: g10/keyedit.c:1915
#, 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:1914
++#: g10/keyedit.c:1917
#, 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:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "zmeni� heslo"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
#, fuzzy
msgid "revoke signatures on the selected user IDs"
msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
#, fuzzy
msgid "revoke selected user IDs"
msgstr "revokova� identifik�tor u��vate�a"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
#, fuzzy
msgid "revoke key or selected subkeys"
msgstr "revokova� sekund�rny k���"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
#, fuzzy
msgid "enable key"
msgstr "nastavi� k��� ako platn� (enable)"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
#, fuzzy
msgid "disable key"
msgstr "nastavi� k��� ako neplatn� (disable)"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
#, fuzzy
msgid "show selected photo IDs"
msgstr "uk�za� fotografick� ID"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Tajn� k��� je dostupn�.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4343,273 -3448,220 +4365,279 @@@
" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
msgstr ""
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "K��� revokovan�."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
#, fuzzy
msgid "Really sign all user IDs? (y/N) "
msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
msgid "Really sign all text user IDs? (y/N) "
msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
msgid "Unknown signature type '%s'\n"
msgstr "nezn�ma trieda podpisu"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Nem�ete zmaza� posledn� id u��vate�a!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
#, 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:2326
++#: g10/keyedit.c:2329
#, 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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
#, fuzzy
msgid "You must select exactly one key.\n"
msgstr "Mus�te vybra� aspo� jeden k���.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr ""
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
msgid "Can't open '%s': %s\n"
msgstr "nem�em otvori� `%s': %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Mus�te vybra� aspo� jeden k���.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
#, fuzzy
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
#, fuzzy
msgid "Do you really want to delete this key? (y/N) "
msgstr "Skuto�ne chcete zmaza� tento k���? "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
#, fuzzy
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
#, fuzzy
msgid "Really revoke this user ID? (y/N) "
msgstr "Skuto�ne revokova� toto id u��vate�a? "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
#, fuzzy
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Skuto�ne chcete revokova� tento k���? "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
#, fuzzy
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Skuto�ne chcete revokova� vybran� k���e? "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
#, fuzzy
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Skuto�ne chcete revokova� tento k���? "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
#, fuzzy
msgid "Set preference list to:\n"
msgstr "nastavi� zoznam predvolieb"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
#, 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:2685
++#: g10/keyedit.c:2688
#, fuzzy
msgid "Really update the preferences? (y/N) "
msgstr "Skuto�ne aktualizova� predvo�by? "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
#, fuzzy
msgid "Save changes? (y/N) "
msgstr "Ulo�i� zmeny? "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
#, fuzzy
msgid "Quit without saving? (y/N) "
msgstr "Ukon�i� bez ulo�enia? "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "aktualiz�cia zlyhala: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "chyba: neplatn� odtla�ok\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "neplatn� hodnota\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, 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:3134
++#: g10/keyedit.c:3241
#, fuzzy
msgid "Nothing to sign.\n"
msgstr "Ni� na podp�sanie k���om %08lX\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Digest: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Charakteristiky: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr ""
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr ""
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
#, fuzzy
msgid "Notations: "
msgstr "Not�cie: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
#, fuzzy
msgid "(sensitive)"
msgstr "(citliv� inform�cia)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, fuzzy, c-format
msgid "created: %s"
msgstr "%s: nem�em vytvori�: %s\n"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, fuzzy, c-format
msgid "revoked: %s"
msgstr "[revokovan�]"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, fuzzy, c-format
msgid "expired: %s"
msgstr " [platnos� skon��: %s]"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, fuzzy, c-format
msgid "expires: %s"
msgstr " [platnos� skon��: %s]"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, fuzzy, c-format
msgid "usage: %s"
msgstr " d�vera: %c/%c"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr ""
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, fuzzy, c-format
msgid "trust: %s"
msgstr " d�vera: %c/%c"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr ""
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4617,19 -3669,14 +4645,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
#, fuzzy
msgid "revoked"
msgstr "[revokovan�]"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
#, fuzzy
msgid "expired"
msgstr "expire"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4637,17 -3684,14 +4665,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:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4656,35 -3700,27 +4684,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4692,38 -3728,31 +4720,38 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Zmazan� %d podpis.\n"
msgstr[1] "Zmazan� %d podpis.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Ni� nebolo zmaznan�.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
#, fuzzy
msgid "invalid"
msgstr "neplatn� sp�sob reprezent�cie v ASCII"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "U��vate�sk� ID \"%s\" je revokovan�."
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4732,200 -3761,162 +4760,205 @@@ 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:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
#, 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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
#, 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:4632
++#: g10/keyedit.c:4739
#, 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:4637
++#: g10/keyedit.c:4744
#, fuzzy
msgid "Changing expiration time for a subkey.\n"
msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, 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:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, 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:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr ""
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
#, 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:5277
++#: g10/keyedit.c:5384
#, 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:5336
++#: g10/keyedit.c:5443
#, fuzzy
msgid "Enter the notation: "
msgstr "Podpisov� not�cia: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "Prep�sa� (a/N)? "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, 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:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, fuzzy, c-format
msgid "No subkey with index %d\n"
msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, fuzzy, c-format
msgid "user ID: \"%s\"\n"
msgstr "id u��vate�a: \""
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, 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:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (nexeportovate�n�)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Platnos� podpisu vypr�� %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
#, fuzzy
msgid "Not signed by you.\n"
msgstr " podp�san� %08lX v %s%s\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
#, fuzzy
msgid " (non-revocable)"
msgstr " (nexeportovate�n�)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, fuzzy, c-format
msgid "revoked by your key %s on %s\n"
msgstr " revokovan� %08lX v %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Chyst�te sa revokova� tieto podpisy:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "neexistuje tajn� k���\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, fuzzy, c-format
msgid "Key %s is already revoked.\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, fuzzy, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, fuzzy, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5377,13 -4290,10 +5410,13 @@@ msgstr "
"pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
"entropie.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5391,66 -4301,53 +5424,66 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "`%s' je u� skomprimovan�\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
msgid "Create anyway? (y/N) "
msgstr "Pou�i� napriek tomu tento k���? "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
msgid "creating anyway\n"
msgstr "vytvori� nov� p�r k���ov"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Vytv�ranie k���a bolo zru�en�.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, fuzzy, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, 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:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
#, fuzzy
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
@@@ -5459,7 -4356,6 +5492,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5467,7 -4363,6 +5500,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:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5475,51 -4370,40 +5508,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:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
#, 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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
#, fuzzy
msgid "Really create? (y/N) "
msgstr "Skuto�ne vytvori�? "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "nikdy "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritick� podpisov� politika: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Podpisov� politika: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr ""
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritick� podpisov� not�cia: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Podpisov� not�cia: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5527,7 -4411,6 +5560,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d zl�ch podpisov\n"
msgstr[1] "%d zl�ch podpisov\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5535,46 -4418,33 +5568,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 podpis neoveren�, preto�e vznikla chyba\n"
msgstr[1] "1 podpis neoveren�, preto�e vznikla chyba\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "s�bor k���ov (keyring)"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Prim�rny fingerprint k���a:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Fingerprint podk���a:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " Prim�rny fingerprint k���a:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Fingerprint podk���a:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
#, fuzzy
msgid " Key fingerprint ="
msgstr " Fingerprint k���a ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr ""
@@@ -5639,305 -4497,248 +5667,310 @@@ msgstr "zadan� URL pre podpisov� politi
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
#, fuzzy
msgid "disabled"
msgstr "disable"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr ""
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, fuzzy, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr ""
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, fuzzy, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
#, fuzzy
msgid "key not found on keyserver\n"
msgstr "k��� `%s' nebol n�jden�: %s\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, fuzzy, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, fuzzy, c-format
msgid "requesting key %s from %s\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
msgid "no keyserver known\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, fuzzy, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "presko�en� `%s': %s\n"
+
++#: g10/keyserver.c:1823
#, 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:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
msgid "requesting key from '%s'\n"
msgstr "po�adujem k��� %08lX z %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s k��� �ifrovan�ho sedenia\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, fuzzy, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, fuzzy, c-format
msgid "public key is %s\n"
msgstr "verejn� k��� je %08lX\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, fuzzy, c-format
msgid " \"%s\"\n"
msgstr " alias \""
# Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
# [kw]
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, fuzzy, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "za�ifrovan� %s k���om, ID %08lX\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "za�ifrovan� s %lu heslami\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "za�ifrovan� jedn�m heslom\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "de�ifrovanie o.k.\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "p�vodn� meno s�boru='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
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:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
#, fuzzy
msgid "no signature found\n"
msgstr "Dobr� podpis od \""
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, fuzzy, c-format
msgid "BAD signature from \"%s\""
msgstr "ZL� podpis od \""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, fuzzy, c-format
msgid "Expired signature from \"%s\""
msgstr "Podpis s vypr�anou platnos�ou od \""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, fuzzy, c-format
msgid "Good signature from \"%s\""
msgstr "Dobr� podpis od \""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "verifik�cia podpisu potla�en�\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, fuzzy, c-format
msgid "Signature made %s\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/mainproc.c:1723
++#: 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:1727
++#: 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:1744
msgid "Key available at: "
msgstr "K��� k dispoz�cii na: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[neist�] "
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, fuzzy, c-format
msgid " aka \"%s\""
msgstr " alias \""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Platnos� podpisu vypr�ala %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Platnos� podpisu vypr�� %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "bin�rne"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "textov� m�d"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "nezn�me"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "nezn�my algoritmus verejn�ho k���a"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Nem�em overi� podpis: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "toto nie je podpis oddelen� od dokumentu\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "samostatn� podpis triedy 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "podpis star�ho typu (PGP 2.x)\n"
@@@ -6115,7 -4882,6 +6148,7 @@@ msgid "WARNING: potentially insecure sy
msgstr ""
"VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@@ -6486,47 -5184,38 +6519,47 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Nie je ist�, �e tento podpis patr� vlastn�kovi.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: presko�en�: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, 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:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr ""
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6534,37 -5223,29 +6567,37 @@@ msgstr "
"\n"
"Nap�te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Verejn� k��� je neplatn� (disabled).\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, fuzzy, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "nezn�my implicitn� adres�t `%s'\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "�iadne platn� adresy\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, 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:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
@@@ -6573,29 -5253,23 +6606,29 @@@
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:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Podpis oddelen� od dokumentu.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "��tam �tandardn� vstup (stdin) ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "ch�baj� podp�san� d�ta\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "nem�em otvori� podp�san� d�ta '%s'\n"
@@@ -6844,7 -5473,6 +6877,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
msgstr[1] "verejn� k��� %08lX je o %lu sekund nov�� ne� podpis\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6920,23 -5539,19 +6953,23 @@@ msgstr "
"VAROVANIE: nem�em %%-expandova� URL politiky (pr�li� dlh�). Pou�it� "
"neexpandovan�.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, fuzzy, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s podpis od: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, 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:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "podpisujem:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "bude pou�it� �ifrovanie %s\n"
@@@ -7018,133 -5619,106 +7051,133 @@@ msgstr "chyba pri ��tan�: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "datab�za d�very: synchroniz�cia zlyhala %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
msgid "can't lock '%s'\n"
msgstr "nemo�no otvori� `%s'\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, 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:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: adres�r neexistuje!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, fuzzy, c-format
msgid "can't access '%s': %s\n"
msgstr "nem�em zavrie� `%s': %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: datab�za d�very vytvoren�\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: neplatn� datab�ze d�very\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, 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:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: nie je s�bor datab�zy d�very\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: z�znam verzie s ��slom %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: neplatn� verzia s�boru %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, 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:1753
++#: g10/tdbio.c:1757
#, 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:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: datab�za d�very vytvoren�\n"
@@@ -7504,7 -6016,6 +7537,7 @@@ msgstr "
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:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "dal�ia kontrola datab�zy d�very %s\n"
@@@ -7519,7 -6028,6 +7552,7 @@@ msgstr "nie je nutn� kontrolova� datab�
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, fuzzy, c-format
msgid "public key %s not found: %s\n"
msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
@@@ -7532,14 -6038,12 +7565,14 @@@ msgstr "pros�m vykonajte --check-trustd
msgid "checking the trustdb\n"
msgstr "kontrolujem datab�zu d�very\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "%lu k���e boli doteraz spracovan�\n"
msgstr[1] "%lu k���e boli doteraz spracovan�\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7547,22 -6051,18 +7580,22 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
msgstr[1] "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, fuzzy, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u %08lX nebol n�jden�\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, 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"
@@@ -8025,27 -6430,22 +8058,27 @@@ msgstr "konfliktn� pr�kazy\n
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -8055,7 -6454,6 +8088,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
@@@ -9933,8 -7944,6 +9966,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "pou�itie: gpg [mo�nosti] "
@@@ -9945,12 -7953,10 +9978,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
@@@ -10445,77 -8349,61 +10478,77 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "zmazanie bloku k���a sa nepodarilo: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10655,7 -8513,6 +10688,7 @@@ msgstr "nezn�my implicitn� adres�t `%s'
msgid "sending line failed: %s\n"
msgstr "podpisovanie zlyhalo: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "chyba pri posielan� na `%s': %s\n"
@@@ -10908,16 -8704,13 +10941,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "verejn� k��� nen�jden�"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "zapisujem tajn� k��� do `%s'\n"
diff --cc po/sv.po
index 64ed537,5c41560..7eba85b
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -450,10 -364,6 +450,10 @@@ msgstr "kör i demonläge (bakgrund)
msgid "run in server mode (foreground)"
msgstr "kör i serverläge (förgrund)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "utförlig"
@@@ -560,11 -445,6 +560,11 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"Rapportera fel till <@EMAIL@>.\n"
@@@ -588,56 -466,39 +588,56 @@@ msgstr "
"Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
"Hantering av hemliga nycklar för GnuPG\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s är för gammal (behöver %s, har %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "OBS: inställningsfilen \"%s\" saknas\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "inställningsfil \"%s\": %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "läser inställningar från \"%s\"\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "kan inte skapa uttag: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
@@@ -648,30 -508,24 +648,30 @@@ msgid "a gpg-agent is already running
msgstr "en gpg-agent är redan igång - startar inte en till\n"
# Jag har valt att inte översätta nonce. Nonce är data eller information som endast används en gång
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "fel vid hämtning av nonce för uttaget\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "fel när \"%s\" bands till uttag: %s\n"
# Extension är vad? FIXME
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() misslyckades: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
@@@ -703,7 -551,6 +703,7 @@@ msgstr "stat() misslyckades för \"%s\"
msgid "can't use '%s' as home directory\n"
msgstr "kan inte använda \"%s\" som hemkatalog\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fel vid läsning av nonce på fd %d: %s\n"
@@@ -728,19 -571,15 +728,19 @@@ msgstr "ssh-hanteraren 0x%lx för fd %
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh-hanteraren 0x%lx för fd %d avslutad\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
#| msgid "pth_select failed: %s - waiting 1s\n"
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "pth_select misslyckades: %s - väntar 1 s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s stoppad\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "ingen gpg-agent kör i den här sessionen\n"
@@@ -758,8 -595,6 +758,8 @@@ msgstr "
"Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
"Underhåll av lösenordscache\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -768,9 -603,6 +768,9 @@@ msgstr "
" "
# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -1024,32 -813,25 +1024,32 @@@ msgstr "fel när ett rör skapades: %s\
msgid "error creating a stream for a pipe: %s\n"
msgstr "fel när ett rör skapades: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "fel vid grening av process: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, 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:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1065,29 -845,23 +1065,29 @@@ msgstr "fel vid hämtning av avslutsko
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "kan inte ansluta till \"%s\": %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "kommunikationsproblem med gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "avbruten av användaren\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "problem med agenten\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
#| msgid "problem with the agent: %s\n"
msgid "problem with the agent (unexpected response \"%s\")\n"
@@@ -1164,7 -923,6 +1164,7 @@@ msgstr "slut på kärna i säkert minn
msgid "out of core while allocating %lu bytes"
msgstr "slut på kärna vid allokering av %lu byte"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 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"
@@@ -1410,7 -1114,6 +1410,7 @@@ msgstr "Det finns ingen hjälp tillgän
msgid "ignoring garbage line"
msgstr "ignorerar skräprad"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[ingen]"
@@@ -1546,82 -1222,64 +1546,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:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII-skal: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "ogiltig rubrikrad i ASCII-skalet: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "ASCII-skal: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "ogiltig rubrikrad i klartextsignatur\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "okänt ASCII-skalhuvud: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "flera klartextsignaturer går in i varandra\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
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:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "ogiltig rad som börjar med bindestreck: "
# överhoppad eller hoppades över?
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, 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:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "för tidigt filslut (ingen CRC-summa)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "för tidigt filslut (i CRC-summan)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "felformaterad CRC-summa\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC-fel; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "för tidigt filslut (i den avslutande raden)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "fel i avslutande rad\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "hittade ingen giltig OpenPGP-data.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
@@@ -1630,13 -1288,11 +1630,13 @@@
"beror sannolikt på att en felaktig e-postserver eller e-postklient har "
"använts\n"
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "inte läsbart"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1644,25 -1300,20 +1644,25 @@@ msgstr "
"ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
"sluta med ett \"'=\"\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
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:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1672,7 -1323,6 +1672,7 @@@ msgstr "
"ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
"sluta med ett \"'=\"\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "VARNING: ogiltig notationsdata hittades\n"
@@@ -1704,19 -1349,14 +1704,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "OpenPGP-kort nr. %s identifierades\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "kan inte göra detta i satsläge\n"
@@@ -1728,10 -1366,6 +1728,10 @@@ msgstr "Detta kommando är endast tillg
msgid "Reset Code not or not anymore available\n"
msgstr "Återställningskoden är inte tillgänglig längre\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Vad väljer du? "
@@@ -1793,86 -1413,65 +1793,87 @@@ 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: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
#| msgid "error writing `%s': %s\n"
msgid "error writing '%s': %s\n"
msgstr "fel vid skrivning till \"%s\": %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Inloggningsdata (kontonamn): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Privat DO-data: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Språkinställningar: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Fel: ogiltig längd på inställningssträngen\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Fel: ogiltigt svar.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "CA-fingeravtryck: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "nyckelåtgärden är inte möjlig: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "inte ett OpenPGP-kort"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Ersätt existerande nyckel? (j/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
#, fuzzy
#| msgid ""
#| "NOTE: There is no guarantee that the card supports the requested size.\n"
@@@ -1888,59 -1487,47 +1889,59 @@@ msgstr "
" kontrollera dokumentationen för ditt kort för att se vilka storlekar\n"
" som tillåts.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för signaturnyckeln? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för krypteringsnyckeln? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Vilken nyckelstorlek vill du använda för autentiseringsnyckeln? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "avrundade uppåt till %u bitar\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s nyckelstorlekar måste vara inom intervallet %u-%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"Kortet kommer nu att konfigureras om för att generera en nyckel med %u "
"bitar\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "fel vid ändring av storlek för nyckel %d till %u bitar: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: keys are already stored on the card!\n"
msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "Ersätt existerande nycklar? (j/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1955,147 -1542,112 +1956,147 @@@ msgstr "
" PIN-kod = \"%s\" Admin PIN-kod = \"%s\"\n"
"Du bör ändra dem med kommandot --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Välj vilken typ av nyckel som ska genereras:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Signeringsnyckel\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Krypteringsnyckel\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) Autentiseringsnyckel\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Ogiltigt val.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Välj var nyckeln ska sparas:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "läsning misslyckades: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
#| msgid "NOTE: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "OBSERVERA: nycklar har redan lagrats på kortet!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "Signera den? (j/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "avsluta denna meny"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "visa administratörskommandon"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "visa denna hjälp"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "lista allt tillgängligt data"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "ändra kortinnehavarens namn"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "ändra url för att hämta nyckel"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "hämta nyckel som anges i kortets url"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "ändra inloggningsnamnet"
# originalet borde ha ett value
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "ändra språkinställningarna"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "ändra kortinnehavarens kön"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "ändra ett CA-fingeravtryck"
# den låter skum
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "växla flagga för att tvinga signatur-PIN-kod"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "generera nya nycklar"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "meny för att ändra eller avblockera PIN-koden"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "validera PIN-koden och lista allt data"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "lås upp PIN-koden med en nollställningskod"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/kort> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "Kommandon endast för administratör\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Administrationskommandon tillåts\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "Administrationskommandon tillåts inte\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Ogiltigt kommando (prova med \"help\")\n"
@@@ -2104,28 -1655,19 +2105,28 @@@ msgid "--output doesn't work for this c
msgstr "--output kan inte användas för detta kommando\n"
# se förra kommentaren
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "kan inte öppna \"%s\"\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "nyckeln \"%s\" hittades inte: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2181,7 -1712,6 +2182,7 @@@ msgstr "det finns en hemlig nyckel fö
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "fel när lösenfras skapades: %s\n"
@@@ -2201,7 -1728,6 +2202,7 @@@ msgstr "använder %s-chiffer\n
msgid "'%s' already compressed\n"
msgstr "\"%s\" är redan komprimerad\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2221,7 -1745,6 +2222,7 @@@ msgstr "
"VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2241,17 -1762,14 +2242,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s krypterad för: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s-krypterad data\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "krypterad med en okänd algoritm %d\n"
@@@ -2326,334 -1831,269 +2327,348 @@@ 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:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "exportera signaturer som är märkta som endast lokala"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "exportera attribut i användaridentiteter (vanligtvis foto-id)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "exportera spärrnycklar markerade som \"känslig\""
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "ta bort oanvändbara delar från nyckeln under exportering"
- #: g10/export.c:86
++#: g10/export.c:110
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:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: hoppade över: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "skriver till \"%s\"\n"
+
++#: g10/export.c:1660
+ #, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
+
++#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
msgstr "export av hemliga nycklar tillåts inte\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "nyckeln %s: nyckelmaterial på kortet - hoppade över\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "VARNING: ingenting exporterat\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[Användaridentiteten hittades inte]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, 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:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, 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:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, 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:1435
++#: g10/getkey.c:1437
#, 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:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "Inget fingeravtryck"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "hemliga nyckeln \"%s\" hittades inte: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "skapa en signatur"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "skapa en klartextsignatur"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "skapa signatur i en separat fil"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "kryptera data"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "kryptering endast med symmetriskt chiffer"
# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "dekryptera data (standard)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "validera en signatur"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "lista nycklar"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "lista nycklar och signaturer"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "lista och kontrollera nyckelsignaturer"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "lista nycklar och fingeravtryck"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "lista hemliga nycklar"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "generera ett nytt nyckelpar"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "generera ett nytt nyckelpar"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "generera ett spärrcertifikat"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "ta bort nycklar från den publika nyckelringen"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "ta bort nycklar från den hemliga nyckelringen"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "signera en nyckel"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "signera en nyckel lokalt"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "signera eller redigera en nyckel"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "ändra en lösenfras"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "exportera nycklar"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "exportera nycklar till en nyckelserver"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "importera nycklar från en nyckelserver"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "sök efter nycklar hos en nyckelserver"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "importera/slå samman nycklar"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "skriv ut kortstatus"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "ändra data på ett kort"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "ändra PIN-kod för ett kort"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "uppdatera tillitsdatabasen"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "skriv ut kontrollsummor"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "kör i serverläge"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "skapa utdata med ett ascii-skal"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID för att signera eller dekryptera"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "använd \"ursprunglig text\"-läget"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FIL|skriv utdata till FIL"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "gör inga ändringar"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "fråga innan överskrivning"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "använd strikt OpenPGP-beteende"
# inställningar istället för flaggor?
# Nej, här är det bruksanvisningen för kommandoraden.
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2661,7 -2101,6 +2676,7 @@@ msgstr "
"@\n"
"(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2681,14 -2120,12 +2696,14 @@@ msgstr "
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2703,7 -2140,6 +2718,7 @@@ msgstr "
"signera, kontrollera, kryptera eller dekryptera\n"
"standardåtgärden beror på inmatningsdata\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2711,84 -2147,69 +2726,84 @@@ msgstr "
"\n"
"Algoritmer som stöds:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Publik nyckel: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Kontrollsumma: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 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:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
# Vad betyder detta?
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2798,21 -2219,18 +2813,21 @@@ msgstr "
"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, 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:1560
#, 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:1563
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2823,523 -2241,417 +2838,529 @@@ msgstr "
"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, 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:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr "visa foto-id under nyckellistning"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr "visa policy-url:er under signaturlistningar"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "visa alla notationer under signaturlistningar"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "visa IETF-standardnotationer under signaturlistningar"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "visa användarangivna notationer under signaturlistningar"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
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:1896
msgid "show user ID validity during key listings"
msgstr "visa giltighet för användaridentitet vid nyckellistningar "
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
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:1900
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:1902
msgid "show the keyring name in key listings"
msgstr "visa nyckelringens namn i nyckellistningar"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
msgstr "visa utgångsdatum under signaturlistningar"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "Tillgängliga nycklar:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "okänt kommando \"%s\"\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, 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:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka url till nyckelserver\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ogiltiga importeringsflaggor\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "ogiltiga importflaggor\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "ogiltiga listflaggor\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ogiltiga exportflaggor\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "ogiltiga exportinställningar\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ogiltiga listflaggor\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "visa foto-id under signaturvalidering"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "visa policy-url:er under signaturvalidering"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "visa alla notationer under signaturvalidering"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "visa IETF-standardnotationer under signaturvalidering"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "visa användarangivna notationer under signaturvalidering"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "visa giltighet för användaridentitet vid signaturvalidering"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
msgstr "visa endast primär användaridentitet i signaturvalidering"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "validera signaturer med PKA-data"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "öka tillit på signaturer med giltigt PKA-data"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "ogiltiga flaggor för validering\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, 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:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
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:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, 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:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "VARNING: kör med falsk systemtid: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "vald komprimeringsalgoritm är ogiltig\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
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:3520
++#: g10/gpg.c:3593
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:3522
++#: g10/gpg.c:3595
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:3524
++#: g10/gpg.c:3597
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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
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:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "ogiltig inställning av personligt chiffer\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [filnamn]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, 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:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnamn]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
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:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnamn]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
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:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnamn]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key användaridentitet"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key användaridentitet"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key användaridentitet [kommandon]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd <användaridentitet>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sändning till nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "hämtning från nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "sökning på nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, 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:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[filnamn]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande här ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@@ -3384,128 -2688,110 +3405,138 @@@ msgstr "Det finns ingen hjälp tillgän
msgid "No help available for '%s'"
msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "importera signaturer som är markerade som endast lokala"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "reparera skada från pks-nyckelservern under importering"
- #: g10/import.c:110
++#: g10/import.c:140
#, 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:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "uppdatera inte tillitsdatabasen efter importering"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "visa nyckelns fingeravtryck"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "acceptera endast uppdateringar till befintliga nycklar"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "ta bort oanvändbara delar från nyckeln efter importering"
- #: g10/import.c:122
++#: g10/import.c:155
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:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "hoppar över block av typen %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "%lu nycklar behandlade än så länge\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Totalt antal behandlade enheter: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " överhoppade nya nycklar: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " utan användaridentiteter: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " importerade: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " oförändrade: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " nya användaridentiteter: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " nya undernycklar: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " nya signaturer: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " nya nyckelspärrningar: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " antal lästa hemliga nycklar: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " importerade hemliga nycklar: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " oförändrade hemliga nycklar: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " inte importerade: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " signaturer rensade: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " användaridentiteter rensade: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3514,205 -2800,160 +3545,198 @@@ msgstr "
"VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
"algoritmer för dessa användaridentiteter:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": inställning för chifferalgoritmen %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": inställning för sammandragsalgoritmen %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": inställning för komprimeringsalgoritmen %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
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:893
++#: g10/import.c:1069
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:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "nyckel %s: ingen användaridentitet\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "hoppade över \"%s\": %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
# Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
- #: g10/import.c:1019
++#: g10/import.c:1264
#, 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:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "nyckel %s: inga giltiga användaridentiteter\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "nyckel %s: ny nyckel - hoppade över\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "skriver till \"%s\"\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, 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:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "nyckel %s: \"%s\" inte ändrad\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "nyckel %s: hemlig nyckel importerades\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, 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:1683
++#: g10/import.c:1971
#, 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:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "import av hemliga nycklar tillåts inte\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, 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"
@@@ -3727,143 -2968,116 +3751,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, 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:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "nyckel %s: ogiltig undernyckelbindning\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "nyckel %s: hoppade över undernyckel\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
@@@ -3904,45 -3112,37 +3928,45 @@@ msgstr "nyckelblockresurs \"%s\": %s\n
msgid "error opening key DB: %s\n"
msgstr "fel vid öppnandet av \"%s\": %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[spärr]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[självsignatur]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
#| msgid "Good signature from"
msgid " (reordered signatures follow)"
msgstr "Korrekt signatur från"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s:\n"
msgstr "hoppade över \"%s\": %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "%d duplicate signature removed\n"
@@@ -3950,7 -3150,6 +3974,7 @@@ msgid_plural "%d duplicate signatures r
msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
- #: g10/keyedit.c:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3958,7 -3157,6 +3982,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3966,7 -3164,6 +3990,7 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d felaktiga signaturer\n"
msgstr[1] "%d felaktiga signaturer\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
#| msgid "Good signature from"
msgid "%d signature reordered\n"
@@@ -3974,14 -3171,12 +3998,14 @@@ msgid_plural "%d signatures reordered\n
msgstr[0] "Korrekt signatur från"
msgstr[1] "Korrekt signatur från"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3992,17 -3187,14 +4016,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:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Jag litar marginellt\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Jag litar fullständigt\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -4012,51 -3204,39 +4036,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:1018
++#: g10/keyedit.c:1021
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:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Användaridentiteten \"%s\" är spärrad."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Vill du verkligen fortfarande signera den? (j/N)"
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Kan inte signera.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Giltighetstiden för användaridentiteten \"%s\" har gått ut."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Användaridentiteten \"%s\" är inte självsignerad."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Användaridentiteten \"%s\" är signerbar. "
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Signera den? (j/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -4065,11 -3245,9 +4089,11 @@@ msgstr "
"Självsignaturen på \"%s\"\n"
"är en signatur av PGP 2.x-typ.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4078,13 -3256,11 +4102,13 @@@ msgstr "
"Giltighetstiden för din nuvarande signatur på \"%s\"\n"
"har gått ut.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4093,44 -3269,35 +4117,44 @@@ msgstr "
"Din nuvarande signatur på \"%s\"\n"
"är en lokal signatur.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" var redan signerad av nyckeln %s\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Vill du verkligen signera den igen ändå?(j/N)"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Det finns inget att signera med nyckeln %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Giltighetstiden för denna nyckel har gått ut!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, 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:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4139,33 -3306,27 +4163,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:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Jag vill inte svara.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Jag har inte kontrollerat alls.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Jag har gjort viss kontroll.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
#, 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:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4174,230 -3335,176 +4198,230 @@@ msgstr "
"Är du verkligen säker på att du vill signera denna nyckel\n"
"med din nyckel \"%s\" (%s)\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Detta kommer att bli en självsignatur.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
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:1527
++#: g10/keyedit.c:1530
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:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "Signaturen kommer att markeras som icke-exporterbar.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
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:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "Jag har inte kontrollerat denna nyckel alls.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "Jag har gjort viss kontroll av denna nyckel.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Verkligen signera? (j/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "signeringen misslyckades: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
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:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "spara och avsluta"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "visa nyckelns fingeravtryck"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "Ange nyckelhashen: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "lista nycklar och användaridentiteter"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "välj användaridentiteten N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "välj undernyckel N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "kontrollera signaturer"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"signera valda användaridentiteter [* se nedan för relaterade kommandon]"
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "signera valda användaridentiteter lokalt"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "signera valda användaridentiteter med en tillitssignatur"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "lägg till en användaridentitet"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "lägg till ett foto-id"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "ta bort valda användaridentiteter"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "lägg till en undernyckel"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "lägg till en nyckel till ett smartkort"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "flytta en nyckel till ett smartkort"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "flytta en nyckelkopia till ett smartkort"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "ta bort valda undernycklar"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "lägg till en spärrnyckel"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "ta bort signaturer från valda användaridentiteter"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "flagga vald användaridentitet som primär"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "lista inställningar (expertläge)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "lista inställningar (utförligt)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "ställ in inställningslista för valda användaridentiteter"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
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:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "ställ in en notation för valda användaridentiteter"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "ändra lösenfrasen"
# originalet borde ha ett value
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "ändra ägartillitsvärdet"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "spärra signaturer på valda användaridentiteter"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "spärra valda användaridentiteter"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "spärra nyckel eller valda undernycklar"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "aktivera nyckel"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "inaktivera nyckel"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "visa valda foto-id:n"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
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:1936
++#: g10/keyedit.c:1939
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:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Den hemliga nyckeln finns tillgänglig.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
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:2169
++#: g10/keyedit.c:2172
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4417,267 -3524,214 +4441,273 @@@ msgstr "
"signaturer\n"
" (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Nyckeln är spärrad."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "Verkligen signera alla användaridentiteter? (j/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, 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:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "Okänd signaturtyp \"%s\"\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, 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:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Du måste välja åtminstone en användaridentitet.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "Verkligen flytta den primära nyckeln? (j/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Du måste välja exakt en nyckel.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "Kommandot förväntar ett filnamnsargument\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, 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:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Du måste välja åtminstone en nyckel.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
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:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "Verkligen spärra denna användaridentitet? (j/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
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:2571
++#: g10/keyedit.c:2574
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:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
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:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Ställ in inställningslista till:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
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:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Spara ändringar? (j/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Avsluta utan att spara? (j/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "uppdateringen misslyckades: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
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:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Nyckelgenereringen misslyckades: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "ogiltigt fingeravtryck"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, 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:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "ogiltigt värde\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "Ingen sådan användaridentitet.\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, 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:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Sammandrag: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Funktioner: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Nyckelserver no-modify"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Föredragen nyckelserver: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Notationer: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(känsligt)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "skapat: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "spärrad: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "utgånget: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "går ut: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "kortnummer: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "tillit: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "giltighet: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Denna nyckel har stängts av"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4685,17 -3739,12 +4715,17 @@@ msgstr "
"Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
"såvida inte du startar om programmet.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "spärrad"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "utgånget"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4704,17 -3753,14 +4734,17 @@@ msgstr "
"Detta kommando kan göra att en annan användaridentitet antas\n"
"vara den primära identiteten.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4723,36 -3769,28 +4753,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
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:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Vill du radera denna okända signatur? (j/N/a)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
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:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4760,20 -3798,16 +4790,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "Raderade %d signatur.\n"
msgstr[1] "Raderade %d signatur.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Ingenting raderat.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "ogiltigt"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4781,17 -3815,14 +4811,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:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Användaridentitet \"%s\": redan minimerad\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Användaridentitet \"%s\": redan rensad\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4801,39 -3832,31 +4831,39 @@@ msgstr "
"denna\n"
" nyckel inte användas i vissa versioner av PGP.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Ange användaridentiteten för spärrnyckeln: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
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:4632
++#: g10/keyedit.c:4739
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4843,162 -3866,132 +4873,167 @@@ 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:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Ändrar utgångstid för en undernyckel.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, 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:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Välj endast en användaridentitet.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
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:5276
++#: g10/keyedit.c:5383
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:5277
++#: g10/keyedit.c:5384
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:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Ange notationen: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "Fortsätt? (j/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ingen användaridentitet med indexet %d\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ingen användaridentitet med hashen %s\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "Ingen undernyckel med indexet %d\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "användaridentitet: \"%s\"\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "signerat av din nyckel %s den %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (icke exporterbar)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Denna signatur gick ut den %s.\n"
# nyckel? signatur?
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "Inte signerad av dig.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (inte spärrbar)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "spärrad av din nyckel %s den %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Du är på väg att spärra dessa signaturer:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "ingen hemlig nyckel\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "användaridentiteten \"%s\" är redan spärrad\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Nyckeln %s är redan spärrad.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Undernyckeln %s är redan spärrad.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, 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"
@@@ -5458,13 -4373,10 +5493,13 @@@ msgstr "
"hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
"en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Nyckelgenereringen misslyckades: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5472,72 -4384,59 +5507,72 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "nyckeln finns redan\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, 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:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "genererar ny nyckel\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Skapandet av nycklar avbröts.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
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:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5547,7 -4446,6 +5582,7 @@@ msgstr "
"syfte.\n"
# c-format behövs inte i singularis
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5555,7 -4453,6 +5590,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:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5563,49 -4460,38 +5598,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:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
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:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Verkligen skapa? (j/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "aldrig"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Viktig signaturpolicy: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Signaturpolicy: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Föredragen kritisk nyckelserver: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritisk signaturnotation: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Signaturnotation: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5613,7 -4499,6 +5648,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d felaktiga signaturer\n"
msgstr[1] "%d felaktiga signaturer\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5621,45 -4506,32 +5656,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 signatur validerades inte eftersom ett fel uppstod\n"
msgstr[1] "1 signatur validerades inte eftersom ett fel uppstod\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Nyckelring"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Undernyckelns fingeravtryck:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr "Primära nyckelns fingeravtryck:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Undernyckelns fingeravtryck:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr "Nyckelns fingeravtryck ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " Kortets serienr ="
@@@ -5725,25 -4585,20 +5755,25 @@@ msgstr "respektera föredragen nyckelse
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:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "inaktiverad"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5751,117 -4606,98 +5781,122 @@@ 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "nyckeln hittades inte på nyckelservern\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, 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:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "begär nyckeln %s från %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "ingen nyckelserveråtgärd!\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "hoppade över \"%s\": %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "skickar nyckeln %s till %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, 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:1878
++#: g10/keyserver.c:1880
#, 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:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s krypterad sessionsnyckel\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, 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:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, 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:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "dekryptering med publik nyckel misslyckades: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "krypterad med %lu lösenfraser\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "krypterad med with 1 lösenfras\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "antar att %s krypterade data\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr ""
@@@ -5869,163 -4705,130 +5904,163 @@@
"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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
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:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "dekrypteringen misslyckades: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "ursprungligt filnamn=\"%.*s\"\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "VARNING: multipla klartexter har påträffats\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
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:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "ingen signatur hittades\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "FELAKTIG signatur från \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Utgången signatur från \"%s\""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "Korrekt signatur från \"%s\""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "signaturvalidering utlämnad\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "kan inte hantera detta tvetydliga signaturdata\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Signatur gjord %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " med %s-nyckeln %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
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:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[osäkert]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " även känd som \"%s\""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Giltighetstiden för signaturen har upphört %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Giltighetstiden för signaturen går ut %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "binär"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "textläge"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "okänd"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritm: %s"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Kan inte kontrollera signaturen: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "detta är inte någon signatur i en separat fil\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
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:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "fristående signatur av klassen 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "signatur av den gamla (PGP 2.x) typen\n"
@@@ -6208,7 -4977,6 +6243,7 @@@ msgstr "kan inte hantera algoritmen %d
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, 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"
@@@ -6584,49 -5284,40 +6619,49 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Det är inte säkert att signaturen tillhör ägaren.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: hoppade över: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: hoppades över: den publika nyckeln är inaktiverad\n"
# överhoppad?
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: hoppades över: publik nyckel finns redan\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Nuvarande mottagare:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6634,24 -5325,19 +6669,24 @@@ msgstr "
"\n"
"Ange användaridentiteten. Avsluta med en tom rad: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Ingen sådan användaridentitet.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Den publika nyckeln är inaktiverad.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "hoppade över: publik nyckel redan angiven\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "okänd standardmottagare \"%s\"\n"
@@@ -6659,16 -5345,13 +6694,16 @@@
# plural av adressee
# dvs. den som meddelandet är adresserat till.
# Åtskillnad görs mellan adressee och receiver.
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "inga giltiga adressater\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, 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:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@@ -6677,31 -5359,25 +6712,31 @@@
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:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Signatur i en separat fil.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Ange namnet på datafilen: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "läser från standard in ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "ingen signerad data\n"
# se förra kommentaren
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "kan inte öppna signerad data fd=%d: %s\n"
@@@ -6966,7 -5597,6 +7001,7 @@@ msgstr[0] "den publika nyckeln %s är %
msgstr[1] "den publika nyckeln %s är %lu sekund nyare än signaturen\n"
# c-format behövs inte i singularis
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -7048,12 -5669,10 +7083,12 @@@ msgstr "
"VARNING: kunde inte %%-expandera url för föredragen nyckelserver (för "
"stor). Använder oexpanderad.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s signatur från: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -7061,11 -5680,9 +7096,11 @@@ msgstr "
"VARNING: tvinga sammandragsalgoritmen %s (%d) strider mot "
"mottagarinställningarna\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "signerar:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "krypteringen %s kommer att användas\n"
@@@ -7144,137 -5747,110 +7179,137 @@@ msgstr "läsfel i \"%s\": %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, 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:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "tillitsdatabastransaktion för stor\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: katalogen finns inte!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: misslyckades med att skapa versionspost: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ogiltig tillitsdatabas skapad\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: tillitsdatabas skapad\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ogiltig tillitsdatabas\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: fel vid uppdatering av versionspost: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: fel vid läsning av versionspost: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: fel vid skrivning av versionspost: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "tillitsdatabas: lseek misslyckades: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: detta är inte en tillitsdatabasfil\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versionspost med postnummer %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: ogiltig filversion %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: fel vid läsning av ledig post: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: fel vid läsning av katalogpost: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, 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:1800
++#: g10/tdbio.c:1804
#, 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:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "Fel: Tillitsdatabasen är skadad.\n"
@@@ -7647,7 -6161,6 +7682,7 @@@ msgstr "använder tillitsmodellen %s\n
msgid "no need for a trustdb check\n"
msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
@@@ -7666,7 -6177,6 +7701,7 @@@ msgid "no need for a trustdb update wit
msgstr ""
"det behövs ingen uppdatering av tillitsdatabasen med tillitsmodellen \"%s\"\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "publika nyckeln %s hittades inte: %s\n"
@@@ -7680,7 -6188,6 +7715,7 @@@ msgstr "gör en kontroll av tillitsdata
msgid "checking the trustdb\n"
msgstr "kontrollerar tillitsdatabasen\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7689,7 -6196,6 +7724,7 @@@ msgstr[0] "%lu nycklar behandlade än s
msgstr[1] "%lu nycklar behandlade än så länge\n"
# Vad är detta!?
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7697,23 -6203,19 +7732,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d nycklar behandlade (%d validity counts rensade)\n"
msgstr[1] "%d nycklar behandlade (%d validity counts rensade)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "publik nyckel för förbehållslöst betrodda nyckeln %s hittades inte\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, 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:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8192,13 -6599,11 +8227,13 @@@ msgstr "neka användning av administrat
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8210,19 -6615,16 +8245,19 @@@ msgstr "
"Syntax: scdaemon [flaggor] [kommando [argument]]\n"
"Smartkortsdemon för GnuPG\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "hanterare för fd %d startad\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "hanterare för fd %d avslutad\n"
@@@ -8233,7 -6634,6 +8268,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "ogiltigt radix64-tecken %02x hoppades över\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
#| msgid "no gpg-agent running in this session\n"
msgid "no dirmngr running in this session\n"
@@@ -10230,8 -8243,6 +10265,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "ogiltig debug-level \"%s\" angiven\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
@@@ -10243,13 -8253,11 +10278,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:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10792,86 -8698,70 +10827,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, 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:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, 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:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_cert_by_url failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, 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:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "start_cert_fetch failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
#| msgid "select failed: %s\n"
msgid "fetch_next_cert failed: %s\n"
msgstr "val misslyckades: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, 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:2406
++#: dirmngr/server.c:2415
#, 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:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -11029,7 -8889,6 +11064,7 @@@ msgstr "okänt kommando \"%s\"\n
msgid "sending line failed: %s\n"
msgstr "sändande rad misslyckades: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "fel vid sändning av standardflaggor: %s\n"
@@@ -11296,15 -9094,12 +11331,15 @@@ msgstr "
"Syntax: gpgconf [flaggor]\n"
"Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Behöver ett komponentargument"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Komponenten hittades inte"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "Inget argument tillåts"
diff --cc po/tr.po
index d02c63a,6e661b5..cbf57fe
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -420,10 -334,6 +420,10 @@@ msgstr "artalan süreci olarak çalış
msgid "run in server mode (foreground)"
msgstr "sunucu olarak (önalanda) çalışır"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "ayrıntılı"
@@@ -529,11 -414,6 +529,11 @@@ msgstr "
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
#, fuzzy
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Yazılım hatalarını lütfen <"
@@@ -556,56 -434,39 +556,56 @@@ msgstr "
"Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
"GnuPG için gizli anahtar yönetimi\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 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:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s çok eski (gereken %s, sizinki %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "soket oluşturulamıyor: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, fuzzy, c-format
#| msgid "socket name `%s' is too long\n"
msgid "socket name '%s' is too long\n"
@@@ -615,29 -475,23 +615,29 @@@ msgstr "soketin ismi `%s' çok uzun\n
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "çalışan bir gpg-agent zaten var - bir yenisi başlatılmayacak\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "soket için tuz alınırken hata\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
#| msgid "error binding socket to `%s': %s\n"
msgid "error binding socket to '%s': %s\n"
msgstr "soket `%s'e bağlanırken hata: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "soket dinleme başarısız: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
#| msgid "listening on socket `%s'\n"
msgid "listening on socket '%s'\n"
@@@ -669,7 -517,6 +669,7 @@@ msgstr "%s için stat() başarısız ol
msgid "can't use '%s' as home directory\n"
msgstr "`%s' ev dizini olarak kullanılamıyor\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
@@@ -694,19 -537,15 +694,19 @@@ msgstr "ssh tutamağı 0x%lx, fd %d iç
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
#| msgid "pth_select failed: %s - waiting 1s\n"
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "pth_select başarısız: %s - 1s bekliyor\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s durdu\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "bu oturumda çalışan gpg-agent yok\n"
@@@ -723,8 -560,6 +723,8 @@@ msgstr "
"Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
"Parola arabelleği bakımcısı\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -732,9 -567,6 +732,9 @@@ msgstr "
"@Komutlar:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -989,32 -778,25 +989,32 @@@ msgstr "boru oluşturulurken hata: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "boru oluşturulurken hata: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "süreç çatallanırken hata: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, 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:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
#| msgid "error running `%s': exit status %d\n"
msgid "error running '%s': exit status %d\n"
msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
#| msgid "error running `%s': terminated\n"
msgid "error running '%s': terminated\n"
@@@ -1030,29 -810,23 +1030,29 @@@ msgstr "süreç %d çıkış kodu alın
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "gpg-agent ile haberleşme problemi\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
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:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "kullanıcı tarafından iptal edildi\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "aracı ile sorun var\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
#| msgid "problem with the agent: %s\n"
msgid "problem with the agent (unexpected response \"%s\")\n"
@@@ -1128,7 -887,6 +1128,7 @@@ msgstr "%lu bayt ayrılırken güvenli
msgid "out of core while allocating %lu bytes"
msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "yeterli bellek ayrılırken hata: %s\n"
@@@ -1380,7 -1084,6 +1380,7 @@@ msgstr "`%s' için yardım mevcut deği
msgid "ignoring garbage line"
msgstr "bozuk satır yok sayılıyor"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[yok]"
@@@ -1516,92 -1192,72 +1516,92 @@@ msgstr "kilit `%s' yapılmadı: %s\n
msgid "waiting for lock %s...\n"
msgstr "%s kilidi için bekleniyor...\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "zırh: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "zırh başlığı geçersiz: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "zırh başlığı: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "açıkça okunabilen imza başlığı geçersiz\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "bilinmeyen zırh başlığı: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "açıkça okunabilen imzalar dahil edildi\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "beklenmeyen zırh: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "araçizgisi escape'lı satır geçersiz: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "geçersiz radix64 karakteri %02X atlandı\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "dosya sonu belirsiz (CRC yok)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "dosya sonu belirsiz (CRC içinde)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "CRC bozulmuş\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC hatası; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "kuyruk satırında hata\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "geçerli OpenPGP verisi yok\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, 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:1305
++#: g10/armor.c:1312
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:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "insan okuyabilir değil"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1609,25 -1265,20 +1609,25 @@@ msgstr "
"bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
"sonuna bir '=' gelir.\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "bir kullanıcı simgelem ismi '@' karakteri içermeli\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
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:1181
++#: g10/build-packet.c:1203
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:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1637,7 -1288,6 +1637,7 @@@ msgstr "
"bir simgelem ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
"sonuna bir '=' gelir.\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
@@@ -1669,19 -1314,14 +1669,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "%s numaralı OpenPGP kartı saptandı\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "bu önceden betik kipinde yapılamaz\n"
@@@ -1693,10 -1331,6 +1693,10 @@@ msgstr "Bu komut sadece 2. sürüm kart
msgid "Reset Code not or not anymore available\n"
msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Seçiminiz? "
@@@ -1758,141 -1378,108 +1758,142 @@@ 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: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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "`%s' yazılırken hata: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Oturum açma verisi (hesap adı): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Özel DO verisi: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Dil tercihleri: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Hata: yanıt geçersiz.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "CA parmak izi: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Hata: biçimli parmakizi geçersiz\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "anahtar işlemi mümkün değil: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "bir OpenPGP kartı değil"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "%u bite yuvarlandı\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s anahtar uzunlukları %u-%u aralığında olmalı\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "soket `%s'e bağlanırken hata: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1907,144 -1494,109 +1908,144 @@@ msgstr "
" PIN = `%s' Admin PIN = `%s'\n"
"Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) İmzalama anahtarı\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Şifreleme anahtarı\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
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:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Seçim geçersiz.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
#| msgid "read failed: %s\n"
msgid "KEYTOCARD failed: %s\n"
msgstr "read başarısız: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "%s kipindeyken bu komut kullanılamaz.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "İmzalayacak mısınız? (e/H veya y/N) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "bu menüden çık"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "yönetici komutlarını gösterir"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "bunu gösterir"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "tüm kullanılabilir veriyi listeler"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "kart sahibinin ismini değiştirir"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "anahtarın alınacağı URL değiştirilir"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "kart URL'sinde belirtilmiş anahtarı alır"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "oturum açma ismini değiştirir"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "dil tercihlerini değiştirir"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "kart sahibinin cinsiyetini değiştirir"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "bir CA parmakizini değiştirir"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "imza zorlama PIN'i bayrağını değiştirir"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "yeni anahtarlar üretir"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "PIN'i değiştirme veya engelleme menüsü"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "PIN'i doğrular ve tüm veriyi listeler"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "Yöneticiye özel komut\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Yönetici komutlarına izin verilir\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "Yönetici komutlarına izin verilmez\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
@@@ -2052,28 -1603,19 +2053,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output seçeneği bu komutla çalışmaz\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "`%s' açılamadı\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "anahtar \"%s\" yok: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/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:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2129,7 -1660,6 +2130,7 @@@ msgstr "genel anahtar \"%s\" için bir
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@@ -2149,7 -1676,6 +2150,7 @@@ msgstr "%s şifrelemesi kullanılıyor\
msgid "'%s' already compressed\n"
msgstr "`%s' zaten sıkıştırılmış\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2169,7 -1693,6 +2170,7 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
"zorlanıyor\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2189,17 -1710,14 +2190,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s \"%s\" için şifrelendi\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s şifreli veri\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
@@@ -2271,334 -1776,269 +2272,348 @@@ 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:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "sadece-yerel olarak imli imzalar ihraç edilir"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
"öznitelik kullanıcı kimliklerini (genellikle foto kimliklerini) ihraç eder"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "\"hassas\" olarak imli yürürlükten kaldırma anahtarlarını ihraç eder"
- #: g10/export.c:84
++#: g10/export.c:108
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:86
++#: g10/export.c:110
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:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s: atlandı: %s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "\"%s\"e yazıyor\n"
+
++#: g10/export.c:1660
+ #, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
+
++#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
msgstr "gizli anahtarların ihracına izin verilmez\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, 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:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "anahtar %s: anahtar malzemesi kartta - atlandı\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[Kullanıcı kimliği yok]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, 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:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, 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:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, 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:1435
++#: g10/getkey.c:1437
#, 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:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "Parmak izi yok"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "gizli anahtar \"%s\" yok: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, 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:3323
++#: g10/getkey.c:3377
#, 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:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "bir imza yapar"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "açıkça okunabilen bir imza yapar"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "bağımsız bir imza yapar"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "veriyi şifreler"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "sadece simetrik şifre ile şifreler"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "veri şifresini açar (öntanımlı)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "bir imzayı doğrular"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "anahtarları listeler"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "anahtarları ve imzaları listeler"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "anahtar imzalarını listeler ve sınar"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "anahtarları ve parmak izlerini listeler"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "gizli anahtarları listeler"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "yeni bir anahtar çifti üretir"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "yeni bir anahtar çifti üretir"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "bir yürürlükten kaldırma sertifikası üretir"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "anahtarları genel anahtar zincirinden siler"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "anahtarları gizli anahtar zincirinden siler"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "bir anahtarı imzalar"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "bir anahtarı yerel olarak imzalar"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "bir anahtarı düzenler ve imzalar"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "anahtar parolası değiştirir"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "anahtarları gönderir"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "anahtarları bir anahtar sunucusuna gönderir"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan indirir"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "bir anahtar sunucusunda anahtarları arar"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "anahtarları bir anahtar sunucusundan günceller"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "anahtarları indirir/katıştırır"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "kart durumunu basar"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "kart üzerindeki veriyi değiştirir"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "bir kartın PIN'ini değiştirir"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "güvence veritabanını günceller"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "ileti özetlerini gösterir"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "sunucu kipinde çalışır"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "ascii zırhlı çıktı oluşturur"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 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:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
"kullanılır"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 iptal eder)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "kurallı metin kipini kullanır"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|DOSYA|çıktı DOSYAya yazılır"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "hiçbir değişiklik yapmaz"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "üzerine yazmadan önce sorar"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "kesin OpenPGP davranışı etkin olur"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2606,7 -2046,6 +2621,7 @@@ msgstr "
"@\n"
"(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2626,13 -2065,11 +2641,13 @@@ msgstr "
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, 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:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2647,7 -2084,6 +2662,7 @@@ msgstr "
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2655,81 -2091,66 +2670,81 @@@ msgstr "
"\n"
"Desteklenen algoritmalar:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "GenAnah: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Şifre: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Sıkıştırma: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 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:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2737,19 -2158,16 +2752,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:1554
#, 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:1560
#, 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:1563
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2758,519 -2176,413 +2773,525 @@@ 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:1566
#, 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:1773
#, 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:1880
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:1882
#, 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:1884
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:1886
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:1888
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:1892
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:1894
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:1896
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:1898
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:1900
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:1902
msgid "show the keyring name in key listings"
msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
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:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "anahtarı iptal eder"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
#| msgid "unknown command `%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "komut `%s' bilinmiyor\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, 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:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "liste seçenekleri geçersiz\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
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:3064
++#: g10/gpg.c:3118
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:3066
++#: g10/gpg.c:3120
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:3068
++#: g10/gpg.c:3122
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:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "imzaları PKA verisi ile doğrular"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
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:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, 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:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, 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:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özet algoritması geçersiz\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
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:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
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:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
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:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "kişisel özet tercihleri geçersiz\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, 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:3752
++#: g10/gpg.c:3826
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:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [dosyaismi]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, 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:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [dosyaismi]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [dosyaismi]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
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:3854
++#: g10/gpg.c:3929
#, 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:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [dosyaismi]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
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:3914
++#: g10/gpg.c:3989
#, 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:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [DOSYA]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [dosyaismi]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key kullanıcı-kimliği"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key kullanıcı-kimliği"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kullanıcı-kimliği [komutlar]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key kullanıcı-kimliği"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, 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:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, 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:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "anahtar sunucusunda arama başarısız: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, 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:4595
++#: g10/gpg.c:4682
#, 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:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[dosyaismi]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@@ -3313,128 -2617,110 +3334,138 @@@ msgstr "yardım mevcut değil
msgid "No help available for '%s'"
msgstr "\"%s\" için yardım mevcut değil"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "salt-yerel olarak imlenmiş imzaları ithal eder"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "ithalat sırasında pks anahtar sunucusundaki bozukluğu giderir"
- #: g10/import.c:110
++#: g10/import.c:140
#, 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:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "ithalat sonrası güvence veritabanını güncellemez"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "parmakizini gösterir"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "güncellemeleri sadece mevcut anahtarlar için kabul eder"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "ithalat sonrası anahtardan kullanışsız parçaları kaldırır"
- #: g10/import.c:122
++#: g10/import.c:155
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:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "%d türündeki blok atlanıyor\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "şu ana kadar %lu anahtar işlendi\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "İşlenmiş toplam miktar: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, 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:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " yeni anahtarlar atlandı: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " kullanıcı kimliksiz: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " alınan: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " değişmedi: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " yeni kullanıcı kimliği: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " yeni yardımcı anahtarlar: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " yeni imzalar: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " yeni anahtar iptalleri: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " gizli anahtarlar okundu: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " gizli anahtarlar indirildi: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " gizli anahtarlar değişmedi: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " alınamadı: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " temizlenen imzalar: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " temizlenen kullanıcı kimlikleri: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3443,204 -2729,159 +3474,197 @@@ msgstr "
"UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
"tercihler içeriyor:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": şifreleme algoritması %s için tercih edilir\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": özet algoritması %s için tercih edilir\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, 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:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "tercihlerinizi güncellemenizi ve\n"
- #: g10/import.c:893
++#: g10/import.c:1069
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:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "anahtar %s: kullanıcı kimliği yok\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "\"%s\" atlandı: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, 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:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
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:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "anahtar %s: genel anahtar yok: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "anahtar %s: yeni anahtar - atlandı\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "\"%s\"e yazıyor\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, 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:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, 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:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, 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:1201
++#: g10/import.c:1488
#, 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:1204
++#: g10/import.c:1491
#, 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:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "anahtar %s: \"%s\" %d yeni imza\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, 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:1228
++#: g10/import.c:1515
#, 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:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "anahtar %s: \"%s\" değişmedi\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "anahtar %s: gizli anahtar alındı\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, 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:1578
++#: g10/import.c:1866
#, 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:1683
++#: g10/import.c:1971
#, 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:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "gizli anahtarı alımına izin verilmez\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
@@@ -3655,147 -2896,120 +3679,147 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, 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:1897
++#: g10/import.c:2182
#, 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:1930
++#: g10/import.c:2215
#, 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:2006
++#: g10/import.c:2291
#, 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:2023
++#: g10/import.c:2308
#, 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:2025
++#: g10/import.c:2310
#, 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:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, 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:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, 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:2108
++#: g10/import.c:2393
#, 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:2121
++#: g10/import.c:2406
#, 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:2136
++#: g10/import.c:2421
#, 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:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "anahtar %s: yardımcı anahtar atlandı\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, 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:2244
++#: g10/import.c:2527
#, 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:2262
++#: g10/import.c:2545
#, 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:2276
++#: g10/import.c:2559
#, 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:2284
++#: g10/import.c:2567
#, 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:2413
++#: g10/import.c:2696
#, 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:2477
++#: g10/import.c:2760
#, 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:2493
++#: g10/import.c:2776
#, 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:2557
++#: g10/import.c:2840
#, 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:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
@@@ -3836,45 -3044,37 +3860,45 @@@ msgstr "anahtar bloku özkaynağı `%s'
msgid "error opening key DB: %s\n"
msgstr "'%s' açılırken hata: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, 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:264
msgid "[revocation]"
msgstr "[yürürlükten kaldırma]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[öz-imza]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
#| msgid "Good signature from"
msgid " (reordered signatures follow)"
msgstr "Buradaki imzeler iyi:"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s:\n"
msgstr "\"%s\" atlandı: %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "%d duplicate signature removed\n"
@@@ -3882,7 -3082,6 +3906,7 @@@ msgid_plural "%d duplicate signatures r
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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3890,7 -3089,6 +3914,7 @@@ 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3898,7 -3096,6 +3922,7 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d kötü imza\n"
msgstr[1] "%d kötü imza\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
#| msgid "Good signature from"
msgid "%d signature reordered\n"
@@@ -3906,14 -3103,12 +3930,14 @@@ msgid_plural "%d signatures reordered\n
msgstr[0] "Buradaki imzeler iyi:"
msgstr[1] "Buradaki imzeler iyi:"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3924,17 -3119,14 +3948,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:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Şöyle böyle güveniyorum\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Tamamen güveniyorum\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3944,50 -3136,38 +3968,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:1018
++#: g10/keyedit.c:1021
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:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " İmzalanamıyor.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Kullanıcı kimliği \"%s\" imzalanabilir. "
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "İmzalayacak mısınız? (e/H veya y/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3996,12 -3176,10 +4020,12 @@@ msgstr "
"\"%s\" üzerindeki öz-imza\n"
"bir PGP 2.x tarzı imza.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
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:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4010,13 -3188,11 +4034,13 @@@ msgstr "
"\"%s\" üzerindeki imzanızın\n"
"kullanım süresi dolmuş.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
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:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -4025,46 -3201,37 +4049,46 @@@ msgstr "
"\"%s\" üzerindeki imzanız\n"
"dahili bir imza.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
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:1341
++#: g10/keyedit.c:1344
#, 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:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
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:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Bu anahtarın kullanım süresi dolmuş!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, 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:1420
++#: g10/keyedit.c:1423
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:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -4073,33 -3240,27 +4097,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:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Cevabı bilmiyorum. %s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Tamamen kontrol edildi.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) İlişkisel denetim yaptım.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, 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:1480
++#: g10/keyedit.c:1483
#, 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:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4109,232 -3270,178 +4133,232 @@@ msgstr "
"gerçekten\n"
"emin misiniz?\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Bu bir öz-imza olacak.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
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:1527
++#: g10/keyedit.c:1530
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:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
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:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "Bu anahtarı çok dikkatle sınadım.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "imzalama başarısız: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
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:1741
++#: g10/keyedit.c:1744
#, 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:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "kaydet ve çık"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "parmakizini gösterir"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "Simgelemi giriniz: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "anahtarı ve kullanıcı kimliğini gösterir"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "N kullanıcı kimliğini seçer"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "N yardımcı anahtarını"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "imzaları sınar"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
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:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "kullanıcı kimlikleri yerel olarak imzalar"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
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:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "bir kullanıcı kimliği ekler"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "bir foto kimliği ekler"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "seçili kullanıcı kimlikleri siler"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "bir yardımcı anahtar ekler"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "bir akıllı karta bir anahtar ekler"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "bir akıllı karttan bir anahtarı taşır"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "seçili yardımcı anahtarları siler"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "bir yürürlükten kaldırma anahtarı ekler"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "seçili kullanıcı kimliklerden imzaları siler"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
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:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "seçili kullanıcı kimliğini asıl olarak imler"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "tercihleri listeler (uzman)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "tercihleri listeler (ayrıntılı)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
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:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "anahtar parolasını değiştirir"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "sahibiningüvencesini değiştirir"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
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:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
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:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "anahtarı kullanıma sokar"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "anahtarı iptal eder"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "seçili foto kimlikleri gösterir"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
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:1936
++#: g10/keyedit.c:1939
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:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Gizli anahtar mevcut.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4353,278 -3460,225 +4377,284 @@@ msgstr "
" için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı olarak "
"(ltsign, tnrsign gibi).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Anahtar yürürlükten kaldırıldı."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
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:2252
++#: g10/keyedit.c:2255
#, 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:2260
++#: g10/keyedit.c:2263
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:2271
++#: g10/keyedit.c:2274
#, 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:2295
++#: g10/keyedit.c:2298
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "%s kipindeyken bu komut kullanılamaz.\n"
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
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:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
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:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "Komut değiştirge olarak bir dosya ismi gerektiriyor\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, 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:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "En az bir anahtar seçmelisiniz.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
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:2503
++#: g10/keyedit.c:2506
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:2541
++#: g10/keyedit.c:2544
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:2542
++#: g10/keyedit.c:2545
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:2560
++#: g10/keyedit.c:2563
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:2571
++#: g10/keyedit.c:2574
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:2573
++#: g10/keyedit.c:2576
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:2631
++#: g10/keyedit.c:2634
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:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Belirlenecek tercih listesi:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
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:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "güncelleme başarısız: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "parmakizi geçersiz"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, 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:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "değer hatalı\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, 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:3134
++#: g10/keyedit.c:3241
#, 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:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Özet: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Özellikler: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Anahtar sunucusu değişmez"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Tercih edilen anahtar sunucusu: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Simgelemler: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
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:3716
++#: g10/keyedit.c:3823
#, 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:3740
++#: g10/keyedit.c:3847
#, 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:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(duyarlı)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "oluşturuldu: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "yürürlükten kaldırıldı: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "son kullanma tarihi: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "son kullanma tarihi: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "kullanımı: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "kart-no: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "güvencesi: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "geçerliliği: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Bu anahtar iptal edilmişti"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4632,17 -3686,12 +4662,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:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "yürürlükten kaldırıldı"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "zamanaşımına uğradı"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4651,17 -3700,14 +4681,17 @@@ msgstr "
" farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
" kabul edilmesini sağlayabilirsiniz.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4670,35 -3716,27 +4700,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:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
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:4191
++#: g10/keyedit.c:4298
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:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
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:4315
++#: g10/keyedit.c:4422
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:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4706,20 -3744,16 +4736,20 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "%d imza silindi.\n"
msgstr[1] "%d imza silindi.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Hiçbir şey silinmedi.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "geçersiz"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, fuzzy, c-format
#| msgid "User ID \"%s\": %d signature removed\n"
msgid "User ID \"%s\": %d signature removed\n"
@@@ -4727,17 -3761,14 +4757,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:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4747,47 -3778,39 +4777,47 @@@ msgstr "
" eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
" ile sonuçlanabilir.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
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:4495
++#: g10/keyedit.c:4602
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:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
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:4575
++#: g10/keyedit.c:4682
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:4581
++#: g10/keyedit.c:4688
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:4632
++#: g10/keyedit.c:4739
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4798,162 -3821,132 +4828,167 @@@ 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:4637
++#: g10/keyedit.c:4744
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:4640
++#: g10/keyedit.c:4747
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:4691
++#: g10/keyedit.c:4798
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:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, 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:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Tercih ettiğiniz sunucunun adresini girin: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
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:5277
++#: g10/keyedit.c:5384
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:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Simgelemi giriniz: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "Devam? (e/H ya da y/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "%s çittirmeli kullanıcı kimliği yok\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, 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:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "%d indisli bir yardımcı anahtar yok\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Kullanıcı kimliği: \"%s\"\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (dışarda geçersiz)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
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:5898
++#: g10/keyedit.c:6005
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:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, 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:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (yürülükten kaldırılmaz)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, 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:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
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:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "gizli anahtar yok\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, 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:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, 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:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr ""
@@@ -5411,13 -4326,10 +5446,13 @@@ msgstr "
"iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
"üretecine yardımcı olur. \n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5425,71 -4337,58 +5460,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "anahtar zaten mevcut\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, 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:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "yeni anahtar üretiliyor\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Anahtar üretimi durduruldu.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, 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:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5497,14 -4396,12 +5532,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:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr ""
"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5512,50 -4409,39 +5547,50 @@@ msgstr "
"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
"problemi)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
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:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "asla "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Kritik imza guvencesi: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "imza guvencesi: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Kritik tercihli anahtar sunucusu: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Kritik imza simgelemi: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "imza simgelemi: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5563,7 -4449,6 +5598,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d kötü imza\n"
msgstr[1] "%d kötü imza\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5571,45 -4456,32 +5606,40 @@@ msgid_plural "%d signatures not checke
msgstr[0] "1 imza bir hata yüzünden kontrol edilmedi\n"
msgstr[1] "1 imza bir hata yüzünden kontrol edilmedi\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Anahtar zinciri"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr "Birincil anahtar parmak izi:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr "Yardımcı anahtar parmak izi:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Anahtar parmakizi ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " Kart seri no. ="
@@@ -5676,25 -4536,20 +5706,25 @@@ msgstr "tercihli anahtar sunucusunun ad
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:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "iptal edildi"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5702,273 -4557,221 +5732,278 @@@ 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:1424
++#: g10/keyserver.c:1426
#, 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:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "anahtar, anahtar sunucusunda yok\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, 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:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "%s anahtarı %s adresinden isteniyor\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "bir anahtar sunucusu eylemi yok!\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "\"%s\" atlandı: %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "%s anahtarı %s adresine gönderiliyor\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, 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:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, 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:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s şifreli oturum anahtarı\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "bilinmeyen özet algoritması ile üretilmiş anahtar parolası %d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "genel anahtar: %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "genel anahtarla şifreli veri: doğru DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, 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:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, 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:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "genel anahtar şifre çözümü başarısız: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "%lu anahtar parolası ile şifrelenmiş\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "1 anahtar parolası ile şifrelenmiş\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "%s şifreli veri varsayılıyor\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, 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:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "UYARI: ileti bütünlük korumalı değildi\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "Şifre çözme tamam\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "şifre çözme başarısız: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "özgün dosya adı = '%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "UYAR: çok sayıda salt metin görüldü\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
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:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "hiç imza yok\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "\"%s\" deki imza KÖTÜ"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "\"%s\" deki imza zamanaşımına uğramış"
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "\"%s\" deki imza iyi"
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "imza doğrulama engellendi\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "bu belirsiz imza verisi elde edilemiyor\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "İmza %s de\n"
- #: g10/mainproc.c:1723
++#: 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:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Anahtar burada:"
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[şüpheli]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " nam-ı diğer \"%s\""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Bu imzanın geçerliliği %s de bitti.\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "ikili"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "metinkipi"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "bilinmeyen"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "algorithm: %s"
msgid ", key algorithm "
msgstr "algoritma: %s"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "İmza kontrol edilemedi: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "bir bağımsız imza değil\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "0x%02x sınıfı tek başına imza\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "eski stil (PGP 2.x) imza\n"
@@@ -6151,7 -4920,6 +6186,7 @@@ msgstr "%d genel anahtar algoritması k
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@@ -6528,48 -5228,39 +6563,48 @@@ msgstr "
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Bu imzanın sahibine ait olduğu kesin değil.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: atlandı: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: atlandı: genel anahtar iptal edildi\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: atlandı: genel anahtar zaten var\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
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:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Şimdiki alıcılar:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6577,37 -5268,29 +6612,37 @@@ msgstr "
"\n"
"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Böyle bir kullanıcı kimliği yok.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
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:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Genel anahtar iptal edildi.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "geçerli adresler yok\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, 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:1636
++#: g10/pkclist.c:1649
#, 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"
@@@ -6616,29 -5298,23 +6651,29 @@@
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:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Bağımsız imza.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Lütfen veri dosyasının ismini girin: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "standart girdiden okuyor ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "imzalı veri yok\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "imzalı veri fd=%d açılamadı: %s\n"
@@@ -6898,7 -5529,6 +6933,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "genel anahtar %s imzadan %lu saniye daha yeni\n"
msgstr[1] "genel anahtar %s imzadan %lu saniye daha yeni\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6978,12 -5599,10 +7013,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:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s imza: \"%s\" den\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6991,11 -5610,9 +7026,11 @@@ msgstr "
"UYARI: alıcının tercihleriyle çelişen %s (%d) özet algoritması kullanılmak "
"isteniyor\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "imzalanıyor:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s şifrelemesi kullanılmayacak\n"
@@@ -7070,136 -5673,109 +7105,136 @@@ msgstr "`%s' için okuma hatası: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "`%s' kiltlenemedi\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, 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:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, 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:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "güvence veritabanı işlemi çok uzun\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: dizin yok!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, 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:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: güvence veritabanı oluşturuldu\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, 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:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: güvence veritabanı geçersiz\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: çittirim tablosu oluşturulamadı: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, 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:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, 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:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "güvence veritabanı: erişim başarısız: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, 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:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: bir güvence veritabanı dosyası değil\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, 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:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: dosya sürümü %d geçersiz\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: serbest kaydı okuma hatası: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: dizin kaydını yazma hatası: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, 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:1800
++#: g10/tdbio.c:1804
#, 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:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: güvence veritabanı oluşturuldu\n"
@@@ -7570,7 -6084,6 +7605,7 @@@ msgstr "%s güvence modeli kullanılıy
msgid "no need for a trustdb check\n"
msgstr "bir güvence veritabanı denetimi gereksiz\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "sonraki güvence veritabanı denetimi %s de\n"
@@@ -7587,7 -6098,6 +7622,7 @@@ msgstr "`%s' güvence modelli güvence
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "genel anahtar %s yok: %s\n"
@@@ -7600,7 -6108,6 +7635,7 @@@ msgstr "lütfen bir --check-trustdb yap
msgid "checking the trustdb\n"
msgstr "güvence veritabanı denetleniyor\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7608,7 -6115,6 +7643,7 @@@ msgid_plural "%d keys processed
msgstr[0] "şu ana kadar %lu anahtar işlendi\n"
msgstr[1] "şu ana kadar %lu anahtar işlendi\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7616,16 -6122,13 +7651,16 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "%d anahtar işlendi (%d doğrulama temizlendi)\n"
msgstr[1] "%d anahtar işlendi (%d doğrulama temizlendi)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "son derece güvenli bir anahtar yok\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "son derece güvenli %s için genel anahtar yok\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7633,7 -6136,6 +7668,7 @@@ msgstr "
"derinlik: %d geçerli: %3d imzalı: %3d güvenilir: %d-, %dq, %dn, %dm, %df, "
"%du\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr ""
@@@ -8103,13 -6510,11 +8138,13 @@@ msgstr "yönetici kartı komutları kul
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
#| msgid "Usage: gpgconf [options] (-h for help)"
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
#, fuzzy
#| msgid ""
#| "Syntax: scdaemon [options] [command [args]]\n"
@@@ -8121,7 -6526,6 +8156,7 @@@ msgstr "
"Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
"GnuPG için akıllı kart artalan süreci\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
#, fuzzy
#| msgid ""
#| "please use the option `--daemon' to run the program in the background\n"
@@@ -8130,12 -6534,10 +8165,12 @@@ msgstr "
"Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
"kullanın\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "fd %d için eylemci başlatıldı\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "fd %d için eylemci sonlandı\n"
@@@ -8145,7 -6546,6 +8180,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "geçersiz radix64 karakteri %02x atlandı\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
#| msgid "no gpg-agent running in this session\n"
msgid "no dirmngr running in this session\n"
@@@ -10135,8 -8148,6 +10170,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
#| msgid "usage: gpgsm [options] "
msgid "usage: %s [options] "
@@@ -10148,13 -8158,11 +10183,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:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
#| msgid "conversion from `%s' to `%s' failed: %s\n"
msgid "processing CRL from '%s' failed: %s\n"
@@@ -10695,86 -8601,70 +10730,86 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, 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:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, 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:1223
++#: dirmngr/server.c:1232
#, 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:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, 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:1373
++#: dirmngr/server.c:1382
#, 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:1406
++#: dirmngr/server.c:1415
#, 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:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, 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:2406
++#: dirmngr/server.c:2415
#, 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:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10931,7 -8791,6 +10966,7 @@@ msgstr "komut `%s' bilinmiyor\n
msgid "sending line failed: %s\n"
msgstr "satır göndirimi başarısız: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "standart seçenekler gönderilirken hata: %s\n"
@@@ -11201,15 -8999,12 +11236,15 @@@ msgstr "
"Sözdizimi: gpgconf [seçenekler]\n"
"GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Tek bileşenlik değiştirge gerekli"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Bileşen yok"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "Değiştirgeye izin verilmez"
diff --cc po/uk.po
index 9edb97e,97442c8..907a41b
--- a/po/uk.po
+++ b/po/uk.po
@@@ -7,8 -7,7 +7,8 @@@ msgid "
msgstr ""
"Project-Id-Version: GNU gnupg 2.1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2016-06-16 17:27+0200\n"
- "PO-Revision-Date: 2016-05-10 18:21+0300\n"
++"POT-Creation-Date: 2016-07-14 16:03+0200\n"
+ "PO-Revision-Date: 2016-07-10 15:11+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
"Language: uk\n"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, c-format
msgid "can't open '%s': %s\n"
msgstr "не вдалося відкрити «%s»: %s\n"
@@@ -395,10 -309,6 +395,10 @@@ msgstr "запустити у режи�
msgid "run in server mode (foreground)"
msgstr "запустити у режимі сервера (основному)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "докладний режим"
@@@ -416,12 -321,9 +416,12 @@@ msgstr "виведення коман�
msgid "csh-style command output"
msgstr "виведення команд у форматі csh"
+#: agent/gpg-agent.c:157 scd/scdaemon.c:120 sm/gpgsm.c:330
+#: dirmngr/dirmngr.c:175 tools/symcryptrun.c:169
msgid "|FILE|read options from FILE"
- msgstr "прочитати параметри з вказаного файла"
+ msgstr "|FILE|прочитати параметри з вказаного файла"
+#: agent/gpg-agent.c:166 scd/scdaemon.c:131 dirmngr/dirmngr.c:178
msgid "do not detach from the console"
msgstr "не від’єднувати від консолі"
@@@ -433,23 -333,18 +433,23 @@@ msgstr "не захоплювати к�
msgid "use a log file for the server"
msgstr "використовувати файл журналу для сервера"
+#: agent/gpg-agent.c:170
msgid "|PGM|use PGM as the PIN-Entry program"
- msgstr "використовувати вказану програму пінзаписів"
+ msgstr "|PGM|використовувати вказану програму пінзаписів"
+#: agent/gpg-agent.c:175
msgid "|PGM|use PGM as the SCdaemon program"
- msgstr "використовувати вказану програму SCdaemon"
+ msgstr "|PGM|використовувати вказану програму SCdaemon"
+#: agent/gpg-agent.c:177
msgid "do not use the SCdaemon"
msgstr "не використовувати SCdaemon"
+#: agent/gpg-agent.c:181
msgid "|NAME|accept some commands via NAME"
- msgstr "приймати певні команди через NAME"
+ msgstr "|NAME|приймати певні команди через NAME"
+#: agent/gpg-agent.c:197
msgid "ignore requests to change the TTY"
msgstr "ігнорувати запити щодо зміни TTY"
@@@ -457,11 -351,9 +457,11 @@@
msgid "ignore requests to change the X display"
msgstr "ігнорувати запити щодо зміни графічного дисплея"
+#: agent/gpg-agent.c:202
msgid "|N|expire cached PINs after N seconds"
- msgstr "вважати кешовані пінкоди за вказану кількість секунд"
+ msgstr "|N|вважати кешовані пінкоди за вказану кількість секунд"
+#: agent/gpg-agent.c:216
msgid "do not use the PIN cache when signing"
msgstr "не використовувати кеш пін-кодів для підписування"
@@@ -496,11 -381,6 +496,11 @@@ msgstr "увімкнути підтри
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "Будь ласка, надсилайте повідомлення про помилки на <@EMAIL@>.\n"
@@@ -516,51 -394,34 +516,51 @@@ msgstr "
"Синтаксис: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
"Керування закритими ключами у @GNUPG@\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "вказано некоректне значення рівня діагностики «%s»\n"
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s є занадто застарілою (потрібно %s, маємо %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, c-format
msgid "option file '%s': %s\n"
msgstr "файл параметрів «%s»: %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, c-format
msgid "reading options from '%s'\n"
msgstr "прочитати параметри з «%s»\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "не вдалося створити сокет: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "назва сокета «%s» є надто довгою\n"
@@@ -569,27 -429,21 +569,27 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent вже запущено, потреби у запуску нової копії немає\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "помилка під час спроби отримання поточного стану сокета\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "помилка під час спроби прив’язування сокета до «%s»: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "не вдалося встановити права доступу до «%s»: %s\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "помилка listen(): %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, c-format
msgid "listening on socket '%s'\n"
msgstr "очікування даних на сокеті «%s»\n"
@@@ -616,7 -464,6 +616,7 @@@ msgstr "помилка stat() щодо
msgid "can't use '%s' as home directory\n"
msgstr "не можна використовувати як домашній каталог «%s»\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr ""
@@@ -643,18 -486,14 +643,18 @@@ msgstr "запущено обробни
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "обробник ssh 0x%lx дескриптора файла %d завершив роботу\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "помилка pth_select: %s — очікування у 1 с\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s зупинено\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "у цьому сеансі не запущено gpg-agent\n"
@@@ -671,8 -508,6 +671,8 @@@ msgstr "
"Синтаксис: gpg-preset-passphrase [параметри] KEYGRIP\n"
"Керування кешем паролів\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -680,9 -515,6 +680,9 @@@ msgstr "
"@Команди:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -925,30 -714,23 +925,30 @@@ msgstr "помилка під час с
msgid "error creating a stream for a pipe: %s\n"
msgstr "помилка під час спроби створення потоку для каналу: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "помилка під час спроби розгалужування процесу: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "не вдалося дочекатися переривання процесу: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr ""
"помилка під час спроби виконання «%s»: ймовірно, програму не встановлено\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "помилка під час спроби виконання «%s»: стан виходу %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, c-format
msgid "error running '%s': terminated\n"
msgstr "помилка під час спроби виконання «%s»: виконання перервано\n"
@@@ -963,28 -743,22 +963,28 @@@ msgstr "помилка під час с
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "не вдалося дочекатися завершення процесу %d: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "не вдалося встановити з’єднання з «%s»: %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "проблема під час спроби обміну даними з gpg-agent\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
msgid "problem setting the gpg-agent options\n"
msgstr "проблема під час спроби встановлення параметрів gpg-agent\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "скасовано користувачем\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "проблема з агентом\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "проблема із агентом (неочікувана відповідь «%s»)\n"
@@@ -1060,7 -819,6 +1060,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr "вихід за межі області під час спроби отримання %lu байтів"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "помилка під час спроби розподілу пам’яті: %s\n"
@@@ -1296,7 -1000,6 +1296,7 @@@ msgstr "Довідки щодо «%s»
msgid "ignoring garbage line"
msgstr "ігноруємо беззмістовний рядок"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[немає]"
@@@ -1424,91 -1100,71 +1424,91 @@@ msgstr "блокування «%s» н�
msgid "waiting for lock %s...\n"
msgstr "очікування на блокування %s…\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "формат ASCII: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "некоректний заголовок ASCII: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "заголовок ASCII: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "некоректний заголовок прозорого підпису\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "некоректний заголовок ASCII: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "вкладені підписи нешифрованим текстом\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "неочікуваний формат ASCII: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "некоректний екранований дефісами рядок: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "пропущено некоректний символ radix64 %02X\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "завчасний кінець файла (немає CRC)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "завчасний кінець файла (у CRC)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "помилкове форматування CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "помилка CRC; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "завчасний кінець файла (у додатку)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "помилка у рядку доповнення\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "не виявлено коректних даних OpenPGP.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "некоректний формат ASCII: рядок є довшим за %d символів\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr ""
"символи quoted printable у кодуванні ASCII — ймовірно, використано "
"помилковий MTA\n"
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
#, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "[ незручне для читання (%zu байтів: %s%s) ]"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
@@@ -1516,27 -1172,21 +1516,27 @@@ msgstr "
"назва примітки має складатися з друкованих символів або пробілів і "
"завершуватися символом «=»\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "назва примітки користувача має містити символ «@»\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
msgid "a notation name must not contain more than one '@' character\n"
msgstr "назва примітки не повинна містити більше за один символ «@»\n"
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "у значенні примітки не повинно міститися керівних символів\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
msgid "a notation name may not contain an '=' character\n"
msgstr "назва позначення не може містити символів «=»\n"
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
msgid "a notation name must have only printable characters or spaces\n"
msgstr "назва примітки має складатися з друкованих символів або пробілів\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "УВАГА: виявлено некоректні дані примітки\n"
@@@ -1564,19 -1209,14 +1564,19 @@@ msgstr "сервер «%s» має ве
msgid "WARNING: %s\n"
msgstr "УВАГА: %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "Не вдалося отримати доступ до картки OpenPGP: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "Виявлено картку OpenPGP з номером %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "це не можна робити у пакетному режимі\n"
@@@ -1588,10 -1226,6 +1588,10 @@@ msgstr "Цією командою мо�
msgid "Reset Code not or not anymore available\n"
msgstr "Немає коду скидання або код скидання вже недоступний\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "Ваш вибір? "
@@@ -1654,86 -1274,65 +1654,87 @@@ msgstr "Адреса для отрим�
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "Помилка: адреса є занадто довгою (максимум — %d символів).\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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, c-format
msgid "error reading '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
- #: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "помилка під час спроби читання «%s»: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "Дані користувача (назва запису): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr ""
"Помилка: дані користувача є занадто довгими (максимум — %d символів).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "Особисті дані DO: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr ""
"Помилка: особисті дані D0 є занадто довгими (максимум — %d символів).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "Основна мова: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "Помилка: некоректна довжина рядка основної мови.\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "Помилка: некоректні символи у рядку основної мови.\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "Стать (чоловіча (M), жіноча (F) або пробіл): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "Помилка: некоректна відповідь.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "Відбиток CA: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "Помилка: некоректне форматування відбитка.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "дія над ключем неможлива: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "не є карткою OpenPGP"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "помилка під час отримання даних поточного ключа: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "Замінити вже створений ключ? (y/N або т/Н) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1744,56 -1343,44 +1745,56 @@@ msgstr "
" ознайомтеся з документацією до вашої картки, щоб\n"
" визначити дозволені розміри.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "Якому розміру ключа підписування ви надаєте перевагу? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "Яким має бути розмір ключа для шифрування? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "Якому розміру ключа для розпізнавання ви надаєте перевагу? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "округлено до %u бітів\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "Розміри ключів %s мають перебувати у діапазоні %u—%u\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
"Зараз налаштування картки буде змінено для створення %u-бітового ключа\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "помилка під час спроби зміни розміру ключа з %d на %u: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "Створити резервну копію ключа шифрування поза карткою? (Y/n або Т/н) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
msgid "Note: keys are already stored on the card!\n"
msgstr "ЗАУВАЖЕННЯ: ключі вже збережено на картці!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "Замірити вже створені ключі? (y/N або т/Н) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1804,141 -1391,106 +1805,141 @@@ msgstr "
" PIN = «%s» Адміністративний PIN = «%s»\n"
"Вам слід змінити параметри за допомогою команди --change-pin\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "Виберіть тип ключа, який слід створити:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) Ключ підписування\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) Ключ шифрування\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) Ключ розпізнавання\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "Некоректний вибір.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "Виберіть сховище для зберігання ключа:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "Помилка KEYTOCARD: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
msgid "This command is not supported by this card\n"
msgstr "Цією карткою не передбачено підтримки вказаної команди\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr ""
"Зауваження: у результаті виконання цієї команди усі ключі на картці буде "
"знищено!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
msgid "Continue? (y/N) "
msgstr "Продовжити? (y (так)/N (ні)) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
"Справді хочете скинути усе до типових налаштувань? (введіть «yes» («так»)) "
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "вийти з цього меню"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "показати керівні команди"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "показати цю довідкову інформацію"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "показати всі доступні дані"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "змінити ім’я власника картки"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "змінити адресу для отримання ключа"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "отримати ключ, вказаний у полі адреси картки"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "змінити ім’я користувача"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "змінити основну мову"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "змінити поле статі власника картки"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "змінити відбиток CA"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "увімкнути або вимкнути позначку примусового пінкоду підпису"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "створити ключі"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "меню зміни або розблокування пінкоду"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "перевірити пінкод і показати список всіх даних"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "розблокувати під коду за допомогою коду скидання"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr "знищити усі ключі і дані"
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/картка> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "Команда адміністратора\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "Команди адміністрування дозволено\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "Команди адміністрування заборонено\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "Некоректна команда (скористайтеся командою «help»)\n"
@@@ -1946,27 -1497,18 +1947,27 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output не працює з цією командою\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "не вдалося відкрити «%s»\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "ключ «%s» не знайдено: %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "помилка під час спроби читання блокування ключа: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, c-format
msgid "key \"%s\" not found\n"
msgstr "ключ «%s» не знайдено\n"
@@@ -2019,7 -1550,6 +2020,7 @@@ msgid "use option \"--delete-secret-key
msgstr ""
"спершу скористайтеся параметром «--delete-secret-keys» для його вилучення.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "помилка під час спроби створення пароля: %s\n"
@@@ -2038,7 -1565,6 +2039,7 @@@ msgstr "використано шиф�
msgid "'%s' already compressed\n"
msgstr "«%s» вже стиснено\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "УВАГА: файл «%s» є порожнім\n"
@@@ -2056,7 -1580,6 +2057,7 @@@ msgstr "
"УВАГА: примусове використання симетричного шифру %s (%d) не відповідає "
"параметрам отримувача\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2077,17 -1598,14 +2078,17 @@@ msgstr "
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s зашифровано для «%s»\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "Дані, зашифровані за алгоритмом %s\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "зашифровано за допомогою невідомого алгоритму %d\n"
@@@ -2157,320 -1662,252 +2158,331 @@@ msgstr "УВАГА: не вдалос�
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "УВАГА: не вдалося вилучити тимчасовий каталог «%s»: %s\n"
- #: g10/export.c:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr ""
"експортувати підписи, які позначено як придатні лише для локального "
"використання"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr ""
"експортувати ідентифікатори користувача атрибута (типово фотоідентифікатори)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "експортувати ключі відкликання, позначені як «важливі»"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "вилучити невикористовувані частини ключа під час експортування"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr "вилучити максимум частин з ключа під час експортування"
- #: g10/export.c:1144
++#: g10/export.c:1204
msgid " - skipped"
msgstr " - пропущено"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, c-format
+ msgid "writing to '%s'\n"
+ msgstr "записуємо до «%s»\n"
+
++#: g10/export.c:1660
+ #, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr "ключ %s: матеріал ключа на карті — пропущено\n"
+
++#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
msgstr "експортування закритих ключів заборонено\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "ключ %s: ключ у стилі PGP 2.x — пропущено\n"
- #: g10/export.c:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "ключ %s: матеріал ключа на карті — пропущено\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "УВАГА: нічого не експортовано\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "помилка створення «%s»: %s.\n"
- #: g10/getkey.c:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[Ідентифікатор не знайдено]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, c-format
msgid "(check argument of option '%s')\n"
msgstr "(перевірте аргумент параметра «%s»)\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
"Попередження: «%s» має бути довгим ідентифікатором ключа або відбитком\n"
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, c-format
msgid "error looking up: %s\n"
msgstr "помилка під час пошуку: %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, c-format
msgid "Warning: %s appears in the keyring %d times\n"
msgstr "Попередження: запис %s наявний у сховищі %d разів\n"
- #: g10/getkey.c:1429
++#: g10/getkey.c:1431
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "автоматично отримано «%s» за допомогою %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "помилка під час спроби отримання «%s» за допомогою %s: %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "Без відбитка"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "закритий ключ «%s» не знайдено: %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, c-format
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "Попередження: «%s» не використовується як типовий ключ: %s\n"
- #: g10/getkey.c:1694
++#: g10/getkey.c:1743
#, c-format
msgid "using \"%s\" as default secret key for signing\n"
msgstr "використовуємо «%s» як типовий закритий ключ для підписування\n"
- #: g10/getkey.c:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr "усі значення, передані «%s», проігноровано\n"
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr ""
"Некоректний ключ %s визнано чинним через параметр --allow-non-selfsigned-"
"uid\n"
- #: g10/getkey.c:3323
++#: g10/getkey.c:3377
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "використовуємо підключ %s замість основного ключа %s\n"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "створити підпис"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "створити текстовий підпис"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "створити від’єднаний підпис"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "зашифрувати дані"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "шифрувати лише за допомогою симетричного шифру"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "розшифрувати дані (типова дія)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "перевірити підпис"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "показати список ключів"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "показати список ключів і підписів"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "показати список і перевірити підписи ключів"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "показати список ключів і відбитків"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "показати список закритих ключів"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "створити пару ключів"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
msgid "quickly generate a new key pair"
msgstr "швидке створення пари ключів"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
msgid "quickly add a new user-id"
msgstr "швидке додавання нового ідентифікатора користувача"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ msgid "quickly revoke a user-id"
+ msgstr "швидке відкликання ідентифікатора користувача"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr "повноцінне створення пари ключів"
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "створити сертифікат відкликання"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "вилучити ключі з відкритого сховища ключів"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "вилучити ключів з закритого сховища ключів"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
msgid "quickly sign a key"
msgstr "швидко підписати ключ"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
msgid "quickly sign a key locally"
msgstr "швидко підписати ключ локально"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "підписати ключ"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "підписати ключ локально"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "підписати або редагувати ключ"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "змінити пароль"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "експортувати ключі"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "експортувати ключі на сервер ключів"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "імпортувати ключі з сервера ключів"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "шукати ключі на сервері ключів"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "оновити всі ключів з сервера ключів"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "імпортувати/об’єднати ключі"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "показати дані про стан картки"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "змінити дані на картці"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "змінити пінкод картки"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "оновити базу даних довіри"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "показати контрольні суми повідомлень"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "запустити у режимі сервера"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr "|VALUE|встановити вказане правило TOFU для ключа"
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "створити дані у форматі ASCII"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|USER-ID|зашифрувати для вказаного ідентифікатора"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr ""
"|USER-ID|використовувати для створення підписів або розшифрування вказаний "
"ідентифікатор"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|встановити рівень стиснення (0 — вимкнути)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "використовувати канонічний текстовий режим"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|FILE|записати дані до вказаного файла"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "не вносити змін"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "запитувати перед перезаписом"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "строго використовувати стандарт OpenPGP"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2479,7 -1916,6 +2491,7 @@@ msgstr "
"(Щоб ознайомитися зі списком команд і параметрів, скористайтеся сторінкою "
"довідника (man))\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2500,11 -1936,9 +2512,11 @@@ msgstr "
" --list-keys [назви] показати ключі\n"
" --fingerprint [назви] показати відбитки\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "Використання: @GPG@ [параметри] [файли] (-h — довідка)"
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2514,7 -1948,6 +2526,7 @@@ msgstr "
"Підписування, перевірка підписів, шифрування або розшифрування\n"
"Типова дія залежатиме від вхідних даних\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2522,76 -1955,61 +2534,76 @@@ msgstr "
"\n"
"Підтримувані алгоритми:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "Відкритий ключ: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "Шифр: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "Хеш: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "Стиснення: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "користування: %s [параметри] %s\n"
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "несумісні команди\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "у визначенні групи «%s» немає знаку «=»\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1524
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1527
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1530
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "УВАГА: визначення власника додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1536
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1539
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1542
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "УВАГА: визначення прав доступу до додатка «%s» не є безпечним\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1548
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1551
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@@ -2599,21 -2017,18 +2611,21 @@@ msgstr "
"УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1560
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
"«%s» не є безпечним\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1563
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@@ -2621,530 -2036,418 +2633,535 @@@ msgstr "
"УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу у додатку «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1773
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "невідомий пункт налаштувань «%s»\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr "показувати фотоідентифікатори у списках ключів"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
msgid "show key usage information during key listings"
msgstr "показувати дані щодо використання ключа у списках ключів"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
msgid "show policy URLs during signature listings"
msgstr "показувати адреси правил у списках підписів"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "показувати всі примітки у списках підписів"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "показувати стандартні примітки IETF у списках підписів"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "показувати примітки користувача у списках підписів"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
msgid "show preferred keyserver URLs during signature listings"
msgstr "показувати адреси основних серверів ключів у списках підписів"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"ключів"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr "показувати відкликані та застарілі підключі у списках ключів"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
msgid "show the keyring name in key listings"
msgstr "показувати назву сховища ключів у списках ключів"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
msgstr "показувати дати завершення строків дії у списку підписів"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
msgid "available TOFU policies:\n"
msgstr "можливі варіанти правил TOFU:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, c-format
msgid "unknown TOFU policy '%s'\n"
msgstr "невідомі правила TOFU «%s»\n"
- #: g10/gpg.c:2002 g10/gpg.c:2026
++#: g10/gpg.c:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr "(команда «help» виводить список можливих варіантів)\n"
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "невідомий формат бази даних TOFU «%s»\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
- #: g10/gpg.c:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt занадто стара (потрібна — %s, маємо %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: g10/gpg.c:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "некоректний режим pinentry, «%s»\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "«%s» не є коректним набором символів\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "не вдалося обробити адресу сервера ключів\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: некоректні параметри сервера ключів\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "некоректні параметри сервера ключів\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: некоректні параметри імпортування\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "некоректні параметри імпортування\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, c-format
+ msgid "invalid filter option: %s\n"
+ msgstr "некоректний параметр фільтрування: %s\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: некоректні параметри експортування\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "некоректні параметри експортування\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: некоректні параметри побудови списку\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "некоректні параметри побудови списку\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "показувати фотоідентифікатори під час перевірки підписів"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "показувати адреси правил під час перевірки підписів"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "показувати всі примітки під час перевірки підписів"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "показувати стандартні примітки IETF під час перевірки підписів"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "показувати вказані користувачем примітки під час перевірки підписів"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"показувати адреси основних серверів ключів у списках перевірки підписів"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr ""
"показувати чинність ідентифікаторів користувача під час перевірки підписів"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"перевірки підписів"
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
msgstr ""
"показувати лише основний ідентифікатор користувача під час перевірки підписів"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "перевірити підписи за допомогою даних PKA"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "підняти рівень довіри до підписів з коректними даними PKA"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: некоректні параметри перевірки\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "некоректні параметри перевірки\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не вдалося встановити шлях для запуску у значення %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: некоректний список auto-key-locate\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "некоректний список auto-key-locate\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "УВАГА: %s перевизначає %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не можна використовувати разом з %s!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s є зайвим, якщо використано %s!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "УВАГА: запущено з фіктивним системним часом: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "вибраний алгоритм шифрування є некоректним\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "вибраний алгоритм стискання є некоректним\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "значення completes-needed має бути більшим за 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "значення marginals-needed має перевищувати 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
- #: g10/gpg.c:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3604
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
"S2K (0)\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3608
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
- #: g10/gpg.c:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "некоректні типові параметри\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "некоректні особисті параметри шифрування\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "некоректні особисті параметри контрольної суми\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "некоректні особисті параметри стискання\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ще не може працювати разом з %s\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
- #: g10/gpg.c:3642
++#: g10/gpg.c:3715
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr ""
"не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
"%s\n"
- #: g10/gpg.c:3647
++#: g10/gpg.c:3720
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
"ключем\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [назва файла]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [назва файла]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [назва файла]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [назва файла]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
"mode 0\n"
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
- #: g10/gpg.c:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [назва файла]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [назва файла]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [назва файла]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
"s2k-mode 0\n"
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
"%s\n"
- #: g10/gpg.c:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва файла]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [назва файла]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [назва файла]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [команди]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd <ідентифікатор-користувача>"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "помилка під час спроби експортування ключа: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, c-format
msgid "export as ssh key failed: %s\n"
msgstr "спроба експортування ключа ssh зазнала невдачі: %s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "помилка пошуку на сервері ключів: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "помилка оновлення з сервера ключів: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "помилка перетворення з формату ASCII: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "помилка перетворення у формат ASCII: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "некоректний алгоритм хешування «%s»\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "помилка під час спроби обробки специфікації ключа «%s»: %s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[назва файла]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "Почніть вводити ваше повідомлення...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "вказана адреса правил сертифікації є некоректною\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "вказана адреса правил підписування є некоректною\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "вказана адреса основного сервера ключів є некоректною\n"
+#: g10/gpgv.c:75
msgid "|FILE|take the keys from the keyring FILE"
- msgstr "визначити ключі з файла сховища ключів ФАЙЛ"
+ msgstr "|FILE|визначити ключі з файла сховища ключів ФАЙЛ"
+#: g10/gpgv.c:77
msgid "make timestamp conflicts only a warning"
msgstr "супроводжувати конфлікти часових позначок лише попередженнями"
+#: g10/gpgv.c:79 sm/gpgsm.c:343
msgid "|FD|write status info to this FD"
- msgstr "записувати до дескриптора файла дані щодо стану"
+ msgstr "|FD|записувати до дескриптора файла дані щодо стану"
+#: g10/gpgv.c:83
msgid "|ALGO|reject signatures made with ALGO"
- msgstr ""
+ msgstr "|ALGO|відкидати підписи, створені за допомогою алгоритму ALGO"
+#: g10/gpgv.c:120
msgid "Usage: gpgv [options] [files] (-h for help)"
msgstr "Використання: gpgv [параметри] [файли] (-h — довідка)"
@@@ -3165,125 -2465,105 +3182,133 @@@ msgstr "Довідки не перед�
msgid "No help available for '%s'"
msgstr "Довідки щодо %s не виявлено"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "імпортувати підписи, позначені як лише локальні"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "відновлювати пошкодження сервером ключів pks під час імпортування"
- #: g10/import.c:110
++#: g10/import.c:140
msgid "do not clear the ownertrust values during import"
msgstr "не вилучати значень власної довіри під час імпортування"
- #: g10/import.c:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "не оновлювати базу даних довіри після імпортування"
- #: g10/import.c:116
++#: g10/import.c:146
+ msgid "show key during import"
+ msgstr "показувати ключ під час імпортування"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "приймати оновлення лише вже створених ключів"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "вилучити невикористані частини ключа після імпортування"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr "вилучити максимум частин з ключа після імпортування"
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr "запустити фільтри імпортування та експортувати ключ негайно"
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "пропускаємо блок типу %d\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "оброблено %lu ключів\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "Загалом оброблено: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, c-format
msgid " skipped PGP-2 keys: %lu\n"
msgstr " пропущено ключів PGP-2: %lu\n"
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr "пропущено нових ключів: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " без ід. користувача: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " імпортовано: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " без змін: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr "нових ід. користувачів: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " нових підключів: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " нових підписів: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr "відкликань нових ключів: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr "прочитано закритих ключів: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr "імпортовано закр. ключів: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " закр. ключів без змін: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " не імпортовано: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " вилучених підписів: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " вилучених ід. корист.: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
@@@ -3292,196 -2572,152 +3317,190 @@@ msgstr "
"УВАГА: у ключі %s містяться записи надання переваги\n"
"недоступним алгоритмам для таких ід. користувачів:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " «%s»: перевага алгоритму шифрування %s\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " «%s»: перевага алгоритму контрольних сум %s\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " «%s»: перевага алгоритму стискання %s\n"
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "наполегливо рекомендуємо вам оновити записи переваг і\n"
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr ""
"повторно поширити цей ключ, щоб уникнути потенційних проблем з алгоритмами\n"
- #: g10/import.c:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "ключ %s: немає ідентифікатор користувача\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, c-format
msgid "key %s: %s\n"
msgstr "ключ %s: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr "відкинуто екранувальником імпорту"
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "ключ %s: відновлено пошкоджений підключ PKS\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "ключ %s: прийнято несамопідписаний ідентифікатор користувача «%s»\n"
- #: g10/import.c:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "ключ %s: немає чинних ідентифікаторів користувача\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "причиною цього може бути те, що немає самопідпису\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "ключ %s: новий ключ — пропущено\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "не виявлено придатного до запису сховища ключів: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr "записуємо до «%s»\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "помилка під час спроби запису сховища ключів «%s»: %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "ключ %s: не відповідає нашій копії\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "ключ %s: не вдалося знайти початковий блок ключів: %s\n"
- #: g10/import.c:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "ключ %s: не вдалося прочитати початковий блок ключів: %s\n"
- #: g10/import.c:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "ключ %s: «%s» 1 новий ідентифікатор користувача\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "ключ %s: «%s» %d нових ідентифікаторів користувачів\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "ключ %s: «%s» 1 новий підпис\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "ключ %s: «%s» %d нових підписів\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "ключ %s: «%s» 1 новий підключ\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "ключ %s: «%s» %d нових підключів\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підпис\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "ключ %s: «%s» вилучено %d підписів\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікатор користувача\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "ключ %s: «%s» спорожнено %d ідентифікаторів користувачів\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: «%s» не змінено\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "ключ %s: імпортовано закритий ключ\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "ключ %s: закритий ключ вже існує\n"
- #: g10/import.c:1578
++#: g10/import.c:1866
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "ключ %s: помилка під час спроби надсилання агенту: %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, c-format
msgid "secret key %s: %s\n"
msgstr "закритий ключ %s: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "імпортування закритих ключів заборонено\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "ключ %s: закритий ключ з некоректним шифром %d — пропущено\n"
@@@ -3496,143 -2732,116 +3515,143 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
"Для перенесення «%s» на кожній із карток пам’яті слід виконати таку команду: "
"%s\n"
- #: g10/import.c:1848
++#: g10/import.c:2133
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr ""
"ключ %s: немає відкритого ключа — не можна застосовувати сертифікат "
"відкликання\n"
- #: g10/import.c:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — відкинуто\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "ключ %s: імпортовано сертифікат відкликання «%s»\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "ключ %s: немає ідентифікатор користувача для підпису\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr ""
"ключ %s: непідтримуваний алгоритм створення відкритого ключа для "
"ідентифікатора користувача «%s»\n"
- #: g10/import.c:2025
++#: g10/import.c:2310
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "ключ %s: некоректний самопідпис для ідентифікатора користувача «%s»\n"
- #: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "ключ %s: непідтримуваний алгоритм створення відкритого ключа\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "ключ %s: некоректний безпосередній підпис ключа\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "ключ %s: немає підключа для зв’язування ключів\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "ключ %s: некоректне зв’язування підключів\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "ключ %s: вилучено кратне зв’язування підключів\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "ключ %s: немає підключа для відкликання ключа\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "ключ %s: некоректне відкликання підключа\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "ключ %s: вилучено кратне відкликання підключа\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "ключ %s: пропущено ідентифікатор користувача «%s»\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "ключ %s: пропущено підключ\n"
- #: g10/import.c:2233
++#: g10/import.c:2516
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "ключ %s: непридатний до експорту підпис (клас 0x%02X) — пропущено\n"
- #: g10/import.c:2244
++#: g10/import.c:2527
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "ключ %s: сертифікат відкликання у помилковому місці — пропущено\n"
- #: g10/import.c:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "ключ %s: некоректний сертифікат відкликання: %s — пропущено\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "ключ %s: підпис підключа у помилковому місці — пропущено\n"
- #: g10/import.c:2284
++#: g10/import.c:2567
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "ключ %s: неочікуваний клас підпису (0x%02X) — пропущено\n"
- #: g10/import.c:2413
++#: g10/import.c:2696
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "ключ %s: виявлено дублювання ідентифікаторів користувача — об’єднано\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "УВАГА: ключ %s могло бути відкликано: отримуємо ключ відкликання %s\n"
- #: g10/import.c:2493
++#: g10/import.c:2776
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "УВАГА: ключ %s могло бути відкликано: ключа відкликання %s немає.\n"
- #: g10/import.c:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "ключ %s: додано сертифікат відкликання «%s»\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "ключ %s: додано безпосередній підпис ключа\n"
@@@ -3667,27 -2870,22 +3686,27 @@@ msgstr "ресурс блоку клю�
msgid "error opening key DB: %s\n"
msgstr "помилка під час спроби відкрити базу даних ключів: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "не вдалося перебудувати кеш сховища ключів: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[revocation]"
msgstr "[відкликання]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[самопідпис]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, c-format
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr ""
"неможливо перевірити підпис із непідтримуваним алгоритмом створення "
"відкритого ключа (%d): %s.\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, c-format
msgid ""
"can't check signature with unsupported message-digest algorithm %d: %s.\n"
@@@ -3695,16 -2893,13 +3714,16 @@@ msgstr "
"неможливо перевірити підпис із непідтримуваним алгоритмом створення "
"контрольної суми %d: %s.\n"
- #: g10/keyedit.c:786
++#: g10/keyedit.c:789
msgid " (reordered signatures follow)"
msgstr " (нижче наведено перевпорядковані підписи)"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, c-format
msgid "key %s:\n"
msgstr "ключ %s:\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, c-format
msgid "%d duplicate signature removed\n"
msgid_plural "%d duplicate signatures removed\n"
@@@ -3712,7 -2907,6 +3731,7 @@@ msgstr[0] "вилучено %d дубл
msgstr[1] "вилучено %d дублікати підписів\n"
msgstr[2] "вилучено %d дублікатів підписів\n"
- #: g10/keyedit.c:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, c-format
msgid "%d signature not checked due to a missing key\n"
msgid_plural "%d signatures not checked due to missing keys\n"
@@@ -3720,7 -2914,6 +3739,7 @@@ msgstr[0] "%d підпис не пер�
msgstr[1] "%d підписи не перевірено через те, що немає ключа\n"
msgstr[2] "%d підписів не перевірено через те, що немає ключа\n"
- #: g10/keyedit.c:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, c-format
msgid "%d bad signature\n"
msgid_plural "%d bad signatures\n"
@@@ -3728,7 -2921,6 +3747,7 @@@ msgstr[0] "%d помилкових пі
msgstr[1] "%d помилкових підписи\n"
msgstr[2] "%d помилкових підписів\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
@@@ -3736,7 -2928,6 +3755,7 @@@ msgstr[0] "перевпорядкова
msgstr[1] "перевпорядковано %d підписи\n"
msgstr[2] "перевпорядковано %d підписів\n"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
@@@ -3745,7 -2936,6 +3764,7 @@@ msgstr "
"Попередження: виявлено помилки, перевірка виконувалася лише для "
"самопідписування, віддайте команду «%s», щоб перевірити усі підписи.\n"
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3756,17 -2946,14 +3775,17 @@@ msgstr "
"ключів інших\n"
"користувачів (за паспортами, відбитками з інших джерел тощо)\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = Я довіряю не повністю\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = Я довіряю повністю\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3776,52 -2963,40 +3795,52 @@@ msgstr "
"Глибина, більша за 1, дозволяє ключу, який ви підписуєте, створювати\n"
"надійні підписи від вашого імені.\n"
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr ""
"Будь ласка, вкажіть домен обмеження цього підпису або натисніть Enter, якщо "
"такого домену немає.\n"
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr "Пропускаємо ідентифікатор користувача «%s», який не є текстовим.\n"
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "Ідентифікатор користувача «%s» відкликано."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "Ви певні, що все ще бажаєте підписати його? (y/N або т/Н) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " Неможливо підписати.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "Строк дії ідентифікатор користувача «%s» сплив."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "Ідентифікатор користувача «%s» не є самопідписаним."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "Ідентифікатор користувача «%s» можна підписувати. "
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "Підписати його? (y/N або т/Н) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3830,12 -3005,10 +3849,12 @@@ msgstr "
"Самопідпис «%s»\n"
"є підписом у форматі PGP 2.x.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr ""
"Бажаєте розширити сферу використання до самопідпису OpenPGP? (y/N або т/Н) "
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3844,11 -3017,9 +3863,11 @@@ msgstr "
"Строк дії вашого поточного підпису «%s»\n"
"завершено.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "Бажаєте видати новий підпис для заміни застарілого? (y/N або т/Н) "
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3857,45 -3028,36 +3876,45 @@@ msgstr "
"Ваш поточний підпис «%s»\n"
"є локальним підписом.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr ""
"Бажаєте розширити сферу використання до повністю експортованого підпису? (y/"
"N або т/Н) "
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "«%s» вже було локально підписано ключем %s\n"
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "«%s» вже було підписано ключем %s\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "Бажаєте підписати його попри все? (y/N або т/Н) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "Нічого підписувати ключем %s\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "Строк дії цього ключа вичерпано!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "Строк дії цього ключа завершиться %s.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "Бажаєте, щоб строк дії вашого підпису був таким самим? (Y/n або Т/н) "
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3906,261 -3068,201 +3925,261 @@@ msgstr "
"справді належить особі, ім’я якої вказано вище? Якщо ви не знаєте відповіді, "
"введіть «0».\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) Не буду відповідати.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) Мною не виконувалося ніяких перевірок.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) Мною виконано часткову перевірку.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) Мною виконано ретельну перевірку.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
msgid "Your selection? (enter '?' for more information): "
msgstr "Ваш вибір? (введіть «?», щоб дізнатися більше): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
"key \"%s\" (%s)\n"
msgstr "Ви справді бажаєте підписати цей ключ вашим ключем «%s» (%s)\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "Це буде самопідпис.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "УВАГА: підпис не буде позначено як непридатний до експортування.\n"
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "УВАГА: підпис не буде позначено як непридатний до відкликання.\n"
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "Підпис буде позначено як непридатний до експортування.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "Підпис буде позначено як непридатний до відкликання.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "Цей ключ не перевірявся мною.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "Цей ключ перевірено мною частково.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "Цей ключ ретельно перевірено мною.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "Підписати? (y/N або т/Н) "
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "помилка під час спроби підписування: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr ""
"До ключа включено лише типовий заповнювач або записи ключа з картки — ніяких "
"паролів не потрібно змінювати.\n"
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "ключ %s: помилка під час спроби зміни пароля: %s\n"
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "зберегти і вийти"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "показати відбиток ключа"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
msgid "show the keygrip"
msgstr "показати keygrip"
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "показати список ключів та ідентифікаторів користувача"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "вибрати вказаний ідентифікатор користувача"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "вибрати вказаний підключ"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "перевірити підписи"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr ""
"підписати вибрані ідентифікатори користувачів [* нижче наведено відповідні "
"команди]"
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "підписати вибрані ідентифікатори користувача локально"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "підписати вибрані ідентифікатори користувача підписом надійності"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr ""
"підписати вибрані ідентифікатори користувача підписом, який не можна "
"відкликати"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "додати ідентифікатор користувача"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "додати фотоідентифікатор"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "вилучити вибрані ідентифікатори користувача"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "додати підключ"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "додати ключ на картку пам’яті"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "пересунути ключ на картку пам’яті"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "пересунути резервний ключ на картку пам’яті"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "вилучити вибрані підключі"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "додати ключ відкликання"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "вилучити підписи з вибраних ідентифікаторів користувача"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
msgstr "змінити дату завершення строку дії ключа або вибраних ключів"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "позначити вибраний ідентифікатор користувача як основний"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "список переваг (експертний)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "список переваг (докладний)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "встановити список параметрів для вибраних ідентифікаторів користувачів"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr ""
"встановити адресу основного сервера ключів для вибраних ідентифікаторів "
"користувачів"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "встановити примітку для вибраного ідентифікатора користувача"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "змінити пароль"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "змінити рівень довіри до власника"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "відкликати підписи для вибраних ідентифікаторів користувачів"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "відкликати вибрані ідентифікатори користувачів"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "відкликати ключ або вибрані підключі"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "увімкнути ключ"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "вимкнути ключ"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "показати вибрані фотоідентифікатори"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
"ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
"невикористані підписи з ключа"
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
"ущільнити непридатні до використання ідентифікатори користувачів і вилучити "
"всі підписи з ключа"
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "Доступний закритий ключ.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "Для цього потрібен закритий ключ.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4171,253 -3273,199 +4190,258 @@@ msgstr "
" «t» для надійних підписів (tsign), «nr» для підписів без відкликання\n"
" (nrsign) або будь-яку комбінацію (ltsign, tnrsign тощо).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "Ключ відкликано."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "Підписати всі ідентифікатори користувача? (y/N або т/Н) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
msgid "Really sign all text user IDs? (y/N) "
msgstr "Підписати всі текстові ідентифікатори користувача? (y/N або т/Н) "
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "Підказка: виберіть ідентифікатори користувача для підписування\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "Невідомий тип підпису «%s»\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "Цією командою не можна користуватися у режимі %s.\n"
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "Вам слід вибрати принаймні один ідентифікатор користувача.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr "(Скористайтеся командою «%s».)\n"
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "Не можна вилучати останній ідентифікатор користувача!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr "Вилучити всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "Вилучити основний ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "Вам слід вибрати лише один ключ.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "Для команди слід вказати аргумент з назвою файла\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "Не вдалося відкрити «%s»: %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "Помилка читання резервного ключа з «%s»: %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "Вам слід вибрати принаймні один ключ.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/Н) "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "Справді бажаєте вилучити цей ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "Відкликати всі вибрані ідентифікатори користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "Відкликати цей ідентифікатор користувача? (y/N або т/Н) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "Ви справді бажаєте відкликати весь ключ? (y/N або т/Н) "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "Ви справді бажаєте відкликати позначені підключі? (y/N або т/Н) "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "Ви справді бажаєте відкликати цей підключ? (y/N або т/Н) "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr ""
"Не можна встановлювати довіру до власника, якщо використовується вказана "
"користувачем база даних довіри\n"
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "Встановити список переваг:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr ""
"Оновити переваги для вибраних ідентифікаторів користувачів? (y/N або т/Н) "
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "Оновити параметри? (y/N або т/Н) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "Зберегти зміни? (y/N або т/Н) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "Вийти без збереження? (y/N або т/Н) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "помилка оновлення: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не змінено, отже оновлення непотрібне.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, c-format
+ msgid "User ID revocation failed: %s\n"
+ msgstr "Спроба відкликання ідентифікатор користувача зазнала невдачі: %s\n"
+
++#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "«%s» не є відбитком\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "«%s» не є основним відбитком\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, c-format
msgid "Invalid user ID '%s': %s\n"
msgstr "Некоректний ідентифікатор користувача «%s»: %s\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "No matching user IDs."
msgstr "Немає відповідних ідентифікаторів користувачів."
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "Nothing to sign.\n"
msgstr "Нічого підписувати.\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "Контрольна сума: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "Можливості: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "Сервер ключів без можливості зміни"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "Основний сервер ключів: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "Примітки: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr ""
"Переваг для ідентифікаторів користувачів у форматі PGP 2.x не передбачено.\n"
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "Цей ключ може бути відкликано %s ключем %s"
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(важливий)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "створено: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "відкликано: %s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "не діє з: %s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "діє до: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "використання: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "номер картки: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "надійність: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "чинність: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "Цей ключ було вимкнено"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4425,17 -3473,12 +4449,17 @@@ msgstr "
"Зауважте, що показані дані щодо чинності ключів не обов’язково є коректними\n"
"до перезапуску програми.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "відкликано"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "збіг строк дії"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4445,15 -3488,12 +4469,15 @@@ msgstr "
" цієї команди можна зробити основним інший ідентифікатор "
"користувача.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "УВАГА: строк дії вашого підключа імпортування невдовзі завершиться.\n"
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
msgid "You may want to change its expiration date too.\n"
msgstr "Ймовірно, вам варто змінити також і його строк дії.\n"
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4463,35 -3503,27 +4487,35 @@@ msgstr "
"до відмови\n"
" у використанні цього ключа деякими версіями PGP.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "Ви справді бажаєте додати його? (y/N або т/Н) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "Не можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr "У цьому ключі вже існує такий ідентифікатор користувача!\n"
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "Вилучити цей дійсний підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "Вилучити цей некоректний підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "Вилучити цей невідомий підпис? (y/N/q або т/Н/в)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "Вилучити цей самопідпис? (y/N або т/Н)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, c-format
msgid "Deleted %d signature.\n"
msgid_plural "Deleted %d signatures.\n"
@@@ -4499,20 -3531,16 +4523,20 @@@ msgstr[0] "Вилучено %d підп
msgstr[1] "Вилучено %d підписи.\n"
msgstr[2] "Вилучено %d підписів.\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "Нічого не вилучено.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "некоректний"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "Ідентифікатор користувача «%s» ущільнено: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgid_plural "User ID \"%s\": %d signatures removed\n"
@@@ -4520,17 -3548,14 +4544,17 @@@ msgstr[0] "Ідентифікатор �
msgstr[1] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
msgstr[2] "Ідентифікатор користувача «%s»: вилучено %d підписів\n"
- #: g10/keyedit.c:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "Ідентифікатор користувача «%s»: вже мінімізовано\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "Ідентифікатор користувача «%s»: вже очищено\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4540,39 -3565,31 +4564,39 @@@ msgstr "
"призвести до відмови\n"
" у використанні цього ключа деякими версіями PGP.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "Не можна додавати підписане відкликання до ключа у форматі PGP 2.x.\n"
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "Вкажіть ідентифікатор користувача підписаного відкликання: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "не можна призначати ключ у форматі PGP 2.x підписаним відкликанням\n"
- #: g10/keyedit.c:4535
++#: g10/keyedit.c:4642
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "не можна призначати ключ власним підписаним відкликанням\n"
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
msgid "this key has already been designated as a revoker\n"
msgstr "цей ключ вже було позначено як призначений для відкликання\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr ""
"УВАГА: призначення ключа як підписаного відкликання не можна скасовувати!\n"
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr ""
"Ви справді бажаєте призначити цей ключ як підписане відкликання? (y/N або т/"
"Н) "
- #: g10/keyedit.c:4632
++#: g10/keyedit.c:4739
msgid ""
"Are you sure you want to change the expiration time for multiple subkeys? (y/"
"N) "
@@@ -4580,159 -3597,129 +4604,164 @@@ msgstr "
"Ви справді хочете змінити час вичерпання строку дії для декількох підключів? "
"(y/N або т/Н) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "Зміна часу завершення строку дії для підключа.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "Зміна часу завершення строку дії для основного ключа.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Не можна змінювати дату завершення строку дії ключа v3\n"
- #: g10/keyedit.c:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "підписування підключа %s вже перехресно сертифіковано\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr ""
"підключ %s не призначено для підписування, отже його не потрібно перехресно "
"сертифікувати\n"
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "Будь ласка, виберіть лише один ідентифікатор користувача.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "пропускаємо самопідпис v3 для ідентифікатора користувача «%s»\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "Вкажіть адресу вашого основного сервера ключів: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
msgstr "Ви справді бажаєте замінити його? (y/N або т/Н) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "Ви справді бажаєте вилучити його? (y/N або т/Н) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "Вкажіть примітку: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "Продовжувати? (y/N або т/Н) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "Ідентифікатора користувача з індексом %d не існує\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "Ідентифікатора користувача з хешем %s не існує\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, c-format
msgid "No subkey with key ID '%s'.\n"
msgstr "Піключа із ідентифікатором ключа «%s» не існує.\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "Підключа з індексом %d не існує\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "Ідентифікатор користувача: «%s»\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "підписано вашим ключем %s %s%s%s\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (неекспортовний)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "Строк дії цього підпису завершується %s.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "Ви справді бажаєте відкликати його? (y/N або т/Н) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "Створити сертифікат відкликання для цього підпису? (y/N або т/Н) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "Не підписано вами.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "Вами підписано ці ідентифікатори користувачів у ключі %s:\n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (невідкликуваний)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "відкликано вашим ключем %s у %s\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "Ви маєте намір відкликати ці підписи:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "Справді створити сертифікати відкликання? (y/N або т/Н) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "немає закритого ключа\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr "спроба відкликати ідентифікатор, який не належить користувачеві: %s\n"
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ідентифікатор користувача «%s» вже відкликано\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr ""
"УВАГА: підпис ідентифікатора користувача позначено датою на %d секунд у "
"майбутньому\n"
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "Ключ %s вже відкликано.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "Підключ %s вже відкликано.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "Показ фотоідентифікатора %s розміру %ld для ключа %s (uid %d)\n"
@@@ -5173,13 -4082,10 +5202,13 @@@ msgstr "
"під час створення простого числа. Це надасть змогу генератору\n"
"псевдовипадкових чисел створити краще випадкове число.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "Помилка під час спроби створення ключа: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5190,64 -4096,51 +5219,64 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr "Продовжити? (Y (так)/n (ні)) "
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "Ключ для «%s» вже існує\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
msgid "Create anyway? (y/N) "
msgstr "Створити попри це? (y (так)/N (ні)) "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
msgid "creating anyway\n"
msgstr "створюємо попри усе\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
"Зауваження: скористайтеся «%s %s», щоб викликати повноцінне діалогове вікно "
"створення ключа.\n"
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "Створення ключа скасовано.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "не вдалося створити файл резервної копії «%s»: %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "ЗАУВАЖЕННЯ: резервну копію ключа на картці збережено до «%s»\n"
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, c-format
msgid "writing public key to '%s'\n"
msgstr "записуємо відкритий ключ до «%s»\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "не знайдено придатного до запису сховища відкритих ключів: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "помилка під час спроби запису до сховища відкритих ключів «%s»: %s\n"
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "відкритий і закритий ключі створено і підписано.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5255,7 -4148,6 +5284,7 @@@ msgstr "
"Зауважте, що цей ключ не може бути використано для шифрування. Ви можете\n"
"скористатися командою «--edit-key» для створення підключа з цією метою.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
@@@ -5263,7 -4155,6 +5292,7 @@@ msgstr "
"ключ було створено з позначкою на %lu секунд у майбутньому (часова петля або "
"проблема з годинником)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
@@@ -5271,47 -4162,36 +5300,47 @@@ msgstr "
"ключ було створено з позначкою на %lu секунду у майбутньому (часова петля "
"або проблема з годинником)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "ЗАУВАЖЕННЯ: створення підключів для ключів v3 несумісне з OpenPGP\n"
- #: g10/keygen.c:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "Закриті частини основного ключа недоступні.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "Закриті частини основного ключа зберігаються на картці.\n"
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "Створити? (y/N або т/Н) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "ніколи "
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "Критичні правила підпису: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "Правила підпису: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "Критичний основний сервер ключів: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "Критична примітка підпису: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "Примітка підпису: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, c-format
msgid "%d good signature\n"
msgid_plural "%d good signatures\n"
@@@ -5319,7 -4199,6 +5348,7 @@@ msgstr[0] "%d добрий підпис
msgstr[1] "%d добрих підписи\n"
msgstr[2] "%d добрих підписів\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, c-format
msgid "%d signature not checked due to an error\n"
msgid_plural "%d signatures not checked due to errors\n"
@@@ -5327,7 -4206,6 +5356,7 @@@ msgstr[0] "%d підпис не пер�
msgstr[1] "%d підписи не перевірено через помилку\n"
msgstr[2] "%d підписів не перевірено через помилку\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
@@@ -5337,38 -4215,26 +5366,33 @@@ msgstr[1] "
msgstr[2] ""
"Попередження: %lu ключів пропущено через їхній надто великий розмір\n"
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "Сховище ключів"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "Основний відбиток ключа:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " Відбиток підключа:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr "Відбиток основного ключа:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " Відбиток підключа:"
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " Відбиток ключа ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr "Серійний номер картки ="
@@@ -5435,25 -4289,20 +5459,25 @@@ msgid "honor the PKA record set on a ke
msgstr ""
"брати до уваги запис PKA, встановлений у ключі під час отримання ключів"
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "вимкнено"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "Вкажіть номер, далі (N) чи вийти (Q) > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "некоректний протокол сервера ключів (наш %d!=%d обробника)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "«%s» не є ідентифікатором ключа: пропускаємо\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, c-format
msgid "refreshing %d key from %s\n"
msgid_plural "refreshing %d keys from %s\n"
@@@ -5461,267 -4310,215 +5485,272 @@@ msgstr[0] "оновлюємо %d клю
msgstr[1] "оновлюємо %d ключі з %s\n"
msgstr[2] "оновлюємо %d ключів з %s\n"
- #: g10/keyserver.c:1424
++#: g10/keyserver.c:1426
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "УВАГА: не вдалося оновити ключ %s за допомогою %s: %s\n"
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "ключ «%s» не знайдено на сервері ключів\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "ключ не знайдено на сервері ключів\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr ""
"не вказано жодного сервера ключів (скористайтеся параметром --keyserver)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "надсилаємо запит щодо ключа %s до %s сервера %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "надсилаємо запит щодо ключа %s з %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
msgid "no keyserver known\n"
msgstr "немає відомих серверів ключів\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "пропущено «%s»: %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "надсилаємо ключ %s на %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, c-format
msgid "requesting key from '%s'\n"
msgstr "надсилаємо запит щодо ключа з «%s»\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "УВАГА: не вдалося отримати адресу %s: %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "дивний розмір для зашифрованого ключа сеансу (%d)\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "зашифрований %s ключ сеансу\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr ""
"пароль створено за допомогою невідомого алгоритму створення контрольних сум "
"%d\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "відкритий ключ — %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "зашифровані відкритим ключем дані: належний DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr ""
"зашифровано за допомогою %u-бітового %s ключа, ідентифікатор %s, створено "
"%s\n"
- #: g10/mainproc.c:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " «%s»\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "зашифровано ключем %s, ідентифікатор %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "невдала спроба розшифровування відкритим ключем: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "зашифровано за допомогою %lu паролів\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "зашифровано за допомогою 1 пароля\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "припускаємо, що дані зашифровано %s\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "Шифр IDEA недоступний, спробуємо скористатися замість нього %s\n"
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "УВАГА: цілісність повідомлення не захищено\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "розшифровано\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "УВАГА: зашифроване повідомлення було змінено!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "невдала спроба розшифрування: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "ЗАУВАЖЕННЯ: вимога відправника: «лише для Вас»\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "початкова назва файла=«%.*s»\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "УВАГА: виявлено декілька фрагментів нешифрованого тексту\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr ""
"окреме відкликання — скористайтеся командою «gpg --import» для застосування\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "підпису не знайдено\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "ПОМИЛКОВИЙ підпис від «%s»"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "Прострочений підпис від «%s»"
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "Належний підпис від «%s»"
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "перевірку підписів придушено\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "не вдалося обробити ці дані з неоднозначним підписом\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "Підпис створено %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " за допомогою %s ключа %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "Ключ доступний на: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[непевний]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " або «%s»"
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "Строк дії підпису вичерпано %s\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "Підпис діє до %s\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s підпис, алгоритм контрольної суми %s%s%s\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "двійковий"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "текстовий"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "невідомо"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
msgid ", key algorithm "
msgstr ", алгоритм ключа "
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr "УВАГА: не відє’днаний підпис; файл «%s» не було перевірено!\n"
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "Не вдалося перевірити підпис: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "не є від’єднаним підписом\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "УВАГА: виявлено кратні підписи. Буде перевірено лише перший.\n"
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "окремий підпис класу 0x%02x\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "підпис у застарілому форматі (PGP 2.x)\n"
@@@ -5897,7 -4660,6 +5926,7 @@@ msgstr "
"УВАГА: потенційно небезпечний зашифрований симетричним алгоритмом ключ "
"сеансу\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "підпакет типу %d містить критичний набір бітів\n"
@@@ -6258,46 -4952,37 +6287,46 @@@ msgstr "УВАГА: цей ключ н�
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " Певності у належності підпису його власнику немає.\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: пропущено: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: пропущено: відкритий ключ вимкнено\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: пропущено: відкритий ключ вже існує\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, c-format
msgid "can't encrypt to '%s'\n"
msgstr "не вдалося зашифрувати до «%s»\n"
- #: g10/pkclist.c:972
++#: g10/pkclist.c:984
#, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "вказано параметр «%s», але не вказано коректних типових ключів\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "вказано параметр «%s», але не вказано параметр «%s»\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr ""
"Вами не вказано ідентифікатора користувача. (можете скористатися «-r»)\n"
- #: g10/pkclist.c:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "Поточні отримувачі:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6305,37 -4990,29 +6334,37 @@@ msgstr "
"\n"
"Вкажіть ідентифікатор користувача. Дані слід завершити порожнім рядком: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "Немає такого ідентифікатора користувача.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "пропущено: відкритий ключ вже встановлено для типового отримувача\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "Відкритий ключ вимкнено.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "пропущено: відкритий ключ вже встановлено\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "невідомий типовий отримувач «%s»\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "немає коректних адрес\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "Зауваження: у ключі %s не передбачено можливості %s\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "Зауваження: у ключі %s не передбачено переваг для %s\n"
@@@ -6346,28 -5022,22 +6375,28 @@@ msgstr "
"дані не збережено; скористайтеся для їхнього збереження параметром «--"
"output»\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "Від’єднаний підпис.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "Будь ласка, вкажіть назву файла даних: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "читаємо дані з stdin...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "немає підписаних даних\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "не вдалося відкрити підписані дані «%s»\n"
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "не вдалося відкрити підписані дані fd=%d: %s\n"
@@@ -6627,7 -5252,6 +6656,7 @@@ msgstr[0] "відкритий ключ
msgstr[1] "відкритий ключ %s є на %lu дні новішим за підпис\n"
msgstr[2] "відкритий ключ %s є на %lu днів новішим за підпис\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6708,12 -5323,10 +6737,12 @@@ msgstr "
"УВАГА: не вдалося виконати %%-розгортання адреси основного сервера ключів "
"(занадто велика). Використовуємо нерозгорнутою.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s підпис від: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@@ -6721,11 -5334,9 +6750,11 @@@ msgstr "
"УВАГА: примусове використання алгоритму контрольних сум %s (%d) не "
"відповідає параметрам отримувача\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "підписування:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "Буде використано шифрування %s\n"
@@@ -6801,131 -5398,104 +6830,131 @@@ msgstr "помилка читання �
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: помилка синхронізації: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "не вдалося створити блокування для «%s»\n"
- #: g10/tdbio.c:145
++#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
msgstr "не вдалося заблокувати «%s»\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "запис trustdb %lu: помилка lseek: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "запис trustdb %lu: помилка запису (n=%d): %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "занадто велика операція trustdb\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: каталогу не існує!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "немає доступу до «%s»: %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: не вдалося створити запис щодо версії: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: створено некоректну trustdb\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: створено trustdb\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
msgstr "ЗАУВАЖЕННЯ: запис до trustdb заборонено\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: некоректна trustdb\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: не вдалося створити таблицю хешів: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: помилка оновлення запису версії: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: помилка читання запису версії: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: помилка записування запису версії: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: помилка lseek: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: помилка читання (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: не є файлом trustdb\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: запис версії з номером запису %lu\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: некоректна версія файла %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: помилка під час спроби читання вільного запису: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: помилка записування запису каталогу (dir): %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: не вдалося обнулити запис: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: не вдалося додати запис: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "Помилка: trustdb пошкоджено.\n"
@@@ -7335,7 -5843,6 +7364,7 @@@ msgstr "використовуємо м
msgid "no need for a trustdb check\n"
msgstr "потреби у перевірці trustdb немає\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "наступну перевірку trustdb призначено на %s\n"
@@@ -7350,7 -5855,6 +7379,7 @@@ msgstr "потреби у переві�
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "потреби у оновленні trustdb на основі моделі довіри «%s» немає\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "відкритий ключ %s не знайдено: %s\n"
@@@ -7363,7 -5865,6 +7392,7 @@@ msgstr "будь ласка, скори
msgid "checking the trustdb\n"
msgstr "перевірка trustdb\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, c-format
msgid "%d key processed"
msgid_plural "%d keys processed"
@@@ -7371,7 -5872,6 +7400,7 @@@ msgstr[0] "оброблено %d клю
msgstr[1] "оброблено %d ключі"
msgstr[2] "оброблено %d ключів"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, c-format
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
@@@ -7379,16 -5879,13 +7408,16 @@@ msgstr[0] " (очищено %d знач
msgstr[1] " (очищено %d значення чинності)\n"
msgstr[2] " (очищено %d значень чинності)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "не знайдено ключів з необмеженою довірою\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "не знайдено відкритий ключ ключа з необмеженою довірою %s\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@@ -7396,7 -5893,6 +7425,7 @@@ msgstr "
"глибина: %d чинність: %3d підписано: %3d надійність: %d-, %dq, %dn, %dm, "
"%df, %du\n"
- #: g10/trustdb.c:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "не вдалося оновити запис версії trustdb: помилка запису: %s\n"
@@@ -7449,13 -5935,9 +7478,11 @@@ msgstr "[невідома]
msgid "[ undef ]"
msgstr "[не визн.]"
+#: g10/trust.c:159
- #, fuzzy
- #| msgid "never"
msgid "[ never ]"
- msgstr "ніколи"
+ msgstr "[ ніколи ]"
+#: g10/trust.c:160
msgid "[marginal]"
msgstr "[неповна ]"
@@@ -7861,11 -6260,9 +7888,11 @@@ msgstr "заборонити викор
msgid "use variable length input for pinpad"
msgstr "використовувати змінну довжину вхідних даних для зчитувача"
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "Використання: @SCDAEMON@ [параметри] (-h — довідка)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7873,18 -6270,15 +7900,18 @@@ msgstr "
"Синтаксис: scdaemon [параметри] [команди [аргументи]]\n"
"Фонова служба карток пам’яті для @GNUPG@\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
"будь ласка, скористайтеся параметром «--daemon» для запуску програми у "
"фоновому режимі\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "запущено запуск обробки для дескриптора %d\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "роботу обробника для дескриптора %d перервано\n"
@@@ -7894,7 -6287,6 +7921,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "пропущено некоректний символ radix64 %02x\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
msgid "no dirmngr running in this session\n"
msgstr "у цьому сеансі не запущено dirmngr\n"
@@@ -8533,11 -6784,9 +8560,11 @@@ msgstr "перевіряти чинні
msgid "|N|number of certificates to include"
msgstr "кількість сертифікатів, які слід включити"
+#: sm/gpgsm.c:283
msgid "|FILE|take policy information from FILE"
- msgstr "взяти дані щодо правил з вказаного файла"
+ msgstr "|FILE|взяти дані щодо правил з вказаного файла"
+#: sm/gpgsm.c:286
msgid "do not check certificate policies"
msgstr "не перевіряти правила сертифікатів"
@@@ -8549,15 -6796,12 +8576,15 @@@ msgstr "Надіслати запит �
msgid "don't use the terminal at all"
msgstr "взагалі не використовувати термінал"
+#: sm/gpgsm.c:303
msgid "|FILE|write a server mode log to FILE"
- msgstr "записувати журнал режиму сервера до файла"
+ msgstr "|FILE|записувати журнал режиму сервера до файла"
+#: sm/gpgsm.c:308
msgid "|FILE|write an audit log to FILE"
- msgstr "записувати журнал перевірки до файла"
+ msgstr "|FILE|записувати журнал перевірки до файла"
+#: sm/gpgsm.c:311
msgid "batch mode: never ask"
msgstr "пакетний режим: нічого не запитувати"
@@@ -8569,11 -6811,9 +8596,11 @@@ msgstr "вважати відповід
msgid "assume no on most questions"
msgstr "вважати відповіддю на більшість питань «ні»"
+#: sm/gpgsm.c:316
msgid "|FILE|add keyring to the list of keyrings"
- msgstr "додати сховище ключів до списку сховищ ключів"
+ msgstr "|FILE|додати сховище ключів до списку сховищ ключів"
+#: sm/gpgsm.c:319
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
"|USER-ID|використовувати ідентифікатор користувача як типовий закритий ключ"
@@@ -9687,11 -7698,9 +9714,11 @@@ msgstr "|FPR|відповідь OCSP п
msgid "|N|do not return more than N items in one query"
msgstr "|N|повертати не більше за вказану кількість записів на запит"
+#: dirmngr/dirmngr.c:222
msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
- msgstr "|ФАЙЛ|використовувати сертифікати CA з файла ФАЙЛ для HKP крізь TLS"
+ msgstr "|FILE|використовувати сертифікати CA з файла для HKP крізь TLS"
+#: dirmngr/dirmngr.c:224
msgid "route all network traffic via Tor"
msgstr "маршрутизувати увесь обмін даними з мережею через Tor"
@@@ -9722,8 -7727,6 +9749,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "коректними рівнями зневаджування є: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, c-format
msgid "usage: %s [options] "
msgstr "використання: %s [параметри]"
@@@ -9732,12 -7734,10 +9759,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "не можна використовувати двокрапки у назві сокета\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "помилка під час спроби отримання CRL з «%s»: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "помилка під час обробки CRL з «%s»: %s\n"
@@@ -10215,76 -8113,60 +10242,76 @@@ msgstr "Відповідачем OCSP �
msgid "OCSP responder returned an too old status\n"
msgstr "Відповідачем OCSP повернуто занадто застарілі дані щодо стану\n"
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "помилка assuan_inquire(%s): %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr "не вказано ldapserver"
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr "у ідентифікаторі сертифіката немає серійного номера"
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "помилка assuan_inquire: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "помилка fetch_cert_by_url: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, c-format
msgid "error sending data: %s\n"
msgstr "помилка під час спроби надсилання даних: %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "помилка start_cert_fetch: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "помилка fetch_next_cert: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "перевищено max_replies у %d\n"
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "не вдалося розмістити структуру керування: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "не вдалося розмістити контекст assuan: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "не вдалося ініціалізувати сервер: %s\n"
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "не вдалося зареєструвати команди за допомогою Assuan: %s\n"
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "проблема з прийняттям Assuan: %s\n"
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "помилка обробки за допомогою Assuan: %s\n"
@@@ -10419,7 -8271,6 +10446,7 @@@ msgstr "невідома команд�
msgid "sending line failed: %s\n"
msgstr "помилка надсилання рядка: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "помилка під час спроби надсилання стандартних параметрів: %s\n"
@@@ -10665,15 -8455,12 +10692,15 @@@ msgstr "
"Синтаксис: @GPGCONF@ [параметри]\n"
"Керування параметрами налаштування інструментів системи @GNUPG@\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "Слід вказати один аргумент компонента"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "Компонент не знайдено"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "Не можна вказувати аргументів"
diff --cc po/zh_CN.po
index ce170e3,41613c7..5365c98
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+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"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, fuzzy, c-format
#| msgid "can't open `%s': %s\n"
msgid "can't open '%s': %s\n"
@@@ -414,10 -328,6 +414,10 @@@ msgstr "
msgid "run in server mode (foreground)"
msgstr ""
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "详细模式"
@@@ -525,11 -410,6 +525,11 @@@ msgstr "未被支持
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
"请向 <@EMAIL@> 报告程序缺陷。\n"
@@@ -546,55 -424,38 +546,55 @@@ msgid "
"Secret key management for @GNUPG@\n"
msgstr ""
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr ""
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, fuzzy, c-format
#| msgid "NOTE: no default option file `%s'\n"
msgid "Note: no default option file '%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, fuzzy, c-format
#| msgid "option file `%s': %s\n"
msgid "option file '%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, fuzzy, c-format
#| msgid "reading options from `%s'\n"
msgid "reading options from '%s'\n"
msgstr "从‘%s’读取选项\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, fuzzy, c-format
#| msgid "WARNING: \"%s\" is a deprecated option\n"
msgid "Note: '%s' is not considered an option\n"
msgstr "警告:“%s”选项已不建议使用\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’:%s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr ""
@@@ -604,28 -464,22 +604,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "获取新 PIN 时出错:%s\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, fuzzy, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
msgid "can't set permissions of '%s': %s\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败:%s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, fuzzy, c-format
msgid "listening on socket '%s'\n"
msgstr "正在将私钥写至`%s'\n"
@@@ -654,7 -502,6 +654,7 @@@ msgstr "fstat(%d) 在 %s 中出错:%s
msgid "can't use '%s' as home directory\n"
msgstr "无法建立目录‘%s’:%s\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "读取‘%s’时出错:%s\n"
@@@ -679,18 -522,14 +679,18 @@@ msgstr "
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, fuzzy, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "更新私钥失败:%s\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s:已跳过:%s\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -706,8 -543,6 +706,8 @@@ msgid "
"Password cache maintenance\n"
msgstr ""
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -715,9 -550,6 +715,9 @@@ msgstr "
"@指令:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -956,29 -745,22 +956,29 @@@ msgstr "生成密码的时候发生错�
msgid "error creating a stream for a pipe: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "读取‘%s’时出错:%s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
msgid "waiting for processes to terminate failed: %s\n"
msgstr "更新失败:%s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, fuzzy, c-format
msgid "error running '%s': probably not installed\n"
msgstr "读取‘%s’时出错:%s\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, fuzzy, c-format
msgid "error running '%s': exit status %d\n"
msgstr "读取‘%s’时出错:%s\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, fuzzy, c-format
msgid "error running '%s': terminated\n"
msgstr "读取‘%s’时出错:%s\n"
@@@ -993,31 -773,25 +993,31 @@@ msgstr "取得当前密钥信息时出�
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, fuzzy, c-format
#| msgid "can't connect to `%s': %s\n"
msgid "can't connect to '%s': %s\n"
msgstr "无法连接至‘%s’:%s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr ""
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
msgid "problem setting the gpg-agent options\n"
msgstr ""
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
#, fuzzy
msgid "canceled by user\n"
msgstr "用户取消\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
#, fuzzy
msgid "problem with the agent\n"
msgstr "代理程序有问题――正在停用代理程序\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
msgid "problem with the agent (unexpected response \"%s\")\n"
msgstr "代理程序有问题――正在停用代理程序\n"
@@@ -1092,7 -851,6 +1092,7 @@@ msgstr "
msgid "out of core while allocating %lu bytes"
msgstr ""
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "建立钥匙环‘%s’时发生错误:%s\n"
@@@ -1356,7 -1060,6 +1356,7 @@@ msgstr "‘%s’没有可用的帮助
msgid "ignoring garbage line"
msgstr "结尾行有问题\n"
- #: common/gettime.c:860
++#: common/gettime.c:893
#, fuzzy
msgid "[none]"
msgstr "[未设定]"
@@@ -1496,116 -1172,90 +1496,116 @@@ msgstr "找不到公钥 %s:%s\n
msgid "waiting for lock %s...\n"
msgstr "等待‘%s’上的锁\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "ASCII 封装:%s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "无效的 ASCII 封装头:"
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "ASCII 封装头:"
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "无效的明文签名头\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
#, fuzzy
msgid "unknown armor header: "
msgstr "ASCII 封装头:"
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "多层明文签名\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "与预期不符的 ASCII 封装:"
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "以连字符开头的行格式错误:"
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "跳过无效的 64 进制字符 %02x\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "文件先于预期结束(没有 CRC 部分)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "文件先于预期结束(CRC 部分未结束)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "异常的 CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC 错误:%06lx - %06lx\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "文件先于预期结束(于结尾处)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "结尾行有问题\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "找不到有效的 OpenPGP 数据。\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "无效的 ASCII 封装:一行超过 %d 字符\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
#, c-format
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr ""
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr ""
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr ""
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
msgid "a notation name must not contain more than one '@' character\n"
msgstr ""
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr ""
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
msgid "a notation name may not contain an '=' character\n"
msgstr ""
- #: g10/build-packet.c:1243
++#: g10/build-packet.c:1265
msgid "a notation name must have only printable characters or spaces\n"
msgstr ""
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
#, fuzzy
msgid "WARNING: invalid notation data found\n"
msgstr "找不到有效的 OpenPGP 数据。\n"
@@@ -1636,19 -1281,14 +1636,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "警告:"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP 卡不可用:%s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@@ -1662,10 -1300,6 +1662,10 @@@ msgstr "在 %s 模式中不允许使用
msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "您的选择? "
@@@ -1727,141 -1347,108 +1727,142 @@@ msgstr "获取公钥的 URL:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误:URL 太长(至多 %d 个字符)\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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, 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:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, fuzzy, c-format
msgid "error writing '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "登录数据(帐号名):"
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "错误:登录数据太长(至多 %d 个字符)。\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "个人 DO 数据:"
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "错误:个人 DO 太长(至多 %d 个字符)。\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "首选语言:"
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "错误:首选项字符串长度无效。\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "错误:首选项字符串里有无效字符。\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性别(男性输入 M,女性输入 F,不指定输入空格):"
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "错误:无效的响应。\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "CA 指纹:"
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "错误:指纹格式无效。\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "针对密钥的操作无法实现:%s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "不是一个 OpenPGP 卡"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得当前密钥信息时出错:%s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "替换已有的密钥?(y/N)"
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "您想要用多大的密钥尺寸?(%u)"
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "您想要用多大的密钥尺寸?(%u)"
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "您想要用多大的密钥尺寸?(%u)"
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否为加密密钥创建卡外的备份?(Y/n)"
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
#, fuzzy
msgid "Note: keys are already stored on the card!\n"
msgstr "私钥已存储在卡上\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "替换已有的密钥?(y/N)"
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, fuzzy, c-format
#| msgid ""
#| "Please note that the factory settings of the PINs are\n"
@@@ -1876,143 -1463,108 +1877,143 @@@ msgstr "
" PIN = ‘%s’ 管理员 PIN = ‘%s’\n"
"您应当使用 --change-pin 命令来更改它们\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "请选择您要使用的密钥种类:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) 签名密钥\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) 加密密钥\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "请选择在哪里存储密钥:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, fuzzy, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "更新失败:%s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "私钥已存储在卡上\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
#| msgid "Sign it? (y/N) "
msgid "Continue? (y/N) "
msgstr "为其添加签名吗?(y/N)"
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "离开这个菜单"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "显示管理员命令"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "显示这份在线说明"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "列出所有可用数据"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "更改卡持有人的姓名"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "更改获取密钥的 URL"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "根据卡中指定的 URL 获取密钥"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "更改登录名"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "更改首选语言首选"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "更改卡持有人的性别"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "更改一个 CA 指纹"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "设定 PIN 签名是否必须"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "生成新的密钥"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "更改或解锁 PIN 的菜单"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "验证 PIN 并列出所有数据"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr ""
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr ""
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "仅供管理员使用的命令\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "允许使用管理员命令\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
@@@ -2020,28 -1571,19 +2021,28 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, fuzzy, c-format
#| msgid "can't open `%s'\n"
msgid "can't open '%s'\n"
msgstr "无法打开‘%s’\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到:%s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "读取密钥区块时发生错误:%s\n"
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2098,7 -1629,6 +2099,7 @@@ msgstr "公钥“%s”有对应的私�
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
@@@ -2118,7 -1645,6 +2119,7 @@@ msgstr "使用对称加密算法 %s\n
msgid "'%s' already compressed\n"
msgstr "‘%s’已被压缩\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, fuzzy, c-format
#| msgid "WARNING: `%s' is an empty file\n"
msgid "WARNING: '%s' is an empty file\n"
@@@ -2136,7 -1660,6 +2137,7 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告:强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2153,17 -1674,14 +2154,17 @@@ msgstr "强行使用的 %s (%d)对称�
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给:“%s”\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 加密过的数据\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以未知的算法 %d 加密\n"
@@@ -2232,336 -1737,271 +2233,350 @@@ msgstr "警告:无法删除临时文�
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "警告:无法删除临时目录‘%s’:%s\n"
- #: g10/export.c:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "导出被标记为局部的密名"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "导出属性用户标识(一般为照片标识)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "导出被标记为“敏感”的吊销密钥"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "导出时清除密钥中的不可用部分"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr "导出时尽可能清除密钥中的可选部分"
- #: g10/export.c:1144
++#: g10/export.c:1204
#, fuzzy
#| msgid "%s: skipped: %s\n"
msgid " - skipped"
msgstr "%s:已跳过:%s\n"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, fuzzy, c-format
+ #| msgid "writing to `%s'\n"
+ msgid "writing to '%s'\n"
+ msgstr "正在写入‘%s’\n"
+
++#: g10/export.c:1660
+ #, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr "密钥 %s:密钥在卡上——已跳过\n"
+
++#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
msgstr "不允许导出私钥\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "密钥 %s:PGP 2.x 样式的密钥――已跳过\n"
- #: g10/export.c:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "密钥 %s:密钥在卡上——已跳过\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "警告:没有导出任何东西\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 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:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
msgid "(check argument of option '%s')\n"
msgstr "无效的列表选项\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
msgid "error looking up: %s\n"
msgstr "‘%s’中出错:%s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, fuzzy, c-format
#| msgid "automatically retrieved `%s' via %s\n"
msgid "automatically retrieved '%s' via %s\n"
msgstr "自动获取‘%s’,通过 %s\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, fuzzy, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "建立‘%s’时发生错误:%s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
#, fuzzy
msgid "No fingerprint"
msgstr "CA 指纹:"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "找不到私钥“%s”:%s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "Warning: not using '%s' as default key: %s\n"
msgstr "不可用的私钥"
- #: g10/getkey.c:1694
++#: g10/getkey.c:1743
#, fuzzy, c-format
#| msgid "unusable secret key"
msgid "using \"%s\" as default secret key for signing\n"
msgstr "不可用的私钥"
- #: g10/getkey.c:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
- #: g10/getkey.c:3323
++#: g10/getkey.c:3377
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
#, fuzzy
msgid "make a signature"
msgstr "|[文件名]|生成一份签名"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
#, fuzzy
msgid "make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "生成一份分离的签名"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "加密数据"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "验证签名"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "列出密钥"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "列出密钥和签名"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "列出私钥"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly generate a new key pair"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "generate a new key pair"
msgid "quickly add a new user-id"
msgstr "生成一副新的密钥对"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "生成一副新的密钥对"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr ""
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
#, fuzzy
#| msgid "sign a key"
msgid "quickly sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
#, fuzzy
#| msgid "sign a key locally"
msgid "quickly sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "为某把密钥添加签名"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "导出密钥"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "把密钥导出到某个公钥服务器上"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "从公钥服务器上导入密钥"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "在公钥服务器上搜寻密钥"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "导入/合并密钥"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "打印卡状态"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "更改卡上的数据"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "更新信任度数据库"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
#, fuzzy
msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr ""
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "不做任何改变"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2569,7 -2009,6 +2584,7 @@@ msgstr "
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2589,13 -2028,11 +2604,13 @@@ msgstr "
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
#, fuzzy
#| msgid "Usage: gpg [options] [files] (-h for help)"
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
#, fuzzy
#| msgid ""
#| "Syntax: gpg [options] [files]\n"
@@@ -2610,7 -2047,6 +2625,7 @@@ msgstr "
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2618,80 -2054,65 +2633,80 @@@ msgstr "
"\n"
"支持的算法:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "公钥:"
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "对称加密:"
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "散列:"
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "压缩:"
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, fuzzy, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法:gpg [选项] "
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, 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:1524
#, 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:1527
#, 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:1530
#, 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:1536
#, 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:1539
#, 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:1542
#, 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:1548
#, 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:1551
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -2699,19 -2120,16 +2714,19 @@@ msgid "
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, 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:1560
#, 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:1563
#, fuzzy, c-format
#| msgid ""
#| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@@ -2720,507 -2138,401 +2735,513 @@@ msgid "
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, 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:1773
#, 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:1880
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
#, 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:1884
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
msgid "available TOFU policies:\n"
msgstr "禁用密钥"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
msgid "unknown TOFU DB format '%s'\n"
msgstr "未知的选项 '%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, 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:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, 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:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, 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:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, fuzzy, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, 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:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "无效的列表选项\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d:无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr ""
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
- #: g10/gpg.c:3526
++#: g10/gpg.c:3599
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
- #: g10/gpg.c:3528
++#: g10/gpg.c:3601
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3604
#, 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:3535
++#: g10/gpg.c:3608
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
- #: g10/gpg.c:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, 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:3642
++#: g10/gpg.c:3715
#, 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:3647
++#: g10/gpg.c:3720
#, 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:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [文件名]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, 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:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
- #: g10/gpg.c:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [文件名]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
- #: g10/gpg.c:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key 用户标识"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "导出密钥失败:%s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, fuzzy, c-format
#| msgid "invalid hash algorithm `%s'\n"
msgid "invalid hash algorithm '%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, fuzzy, c-format
msgid "error parsing key specification '%s': %s\n"
msgstr "取得当前密钥信息时出错:%s\n"
- #: g10/gpg.c:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[文件名]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@@ -3264,326 -2568,263 +3285,329 @@@ msgstr "没有可用的帮助
msgid "No help available for '%s'"
msgstr "‘%s’没有可用的帮助"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "导入被标记为局部的签名"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "导入时修复 PKS 公钥服务器导致的损坏"
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "导入后不更新信任度数据库"
- #: g10/import.c:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "导入后不更新信任度数据库"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "显示密钥指纹"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "只接受对已有密钥的更新"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "导入后清除密钥中无用的部分"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr "导入后尽可能清除密钥中的可选部分"
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "跳过 %d 样式的区块\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已处理 %lu 把密钥\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "合计被处理的数量:%lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " 已跳过的新密钥:%lu\n"
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳过的新密钥:%lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 遗失用户标识:%lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " 已导入:%lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改变:%lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新用户标识:%lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子钥:%lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的签名:%lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的密钥吊销:%lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 读取的私钥:%lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 导入的私钥:%lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改变的私钥:%lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被导入:%lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 清除的签名:%lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 清除的用户标识:%lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, fuzzy, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告:密钥 %s 下列用户标识的首选项中包含不可用的算法:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”:对称加密算法 %s 对应首选项\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”:散列算法 %s 对应首选项\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”:压缩算法 %s 对应首选项\n"
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "强烈建议您更新您的首选项并重新分发这把密钥,\n"
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "以避免可能的算法不匹配问题\n"
- #: g10/import.c:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s:没有用户标识\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s: %s\n"
msgstr "“%s”已跳过:%s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr ""
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s:PKS 子钥破损已修复\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s:已接受不含自身签名的用户标识“%s”\n"
- #: g10/import.c:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s:没有有效的用户标识\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签名所致\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s:找不到公钥:%s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s:新密钥――已跳过\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环:%s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, fuzzy, c-format
- #| msgid "writing to `%s'\n"
- msgid "writing to '%s'\n"
- msgstr "正在写入‘%s’\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, fuzzy, c-format
#| msgid "error writing keyring `%s': %s\n"
msgid "error writing keyring '%s': %s\n"
msgstr "写入钥匙环‘%s’时出错: %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s:公钥“%s”已导入\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s:与我们的副本不吻合\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s:无法定位原始的密钥区块:%s\n"
- #: g10/import.c:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s:无法读取原始的密钥区块: %s\n"
- #: g10/import.c:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s:“%s”一个新的用户标识\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s:“%s”%d 个新的用户标识\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s:“%s”1 个新的签名\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s:“%s”%d 个新的签名\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s:“%s”1 个新的子钥\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s:“%s”%d 个新的子钥\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s:“%s”未改变\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s:私钥已导入\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, fuzzy, c-format
#| msgid "skipped: secret key already present\n"
msgid "key %s: secret key already exists\n"
msgstr "已跳过:私钥已存在\n"
- #: g10/import.c:1578
++#: g10/import.c:1866
#, fuzzy, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "读取‘%s’时出错:%s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, fuzzy, c-format
#| msgid "secret key \"%s\" not found: %s\n"
msgid "secret key %s: %s\n"
msgstr "找不到私钥“%s”:%s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s:私钥使用了无效的加密算法 %d――已跳过\n"
@@@ -3598,87 -2839,70 +3622,87 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s:没有公钥――无法应用吊销证书\n"
- #: g10/import.c:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s:无效的吊销证书:%s――已拒绝\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s:“%s”吊销证书已被导入\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s:签名没有用户标识\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”使用了不支持的公钥算法\n"
- #: g10/import.c:2025
++#: g10/import.c:2310
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”自身签名无效\n"
- #: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s:不支持的公钥算法\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "密钥 %s:已新增直接密钥签名\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s:没有可供绑定的子钥\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s:无效的子钥绑定\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s:已删除多重子钥绑定\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s:没有用于密钥吊销的子钥\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s:无效的子钥吊销\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s:已删除多重子钥吊销\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s:已跳过用户标识“%s”\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s:已跳过子钥\n"
@@@ -3687,52 -2911,42 +3711,52 @@@
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
- #: g10/import.c:2233
++#: g10/import.c:2516
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s:不可导出的签名(验证级别 0x%02X)――已跳过\n"
- #: g10/import.c:2244
++#: g10/import.c:2527
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s:吊销证书位置错误――已跳过\n"
- #: g10/import.c:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s:无效的吊销证书:%s――已跳过\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s:子钥签名位置错误――已跳过\n"
- #: g10/import.c:2284
++#: g10/import.c:2567
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s:与预期不符的签名验证级别(0x%02X)――已跳过\n"
- #: g10/import.c:2413
++#: g10/import.c:2696
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s:检测到重复的用户标识――已合并\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告:密钥 %s 可能已被吊销:正在取回吊销密钥 %s\n"
- #: g10/import.c:2493
++#: g10/import.c:2776
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告:密钥 %s 可能已被吊销:吊销密钥 %s 不存在。\n"
- #: g10/import.c:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s:已新增吊销证书“%s”\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s:已新增直接密钥签名\n"
@@@ -3770,51 -2978,42 +3794,51 @@@ msgstr "密钥块资源‘%s’:%s\n
msgid "error opening key DB: %s\n"
msgstr "‘%s’中出错:%s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立钥匙环缓存失败: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[revocation]"
msgstr "[吊销]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[自身签名]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "密钥 %s:不支持的公钥算法\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
msgid " (reordered signatures follow)"
msgstr "完好的签名,来自于“%s”"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "skipped \"%s\": %s\n"
msgid "key %s:\n"
msgstr "“%s”已跳过:%s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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"
@@@ -3822,7 -3021,6 +3846,7 @@@ msgid_plural "%d signatures not checke
msgstr[0] "有 1 份签名因为遗失密钥而未被检查\n"
msgstr[1] "有 1 份签名因为遗失密钥而未被检查\n"
- #: g10/keyedit.c:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
@@@ -3830,21 -3028,18 +3854,21 @@@ msgid_plural "%d bad signatures\n
msgstr[0] "%d 个损坏的签名\n"
msgstr[1] "%d 个损坏的签名\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "完好的签名,来自于“%s”"
msgstr[1] "完好的签名,来自于“%s”"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3855,17 -3050,14 +3879,17 @@@ msgstr "
"查\n"
"指纹等)?\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉强相信\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全相信\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3874,50 -3066,38 +3898,50 @@@ msgstr "
"请输入这份信任签名的深度。\n"
"深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n"
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "请输入这份签名的限制域,如果没有请按回车。\n"
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "用户标识“%s”已被吊销。"
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "您仍然想要为它签名吗?(y/N)"
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " 无法添加签名。\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "用户标识“%s”已过期。"
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "警告:用户标识“%s”不含自身签名。"
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "可以为用户标识“%s”添加签名。"
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "为其添加签名吗?(y/N)"
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3926,65 -3106,52 +3950,65 @@@ msgstr "
"“%s”的自身签名是 PGP 2.x 样\n"
"式的签名。\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "您是否想要将它升级成 OpenPGP 的自身签名?(y/N)"
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr "您目前为“%s”的签名已经过期了。\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "您想要发布一份新的签名来取代已过期的那一个吗?(y/N)"
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr "您目前为“%s”的签名是一份本地签名。\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "您是否想要把它升级成可以完全导出的签名?(y/N)"
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "“%s”已由密钥 %s 在本地签名\n"
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "“%s”已由密钥 %s 签名\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "您仍然想要为它再次签名吗?(y/N)"
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "没有东西可以让密钥 %s 签名\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "这把密钥已经过期!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "这把密钥将在 %s 过期。\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "您想要让您的签名也同时过期吗? (Y/n) "
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3993,33 -3160,27 +4017,33 @@@ msgstr "
"您是否谨慎地检查过,确认正要签名的密钥的确属于以上它所声称的所有者呢?\n"
"如果您不知道这个问题的答案,请输入“0”。\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答。 %s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本没有检查过。 %s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我随意检查过。 %s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地检查过。 %s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
#, fuzzy
#| msgid "Your selection? (enter `?' for more information): "
msgid "Your selection? (enter '?' for more information): "
msgstr "您的选择?(输入‘?’以获得更多的信息):"
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -4028,220 -3189,166 +4052,220 @@@ msgstr "
"您真的确定要签名这把密钥,使用您的密钥\n"
"“%s”(%s)\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "这将是一个自身签名。\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告:这份签名不会被标记为不可导出。\n"
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告:这份签名不会被标记成不可吊销。\n"
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "这份签名会被标记成不可导出。\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "这份签名会被标记成不可吊销。\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "我根本没有检查过这把密钥。\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "我随意检查过这把密钥。\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地检查过这把密钥。\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "真的要签名吗?(y/N)"
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, fuzzy, c-format
#| msgid "error creating passphrase: %s\n"
msgid "key %s: error changing passphrase: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "保存并离开"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "显示密钥指纹"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
msgid "show the keygrip"
msgstr "输入注记:"
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "列出密钥和用户标识"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "选择用户标识 N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "选择子钥 N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "检查签名"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "为所选用户标识添加本地签名"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "为所选用户标识添加信任签名"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr "为所选用户标识添加不可吊销签名"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "增加一个用户标识"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "增加一个照片标识"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "删除选定的用户标识"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "添加一个子钥"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "在智能卡上添加一把密钥"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "将一把密钥移动到智能卡上"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "将备份密钥转移到卡上"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "删除选定的子钥"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "增加一把吊销密钥"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "删除所选用户标识上的签名"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
msgstr "变更密钥或所选子钥的使用期限"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "将所选的用户标识设为首选用户标识"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "列出首选项(专家模式)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "列出首选项(详细模式)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "设定所选用户标识的首选项"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "设定所选用户标识的首选公钥服务器的 URL"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "为所选用户标识的设定注记"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "更改密码"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "更改信任度"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "吊销所选用户标识上的签名"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "吊销选定的用户标识"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "吊销密钥或选定的子钥"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "启用密钥"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "禁用密钥"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "显示选定的照片标识"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "压缩不可用的用户标识并删除不可用的签名"
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "压缩不可用的用户标识并删除所有签名"
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "私钥可用。\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "要有私钥才能这么做。\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
#, fuzzy
#| msgid ""
#| "* The `sign' command may be prefixed with an `l' for local signatures "
@@@ -4259,294 -3366,233 +4283,300 @@@ msgstr "
" 信任签名,或‘nr’前缀(nrsign)以添加不可吊销签名,或者以上三种前缀的任何组\n"
" 合(ltsign、tnrsign 等)。\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "密钥已被吊销。"
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "真的为所有的用户标识签名吗?(y/N)"
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, fuzzy
#| msgid "Really sign all user IDs? (y/N) "
msgid "Really sign all text user IDs? (y/N) "
msgstr "真的为所有的用户标识签名吗?(y/N)"
- #: g10/keyedit.c:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示:选择要添加签名的用户标识\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, fuzzy, c-format
#| msgid "Unknown signature type `%s'\n"
msgid "Unknown signature type '%s'\n"
msgstr "未知的签名类型‘%s’\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "您至少得选择一个用户标识。\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "您不能删除最后一个用户标识!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要删除所有选定的用户标识吗?(y/N)"
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "真的要删除主钥吗?(y/N)"
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "您必须指定一把密钥。\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "命令需要一个文件名作为参数\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, fuzzy, c-format
#| msgid "Can't open `%s': %s\n"
msgid "Can't open '%s': %s\n"
msgstr "无法打开‘%s’:%s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, 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:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "您必须选择至少一把密钥。\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "您真的想要删除选定的密钥吗?(y/N)"
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "您真的要删除这把密钥吗?(y/N)"
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要吊销所有选定的用户标识吗?(y/N)"
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要吊销这个用户标识吗?(y/N)"
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "您真的要吊销整把密钥吗?(y/N)"
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "您真的要吊销选定的子钥吗?(y/N)"
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "您真的要吊销这把子钥吗?(y/N)"
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "设为首选项列表为:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所选用户标识的首选项吗?(y/N)"
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗?(y/N)"
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "要保存变动吗?(y/N)"
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "要不保存而离开吗?(y/N)"
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "更新失败:%s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "密钥没有变动所以不需要更新。\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "生成密钥失败:%s\n"
+
++#: g10/keyedit.c:3070
#, fuzzy, c-format
#| msgid "invalid fingerprint"
msgid "\"%s\" is not a fingerprint\n"
msgstr "指纹无效"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, fuzzy, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "无法存储指纹:%s\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "无效的数值\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "No such user ID.\n"
msgid "No matching user IDs."
msgstr "没有这个用户标识。\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
#, fuzzy
#| msgid "Nothing to sign with key %s\n"
msgid "Nothing to sign.\n"
msgstr "没有东西可以让密钥 %s 签名\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "散列:"
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "特点:"
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "首选公钥服务器:"
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "注记:"
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "这把密钥可被 %s 密钥 %s 吊销"
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr " (敏感的)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "创建于:%s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "已吊销:%s"
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "已过期:%s"
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "有效至:%s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "可用于:%s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "卡号:"
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "信任度:%s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "有效性:%s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "已吊销"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "已过期"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
"警告:没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr ""
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
#, 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:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4555,35 -3601,27 +4585,35 @@@ msgstr "
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗?(y/N)"
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr ""
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "删除这个完好的签名吗?(y/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "删除这个无效的签名吗?(y/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "删除这个未知的签名吗?(y/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要删除这个自身签名吗?(y/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, fuzzy, c-format
#| msgid "Deleted %d signature.\n"
msgid "Deleted %d signature.\n"
@@@ -4591,37 -3629,30 +4621,37 @@@ msgid_plural "Deleted %d signatures.\n
msgstr[0] "已经删除了 %d 个签名。\n"
msgstr[1] "已经删除了 %d 个签名。\n"
- #: g10/keyedit.c:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "无效"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "用户标识“%s”:无用部分已清除\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "用户标识“%s”:无用部分已清除\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "用户标识“%s”:无用部分已清除\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4630,42 -3661,34 +4660,42 @@@ msgstr "
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识:"
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
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:4557
++#: g10/keyedit.c:4664
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告:将某把密钥指派为指定吊销者的操作无法撤销!\n"
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
- #: g10/keyedit.c:4632
++#: g10/keyedit.c:4739
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4674,156 -3697,126 +4704,161 @@@ msgid "
"N) "
msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
- #: g10/keyedit.c:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "签名的子钥 %s 已经交叉验证\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子钥 %s 不签名,因此不需要交叉验证\n"
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签名\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL:"
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗?(y/N)"
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗?(y/N)"
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "输入注记:"
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "继续?(y/N)"
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "没有散列值为 %s 的用户标识\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "没有索引为 %d 的子钥\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识:“%s”\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (不可导出)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签名已在 %s 过期。\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗?(y/N)"
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签名生成一份吊销证书吗?(y/N)"
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr ""
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名:\n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (不可吊销)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签名:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗?(y/N)"
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "没有私钥\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告:有一份用户标识签名的日期标记为 %d 秒后的未来\n"
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
@@@ -5266,13 -4181,10 +5301,13 @@@ msgstr "
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5280,71 -4192,58 +5315,71 @@@
"\n"
msgstr ""
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr ""
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, fuzzy, c-format
#| msgid "key already exists\n"
msgid "A key for \"%s\" already exists\n"
msgstr "密钥已存在\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
#, fuzzy
#| msgid "Use this key anyway? (y/N) "
msgid "Create anyway? (y/N) "
msgstr "无论如何还是使用这把密钥吗?(y/N)"
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
#, fuzzy
#| msgid "generating new key\n"
msgid "creating anyway\n"
msgstr "生成新密钥\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr ""
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, 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:4009
++#: g10/keygen.c:4016
#, 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:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, fuzzy, c-format
#| msgid "writing public key to `%s'\n"
msgid "writing public key to '%s'\n"
msgstr "正在将公钥写至`%s'\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环:%s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, 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:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5352,61 -4251,48 +5387,61 @@@ msgstr "
"请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
#, 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:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "真的要建立吗?(y/N)"
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "永不过期"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "关键签名策略:"
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "签名策略:"
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "关键首选公钥服务器:"
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "关键签名注记:"
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "签名注记:"
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d good signature\n"
@@@ -5414,7 -4300,6 +5449,7 @@@ msgid_plural "%d good signatures\n
msgstr[0] "%d 个损坏的签名\n"
msgstr[1] "%d 个损坏的签名\n"
- #: g10/keylist.c:484
++#: g10/keylist.c:485
#, fuzzy, c-format
#| msgid "1 signature not checked due to an error\n"
msgid "%d signature not checked due to an error\n"
@@@ -5422,46 -4307,33 +5457,41 @@@ msgid_plural "%d signatures not checke
msgstr[0] "有 1 份签名因为某个错误而未被检查\n"
msgstr[1] "有 1 份签名因为某个错误而未被检查\n"
- #: g10/keylist.c:566
++#: g10/keylist.c:567
#, c-format
msgid "Warning: %lu key skipped due to its large size\n"
msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
msgstr[0] ""
msgstr[1] ""
- #: g10/keylist.c:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "钥匙环"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr "主钥指纹:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr "子钥指纹:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " 主钥指纹:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " 子钥指纹:"
# use tty
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr "卡序列号 ="
@@@ -5527,25 -4387,20 +5557,25 @@@ msgstr "使用密钥中指定的首选�
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "获取密钥时使用密钥上的 PKA 记录"
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "已禁用"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识:跳过\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, fuzzy, c-format
#| msgid "refreshing %d keys from %s\n"
msgid "refreshing %d key from %s\n"
@@@ -5553,269 -4408,217 +5583,274 @@@ msgid_plural "refreshing %d keys from %
msgstr[0] "%d 个密钥正从 %s 得到更新\n"
msgstr[1] "%d 个密钥正从 %s 得到更新\n"
- #: g10/keyserver.c:1424
++#: g10/keyserver.c:1426
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’,从 %s 服务器 %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s,从 %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
#| msgid "no keyserver action!\n"
msgid "no keyserver known\n"
msgstr "公钥服务器无动作!\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "“%s”已跳过:%s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, fuzzy, c-format
#| msgid "requesting key %s from %s\n"
msgid "requesting key from '%s'\n"
msgstr "下载密钥 %s,从 %s\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告:无法获取 URI %s:%s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "加密过的会话密钥尺寸(%d)诡异\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 加密过的会话密钥\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密码由未知的散列算法 %d 生成\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "公钥是 %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "公钥加密过的数据:完好的数据加密密钥\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "由 %u 位的 %s 密钥加密,钥匙号为 %s、生成于 %s\n"
- #: g10/mainproc.c:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " “%s”\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "由 %s 密钥加密、钥匙号为 %s\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公钥解密失败:%s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "以 %lu 个密码加密\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "以 1 个密码加密\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 为加密过的数据\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 算法不可用,试以 %s 代替\n"
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "警告:报文未受到完整的保护\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "解密成功\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告:加密过的报文已经变造!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失败:%s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
#, fuzzy
#| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "注意:发件者要求您“只阅读不存盘”\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "未找到签名\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签名,来自于“%s”"
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签名,来自于“%s”"
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签名,来自于“%s”"
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "签名验证已被抑制\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些有歧义的签名\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "签名建立于 %s\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "可用的密钥在:"
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[不确定]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签名已于 %s 过期。\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签名在 %s 过期。\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, 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:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "二进制"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "文本模式"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
#, fuzzy
#| msgid "unknown pubkey algorithm"
msgid ", key algorithm "
msgstr "未知的公钥算法"
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签名:%s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "不是一份分离的签名\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告:检测到多重签名。只检查第一个签名。\n"
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签名\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签名\n"
@@@ -5996,7 -4765,6 +6031,7 @@@ msgstr "无法操作公钥算法 %d\n
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告:潜在不安全的对称加密会话密钥\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
@@@ -6352,46 -5052,37 +6387,46 @@@ msgstr "警告:这把密钥未经有�
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 这份签名并不一定属于它所声称的持有者\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s:已跳过:%s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s:已跳过:公钥已被禁用\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳过:公钥已存在\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, fuzzy, c-format
msgid "option '%s' given, but no valid default keys given\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/pkclist.c:979
++#: g10/pkclist.c:991
#, fuzzy, c-format
msgid "option '%s' given, but option '%s' not given\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/pkclist.c:1082
++#: g10/pkclist.c:1094
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
- #: g10/pkclist.c:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "当前收件人:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6399,37 -5090,29 +6434,37 @@@ msgstr "
"\n"
"输入用户标识。以空白行结束:"
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "没有这个用户标识。\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳过:公钥已被设为默认收件者\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "公钥被禁用。\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "已跳过:公钥已被设定\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的默认收件者“%s”\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "密钥 %s:没有有效的用户标识\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "密钥 %s:没有有效的用户标识\n"
@@@ -6438,29 -5120,23 +6473,29 @@@
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "数据未被保存;请用“--output”选项来保存它们\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "分离的签名。\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "请输入数据文件的名称: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "正在从标准输入读取 ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "不含签名的数据\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, 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:734
++#: g10/plaintext.c:741
#, fuzzy, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "无法打开有签名的数据‘%s’\n"
@@@ -6709,7 -5340,6 +6744,7 @@@ msgid_plural "public key %s is %lu day
msgstr[0] "公钥 %s 在其签名后 %lu 秒生成\n"
msgstr[1] "公钥 %s 在其签名后 %lu 秒生成\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6774,22 -5395,18 +6809,22 @@@ msgid "
"unexpanded.\n"
msgstr "警告:无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 签名来自:“%s”\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告:强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "正在签名:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
@@@ -6864,136 -5467,109 +6899,136 @@@ msgstr "读取‘%s’错误:%s\n
msgid "trustdb: sync failed: %s\n"
msgstr "信任度数据库:同步失败:%s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 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:145
++#: g10/tdbio.c:146
#, fuzzy, c-format
#| msgid "can't lock `%s'\n"
msgid "can't lock '%s'\n"
msgstr "无法锁定‘%s’\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任度数据库记录 %lu:lseek 失败:%s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信任度数据库记录 %lu:write 失败 (n=%d): %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "信任度数据库处理量过大\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s:目录不存在!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 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:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s:建立版本记录失败:%s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s:建立了无效的信任度数据库\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s:建立了信任度数据库\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
#, fuzzy
#| msgid "NOTE: trustdb not writable\n"
msgid "Note: trustdb not writable\n"
msgstr "注意:信任度数据库不可写入\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s:无效的信任度数据库\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s:建立散列表失败:%s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s:更新版本记录时出错: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s:读取版本记录时出错: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s:写入版本记录时出错:%s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信任度数据库:lseek 失败:%s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信任度数据库:read 失败(n=%d):%s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s:不是一个信任度数据库文件\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s:记录编号为%lu的版本记录\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s:无效的文件版本%d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s:读取自由记录时出错:%s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s:写入目录记录时出错:%s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s:记录归零时失败:%s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s:附加记录时失败:%s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s:建立了信任度数据库\n"
@@@ -7353,7 -5867,6 +7388,7 @@@ msgstr "使用 %s 信任模型\n
msgid "no need for a trustdb check\n"
msgstr "不需要检查信任度数据库\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任度数据库检查将于 %s 进行\n"
@@@ -7370,7 -5881,6 +7405,7 @@@ msgstr "使用‘%s’信任模型时�
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "找不到公钥 %s:%s\n"
@@@ -7383,7 -5891,6 +7418,7 @@@ msgstr "请执行一次 --check-trustdb
msgid "checking the trustdb\n"
msgstr "正在检查信任度数据库\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
@@@ -7391,7 -5898,6 +7426,7 @@@ msgid_plural "%d keys processed
msgstr[0] "目前已处理 %lu 把密钥\n"
msgstr[1] "目前已处理 %lu 把密钥\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
@@@ -7399,23 -5905,19 +7434,23 @@@ msgid_plural " (%d validity counts clea
msgstr[0] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
msgstr[1] "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "没有找到任何绝对信任的密钥\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, 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:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录:写入失败:%s\n"
@@@ -7874,27 -6281,22 +7909,27 @@@ msgstr "显示管理员命令
msgid "use variable length input for pinpad"
msgstr ""
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
#, fuzzy
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
msgstr ""
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr ""
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@@ -7904,7 -6305,6 +7939,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "跳过无效的 64 进制字符 %02x\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
msgid "no dirmngr running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
@@@ -9787,8 -7800,6 +9822,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr ""
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, fuzzy, c-format
msgid "usage: %s [options] "
msgstr "用法:gpg [选项] "
@@@ -9799,13 -7809,11 +9834,13 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "%s 不可与 %s 并用\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, fuzzy, c-format
#| msgid "renaming `%s' to `%s' failed: %s\n"
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, fuzzy, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败:%s\n"
@@@ -10311,78 -8217,62 +10346,78 @@@ msgstr "
msgid "OCSP responder returned an too old status\n"
msgstr ""
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, fuzzy, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "签名时失败: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr ""
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr ""
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, fuzzy, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "签名时失败: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, fuzzy, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "删除密钥区块时失败:%s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, fuzzy, c-format
msgid "error sending data: %s\n"
msgstr "读取‘%s’时出错:%s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, fuzzy, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "删除密钥区块时失败:%s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, fuzzy, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "删除密钥区块时失败:%s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, fuzzy, c-format
msgid "can't allocate control structure: %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, fuzzy, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "%s:建立散列表失败:%s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, 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:2435
++#: dirmngr/server.c:2444
#, 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:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, fuzzy, c-format
#| msgid "signing failed: %s\n"
msgid "Assuan processing failed: %s\n"
@@@ -10522,7 -8382,6 +10557,7 @@@ msgstr "未知的选项 '%s'\n
msgid "sending line failed: %s\n"
msgstr "签名时失败: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
@@@ -10774,16 -8572,13 +10809,16 @@@ msgid "
"Manage configuration options for tools of the @GNUPG@ system\n"
msgstr ""
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr ""
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
#, fuzzy
msgid "Component not found"
msgstr "找不到公钥"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
#, fuzzy
msgid "No argument allowed"
msgstr "不允许使用管理员命令\n"
diff --cc po/zh_TW.po
index ad29a3c,d9a4bb8..c16c69c
--- 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-06-16 17:27+0200\n"
++"POT-Creation-Date: 2016-07-14 16:03+0200\n"
"PO-Revision-Date: 2014-11-22 20:56+0800\n"
"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@@ -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:1255 g10/keygen.c:4148 g10/keyring.c:1326
- #: g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424 g10/sign.c:824
- #: g10/sign.c:1126 g10/tdbio.c:709
++#: agent/command-ssh.c:915 common/dotlock.c:839 g10/card-util.c:828
++#: g10/exec.c:484 g10/export.c:1233 g10/gpg.c:1272 g10/keygen.c:4155
++#: g10/keyring.c:1326 g10/keyring.c:1655 g10/openfile.c:297 g10/openfile.c:424
++#: g10/sign.c:826 g10/sign.c:1129 g10/tdbio.c:715
#, 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
++#: agent/command-ssh.c:927 common/helpfile.c:57 g10/card-util.c:782
+#: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:66 g10/decrypt.c:135
- #: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1256
- #: g10/import.c:222 g10/import.c:395 g10/keygen.c:3336 g10/keyring.c:1681
- #: g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
- #: g10/plaintext.c:625 g10/sign.c:806 g10/sign.c:1006 g10/sign.c:1110
- #: g10/sign.c:1255 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:714
- #: g10/tdbio.c:785 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
++#: g10/decrypt.c:152 g10/encrypt.c:205 g10/encrypt.c:552 g10/gpg.c:1273
++#: g10/import.c:255 g10/import.c:398 g10/import.c:571 g10/keygen.c:3336
++#: g10/keyring.c:1681 g10/openfile.c:201 g10/openfile.c:215 g10/openfile.c:405
++#: g10/plaintext.c:632 g10/sign.c:808 g10/sign.c:1008 g10/sign.c:1113
++#: g10/sign.c:1258 g10/tdbdump.c:143 g10/tdbdump.c:151 g10/tdbio.c:720
++#: g10/tdbio.c:791 g10/verify.c:97 g10/verify.c:161 sm/gpgsm.c:2145
+#: sm/gpgsm.c:2175 sm/gpgsm.c:2213 sm/qualified.c:66 dirmngr/certcache.c:371
+#: dirmngr/crlcache.c:2415 dirmngr/dirmngr.c:1671
#, c-format
msgid "can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
@@@ -395,10 -309,6 +395,10 @@@ msgstr "以服務模式執行 (背景)
msgid "run in server mode (foreground)"
msgstr "以伺服器模式執行 (前景)"
- #: agent/gpg-agent.c:153 g10/gpg.c:545 g10/gpgv.c:72 kbx/kbxutil.c:88
++#: agent/gpg-agent.c:153 g10/gpg.c:558 g10/gpgv.c:72 kbx/kbxutil.c:88
+#: scd/scdaemon.c:116 sm/gpgsm.c:299 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:171 dirmngr/dirmngr_ldap.c:135
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:90 tools/symcryptrun.c:166
msgid "verbose"
msgstr "囉唆模式"
@@@ -500,11 -385,6 +500,11 @@@ msgstr "啟用 putty 支援
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:473 agent/preset-passphrase.c:95 agent/protect-tool.c:151
- #: g10/gpg.c:974 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:273
++#: g10/gpg.c:991 g10/gpgv.c:117 kbx/kbxutil.c:113 scd/scdaemon.c:274
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:350
+#: dirmngr/dirmngr_ldap.c:205 tools/gpg-connect-agent.c:202
+#: tools/gpgconf.c:113 tools/symcryptrun.c:206 tools/gpg-check-pattern.c:140
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr "翻譯瑕疵請回報給 <Jedi at Jedi.org>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
@@@ -520,51 -398,34 +520,51 @@@ msgstr "
"語法: @GPG_AGENT@ [選項] [指令 [引數]]\n"
"@GNUPG@ 私鑰管理\n"
- #: agent/gpg-agent.c:530 g10/gpg.c:1165 scd/scdaemon.c:346 sm/gpgsm.c:709
++#: agent/gpg-agent.c:530 g10/gpg.c:1182 scd/scdaemon.c:347 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:434
#, c-format
msgid "invalid debug-level '%s' given\n"
msgstr "給定的除錯等級 '%s' 無效\n"
+#: agent/gpg-agent.c:772 agent/protect-tool.c:571 g10/gpgv.c:160
- #: kbx/kbxutil.c:467 scd/scdaemon.c:430 sm/gpgsm.c:942 sm/gpgsm.c:945
++#: kbx/kbxutil.c:467 scd/scdaemon.c:431 sm/gpgsm.c:942 sm/gpgsm.c:945
+#: dirmngr/dirmngr.c:760 dirmngr/dirmngr.c:763 dirmngr/dirmngr.c:772
+#: tools/symcryptrun.c:1003 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
- #: agent/gpg-agent.c:888 g10/gpg.c:2366 scd/scdaemon.c:509 sm/gpgsm.c:1045
++#: agent/gpg-agent.c:888 g10/gpg.c:2388 scd/scdaemon.c:510 sm/gpgsm.c:1045
+#: dirmngr/dirmngr.c:893
#, c-format
msgid "Note: no default option file '%s'\n"
msgstr "請注意: 沒有預設選項檔 '%s'\n"
- #: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2370
- #: scd/scdaemon.c:514 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
++#: agent/gpg-agent.c:899 agent/gpg-agent.c:1652 g10/gpg.c:2392
++#: scd/scdaemon.c:515 sm/gpgsm.c:1049 dirmngr/dirmngr.c:898
+#: dirmngr/dirmngr.c:1777 tools/symcryptrun.c:936
#, c-format
msgid "option file '%s': %s\n"
msgstr "選項檔 '%s': %s\n"
- #: agent/gpg-agent.c:907 g10/gpg.c:2377 scd/scdaemon.c:522 sm/gpgsm.c:1056
++#: agent/gpg-agent.c:907 g10/gpg.c:2399 scd/scdaemon.c:523 sm/gpgsm.c:1056
+#: dirmngr/dirmngr.c:906
#, c-format
msgid "reading options from '%s'\n"
msgstr "從 '%s' 讀取選項中\n"
- #: agent/gpg-agent.c:1028 g10/gpg.c:3444 scd/scdaemon.c:642 sm/gpgsm.c:1533
- #: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:218
++#: agent/gpg-agent.c:1028 g10/gpg.c:3517 scd/scdaemon.c:643 sm/gpgsm.c:1533
++#: dirmngr/dirmngr.c:1017 tools/gpg-connect-agent.c:1237 tools/gpgconf.c:276
#, c-format
msgid "Note: '%s' is not considered an option\n"
msgstr "請注意: '%s' 並不當成選項\n"
- #: agent/gpg-agent.c:1789 scd/scdaemon.c:1068 dirmngr/dirmngr.c:1130
++#: agent/gpg-agent.c:1789 scd/scdaemon.c:1069 dirmngr/dirmngr.c:1130
#, c-format
msgid "can't create socket: %s\n"
msgstr "無法建立 socket: %s\n"
- #: agent/gpg-agent.c:1806 scd/scdaemon.c:1081 dirmngr/dirmngr.c:1143
++#: agent/gpg-agent.c:1806 scd/scdaemon.c:1082 dirmngr/dirmngr.c:1143
#, c-format
msgid "socket name '%s' is too long\n"
msgstr "socket 名稱 '%s' 太長\n"
@@@ -573,28 -433,22 +573,28 @@@
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
- #: agent/gpg-agent.c:1854 scd/scdaemon.c:1105 dirmngr/dirmngr.c:1175
++#: agent/gpg-agent.c:1854 scd/scdaemon.c:1106 dirmngr/dirmngr.c:1175
msgid "error getting nonce for the socket\n"
msgstr "為 socket 取得 nonce 時出錯\n"
- #: agent/gpg-agent.c:1859 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1178
++#: agent/gpg-agent.c:1859 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1178
#, c-format
msgid "error binding socket to '%s': %s\n"
msgstr "綁定 socket 至 '%s' 時出錯: %s\n"
- #: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1116
++#: agent/gpg-agent.c:1869 agent/gpg-agent.c:1906 scd/scdaemon.c:1117
+#: dirmngr/dirmngr.c:1187
#, fuzzy, c-format
#| msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgid "can't set permissions of '%s': %s\n"
msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
- #: agent/gpg-agent.c:1874 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1192
++#: agent/gpg-agent.c:1874 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1192
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() 失敗: %s\n"
- #: agent/gpg-agent.c:1881 scd/scdaemon.c:1128 dirmngr/dirmngr.c:1198
++#: agent/gpg-agent.c:1881 scd/scdaemon.c:1129 dirmngr/dirmngr.c:1198
#, c-format
msgid "listening on socket '%s'\n"
msgstr "正在候聽 socket '%s'\n"
@@@ -621,7 -469,6 +621,7 @@@ msgstr "'%s' 的 stat() 失敗: %s\n
msgid "can't use '%s' as home directory\n"
msgstr "無法使用 '%s' 做為家目錄\n"
- #: agent/gpg-agent.c:2101 scd/scdaemon.c:1144 dirmngr/dirmngr.c:1969
++#: agent/gpg-agent.c:2101 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1969
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
@@@ -646,18 -489,14 +646,18 @@@ msgstr "ssh 經手程式 0x%lx (用於
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
- #: agent/gpg-agent.c:2558 scd/scdaemon.c:1267 dirmngr/dirmngr.c:2100
++#: agent/gpg-agent.c:2558 scd/scdaemon.c:1268 dirmngr/dirmngr.c:2100
#, c-format
msgid "npth_pselect failed: %s - waiting 1s\n"
msgstr "npth_select 失敗: %s - 等 1 秒鐘\n"
- #: agent/gpg-agent.c:2621 scd/scdaemon.c:1317
++#: agent/gpg-agent.c:2621 scd/scdaemon.c:1318
#, c-format
msgid "%s %s stopped\n"
msgstr "%s %s 已停止\n"
+#: agent/gpg-agent.c:2761 common/simple-pwquery.c:330 g10/call-agent.c:318
- #: sm/call-agent.c:149 tools/gpg-connect-agent.c:2236
++#: sm/call-agent.c:149 tools/gpg-connect-agent.c:2246
msgid "no gpg-agent running in this session\n"
msgstr "在此階段中沒有執行中的 gpg-agent\n"
@@@ -673,8 -510,6 +673,8 @@@ msgstr "
"語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
"密碼快取維護\n"
- #: agent/protect-tool.c:106 g10/gpg.c:407 kbx/kbxutil.c:71 sm/gpgsm.c:196
++#: agent/protect-tool.c:106 g10/gpg.c:415 kbx/kbxutil.c:71 sm/gpgsm.c:196
+#: dirmngr/dirmngr.c:154 tools/gpgconf.c:66
msgid ""
"@Commands:\n"
" "
@@@ -682,9 -517,6 +682,9 @@@ msgstr "
"@指令:\n"
" "
- #: agent/protect-tool.c:115 g10/gpg.c:495 g10/gpgv.c:70 kbx/kbxutil.c:81
++#: agent/protect-tool.c:115 g10/gpg.c:505 g10/gpgv.c:70 kbx/kbxutil.c:81
+#: sm/gpgsm.c:242 dirmngr/dirmngr.c:169 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:87 tools/symcryptrun.c:159
msgid ""
"@\n"
"Options:\n"
@@@ -917,30 -706,23 +917,30 @@@ msgstr "建立管道時出錯: %s\n
msgid "error creating a stream for a pipe: %s\n"
msgstr "建立管道串流時出錯: %s\n"
- #: common/exechelp-posix.c:497 common/exechelp-posix.c:571
- #: common/exechelp-posix.c:711 dirmngr/dirmngr.c:1216
++#: common/exechelp-posix.c:497 common/exechelp-posix.c:572
++#: common/exechelp-posix.c:712 dirmngr/dirmngr.c:1216
#, c-format
msgid "error forking process: %s\n"
msgstr "衍生執行程序時出錯: %s\n"
- #: common/exechelp-posix.c:627 common/exechelp-w32.c:734
++#: common/exechelp-posix.c:628 common/exechelp-w32.c:734
#, fuzzy, c-format
#| msgid "waiting for process %d to terminate failed: %s\n"
msgid "waiting for processes to terminate failed: %s\n"
msgstr "等候 %d 處理程序終止時失敗: %s\n"
- #: common/exechelp-posix.c:651
++#: common/exechelp-posix.c:652
#, c-format
msgid "error running '%s': probably not installed\n"
msgstr "執行 '%s' 時出錯: 可能尚未安裝\n"
- #: common/exechelp-posix.c:658 common/exechelp-w32.c:753
++#: common/exechelp-posix.c:659 common/exechelp-w32.c:753
+#: common/exechelp-w32ce.c:781
#, c-format
msgid "error running '%s': exit status %d\n"
msgstr "執行 '%s' 時出錯: 結束狀態 %d\n"
- #: common/exechelp-posix.c:666
++#: common/exechelp-posix.c:667
#, c-format
msgid "error running '%s': terminated\n"
msgstr "執行 '%s' 時出錯: 已終止\n"
@@@ -955,28 -735,22 +955,28 @@@ msgstr "取得 %d 執行程序結束碼
msgid "waiting for process %d to terminate failed: %s\n"
msgstr "等候 %d 處理程序終止時失敗: %s\n"
- #: common/simple-pwquery.c:376
++#: common/simple-pwquery.c:379
#, c-format
msgid "can't connect to '%s': %s\n"
msgstr "無法連接至 '%s': %s\n"
- #: common/simple-pwquery.c:387
++#: common/simple-pwquery.c:391
msgid "communication problem with gpg-agent\n"
msgstr "與 gpg-agent 的溝通問題\n"
- #: common/simple-pwquery.c:397
++#: common/simple-pwquery.c:401
msgid "problem setting the gpg-agent options\n"
msgstr "設定 gpg-agent 選項時發生問題\n"
- #: common/simple-pwquery.c:560 common/simple-pwquery.c:665
++#: common/simple-pwquery.c:564 common/simple-pwquery.c:669
msgid "canceled by user\n"
msgstr "由使用者取消\n"
- #: common/simple-pwquery.c:575
++#: common/simple-pwquery.c:579
msgid "problem with the agent\n"
msgstr "代理程式的問題\n"
- #: common/simple-pwquery.c:697
++#: common/simple-pwquery.c:701
#, fuzzy, c-format
#| msgid "problem with the agent: %s\n"
msgid "problem with the agent (unexpected response \"%s\")\n"
@@@ -1052,7 -811,6 +1052,7 @@@ msgstr "在安全記憶體配置 %lu �
msgid "out of core while allocating %lu bytes"
msgstr "配置 %lu 位元組時超出核心"
- #: common/miscellaneous.c:115 g10/card-util.c:799 tools/no-libgcrypt.c:30
++#: common/miscellaneous.c:115 g10/card-util.c:789 tools/no-libgcrypt.c:30
#, c-format
msgid "error allocating enough memory: %s\n"
msgstr "配置足夠的記憶體時出錯: %s\n"
@@@ -1290,7 -994,6 +1290,7 @@@ msgstr "'%s' 沒有可用的說明.
msgid "ignoring garbage line"
msgstr "忽略垃圾列"
- #: common/gettime.c:860
++#: common/gettime.c:893
msgid "[none]"
msgstr "[ 無 ]"
@@@ -1418,114 -1094,89 +1418,114 @@@ msgstr "未鎖定 '%s': %s\n
msgid "waiting for lock %s...\n"
msgstr "正在等候 `%s' 鎖定...\n"
- #: g10/armor.c:417
++#: g10/armor.c:424
#, c-format
msgid "armor: %s\n"
msgstr "封裝: %s\n"
- #: g10/armor.c:456
++#: g10/armor.c:463
msgid "invalid armor header: "
msgstr "無效的封裝檔頭: "
- #: g10/armor.c:467
++#: g10/armor.c:474
msgid "armor header: "
msgstr "封裝檔頭: "
- #: g10/armor.c:480
++#: g10/armor.c:487
msgid "invalid clearsig header\n"
msgstr "無效的明文簽章檔頭\n"
- #: g10/armor.c:493
++#: g10/armor.c:500
msgid "unknown armor header: "
msgstr "未知的封裝檔頭: "
- #: g10/armor.c:546
++#: g10/armor.c:553
msgid "nested clear text signatures\n"
msgstr "多層明文簽章\n"
- #: g10/armor.c:681
++#: g10/armor.c:688
msgid "unexpected armor: "
msgstr "未預期的封裝: "
- #: g10/armor.c:694
++#: g10/armor.c:701
msgid "invalid dash escaped line: "
msgstr "無效的破折號逸出列: "
- #: g10/armor.c:866 g10/armor.c:1482
++#: g10/armor.c:873 g10/armor.c:1490
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "無效的 64 進位字符 %02x 已跳過\n"
- #: g10/armor.c:909
++#: g10/armor.c:916
msgid "premature eof (no CRC)\n"
msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
- #: g10/armor.c:943
++#: g10/armor.c:950
msgid "premature eof (in CRC)\n"
msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
- #: g10/armor.c:951
++#: g10/armor.c:958
msgid "malformed CRC\n"
msgstr "格式不對的 CRC\n"
- #: g10/armor.c:955 g10/armor.c:1519
++#: g10/armor.c:962 g10/armor.c:1527
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC 錯誤; %06lX - %06lX\n"
- #: g10/armor.c:975
++#: g10/armor.c:982
msgid "premature eof (in trailer)\n"
msgstr "檔案未預期的結束 (於結尾處)\n"
- #: g10/armor.c:979
++#: g10/armor.c:986
msgid "error in trailer line\n"
msgstr "結尾列有問題\n"
- #: g10/armor.c:1296
++#: g10/armor.c:1303
msgid "no valid OpenPGP data found.\n"
msgstr "找不到有效的 OpenPGP 資料.\n"
- #: g10/armor.c:1301
++#: g10/armor.c:1308
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "無效的封裝: 列長超出 %d 字符\n"
- #: g10/armor.c:1305
++#: g10/armor.c:1312
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
- #: g10/build-packet.c:1093
++#: g10/build-packet.c:1115
#, fuzzy, c-format
#| msgid "not human readable"
msgid "[ not human readable (%zu bytes: %s%s) ]"
msgstr "不是人類能讀得懂的"
- #: g10/build-packet.c:1145
++#: g10/build-packet.c:1167
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
- #: g10/build-packet.c:1157 g10/build-packet.c:1253
++#: g10/build-packet.c:1179 g10/build-packet.c:1275
msgid "a user notation name must contain the '@' character\n"
msgstr "使用者標記名稱一定要含有 '@' 字符\n"
- #: g10/build-packet.c:1163 g10/build-packet.c:1259
++#: g10/build-packet.c:1185 g10/build-packet.c:1281
msgid "a notation name must not contain more than one '@' character\n"
msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
- #: g10/build-packet.c:1181
++#: g10/build-packet.c:1203
msgid "a notation value must not use any control characters\n"
msgstr "標記值一定不能使用任何的控制字符\n"
- #: g10/build-packet.c:1237
++#: g10/build-packet.c:1259
#, 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:1243
++#: g10/build-packet.c:1265
#, fuzzy
#| msgid ""
#| "a notation name must have only printable characters or spaces, and end "
@@@ -1533,7 -1184,6 +1533,7 @@@
msgid "a notation name must have only printable characters or spaces\n"
msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
- #: g10/build-packet.c:1302 g10/build-packet.c:1313
++#: g10/build-packet.c:1324 g10/build-packet.c:1335
msgid "WARNING: invalid notation data found\n"
msgstr "警告: 找到無效的標記資料\n"
@@@ -1563,19 -1208,14 +1563,19 @@@ msgstr "
msgid "WARNING: %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1698
- #: g10/keygen.c:4872
++#: g10/card-util.c:86 g10/card-util.c:383 g10/card-util.c:1688
++#: g10/keygen.c:4883
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "沒有可用的 OpenPGP 卡片: %s\n"
- #: g10/card-util.c:91 g10/card-util.c:1704
++#: g10/card-util.c:91 g10/card-util.c:1694
#, c-format
msgid "OpenPGP card no. %s detected\n"
msgstr "偵測到 OpenPGP 卡片編號 %s\n"
- #: g10/card-util.c:99 g10/card-util.c:1901 g10/delkey.c:128 g10/keyedit.c:2015
- #: g10/keygen.c:3701 g10/revoke.c:215 g10/revoke.c:617
++#: g10/card-util.c:99 g10/card-util.c:1891 g10/delkey.c:128 g10/keyedit.c:2018
++#: g10/keygen.c:3708 g10/revoke.c:215 g10/revoke.c:617
msgid "can't do this in batch mode\n"
msgstr "無法在批次模式中這樣做\n"
@@@ -1587,10 -1225,6 +1587,10 @@@ msgstr "祇有第二版卡片纔能用�
msgid "Reset Code not or not anymore available\n"
msgstr "(再也) 沒有重設碼\n"
- #: g10/card-util.c:142 g10/card-util.c:1467 g10/card-util.c:1580
- #: g10/keyedit.c:988 g10/keyedit.c:1009 g10/keyedit.c:1023 g10/keygen.c:1746
++#: g10/card-util.c:142 g10/card-util.c:1457 g10/card-util.c:1570
++#: g10/keyedit.c:991 g10/keyedit.c:1012 g10/keyedit.c:1026 g10/keygen.c:1746
+#: g10/keygen.c:1920 g10/keygen.c:2265 sm/certreqgen-ui.c:169
+#: sm/certreqgen-ui.c:253 sm/certreqgen-ui.c:287
msgid "Your selection? "
msgstr "你要選哪一個? "
@@@ -1652,84 -1272,63 +1652,85 @@@ msgstr "取回公鑰的 URL:
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "錯誤: URL 太長 (上限是 %d 個字符).\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:1617
++#: g10/card-util.c:801 g10/decrypt-data.c:241 g10/import.c:284
++#: g10/import.c:542 g10/import.c:590 dirmngr/crlcache.c:656
++#: dirmngr/crlcache.c:661 dirmngr/crlcache.c:915 dirmngr/crlcache.c:921
++#: dirmngr/dirmngr.c:1617
#, c-format
msgid "error reading '%s': %s\n"
msgstr "讀取 '%s' 時出錯: %s\n"
- #: g10/card-util.c:844 g10/decrypt-data.c:244 g10/export.c:1895
++#: g10/card-util.c:834 g10/decrypt-data.c:244 g10/export.c:2297
+#: dirmngr/crlcache.c:926
#, c-format
msgid "error writing '%s': %s\n"
msgstr "寫入 '%s' 時出錯: %s\n"
- #: g10/card-util.c:871
++#: g10/card-util.c:861
msgid "Login data (account name): "
msgstr "登入資料 (帳號名稱): "
- #: g10/card-util.c:881
++#: g10/card-util.c:871
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
- #: g10/card-util.c:917
++#: g10/card-util.c:907
msgid "Private DO data: "
msgstr "私人的 DO 資料: "
- #: g10/card-util.c:927
++#: g10/card-util.c:917
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
- #: g10/card-util.c:1010
++#: g10/card-util.c:1000
msgid "Language preferences: "
msgstr "介面語言偏好設定: "
- #: g10/card-util.c:1018
++#: g10/card-util.c:1008
msgid "Error: invalid length of preference string.\n"
msgstr "錯誤: 無效的偏好設定字串長度\n"
- #: g10/card-util.c:1027
++#: g10/card-util.c:1017
msgid "Error: invalid characters in preference string.\n"
msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
- #: g10/card-util.c:1049
++#: g10/card-util.c:1039
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性別 ((M)男性, (F)女性或留空): "
- #: g10/card-util.c:1063
++#: g10/card-util.c:1053
msgid "Error: invalid response.\n"
msgstr "錯誤: 無效的回應.\n"
- #: g10/card-util.c:1085
++#: g10/card-util.c:1075
msgid "CA fingerprint: "
msgstr "憑證中心 (CA) 指紋: "
- #: g10/card-util.c:1108
++#: g10/card-util.c:1098
msgid "Error: invalid formatted fingerprint.\n"
msgstr "錯誤: 無效的格式化指紋.\n"
- #: g10/card-util.c:1158
++#: g10/card-util.c:1148
#, c-format
msgid "key operation not possible: %s\n"
msgstr "不可能進行金鑰操作: %s\n"
- #: g10/card-util.c:1159
++#: g10/card-util.c:1149
msgid "not an OpenPGP card"
msgstr "這不是 OpenPGP 卡片"
- #: g10/card-util.c:1172
++#: g10/card-util.c:1162
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得現用金鑰資訊時出錯: %s\n"
- #: g10/card-util.c:1259
++#: g10/card-util.c:1249
msgid "Replace existing key? (y/N) "
msgstr "是否要取代既有的金鑰? (y/N) "
- #: g10/card-util.c:1276
++#: g10/card-util.c:1266
msgid ""
"Note: There is no guarantee that the card supports the requested size.\n"
" If the key generation does not succeed, please check the\n"
@@@ -1739,55 -1338,43 +1740,55 @@@ msgstr "
" 如果金鑰產生失敗了, 煩請查閱你卡片上的文件,\n"
" 看看這張卡片支援哪些尺寸.\n"
- #: g10/card-util.c:1301
++#: g10/card-util.c:1291
#, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "你的簽署金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1303
++#: g10/card-util.c:1293
#, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1304
++#: g10/card-util.c:1294
#, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
- #: g10/card-util.c:1315 g10/keygen.c:2081 g10/keygen.c:2113
++#: g10/card-util.c:1305 g10/keygen.c:2081 g10/keygen.c:2113
+#: sm/certreqgen-ui.c:198
#, c-format
msgid "rounded up to %u bits\n"
msgstr "加大到 %u 位元\n"
- #: g10/card-util.c:1323 g10/keygen.c:2166 sm/certreqgen-ui.c:188
++#: g10/card-util.c:1313 g10/keygen.c:2166 sm/certreqgen-ui.c:188
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
- #: g10/card-util.c:1328
++#: g10/card-util.c:1318
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr "這張卡片將重新加以組態, 以便產生 %u 位元的金鑰\n"
- #: g10/card-util.c:1348
++#: g10/card-util.c:1338
#, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "將金鑰 %d 尺寸變更至 %u 位元時出錯: %s\n"
- #: g10/card-util.c:1372
++#: g10/card-util.c:1362
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
- #: g10/card-util.c:1386
++#: g10/card-util.c:1376
msgid "Note: keys are already stored on the card!\n"
msgstr "請注意: 金鑰已經存放在卡片上了!\n"
- #: g10/card-util.c:1389
++#: g10/card-util.c:1379
msgid "Replace existing keys? (y/N) "
msgstr "是否要取代既有的金鑰? (y/N) "
- #: g10/card-util.c:1401
++#: g10/card-util.c:1391
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@@ -1798,144 -1385,109 +1799,144 @@@ msgstr "
" PIN = '%s' 管理者 PIN = '%s'\n"
"你應該用 --change-pin 指令來加以變更\n"
- #: g10/card-util.c:1458
++#: g10/card-util.c:1448
msgid "Please select the type of key to generate:\n"
msgstr "請選擇你要產生的金鑰種類:\n"
- #: g10/card-util.c:1460 g10/card-util.c:1571
++#: g10/card-util.c:1450 g10/card-util.c:1561
msgid " (1) Signature key\n"
msgstr " (1) 簽署用金鑰\n"
- #: g10/card-util.c:1461 g10/card-util.c:1573
++#: g10/card-util.c:1451 g10/card-util.c:1563
msgid " (2) Encryption key\n"
msgstr " (2) 加密用金鑰\n"
- #: g10/card-util.c:1462 g10/card-util.c:1575
++#: g10/card-util.c:1452 g10/card-util.c:1565
msgid " (3) Authentication key\n"
msgstr " (3) 憑證用金鑰\n"
- #: g10/card-util.c:1479 g10/card-util.c:1600 g10/keyedit.c:1493
++#: g10/card-util.c:1469 g10/card-util.c:1590 g10/keyedit.c:1496
+#: g10/keygen.c:1772 g10/keygen.c:1800 g10/keygen.c:2029 g10/keygen.c:2288
+#: g10/revoke.c:819
msgid "Invalid selection.\n"
msgstr "無效的選擇.\n"
- #: g10/card-util.c:1568
++#: g10/card-util.c:1558
msgid "Please select where to store the key:\n"
msgstr "請選擇要把金鑰存放在哪裡:\n"
- #: g10/card-util.c:1614
++#: g10/card-util.c:1604
#, c-format
msgid "KEYTOCARD failed: %s\n"
msgstr "KEYTOCARD 失敗: %s\n"
- #: g10/card-util.c:1710
++#: g10/card-util.c:1700
#, fuzzy
#| msgid "This command is not allowed while in %s mode.\n"
msgid "This command is not supported by this card\n"
msgstr "在 %s 模式中不允許使用這個指令.\n"
- #: g10/card-util.c:1715
++#: g10/card-util.c:1705
#, fuzzy
#| msgid "Note: keys are already stored on the card!\n"
msgid "Note: This command destroys all keys stored on the card!\n"
msgstr "請注意: 金鑰已經存放在卡片上了!\n"
- #: g10/card-util.c:1718
++#: g10/card-util.c:1708
#, fuzzy
#| msgid "Continue? (Y/n) "
msgid "Continue? (y/N) "
msgstr "是否繼續? (Y/n) "
- #: g10/card-util.c:1723
++#: g10/card-util.c:1713
msgid "Really do a factory reset? (enter \"yes\") "
msgstr ""
- #: g10/card-util.c:1809 g10/keyedit.c:1853
++#: g10/card-util.c:1799 g10/keyedit.c:1856
msgid "quit this menu"
msgstr "離開這個選單"
- #: g10/card-util.c:1811
++#: g10/card-util.c:1801
msgid "show admin commands"
msgstr "顯示管理者指令"
- #: g10/card-util.c:1812 g10/keyedit.c:1856
++#: g10/card-util.c:1802 g10/keyedit.c:1859
msgid "show this help"
msgstr "顯示這份線上說明"
- #: g10/card-util.c:1814
++#: g10/card-util.c:1804
msgid "list all available data"
msgstr "列出所有可用的資料"
- #: g10/card-util.c:1817
++#: g10/card-util.c:1807
msgid "change card holder's name"
msgstr "變更卡片持有人的名字"
- #: g10/card-util.c:1818
++#: g10/card-util.c:1808
msgid "change URL to retrieve key"
msgstr "變更取回金鑰的 URL"
- #: g10/card-util.c:1819
++#: g10/card-util.c:1809
msgid "fetch the key specified in the card URL"
msgstr "從卡片 URL 取回指定的金鑰"
- #: g10/card-util.c:1820
++#: g10/card-util.c:1810
msgid "change the login name"
msgstr "變更登入名稱"
- #: g10/card-util.c:1821
++#: g10/card-util.c:1811
msgid "change the language preferences"
msgstr "變更介面語言偏好設定"
- #: g10/card-util.c:1822
++#: g10/card-util.c:1812
msgid "change card holder's sex"
msgstr "變更卡片持有者的性別"
- #: g10/card-util.c:1823
++#: g10/card-util.c:1813
msgid "change a CA fingerprint"
msgstr "變更某個憑證中心 (CA) 的指紋"
- #: g10/card-util.c:1824
++#: g10/card-util.c:1814
msgid "toggle the signature force PIN flag"
msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
- #: g10/card-util.c:1825
++#: g10/card-util.c:1815
msgid "generate new keys"
msgstr "產生新的金鑰"
- #: g10/card-util.c:1826
++#: g10/card-util.c:1816
msgid "menu to change or unblock the PIN"
msgstr "變更或重設個人識別碼 (PIN) 的選單"
- #: g10/card-util.c:1827
++#: g10/card-util.c:1817
msgid "verify the PIN and list all data"
msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
- #: g10/card-util.c:1828
++#: g10/card-util.c:1818
msgid "unblock the PIN using a Reset Code"
msgstr "用重設碼來解凍個人識別碼 (PIN)"
- #: g10/card-util.c:1829
++#: g10/card-util.c:1819
msgid "destroy all keys and data"
msgstr ""
- #: g10/card-util.c:1951
++#: g10/card-util.c:1941
msgid "gpg/card> "
msgstr "gpg/卡片> "
- #: g10/card-util.c:1992
++#: g10/card-util.c:1982
msgid "Admin-only command\n"
msgstr "限管理者使用的指令\n"
- #: g10/card-util.c:2023
++#: g10/card-util.c:2013
msgid "Admin commands are allowed\n"
msgstr "允許使用管理者指令\n"
- #: g10/card-util.c:2025
++#: g10/card-util.c:2015
msgid "Admin commands are not allowed\n"
msgstr "未允許使用管理者指令\n"
- #: g10/card-util.c:2120 g10/keyedit.c:2802
++#: g10/card-util.c:2110 g10/keyedit.c:2805
msgid "Invalid command (try \"help\")\n"
msgstr "無效的指令 (試試看 \"help\")\n"
@@@ -1943,27 -1494,18 +1944,27 @@@
msgid "--output doesn't work for this command\n"
msgstr "--output 在這個指令中沒有作用\n"
- #: g10/decrypt.c:247 g10/gpg.c:4670 g10/keyring.c:398 g10/keyring.c:771
++#: g10/decrypt.c:247 g10/gpg.c:4756 g10/keyring.c:398 g10/keyring.c:771
#, c-format
msgid "can't open '%s'\n"
msgstr "無法開啟 '%s'\n"
- #: g10/delkey.c:79 g10/export.c:1208 g10/export.c:1697 g10/export.c:1776
- #: g10/getkey.c:498 g10/getkey.c:1626 g10/gpg.c:4626 g10/keyedit.c:2036
- #: g10/keyedit.c:2970 g10/keyedit.c:4509 g10/keylist.c:658
- #: g10/keyserver.c:1238 g10/revoke.c:231
++#: g10/delkey.c:79 g10/export.c:1829 g10/export.c:2099 g10/export.c:2178
++#: g10/getkey.c:503 g10/getkey.c:1675 g10/gpg.c:4713 g10/keyedit.c:2039
++#: g10/keyedit.c:3077 g10/keyedit.c:4616 g10/keylist.c:659
++#: g10/keyserver.c:1240 g10/revoke.c:231
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "找不到金鑰 \"%s\": %s\n"
- #: g10/delkey.c:88 g10/export.c:1277 g10/getkey.c:1634 g10/getkey.c:3903
- #: g10/gpg.c:4634 g10/keyedit.c:2889 g10/keyserver.c:1256 g10/revoke.c:237
- #: g10/revoke.c:644
++#: g10/delkey.c:88 g10/export.c:1897 g10/getkey.c:1683 g10/getkey.c:3995
++#: g10/gpg.c:4721 g10/keyedit.c:2892 g10/keyedit.c:2977 g10/keyserver.c:1258
++#: g10/revoke.c:237 g10/revoke.c:644
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "讀取金鑰區塊時出錯: %s\n"
- #: g10/delkey.c:118 g10/getkey.c:574
++#: g10/delkey.c:118 g10/getkey.c:579
#, fuzzy, c-format
#| msgid "key \"%s\" not found: %s\n"
msgid "key \"%s\" not found\n"
@@@ -2016,7 -1547,6 +2017,7 @@@ msgstr "公鑰 \"%s\" 有相對應的�
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
- #: g10/encrypt.c:233 g10/sign.c:1274
++#: g10/encrypt.c:233 g10/sign.c:1277
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "建立密語時出錯: %s\n"
@@@ -2035,7 -1562,6 +2036,7 @@@ msgstr "正在使用 %s 編密法\n
msgid "'%s' already compressed\n"
msgstr "'%s' 已經被壓縮了\n"
- #: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:592
++#: g10/encrypt.c:321 g10/encrypt.c:661 g10/sign.c:593
#, c-format
msgid "WARNING: '%s' is an empty file\n"
msgstr "警告: '%s' 是個空檔案\n"
@@@ -2051,7 -1575,6 +2052,7 @@@ msgid "
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
- #: g10/encrypt.c:708 g10/sign.c:967
++#: g10/encrypt.c:708 g10/sign.c:969
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@@ -2068,17 -1589,14 +2069,17 @@@ msgstr "強迫使用 %s (%d) 對稱式�
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已加密給: \"%s\"\n"
- #: g10/encrypt.c:932 g10/pkclist.c:999 g10/pkclist.c:1050
++#: g10/encrypt.c:932 g10/pkclist.c:1011 g10/pkclist.c:1062
#, 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
++#: g10/decrypt-data.c:93 g10/mainproc.c:304
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 已加密的資料\n"
- #: g10/decrypt-data.c:96 g10/mainproc.c:310
++#: g10/decrypt-data.c:96 g10/mainproc.c:308
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以 %d 未知演算法所加密\n"
@@@ -2143,319 -1648,253 +2144,332 @@@ msgstr "警告: 無法移除暫存檔 (
msgid "WARNING: unable to remove temp directory '%s': %s\n"
msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
- #: g10/export.c:78
++#: g10/export.c:102
msgid "export signatures that are marked as local-only"
msgstr "匯出標記為僅限本機使用的簽章"
- #: g10/export.c:80
++#: g10/export.c:104
msgid "export attribute user IDs (generally photo IDs)"
msgstr "匯出署名使用者 ID (通常是照片 ID)"
- #: g10/export.c:82
++#: g10/export.c:106
msgid "export revocation keys marked as \"sensitive\""
msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
- #: g10/export.c:84
++#: g10/export.c:108
msgid "remove unusable parts from key during export"
msgstr "匯出時從金鑰中移除無法使用的部分"
- #: g10/export.c:86
++#: g10/export.c:110
msgid "remove as much as possible from key during export"
msgstr "匯出時盡可能地從金鑰中移除"
- #: g10/export.c:1144
++#: g10/export.c:1204
msgid " - skipped"
msgstr " - 已跳過"
- #: g10/export.c:1225
++#: g10/export.c:1237 g10/import.c:1373 g10/openfile.c:206 g10/openfile.c:300
++#: g10/sign.c:830 g10/sign.c:1133
+ #, c-format
+ msgid "writing to '%s'\n"
+ msgstr "正在寫入 '%s'\n"
+
++#: g10/export.c:1660
+ #, c-format
+ msgid "key %s: key material on-card - skipped\n"
+ msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
+
++#: g10/export.c:1846
msgid "exporting secret keys not allowed\n"
msgstr "不允許匯出私鑰\n"
- #: g10/export.c:1303
++#: g10/export.c:1923
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
- #: g10/export.c:1490
- #, c-format
- msgid "key %s: key material on-card - skipped\n"
- msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
-
- #: g10/export.c:1602
++#: g10/export.c:2004
msgid "WARNING: nothing exported\n"
msgstr "警告: 沒有匯出任何東西\n"
- #: g10/export.c:1859 g10/plaintext.c:136 g10/plaintext.c:145
++#: g10/export.c:2261 g10/plaintext.c:136 g10/plaintext.c:145
+#: g10/plaintext.c:151 g10/plaintext.c:174
#, c-format
msgid "error creating '%s': %s\n"
msgstr "建立 '%s' 時出錯: %s\n"
- #: g10/getkey.c:252
++#: g10/getkey.c:257
msgid "[User ID not found]"
msgstr "[找不到使用者 ID]"
- #: g10/getkey.c:501 g10/getkey.c:514 g10/getkey.c:576 g10/getkey.c:1606
- #: g10/pkclist.c:959
++#: g10/getkey.c:506 g10/getkey.c:519 g10/getkey.c:581 g10/getkey.c:1655
++#: g10/pkclist.c:971
#, fuzzy, c-format
#| msgid "missing argument for option \"%.50s\"\n"
msgid "(check argument of option '%s')\n"
msgstr "\"%.50s\" 選項遺失了引數\n"
- #: g10/getkey.c:511
++#: g10/getkey.c:516
#, c-format
msgid "Warning: '%s' should be a long key ID or a fingerprint\n"
msgstr ""
- #: g10/getkey.c:541
++#: g10/getkey.c:546
#, fuzzy, c-format
#| msgid "error closing %s: %s\n"
msgid "error looking up: %s\n"
msgstr "關閉 %s 時出錯: %s\n"
- #: g10/getkey.c:631
++#: g10/getkey.c:636
#, 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:1429
++#: g10/getkey.c:1431
#, c-format
msgid "automatically retrieved '%s' via %s\n"
msgstr "已自動取回 '%s' (經由 %s )\n"
- #: g10/getkey.c:1435
++#: g10/getkey.c:1437
#, c-format
msgid "error retrieving '%s' via %s: %s\n"
msgstr "取得 '%s' (經由 %s ) 時出錯: %s\n"
- #: g10/getkey.c:1437
++#: g10/getkey.c:1439
msgid "No fingerprint"
msgstr "沒有指紋"
- #: g10/getkey.c:1603 g10/keyedit.c:2914 g10/revoke.c:636 g10/revoke.c:701
++#: g10/getkey.c:1652 g10/keyedit.c:2917 g10/keyedit.c:3002 g10/revoke.c:636
++#: g10/revoke.c:701
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "找不到私鑰 \"%s\": %s\n"
- #: g10/getkey.c:1686
++#: g10/getkey.c:1735
#, 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:1694
++#: g10/getkey.c:1743
#, 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:1701
++#: g10/getkey.c:1750
#, c-format
msgid "all values passed to '%s' ignored\n"
msgstr ""
- #: g10/getkey.c:2496
++#: g10/getkey.c:2545
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
- #: g10/getkey.c:3323
++#: g10/getkey.c:3377
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子鑰 %s 來替換主鑰 %s\n"
- #: g10/gpg.c:409 sm/gpgsm.c:198
++#: g10/gpg.c:417 sm/gpgsm.c:198
msgid "make a signature"
msgstr "建立簽章"
- #: g10/gpg.c:410
++#: g10/gpg.c:418
msgid "make a clear text signature"
msgstr "建立明文簽章"
- #: g10/gpg.c:411 sm/gpgsm.c:200
++#: g10/gpg.c:419 sm/gpgsm.c:200
msgid "make a detached signature"
msgstr "建立分離式簽章"
- #: g10/gpg.c:412 sm/gpgsm.c:201
++#: g10/gpg.c:420 sm/gpgsm.c:201
msgid "encrypt data"
msgstr "加密資料"
- #: g10/gpg.c:414
++#: g10/gpg.c:422
msgid "encryption only with symmetric cipher"
msgstr "僅使用對稱式編密法來加密"
- #: g10/gpg.c:416 sm/gpgsm.c:203
++#: g10/gpg.c:424 sm/gpgsm.c:203
msgid "decrypt data (default)"
msgstr "資料解密 (預設)"
- #: g10/gpg.c:418 sm/gpgsm.c:204
++#: g10/gpg.c:426 sm/gpgsm.c:204
msgid "verify a signature"
msgstr "驗證簽章"
- #: g10/gpg.c:420 sm/gpgsm.c:205
++#: g10/gpg.c:428 sm/gpgsm.c:205
msgid "list keys"
msgstr "列出金鑰"
- #: g10/gpg.c:422
++#: g10/gpg.c:430
msgid "list keys and signatures"
msgstr "列出金鑰和簽章"
- #: g10/gpg.c:423
++#: g10/gpg.c:431
msgid "list and check key signatures"
msgstr "列出並檢查金鑰簽章"
- #: g10/gpg.c:424 sm/gpgsm.c:210
++#: g10/gpg.c:432 sm/gpgsm.c:210
msgid "list keys and fingerprints"
msgstr "列出金鑰和指紋"
- #: g10/gpg.c:425 sm/gpgsm.c:208
++#: g10/gpg.c:433 sm/gpgsm.c:208
msgid "list secret keys"
msgstr "列出私鑰"
- #: g10/gpg.c:427 sm/gpgsm.c:211
++#: g10/gpg.c:435 sm/gpgsm.c:211
msgid "generate a new key pair"
msgstr "產生新的金鑰對"
- #: g10/gpg.c:429
++#: g10/gpg.c:437
msgid "quickly generate a new key pair"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:431
++#: g10/gpg.c:439
#, fuzzy
#| msgid "quickly generate a new key pair"
msgid "quickly add a new user-id"
msgstr "快速產生新的金鑰對"
- #: g10/gpg.c:434
++#: g10/gpg.c:442
+ #, fuzzy
+ #| msgid "quickly generate a new key pair"
+ msgid "quickly revoke a user-id"
+ msgstr "快速產生新的金鑰對"
+
++#: g10/gpg.c:444
msgid "full featured key pair generation"
msgstr "全能金鑰對生成"
- #: g10/gpg.c:435
++#: g10/gpg.c:445
msgid "generate a revocation certificate"
msgstr "產生撤銷憑證"
- #: g10/gpg.c:437 sm/gpgsm.c:213
++#: g10/gpg.c:447 sm/gpgsm.c:213
msgid "remove keys from the public keyring"
msgstr "從公鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:439
++#: g10/gpg.c:449
msgid "remove keys from the secret keyring"
msgstr "從私鑰鑰匙圈裡移除金鑰"
- #: g10/gpg.c:441
++#: g10/gpg.c:451
msgid "quickly sign a key"
msgstr "快速簽署金鑰"
- #: g10/gpg.c:443
++#: g10/gpg.c:453
msgid "quickly sign a key locally"
msgstr "快速在本機簽署金鑰"
- #: g10/gpg.c:444
++#: g10/gpg.c:454
msgid "sign a key"
msgstr "簽署金鑰"
- #: g10/gpg.c:445
++#: g10/gpg.c:455
msgid "sign a key locally"
msgstr "僅在本機簽署金鑰"
- #: g10/gpg.c:446
++#: g10/gpg.c:456
msgid "sign or edit a key"
msgstr "簽署或編輯金鑰"
- #: g10/gpg.c:448 sm/gpgsm.c:231
++#: g10/gpg.c:458 sm/gpgsm.c:231
msgid "change a passphrase"
msgstr "更改密語"
- #: g10/gpg.c:450
++#: g10/gpg.c:460
msgid "export keys"
msgstr "匯出金鑰"
- #: g10/gpg.c:451
++#: g10/gpg.c:461
msgid "export keys to a keyserver"
msgstr "把金鑰匯出至金鑰伺服器"
- #: g10/gpg.c:452
++#: g10/gpg.c:462
msgid "import keys from a keyserver"
msgstr "從金鑰伺服器匯入金鑰"
- #: g10/gpg.c:454
++#: g10/gpg.c:464
msgid "search for keys on a keyserver"
msgstr "在金鑰伺服器上搜尋金鑰"
- #: g10/gpg.c:456
++#: g10/gpg.c:466
msgid "update all keys from a keyserver"
msgstr "從金鑰伺服器更新所有的金鑰"
- #: g10/gpg.c:462
++#: g10/gpg.c:472
msgid "import/merge keys"
msgstr "匯入/合併金鑰"
- #: g10/gpg.c:465
++#: g10/gpg.c:475
msgid "print the card status"
msgstr "列印卡片狀態"
- #: g10/gpg.c:466
++#: g10/gpg.c:476
msgid "change data on a card"
msgstr "變更卡片上的資料"
- #: g10/gpg.c:467
++#: g10/gpg.c:477
msgid "change a card's PIN"
msgstr "變更卡片的個人識別碼 (PIN)"
- #: g10/gpg.c:479
++#: g10/gpg.c:489
msgid "update the trust database"
msgstr "更新信任資料庫"
- #: g10/gpg.c:488
++#: g10/gpg.c:498
msgid "print message digests"
msgstr "印出訊息摘要"
- #: g10/gpg.c:491 sm/gpgsm.c:226
++#: g10/gpg.c:501 sm/gpgsm.c:226
msgid "run in server mode"
msgstr "以伺服器模式執行"
- #: g10/gpg.c:493
++#: g10/gpg.c:503
msgid "|VALUE|set the TOFU policy for a key"
msgstr ""
- #: g10/gpg.c:497 sm/gpgsm.c:244
++#: g10/gpg.c:507 sm/gpgsm.c:244
msgid "create ascii armored output"
msgstr "建立以 ASCII 封裝過的輸出"
- #: g10/gpg.c:500 sm/gpgsm.c:260
++#: g10/gpg.c:510 sm/gpgsm.c:260
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|使用者-ID|以指定使用者 ID 作為加密對象"
- #: g10/gpg.c:514 sm/gpgsm.c:296
++#: g10/gpg.c:526 sm/gpgsm.c:296
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
- #: g10/gpg.c:519
++#: g10/gpg.c:531
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
- #: g10/gpg.c:525
++#: g10/gpg.c:538
msgid "use canonical text mode"
msgstr "使用標準的文字模式"
- #: g10/gpg.c:542 sm/gpgsm.c:298
++#: g10/gpg.c:555 sm/gpgsm.c:298
msgid "|FILE|write output to FILE"
msgstr "|檔案|將輸出寫入至指定檔案"
- #: g10/gpg.c:556 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
++#: g10/gpg.c:569 kbx/kbxutil.c:90 sm/gpgsm.c:310 tools/gpgconf.c:92
msgid "do not make any changes"
msgstr "不要做任何改變"
- #: g10/gpg.c:557
++#: g10/gpg.c:570
msgid "prompt before overwriting"
msgstr "覆寫前先詢問"
- #: g10/gpg.c:602
++#: g10/gpg.c:618
msgid "use strict OpenPGP behavior"
msgstr "使用嚴謹的 OpenPGP 行為"
- #: g10/gpg.c:628 sm/gpgsm.c:353
++#: g10/gpg.c:644 sm/gpgsm.c:353
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@@ -2463,7 -1902,6 +2477,7 @@@ msgstr "
"@\n"
"(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
- #: g10/gpg.c:631 sm/gpgsm.c:356
++#: g10/gpg.c:647 sm/gpgsm.c:356
msgid ""
"@\n"
"Examples:\n"
@@@ -2483,11 -1921,9 +2497,11 @@@ msgstr "
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:996
++#: g10/gpg.c:1013
msgid "Usage: @GPG@ [options] [files] (-h for help)"
msgstr "用法: @GPG@ [選項] [檔案] (或用 -h 求助)"
- #: g10/gpg.c:999
++#: g10/gpg.c:1016
msgid ""
"Syntax: @GPG@ [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -2497,7 -1933,6 +2511,7 @@@ msgstr "
"簽署, 檢查, 加密, 解密\n"
"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:1010 sm/gpgsm.c:585
++#: g10/gpg.c:1027 sm/gpgsm.c:585
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -2505,580 -1940,456 +2519,586 @@@ msgstr "
"\n"
"已支援的演算法:\n"
- #: g10/gpg.c:1013
++#: g10/gpg.c:1030
msgid "Pubkey: "
msgstr "公鑰: "
- #: g10/gpg.c:1020 g10/keyedit.c:3282
++#: g10/gpg.c:1037 g10/keyedit.c:3389
msgid "Cipher: "
msgstr "編密法: "
- #: g10/gpg.c:1027
++#: g10/gpg.c:1044
msgid "Hash: "
msgstr "雜湊: "
- #: g10/gpg.c:1034 g10/keyedit.c:3331
++#: g10/gpg.c:1051 g10/keyedit.c:3438
msgid "Compression: "
msgstr "壓縮: "
- #: g10/gpg.c:1103 sm/gpgsm.c:659
++#: g10/gpg.c:1120 sm/gpgsm.c:659
#, c-format
msgid "usage: %s [options] %s\n"
msgstr "用法: %s [選項] %s\n"
- #: g10/gpg.c:1291 sm/gpgsm.c:748
++#: g10/gpg.c:1308 sm/gpgsm.c:748
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
- #: g10/gpg.c:1309
++#: g10/gpg.c:1326
#, c-format
msgid "no = sign found in group definition '%s'\n"
msgstr "在群組定義 '%s' 裡找不到 = 記號\n"
- #: g10/gpg.c:1507
++#: g10/gpg.c:1524
#, c-format
msgid "WARNING: unsafe ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1510
++#: g10/gpg.c:1527
#, c-format
msgid "WARNING: unsafe ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1513
++#: g10/gpg.c:1530
#, c-format
msgid "WARNING: unsafe ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的所有權並不安全\n"
- #: g10/gpg.c:1519
++#: g10/gpg.c:1536
#, c-format
msgid "WARNING: unsafe permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1522
++#: g10/gpg.c:1539
#, c-format
msgid "WARNING: unsafe permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1525
++#: g10/gpg.c:1542
#, c-format
msgid "WARNING: unsafe permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的權限並不安全\n"
- #: g10/gpg.c:1531
++#: g10/gpg.c:1548
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1534
++#: g10/gpg.c:1551
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1537
++#: g10/gpg.c:1554
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1543
++#: g10/gpg.c:1560
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
msgstr "警告: 家目錄 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1546
++#: g10/gpg.c:1563
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
msgstr "警告: 組態檔案 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1549
++#: g10/gpg.c:1566
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
msgstr "警告: 延伸模組 '%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1756
++#: g10/gpg.c:1773
#, c-format
msgid "unknown configuration item '%s'\n"
msgstr "未知的組態項目 '%s'\n"
- #: g10/gpg.c:1863
++#: g10/gpg.c:1880
msgid "display photo IDs during key listings"
msgstr "列出金鑰時顯示照片 ID"
- #: g10/gpg.c:1865
++#: g10/gpg.c:1882
msgid "show key usage information during key listings"
msgstr "列出金鑰時顯示金鑰用途資訊"
- #: g10/gpg.c:1867
++#: g10/gpg.c:1884
msgid "show policy URLs during signature listings"
msgstr "列出簽章時顯示原則 URL"
- #: g10/gpg.c:1869
++#: g10/gpg.c:1886
msgid "show all notations during signature listings"
msgstr "列出簽章時顯示所有的註記"
- #: g10/gpg.c:1871
++#: g10/gpg.c:1888
msgid "show IETF standard notations during signature listings"
msgstr "列出簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:1875
++#: g10/gpg.c:1892
msgid "show user-supplied notations during signature listings"
msgstr "列出簽章時顯示使用者提供的註記"
- #: g10/gpg.c:1877
++#: g10/gpg.c:1894
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:1879
++#: g10/gpg.c:1896
msgid "show user ID validity during key listings"
msgstr "列出金鑰時顯示使用者 ID 有效性"
- #: g10/gpg.c:1881
++#: g10/gpg.c:1898
msgid "show revoked and expired user IDs in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:1883
++#: g10/gpg.c:1900
msgid "show revoked and expired subkeys in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
- #: g10/gpg.c:1885
++#: g10/gpg.c:1902
msgid "show the keyring name in key listings"
msgstr "在金鑰清單中顯示鑰匙圈名稱"
- #: g10/gpg.c:1887
++#: g10/gpg.c:1904
msgid "show expiration dates during signature listings"
msgstr "列出簽章時顯示有效期限"
- #: g10/gpg.c:1989
++#: g10/gpg.c:2006
#, fuzzy
#| msgid "Available keys:\n"
msgid "available TOFU policies:\n"
msgstr "可用金鑰:\n"
- #: g10/gpg.c:2000
++#: g10/gpg.c:2017
#, 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:2019 g10/gpg.c:2043
msgid "(use \"help\" to list choices)\n"
msgstr ""
- #: g10/gpg.c:2024
++#: g10/gpg.c:2041
#, fuzzy, c-format
#| msgid "unknown command '%s'\n"
msgid "unknown TOFU DB format '%s'\n"
msgstr "未知的指令 '%s'\n"
- #: g10/gpg.c:2091
++#: g10/gpg.c:2109
#, c-format
msgid "Note: old default options file '%s' ignored\n"
msgstr "請注意: 已忽略舊有的預設選項檔 '%s'\n"
- #: g10/gpg.c:2186
++#: g10/gpg.c:2208
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
- #: g10/gpg.c:2676 g10/gpg.c:3411 g10/gpg.c:3423
++#: g10/gpg.c:2707 g10/gpg.c:3484 g10/gpg.c:3496
#, c-format
msgid "Note: %s is not for normal use!\n"
msgstr "請注意: 一般情況下不採用 %s!\n"
- #: g10/gpg.c:2863 g10/gpg.c:2875
++#: g10/gpg.c:2907 g10/gpg.c:2919
#, c-format
msgid "'%s' is not a valid signature expiration\n"
msgstr "'%s' 不是有效的簽章使用期限\n"
- #: g10/gpg.c:2916 sm/gpgsm.c:1166
++#: g10/gpg.c:2960 sm/gpgsm.c:1166
#, c-format
msgid "invalid pinentry mode '%s'\n"
msgstr "無效的個人識別碼項目模式 '%s'\n"
- #: g10/gpg.c:2969
++#: g10/gpg.c:3013
#, c-format
msgid "'%s' is not a valid character set\n"
msgstr "'%s' 不是有效的字元集\n"
- #: g10/gpg.c:2991 g10/gpg.c:3181 g10/keyedit.c:5215
++#: g10/gpg.c:3035 g10/gpg.c:3235 g10/keyedit.c:5322
msgid "could not parse keyserver URL\n"
msgstr "無法剖析金鑰伺服器 URL\n"
- #: g10/gpg.c:3009
++#: g10/gpg.c:3053
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無效的金鑰伺服器選項\n"
- #: g10/gpg.c:3012
++#: g10/gpg.c:3056
msgid "invalid keyserver options\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/gpg.c:3019
++#: g10/gpg.c:3063
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無效的匯入選項\n"
- #: g10/gpg.c:3022
++#: g10/gpg.c:3066
msgid "invalid import options\n"
msgstr "無效的匯入選項\n"
- #: g10/gpg.c:3029
++#: g10/gpg.c:3072 g10/gpg.c:3087
+ #, fuzzy, c-format
+ #| msgid "invalid list options\n"
+ msgid "invalid filter option: %s\n"
+ msgstr "無效的清單選項\n"
+
++#: g10/gpg.c:3078
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無效的匯出選項\n"
- #: g10/gpg.c:3032
++#: g10/gpg.c:3081
msgid "invalid export options\n"
msgstr "無效的匯出選項\n"
- #: g10/gpg.c:3039
++#: g10/gpg.c:3093
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無效的清單選項\n"
- #: g10/gpg.c:3042
++#: g10/gpg.c:3096
msgid "invalid list options\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:3050
++#: g10/gpg.c:3104
msgid "display photo IDs during signature verification"
msgstr "驗證簽章時顯示照片 ID"
- #: g10/gpg.c:3052
++#: g10/gpg.c:3106
msgid "show policy URLs during signature verification"
msgstr "驗證簽章時顯示原則 URL"
- #: g10/gpg.c:3054
++#: g10/gpg.c:3108
msgid "show all notations during signature verification"
msgstr "驗證簽章時顯示所有的註記"
- #: g10/gpg.c:3056
++#: g10/gpg.c:3110
msgid "show IETF standard notations during signature verification"
msgstr "驗證簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:3060
++#: g10/gpg.c:3114
msgid "show user-supplied notations during signature verification"
msgstr "驗證簽章時顯示使用者提供的註記"
- #: g10/gpg.c:3062
++#: g10/gpg.c:3116
msgid "show preferred keyserver URLs during signature verification"
msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:3064
++#: g10/gpg.c:3118
msgid "show user ID validity during signature verification"
msgstr "驗證簽章時顯示使用者 ID 有效性"
- #: g10/gpg.c:3066
++#: g10/gpg.c:3120
msgid "show revoked and expired user IDs in signature verification"
msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:3068
++#: g10/gpg.c:3122
msgid "show only the primary user ID in signature verification"
msgstr "驗證簽章時祇顯示主要的使用者 ID"
- #: g10/gpg.c:3070
++#: g10/gpg.c:3124
msgid "validate signatures with PKA data"
msgstr "以 PKA 資料驗證簽章"
- #: g10/gpg.c:3072
++#: g10/gpg.c:3126
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提高對持有有效 PKA 資料之簽章的信任"
- #: g10/gpg.c:3079
++#: g10/gpg.c:3133
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無效的驗證選項\n"
- #: g10/gpg.c:3082
++#: g10/gpg.c:3136
msgid "invalid verify options\n"
msgstr "無效的驗證選項\n"
- #: g10/gpg.c:3089
++#: g10/gpg.c:3143
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "無法把執行檔路徑設成 %s\n"
- #: g10/gpg.c:3276
++#: g10/gpg.c:3330
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3279
++#: g10/gpg.c:3333
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
- #: g10/gpg.c:3400 sm/gpgsm.c:1503
++#: g10/gpg.c:3466 sm/gpgsm.c:1503
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
- #: g10/gpg.c:3404
++#: g10/gpg.c:3477
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3486
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不允許跟 %s 併用!\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3489
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
- #: g10/gpg.c:3431 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
++#: g10/gpg.c:3504 sm/gpgsm.c:1520 dirmngr/dirmngr.c:1032
msgid "WARNING: running with faked system time: "
msgstr "警告: 正在偽造的系統時間中執行: "
- #: g10/gpg.c:3452
++#: g10/gpg.c:3525
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
- #: g10/gpg.c:3487 g10/gpg.c:3511 sm/gpgsm.c:1587
++#: g10/gpg.c:3560 g10/gpg.c:3584 sm/gpgsm.c:1587
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
- #: g10/gpg.c:3493 g10/gpg.c:3517 sm/gpgsm.c:1593 sm/gpgsm.c:1599
++#: g10/gpg.c:3566 g10/gpg.c:3590 sm/gpgsm.c:1593 sm/gpgsm.c:1599
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
- #: g10/gpg.c:3499
++#: g10/gpg.c:3572
msgid "selected compression algorithm is invalid\n"
msgstr "所選的壓縮演算法無效\n"
- #: g10/gpg.c:3505
++#: g10/gpg.c:3578
msgid "selected certification digest algorithm is invalid\n"
msgstr "所選的憑證摘要演算法無效\n"
- #: g10/gpg.c:3520
++#: g10/gpg.c:3593
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed 一定要大於 0\n"
- #: g10/gpg.c:3522
++#: g10/gpg.c:3595
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed 一定要大於 1\n"
- #: g10/gpg.c:3524
++#: g10/gpg.c:3597
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
- #: g10/gpg.c:3526
++#: g10/gpg.c:3599
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:3528
++#: g10/gpg.c:3601
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
- #: g10/gpg.c:3531
++#: g10/gpg.c:3604
msgid "Note: simple S2K mode (0) is strongly discouraged\n"
msgstr "請注意: 強烈不建議使用單純 S2K 模式 (0)\n"
- #: g10/gpg.c:3535
++#: g10/gpg.c:3608
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
- #: g10/gpg.c:3542
++#: g10/gpg.c:3615
msgid "invalid default preferences\n"
msgstr "無效的預設偏好\n"
- #: g10/gpg.c:3546
++#: g10/gpg.c:3619
msgid "invalid personal cipher preferences\n"
msgstr "無效的個人編密法偏好\n"
- #: g10/gpg.c:3550
++#: g10/gpg.c:3623
msgid "invalid personal digest preferences\n"
msgstr "無效的個人摘要偏好\n"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3627
msgid "invalid personal compress preferences\n"
msgstr "無效的個人壓縮偏好\n"
- #: g10/gpg.c:3590
++#: g10/gpg.c:3663
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
- #: g10/gpg.c:3637
++#: g10/gpg.c:3710
#, c-format
msgid "you may not use cipher algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 編密演算法用於 %s 模式\n"
- #: g10/gpg.c:3642
++#: g10/gpg.c:3715
#, c-format
msgid "you may not use digest algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 摘要演算法用於 %s 模式\n"
- #: g10/gpg.c:3647
++#: g10/gpg.c:3720
#, c-format
msgid "you may not use compression algorithm '%s' while in %s mode\n"
msgstr "你不該將 '%s' 壓縮演算法用於 %s 模式\n"
- #: g10/gpg.c:3740
++#: g10/gpg.c:3814
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信任資料庫啟始失敗: %s\n"
- #: g10/gpg.c:3752
++#: g10/gpg.c:3826
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
- #: g10/gpg.c:3808
++#: g10/gpg.c:3883
msgid "--store [filename]"
msgstr "--store [檔名]"
- #: g10/gpg.c:3818
++#: g10/gpg.c:3893
msgid "--symmetric [filename]"
msgstr "--symmetric [檔名]"
- #: g10/gpg.c:3822
++#: g10/gpg.c:3897
#, c-format
msgid "symmetric encryption of '%s' failed: %s\n"
msgstr "'%s' 對稱式加密失敗: %s\n"
- #: g10/gpg.c:3833
++#: g10/gpg.c:3908
msgid "--encrypt [filename]"
msgstr "--encrypt [檔名]"
- #: g10/gpg.c:3849
++#: g10/gpg.c:3924
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [檔名]"
- #: g10/gpg.c:3851
++#: g10/gpg.c:3926
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3854
++#: g10/gpg.c:3929
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3875
++#: g10/gpg.c:3950
msgid "--sign [filename]"
msgstr "--sign [檔名]"
- #: g10/gpg.c:3891
++#: g10/gpg.c:3966
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [檔名]"
- #: g10/gpg.c:3909
++#: g10/gpg.c:3984
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [檔名]"
- #: g10/gpg.c:3911
++#: g10/gpg.c:3986
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3914
++#: g10/gpg.c:3989
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3938
++#: g10/gpg.c:4013
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [檔名]"
- #: g10/gpg.c:3950
++#: g10/gpg.c:4025
msgid "--clearsign [filename]"
msgstr "--clearsign [檔名]"
- #: g10/gpg.c:3980
++#: g10/gpg.c:4055
msgid "--decrypt [filename]"
msgstr "--decrypt [檔名]"
- #: g10/gpg.c:4007
++#: g10/gpg.c:4082
msgid "--sign-key user-id"
msgstr "--sign-key 使用者ID"
- #: g10/gpg.c:4011
++#: g10/gpg.c:4086
msgid "--lsign-key user-id"
msgstr "--lsign-key 使用者ID"
- #: g10/gpg.c:4032
++#: g10/gpg.c:4107
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 使用者ID [指令]"
- #: g10/gpg.c:4048
++#: g10/gpg.c:4123
msgid "--passwd <user-id>"
msgstr "--passwd 使用者ID"
- #: g10/gpg.c:4232 g10/keyserver.c:1831
++#: g10/gpg.c:4319 g10/keyserver.c:1833
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "送至金鑰伺服器失敗: %s\n"
- #: g10/gpg.c:4237
++#: g10/gpg.c:4324
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "從金鑰伺服器接收失敗: %s\n"
- #: g10/gpg.c:4243
++#: g10/gpg.c:4330
#, c-format
msgid "key export failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4256
++#: g10/gpg.c:4343
#, fuzzy, c-format
#| msgid "key export failed: %s\n"
msgid "export as ssh key failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:4268
++#: g10/gpg.c:4355
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "用金鑰伺服器搜尋失敗: %s\n"
- #: g10/gpg.c:4281
++#: g10/gpg.c:4368
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "從金鑰伺服器更新失敗: %s\n"
- #: g10/gpg.c:4348
++#: g10/gpg.c:4435
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解開封裝失敗: %s\n"
- #: g10/gpg.c:4359
++#: g10/gpg.c:4446
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "進行封裝失敗: %s\n"
- #: g10/gpg.c:4451
++#: g10/gpg.c:4538
#, c-format
msgid "invalid hash algorithm '%s'\n"
msgstr "無效的雜湊演算法 '%s'\n"
- #: g10/gpg.c:4595
++#: g10/gpg.c:4682
#, 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:4607
++#: g10/gpg.c:4694
#, c-format
msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
msgstr ""
- #: g10/gpg.c:4654
++#: g10/gpg.c:4740
msgid "[filename]"
msgstr "[檔名]"
- #: g10/gpg.c:4660
++#: g10/gpg.c:4746
msgid "Go ahead and type your message ...\n"
msgstr "請開始輸入你的訊息 ...\n"
- #: g10/gpg.c:4998
++#: g10/gpg.c:5084
msgid "the given certification policy URL is invalid\n"
msgstr "給定的的憑證原則 URL 無效\n"
- #: g10/gpg.c:5000
++#: g10/gpg.c:5086
msgid "the given signature policy URL is invalid\n"
msgstr "給定的簽章原則 URL 無效\n"
- #: g10/gpg.c:5033
++#: g10/gpg.c:5119
msgid "the given preferred keyserver URL is invalid\n"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
@@@ -3119,321 -2422,259 +3139,325 @@@ msgstr "沒有可用的說明
msgid "No help available for '%s'"
msgstr "'%s' 沒有可用的說明"
- #: g10/import.c:104
++#: g10/import.c:134
msgid "import signatures that are marked as local-only"
msgstr "匯入標記為僅限本機使用的簽章"
- #: g10/import.c:107
++#: g10/import.c:137
msgid "repair damage from the pks keyserver during import"
msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
- #: g10/import.c:110
++#: g10/import.c:140
#, fuzzy
#| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
msgstr "匯入後不要更新信任資料庫"
- #: g10/import.c:113
++#: g10/import.c:143
msgid "do not update the trustdb after import"
msgstr "匯入後不要更新信任資料庫"
- #: g10/import.c:116
++#: g10/import.c:146
+ #, fuzzy
+ #| msgid "show key fingerprint"
+ msgid "show key during import"
+ msgstr "顯示金鑰指紋"
+
++#: g10/import.c:149
msgid "only accept updates to existing keys"
msgstr "祇接受既有金鑰的更新"
- #: g10/import.c:119
++#: g10/import.c:152
msgid "remove unusable parts from key after import"
msgstr "匯入後從金鑰中移除無法使用的部分"
- #: g10/import.c:122
++#: g10/import.c:155
msgid "remove as much as possible from key after import"
msgstr "匯入後盡可能地從金鑰中移除"
- #: g10/import.c:343
++#: g10/import.c:158
+ msgid "run import filters and export key immediately"
+ msgstr ""
+
++#: g10/import.c:277 g10/import.c:519
#, c-format
msgid "skipping block of type %d\n"
msgstr "正在跳過 %d 型態的區塊\n"
- #: g10/import.c:360
++#: g10/import.c:536
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已處理 %lu 把金鑰\n"
- #: g10/import.c:430
++#: g10/import.c:606
#, c-format
msgid "Total number processed: %lu\n"
msgstr "處理總量: %lu\n"
- #: g10/import.c:433
++#: g10/import.c:609
#, fuzzy, c-format
#| msgid " skipped new keys: %lu\n"
msgid " skipped PGP-2 keys: %lu\n"
msgstr " 已跳過的新金鑰: %lu\n"
- #: g10/import.c:435
++#: g10/import.c:611
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳過的新金鑰: %lu\n"
- #: g10/import.c:438
++#: g10/import.c:614
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 沒有使用者的 ID: %lu\n"
- #: g10/import.c:441 sm/import.c:130
++#: g10/import.c:617 sm/import.c:130
#, c-format
msgid " imported: %lu"
msgstr " 已匯入: %lu"
- #: g10/import.c:445 sm/import.c:134
++#: g10/import.c:621 sm/import.c:134
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改變的: %lu\n"
- #: g10/import.c:447
++#: g10/import.c:623
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新的使用者 ID: %lu\n"
- #: g10/import.c:449
++#: g10/import.c:625
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子鑰: %lu\n"
- #: g10/import.c:451
++#: g10/import.c:627
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的簽章: %lu\n"
- #: g10/import.c:453
++#: g10/import.c:629
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的金鑰撤銷: %lu\n"
- #: g10/import.c:455 sm/import.c:136
++#: g10/import.c:631 sm/import.c:136
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 已讀取的私鑰: %lu\n"
- #: g10/import.c:457 sm/import.c:138
++#: g10/import.c:633 sm/import.c:138
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 已匯入的私鑰: %lu\n"
- #: g10/import.c:459 sm/import.c:140
++#: g10/import.c:635 sm/import.c:140
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改變的私鑰: %lu\n"
- #: g10/import.c:461 sm/import.c:142
++#: g10/import.c:637 sm/import.c:142
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被匯入: %lu\n"
- #: g10/import.c:463
++#: g10/import.c:639
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 已清除的簽章: %lu\n"
- #: g10/import.c:465
++#: g10/import.c:641
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 已清除的使用者 ID: %lu\n"
- #: g10/import.c:809
++#: g10/import.c:985
#, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
- #: g10/import.c:851
++#: g10/import.c:1027
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": 編密演算法 %s 的偏好設定\n"
- #: g10/import.c:866
++#: g10/import.c:1042
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " \"%s\": 摘要演算法 %s 的偏好設定\n"
- #: g10/import.c:878
++#: g10/import.c:1054
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": 壓縮演算法 %s 的偏好設定\n"
- #: g10/import.c:891
++#: g10/import.c:1067
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "我們強烈建議你更新偏好設定, 並重新\n"
- #: g10/import.c:893
++#: g10/import.c:1069
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
- #: g10/import.c:918
++#: g10/import.c:1094
#, 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:982 g10/import.c:1710
++#: g10/import.c:1227 g10/import.c:1998
#, c-format
msgid "key %s: no user ID\n"
msgstr "金鑰 %s: 沒有使用者 ID\n"
- #: g10/import.c:988
++#: g10/import.c:1233
#, c-format
msgid "key %s: %s\n"
msgstr "金鑰 %s: %s\n"
- #: g10/import.c:989 g10/import.c:1684
++#: g10/import.c:1234 g10/import.c:1972
msgid "rejected by import screener"
msgstr "遭到匯入篩選程式駁回"
- #: g10/import.c:1019
++#: g10/import.c:1264
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
- #: g10/import.c:1035
++#: g10/import.c:1282
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
- #: g10/import.c:1045
++#: g10/import.c:1292
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
- #: g10/import.c:1047
++#: g10/import.c:1294
msgid "this may be caused by a missing self-signature\n"
msgstr "這可能肇因於遺失自我簽章所致\n"
- #: g10/import.c:1060 g10/import.c:1855
++#: g10/import.c:1347 g10/import.c:2140
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "金鑰 %s: 找不到公鑰: %s\n"
- #: g10/import.c:1066
++#: g10/import.c:1353
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
- #: g10/import.c:1081
++#: g10/import.c:1368
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可寫入的鑰匙圈: %s\n"
- #: g10/import.c:1086 g10/openfile.c:206 g10/openfile.c:300 g10/sign.c:828
- #: g10/sign.c:1130
- #, c-format
- msgid "writing to '%s'\n"
- msgstr "正在寫入 '%s'\n"
-
- #: g10/import.c:1090 g10/import.c:1191 g10/import.c:1921
++#: g10/import.c:1377 g10/import.c:1478 g10/import.c:2206
#, c-format
msgid "error writing keyring '%s': %s\n"
msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/import.c:1110
++#: g10/import.c:1397
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
- #: g10/import.c:1134
++#: g10/import.c:1421
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "金鑰 %s: 跟我們的副本不吻合\n"
- #: g10/import.c:1150 g10/import.c:1879
++#: g10/import.c:1437 g10/import.c:2164
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
- #: g10/import.c:1158 g10/import.c:1886
++#: g10/import.c:1445 g10/import.c:2171
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
- #: g10/import.c:1201
++#: g10/import.c:1488
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
- #: g10/import.c:1204
++#: g10/import.c:1491
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
- #: g10/import.c:1207
++#: g10/import.c:1494
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
- #: g10/import.c:1210
++#: g10/import.c:1497
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
- #: g10/import.c:1213
++#: g10/import.c:1500
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
- #: g10/import.c:1216
++#: g10/import.c:1503
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
- #: g10/import.c:1219
++#: g10/import.c:1506
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1222
++#: g10/import.c:1509
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
- #: g10/import.c:1225
++#: g10/import.c:1512
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1228
++#: g10/import.c:1515
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
- #: g10/import.c:1251
++#: g10/import.c:1538
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "金鑰 %s: \"%s\" 未改變\n"
- #: g10/import.c:1562 g10/import.c:1804
++#: g10/import.c:1850 g10/import.c:2092
#, c-format
msgid "key %s: secret key imported\n"
msgstr "金鑰 %s: 私鑰已匯入\n"
- #: g10/import.c:1570
++#: g10/import.c:1858
#, c-format
msgid "key %s: secret key already exists\n"
msgstr "金鑰 %s: 私鑰已存在\n"
- #: g10/import.c:1578
++#: g10/import.c:1866
#, c-format
msgid "key %s: error sending to agent: %s\n"
msgstr "金鑰 %s: 送至代理程式時出錯: %s\n"
- #: g10/import.c:1683
++#: g10/import.c:1971
#, c-format
msgid "secret key %s: %s\n"
msgstr "私鑰 %s: %s\n"
- #: g10/import.c:1703 g10/import.c:1738
++#: g10/import.c:1991 g10/import.c:2026
msgid "importing secret keys not allowed\n"
msgstr "未允許匯入私鑰\n"
- #: g10/import.c:1727
++#: g10/import.c:2015
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
@@@ -3448,87 -2689,70 +3472,87 @@@
#. suggested to run 'gpg --card-status', then,
#. references to a card will be automatically
#. created again.
- #: g10/import.c:1796
++#: g10/import.c:2084
#, c-format
msgid "To migrate '%s', with each smartcard, run: %s\n"
msgstr ""
- #: g10/import.c:1848
++#: g10/import.c:2133
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
- #: g10/import.c:1897
++#: g10/import.c:2182
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
- #: g10/import.c:1930
++#: g10/import.c:2215
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
- #: g10/import.c:2006
++#: g10/import.c:2291
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
- #: g10/import.c:2023
++#: g10/import.c:2308
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
- #: g10/import.c:2025
++#: g10/import.c:2310
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
- #: g10/import.c:2042 g10/import.c:2068 g10/import.c:2119
++#: g10/import.c:2327 g10/import.c:2353 g10/import.c:2404
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "金鑰 %s: 未支援的公鑰演算法\n"
- #: g10/import.c:2043
++#: g10/import.c:2328
#, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
- #: g10/import.c:2057
++#: g10/import.c:2342
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
- #: g10/import.c:2070
++#: g10/import.c:2355
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "金鑰 %s: 無效的附帶子鑰\n"
- #: g10/import.c:2086
++#: g10/import.c:2371
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
- #: g10/import.c:2108
++#: g10/import.c:2393
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
- #: g10/import.c:2121
++#: g10/import.c:2406
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "金鑰 %s: 無效的子鑰撤銷\n"
- #: g10/import.c:2136
++#: g10/import.c:2421
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
- #: g10/import.c:2181
++#: g10/import.c:2463
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
- #: g10/import.c:2204
++#: g10/import.c:2487
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "金鑰 %s: 子鑰已跳過\n"
@@@ -3537,52 -2761,42 +3561,52 @@@
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
- #: g10/import.c:2233
++#: g10/import.c:2516
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
- #: g10/import.c:2244
++#: g10/import.c:2527
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2262
++#: g10/import.c:2545
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
- #: g10/import.c:2276
++#: g10/import.c:2559
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
- #: g10/import.c:2284
++#: g10/import.c:2567
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
- #: g10/import.c:2413
++#: g10/import.c:2696
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
- #: g10/import.c:2477
++#: g10/import.c:2760
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
- #: g10/import.c:2493
++#: g10/import.c:2776
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
- #: g10/import.c:2557
++#: g10/import.c:2840
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
- #: g10/import.c:2595
++#: g10/import.c:2878
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
@@@ -3618,80 -2826,67 +3642,80 @@@ msgstr "金鑰區塊資源 '%s': %s\n
msgid "error opening key DB: %s\n"
msgstr "開啟 '%s' 時出錯: %s\n"
- #: g10/keydb.c:1777
++#: g10/keydb.c:1778
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立鑰匙圈快取失敗: %s\n"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[revocation]"
msgstr "[撤銷]"
- #: g10/keyedit.c:261
++#: g10/keyedit.c:264
msgid "[self-signature]"
msgstr "[自我簽章]"
- #: g10/keyedit.c:615
++#: g10/keyedit.c:618
#, fuzzy, c-format
#| msgid "key %s: unsupported public key algorithm\n"
msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
msgstr "金鑰 %s: 未支援的公鑰演算法\n"
- #: g10/keyedit.c:624
++#: g10/keyedit.c:627
#, 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:786
++#: g10/keyedit.c:789
#, fuzzy
#| msgid "Good signature from"
msgid " (reordered signatures follow)"
msgstr "完好的簽章來自於"
- #: g10/keyedit.c:899
++#: g10/keyedit.c:902
#, fuzzy, c-format
#| msgid "key %s: %s\n"
msgid "key %s:\n"
msgstr "金鑰 %s: %s\n"
- #: g10/keyedit.c:902
++#: g10/keyedit.c:905
#, 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:905 g10/keylist.c:479
++#: g10/keyedit.c:908 g10/keylist.c:480
#, 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:909 g10/keylist.c:475
++#: g10/keyedit.c:912 g10/keylist.c:476
#, fuzzy, c-format
#| msgid "%d bad signatures\n"
msgid "%d bad signature\n"
msgid_plural "%d bad signatures\n"
msgstr[0] "%d 份損壞的簽章\n"
- #: g10/keyedit.c:913
++#: g10/keyedit.c:916
#, fuzzy, c-format
#| msgid "Good signature from"
msgid "%d signature reordered\n"
msgid_plural "%d signatures reordered\n"
msgstr[0] "完好的簽章來自於"
- #: g10/keyedit.c:918
++#: g10/keyedit.c:921
#, c-format
msgid ""
"Warning: errors found and only checked self-signatures, run '%s' to check "
"all signatures.\n"
msgstr ""
- #: g10/keyedit.c:978 g10/pkclist.c:274
++#: g10/keyedit.c:981 g10/pkclist.c:274
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@@ -3701,17 -2896,14 +3725,17 @@@ msgstr "
"請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
"(像是查對身份證, 或從不同的來源檢查指紋等...)的能力\n"
- #: g10/keyedit.c:982 g10/pkclist.c:286
++#: g10/keyedit.c:985 g10/pkclist.c:286
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉強信任\n"
- #: g10/keyedit.c:983 g10/pkclist.c:288
++#: g10/keyedit.c:986 g10/pkclist.c:288
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全信任\n"
- #: g10/keyedit.c:1001
++#: g10/keyedit.c:1004
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@@ -3721,50 -2913,38 +3745,50 @@@ msgstr "
"深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
"同時也信任這把金鑰所簽署的信任簽章.\n"
- #: g10/keyedit.c:1018
++#: g10/keyedit.c:1021
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
- #: g10/keyedit.c:1146
++#: g10/keyedit.c:1149
#, c-format
msgid "Skipping user ID \"%s\", which is not a text ID.\n"
msgstr ""
- #: g10/keyedit.c:1154
++#: g10/keyedit.c:1157
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "使用者 ID \"%s\" 已撤銷."
- #: g10/keyedit.c:1163 g10/keyedit.c:1191 g10/keyedit.c:1218 g10/keyedit.c:1402
- #: g10/keyedit.c:2232
++#: g10/keyedit.c:1166 g10/keyedit.c:1194 g10/keyedit.c:1221 g10/keyedit.c:1405
++#: g10/keyedit.c:2235
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "你仍然想要簽署它嗎? (y/N) "
- #: g10/keyedit.c:1177 g10/keyedit.c:1205 g10/keyedit.c:1232 g10/keyedit.c:1408
- #: g10/keyedit.c:2237 g10/keyedit.c:3057
++#: g10/keyedit.c:1180 g10/keyedit.c:1208 g10/keyedit.c:1235 g10/keyedit.c:1411
++#: g10/keyedit.c:2240 g10/keyedit.c:3164
msgid " Unable to sign.\n"
msgstr " 無法簽署.\n"
- #: g10/keyedit.c:1182
++#: g10/keyedit.c:1185
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "使用者 ID \"%s\" 已過期."
- #: g10/keyedit.c:1210
++#: g10/keyedit.c:1213
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "使用者 ID \"%s\" 未經自我簽署."
- #: g10/keyedit.c:1239
++#: g10/keyedit.c:1242
#, c-format
msgid "User ID \"%s\" is signable. "
msgstr "使用者 ID \"%s\" 可被簽署."
- #: g10/keyedit.c:1241
++#: g10/keyedit.c:1244
msgid "Sign it? (y/N) "
msgstr "是否要簽署? (y/N) "
- #: g10/keyedit.c:1268
++#: g10/keyedit.c:1271
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@@ -3773,11 -2953,9 +3797,11 @@@ msgstr "
"\"%s\" 裡的自我簽章\n"
"是 PGP 2.x 型態的簽章.\n"
- #: g10/keyedit.c:1277
++#: g10/keyedit.c:1280
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "你是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
- #: g10/keyedit.c:1290
++#: g10/keyedit.c:1293
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3786,11 -2964,9 +3810,11 @@@ msgstr "
"你目前在 \"%s\" 的簽章\n"
"已經過期了.\n"
- #: g10/keyedit.c:1295
++#: g10/keyedit.c:1298
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "你想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
- #: g10/keyedit.c:1316
++#: g10/keyedit.c:1319
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
@@@ -3799,43 -2975,34 +3823,43 @@@ msgstr "
"你目前在 \"%s\" 的簽章\n"
"是一份本機簽章.\n"
- #: g10/keyedit.c:1321
++#: g10/keyedit.c:1324
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "你是否想要把他升級成可以完全匯出的簽章? (y/N) "
- #: g10/keyedit.c:1341
++#: g10/keyedit.c:1344
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
- #: g10/keyedit.c:1345
++#: g10/keyedit.c:1348
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
- #: g10/keyedit.c:1350
++#: g10/keyedit.c:1353
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "你仍然想要再次簽署它嗎? (y/N) "
- #: g10/keyedit.c:1372
++#: g10/keyedit.c:1375
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "沒有東西可以讓金鑰 %s 簽署\n"
- #: g10/keyedit.c:1396
++#: g10/keyedit.c:1399
msgid "This key has expired!"
msgstr "這把金鑰已經過期了!"
- #: g10/keyedit.c:1414
++#: g10/keyedit.c:1417
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "這把金鑰將在 %s 過期.\n"
- #: g10/keyedit.c:1420
++#: g10/keyedit.c:1423
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
- #: g10/keyedit.c:1461
++#: g10/keyedit.c:1464
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@@ -3844,31 -3011,25 +3868,31 @@@ msgstr "
"你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
"如果你不知道這個問題的答案, 請輸入 \"0\".\n"
- #: g10/keyedit.c:1466
++#: g10/keyedit.c:1469
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答.%s\n"
- #: g10/keyedit.c:1468
++#: g10/keyedit.c:1471
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本沒有檢查過.%s\n"
- #: g10/keyedit.c:1470
++#: g10/keyedit.c:1473
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我隨意檢查過了.%s\n"
- #: g10/keyedit.c:1473
++#: g10/keyedit.c:1476
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地檢查過了.%s\n"
- #: g10/keyedit.c:1480
++#: g10/keyedit.c:1483
msgid "Your selection? (enter '?' for more information): "
msgstr "你的選擇是? (輸入 '?' 以取得更多資訊): "
- #: g10/keyedit.c:1507
++#: g10/keyedit.c:1510
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@@ -3877,220 -3038,166 +3901,220 @@@ msgstr "
"你真的確定要用你的金鑰 \"%s\" (%s)\n"
"來簽署這把金鑰嗎\n"
- #: g10/keyedit.c:1515
++#: g10/keyedit.c:1518
msgid "This will be a self-signature.\n"
msgstr "這將會是一份自我簽章.\n"
- #: g10/keyedit.c:1520
++#: g10/keyedit.c:1523
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
- #: g10/keyedit.c:1527
++#: g10/keyedit.c:1530
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
- #: g10/keyedit.c:1537
++#: g10/keyedit.c:1540
msgid "The signature will be marked as non-exportable.\n"
msgstr "這份簽章會被標記成不可匯出.\n"
- #: g10/keyedit.c:1544
++#: g10/keyedit.c:1547
msgid "The signature will be marked as non-revocable.\n"
msgstr "這份簽章會被標記成不可撤銷.\n"
- #: g10/keyedit.c:1551
++#: g10/keyedit.c:1554
msgid "I have not checked this key at all.\n"
msgstr "我根本沒有檢查過這把金鑰.\n"
- #: g10/keyedit.c:1556
++#: g10/keyedit.c:1559
msgid "I have checked this key casually.\n"
msgstr "我隨意檢查過這把金鑰了.\n"
- #: g10/keyedit.c:1561
++#: g10/keyedit.c:1564
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地檢查過這把金鑰了.\n"
- #: g10/keyedit.c:1573
++#: g10/keyedit.c:1576
msgid "Really sign? (y/N) "
msgstr "真的要簽署嗎? (y/N)"
- #: g10/keyedit.c:1624 g10/keyedit.c:6087 g10/keyedit.c:6179 g10/keyedit.c:6244
- #: g10/keyedit.c:6306 g10/sign.c:307
++#: g10/keyedit.c:1627 g10/keyedit.c:6194 g10/keyedit.c:6277 g10/keyedit.c:6385
++#: g10/keyedit.c:6447 g10/sign.c:308
#, c-format
msgid "signing failed: %s\n"
msgstr "簽署時失敗: %s\n"
- #: g10/keyedit.c:1711
++#: g10/keyedit.c:1714
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
- #: g10/keyedit.c:1741
++#: g10/keyedit.c:1744
#, c-format
msgid "key %s: error changing passphrase: %s\n"
msgstr "金鑰 %s: 變更密語時出錯: %s\n"
- #: g10/keyedit.c:1855
++#: g10/keyedit.c:1858
msgid "save and quit"
msgstr "儲存並離開"
- #: g10/keyedit.c:1858
++#: g10/keyedit.c:1861
msgid "show key fingerprint"
msgstr "顯示金鑰指紋"
- #: g10/keyedit.c:1859
++#: g10/keyedit.c:1862
#, fuzzy
#| msgid "Enter the keygrip: "
msgid "show the keygrip"
msgstr "請輸入金鑰鑰柄: "
- #: g10/keyedit.c:1860
++#: g10/keyedit.c:1863
msgid "list key and user IDs"
msgstr "列出金鑰和使用者 ID"
- #: g10/keyedit.c:1862
++#: g10/keyedit.c:1865
msgid "select user ID N"
msgstr "選擇使用者 ID N"
- #: g10/keyedit.c:1863
++#: g10/keyedit.c:1866
msgid "select subkey N"
msgstr "選擇子鑰 N"
- #: g10/keyedit.c:1864
++#: g10/keyedit.c:1867
msgid "check signatures"
msgstr "檢查簽章"
- #: g10/keyedit.c:1870
++#: g10/keyedit.c:1873
msgid "sign selected user IDs [* see below for related commands]"
msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
- #: g10/keyedit.c:1875
++#: g10/keyedit.c:1878
msgid "sign selected user IDs locally"
msgstr "僅在本機簽署所選的使用者 ID"
- #: g10/keyedit.c:1876
++#: g10/keyedit.c:1879
msgid "sign selected user IDs with a trust signature"
msgstr "用信任簽章來簽署所選的使用者 ID"
- #: g10/keyedit.c:1878
++#: g10/keyedit.c:1881
msgid "sign selected user IDs with a non-revocable signature"
msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
- #: g10/keyedit.c:1880
++#: g10/keyedit.c:1883
msgid "add a user ID"
msgstr "增加使用者 ID"
- #: g10/keyedit.c:1882
++#: g10/keyedit.c:1885
msgid "add a photo ID"
msgstr "增加照片 ID"
- #: g10/keyedit.c:1883
++#: g10/keyedit.c:1886
msgid "delete selected user IDs"
msgstr "刪除所選的使用者 ID"
- #: g10/keyedit.c:1886
++#: g10/keyedit.c:1889
msgid "add a subkey"
msgstr "增加子鑰"
- #: g10/keyedit.c:1889
++#: g10/keyedit.c:1892
msgid "add a key to a smartcard"
msgstr "將金鑰加到智慧卡"
- #: g10/keyedit.c:1891
++#: g10/keyedit.c:1894
msgid "move a key to a smartcard"
msgstr "將金鑰移動到智慧卡"
- #: g10/keyedit.c:1893
++#: g10/keyedit.c:1896
msgid "move a backup key to a smartcard"
msgstr "將備份金鑰移動到智慧卡"
- #: g10/keyedit.c:1895
++#: g10/keyedit.c:1898
msgid "delete selected subkeys"
msgstr "刪除所選的子鑰"
- #: g10/keyedit.c:1897
++#: g10/keyedit.c:1900
msgid "add a revocation key"
msgstr "增加撤銷金鑰"
- #: g10/keyedit.c:1899
++#: g10/keyedit.c:1902
msgid "delete signatures from the selected user IDs"
msgstr "從所選的使用者 ID 中刪除簽章"
- #: g10/keyedit.c:1901
++#: g10/keyedit.c:1904
msgid "change the expiration date for the key or selected subkeys"
msgstr "變更金鑰或所選子鑰的使用期限"
- #: g10/keyedit.c:1903
++#: g10/keyedit.c:1906
msgid "flag the selected user ID as primary"
msgstr "把所選的使用者 ID 標為主要"
- #: g10/keyedit.c:1906
++#: g10/keyedit.c:1909
msgid "list preferences (expert)"
msgstr "列出偏好 (專家模式)"
- #: g10/keyedit.c:1907
++#: g10/keyedit.c:1910
msgid "list preferences (verbose)"
msgstr "列出偏好 (囉唆模式)"
- #: g10/keyedit.c:1909
++#: g10/keyedit.c:1912
msgid "set preference list for the selected user IDs"
msgstr "設定所選使用者 ID 的偏好清單"
- #: g10/keyedit.c:1912
++#: g10/keyedit.c:1915
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
- #: g10/keyedit.c:1914
++#: g10/keyedit.c:1917
msgid "set a notation for the selected user IDs"
msgstr "為所選的使用者 ID 設定註記"
- #: g10/keyedit.c:1916
++#: g10/keyedit.c:1919
msgid "change the passphrase"
msgstr "更改密語"
- #: g10/keyedit.c:1919
++#: g10/keyedit.c:1922
msgid "change the ownertrust"
msgstr "更改主觀信任"
- #: g10/keyedit.c:1922
++#: g10/keyedit.c:1925
msgid "revoke signatures on the selected user IDs"
msgstr "撤銷所選使用者 ID 的簽章"
- #: g10/keyedit.c:1924
++#: g10/keyedit.c:1927
msgid "revoke selected user IDs"
msgstr "撤銷所選的使用者 ID"
- #: g10/keyedit.c:1927
++#: g10/keyedit.c:1930
msgid "revoke key or selected subkeys"
msgstr "撤銷金鑰或所選的子鑰"
- #: g10/keyedit.c:1929
++#: g10/keyedit.c:1932
msgid "enable key"
msgstr "啟用金鑰"
- #: g10/keyedit.c:1930
++#: g10/keyedit.c:1933
msgid "disable key"
msgstr "停用金鑰"
- #: g10/keyedit.c:1932
++#: g10/keyedit.c:1935
msgid "show selected photo IDs"
msgstr "顯示所選的照片 ID"
- #: g10/keyedit.c:1934
++#: g10/keyedit.c:1937
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
- #: g10/keyedit.c:1936
++#: g10/keyedit.c:1939
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
- #: g10/keyedit.c:2048
++#: g10/keyedit.c:2051
msgid "Secret key is available.\n"
msgstr "私鑰可用.\n"
- #: g10/keyedit.c:2148
++#: g10/keyedit.c:2151
msgid "Need the secret key to do this.\n"
msgstr "要有私鑰纔能這麼做.\n"
- #: g10/keyedit.c:2169
++#: g10/keyedit.c:2172
msgid ""
"* The 'sign' command may be prefixed with an 'l' for local signatures "
"(lsign),\n"
@@@ -4101,254 -3208,201 +4125,260 @@@ msgstr "
" 加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是不可撤銷簽章\n"
" (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
- #: g10/keyedit.c:2225 g10/keyedit.c:3057 g10/keyedit.c:3196
++#: g10/keyedit.c:2228 g10/keyedit.c:3164 g10/keyedit.c:3303
msgid "Key is revoked."
msgstr "金鑰已撤銷."
- #: g10/keyedit.c:2248
++#: g10/keyedit.c:2251
msgid "Really sign all user IDs? (y/N) "
msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2252
++#: g10/keyedit.c:2255
#, 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:2260
++#: g10/keyedit.c:2263
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示: 選擇使用者 ID 來加以簽署\n"
- #: g10/keyedit.c:2271
++#: g10/keyedit.c:2274
#, c-format
msgid "Unknown signature type '%s'\n"
msgstr "未知的簽章種類 '%s'\n"
- #: g10/keyedit.c:2295
++#: g10/keyedit.c:2298
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允許使用這個指令.\n"
- #: g10/keyedit.c:2317 g10/keyedit.c:2341 g10/keyedit.c:2535
++#: g10/keyedit.c:2320 g10/keyedit.c:2344 g10/keyedit.c:2538
msgid "You must select at least one user ID.\n"
msgstr "你至少得選擇一個使用者 ID.\n"
- #: g10/keyedit.c:2319 g10/keyedit.c:2343 g10/keyedit.c:2497 g10/keyedit.c:2537
++#: g10/keyedit.c:2322 g10/keyedit.c:2346 g10/keyedit.c:2500 g10/keyedit.c:2540
#, c-format
msgid "(Use the '%s' command.)\n"
msgstr ""
- #: g10/keyedit.c:2322
++#: g10/keyedit.c:2325
msgid "You can't delete the last user ID!\n"
msgstr "你不能刪除最後一個使用者 ID!\n"
- #: g10/keyedit.c:2325
++#: g10/keyedit.c:2328
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2326
++#: g10/keyedit.c:2329
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:2383
++#: g10/keyedit.c:2386
msgid "Really move the primary key? (y/N) "
msgstr "真的要移動主鑰嗎? (y/N) "
- #: g10/keyedit.c:2395 g10/keyedit.c:4743
++#: g10/keyedit.c:2398 g10/keyedit.c:4850
msgid "You must select exactly one key.\n"
msgstr "你一定祇得選擇一把金鑰.\n"
- #: g10/keyedit.c:2422
++#: g10/keyedit.c:2425
msgid "Command expects a filename argument\n"
msgstr "這項指令要拿一個檔名來當作引數\n"
- #: g10/keyedit.c:2443
++#: g10/keyedit.c:2446
#, c-format
msgid "Can't open '%s': %s\n"
msgstr "無法開啟 '%s': %s\n"
- #: g10/keyedit.c:2460
++#: g10/keyedit.c:2463
#, c-format
msgid "Error reading backup key from '%s': %s\n"
msgstr "從 '%s' 讀取備份金鑰時出錯: %s\n"
- #: g10/keyedit.c:2495
++#: g10/keyedit.c:2498
msgid "You must select at least one key.\n"
msgstr "你至少得選擇一把金鑰.\n"
- #: g10/keyedit.c:2501
++#: g10/keyedit.c:2504
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
- #: g10/keyedit.c:2503
++#: g10/keyedit.c:2506
msgid "Do you really want to delete this key? (y/N) "
msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
- #: g10/keyedit.c:2541
++#: g10/keyedit.c:2544
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2542
++#: g10/keyedit.c:2545
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
- #: g10/keyedit.c:2560
++#: g10/keyedit.c:2563
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
- #: g10/keyedit.c:2571
++#: g10/keyedit.c:2574
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
- #: g10/keyedit.c:2573
++#: g10/keyedit.c:2576
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
- #: g10/keyedit.c:2631
++#: g10/keyedit.c:2634
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
- #: g10/keyedit.c:2676
++#: g10/keyedit.c:2679
msgid "Set preference list to:\n"
msgstr "設定偏好清單至:\n"
- #: g10/keyedit.c:2683
++#: g10/keyedit.c:2686
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
- #: g10/keyedit.c:2685
++#: g10/keyedit.c:2688
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新偏好設定嗎? (y/N) "
- #: g10/keyedit.c:2759
++#: g10/keyedit.c:2762
msgid "Save changes? (y/N) "
msgstr "要儲存變更嗎? (y/N) "
- #: g10/keyedit.c:2763
++#: g10/keyedit.c:2766
msgid "Quit without saving? (y/N) "
msgstr "要不儲存就離開嗎? (y/N) "
- #: g10/keyedit.c:2774 g10/keyedit.c:2784 g10/keyedit.c:2926 g10/keyedit.c:3147
- #: g10/keyedit.c:3212
++#: g10/keyedit.c:2777 g10/keyedit.c:2787 g10/keyedit.c:2929 g10/keyedit.c:3032
++#: g10/keyedit.c:3254 g10/keyedit.c:3319
#, c-format
msgid "update failed: %s\n"
msgstr "更新失敗: %s\n"
- #: g10/keyedit.c:2790 g10/keyedit.c:3152 g10/keyedit.c:3217
++#: g10/keyedit.c:2793 g10/keyedit.c:3259 g10/keyedit.c:3324
msgid "Key not changed so no update needed.\n"
msgstr "金鑰沒有變更所以不需要更新.\n"
- #: g10/keyedit.c:2963
++#: g10/keyedit.c:3025
+ #, fuzzy, c-format
+ #| msgid "Key generation failed: %s\n"
+ msgid "User ID revocation failed: %s\n"
+ msgstr "產生金鑰失敗: %s\n"
+
++#: g10/keyedit.c:3070
#, c-format
msgid "\"%s\" is not a fingerprint\n"
msgstr "\"%s\" 不是指紋\n"
- #: g10/keyedit.c:2992
++#: g10/keyedit.c:3099
#, c-format
msgid "\"%s\" is not the primary fingerprint\n"
msgstr "\"%s\" 不是主要指紋\n"
- #: g10/keyedit.c:3128 g10/keyedit.c:3131
++#: g10/keyedit.c:3235 g10/keyedit.c:3238
#, fuzzy, c-format
#| msgid "invalid value\n"
msgid "Invalid user ID '%s': %s\n"
msgstr "無效的數值\n"
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "No matching user IDs."
msgstr "沒有相符的使用者 ID."
- #: g10/keyedit.c:3134
++#: g10/keyedit.c:3241
msgid "Nothing to sign.\n"
msgstr "沒有東西可以簽署.\n"
- #: g10/keyedit.c:3307
++#: g10/keyedit.c:3414
msgid "Digest: "
msgstr "摘要: "
- #: g10/keyedit.c:3364
++#: g10/keyedit.c:3471
msgid "Features: "
msgstr "特點: "
- #: g10/keyedit.c:3375
++#: g10/keyedit.c:3482
msgid "Keyserver no-modify"
msgstr "金鑰伺服器無修改"
- #: g10/keyedit.c:3390 g10/keylist.c:376
++#: g10/keyedit.c:3497 g10/keylist.c:377
msgid "Preferred keyserver: "
msgstr "偏好的金鑰伺服器: "
- #: g10/keyedit.c:3398 g10/keyedit.c:3399
++#: g10/keyedit.c:3505 g10/keyedit.c:3506
msgid "Notations: "
msgstr "註記: "
- #: g10/keyedit.c:3644
++#: g10/keyedit.c:3751
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
- #: g10/keyedit.c:3716
++#: g10/keyedit.c:3823
#, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
- #: g10/keyedit.c:3740
++#: g10/keyedit.c:3847
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
- #: g10/keyedit.c:3746
++#: g10/keyedit.c:3853
msgid "(sensitive)"
msgstr "(機密)"
- #: g10/keyedit.c:3788 g10/keyedit.c:3930 g10/keylist.c:261 g10/keyserver.c:534
++#: g10/keyedit.c:3895 g10/keyedit.c:4037 g10/keylist.c:262 g10/keyserver.c:536
#, c-format
msgid "created: %s"
msgstr "建立: %s"
- #: g10/keyedit.c:3791 g10/keylist.c:1987
++#: g10/keyedit.c:3898 g10/keylist.c:1843
#, c-format
msgid "revoked: %s"
msgstr "撤銷: %s"
# of subkey
- #: g10/keyedit.c:3793 g10/keylist.c:1993
++#: g10/keyedit.c:3900 g10/keylist.c:1849
#, c-format
msgid "expired: %s"
msgstr "過期: %s"
# of subkey
- #: g10/keyedit.c:3795 g10/keyedit.c:3932 g10/keylist.c:263 g10/keylist.c:1999
- #: g10/keyserver.c:540
++#: g10/keyedit.c:3902 g10/keyedit.c:4039 g10/keylist.c:264 g10/keylist.c:1855
++#: g10/keyserver.c:542
#, c-format
msgid "expires: %s"
msgstr "到期: %s"
- #: g10/keyedit.c:3797
++#: g10/keyedit.c:3904
#, c-format
msgid "usage: %s"
msgstr "用途: %s"
- #: g10/keyedit.c:3805 g10/keyedit.c:3825 g10/keylist.c:266
++#: g10/keyedit.c:3912 g10/keyedit.c:3932 g10/keylist.c:267
msgid "card-no: "
msgstr "卡片編號: "
- #: g10/keyedit.c:3864
++#: g10/keyedit.c:3971
#, c-format
msgid "trust: %s"
msgstr "信任: %s"
- #: g10/keyedit.c:3868
++#: g10/keyedit.c:3975
#, c-format
msgid "validity: %s"
msgstr "有效性: %s"
- #: g10/keyedit.c:3875
++#: g10/keyedit.c:3982
msgid "This key has been disabled"
msgstr "這把金鑰已經停用了"
- #: g10/keyedit.c:3893
++#: g10/keyedit.c:4000
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
@@@ -4356,17 -3410,12 +4386,17 @@@ msgstr "
"請注意顯示出來的金鑰有效性不需要更正,\n"
"除非你重新執行程式.\n"
- #: g10/keyedit.c:3949 g10/keyedit.c:4377 g10/keyserver.c:544
- #: g10/mainproc.c:2008 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
++#: g10/keyedit.c:4056 g10/keyedit.c:4484 g10/keyserver.c:546
++#: g10/mainproc.c:2013 g10/trust.c:384 g10/trust.c:689 dirmngr/ocsp.c:707
msgid "revoked"
msgstr "已撤銷"
- #: g10/keyedit.c:3951 g10/keyedit.c:4379 g10/keyserver.c:548
- #: g10/mainproc.c:2010 g10/trust.c:104 g10/trust.c:691
++#: g10/keyedit.c:4058 g10/keyedit.c:4486 g10/keyserver.c:550
++#: g10/mainproc.c:2015 g10/trust.c:104 g10/trust.c:691
msgid "expired"
msgstr "已過期"
- #: g10/keyedit.c:4068
++#: g10/keyedit.c:4175
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
@@@ -4374,15 -3423,12 +4404,15 @@@ msgstr "
"警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
" 導致不同的使用者 ID 被當成主要 ID.\n"
- #: g10/keyedit.c:4120
++#: g10/keyedit.c:4227
msgid "WARNING: Your encryption subkey expires soon.\n"
msgstr "警告: 你的加密子鑰很快將到期.\n"
- #: g10/keyedit.c:4121
++#: g10/keyedit.c:4228
msgid "You may want to change its expiration date too.\n"
msgstr "你可能也會想變更其使用期限.\n"
- #: g10/keyedit.c:4180
++#: g10/keyedit.c:4287
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4391,72 -3437,57 +4421,72 @@@ msgstr "
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:4185 g10/keyedit.c:4472
++#: g10/keyedit.c:4292 g10/keyedit.c:4579
msgid "Are you sure you still want to add it? (y/N) "
msgstr "你確定仍然想要增加嗎? (y/N) "
- #: g10/keyedit.c:4191
++#: g10/keyedit.c:4298
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
- #: g10/keyedit.c:4204 g10/keygen.c:2676
++#: g10/keyedit.c:4311 g10/keygen.c:2676
msgid "Such a user ID already exists on this key!\n"
msgstr "這把金鑰上已經有這樣子的使用者 ID 了!\n"
- #: g10/keyedit.c:4305
++#: g10/keyedit.c:4412
msgid "Delete this good signature? (y/N/q)"
msgstr "刪除這份完好的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:4315
++#: g10/keyedit.c:4422
msgid "Delete this invalid signature? (y/N/q)"
msgstr "刪除這份無效的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:4319
++#: g10/keyedit.c:4426
msgid "Delete this unknown signature? (y/N/q)"
msgstr "刪除這份未知的簽章嗎? (y/N/q)"
- #: g10/keyedit.c:4326
++#: g10/keyedit.c:4433
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要刪除這份自我簽章嗎? (y/N)"
- #: g10/keyedit.c:4342
++#: g10/keyedit.c:4449
#, 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:4346
++#: g10/keyedit.c:4453
msgid "Nothing deleted.\n"
msgstr "沒有刪除任何東西.\n"
- #: g10/keyedit.c:4381 g10/trust.c:693
++#: g10/keyedit.c:4488 g10/trust.c:693
msgid "invalid"
msgstr "無效"
- #: g10/keyedit.c:4383
++#: g10/keyedit.c:4490
#, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "使用者 ID \"%s\" 已精簡: %s\n"
- #: g10/keyedit.c:4389
++#: g10/keyedit.c:4496
#, 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:4397
++#: g10/keyedit.c:4504
#, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "使用者 ID \"%s\": 已經最小化了\n"
- #: g10/keyedit.c:4398
++#: g10/keyedit.c:4505
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
- #: g10/keyedit.c:4467
++#: g10/keyedit.c:4574
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@@ -4465,39 -3496,31 +4495,39 @@@ msgstr "
"警告: 這是一把 PGP2 型態的金鑰.\n"
" 增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
- #: g10/keyedit.c:4478
++#: g10/keyedit.c:4585
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
- #: g10/keyedit.c:4495
++#: g10/keyedit.c:4602
msgid "Enter the user ID of the designated revoker: "
msgstr "輸入指定撤銷者的使用者 ID: "
- #: g10/keyedit.c:4520
++#: g10/keyedit.c:4627
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:4535
++#: g10/keyedit.c:4642
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
- #: g10/keyedit.c:4557
++#: g10/keyedit.c:4664
msgid "this key has already been designated as a revoker\n"
msgstr "已指定這把金鑰為撤銷者了\n"
- #: g10/keyedit.c:4575
++#: g10/keyedit.c:4682
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
- #: g10/keyedit.c:4581
++#: g10/keyedit.c:4688
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
- #: g10/keyedit.c:4632
++#: g10/keyedit.c:4739
#, fuzzy
#| msgid ""
#| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@@ -4506,156 -3529,126 +4536,161 @@@ msgid "
"N) "
msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
- #: g10/keyedit.c:4637
++#: g10/keyedit.c:4744
msgid "Changing expiration time for a subkey.\n"
msgstr "正在變更子鑰的使用期限.\n"
- #: g10/keyedit.c:4640
++#: g10/keyedit.c:4747
msgid "Changing expiration time for the primary key.\n"
msgstr "正在變更主鑰的使用期限.\n"
- #: g10/keyedit.c:4691
++#: g10/keyedit.c:4798
msgid "You can't change the expiration date of a v3 key\n"
msgstr "你不能變更 v3 金鑰的使用期限\n"
- #: g10/keyedit.c:4864
++#: g10/keyedit.c:4971
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "簽署子鑰 %s 已經交叉認證過了\n"
- #: g10/keyedit.c:4870
++#: g10/keyedit.c:4977
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
- #: g10/keyedit.c:4985
++#: g10/keyedit.c:5092
msgid "Please select exactly one user ID.\n"
msgstr "請祇選擇一個使用者 ID.\n"
- #: g10/keyedit.c:5026 g10/keyedit.c:5140 g10/keyedit.c:5253 g10/keyedit.c:5390
++#: g10/keyedit.c:5133 g10/keyedit.c:5247 g10/keyedit.c:5360 g10/keyedit.c:5497
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
- #: g10/keyedit.c:5197
++#: g10/keyedit.c:5304
msgid "Enter your preferred keyserver URL: "
msgstr "請輸入你的偏好金鑰伺服器 URL: "
- #: g10/keyedit.c:5276
++#: g10/keyedit.c:5383
msgid "Are you sure you want to replace it? (y/N) "
msgstr "你確定要取代它嗎? (y/N) "
- #: g10/keyedit.c:5277
++#: g10/keyedit.c:5384
msgid "Are you sure you want to delete it? (y/N) "
msgstr "你確定要刪除它嗎? (y/N) "
- #: g10/keyedit.c:5336
++#: g10/keyedit.c:5443
msgid "Enter the notation: "
msgstr "請輸入註記: "
- #: g10/keyedit.c:5483
++#: g10/keyedit.c:5590
msgid "Proceed? (y/N) "
msgstr "是否繼續? (y/N) "
- #: g10/keyedit.c:5553
++#: g10/keyedit.c:5660
#, c-format
msgid "No user ID with index %d\n"
msgstr "索引 %d 沒有對應到使用者 ID\n"
- #: g10/keyedit.c:5615
++#: g10/keyedit.c:5722
#, c-format
msgid "No user ID with hash %s\n"
msgstr "雜湊 %s 沒有對應到使用者 ID\n"
- #: g10/keyedit.c:5716
++#: g10/keyedit.c:5823
#, fuzzy, c-format
#| msgid "No subkey with index %d\n"
msgid "No subkey with key ID '%s'.\n"
msgstr "索引 %d 沒有對應到子鑰\n"
- #: g10/keyedit.c:5738
++#: g10/keyedit.c:5845
#, c-format
msgid "No subkey with index %d\n"
msgstr "索引 %d 沒有對應到子鑰\n"
- #: g10/keyedit.c:5879
++#: g10/keyedit.c:5986
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "使用者 ID: \"%s\"\n"
- #: g10/keyedit.c:5882 g10/keyedit.c:5984 g10/keyedit.c:6032
++#: g10/keyedit.c:5989 g10/keyedit.c:6091 g10/keyedit.c:6139
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
- #: g10/keyedit.c:5884 g10/keyedit.c:5986 g10/keyedit.c:6034
++#: g10/keyedit.c:5991 g10/keyedit.c:6093 g10/keyedit.c:6141
msgid " (non-exportable)"
msgstr " (不可匯出)"
- #: g10/keyedit.c:5888
++#: g10/keyedit.c:5995
#, c-format
msgid "This signature expired on %s.\n"
msgstr "這份簽章已經在 %s 過期了.\n"
- #: g10/keyedit.c:5893
++#: g10/keyedit.c:6000
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "你確定仍然想要撤銷它嗎? (y/N) "
- #: g10/keyedit.c:5898
++#: g10/keyedit.c:6005
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
- #: g10/keyedit.c:5952
++#: g10/keyedit.c:6059
msgid "Not signed by you.\n"
msgstr "並非由你所簽署.\n"
- #: g10/keyedit.c:5958
++#: g10/keyedit.c:6065
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
- #: g10/keyedit.c:5987
++#: g10/keyedit.c:6094
msgid " (non-revocable)"
msgstr " (不可撤銷)"
- #: g10/keyedit.c:5994
++#: g10/keyedit.c:6101
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
- #: g10/keyedit.c:6019
++#: g10/keyedit.c:6126
msgid "You are about to revoke these signatures:\n"
msgstr "你正要撤銷這些簽章:\n"
- #: g10/keyedit.c:6042
++#: g10/keyedit.c:6149
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要建立撤銷憑證嗎? (y/N) "
- #: g10/keyedit.c:6075
++#: g10/keyedit.c:6182
msgid "no secret key\n"
msgstr "沒有私鑰\n"
- #: g10/keyedit.c:6144
++#: g10/keyedit.c:6230
+ #, c-format
+ msgid "tried to revoke a non-user ID: %s\n"
+ msgstr ""
+
++#: g10/keyedit.c:6240
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "使用者 ID \"%s\" 已撤銷\n"
- #: g10/keyedit.c:6161
++#: g10/keyedit.c:6257
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
- #: g10/keyedit.c:6229
++#: g10/keyedit.c:6370
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "金鑰 %s 已撤銷.\n"
- #: g10/keyedit.c:6291
++#: g10/keyedit.c:6432
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子鑰 %s 已撤銷.\n"
- #: g10/keyedit.c:6388
++#: g10/keyedit.c:6529
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@@ -5086,13 -4001,10 +5121,13 @@@ msgstr "
"(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
"這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
- #: g10/keygen.c:3567 g10/keygen.c:3626 g10/keygen.c:4369 g10/keygen.c:4684
- #: g10/keygen.c:4780
++#: g10/keygen.c:3568 g10/keygen.c:3633 g10/keygen.c:4380 g10/keygen.c:4695
++#: g10/keygen.c:4791
#, c-format
msgid "Key generation failed: %s\n"
msgstr "產生金鑰失敗: %s\n"
- #: g10/keygen.c:3576
++#: g10/keygen.c:3577
#, c-format
msgid ""
"About to create a key for:\n"
@@@ -5103,62 -4015,49 +5138,62 @@@ msgstr "
" \"%s\"\n"
"\n"
- #: g10/keygen.c:3578
++#: g10/keygen.c:3579
msgid "Continue? (Y/n) "
msgstr "是否繼續? (Y/n) "
- #: g10/keygen.c:3599
++#: g10/keygen.c:3600
#, c-format
msgid "A key for \"%s\" already exists\n"
msgstr "\"%s\" 的金鑰已存在\n"
- #: g10/keygen.c:3604
++#: g10/keygen.c:3605
msgid "Create anyway? (y/N) "
msgstr "無論如何還是要建立嗎? (y/N) "
- #: g10/keygen.c:3609
++#: g10/keygen.c:3610
msgid "creating anyway\n"
msgstr "總之還是在建立\n"
- #: g10/keygen.c:3897
++#: g10/keygen.c:3904
#, c-format
msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
msgstr "請注意: 如需全能金鑰產生對話框請用 \"%s %s\".\n"
- #: g10/keygen.c:3929
++#: g10/keygen.c:3936
msgid "Key generation canceled.\n"
msgstr "金鑰產生已取消.\n"
- #: g10/keygen.c:3989
++#: g10/keygen.c:3996
#, c-format
msgid "can't create backup file '%s': %s\n"
msgstr "無法建立備份檔案 '%s': %s\n"
- #: g10/keygen.c:4009
++#: g10/keygen.c:4016
#, c-format
msgid "Note: backup of card key saved to '%s'\n"
msgstr "請注意: 卡片金鑰的備份已儲存至 '%s'\n"
- #: g10/keygen.c:4160 g10/keygen.c:4308
++#: g10/keygen.c:4167 g10/keygen.c:4315
#, c-format
msgid "writing public key to '%s'\n"
msgstr "正在寫入公鑰至 '%s'\n"
- #: g10/keygen.c:4302
++#: g10/keygen.c:4309
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
- #: g10/keygen.c:4316
++#: g10/keygen.c:4323
#, c-format
msgid "error writing public keyring '%s': %s\n"
msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
- #: g10/keygen.c:4345
++#: g10/keygen.c:4355
msgid "public and secret key created and signed.\n"
msgstr "公鑰和私鑰已建立及簽署.\n"
- #: g10/keygen.c:4356
++#: g10/keygen.c:4367
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@@ -5166,112 -4065,85 +5201,107 @@@ msgstr "
"請注意這把金鑰不能用於加密. 也許你會想藉由 \"--edit-key\" 指令\n"
"來產生加密用的子鑰.\n"
- #: g10/keygen.c:4556 g10/keygen.c:4730
++#: g10/keygen.c:4567 g10/keygen.c:4741
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4558 g10/keygen.c:4732
++#: g10/keygen.c:4569 g10/keygen.c:4743
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
- #: g10/keygen.c:4569 g10/keygen.c:4743
++#: g10/keygen.c:4580 g10/keygen.c:4754
msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "請注意: 對 v3 金鑰製造子鑰不符合 OpenPGP 規範\n"
- #: g10/keygen.c:4581 g10/keygen.c:4583
++#: g10/keygen.c:4592 g10/keygen.c:4594
msgid "Secret parts of primary key are not available.\n"
msgstr "主鑰的私鑰部分無法取用.\n"
- #: g10/keygen.c:4590 g10/keygen.c:4592
++#: g10/keygen.c:4601 g10/keygen.c:4603
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主鑰的私鑰部分存放於卡上.\n"
- #: g10/keygen.c:4611 g10/keygen.c:4758
++#: g10/keygen.c:4622 g10/keygen.c:4769
msgid "Really create? (y/N) "
msgstr "真的要建立嗎? (y/N) "
- #: g10/keyid.c:670 g10/keyid.c:683 g10/keyid.c:696
++#: g10/keyid.c:662 g10/keyid.c:675 g10/keyid.c:688
msgid "never "
msgstr "永遠不過期"
- #: g10/keylist.c:330
++#: g10/keylist.c:331
msgid "Critical signature policy: "
msgstr "關鍵簽章原則: "
- #: g10/keylist.c:332
++#: g10/keylist.c:333
msgid "Signature policy: "
msgstr "簽章原則: "
- #: g10/keylist.c:374
++#: g10/keylist.c:375
msgid "Critical preferred keyserver: "
msgstr "執意偏好的金鑰伺服器: "
- #: g10/keylist.c:427
++#: g10/keylist.c:428
msgid "Critical signature notation: "
msgstr "關鍵簽章註記: "
- #: g10/keylist.c:429
++#: g10/keylist.c:430
msgid "Signature notation: "
msgstr "簽章註記: "
- #: g10/keylist.c:471
++#: g10/keylist.c:472
#, 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:484
++#: g10/keylist.c:485
#, 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:566
++#: g10/keylist.c:567
#, 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:588
++#: g10/keylist.c:589
msgid "Keyring"
msgstr "鑰匙圈"
- #: g10/keylist.c:936 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:1854
++#: g10/keylist.c:1710
msgid "Primary key fingerprint:"
msgstr " 主鑰指紋:"
- #: g10/keylist.c:1856
++#: g10/keylist.c:1712
msgid " Subkey fingerprint:"
msgstr " 子鑰指紋:"
#. TRANSLATORS: this should fit into 24 bytes so that the
#. * fingerprint data is properly aligned with the user ID
- #: g10/keylist.c:1864
++#: g10/keylist.c:1720
msgid " Primary key fingerprint:"
msgstr " 主鑰指紋:"
- #: g10/keylist.c:1866 g10/keylist.c:1876
++#: g10/keylist.c:1722 g10/keylist.c:1732
msgid " Subkey fingerprint:"
msgstr " 子鑰指紋:"
# use tty
- #: g10/keylist.c:1871 g10/keylist.c:1887
++#: g10/keylist.c:1727 g10/keylist.c:1743
msgid " Key fingerprint ="
msgstr " 金鑰指紋 ="
- #: g10/keylist.c:1938
++#: g10/keylist.c:1794
msgid " Card serial no. ="
msgstr " 卡片序號 ="
@@@ -5334,288 -4194,231 +5364,293 @@@ msgstr "尊重金鑰上所設定的偏�
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
- #: g10/keyserver.c:546
++#: g10/keyserver.c:548
msgid "disabled"
msgstr "已停用"
- #: g10/keyserver.c:750
++#: g10/keyserver.c:752
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
- #: g10/keyserver.c:856
++#: g10/keyserver.c:858
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
- #: g10/keyserver.c:997 g10/keyserver.c:1112
++#: g10/keyserver.c:999 g10/keyserver.c:1114
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
- #: g10/keyserver.c:1417 g10/keyserver.c:1450
++#: g10/keyserver.c:1419 g10/keyserver.c:1452
#, 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:1424
++#: g10/keyserver.c:1426
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
- #: g10/keyserver.c:1528
++#: g10/keyserver.c:1530
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
- #: g10/keyserver.c:1531
++#: g10/keyserver.c:1533
msgid "key not found on keyserver\n"
msgstr "在金鑰伺服器上找不到金鑰\n"
- #: g10/keyserver.c:1535
++#: g10/keyserver.c:1537
msgid "no keyserver known (use option --keyserver)\n"
msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
- #: g10/keyserver.c:1699
++#: g10/keyserver.c:1701
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
- #: g10/keyserver.c:1703
++#: g10/keyserver.c:1705
#, c-format
msgid "requesting key %s from %s\n"
msgstr "正在請求金鑰 %s 自 %s\n"
- #: g10/keyserver.c:1803 g10/keyserver.c:1958
++#: g10/keyserver.c:1805 g10/keyserver.c:1960
#, fuzzy
#| msgid "invalid keyserver options\n"
msgid "no keyserver known\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/keyserver.c:1821
++#: g10/keyserver.c:1820 g10/skclist.c:196 g10/skclist.c:224
+ #, c-format
+ msgid "skipped \"%s\": %s\n"
+ msgstr "已跳過 \"%s\": %s\n"
+
++#: g10/keyserver.c:1823
#, c-format
msgid "sending key %s to %s\n"
msgstr "遞送金鑰 %s 至 %s\n"
- #: g10/keyserver.c:1862
++#: g10/keyserver.c:1864
#, c-format
msgid "requesting key from '%s'\n"
msgstr "正在向 '%s' 請求金鑰\n"
- #: g10/keyserver.c:1878
++#: g10/keyserver.c:1880
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告: 無法抓取 URI %s: %s\n"
- #: g10/mainproc.c:256
++#: g10/mainproc.c:254
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
- #: g10/mainproc.c:304
++#: g10/mainproc.c:302
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 加密過的階段金鑰\n"
- #: g10/mainproc.c:314
++#: g10/mainproc.c:312
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密語係以未知的 %d 摘要演算法所產生\n"
- #: g10/mainproc.c:380
++#: g10/mainproc.c:378
#, c-format
msgid "public key is %s\n"
msgstr "公鑰為 %s\n"
- #: g10/mainproc.c:458
++#: g10/mainproc.c:456
msgid "public key encrypted data: good DEK\n"
msgstr "公鑰加密過的資料: 完好的 DEK\n"
- #: g10/mainproc.c:491
++#: g10/mainproc.c:489
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "已用 %u 位元長的 %s 金鑰, ID %s, 建立於 %s 所加密\n"
- #: g10/mainproc.c:495 g10/pkclist.c:228
++#: g10/mainproc.c:493 g10/pkclist.c:228
#, c-format
msgid " \"%s\"\n"
msgstr " \"%s\"\n"
- #: g10/mainproc.c:499
++#: g10/mainproc.c:497
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "已用 %s 金鑰, ID %s 所加密\n"
- #: g10/mainproc.c:516
++#: g10/mainproc.c:514
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公鑰解密失敗: %s\n"
- #: g10/mainproc.c:532
++#: g10/mainproc.c:530
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "已用 %lu 個密語加密了\n"
- #: g10/mainproc.c:534
++#: g10/mainproc.c:532
msgid "encrypted with 1 passphrase\n"
msgstr "已用 1 個密語加密了\n"
- #: g10/mainproc.c:568 g10/mainproc.c:589
++#: g10/mainproc.c:566 g10/mainproc.c:587
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 為加密過的資料\n"
- #: g10/mainproc.c:575
++#: g10/mainproc.c:573
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
- #: g10/mainproc.c:620 g10/mainproc.c:634
++#: g10/mainproc.c:618 g10/mainproc.c:632
msgid "WARNING: message was not integrity protected\n"
msgstr "警告: 訊息未受到完整的保護\n"
- #: g10/mainproc.c:630
++#: g10/mainproc.c:628
msgid "decryption okay\n"
msgstr "解密成功\n"
- #: g10/mainproc.c:639
++#: g10/mainproc.c:637
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告: 加密過的訊息已經被變造了!\n"
- #: g10/mainproc.c:655
++#: g10/mainproc.c:653
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失敗: %s\n"
- #: g10/mainproc.c:678
++#: g10/mainproc.c:676
msgid "Note: sender requested \"for-your-eyes-only\"\n"
msgstr "請注意: 寄件者要求了 \"只准你用眼睛看\"\n"
- #: g10/mainproc.c:680
++#: g10/mainproc.c:678
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始的檔名 ='%.*s'\n"
- #: g10/mainproc.c:750
++#: g10/mainproc.c:748
msgid "WARNING: multiple plaintexts seen\n"
msgstr "警告: 看到了多份明文\n"
- #: g10/mainproc.c:916
++#: g10/mainproc.c:914
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
- #: g10/mainproc.c:1216 g10/mainproc.c:1259
++#: g10/mainproc.c:1214 g10/mainproc.c:1257
msgid "no signature found\n"
msgstr "找不到簽章\n"
- #: g10/mainproc.c:1575
++#: g10/mainproc.c:1573
#, c-format
msgid "BAD signature from \"%s\""
msgstr "*損壞* 的簽章來自於 \"%s\""
- #: g10/mainproc.c:1577
++#: g10/mainproc.c:1575
#, c-format
msgid "Expired signature from \"%s\""
msgstr "過期的簽章來自於 \"%s\""
- #: g10/mainproc.c:1579
++#: g10/mainproc.c:1577
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的簽章來自於 \"%s\""
- #: g10/mainproc.c:1599
++#: g10/mainproc.c:1597
msgid "signature verification suppressed\n"
msgstr "簽章驗證已抑制\n"
- #: g10/mainproc.c:1708
++#: g10/mainproc.c:1706
msgid "can't handle this ambiguous signature data\n"
msgstr "無法處理這個不明確的簽章資料\n"
- #: g10/mainproc.c:1722
++#: g10/mainproc.c:1720
#, c-format
msgid "Signature made %s\n"
msgstr "由 %s 建立的簽章\n"
- #: g10/mainproc.c:1723
++#: g10/mainproc.c:1721
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 金鑰 %s\n"
- #: g10/mainproc.c:1727
++#: 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:1744
msgid "Key available at: "
msgstr "可用的金鑰於: "
- #: g10/mainproc.c:1962
++#: g10/mainproc.c:1967
msgid "[uncertain]"
msgstr "[ 不確定 ]"
- #: g10/mainproc.c:2000
++#: g10/mainproc.c:2005
#, c-format
msgid " aka \"%s\""
msgstr " 亦即 \"%s\""
- #: g10/mainproc.c:2111
++#: g10/mainproc.c:2116
#, c-format
msgid "Signature expired %s\n"
msgstr "這份簽署已經在 %s 過期了\n"
- #: g10/mainproc.c:2115
++#: g10/mainproc.c:2120
#, c-format
msgid "Signature expires %s\n"
msgstr "這份簽署將在 %s 到期\n"
- #: g10/mainproc.c:2118
++#: g10/mainproc.c:2123
#, c-format
msgid "%s signature, digest algorithm %s%s%s\n"
msgstr "%s 簽章, 摘要演算法 %s%s%s\n"
- #: g10/mainproc.c:2119
++#: g10/mainproc.c:2124
msgid "binary"
msgstr "二進制"
- #: g10/mainproc.c:2120
++#: g10/mainproc.c:2125
msgid "textmode"
msgstr "文字模式"
- #: g10/mainproc.c:2120 g10/trust.c:103 dirmngr/ocsp.c:708
++#: g10/mainproc.c:2125 g10/trust.c:103 dirmngr/ocsp.c:708
msgid "unknown"
msgstr "未知"
- #: g10/mainproc.c:2122
++#: g10/mainproc.c:2127
msgid ", key algorithm "
msgstr ", 金鑰演算法 "
- #: g10/mainproc.c:2157
++#: g10/mainproc.c:2162
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
- #: g10/mainproc.c:2184
++#: g10/mainproc.c:2189
#, c-format
msgid "Can't check signature: %s\n"
msgstr "無法檢查簽章: %s\n"
- #: g10/mainproc.c:2277 g10/mainproc.c:2296 g10/mainproc.c:2402
++#: g10/mainproc.c:2282 g10/mainproc.c:2301 g10/mainproc.c:2407
msgid "not a detached signature\n"
msgstr "不是一份分離的簽章\n"
- #: g10/mainproc.c:2325
++#: g10/mainproc.c:2330
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
- #: g10/mainproc.c:2334
++#: g10/mainproc.c:2339
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等級 0x%02x 的獨立簽章\n"
- #: g10/mainproc.c:2406
++#: g10/mainproc.c:2411
msgid "old style (PGP 2.x) signature\n"
msgstr "舊型 (PGP 2.x) 簽章\n"
@@@ -5785,7 -4554,6 +5820,7 @@@ msgstr "無法操作 %d 公開金鑰演
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
- #: g10/parse-packet.c:1631
++#: g10/parse-packet.c:1649
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 類別的子封包設定了關鍵位元\n"
@@@ -6138,48 -4838,39 +6173,48 @@@ msgstr "警告: 這把金鑰並非以�
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 這份簽章並不屬於這個持有者\n"
- #: g10/pkclist.c:823 g10/pkclist.c:841 g10/pkclist.c:1020 g10/pkclist.c:1062
++#: g10/pkclist.c:829 g10/pkclist.c:847 g10/pkclist.c:1032 g10/pkclist.c:1074
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s: 已跳過: %s\n"
- #: g10/pkclist.c:852
++#: g10/pkclist.c:862
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s: 已跳過: 公鑰已停用\n"
- #: g10/pkclist.c:871 g10/pkclist.c:1033
++#: g10/pkclist.c:881 g10/pkclist.c:1045
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳過: 公鑰已存在\n"
- #: g10/pkclist.c:957
++#: g10/pkclist.c:969
#, 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:972
++#: g10/pkclist.c:984
#, 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:979
++#: g10/pkclist.c:991
#, 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:1082
++#: g10/pkclist.c:1094
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "你沒有指定使用者 ID. (你可能得用 \"-r\")\n"
- #: g10/pkclist.c:1106
++#: g10/pkclist.c:1118
msgid "Current recipients:\n"
msgstr "目前的收件者:\n"
- #: g10/pkclist.c:1132
++#: g10/pkclist.c:1144
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@@ -6187,37 -4878,29 +6222,37 @@@ msgstr "
"\n"
"請輸入使用者 ID. 以空白列結束: "
- #: g10/pkclist.c:1156
++#: g10/pkclist.c:1168
msgid "No such user ID.\n"
msgstr "沒有這個使用者 ID.\n"
- #: g10/pkclist.c:1167 g10/pkclist.c:1243
++#: g10/pkclist.c:1179 g10/pkclist.c:1255
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳過: 公鑰已經被設成預設收件者\n"
- #: g10/pkclist.c:1188
++#: g10/pkclist.c:1200
msgid "Public key is disabled.\n"
msgstr "公鑰已停用.\n"
- #: g10/pkclist.c:1198
++#: g10/pkclist.c:1210
msgid "skipped: public key already set\n"
msgstr "已跳過: 公鑰已設過\n"
- #: g10/pkclist.c:1233
++#: g10/pkclist.c:1245
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的預設收件者 \"%s\"\n"
- #: g10/pkclist.c:1281
++#: g10/pkclist.c:1294
msgid "no valid addressees\n"
msgstr "沒有有效的地址\n"
- #: g10/pkclist.c:1611
++#: g10/pkclist.c:1624
#, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "請注意: 金鑰 %s 沒有 %s 功能\n"
- #: g10/pkclist.c:1636
++#: g10/pkclist.c:1649
#, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
@@@ -6226,28 -4908,22 +6261,28 @@@
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
- #: g10/plaintext.c:591
++#: g10/plaintext.c:598
msgid "Detached signature.\n"
msgstr "分離的簽章.\n"
- #: g10/plaintext.c:599
++#: g10/plaintext.c:606
msgid "Please enter name of data file: "
msgstr "請輸入資料檔的名稱: "
- #: g10/plaintext.c:636
++#: g10/plaintext.c:643
msgid "reading stdin ...\n"
msgstr "正在讀取標準輸入中 ...\n"
- #: g10/plaintext.c:681
++#: g10/plaintext.c:688
msgid "no signed data\n"
msgstr "沒有被簽署過的資料\n"
- #: g10/plaintext.c:699
++#: g10/plaintext.c:706
#, c-format
msgid "can't open signed data '%s'\n"
msgstr "無法開啟被簽署過的資料 '%s'\n"
- #: g10/plaintext.c:734
++#: g10/plaintext.c:741
#, c-format
msgid "can't open signed data fd=%d: %s\n"
msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
@@@ -6507,7 -5138,6 +6542,7 @@@ msgid "public key %s is %lu day newer t
msgid_plural "public key %s is %lu days newer than the signature\n"
msgstr[0] "公鑰 %s 比簽章還要新了 %lu 秒\n"
- #: g10/sig-check.c:300 g10/sign.c:250
++#: g10/sig-check.c:300 g10/sign.c:251
#, fuzzy, c-format
#| msgid ""
#| "key %s was created %lu second in the future (time warp or clock problem)\n"
@@@ -6571,22 -5192,18 +6606,22 @@@ msgid "
"unexpanded.\n"
msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
- #: g10/sign.c:313
++#: g10/sign.c:314
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 簽章來自: \"%s\"\n"
- #: g10/sign.c:861
++#: g10/sign.c:863
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
- #: g10/sign.c:992
++#: g10/sign.c:994
msgid "signing:"
msgstr "簽署:"
- #: g10/sign.c:1268
++#: g10/sign.c:1271
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密將被採用\n"
@@@ -6658,131 -5261,104 +6693,131 @@@ msgstr "'%s' 讀取錯誤: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "信任資料庫: 同步化失敗: %s\n"
- #: g10/tdbio.c:140 sm/keydb.c:355
++#: g10/tdbio.c:141 sm/keydb.c:355
#, c-format
msgid "can't create lock for '%s'\n"
msgstr "無法為 '%s' 建立鎖定\n"
- #: g10/tdbio.c:145
++#: g10/tdbio.c:146
#, c-format
msgid "can't lock '%s'\n"
msgstr "無法鎖定 '%s'\n"
- #: g10/tdbio.c:204 g10/tdbio.c:1783
++#: g10/tdbio.c:205 g10/tdbio.c:1787
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
- #: g10/tdbio.c:212 g10/tdbio.c:1794
++#: g10/tdbio.c:213 g10/tdbio.c:1798
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
- #: g10/tdbio.c:351
++#: g10/tdbio.c:352
msgid "trustdb transaction too large\n"
msgstr "信任資料庫更動量過大\n"
- #: g10/tdbio.c:676
++#: g10/tdbio.c:682
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: 目錄不存在!\n"
- #: g10/tdbio.c:697 dirmngr/dirmngr.c:606
++#: g10/tdbio.c:703 dirmngr/dirmngr.c:606
#, c-format
msgid "can't access '%s': %s\n"
msgstr "無法存取 '%s': %s\n"
- #: g10/tdbio.c:718
++#: g10/tdbio.c:724
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: 建立版本記錄失敗: %s"
- #: g10/tdbio.c:723
++#: g10/tdbio.c:729
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: 建立了無效的信任資料庫\n"
- #: g10/tdbio.c:726
++#: g10/tdbio.c:732
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: 建立了信任資料庫\n"
- #: g10/tdbio.c:782
++#: g10/tdbio.c:788
msgid "Note: trustdb not writable\n"
msgstr "請注意: 信任資料庫不可寫入\n"
- #: g10/tdbio.c:791
++#: g10/tdbio.c:797
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: 無效的信任資料庫\n"
- #: g10/tdbio.c:828
++#: g10/tdbio.c:834
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: 建立雜湊表失敗: %s\n"
- #: g10/tdbio.c:836
++#: g10/tdbio.c:842
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: 更新版本記錄時錯誤: %s\n"
- #: g10/tdbio.c:859 g10/tdbio.c:885 g10/tdbio.c:903 g10/tdbio.c:923
- #: g10/tdbio.c:958 g10/tdbio.c:1707 g10/tdbio.c:1736
++#: g10/tdbio.c:865 g10/tdbio.c:891 g10/tdbio.c:909 g10/tdbio.c:929
++#: g10/tdbio.c:964 g10/tdbio.c:1711 g10/tdbio.c:1740
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: 讀取版本記錄時錯誤: %s\n"
- #: g10/tdbio.c:932
++#: g10/tdbio.c:938
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: 寫入版本記錄時錯誤: %s\n"
- #: g10/tdbio.c:1457
++#: g10/tdbio.c:1461
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信任資料庫: 本機搜尋失敗: %s\n"
- #: g10/tdbio.c:1468
++#: g10/tdbio.c:1472
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
- #: g10/tdbio.c:1493
++#: g10/tdbio.c:1497
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: 不是一個信任資料庫檔案\n"
- #: g10/tdbio.c:1518
++#: g10/tdbio.c:1522
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
- #: g10/tdbio.c:1524
++#: g10/tdbio.c:1528
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: 無效的檔案版本 %d\n"
- #: g10/tdbio.c:1744
++#: g10/tdbio.c:1748
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
- #: g10/tdbio.c:1753
++#: g10/tdbio.c:1757
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: 寫入目錄記錄時出錯: %s\n"
- #: g10/tdbio.c:1764
++#: g10/tdbio.c:1768
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: 記錄歸零失敗: %s\n"
- #: g10/tdbio.c:1800
++#: g10/tdbio.c:1804
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: 附加記錄失敗: %s\n"
- #: g10/tdbio.c:1861
++#: g10/tdbio.c:1865
msgid "Error: The trustdb is corrupted.\n"
msgstr "錯誤: 信任資料庫已毀損.\n"
@@@ -7135,7 -5649,6 +7170,7 @@@ msgstr "正在使用 %s 信任模型\n
msgid "no need for a trustdb check\n"
msgstr "不需要檢查信任資料庫\n"
- #: g10/trustdb.c:516 g10/trustdb.c:2128
++#: g10/trustdb.c:516 g10/trustdb.c:2130
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@@ -7150,7 -5661,6 +7185,7 @@@ msgstr "在 '%s' 信任模型中並不�
msgid "no need for a trustdb update with '%s' trust model\n"
msgstr "在 '%s' 信任模型中並不需要更新信任資料庫\n"
- #: g10/trustdb.c:748 g10/trustdb.c:1281
++#: g10/trustdb.c:748 g10/trustdb.c:1283
#, c-format
msgid "public key %s not found: %s\n"
msgstr "找不到公鑰 %s: %s\n"
@@@ -7163,36 -5671,30 +7198,36 @@@ msgstr "請做一次 --check-trustdb\n
msgid "checking the trustdb\n"
msgstr "正在檢查信任資料庫\n"
- #: g10/trustdb.c:1851
++#: g10/trustdb.c:1853
#, fuzzy, c-format
#| msgid "%lu keys processed so far\n"
msgid "%d key processed"
msgid_plural "%d keys processed"
msgstr[0] "目前已處理 %lu 把金鑰\n"
- #: g10/trustdb.c:1854
++#: g10/trustdb.c:1856
#, fuzzy, c-format
#| msgid "%d keys processed (%d validity counts cleared)\n"
msgid " (%d validity count cleared)\n"
msgid_plural " (%d validity counts cleared)\n"
msgstr[0] "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
- #: g10/trustdb.c:1924
++#: g10/trustdb.c:1926
msgid "no ultimately trusted keys found\n"
msgstr "沒有找到任何徹底信任的金鑰\n"
- #: g10/trustdb.c:1938
++#: g10/trustdb.c:1940
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
- #: g10/trustdb.c:2055
++#: g10/trustdb.c:2057
#, 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:2135
++#: g10/trustdb.c:2137
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@@ -7639,11 -6046,9 +7674,11 @@@ msgstr "禁用管理者卡片指令
msgid "use variable length input for pinpad"
msgstr "輸入 PIN 時在輸入區顯示成變動長度"
- #: scd/scdaemon.c:286
++#: scd/scdaemon.c:287
msgid "Usage: @SCDAEMON@ [options] (-h for help)"
msgstr "用法: @SCDAEMON@ [選項] (或用 -h 求助)"
- #: scd/scdaemon.c:288
++#: scd/scdaemon.c:289
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for @GNUPG@\n"
@@@ -7651,16 -6056,13 +7686,16 @@@ msgstr "
"語法: scdaemon [選項] [指令 [引數]]\n"
"@GNUPG@ 智慧卡服務\n"
- #: scd/scdaemon.c:792
++#: scd/scdaemon.c:793
msgid "please use the option '--daemon' to run the program in the background\n"
msgstr "請使用 '--daemon' 選項來將此程式執行於背景\n"
- #: scd/scdaemon.c:1153 dirmngr/dirmngr.c:2002
++#: scd/scdaemon.c:1154 dirmngr/dirmngr.c:2002
#, c-format
msgid "handler for fd %d started\n"
msgstr "用於 fd %d 的經手程式已啟動\n"
- #: scd/scdaemon.c:1165 dirmngr/dirmngr.c:2007
++#: scd/scdaemon.c:1166 dirmngr/dirmngr.c:2007
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "用於 fd %d 的經手程式已終止\n"
@@@ -7670,7 -6071,6 +7705,7 @@@
msgid "invalid radix64 character %02x skipped\n"
msgstr "已跳過無效的 radix64 字符 %02x\n"
- #: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2235
++#: sm/call-dirmngr.c:261 tools/gpg-connect-agent.c:2245
#, fuzzy
#| msgid "no gpg-agent running in this session\n"
msgid "no dirmngr running in this session\n"
@@@ -9458,8 -7471,6 +9493,8 @@@ msgstr "
msgid "valid debug levels are: %s\n"
msgstr "有效的除錯等級為: %s\n"
- #: dirmngr/dirmngr.c:488 tools/gpgconf.c:241 tools/gpgconf.c:275
- #: tools/gpgconf.c:346
++#: dirmngr/dirmngr.c:488 tools/gpgconf.c:299 tools/gpgconf.c:333
++#: tools/gpgconf.c:404
#, c-format
msgid "usage: %s [options] "
msgstr "用法: %s [選項] "
@@@ -9468,12 -7478,10 +9503,12 @@@
msgid "colons are not allowed in the socket name\n"
msgstr "socket 名稱內不允許使用冒號\n"
- #: dirmngr/dirmngr.c:1363 dirmngr/server.c:1531
++#: dirmngr/dirmngr.c:1363 dirmngr/server.c:1540
#, c-format
msgid "fetching CRL from '%s' failed: %s\n"
msgstr "從 '%s' 取回 CRL 時失敗: %s\n"
- #: dirmngr/dirmngr.c:1369 dirmngr/server.c:1537
++#: dirmngr/dirmngr.c:1369 dirmngr/server.c:1546
#, c-format
msgid "processing CRL from '%s' failed: %s\n"
msgstr "從 '%s' 處理 CRL 時失敗: %s\n"
@@@ -9950,76 -7856,60 +9985,76 @@@ msgstr "OCSP 回應程式傳回非當�
msgid "OCSP responder returned an too old status\n"
msgstr "OCSP 回應程式傳回老舊的狀態\n"
- #: dirmngr/server.c:358 dirmngr/server.c:470 dirmngr/server.c:516
++#: dirmngr/server.c:353 dirmngr/server.c:465 dirmngr/server.c:511
#, c-format
msgid "assuan_inquire(%s) failed: %s\n"
msgstr "assuan_inquire(%s) 失敗: %s\n"
- #: dirmngr/server.c:884
++#: dirmngr/server.c:893
msgid "ldapserver missing"
msgstr "遺失 ldapserver"
- #: dirmngr/server.c:958
++#: dirmngr/server.c:967
msgid "serialno missing in cert ID"
msgstr "憑證 ID 中遺失 serialno"
- #: dirmngr/server.c:1094 dirmngr/server.c:1180 dirmngr/server.c:1616
- #: dirmngr/server.c:1667 dirmngr/server.c:2147 dirmngr/server.c:2163
++#: dirmngr/server.c:1103 dirmngr/server.c:1189 dirmngr/server.c:1625
++#: dirmngr/server.c:1676 dirmngr/server.c:2156 dirmngr/server.c:2172
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr "assuan_inquire 失敗: %s\n"
- #: dirmngr/server.c:1223
++#: dirmngr/server.c:1232
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr "fetch_cert_by_url 失敗: %s\n"
- #: dirmngr/server.c:1235 dirmngr/server.c:1266 dirmngr/server.c:1425
++#: dirmngr/server.c:1244 dirmngr/server.c:1275 dirmngr/server.c:1434
#, c-format
msgid "error sending data: %s\n"
msgstr "送出資料時出錯: %s\n"
- #: dirmngr/server.c:1373
++#: dirmngr/server.c:1382
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr "start_cert_fetch 失敗: %s\n"
- #: dirmngr/server.c:1406
++#: dirmngr/server.c:1415
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr "fetch_next_cert 失敗: %s\n"
- #: dirmngr/server.c:1433
++#: dirmngr/server.c:1442
#, c-format
msgid "max_replies %d exceeded\n"
msgstr "max_replies %d 已超出\n"
- #: dirmngr/server.c:2395
++#: dirmngr/server.c:2404
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr "無法配置控制結構: %s\n"
- #: dirmngr/server.c:2406
++#: dirmngr/server.c:2415
#, c-format
msgid "failed to allocate assuan context: %s\n"
msgstr "配置 assuan 脈絡失敗: %s\n"
- #: dirmngr/server.c:2427
++#: dirmngr/server.c:2436
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr "伺服器啟始失敗: %s\n"
- #: dirmngr/server.c:2435
++#: dirmngr/server.c:2444
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr "向 Assuan 註冊指令時失敗: %s\n"
- #: dirmngr/server.c:2466
++#: dirmngr/server.c:2475
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr "Assuan 接受問題: %s\n"
- #: dirmngr/server.c:2485
++#: dirmngr/server.c:2494
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr "Assuan 處理時失敗: %s\n"
@@@ -10151,7 -8011,6 +10186,7 @@@ msgstr "未知的指令 '%s'\n
msgid "sending line failed: %s\n"
msgstr "送出列時失敗: %s\n"
- #: tools/gpg-connect-agent.c:2241
++#: tools/gpg-connect-agent.c:2251
#, c-format
msgid "error sending standard options: %s\n"
msgstr "送出標準選項時出錯: %s\n"
@@@ -10400,15 -8198,12 +10435,15 @@@ msgstr "
"語法: @GPGCONF@ [選項]\n"
"管理 @GNUPG@ 系統工具的組態選項\n"
- #: tools/gpgconf.c:243 tools/gpgconf.c:277
++#: tools/gpgconf.c:301 tools/gpgconf.c:335
msgid "Need one component argument"
msgstr "需要一個元件引數"
- #: tools/gpgconf.c:252 tools/gpgconf.c:289 tools/gpgconf.c:322
++#: tools/gpgconf.c:310 tools/gpgconf.c:347 tools/gpgconf.c:380
msgid "Component not found"
msgstr "找不到元件"
- #: tools/gpgconf.c:348
++#: tools/gpgconf.c:406
msgid "No argument allowed"
msgstr "未允許使用引數"
diff --cc tests/openpgp/4gb-packet.test
index 548ebfe,548ebfe..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/4gb-packet.test
+++ /dev/null
@@@ -1,14 -1,14 +1,0 @@@
--#!/bin/sh
--
--. $srcdir/defs.inc || exit 3
--
--# GnuPG through 2.1.7 would incorrect mark packets whose size is
--# 2^32-1 as invalid and exit with status code 2.
--i=$srcdir/4gb-packet.asc
--
--if ! $GPG --list-packets $i >/dev/null
--then
-- error Failed to parse 4GB packet.
--else
-- info Can parse 4GB packets.
--fi
diff --cc tests/openpgp/armdetach.test
index e4bbb1f,e4bbb1f..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/armdetach.test
+++ /dev/null
@@@ -1,19 -1,19 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--
--#info Checking armored detached signatures
--for i in $plain_files $data_files ; do
-- echo "$usrpass1" | $GPG --passphrase-fd 0 -sab -o x --yes $i
-- $GPG -o /dev/null --yes x <$i || error "$i: bad signature"
--done
--
diff --cc tests/openpgp/armdetachm.test
index 67d9628,67d9628..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/armdetachm.test
+++ /dev/null
@@@ -1,17 -1,17 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking armored detached signatures of multiple files
--i="$plain_files $data_files"
--echo "$usrpass1" | $GPG --passphrase-fd 0 -sab -o x --yes $i
--cat $i | $GPG -o /dev/null --yes x || error "$i: bad signature"
--
diff --cc tests/openpgp/armencrypt.test
index ce1067e,ce1067e..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/armencrypt.test
+++ /dev/null
@@@ -1,19 -1,19 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking armored encryption
--for i in $plain_files $data_files ; do
-- $GPG ${opt_always} -ea -o x --yes -r "$usrname2" $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
diff --cc tests/openpgp/armencryptp.test
index dfebb48,dfebb48..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/armencryptp.test
+++ /dev/null
@@@ -1,20 -1,20 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking armored encryption with a pipe
--for i in $plain_files $data_files ; do
-- $GPG ${opt_always} -ea --yes -r "$usrname2" < $i | tee x | $GPG -o y --yes
-- cmp $i y || error "$i: mismatch"
-- $GPG --yes < x > y
-- cmp $i y || error "$i: mismatch"
--done
--
diff --cc tests/openpgp/armsignencrypt.test
index c50a12d,c50a12d..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/armsignencrypt.test
+++ /dev/null
@@@ -1,21 -1,21 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--
--#info Checking armored signing and encryption
--for i in $plain_files $data_files ; do
-- echo "$usrpass1" | $GPG --passphrase-fd 0 ${opt_always} \
-- -sae -o x --yes -r "$usrname2" $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
diff --cc tests/openpgp/armsigs.test
index 8fc8672,8fc8672..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/armsigs.test
+++ /dev/null
@@@ -1,19 -1,19 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking armored signatures
--for i in $plain_files $data_files ; do
-- echo "$usrpass1" | $GPG --passphrase-fd 0 -sa -o x --yes $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
diff --cc tests/openpgp/clearsig.test
index bf67916,bf67916..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/clearsig.test
+++ /dev/null
@@@ -1,99 -1,99 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--# Fixme: we should not only do a --verify but also the output.
--
--. $srcdir/defs.inc || exit 3
--
--# ======================================
--# I can't compare the out because plain-3 has no LF as last charcater
--# but the output has always one. I do not thinkl this is a bug, because
--# it is clear text and not binary text.
--# ======================================
--for i in $plain_files plain-large ; do
-- echo "$usrpass1" | $GPG --passphrase-fd 0 --clearsign -o x --yes $i
-- $GPG --verify x
--done
--
--
--# ======================================
--# and one with long lines
--# ======================================
--cat >y <<EOF
--xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxyx
--
--xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
--EOF
--echo "$usrpass1" | $GPG --passphrase-fd 0 --clearsign -o x --yes y
--$GPG --verify x
--
--
--# ======================================
--# and one with only one long lines
--# ======================================
--cat >y <<EOF
--xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxyx
--EOF
--echo "$usrpass1" | $GPG --passphrase-fd 0 --clearsign -o x --yes y
--$GPG --verify x
--
--
--# ======================================
--# and one with an empty body
--# ======================================
--cat >y <<EOF
--EOF
--echo "$usrpass1" | $GPG --passphrase-fd 0 --clearsign -o x --yes y
--$GPG --verify x
--
--
--# ======================================
--# and one with one empty line at the end
--# ======================================
--cat >y <<EOF
--line 1
--line 2
--line 3
--there is a blank line after this
--
--EOF
--echo "$usrpass1" | $GPG --passphrase-fd 0 --clearsign -o x --yes y
--$GPG --verify x
--
--
--# ======================================
--# I think this file will be constructed wrong (gpg 0.9.3)
--# but it should verify okay anyway.
--# ======================================
--echo "this is a sig test" >y
--echo_n " " >>y
--echo "$usrpass1" | $GPG --passphrase-fd 0 --clearsign -o x --yes y
--$GPG --verify x
--
--
--# ======================================
--# check our special diff mode
--# ======================================
--cat >y <<EOF
----- mainproc.c Tue Jun 27 09:28:11 2000
--+++ mainproc.c~ Thu Jun 8 22:50:25 2000
--@@ -1190,16 +1190,13 @@
-- md_enable( c->mfx.md, n1->pkt->pkt.signature->digest_algo);
-- }
-- /* ask for file and hash it */
--- if( c->sigs_only ) {
--+ if( c->sigs_only )
-- rc = hash_datafiles( c->mfx.md, NULL,
-- c->signed_data, c->sigfilename,
-- n1? (n1->pkt->pkt.onepass_sig->sig_class == 0x01):0 );
--EOF
--echo "$usrpass1" | $GPG --passphrase-fd 0 \
-- --not-dash-escaped --clearsign -o x --yes y
--$GPG --verify x
diff --cc tests/openpgp/conventional-mdc.test
index 031fc0e,031fc0e..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/conventional-mdc.test
+++ /dev/null
@@@ -1,44 -1,44 +1,0 @@@
--#!/bin/sh
--# Copyright 2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--# We use use a lower than default value for the S2K count to run the
--# tests faster. We used a fixed value of 65536 already the past.
--s2k="--s2k-count=65536"
--
--#info Checking conventional encryption
--for ciph in `all_cipher_algos`; do
-- progress "$ciph"
-- for i in 0 1 2 3 9 10 11 19 20 21 22 23 39 40 41 8192 32000 ; do
-- # *BSD's dd can't cope with a count of 0
-- if test "$i" = "0"; then
-- : >z
-- else
-- dd if=data-80000 of=z bs=1 count=$i 2>/dev/null
-- fi
-- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k \
-- --force-mdc --cipher $ciph -c -o x --yes z
-- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k \
-- -o y --yes x
-- cmp z y || error "$ciph/$i: mismatch"
-- done
--done
--progress_end
--
--#info Checking sign+symencrypt
--for i in $plain_files $data_files; do
-- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -cs -o x --yes $i
-- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -o y --yes x
-- cmp $i y || error "$i: mismatch in sign+symenc"
--done
--
--
--# eof
diff --cc tests/openpgp/conventional.test
index 30c9ba0,30c9ba0..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/conventional.test
+++ /dev/null
@@@ -1,34 -1,34 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--# We use use a lower than default value for the S2K count to run the
--# tests faster. We used a fixed value of 65536 already the past.
--s2k="--s2k-count=65536"
--
--#info Checking conventional encryption
--for i in plain-2 data-32000 ; do
-- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -c -o x --yes $i
-- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
--for a in `all_cipher_algos`; do
-- progress "$a"
-- for i in plain-1 data-80000 ; do
-- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k \
-- --cipher-algo $a -c -o x --yes $i
-- echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -o y --yes x
-- cmp $i y || error "$i: ($a) mismatch"
-- done
--done
--
--progress_end
diff --cc tests/openpgp/decrypt-dsa.test
index ba83fea,ba83fea..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/decrypt-dsa.test
+++ /dev/null
@@@ -1,18 -1,18 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking decryption of supplied DSA encrypted file
--for i in "plain-1" ; do
-- $GPG -o y --yes $srcdir/$i-pgp.asc
-- cmp $i y || error "$i: mismatch"
--done
--
diff --cc tests/openpgp/decrypt.test
index 370dc96,370dc96..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/decrypt.test
+++ /dev/null
@@@ -1,18 -1,18 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking decryption of supplied files
--for i in $plain_files ; do
-- $GPG -o y --yes $srcdir/$i.asc
-- cmp $i y || error "$i: mismatch"
--done
--
diff --cc tests/openpgp/default-key.test
index 83e4f79,83e4f79..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/default-key.test
+++ /dev/null
@@@ -1,73 -1,73 +1,0 @@@
--#!/bin/sh
--
--. $srcdir/defs.inc || exit 3
--
--#set -x
--
--# Make sure $srcdir is set.
--if test "x$srcdir" = x
--then
-- echo srcdir environment variable not set!
-- exit 1
--fi
--
--# Import the sample key
--#
--# pub 1024R/8BC90111 2015-12-02
--# Key fingerprint = E657 FB60 7BB4 F21C 90BB 6651 BC06 7AF2 8BC9 0111
--# uid [ultimate] Barrett Brown <barrett at example.org>
--# sub 1024R/3E880CFF 2015-12-02 (encryption)
--# sub 1024R/F5F77B83 2015-12-02 (signing)
--# sub 1024R/45117079 2015-12-02 (encryption)
--# sub 1024R/1EA97479 2015-12-02 (signing)
--info "Importing public key."
--if $GPG --import $srcdir/samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc
--then
-- :
--else
-- error "$k: import failed"
--fi
--
--# By default, the most recent, valid signing subkey (1EA97479).
--for x in 8BC90111 3E880CFF F5F77B83 45117079 1EA97479
--do
-- info
-- info "Trying --default-key $x"
--
-- if ! echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=1 \
-- | grep 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479' >/dev/null
-- then
-- echo | $GPG --default-key "$x" -s | $GPG --verify --status-fd=2
-- error "Unexpected key used for signing (not the signing subkey, specified \"$x\")."
-- exit 1
-- fi
--done
--
--# By default, the most recent, valid encryption subkey (45117079).
--for x in 8BC90111 3E880CFF F5F77B83 45117079 1EA97479
--do
-- info
-- info "Trying --default-key $x --encrypt-to-default-key"
--
-- # We need another recipient, because --encrypt-to-default-key is
-- # not considered a recipient and gpg doesn't encrypt without any
-- # recipients.
-- #
-- # Note: it doesn't matter whether we specify the primary key or
-- # a subkey: the newest encryption subkey will be used.
-- if ! echo | $GPG ${opt_always} \
-- --default-key "$x" --encrypt-to-default-key \
-- -r 439F02CA -e \
-- | $GPG --list-packets \
-- | grep "keyid[ ][A-F0-9]*45117079" >/dev/null
-- then
-- echo | $GPG ${opt_always} \
-- --default-key "$x" --encrypt-to-default-key \
-- -r 439F02CA -e \
-- | $GPG --list-packets 1>&2
-- error "Unexpected key used for signing (specified \"$x\")."
-- exit 1
-- fi
--done
--
--exit 0
diff --cc tests/openpgp/detach.test
index 9b68e00,9b68e00..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/detach.test
+++ /dev/null
@@@ -1,18 -1,18 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking detached signatures
--for i in $plain_files $data_files ; do
-- echo "$usrpass1" | $GPG --passphrase-fd 0 -sb -o x --yes $i
-- $GPG -o /dev/null --yes x <$i || error "$i: bad signature"
--done
--
diff --cc tests/openpgp/detachm.test
index d65bcf2,d65bcf2..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/detachm.test
+++ /dev/null
@@@ -1,17 -1,17 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking detached signatures of multiple files
--i="$plain_files $data_files"
--echo "$usrpass1" | $GPG --passphrase-fd 0 -sb -o x --yes $i
--cat $i | $GPG -o /dev/null --yes x || error "$i: bad signature"
--
diff --cc tests/openpgp/ecc.test
index 58fd251,58fd251..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/ecc.test
+++ /dev/null
@@@ -1,253 -1,253 +1,0 @@@
--#!/bin/sh
--# Copyright 2011 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--keygrips='8E06A180EFFE4C65B812150CAF19BF30C0689A4C
-- E4403F3FD7A443FAC29FEF288FA0D20AC212851E
-- 0B7554421FFB14A06CB9F63FB49A85A58E97ABAC
-- 303ACC892C2D786C8A789677C0BE54DA8538F903
-- 9FE5C36985351524B6AFA19FDCBC1A3A750B6F5F
-- 145A52CC7ED3FD41C5B0A26BE220FEED36AF24DE'
--mainkeyids='BAA59D9C
-- 0F54719F
-- 45AF2FFE'
--
--
--if have_pubkey_algo "ECDH"; then
-- :
--else
-- info "No ECC support due to an old Libgcrypt"
-- exit 77
--fi
--
--
--#
--# Setup for ECC testing
--#
--info "Preparing for ECC test."
--for i in $keygrips ; do
-- rm private-keys-v1.d/$i.key 2>/dev/null || true
-- $GPG_PRESET_PASSPHRASE --preset -P ecc $i
--done
--
--
--#
--# Import the sample keys
--#
--info "Importing ECC public keys."
--for k in $mainkeyids ; do
-- $GPG --delete-key --batch --yes $k 2>/dev/null || true
--done
--for i in 1 2 3; do
-- k="ecc-sample-$i-pub.asc"
-- if $GPG --import $srcdir/samplekeys/$k; then
-- :
-- else
-- error "$k: import failed"
-- fi
--done
--
--
--#
--# Check a few sample signature
--#
--info "Checking ECC signatures."
--tests=""
--
--# The following is an opaque ECDSA signature on a message "This is one
--# line\n" (17 byte long) by the primary 256 bit key:
--tests="$tests msg_opaque_signed_256"
--msg_opaque_signed_256='-----BEGIN PGP MESSAGE-----
--Version: GnuPG v2.1.0-ecc (GNU/Linux)
--
--owGbwMvMwCHMvVT3w66lc+cwrlFK4k5N1k3KT6nUK6ko8Zl8MSEkI7NYAYjy81IV
--cjLzUrk64lgYhDkY2FiZQNIMXJwCMO31rxgZ+tW/zesUPxWzdKWrtLGW/LkP5rXL
--V/Yvnr/EKjBbQuvZSYa/klsum6XFmTze+maVgclT6Rc6hzqqxNy6o6qdTTmLJuvp
--AQA=
--=GDv4
-------END PGP MESSAGE----'
--
--# The following is an opaque ECDSA signature on a message "This is one
--# line\n" (17 byte long) by the primary 384 bit key:
--tests="$tests msg_opaque_signed_384"
--msg_opaque_signed_384='-----BEGIN PGP MESSAGE-----
--Version: PGP Command Line v10.0.0 (Linux)
--
--qANQR1DIqwE7wsvMwCnM2WDcwR9SOJ/xtFISd25qcXFieqpeSUUJAxCEZGQWKwBR
--fl6qQk5mXirXoXJmVgbfYC5xmC5hzsDPjHXqbDLzpXpTBXSZV3L6bAgP3Kq7Ykmo
--7Ds1v4UfBS+3CSSon7Pzq79WLjzXXEH54MkjPxnrw+8cfMVnY7Bi18J702Nnsa7a
--9lMv/PM0/ao9CZ3KX7Q+Tv1rllTZ5Hj4V1frw431QnHfAA==
--=elKT
-------END PGP MESSAGE-----'
--
--# The following is an opaque ECDSA signature on a message "This is one
--# line\n" (17 byte long) by the primary 521 bit key:
--tests="$tests msg_opaque_signed_521"
--msg_opaque_signed_521='-----BEGIN PGP MESSAGE-----
--Version: PGP Command Line v10.0.0 (Linux)
--
--qANQR1DIwA8BO8LLzMAlnO3Y8tB1vf4/xtNKSdy5qcXFiempeiUVJQxAEJKRWawA
--RPl5qQo5mXmpXIdmMLMy+AaLnoLpEubatpeJY2Lystd7Qt32q2UcvRS5kNPWtDB7
--ryufvcrWtFM7Jx8qXKDxZuqr7b9PGv1Ssk+I8TzB2O9dZC+n/jv+PAdbuu7mLe33
--Gf9pLd3weV3Qno6FOqxGa5ZszQx+uer2xH3/El9x/2pVeO4l15ScsL7qWMTmffmG
--Ic1RdzgeCfosMF+l/zVRchcLKzenEQA=
--=ATtX
-------END PGP MESSAGE-----'
--
--echo 'This is one line' >z
--for msg in $tests; do
-- info "checking: $msg"
-- eval "(IFS=; echo \"\$$msg\")" >x
-- $GPG --verify x || error "verify(1) of $msg failed"
-- $GPG -o y --yes x || error "verify(2) of $msg failed"
-- cmp y z || error "$msg: mismatch"
--done
--
--
--#
--# Import the secret keys so that we now can sign and decrypt.
--#
--# Note that the PGP generated secret keys are not self-signed, thus we
--# need to pass an appropriate option.
--#
--info "Importing ECC secret keys."
--for i in 1 2 3; do
-- k="ecc-sample-$i-sec.asc"
-- if [ "$i" -gt "1" ]; then
-- extraopts="--allow-non-selfsigned-uid"
-- else
-- extraopts=""
-- fi
-- if PINENTRY_USER_DATA=ecc $GPG $extraopts --import $srcdir/samplekeys/$k; then
-- :
-- else
-- error "$k: import failed"
-- fi
--done
--
--
--#
--# Check a few sample encrtpted messages.
--#
--info "Checking ECC encryption."
--tests=""
--
--# The following block encrypts the text "This is one line\n", 17 bytes,
--# with the subkey 4089AB73.
--tests="$tests msg_encrypted_256"
--msg_encrypted_256='-----BEGIN PGP MESSAGE-----
--Version: GnuPG v2.1.0-ecc (GNU/Linux)
--
--hH4Dd863o0CJq3MSAgMEHdIYZQx+rV1cjy7qitIOEICFFzp4cjsRX4r+rDdMcQUs
--h7VZmbP1c9C0s9sgCKwubWfkcYUl2ZOju4gy+s4MYTBb4/j8JjnJ9Bqn6LWutTXJ
--zwsdP13VIJLnhiNqISdR3/6xWQ0ICRYzwb95nUZ1c1DSVgFpjPgUvi4pgYbTpcDB
--jzILKWBfBDT/jck169XE8vgtbcqVQYZ7lZpaY9CzEbC+4dXZmV1gm5MafpTyFWgH
--VnyrZB4gad9Lp9e0RKHHcOOE7s/NeLuu
--=odUZ
-------END PGP MESSAGE-----'
--
--# The following block encrypts the text "This is one line\n", 17 bytes,
--# with the subkey 9A201946:
--tests="$tests msg_encrypted_384"
--msg_encrypted_384='-----BEGIN PGP MESSAGE-----
--Version: PGP Command Line v10.0.0 (Linux)
--
--qANQR1DBngOqi5OPmiAZRhIDAwQqIr/00cJyf+QP+VA4QKVkk77KMHdz9OVaR2XK
--0VYu0F/HPm89vL2orfm2hrAZxY9G2R0PG4Wk5Lg04UjKca/O72uWtjdPYulFidmo
--uB0QpzXFz22ZZinxeVPLPEr19Pow0EwCc95cg4HAgrD0nV9vRcTJ/+juVfvsJhAO
--isMKqrFNMvwnK5A1ECeyVXe7oLZl0lUBRhLr59QTtvf85QJjg/m5kaGy8XCJvLv3
--61pZa6KUmw89PjtPak7ebcjnINL01vwmyeg1PAyW/xjeGGvcO+R4P1b4ewyFnJyR
--svzIJcP7d4DqYOw7
--=oiTJ
-------END PGP MESSAGE-----'
--
--# The following block encrypts the text "This is one line\n", 17 bytes,
--# with the subkey A81C4838:
--tests="$tests msg_encrypted_521"
--msg_encrypted_521='-----BEGIN PGP MESSAGE-----
--Version: PGP Command Line v10.0.0 (Linux)
--
--qANQR1DBwAIDB+qqSKgcSDgSBCMEAKpzTUxB4c56C7g09ekD9I+ttC5ER/xzDmXU
--OJmFqU5w3FllhFj4TgGxxdH+8fv4W2Ag0IKoJvIY9V1V7oUCClfqAR01QbN7jGH/
--I9GFFnH19AYEgMKgFmh14ZwN1BS6/VHh+H4apaYqapbx8/09EL+DV9zWLX4GRLXQ
--VqCR1N2rXE29MJFzGmDOCueQNkUjcbuenoCSKcNT+6xhO27U9IYVCg4BhRUDGfD6
--dhfRzBLxL+bKR9JVAe46+K8NLjRVu/bd4Iounx4UF5dBk8ERy+/8k9XantDoQgo6
--RPqCad4Dg/QqkpbK3y574ds3VFNJmc4dVpsXm7lGV5w0FBxhVNPoWNhhECMlTroX
--Rg==
--=5GqW
-------END PGP MESSAGE-----'
--
--echo 'This is one line' >z
--for msg in $tests; do
-- info "checking: $msg"
-- eval "(IFS=; echo \"\$$msg\")" >x
-- PINENTRY_USER_DATA=ecc $GPG -o y --yes x || error "decryption of $msg failed"
-- cmp y z || error "$msg: mismatch"
--done
--
--
--#
--# Now check that we can encrypt and decrypt our own messages.
--#
--# Note that we don't need to provide a passppharse because we already
--# preset the passphrase into the gpg-agent.
--#
--info "Checking ECC encryption and decryption."
--for i in $plain_files $data_files ; do
-- for k in $mainkeyids ; do
-- info "file: $i key: $k"
-- $GPG ${opt_always} -e -o x --yes -r $k $i
-- PINENTRY_USER_DATA=ecc $GPG -o y --yes x
-- cmp $i y || error "$i,$k: mismatch"
-- done
--done
--
--
--#
--# Now check that we can sign and verify our own messages.
--#
--info "Checking ECC signing and verifiction."
--for i in $plain_files $data_files ; do
-- for k in $mainkeyids ; do
-- info "file: $i key: $k"
-- PINENTRY_USER_DATA=ecc $GPG -s -o x --yes -u $k $i
-- $GPG -o y --yes x || error "verify of $i,$k failed"
-- cmp $i y || error "$i,$k: mismatch"
-- done
--done
--
--
--#
--# Let us also try to import the keys only from a secret keyblock.
--#
--# Because PGP does not sign the UID, it is not very useful to work
--# with this key unless we go into the trouble of adding the
--# self-signature.
--#
--info "Importing ECC secret keys directly."
--for i in $keygrips ; do
-- rm private-keys-v1.d/$i.key 2>/dev/null || true
--done
--for k in $mainkeyids ; do
-- $GPG --delete-key --batch --yes $k 2>/dev/null || true
--done
--for i in 1 2 3; do
-- k="ecc-sample-$i-sec.asc"
-- if [ "$i" -gt "1" ]; then
-- extraopts="--allow-non-selfsigned-uid"
-- else
-- extraopts=""
-- fi
-- if PINENTRY_USER_DATA=ecc $GPG $extraopts --import $srcdir/samplekeys/$k; then
-- :
-- else
-- error "$k: import failed"
-- fi
--done
diff --cc tests/openpgp/encrypt-dsa.test
index 7ce670e,7ce670e..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/encrypt-dsa.test
+++ /dev/null
@@@ -1,30 -1,30 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking encryption
--for i in $plain_files $data_files ; do
-- $GPG ${opt_always} -e -o x --yes -r "$dsa_usrname2" $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
--for ca in `all_cipher_algos` ; do
-- progress "$ca"
-- for i in $plain_files $data_files ; do
-- $GPG ${opt_always} --cipher-algo $ca -e \
-- -o x --yes -r "$dsa_usrname2" $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
-- done
--done
--
--progress_end
diff --cc tests/openpgp/encrypt.test
index 295a6c3,295a6c3..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/encrypt.test
+++ /dev/null
@@@ -1,29 -1,29 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking encryption
--for i in $plain_files $data_files ; do
-- $GPG ${opt_always} -e -o x --yes -r "$usrname2" $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
--echo_n " > "
--for ca in `all_cipher_algos` ; do
-- echo_n "$ca "
-- for i in $plain_files $data_files ; do
-- $GPG ${opt_always} -e -o x --yes -r "$usrname2" --cipher-algo $ca $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
-- done
--done
--echo "<"
diff --cc tests/openpgp/encryptp.test
index 3ad7119,3ad7119..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/encryptp.test
+++ /dev/null
@@@ -1,18 -1,18 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking encryption with a pipe
--for i in $plain_files $data_files ; do
-- $GPG ${opt_always} -e --yes -r "$usrname2" <$i | $GPG --yes > y
-- cmp $i y || error "$i: mismatch"
--done
--
diff --cc tests/openpgp/export.test
index 9776760,9776760..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/export.test
+++ /dev/null
@@@ -1,110 -1,110 +1,0 @@@
--#!/bin/sh
--
--. $srcdir/defs.inc || exit 3
--
--check_exported_public_key()
--{
-- $GPG --list-packets $1 >$1.packets
-- grep '^:public key packet:' $1.packets >/dev/null
-- grep "^ keyid: .*$KEY$" $1.packets >/dev/null
-- grep '^:user ID packet:' $1.packets >/dev/null
-- grep "^:signature packet:.*keyid.*$KEY" $1.packets >/dev/null
-- rm $1.packets
--}
--
--check_armored_public_key()
--{
-- grep '^-----BEGIN PGP PUBLIC KEY BLOCK-----$' $1 >/dev/null
-- grep '^-----END PGP PUBLIC KEY BLOCK-----$' $1 >/dev/null
-- check_exported_public_key $1
--}
--
--check_exported_private_key()
--{
-- $GPG --list-packets $1 >$1.packets
-- grep '^:secret key packet:' $1.packets >/dev/null
-- grep "^ keyid: .*$KEY$" $1.packets >/dev/null
-- grep '^:user ID packet:' $1.packets >/dev/null
-- grep "^:signature packet:.*keyid.*$KEY" $1.packets >/dev/null
-- rm $1.packets
--}
--
--check_armored_private_key()
--{
-- grep '^-----BEGIN PGP PRIVATE KEY BLOCK-----$' $1 >/dev/null
-- grep '^-----END PGP PRIVATE KEY BLOCK-----$' $1 >/dev/null
-- check_exported_private_key $1
--}
--
--logfile="`pwd`/pinentry.log"
--ppfile="`pwd`/passphrases"
--rm -f -- $logfile $ppfile
--touch $ppfile
--
--prepare_passphrase()
--{
-- echo $* >>$ppfile
--}
--
--prepare_passphrase_confirm()
--{
-- echo "fake-entry being started to CONFIRM the weak phrase" >>$ppfile
--}
--
--assert_passphrases_consumed()
--{
-- if test -s $ppfile; then
-- echo "Expected $ppfile to be empty, but these are enqueued:" >&2
-- cat "$ppfile" >&2
-- exit 1
-- fi
-- rm -f -- $logfile
--}
--
--export PINENTRY_USER_DATA="--logfile=$logfile --passphrasefile=$ppfile"
--
--info "Checking key export."
--for KEY in D74C5F22 C40FDECF ECABF51D
--do
-- progress $KEY
--
-- $GPG --export $KEY >$KEY.public
-- check_exported_public_key $KEY.public
-- rm $KEY.public
--
-- $GPG --armor --export $KEY >$KEY.public
-- check_armored_public_key $KEY.public
-- rm $KEY.public
--
-- # test without --armor:
--
-- if [ $KEY = D74C5F22 ]; then
-- # Key D74C5F22 is protected by a passphrase. Prepare this
-- # one. Currently, GnuPG does not ask for an export passphrase
-- # in this case.
-- prepare_passphrase "$usrpass1"
-- fi
--
-- $GPG --export-secret-keys $KEY >$KEY.private
-- check_exported_private_key $KEY.private
-- rm $KEY.private
--
-- assert_passphrases_consumed
--
-- # test with --armor:
--
-- if [ $KEY = D74C5F22 ]; then
-- # Key D74C5F22 is protected by a passphrase. Prepare this
-- # one. Currently, GnuPG does not ask for an export passphrase
-- # in this case.
-- prepare_passphrase "$usrpass1"
-- fi
--
-- $GPG --armor --export-secret-keys $KEY >$KEY.private
-- check_armored_private_key $KEY.private
-- rm $KEY.private
--
-- assert_passphrases_consumed
--done
--
--progress_end
diff --cc tests/openpgp/finish.test
index fced570,fced570..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/finish.test
+++ /dev/null
@@@ -1,17 -1,17 +1,0 @@@
--#!/bin/sh
--# Copyright 2010 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--if $GPG_AGENT --quiet; then
-- $GPG_CONNECT_AGENT killagent /bye >/dev/null
--fi
--
--exit 0
--
diff --cc tests/openpgp/genkey1024.test
index 99a0d5d,99a0d5d..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/genkey1024.test
+++ /dev/null
@@@ -1,41 -1,41 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--$GPG --quiet --batch --gen-key <<EOF
--Key-Type: DSA
--Key-Length: 1024
--Subkey-Type: ELG
--Subkey-Length: 1024
--Name-Real: Harry H.
--Name-Comment: test key
--Name-Email: hh@@ddorf.de
--Expire-Date: 1
--%no-protection
--%transient-key
--%commit
--EOF
--
--if have_pubkey_algo "RSA"; then
--$GPG --quiet --batch --gen-key <<EOF
--Key-Type: RSA
--Key-Length: 1024
--Key-Usage: sign,encrypt
--Name-Real: Harry A.
--Name-Comment: RSA test key
--Name-Email: hh@@ddorf.de
--Expire-Date: 2
--%no-protection
--%transient-key
--%commit
--EOF
--fi
--
diff --cc tests/openpgp/gpgtar.test
index 2f33f75,2f33f75..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/gpgtar.test
+++ /dev/null
@@@ -1,126 -1,126 +1,0 @@@
--#!/bin/sh
--
--#set -x
--
--# Make sure $srcdir is set.
--if test "x$srcdir" = x
--then
-- echo srcdir environment variable not set!
-- exit 1
--fi
--
--. $srcdir/defs.inc || exit 3
--
--set -e
--
--# Make sure $GNUPGHOME is set.
--if test "x$GNUPGHOME" = x
--then
-- echo "GNUPGHOME not set."
-- exit 1
--fi
--
--TESTFILES="$plain_files $data_files"
--
--TESTDIR=gpgtar.d
--FILELIST="${TESTDIR}/filelist"
--PPFILE="${TESTDIR}/passphrase"
--PPFLAGS="--gpg-args --passphrase-file=$PPFILE"
--
--GPG=../../g10/gpg
--GPGARGS="$opt_always --no-permission-warning"
--
--GPGTAR="../../tools/gpgtar"
--GPGZIP="sh ../../tools/gpg-zip"
--
--# Skip test if gpgtar has not been built.
--if ! test -x "$GPGTAR"
--then
-- exit 77
--fi
--
--# Create, inspect, and extract an archive with the given options.
--#
--# $1 the tool to test
--# $2 options used to create the archive
--# $3 options used to inspect the archive
--# $4 options used to extract the archive
--do_test()
--{
-- (
-- TOOL="$1"
-- CREATE_FLAGS="$2"
-- INSPECT_FLAGS="$3"
-- EXTRACT_FLAGS="$4"
--
-- rm -rf -- "${TESTDIR}"
-- mkdir "${TESTDIR}"
-- echo frob >"$PPFILE"
--
-- $TOOL --gpg "$GPG" --gpg-args "$GPGARGS" $CREATE_FLAGS \
-- --output "${TESTDIR}/test.tar.pgp" $TESTFILES
--
-- $TOOL --gpg "$GPG" --gpg-args "$GPGARGS" $INSPECT_FLAGS \
-- "${TESTDIR}/test.tar.pgp" \
-- >"$FILELIST"
-- for F in $TESTFILES
-- do
-- awk '{print $NF}' "$FILELIST" | grep "^${F}$" >/dev/null
-- done
--
-- $TOOL --gpg "$GPG" --gpg-args "$GPGARGS" $EXTRACT_FLAGS --quiet \
-- --tar-args --directory="${TESTDIR}" \
-- "${TESTDIR}/test.tar.pgp"
-- for F in $TESTFILES
-- do
-- cmp "$F" "${TESTDIR}/$F"
-- done
-- )
--}
--
--for TOOL in "$GPGTAR" "$GPGZIP"
--#for TOOL in "$GPGZIP"
--do
-- # Asymmetric encryption.
-- do_test "$TOOL" \
-- "--encrypt --recipient $usrname2" \
-- "--list-archive" \
-- "--decrypt"
--
-- # Asymmetric encryption and signing.
-- do_test "$TOOL" \
-- "--encrypt --recipient $usrname2 --sign --local-user $usrname3" \
-- "--list-archive" \
-- "--decrypt"
--
-- # Signing only.
-- do_test "$TOOL" \
-- "--sign --local-user $usrname3" \
-- "--list-archive" \
-- "--decrypt"
--
-- # Symmetric encryption.
-- do_test "$TOOL" \
-- "${PPFLAGS} --symmetric" \
-- "${PPFLAGS} --list-archive" \
-- "${PPFLAGS} --decrypt"
--
-- # Symmetric encryption, explicitly choose cipher.
-- for a in `all_cipher_algos`; do
-- do_test "$TOOL" \
-- "${PPFLAGS} --gpg-args --cipher=$a --symmetric" \
-- "${PPFLAGS} --list-archive" \
-- "${PPFLAGS} --decrypt"
-- break
-- done
--
-- # Asymmetric and symmetric encryption, and signing.
-- do_test "$TOOL" \
-- "${PPFLAGS} --encrypt --symmetric --recipient $usrname2 --sign --local-user $usrname3" \
-- "${PPFLAGS} --list-archive" \
-- "${PPFLAGS} --decrypt"
--done
--
--# Success!
--
--exit 0
diff --cc tests/openpgp/import.test
index 783d059,783d059..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/import.test
+++ /dev/null
@@@ -1,48 -1,48 +1,0 @@@
--#!/bin/sh
--# Copyright 2008 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--i=$srcdir/bug894-test.asc
--info "Checking bug 894: segv importing certain keys."
--if $GPG --import $i; then
-- :
--else
-- error "$i: import failed (bug 894)"
--fi
--
--
--boguskey=$srcdir/bug1223-bogus.asc
--goodkey=$srcdir/bug1223-good.asc
--keyid=0xC108E83A
--info "Checking bug 1223: designated revoker sigs are not properly merged."
--$GPG --delete-key --batch --yes $keyid 2>/dev/null || true
--$GPG --import $boguskey || true
--$GPG --import $goodkey || true
--if $GPG --list-keys --with-colons $keyid \
-- | grep '^rvk:.*:0EE5BE979282D80B9F7540F1CCD2ED94D21739E9:' >/dev/null; then
-- :
--else
-- error "$goodkey: import failed (bug 1223)"
--fi
--
--
--key1=$srcdir/samplekeys/dda252ebb8ebe1af-1.asc
--key2=$srcdir/samplekeys/dda252ebb8ebe1af-2.asc
--fpr1=9E669861368BCA0BE42DAF7DDDA252EBB8EBE1AF
--fpr2=A55120427374F3F7AA5F1166DDA252EBB8EBE1AF
--info "Checking import of two keys with colliding long key ids."
--$GPG --delete-key --batch --yes $fpr1 $fpr2 2>/dev/null || true
--$GPG --import $key1 || true
--$GPG --import $key2 || true
--n=$($GPG --list-keys --with-colons $fpr1 $fpr2 2>/dev/null \
-- | grep '^pub:.:4096:1:DDA252EBB8EBE1AF:' | wc -l)
--if [ $n -ne 2 ] ; then
-- error "Importing keys with long id collision failed"
--fi
diff --cc tests/openpgp/mds.test
index bb73312,bb73312..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/mds.test
+++ /dev/null
@@@ -1,89 -1,89 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--
--. $srcdir/defs.inc || exit 3
--
--
--test_one () {
-- if [ "`grep $1 y | sed -e 's/:[^:]*:\(.*\):/\1/'`" != "$2" ]; then
-- failed="$failed $1"
-- fi
--}
--
--failed=""
--
--#info Checking message digests
--cat /dev/null | $GPG --with-colons --print-mds >y
--# MD5
--if have_hash_algo "MD5"; then
-- test_one ":1:" "D41D8CD98F00B204E9800998ECF8427E"
--else
-- echo " > Hash algorithm MD5 is not installed (not an error)"
--fi
--# SHA-1
--test_one ":2:" "DA39A3EE5E6B4B0D3255BFEF95601890AFD80709"
--# RMD160
--if have_hash_algo "RIPEMD160"; then
-- test_one ":3:" "9C1185A5C5E9FC54612808977EE8F548B2258D31"
--else
-- echo "Hash algorithm RIPEMD160 is not installed (not an error)"
--fi
--# SHA-224
--if have_hash_algo "SHA224"; then
-- test_one ":11:" "D14A028C2A3A2BC9476102BB288234C415A2B01F828EA62AC5B3E42F"
--else
-- echo "Hash algorithm SHA-224 is not installed (not an error)"
--fi
--# SHA-256
--if have_hash_algo "SHA256"; then
-- test_one ":8:" "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855"
--else
-- echo "Hash algorithm SHA-256 is not installed (not an error)"
--fi
--# SHA-384
--if have_hash_algo "SHA384"; then
-- test_one ":9:" "38B060A751AC96384CD9327EB1B1E36A21FDB71114BE07434C0CC7BF63F6E1DA274EDEBFE76F65FBD51AD2F14898B95B"
--else
-- echo "Hash algorithm SHA-384 is not installed (not an error)"
--fi
--# SHA-512
--if have_hash_algo "SHA512"; then
-- test_one ":10:" "CF83E1357EEFB8BDF1542850D66D8007D620E4050B5715DC83F4A921D36CE9CE47D0D13C5D85F2B0FF8318D2877EEC2F63B931BD47417A81A538327AF927DA3E"
--else
-- echo "Hash algorithm SHA-512 is not installed (not an error)"
--fi
--
--[ "$failed" != "" ] && error "$failed failed for empty string"
--
--echo_n "abcdefghijklmnopqrstuvwxyz" | $GPG --with-colons --print-mds >y
--if have_hash_algo "MD5"; then
-- test_one ":1:" "C3FCD3D76192E4007DFB496CCA67E13B"
--fi
--test_one ":2:" "32D10C7B8CF96570CA04CE37F2A19D84240D3A89"
--if have_hash_algo "RIPEMD160"; then
-- test_one ":3:" "F71C27109C692C1B56BBDCEB5B9D2865B3708DBC"
--fi
--if have_hash_algo "SHA224"; then
-- test_one ":11:" "45A5F72C39C5CFF2522EB3429799E49E5F44B356EF926BCF390DCCC2"
--fi
--if have_hash_algo "SHA256"; then
-- test_one ":8:" "71C480DF93D6AE2F1EFAD1447C66C9525E316218CF51FC8D9ED832F2DAF18B73"
--fi
--if have_hash_algo "SHA384"; then
-- test_one ":9:" "FEB67349DF3DB6F5924815D6C3DC133F091809213731FE5C7B5F4999E463479FF2877F5F2936FA63BB43784B12F3EBB4"
--fi
--if have_hash_algo "SHA512"; then
-- test_one ":10:" "4DBFF86CC2CA1BAE1E16468A05CB9881C97F1753BCE3619034898FAA1AABE429955A1BF8EC483D7421FE3C1646613A59ED5441FB0F321389F77F48A879C7B1F1"
--fi
--
--[ "$failed" != "" ] && error "$failed failed for a..z"
--
--exit 0
diff --cc tests/openpgp/seat.test
index b400e72,b400e72..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/seat.test
+++ /dev/null
@@@ -1,19 -1,19 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--for i in $plain_files ; do
-- echo "$usrpass1" | $GPG --passphrase-fd 0 ${opt_always} -seat \
-- -r two at example.com -o x --yes $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
diff --cc tests/openpgp/signencrypt-dsa.test
index 2fb2bb1,2fb2bb1..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/signencrypt-dsa.test
+++ /dev/null
@@@ -1,37 -1,37 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking signing and encryption for DSA
--for i in $plain_files $data_files ; do
-- $GPG ${opt_always} -se -o x --yes \
-- -u "$dsa_usrname1" -r "$dsa_usrname2" $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
--algos="sha1"
--if have_hash_algo "RIPEMD160"; then
-- algos="ripemd160 $algos"
--else
-- echo "Hash algorithm RIPEMD160 is not installed (not an error)"
--fi
--
--for da in $algos; do
-- for i in $plain_files; do
-- $GPG ${opt_always} -se -o x --yes --digest-algo $da \
-- -u "$dsa_usrname1" -r "$dsa_usrname2" $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
-- # process only the first one
-- break
-- done
--done
diff --cc tests/openpgp/signencrypt.test
index 5644bef,5644bef..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/signencrypt.test
+++ /dev/null
@@@ -1,34 -1,34 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--
--info "Checking signing and encryption"
--for i in $plain_files $data_files ; do
-- echo "$usrpass1" | $GPG --passphrase-fd 0 ${opt_always} \
-- -se -o x --yes -r "$usrname2" $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
--i=$srcdir/bug537-test.data.asc
--info "Checking bug 537: MDC problem with old style compressed packets."
--echo "$usrpass1" | $GPG --passphrase-fd 0 -o y --yes $i
--tmp=`$GPG --with-colons --print-md sha1 <y`
--if [ "$tmp" != ":2:4336AE2A528FAE091E73E59E325B588FEE795F9B:" ]; then
-- error "$i: mismatch (bug 537)"
--fi
--
--
--
--
--
--
diff --cc tests/openpgp/sigs-dsa.test
index 4ba43ac,4ba43ac..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/sigs-dsa.test
+++ /dev/null
@@@ -1,36 -1,36 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--#info Checking DSA signatures (default digest algo)
--for i in $plain_files $data_files; do
-- $GPG -s -o x --yes -u $dsa_usrname1 $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
--algos="sha1"
--if have_hash_algo "RIPEMD160"; then
-- algos="ripemd160 $algos"
--else
-- echo "Hash algorithm RIPEMD160 is not installed (not an error)"
--fi
--
--for da in $algos; do
-- for i in $plain_files; do
-- $GPG --digest-algo $da -s -o x --yes -u $dsa_usrname1 $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
-- # process only the first one
-- break
-- done
--done
--
diff --cc tests/openpgp/sigs.test
index d6d8898,d6d8898..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/sigs.test
+++ /dev/null
@@@ -1,46 -1,46 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--for i in $plain_files $data_files; do
-- $GPG -s -o x --yes $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
--done
--
--for da in `all_hash_algos` ; do
-- progress "$da"
--
-- # RSA key, so any hash is okay
-- if have_pubkey_algo "RSA"; then
-- for i in $plain_files; do
-- $GPG -u $usrname3 --digest-algo $da -s -o x --yes $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
-- # process only the first one
-- break
-- done
-- fi
--
-- # Using the DSA sig key - only 160 bit or larger hashes
-- if test $da != "MD5"; then
-- for i in $plain_files; do
-- echo "$usrpass1" | $GPG --passphrase-fd 0 --digest-algo $da \
-- -s -o x --yes $i
-- $GPG -o y --yes x
-- cmp $i y || error "$i: mismatch"
-- # process only the first one
-- break
-- done
-- fi
--done
--
--progress_end
diff --cc tests/openpgp/tofu.test
index 18c1756,0d34af4..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/tofu.test
+++ /dev/null
@@@ -1,245 -1,248 +1,0 @@@
--#!/bin/sh
--
--. $srcdir/defs.inc || exit 3
--
--# set -x
-
-# Redefine GPG with a fixed time.
-GPG="$GPG --faked-system-time=1466684990"
--
--KEYS="2183839A BC15C85A EE37CF96"
--
--# Make sure $srcdir is set.
--if test "x$srcdir" = x
--then
-- echo srcdir environment variable not set!
-- exit 1
--fi
--
--# Make sure $GNUPGHOME is set.
--if test "x$GNUPGHOME" = x
--then
-- echo "GNUPGHOME not set."
-- exit 1
--fi
--
--# Import the test keys.
--$GPG --import $srcdir/tofu-keys.asc
--
--# Make sure the keys are imported.
--for k in $KEYS
--do
-- if ! $GPG --list-keys $k >/dev/null 2>&1
-- then
-- echo Missing key $k
-- exit 1
-- fi
--done
--
--format=auto
--
--debug()
--{
-- echo "$@" >&2
--}
--
--debug_exec()
--{
-- debug "Running GNUPGHOME=$GNUPGHOME $@"
-- ${@:+"$@"}
--}
--
--# $1 is the keyid of the policy to lookup. Any remaining arguments
--# are simply passed to GPG.
--#
--# This function only supports keys with a single user id.
--getpolicy()
--{
-- keyid=$1
-- if test x$keyid = x
-- then
-- echo No keyid supplied!
-- exit 1
-- fi
-- shift
--
-- policy=$(debug_exec $GPG --tofu-db-format=$format --trust-model=tofu \
-- --with-colons $@ --list-keys "$keyid" \
-- | awk -F: '/^uid:/ { print $18 }')
-- if test $(echo "$policy" | wc -l) -ne 1
-- then
-- echo "Got: $policy" >&2
-- echo "error"
-- else
-- case $policy in
-- auto|good|unknown|bad|ask) echo $policy ;;
-- *) echo "error" ;;
-- esac
-- fi
--}
--
--# $1 is the key id
--# $2 is the expected policy
--# The rest are additional options to pass to gpg.
--checkpolicy()
--{
-- debug
-- debug "checkpolicy($@)"
--
-- keyid=$1
-- shift
-- expected_policy=$1
-- shift
-- policy=$(getpolicy "$keyid" ${@:+"$@"})
-- if test "x$policy" != "x$expected_policy"
-- then
-- echo "$keyid: Expected policy to be \`$expected_policy', but got \`$policy'."
-- exit 1
-- fi
--}
--
--# $1 is the keyid of the trust level to lookup. Any remaining
--# arguments are simply passed to GPG.
--#
--# This function only supports keys with a single user id.
--gettrust()
--{
-- keyid=$1
-- if test x$keyid = x
-- then
-- echo No keyid supplied!
-- exit 1
-- fi
-- shift
--
-- trust=$(debug_exec $GPG --tofu-db-format=$format --trust-model=tofu \
-- --with-colons $@ --list-keys "$keyid" \
-- | awk -F: '/^pub:/ { print $2 }')
-- if test $(echo "$trust" | wc -l) -ne 1
-- then
-- echo "error"
-- else
-- case $trust in
-- [oidreqnmfuws-]) echo $trust ;;
-- *) echo "Bad trust value: $trust" >&2; echo "error" ;;
-- esac
-- fi
--}
--
--# $1 is the key id
--# $2 is the expected trust level
--# The rest are additional options to pass to gpg.
--checktrust()
--{
-- debug
-- debug "checktrust($@)"
--
-- keyid=$1
-- shift
-- expected_trust=$1
-- shift
-- trust=$(gettrust "$keyid" ${@:+"$@"})
-- if test "x$trust" != "x$expected_trust"
-- then
-- echo "$keyid: Expected trust to be \`$expected_trust', but got \`$trust'."
-- exit 1
-- fi
--}
--
--# Set key $1's policy to $2. Any remaining arguments are passed as
--# options to gpg.
--setpolicy()
--{
-- debug
-- debug "setpolicy($@)"
--
-- keyid=$1
-- shift
-- policy=$1
-- shift
--
-- debug_exec $GPG --tofu-db-format=$format \
-- --trust-model=tofu ${@:+"$@"} --tofu-policy $policy $keyid
--}
--
--for format in split flat
--do
-- debug
-- debug "Testing with db format $format"
--
-- # Carefully remove the TOFU db.
-- test -e $GNUPGHOME/tofu.db && rm $GNUPGHOME/tofu.db
-- test -e $GNUPGHOME/tofu.d/email && rm -r $GNUPGHOME/tofu.d/email
-- test -e $GNUPGHOME/tofu.d/key && rm -r $GNUPGHOME/tofu.d/key
-- # This will fail if the directory is not empty.
-- test -e $GNUPGHOME/tofu.d && rmdir $GNUPGHOME/tofu.d
--
-- # Verify a message. There should be no conflict and the trust policy
-- # should be set to auto.
-- debug_exec $GPG --tofu-db-format=$format --trust-model=tofu \
-- --verify $srcdir/tofu-2183839A-1.txt
--
-- checkpolicy 2183839A auto
--
-- trust=$(gettrust 2183839A)
-- debug "default trust = $trust"
-- if test "x$trust" != xm
-- then
-- echo "Wrong default trust. Got: \`$trust', expected \`m'"
-- exit 1
-- fi
--
-- # Trust should be derived lazily. Thus, if the policy is set to auto
-- # and we change --tofu-default-policy, then the trust should change as
-- # well. Try it.
-- checktrust 2183839A f --tofu-default-policy=good
-- checktrust 2183839A - --tofu-default-policy=unknown
-- checktrust 2183839A n --tofu-default-policy=bad
--
-- # Change the policy to something other than auto and make sure the
-- # policy and the trust are correct.
-- for policy in good unknown bad
-- do
-- if test $policy = good
-- then
-- expected_trust='f'
-- elif test $policy = unknown
-- then
-- expected_trust='-'
-- else
-- expected_trust='n'
-- fi
--
-- debug
-- debug "Setting TOFU policy to $policy"
-- setpolicy 2183839A $policy
--
-- # Since we have a fixed policy, the trust level shouldn't
-- # change if we change the default policy.
-- for default_policy in auto good unknown bad ask
-- do
-- checkpolicy 2183839A $policy --tofu-default-policy=$default_policy
-- checktrust 2183839A $expected_trust \
-- --tofu-default-policy=$default_policy
-- done
-- done
--
-- # BC15C85A conflicts with 2183839A. On conflict, this will set
-- # BC15C85A to ask. If 2183839A is auto (it's not, it's bad), then
-- # it will be set to ask.
-- debug_exec $GPG --tofu-db-format=$format --trust-model=tofu \
-- --verify $srcdir/tofu-BC15C85A-1.txt
-- checkpolicy BC15C85A ask
-- checkpolicy 2183839A bad
--
-- # EE37CF96 conflicts with 2183839A and BC15C85A. We change
-- # BC15C85A's policy to auto and leave 2183839A's policy at bad.
-- # This conflict should cause BC15C85A's policy to be changed to
-- # ask (since it is auto), but not affect 2183839A's policy.
-- setpolicy BC15C85A auto
-- checkpolicy BC15C85A auto
-- debug_exec $GPG --tofu-db-format=$format --trust-model=tofu \
-- --verify $srcdir/tofu-EE37CF96-1.txt
-- checkpolicy BC15C85A ask
-- checkpolicy 2183839A bad
-- checkpolicy EE37CF96 ask
--done
--
--exit 0
diff --cc tests/openpgp/use-exact-key.test
index 3745a2d,3745a2d..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/use-exact-key.test
+++ /dev/null
@@@ -1,55 -1,55 +1,0 @@@
--#!/bin/sh
--
--. $srcdir/defs.inc || exit 3
--
--# set -x
--
--# Make sure $srcdir is set.
--if test "x$srcdir" = x
--then
-- echo srcdir environment variable not set!
-- exit 1
--fi
--
--# Import the sample key
--#
--# pub 1024R/8BC90111 2015-12-02
--# Key fingerprint = E657 FB60 7BB4 F21C 90BB 6651 BC06 7AF2 8BC9 0111
--# uid [ultimate] Barrett Brown <barrett at example.org>
--# sub 1024R/3E880CFF 2015-12-02 (encryption)
--# sub 1024R/F5F77B83 2015-12-02 (signing)
--# sub 1024R/45117079 2015-12-02 (encryption)
--# sub 1024R/1EA97479 2015-12-02 (signing)
--info "Importing public key."
--if $GPG --import $srcdir/samplekeys/E657FB607BB4F21C90BB6651BC067AF28BC90111.asc
--then
-- :
--else
-- error "$k: import failed"
--fi
--
--# By default, the most recent, valid signing subkey (1EA97479).
--for x in 8BC90111 3E880CFF F5F77B83 45117079 1EA97479
--do
-- if ! echo | $GPG -s -u "$x" | $GPG --verify --status-fd=1 \
-- | grep 'VALIDSIG 5FBA84ACE02DCB17DA3DFF6BBCA43C441EA97479' >/dev/null
-- then
-- echo | $GPG -s -u "$x" | $GPG --verify --status-fd=2
-- error "Unexpected key used for signing (not the signing subkey, specified \"$x\")."
-- exit 1
-- fi
--done
--
--# But, if we request a particular signing key, we should get it.
--for x in 8BC90111 F5F77B83 1EA97479
--do
-- if ! echo | $GPG -s -u "$x!" | $GPG --verify --status-fd=1 \
-- | grep "VALIDSIG [0-9A-F]*$x " >/dev/null
-- then
-- echo | $GPG -s -u "$x!" | $GPG --verify --status-fd=2
-- error "Unexpected key used for signing (specified: \"$x!\")."
-- exit 1
-- fi
--done
--
--exit 0
diff --cc tests/openpgp/version.test
index 9d265ad,9d265ad..0000000
deleted file mode 100755,100755
--- a/tests/openpgp/version.test
+++ /dev/null
@@@ -1,110 -1,110 +1,0 @@@
--#!/bin/sh
--# Copyright 1998,1999,2000,2001,2002,2003,2004,2005,2006,
--# 2007 Free Software Foundation, Inc.
--# This file is free software; as a special exception the author gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved. This file is
--# distributed in the hope that it will be useful, but WITHOUT ANY
--# WARRANTY, to the extent permitted by law; without even the implied
--# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--
--. $srcdir/defs.inc || exit 3
--
--# This is the first test run by "make check". First kill a possible
--# gpg-agent process from a previous test run.
--if $GPG_AGENT --quiet; then
-- echo "$pgmname: killing leftover gpg-agent process" >&2
-- $GPG_CONNECT_AGENT killagent /bye >/dev/null
-- sleep 2
--fi
--
--
--info "Deleting old files"
--if [ -f Makefile -a -f $srcdir/decrypt-dsa.test ]; then
-- :
--else
-- fatal "not running in the test directory"
-- exit 1
--fi
--if [ -d private-keys-v1.d ]; then
-- rm private-keys-v1.d/* 2>/dev/null || true
-- rmdir private-keys-v1.d
--fi
--for i in pubring.gpg pubring.gpg~ trustdb.gpg trustdb.gpg~ ; do
-- [ -f "$i" ] && rm "$i"
--done
--
--# Now start the agent right away, so that there is only one place
--# where starting the agent may fail. To speed up key generation we
--# create a faked random seed file. Note that we need to set the
--# agent-program so that gpg-connect-agent is able to start the agent
--# we are currently testing and not an already installed one.
--# The "|--debug-quick-random" is a hack to start gpg-agent with
--# that option on the command line.
--info "Starting the agent"
--$MKTDATA 600 >random_seed
--if $GPG_CONNECT_AGENT -v \
-- --agent-program="${GPG_AGENT}|--debug-quick-random" /bye; then
-- :
--else
-- error "starting the gpg-agent failed"
-- exit 1
--fi
--
--
--info "Creating sample data files"
--for i in 500 9000 32000 80000; do
-- $MKTDATA $i >data-$i
--done
--
--info "Unpacking samples"
--$GPG --dearmor < $srcdir/plain-1o.asc > ./plain-1
--$GPG --dearmor < $srcdir/plain-2o.asc > ./plain-2
--$GPG --dearmor < $srcdir/plain-3o.asc > ./plain-3
--$GPG --dearmor < $srcdir/plain-largeo.asc > ./plain-large
--
--info "Storing private keys"
--for i in 50B2D4FA4122C212611048BC5FC31BD44393626E \
-- 7E201E28B6FEB2927B321F443205F4724EBE637E \
-- 13FDB8809B17C5547779F9D205C45F47CE0217CE \
-- 343D8AF79796EE107D645A2787A9D9252F924E6F \
-- 8B5ABF3EF9EB8D96B91A0B8C2C4401C91C834C34 \
-- 0D6F6AD4C4C803B25470F9104E9F4E6A4CA64255 \
-- FD692BD59D6640A84C8422573D469F84F3B98E53 \
-- 76F7E2B35832976B50A27A282D9B87E44577EB66 \
-- A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD \
-- 00FE67F28A52A8AA08FFAED20AF832DA916D1985 \
-- 1DF48228FEFF3EC2481B106E0ACA8C465C662CC5 \
-- A2832820DC9F40751BDCD375BB0945BA33EC6B4C \
-- ADE710D74409777B7729A7653373D820F67892E0 \
-- CEFC51AF91F68A2904FBFF62C4F075A4785B803F; do
-- $GPG --dearmor < $srcdir/privkeys/$i.asc > private-keys-v1.d/$i.key
--done
--
--info "Importing public demo and test keys"
--$GPG --yes --import $srcdir/pubdemo.asc $srcdir/pubring.asc
--$GPG --dearmor < $srcdir/pubring.pkr.asc | $GPG --yes --import
--
--
--info "Preset passphrases"
--# one at example.com
--$GPG_PRESET_PASSPHRASE --preset -P def 50B2D4FA4122C212611048BC5FC31BD44393626E
--$GPG_PRESET_PASSPHRASE --preset -P def 7E201E28B6FEB2927B321F443205F4724EBE637E
--# alpha at example.net
--$GPG_PRESET_PASSPHRASE --preset -P abc 76F7E2B35832976B50A27A282D9B87E44577EB66
--$GPG_PRESET_PASSPHRASE --preset -P abc A0747D5F9425E6664F4FFBEED20FBCA79FDED2BD
--
--
--# Note: secring.asc and secring.skr.asc are the original secrings for
--# our test files. We don't support this as storage format anymore but
--# keep the files here for reference. The actual keys have been
--# extracted and put in gpg-agent's format unter privkeys/. Because
--# the current gpg's import feature does not support storing of
--# unprotected keys in the new gpg-agent format, we had to resort to
--# some trickery to convert them.
--
--
--info "Printing the GPG version"
--$GPG --version | awk '{print " > " $0}'
--
--#fixme: check that the output is as expected
--
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