[Pkg-gnupg-commit] [gnupg1] 28/35: Imported Upstream version 1.4.21
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Mon Aug 29 14:48:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg1.
commit 58c1acefbe5d349fd946ad4043b2501d1f825e79
Merge: 46141f9 4753122
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Mon Aug 29 09:27:26 2016 -0400
Imported Upstream version 1.4.21
ChangeLog | 136 +
Makefile.am | 15 +-
Makefile.in | 968 ---
NEWS | 13 +
README | 34 +-
VERSION | 2 +-
aclocal.m4 | 1346 ----
bzlib/Makefile.in | 658 --
checks/Makefile.in | 745 --
checks/armor.test | 2 +-
cipher/Makefile.in | 708 --
cipher/blowfish.c | 10 +-
cipher/camellia.c | 28 +-
cipher/cast5.c | 18 +-
cipher/cipher.c | 4 +-
cipher/des.c | 22 +-
cipher/pubkey.c | 2 +-
cipher/random.c | 19 +-
cipher/rndunix.c | 15 +-
cipher/twofish.c | 6 +-
configure | 19304 ------------------------------------------------
configure.ac | 2 +-
doc/Makefile.in | 990 ---
doc/gnupg1.info | 120 +-
doc/gpg.texi | 26 +-
doc/stamp-vti | 8 +-
doc/version.texi | 8 +-
g10/Makefile.in | 988 ---
g10/armor.c | 2 +-
g10/ccid-driver.c | 2 +-
g10/cipher.c | 2 +-
g10/compress-bz2.c | 2 +-
g10/compress.c | 2 +-
g10/encode.c | 2 +-
g10/encr-data.c | 4 +-
g10/gpg.c | 10 +-
g10/gpgv.c | 2 +
g10/keygen.c | 4 +-
g10/mainproc.c | 2 +-
g10/mdfilter.c | 2 +-
g10/options.h | 2 +-
g10/parse-packet.c | 2 +-
g10/pipemode.c | 2 +-
g10/pkclist.c | 2 +-
g10/progress.c | 2 +-
g10/sig-check.c | 4 +-
g10/tdbio.c | 104 +-
g10/textfilter.c | 2 +-
gnupg.spec | 2 +-
include/iobuf.h | 1 -
intl/Makefile.in | 662 --
intl/plural.c | 2015 -----
intl/tsearch.h | 81 -
keyserver/Makefile.in | 1063 ---
m4/Makefile.in | 510 --
mpi/Makefile.in | 724 --
po/be.gmo | Bin 12247 -> 0 bytes
po/be.po | 352 +-
po/ca.gmo | Bin 74422 -> 0 bytes
po/ca.po | 352 +-
po/cs.gmo | Bin 145929 -> 0 bytes
po/cs.po | 352 +-
po/da.gmo | Bin 140894 -> 0 bytes
po/da.po | 352 +-
po/de.gmo | Bin 151053 -> 0 bytes
po/de.po | 355 +-
po/el.gmo | Bin 74129 -> 0 bytes
po/el.po | 352 +-
po/en at boldquot.gmo | Bin 136695 -> 0 bytes
po/en at boldquot.po | 360 +-
po/en at quot.gmo | Bin 135043 -> 0 bytes
po/en at quot.po | 360 +-
po/eo.gmo | Bin 53202 -> 0 bytes
po/eo.po | 352 +-
po/es.gmo | Bin 144849 -> 0 bytes
po/es.po | 352 +-
po/et.gmo | Bin 69810 -> 0 bytes
po/et.po | 352 +-
po/fi.gmo | Bin 73436 -> 0 bytes
po/fi.po | 352 +-
po/fr.gmo | Bin 152742 -> 0 bytes
po/fr.po | 352 +-
po/gl.gmo | Bin 72589 -> 0 bytes
po/gl.po | 352 +-
po/gnupg.pot | 350 +-
po/hu.gmo | Bin 72725 -> 0 bytes
po/hu.po | 352 +-
po/id.gmo | Bin 70883 -> 0 bytes
po/id.po | 352 +-
po/it.gmo | Bin 144891 -> 0 bytes
po/it.po | 352 +-
po/ja.gmo | Bin 152946 -> 0 bytes
po/ja.po | 389 +-
po/nb.gmo | Bin 89940 -> 0 bytes
po/nb.po | 352 +-
po/nl.gmo | Bin 151715 -> 0 bytes
po/nl.po | 352 +-
po/pl.gmo | Bin 146345 -> 0 bytes
po/pl.po | 352 +-
po/pt.gmo | Bin 64153 -> 0 bytes
po/pt.po | 352 +-
po/pt_BR.gmo | Bin 37353 -> 0 bytes
po/pt_BR.po | 352 +-
po/ro.gmo | Bin 144523 -> 0 bytes
po/ro.po | 352 +-
po/ru.gmo | Bin 183040 -> 0 bytes
po/ru.po | 514 +-
po/sk.gmo | Bin 71774 -> 0 bytes
po/sk.po | 352 +-
po/stamp-po | 1 -
po/sv.gmo | Bin 139378 -> 0 bytes
po/sv.po | 352 +-
po/tr.gmo | Bin 129318 -> 0 bytes
po/tr.po | 352 +-
po/uk.gmo | Bin 192371 -> 0 bytes
po/uk.po | 352 +-
po/zh_CN.gmo | Bin 131135 -> 0 bytes
po/zh_CN.po | 352 +-
po/zh_TW.gmo | Bin 135000 -> 0 bytes
po/zh_TW.po | 352 +-
scripts/compile | 347 -
scripts/config.guess | 168 +-
scripts/config.sub | 58 +-
scripts/depcomp | 791 --
scripts/install-sh | 527 --
scripts/mdate-sh | 224 -
scripts/missing | 215 -
scripts/texinfo.tex | 10079 -------------------------
tools/Makefile.in | 858 ---
util/Makefile.in | 766 --
util/iobuf.c | 76 +-
util/regcomp.c | 4 +-
util/regex_internal.c | 4 +-
zlib/Makefile.in | 665 --
134 files changed, 6337 insertions(+), 51337 deletions(-)
diff --cc ChangeLog
index 464a673,8bd68a6..aad833f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,1142 -1,16 +1,1278 @@@
-No more ChangeLog files
-========================
++2016-08-17 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 1.4.21.
+
++ gpg: Add dummy option --with-subkey-fingerprint.
++ * g10/gpg.c (opts): Add dummy option.
+
++ build: Create a swdb file during "make distcheck".
++ * Makefile.am (distcheck-hook): New.
+
-Local Variables:
-buffer-read-only: t
-mode: text
-End:
++2016-08-17 Ineiev <ineiev at gnu.org>
++
++ po: Update Russian translation.
++
++2016-08-17 Werner Koch <wk at gnupg.org>
++
++ random: Hash continuous areas in the csprng pool.
++ * cipher/random.c (mix_pool): Store the first hash at the end of the
++ pool.
++
++ cipher: Improve readability by using a macro.
++ * cipher/random.c (mix_pool): Use DIGESTLEN instead of 20.
++
++2016-08-09 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ gpg: Avoid publishing the GnuPG version by default.
++ * g10/gpg.c (main): initialize opt.emit_version to 0
++ * doc/gpg.texi: document different default for --emit-version
++
++2016-08-04 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
++
++ Clean up "allow to"
++ * README, cipher/cipher.c, cipher/pubkey.c, doc/gpg.texi: replace
++ "allow to" with clearer text
++
++ In standard English, the normal construction is "${XXX} allows ${YYY}
++ to" -- that is, the subject (${XXX}) of the sentence is allowing the
++ object (${YYY}) to do something. When the object is missing, the
++ phrasing sounds awkward, even if the object is implied by context.
++ There's almost always a better construction that isn't as awkward.
++
++ These changes should make the language a bit clearer.
++
++ Fix spelling: "occured" should be "occurred"
++ * checks/armor.test, cipher/des.c, g10/ccid-driver.c, g10/pkclist.c,
++ util/regcomp.c, util/regex_internal.c: correct the spelling of
++ "occured" to "occurred"
++
++2016-08-04 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: Fix checking key for signature validation.
++ * g10/sig-check.c (signature_check2): Not only subkey, but also primary
++ key should have flags.valid=1.
++
++2016-08-03 Justus Winter <justus at g10code.com>
++
++ Partially revert "g10: Fix another race condition for trustdb access."
++ This amends db246f8b which accidentally included the compiled
++ translation files.
++
++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-06 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: Fix keysize with --expert.
++ * g10/keygen.c (ask_keysize): It's 768 only for DSA.
++
++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-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-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-01 Werner Koch <wk at gnupg.org>
++
++ Fix possible sign extension problem with newer compilers.
++ * cipher/des.c (READ_64BIT_DATA): Cast to u32 before shifting by 24.
++ * cipher/blowfish.c (do_encrypt_block): Ditto.
++ (do_decrypt_block): Ditto.
++ * cipher/camellia.c (CAMELLIA_RR8): Ditto.
++ * cipher/cast5.c (do_encrypt_block): Ditto.
++ (do_decrypt_block): Ditto.
++ (do_cast_setkey): Ditto.
++ * cipher/twofish.c (INPACK): Ditto.
++ * util/iobuf.c (block_filter): Ditto.
++
++2016-01-26 NIIBE Yutaka <gniibe at fsij.org>
++
++ g10: Fix iobuf API of filter function for alignment.
++ * include/iobuf.h (struct iobuf_struct): Remove DESC.
++ * util/iobuf.c (iobuf_desc): New.
++ (print_chain, iobuf_close, iobuf_open, iobuf_fdopen, iobuf_sockopen)
++ (iobuf_create, iobuf_append, iobuf_openrw, iobuf_ioctl)
++ (iobuf_push_filter2, pop_filter, underflow): Use iobuf_desc.
++ (file_filter, sock_filter, block_filter): Fill the description.
++ * g10/armor.c, g10/cipher.c, g10/compress-bz2.c, g10/compress.c,
++ g10/encode.c, g10/encr-data.c, g10/mdfilter.c, g10/pipemode.c,
++ g10/progress.c, g10/textfilter.c: Likewise.
++
++2016-01-15 Werner Koch <wk at gnupg.org>
++
++ Fix possible AIX problem with sysconf in rndunix.
++ * cipher/rndunix.c [HAVE_STDINT_H]: Include stdint.h.
++ (start_gatherer): Detect misbehaving sysconf.
++
++2016-01-13 NIIBE Yutaka <gniibe at fsij.org>
++
++ Fix to support git worktree.
++ * Makefile.am: Use -e for testing .git.
++
++2015-12-21 NIIBE Yutaka <gniibe at fsij.org>
++
++ po: Update Japanese translation.
++
+2015-12-19 Werner Koch <wk at gnupg.org>
+
+ Release 1.4.20.
+
+ w32: Avoid warning when using newer mingw versions.
+ * g10/tdbio.c (ftruncate): Do not define if already defined.
+
+2015-12-19 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Add option --weak-digest to gpg and gpgv.
+ * g10/options.h: Add 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.
+ * g10/sig-check.c: (do_check): Reject all weak digests.
+ * 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-12-19 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/gpg.conf.tmpl: Add allow_weak_digest_algos.
+
+2015-12-17 Werner Koch <wk at gnupg.org>
+
+ gpg: Change default cipher for --symmetric from CAST5 to AES-128.
+ * g10/main.h (DEFAULT_CIPHER_ALGO): Change to AES or CAST5 or 3DES
+ depending on configure options.
+ * g10/gpg.c (main): Set opt.s2k_cipher_algo to DEFAULT_CIPHER_ALGO.
+
+2015-12-17 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ Pass DBUS_SESSION_BUS_ADDRESS for gnome3.
+ * g10/passphrase.c (stdenvnames): Add DBUS_SESSION_BUS_ADDRESS.
+
+2015-11-20 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.
+
+2015-10-01 Werner Koch <wk at gnupg.org>
+
+ gpg: Silence a compiler warning.
+ * g10/parse-packet.c (enum_sig_subpkt): Replace hack.
+
+2015-09-17 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Update Japanese translation.
+
+2015-09-08 NIIBE Yutaka <gniibe at fsij.org>
+
+ po: Fix Spanish translation.
+
+2015-09-01 Werner Koch <wk at gnupg.org>
+
+ Obsolete option --no-sig-create-check.
+ * cipher/rsa.c (rsa_sign): Verify after sign.
+ * g10/gpg.c (opts): Make --no-sig-create-check a NOP.
+ * g10/options.h (opt): Remove field "no_sig_create_check".
+ * g10/sign.c (do_sign): Do check only for DSA.
+
+2015-06-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: Fix a race condition initially creating trustdb.
+ * g10/tdbio.c (take_write_lock, tdbio_set_dbname): Fix message.
+
+2015-06-15 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-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.
+
+ g10: Improve handling of no corresponding public key.
+ * g10/getkey.c (get_seckey): Return G10ERR_NO_PUBKEY when it's not
+ exact match.
+
+2015-04-30 NIIBE Yutaka <gniibe at fsij.org>
+
+ g10: fix cmp_public_key and cmp_secret_keys.
+ * g10/free-packet.c (cmp_public_keys, cmp_secret_keys): Compare opaque
+ data at the first entry of the array when it's unknown algo.
+ * mpi/mpi-cmp.c (mpi_cmp): Backport libgcrypt 1.5.0's semantics.
+
+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-03-28 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove left-over debug message.
+ * g10/armor.c (check_input): Remove log_debug.
+
+2015-02-27 Werner Koch <wk at gnupg.org>
+
+ Release 1.4.19.
+
+ po: Update German translation.
+
+2015-02-26 David Prévot <taffit at debian.org>
+
+ po: Update French translation.
+
+2015-02-26 Roman Pavlik <rp at tns.cz>
+
+ po: Update Czech translation.
+
+2015-02-26 Frans Spiesschaert <Frans.Spiesschaert at yucom.be>
+
+ po: Update Dutch translation.
+
+2015-02-26 Manuel \"Venturi\" Porras Peralta <venturi at openmailbox.org>
+
+ po: Update Spanish translation.
+
+2015-02-26 Jakub Bogusz <qboosh at pld-linux.org>
+
+ po: Update Polish translation.
+
+2015-02-26 Ineiev <ineiev at gnu.org>
+
+ po: Update Russian translation.
+
+2015-02-26 Yuri Chornoivan <yurchor at ukr.net>
+
+ po: Update Ukrainian translation.
+
+2015-02-26 Milo Casagrande <milo at milo.name>
+
+ po: Update Italian translation.
+
+2015-02-26 Jedi Lin <Jedi at Jedi.org>
+
+ Update Chinese (traditional) translation.
+
+2015-02-26 Werner Koch <wk at gnupg.org>
+
+ Fix for building without DNS support.
+ * util/cert.c (get_cert) [!USE_DNS_CERT]: Add want_ipgp.
+
+ po,intl: Update to 0.19.3.
+
+ Switch to a hash and CERT record based PKA system.
+ * util/pka.c: Rewrite.
+ (get_pka_info): Add arg fprbuflen. Change callers to pass this.
+ * util/strgutil.c (ascii_strlwr): New.
+ * configure.ac: Remove option --disable-dns-pka.
+ (USE_DNS_PKA): Remove ac_define.
+ * g10/getkey.c (parse_auto_key_locate): Always include PKA.
+
+ Move two functions from g10/ to util/.
+ * g10/misc.c (has_invalid_email_chars, is_valid_mailbox): Move to ...
+ * util/strgutil.c: here.
+
+ Add new function strconcat.
+ * include/util.h (GNUPG_GCC_A_SENTINEL): New.
+ * util/strgutil.c (do_strconcat, strconcat): New.
+
+ Add convenience function to hash a buffer.
+ * cipher/sha1.c (sha1_hash_buffer): New.
+
+ Allow requesting only an IPGP certtype with dns_cert().
+ * util/cert.c (get_cert): Add arg want_ipgp. Change callers.
+
+2015-02-26 NIIBE Yutaka <gniibe at fsij.org>
+
+ mpi: Avoid data-dependent timing variations in mpi_powm.
+ * include/mpi.h, mpi/mpiutils.c (mpi_set_cond): New.
+ * mpi/mpi-pow.c (SIZE_PRECOMP): Rename from SIZE_B_2I3.
+ (mpi_powm): Access all data in the table and use mpi_set_cond.
+
+2015-02-23 Werner Koch <wk at gnupg.org>
+
+ Protect against NULL return of mpi_get_opaque.
+ * g10/seckey-cert.c (do_check): Call BUG for NULL return of
+ get_opaque.
+
+2015-02-23 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ gpg: Fix segv due to NULL value stored as opaque MPI.
+ * g10/build-packet.c (do_secret_key): Check for NULL return from
+ gcry_mpi_get_opaque.
+ * g10/keyid.c (hash_public_key): Ditto.
+
+2015-02-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Remove an unused variable.
+ * g10/import.c (import): Remove need_armor.
+
+ [dkg: rebased to STABLE-BRANCH-1-4]
+
+2015-02-23 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ curl-shim: clean up varargs.
+ * keyserver/curl-shim.c (curl_easy_setopt) : ensure that va_end is
+ called.
+
+2015-02-23 Werner Koch <wk at gnupg.org>
+
+ gpg: Print better diagnostics for keyserver operations.
+ * g10/armor.c (parse_key_failed_line): New.
+ (check_input): Watch out for gpgkeys_ error lines.
+ * g10/filter.h (armor_filter_context_t): Add field key_failed_code.
+ * g10/import.c (import): Add arg r_gpgkeys_err.
+ (import_keys_internal): Ditto.
+ (import_keys_stream): Ditto.
+ * g10/keyserver.c (keyserver_errstr): New.
+ (keyserver_spawn): Detect "KEY " lines while sending. Get gpgkeys_err
+ while receiving keys.
+ (keyserver_work): Add kludge for better error messages.
+
+ Use inline functions to convert buffer data to scalars.
+ * include/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.
+
+ gpg: Prevent an invalid memory read using a garbled keyring.
+ * g10/keyring.c (keyring_get_keyblock): Whitelist allowed packet
+ types.
+
+ 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.
+
+ 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: Allow predefined names as answer to the keygen.algo prompt.
+ * g10/keygen.c (ask_algo): Add list of strings.
+
+ 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.
+
+2015-02-11 Werner Koch <wk at gnupg.org>
+
+ Use ciphertext blinding for Elgamal decryption.
+ * cipher/elgamal.c (USE_BLINDING): New.
+ (decrypt): Rewrite to use ciphertext blinding.
+
+2015-01-19 Werner Koch <wk at gnupg.org>
+
+ Modernize to automake 1.14.
+ * Makefile.am (AUTOMAKE_OPTIONS): Move to ...
+ * configure.ac (AM_INIT_AUTOMAKE): here and add serial-tests.
+
+ * keyserver/Makefile.am: Replace INCLUDES by AM_CPPFLAGS.
+ * mpi/Makefile.am: Ditto.
+ * util/Makefile.am: Ditto.
+ * keyserver/Makefile.am: Ditto. Adjusted other things.
+
+ * m4/intl.m4, m4/po.m4: Use autoconf's AC_PROG_MKDIR_P.
+
+ Fix a problem with select and high fds.
+ * cipher/rndlinux.c (rndlinux_gather_random): Check fd before using
+ FD_SET.
+
+2015-01-13 Werner Koch <wk at gnupg.org>
+
+ doc: Formatting fixes.
+ * doc/gpl.texi: Fix enumerate and re-indent examples.
+
+2015-01-13 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+ avoid future chance of using uninitialized memory.
+ * util/iobuf.c: (iobuf_open): initialize len
+
+2015-01-13 Werner Koch <wk at gnupg.org>
+
+ doc: Fix memory leak in yat2m.
+ * doc/yat2m.c (write_th): Free NAME.
+
+ gpg: Fix possible read of unallocated memory.
+ * g10/parse-packet.c (can_handle_critical): Check content length
+ before calling can_handle_critical_notation.
+
+2015-01-09 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.
+
+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.
+
+2014-12-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ gpg: release DEK soon after its use.
+ * g10/keygen.c (generate_subkeypair): Release DEK soon.
+
+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 a NULL-deref for invalid input data.
+ * g10/mainproc.c (proc_encrypted): Take care of canceled passpharse
+ entry.
+
+2014-11-14 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.
+
+2014-11-12 Werner Koch <wk at gnupg.org>
+
+ gpg: Add import option "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-10-03 Werner Koch <wk at gnupg.org>
+
+ mpi: Fix compiler warning.
+ * mpi/mpi-inv.c (mpi_invm): Do not return a value.
+
+2014-10-03 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-09-29 Werner Koch <wk at gnupg.org>
+
+ doc: Final update from master (gnupg 2.1)
+ * doc/Makefile.am (sources_from_trunk): Remove.
+ (update-source): Make it a dummy.
+ * doc/gpg.texi: Update.
+ * doc/yat2m.c: Update.
+
+ Allow use of --debug-level=LEVEL without '='.
+ * g10/gpg.c (opts): Fix "debug-level".
+
+2014-09-11 Werner Koch <wk at gnupg.org>
+
+ mpi: Improve mpi_invm to detect bad input.
+ * mpi/mpi-inv.c (mpi_invm): Return 0 for bad input.
+
+2014-08-20 Werner Koch <wk at gnupg.org>
+
+ mpi: Suppress set-but-unused-variables warnings.
+ * include/types.h (GNUPG_GCC_ATTR_UNUSED): Define for gcc >= 3.5.
+ * mpi/mpih-div.c (mpihelp_divmod_1, mpihelp_mod_1): Mark dummy as
+ unused.
+ * mpi/mpi-internal.h (UDIV_QRNND_PREINV): Mark _ql as unused.
+
+ Fix strict-alias warnings for rijndael.c.
+ * cipher/rijndael.c (do_setkey, prepare_decryption): Use u32_a_t cast.
+
+ gpg: Allow compressed data with algorithm 0.
+ * g10/mainproc.c (proc_compressed): Remove superfluous check for
+ an algorithm number of 0.
+
+2014-08-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Fix regression due to the keyserver import filter.
+ * g10/keyserver.c (keyserver_retrieval_filter): Change args. Rewrite
+ to take subpakets in account.
+ * g10/import.c (import_one, import_secret_one): Pass keyblock to
+ filter.
+
+ Add kbnode_t for easier backporting.
+ * g10/global.h (kbnode_t): New.
+
+2014-06-30 Werner Koch <wk at gnupg.org>
+
+ Release 1.4.18.
+
+ 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.
+
+ Make screening of keyserver result work with multi-key commands.
+ * g10/keyserver.c (ks_retrieval_filter_arg_s): new.
+ (keyserver_retrieval_filter): Use new struct and check all
+ descriptions.
+ (keyserver_spawn): Pass filter arg suing the new struct.
+
+2014-06-23 Werner Koch <wk at gnupg.org>
+
+ Release 1.4.17.
+
+ doc: Update from master.
+
+ Fix syntax error introduced with 60bd6488.
+ * g10/apdu.c (pcsc_dword_t): Fix syntax error.
+
+2014-06-23 Stefan Tomanek <tomanek at internet-sicherheit.de>
+
+ Screen keyserver responses.
+ * g10/main.h: Typedef import_filter for filter callbacks.
+ * g10/import.c (import): Add filter callbacks to param list.
+ (import_one): Ditto.
+ (import_secret_one): Ditto.
+ (import_keys_internal): Ditto.
+ (import_keys_stream): Ditto.
+ * g10/keyserver.c (keyserver_retrieval_filter): New.
+ (keyserver_spawn): Pass filter to import_keys_stream()
+
+2014-06-23 Werner Koch <wk at gnupg.org>
+
+ Print hash algorithm in sig records.
+ * g10/keylist.c (list_keyblock_colon): Print field 16.
+
+ Remove useless diagnostic in MDC verification.
+ * g10/encr-data.c (decrypt_data): Do not distinguish between a bad MDC
+ packet header and a bad MDC.
+
+ intl: Fix for uClibc.
+ * intl/localename.c (gl_locale_name_thread_unsafe): Take care of
+ uCLIBC.
+
+ PC/SC cleanup.
+ * g10/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.
+
+ gpg: Use more specific reason codes for INV_RECP.
+ * g10/pkclist.c (build_pk_list): Use more specific reasons codes for
+ INV_RECP.
+
+ doc: Remove outdated Russian man page.
+ * configure.ac (DOCBOOK_TO_MAN): Remove.
+ * doc/gpg.ru.sgml: Remove.
+ * doc/Makefile.am: Remove all gpg.ru related code.
+
+2014-06-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Avoid infinite loop in uncompressing garbled packets.
+ * g10/compress.c (do_uncompress): Limit the number of extra FF bytes.
+
+2014-03-06 Werner Koch <wk at gnupg.org>
+
+ gpg: Need to init the trustdb for import.
+ * g10/trustdb.c (clear_ownertrusts): Init trustdb.
+
+2014-01-23 Werner Koch <wk at gnupg.org>
+
+ Support building using the latest mingw-w64 toolchain.
+ * acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Change mingw detection.
+
+2013-12-13 Werner Koch <wk at gnupg.org>
+
+ Release 1.4.16.
+
+2013-12-11 Werner Koch <wk at gnupg.org>
+
+ Change --show-session-key to print the session key earlier.
+ * g10/mainproc.c (proc_encrypted): Move show_session_key code to ...
+ * g10/decrypt-data.c (decrypt_data): here.
+
+2013-12-10 Werner Koch <wk at gnupg.org>
+
+ Update config.{guess,sub} and some copyright notices.
+ * scripts/config.guess, scripts/config.sub: Update to version
+ 2013-11-29.
+
+2013-12-05 Werner Koch <wk at gnupg.org>
+
+ Prepare for newer automakes which default to parallel tests.
+ * checks/Makefile.am: Add a list of test dependencies.
+
+2013-12-03 Werner Koch <wk at gnupg.org>
+
+ Normalize the MPIs used as input to secret key functions.
+ * cipher/rsa.c (secret): Normalize the INPUT.
+ (rsa_decrypt): Pass reduced data to secret.
+ * cipher/elgamal.c (decrypt): Normalize A and B.
+ * cipher/dsa.c (sign): Normalize HASH.
+
+ Use blinding for the RSA secret operation.
+ * cipher/random.c (randomize_mpi): New.
+ * g10/gpgv.c (randomize_mpi): New stub.
+ * cipher/rsa.c (USE_BLINDING): Define macro.
+ (secret): Implement blinding.
+
+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-10-18 Werner Koch <wk at gnupg.org>
+
+ mpi: mpi-pow improvements.
+ * mpi/mpi-pow.c (USE_ALGORITHM_SIMPLE_EXPONENTIATION): New.
+ (mul_mod) [!USE_ALGORITHM_SIMPLE_EXPONENTIATION]: New.
+ (mpi_powm) [!USE_ALGORITHM_SIMPLE_EXPONENTIATION]: New implementation
+ of left-to-right k-ary exponentiation.
+
+ Print the keyid for key packets with --list-packets.
+ * g10/parse-packet.c (parse_key): Add keyid printing.
+
+2013-10-11 Werner Koch <wk at gnupg.org>
+
+ mpi: Fix syntax error for mips64 and gcc < 4.4.
+ * mpi/longlong.h [__mips && gcc < 4.4]: Fix cpp syntax error.
+
+ 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.
+ (get_ownertrust): Ditto.
+ (get_min_ownertrust): Ditto.
+ (update_ownertrust): Ditto.
+ (update_min_ownertrust): Ditto.
+ (clear_ownertrusts): Ditto.
+ (cache_disabled_value): Ditto.
+ (check_trustdb_stale): Ditto.
+ (get_validity): Ditto.
+ * g10/gpg.c (main): Do not create a trustdb with most commands for
+ trust-model always.
+
+2013-10-04 Werner Koch <wk at gnupg.org>
+
+ Release 1.4.15.
+
+ doc: Update from master.
+
+ 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.
+
+2013-10-04 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.
+ (cherry picked from commit b693ec02c467696bf9d7324dd081e279f9965151)
+ (cherry picked from commit dd868acb0d13a9f119c0536777350a6c237a66a1)
+
+2013-10-04 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.
+
+ keyserver: Allow use of cURL's default CA store.
+ * keyserver/gpgkeys_curl.c (main): Set CURLOPT_CAINFO only if a file
+ has been given.
+ * keyserver/gpgkeys_hkp.c (main): Ditto.
+
+ gpg: Limit the nesting level of I/O filters.
+ * until/iobuf.c (MAX_NESTING_FILTER): New.
+ (iobuf_push_filter2): Limit the nesting level.
+
+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-16 Werner Koch <wk at gnupg.org>
+
+ Fix bug in mpi_tdiv_q_2exp.
+ * mpi/mpi-internal.h (MPN_COPY_INCR): Make it work.
+
+2013-08-30 Werner Koch <wk at gnupg.org>
+
+ gpg: Use 2048 as the default keysize in batch mode.
+ * g10/keygen.c (gen_elg, gen_dsa, gen_rsa): Set default keysize to
+ 2048.
+
+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-07-25 Werner Koch <wk at gnupg.org>
+
+ Release 1.4.14.
+
+2013-07-25 Jedi Lin <Jedi at Jedi.org>
+
+ Update Chinese translation.
+
+2013-07-25 Werner Koch <wk at gnupg.org>
+
+ Update to modern beta release numbering scheme.
+ * configure.ac: s/my_/mym4_/. Add new release building code.
+
+ Prepare for a forthcoming new algorithm id.
+ * include/cipher.h (PUBKEY_ALGO_ECC): New.
+ * g10/keyid.c (pubkey_letter): Add letter 'C'.
+
+ Mitigate a flush+reload cache attack on RSA secret exponents.
+ * mpi/mpi-pow.c (mpi_powm): Always perform the mpi_mul for exponents
+ hold in secure memory.
+
+ Fix git revision parsing.
+ * configure.ac: Use git rev-parse to retrieve the revision.
+
+2013-07-16 NIIBE Yutaka <gniibe at fsij.org>
+
+ gpg: fix previous change.
+ * g10/gpgv.c: Fix void dotlock_remove_lockfiles.
+
+2013-07-12 NIIBE Yutaka <gniibe at fsij.org>
+
+ gpg: signal handling fix.
+ * include/dotlock.h (dotlock_remove_lockfiles_reclaim): New.
+ (dotlock_destroy, dotlock_remove_lockfiles): Add a flag to reclaim
+ memory or not.
+ * util/dotlock.c (dotlock_create): Use
+ dotlock_remove_lockfiles_reclaim for atexit.
+ (dotlock_destroy_unix, dotlock_destroy)
+ (dotlock_remove_lockfiles): Add a reclaim flag.
+ (dotlock_remove_lockfiles_reclaim): New.
+ * g10/signal.c (got_fatal_signal): Disable flag of reclaim memory to
+ avoid non-async-face call.
+ * g10/keydb.c (maybe_create_keyring): Follow the API change.
+ * g10/gpgv.c: Follow the API change.
+
+2013-03-03 David Shaw <dshaw at jabberwocky.com>
+
+ Differentiate between success (full or partial), not-found, and failure.
+ * keyserver/gpgkeys_hkp.c (get_key): Use curl_easy_setinfo to get the
+ HTTP status code so we can tell the difference between a successful
+ retrieval, a partial retrieval, a not-found, or a server failed.
+
+ Emulate curl_easy_getinfo and CURLINFO_RESPONSE_CODE in curl-shim.
+ * keyserver/curl-shim.h, keyserver/curl-shim.c (curl_easy_getinfo):
+ New. Return the HTTP status code for the last transfer.
+
+2013-01-30 David Shaw <dshaw at jabberwocky.com>
+
+ Fix DNS check for recent OS X releases.
+ * configure.ac: OS X now needs BIND_8_COMPAT and -lresolv
+
+2013-01-11 Werner Koch <wk at gnupg.org>
+
+ Automake 1.13 compatibility fix.
+ * configure.ac: s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/.
+
+ Fix idea.c for big endian CPUs.
+ * cipher/idea.c: Replace use of WORDS_BIGENDIAN by BIG_ENDIAN_HOST.
+
+2013-01-11 Christian Aistleitner <christian at quelltextlich.at>
+
+ Fix honoring --cert-digest-algo when recreating a cert.
+ * g10/sign.c (update_keysig_packet): Override original signature's
+ digest algo in hashed data.
+
+2012-12-20 Werner Koch <wk at gnupg.org>
+
+ Release 1.4.13.
+
+ Last fix for the SRV record patches.
+ * keyserver/gpgkeys_hkp.c (srv_replace): Make sure SRVCOUNT is
+ always initialized.
+
+ Update manuals from master.
+ * doc/Makefile.am (update-source): Copy from Git master.
+ (update-source-from-gnupg-2): Remove.
+ * doc/gpg.texi: Fix minor typos and grammar bugs.
+ * doc/yat2m.c: Change diagnostics to updated coding standards.
+
+ Update config.{guess,sub} to version 2012-07-31.
+ * scripts/config.guess, scripts/config.sub: Update.
+
+2012-12-20 Joe Hansen <joedalton2 at yahoo.dk>
+
+ po: Update Danish translation.
+ * po/da.po: Update.
+
+2012-12-20 Werner Koch <wk at gnupg.org>
+
+ gpg: Suppress "public key already present" in quiet mode.
+ * g10/pkclist.c (build_pk_list): Print two diagnostics only in
+ non-quiet mode.
+
+ 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 David Shaw <dshaw at jabberwocky.com>
+
+ Issue 1447: Pass proper Host header and SNI when SRV is used with curl.
+ * configure.ac: Check for inet_ntop.
+
+ * m4/libcurl.m4: Provide a #define for the version of the curl
+ library.
+
+ * keyserver/gpgkeys_hkp.c (main, srv_replace): Call getaddrinfo() on
+ each target. Once we find one that resolves to an address (whether
+ IPv4 or IPv6), pass it into libcurl via CURLOPT_RESOLVE using the
+ SRV name as the "host". Force the HTTP Host header to be the same.
+
+ Backported from 6b1f71055ebab36989e2089cfde319d2ba40ada7
+
+ * keyserver/gpgkeys_hkp.c (main): Only default try-dns-srv to on if we
+ have SRV support in the first place.
+
+ Backported from 732f3d1d4786239db5f31f82cc04ec79326cc13c
+
+ Part of issue 1447: Pass proper Host header when SRV is used.
+ * common/http.c (send_request, connect_server): Set proper Host header
+ (no :port, host is that of the SRV) when SRV is used in the
+ curl-shim.
+
+ Backported from cbe98b2cb1e40ba253300e604996681ae191e363
+
+2012-12-19 Werner Koch <wk at gnupg.org>
+
+ Fix last commit.
+ * util/http.c (connect_server): Bump SRVINDEX and not SRV.
+
+2012-12-19 David Shaw <dshaw at jabberwocky.com>
+
+ Fix issue 1446: honor ports given in SRV responses.
+ * common/http.c (send_request, connect_server, http_open): Use a
+ struct srv instead of a single srvtag so we can pass the chosen host
+ and port back to the caller.
+ (connect_server): Use the proper port in the HAVE_GETADDRINFO case.
+
+ * keyserver/curl-shim.c (curl_easy_perform): Use struct srv and log
+ chosen host and port.
+
+ * keyserver/gpgkeys_hkp.c (main): Properly take the port given by SRV.
+
+ Backported from ba9e974f1fd85b3dbbfb5e26d7a14f71d07c7cf2
+
+2012-12-18 Werner Koch <wk at gnupg.org>
+
+ Add meta option ignore-invalid-option.
+ * util/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-15 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.
+ * util/membuf.c (put_membuf_str): New.
+ (get_membuf): Make LEN optional.
+
+2012-12-14 Werner Koch <wk at gnupg.org>
+
+ Workaround for a gettext problem during "make distcheck".
+ * configure.ac: Add comment string "GNU gnupg".
+
+ gettext: Upgrade to version 0.18.
+ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.
+ * po/Makefile.in.in: Upgrade to gettext-0.18. Keep option --previous
+ of msgmerge.
+ * intl/: Upgrade to gettext-0.18.
+ * m4/gettext.m4: Upgrade to gettext-0.18.1.
+ * m4/iconv.m4: Upgrade to gettext-0.18.1.
+ * m4/lib-ld.m4: Upgrade to gettext-0.18.1.
+ * m4/lib-link.m4: Upgrade to gettext-0.18.1.
+ * m4/lib-prefix.m4: Upgrade to gettext-0.18.1.
+ * m4/nls.m4: Upgrade to gettext-0.18.1.
+ * m4/po.m4: Upgrade to gettext-0.18.1.
+ * m4/progtest.m4: Upgrade to gettext-0.18.1.
+ * m4/codeset.m4: Upgrade to gettext-0.18.1.
+ * m4/fcntl-o.m4: New file, from gettext-0.18.1.
+ * m4/glibc2.m4: Upgrade to gettext-0.18.1.
+ * m4/glibc21.m4: Upgrade to gettext-0.18.1.
+ * m4/intdiv0.m4: Upgrade to gettext-0.18.1.
+ * m4/intl.m4: Upgrade to gettext-0.18.1.
+ * m4/intldir.m4: Upgrade to gettext-0.18.1.
+ * m4/intlmacosx.m4: Upgrade to gettext-0.18.1.
+ * m4/intmax.m4: Upgrade to gettext-0.18.1.
+ * m4/inttypes_h.m4: Upgrade to gettext-0.18.1.
+ * m4/inttypes-pri.m4: Upgrade to gettext-0.18.1.
+ * m4/lcmessage.m4: Upgrade to gettext-0.18.1.
+ * m4/lock.m4: Upgrade to gettext-0.18.1.
+ * m4/longlong.m4: Upgrade to gettext-0.18.1.
+ * m4/printf-posix.m4: Upgrade to gettext-0.18.1.
+ * m4/size_max.m4: Upgrade to gettext-0.18.1.
+ * m4/stdint_h.m4: Upgrade to gettext-0.18.1.
+ * m4/threadlib.m4: New file, from gettext-0.18.1.
+ * m4/uintmax_t.m4: Upgrade to gettext-0.18.1.
+ * m4/visibility.m4: Upgrade to gettext-0.18.1.
+ * m4/wchar_t.m4: Upgrade to gettext-0.18.1.
+ * m4/wint_t.m4: Upgrade to gettext-0.18.1.
+ * m4/xsize.m4: Upgrade to gettext-0.18.1.
+ * m4/Makefile.am (EXTRA_DIST): Add the new files.
+
+2012-12-13 Werner Koch <wk at gnupg.org>
+
+ Support NetBSD m68K ELF targets.
+ * mpi/config.links (m68k*-*-netbsdelf): New.
+
+2012-12-13 NIIBE Yutaka <gniibe at fsij.org>
+
+ Card: Fix the process of writing key or generating key.
+ * g10/app-openpgp.c (store_fpr): Flush KEY-FPR and KEY-TIME.
+
+2012-11-30 David Shaw <dshaw at jabberwocky.com>
+
+ Fix mksamplekeys awk to not leave out the whitespace altogether.
+
+ Refresh sample keys.
+ * mksamplekeys: Tweak awk script to not add trailing whitespace to
+ blank lines (makes git pre-commit hook unhappy).
+
+ * samplekeys.asc: Refresh.
+
+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-08 Werner Koch <wk at gnupg.org>
+
+ tests: Skip secret key import check in SELinux mode.
+ * configure.ac (ENABLE_SELINUX_HACKS): New am_conditional.
+ * checks/Makefile.am (prepared.stamp): Replace by defs-config.inc.
+ (defs-config.inc): Create and set enable_selinux_hacks variable.
+ * checks/defs.inc: Include defs-config.inc.
+
+ * checks/armor.test: Do not run the last test in selinux mode.
+
+ GnuPG-bug-id: 1390
+
+ de.po: Grammar fix.
+ * po/de.po: Grammar fix by Daniel Leidert
+
+ Create off-line card encryption key with the right size.
+ * g10/keygen.c (gen_card_key_with_backup): Get the size of the key
+ from the card.
+
+ Support the not anymore patented IDEA cipher algorithm.
+ * cipher/idea.c: New. Take from Libgcrypt master and adjust for
+ direct use in GnuPG.
+ * cipher/idea-stub.c: Remove.
+ * cipher/Makefile.am: Add idea.c and remove idea-stub.c rules.
+ * configure.ac: Remove idea-stub code.
+ * g10/gpg.c (check_permissions): Remove code path for ITEM==2.
+ (main): Make --load-extension a dummy option.
+ * 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.
+ * g10/seckey-cert.c (do_check): Remove emitting of STATUS_RSA_OR_IDEA.
+ * g10/status.c (get_status_string): Remove STATUS_RSA_OR_IDEA.
+ * g10/status.h (STATUS_RSA_OR_IDEA): Remove.
+
+2012-11-07 Werner Koch <wk at gnupg.org>
+
+ Fix usage of dlerror to conform to POSIX.
+ * cipher/idea-stub.c: Clear last error before dlsym.
+
+ Improve handling of random_seed read errors.
+ * cipher/random.c (read_seed_file): Distinguish between errors and
+ short reads.
+
+2012-11-06 Thomas Klausner <wiz at NetBSD.org>
+
+ Handle systems which have uint64_t but not the UINT64_C macro.
+ * include/types.h (U64_C) [!UINT64_C]: Add simple replacement.
+
+2012-11-06 Werner Koch <wk at gnupg.org>
+
+ Fix extern inline use for gcc > 4.3 in c99 mode.
+ * mpi/mpi-inline.h [!G10_MPI_INLINE_DECL]: Take care of changed extern
+ inline semantics in gcc.
+
+2012-08-24 Werner Koch <wk at gnupg.org>
+
+ Update translations to adjust for typo fixes.
+
+2012-08-24 David Prévot <taffit at debian.org>
+
+ Update French translation.
+ * po/fr.po: Update.
+
+2012-08-24 Werner Koch <wk at gnupg.org>
+
+ Fix typos spotted during translations.
+ * g10/gpg.c: uppercase after Syntax
+ * util/secmem.c (print_warn): Update URL.
+
+2012-08-24 David Prévot <taffit at debian.org>
+
+ Keep previous msgids of translated messages.
+ * po/Makefile.in.in: Use option --previous with msgmerge.
+
+2012-04-29 Werner Koch <wk at gnupg.org>
+
+ With --quiet do not print reading passphrase from fd message.
+ Fix for bug#1403.
+ * g10/passphrase.c (read_passphrase_from_fd): Act on --quiet.
+
+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-30 Werner Koch <wk at gnupg.org>
+
+ Release 1.4.12.
+
+ Fix ChangeLog creation rule.
+ * Makefile.am (gen-ChangeLog): Use set -e. Fixes commit b99e77d5.
+
+ Add Ukrainian translation.
+ * po/uk.po: New.
+ * po/LINGUAS: Add uk.po.
+
+ Update GNU helper files.
+ * scripts/config.guess, scripts/config.rpath: Update to version
+ 2012-01-01.
+ * scripts/config.rpath, scripts/compile, scripts/depcomp: Update to
+ modern version.
+ * scripts/texinfo.tex: Update from current gnulib.
+
+ Update documentation.
+ * doc/gpg.texi, doc/specify-user-id.texi, doc/yat2m.c: Update from
+ current GnuPG master (commit bdde44a).
+
+ 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 Werner Koch <wk at gnupg.org>
+
+ Do not copy default merge commit log entries into the ChangeLog.
+ * scripts/gitlog-to-changelog: Skip merge commits.
+
+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-16 Werner Koch <wk at gnupg.org>
+
+ w32: Always build with -fno-omit-frame-pointer.
+ This is required due to a bug in the mingw32 runtime.
+ * configure.ac (HAVE_W32_SYSTEM): Force use of -fno-omit-frame-pointer.
+
+ w32: Allow passing a relative name for the tarball.
+ * scripts/mk-w32-dist: Prepend PWD to TARBALL.
+
+ Automate W32 installer building.
+ * doc/README.W32: Document new installer build procedure.
+ * scripts/autogen.sh: Pass all args to the installer (regression fix).
+ * scripts/conf-w32/README: Remove from repo.
+ * scripts/conf-w32/bzip2-1.diff: Remove from repo.
+ * scripts/mk-w32-dist: Rewrite.
+ * scripts/w32installer.nsi [WITH_PATCHES]: Use constant patch file
+ name.
+
+2012-01-13 Werner Koch <wk at gnupg.org>
+
+ Add a DECRYPTION_INFO status.
+ * g10/status.h (STATUS_DECRYPTION_INFO): New.
+ * g10/status.c (get_status_string): Add new status string.
+ * g10/encr-data.c: Include status.h.
+ (decrypt_data): Print STATUS_DECRYPTION_INFO.
+
+ Include bzip2 code to ease building for W32.
+ * bzlib/: Include bzip2 code.
+ * configure.ac [W32]: Force use of included bzip2 code.
+ * scripts/autogen.sh <--build-w32>: Do not pass --with-bzip option.
+ * Makefile.am (SUBDIRS): Add bzip. Use it only under W32.
+
+2012-01-12 Werner Koch <wk at gnupg.org>
+
+ Allow building with the 32 bit mingw-w64 toolchain.
+ * scripts/autogen.sh <--build-w32>: Support i686-w64-mingw32 and use
+ it by default if installed.
+ * keyserver/gpgkeys_ldap.c (my_ldap_start_tls_s): Define macro
+ depending on compiler version.
+ (main): Use new macro.
+ * util/miscutil.c [!HAVE_TIMEGM]: Add prototype for the timegm
+ autoconf replacement function.
+
+ gpg: Remove unused fields from a trust data structure.
+ The functions tdbio_read_record and tdbio_write_record control the
+ actual on-disk format. Thus there is no need to keep reserved fields
+ in the internal data structure.
+
+ * g10/tdbio.h (struct trust_record): Remove reserved fields.
+
+ Typo fixes and comment re-formatting.
+
+2012-01-11 David Shaw <dshaw at jabberwocky.com>
+
+ Distribute dotlock.h.
+
+2012-01-10 David Shaw <dshaw at jabberwocky.com>
+
+ Refresh sample keys.
+
+2012-01-10 Werner Koch <wk at gnupg.org>
+
+ Allow use of a standard space separated fingerprint.
+ We allow a single or a double space in the middle of the fingerprint
+ to help with c+p fingerprints from an HTML pages which are not being
+ enclosed in a "pre" tag.
+ * g10/getkey.c (classify_user_id): Check for space separated GPG
+ fingerprint.
+
+ Replace file locking by the new portable dotlock code.
+ * include/dotlock.h: New. From current gnupg master.
+ * util/dotlock.c: Ditto. Include util.h. The major changes done in
+ master are: Factor Unix and W32 specific code out into specific
+ functions. Define HAVE_POSIX_SYSTEM. Rearrange some functions.
+ (disable_dotlock): Rename to dotlock_disable.
+ (create_dotlock): Rename to dotlock_create and add a dummy arg.
+ (destroy_dotlock): Rename to dotlock_destroy.
+ (make_dotlock): Rename to dotlock_take.
+ (release_dotlock): Rename to dotlock_release.
+ (remove_lockfiles): Rename to dotlock_remove_lockfiles.
+
+ Update copyright years.
+ * util/argparse.c (default_strusage): Update printed copyright year.
+
+ Use gcc pragmas to suppress some warnings.
+ * configure.ac (AH_BOTTOM): Add GNUPG_GCC_VERSION macro.
+ * util/estream-printf.c (pr_float): Use new gcc pragma to ignore a
+ warning about a non-literal format.
+ * util/miscutil.c (asctimestamp): Ditto.
+ * cipher/md.c (md_stop_debug): Use new gcc pragme to ignore a warning
+ * about a set but unused variable.
+
+ Update gitlog-to-changelog.
+ * scripts/gitlog-to-changelog: Update from gnupg master.
+ * Makefile.am (gen-ChangeLog): Add new options.
+ * scripts/autogen.sh: Fix typo in URL. Reported by Gilles Espinasse.
+
+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-02 Werner Koch <wk at gnupg.org>
+
+ 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.
+ * scripts/git-hooks/commit-msg: New script.
+ * autogen.sh: Install commit-msg hook for git.
+ * doc/HACKING: Describe the ChangeLog policy.
+ * Makefile.am (EXTRA_DIST): Add new files.
+ (gen-ChangeLog): New.
+ (dist-hook): Run gen-ChangeLog.
+
+ Rename all ChangeLog files to ChangeLog-2011.
+ * ChangeLog: New file.
+
+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) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007, 2008, 2009, 2010, 2011,
+ 2012 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 771411b,0000000..8cc8fe0
mode 100644,000000..100644
--- a/VERSION
+++ b/VERSION
@@@ -1,1 -1,0 +1,1 @@@
- 1.4.20
++1.4.21
diff --cc doc/gnupg1.info
index 0591064,0000000..76b2864
mode 100644,000000..100644
--- a/doc/gnupg1.info
+++ b/doc/gnupg1.info
@@@ -1,4410 -1,0 +1,4398 @@@
+This is gnupg1.info, produced by makeinfo version 5.2 from gnupg1.texi.
+
- This is the 'The GNU Privacy Guard Manual' (1.4.20, 19 December 2015).
++This is the 'The GNU Privacy Guard Manual' (1.4.21, 22 April 2016).
+
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free
+Software Foundation, Inc.
+
+ 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
+* gpg: (gnupg1). OpenPGP encryption and signing tool (v1).
+END-INFO-DIR-ENTRY
+
+
+File: gnupg1.info, Node: Top, Next: Invoking GPG, Up: (dir)
+
+Using the GnuPG Version 1.4
+***************************
+
- This is the 'The GNU Privacy Guard Manual' (1.4.20, 19 December 2015).
++This is the 'The GNU Privacy Guard Manual' (1.4.21, 22 April 2016).
+
+ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006 Free
+Software Foundation, Inc.
+
+ 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 standalone version of GNU Privacy
+Guard.
+
+* Menu:
+
+* Invoking GPG:: Using the classic GPG protocol.
+* Specify a User ID:: How to Specify a User Id.
+
+* Copying:: GNU General Public License says
+ how you can copy and share GnuPG
+* Option Index:: Index to command line options.
+* Index:: Index of concepts and symbol names.
+
+
+File: gnupg1.info, Node: Invoking GPG, Next: Specify a User ID, Prev: Top, Up: Top
+
+1 Invoking GPG
+**************
+
+'gpg' is the OpenPGP only version 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.
+
+ This is the standalone version of 'gpg'. For desktop use you should
+consider using 'gpg2' from the GnuPG-2 package (1).
+
+ *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.
+
+ ---------- Footnotes ----------
+
+ (1) On some platforms gpg2 is installed under the name 'gpg'
+
+
+File: gnupg1.info, Node: GPG Commands, Next: GPG Options, Up: Invoking GPG
+
+1.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: gnupg1.info, Node: General GPG Commands, Next: Operational GPG Commands, Up: GPG Commands
+
+1.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: gnupg1.info, Node: Operational GPG Commands, Next: OpenPGP Key Management, Prev: General GPG Commands, Up: GPG Commands
+
+1.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 AES128, but may be chosen with the
+ '--cipher-algo' option. This option may be combined with '--sign'
+ (for a signed and symmetrically encrypted message), '--encrypt'
+ (for a message that may be decrypted via a secret key or a
+ passphrase), or '--sign' and '--encrypt' together (for a signed
+ message that may be decrypted via a secret key or a passphrase).
+
+'--store'
+ Store only (make a simple RFC1991 literal data packet).
+
+'--decrypt'
+'-d'
+ Decrypt the file given on the command line (or STDIN if no file is
+ specified) and write it to STDOUT (or the file specified with
+ '--output'). If the decrypted file is signed, the signature is
+ also verified. This command differs from the default operation, as
+ it never writes to the filename which is included in the file and
+ it rejects files which don't begin with an encrypted message.
+
+'--verify'
+ Assume that the first argument is a signed file and verify it
+ without generating any output. With no arguments, the signature
+ packet is read from STDIN. If only a one argument is given, it is
+ expected to be a complete signature.
+
+ With more than 1 argument, the first should be a detached signature
+ and the remaining files ake up the the signed data. To read the
+ signed data from STDIN, use '-' as the second filename. For
+ security reasons a detached signature cannot read the signed
+ material from STDIN without denoting it in the above way.
+
+ Note: If the option '--batch' is not used, '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.
+
+ '-k' is slightly different from '--list-keys' in that it allows
+ only for one argument and takes the second argument as the keyring
+ to search. This is for command line compatibility with PGP 2 and
+ has been removed in 'gpg2'.
+
+ Avoid using the output of this command in scripts or other programs
+ as it is likely to change as GnuPG changes. See '--with-colons'
+ for a machine-parseable key listing command that is appropriate for
+ use in scripts and other programs.
+
+'--list-secret-keys'
+'-K'
+ List all keys from the secret keyrings, or just the ones given on
+ the command line. A '#' after the letters 'sec' means that the
+ secret key is not usable (for example, if it was created via
+ '--export-secret-subkeys').
+
+'--list-sigs'
+ Same as '--list-keys', but the signatures are listed too.
+
+ 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.
+
+ 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).
+
+'--fingerprint'
+ List all keys (or the specified ones) along with their
+ fingerprints. This is the same output as '--list-keys' but with
+ the additional output of a line with the fingerprint. May also be
+ combined with '--list-sigs' or '--check-sigs'. If this command is
+ given twice, the fingerprints of all secondary keys are listed too.
+
+'--list-packets'
+ List only the sequence of packets. This is mainly useful for
+ debugging.
+
+'--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-key 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-key name'
+ Remove key from the secret keyring. In batch mode the key must be
+ specified by fingerprint.
+
+'--delete-secret-and-public-key name'
+ Same as '--delete-key', but if a secret key exists, it will be
+ removed first. In batch mode the key must be specified by
+ fingerprint.
+
+'--export'
+ Either export all keys from all keyrings (default keyrings and
+ those registered via option '--keyring'), or if at least one name
+ is given, those of the given name. The exported keys are written
+ to STDOUT or to the file given with option '--output'. Use
+ together with '--armor' to mail those keys.
+
+'--send-keys key IDs'
+ Similar to '--export' but sends the keys to a keyserver.
+ Fingerprints may be used instead of key IDs. Option '--keyserver'
+ must be used to give the name of this keyserver. Don't send your
+ complete keyring to a keyserver -- select only those keys which are
+ new or changed by you. If no key IDs are given, 'gpg' does
+ nothing.
+
+'--export-secret-keys'
+'--export-secret-subkeys'
+ Same as '--export', but exports the secret keys instead. The
+ exported keys are written to STDOUT or to the file given with
+ option '--output'. This command is often used along with the
+ option '--armor' to allow easy printing of the key for paper
+ backup; however the external tool 'paperkey' does a better job for
+ creating backups on paper. Note that exporting a secret key can be
+ a security risk if the exported keys are send over an insecure
+ channel.
+
+ The second form of the command has the special property to render
+ the secret part of the primary key useless; this is a GNU extension
+ to OpenPGP and other implementations can not be expected to
+ successfully import such a key. Its intended use is to generated a
+ full key with an additional signing subkey on a dedicated machine
+ and then using this command to export the key without the primary
+ key to the main machine.
+
+ See the option '--simple-sk-checksum' if you want to import an
+ exported secret key into ancient OpenPGP implementations.
+
+'--import'
+'--fast-import'
+ Import/merge keys. This adds the given keys to the keyring. The
+ fast version is currently just a synonym.
+
+ There are a few other options which control how this command works.
+ Most notable here is the '--import-options merge-only' option which
+ does not insert new keys but does only the merging of new
+ signatures, user-IDs and subkeys.
+
+'--recv-keys key IDs'
+ Import the keys with the given key IDs from a keyserver. Option
+ '--keyserver' must be used to give the name of this keyserver.
+
+'--refresh-keys'
+ Request updates from a keyserver for keys that already exist on the
+ local keyring. This is useful for updating a key with the latest
+ signatures, user IDs, etc. Calling this with no arguments will
+ refresh the entire keyring. Option '--keyserver' must be used to
+ give the name of the keyserver for all keys that do not have
+ preferred keyservers set (see '--keyserver-options
+ honor-keyserver-url').
+
+'--search-keys names'
+ Search the keyserver for the given names. Multiple names given
+ here will be joined together to create the search string for the
+ keyserver. Option '--keyserver' must be used to give the name of
+ this keyserver. Keyservers that support different search methods
+ allow using the syntax specified in "How to specify a user ID"
+ below. Note that different keyserver types support different
+ search methods. Currently only LDAP supports them all.
+
+'--fetch-keys URIs'
+ Retrieve keys located at the specified URIs. Note that different
+ installations of GnuPG may support different protocols (HTTP, FTP,
+ LDAP, etc.)
+
+'--update-trustdb'
+ Do trust database maintenance. This command iterates over all keys
+ and builds the Web of Trust. This is an interactive command
+ because it may have to ask for the "ownertrust" values for keys.
+ The user has to give an estimation of how far she trusts the owner
+ of the displayed key to correctly certify (sign) other keys. GnuPG
+ only asks for the ownertrust value if it has not yet been assigned
+ to a key. Using the '--edit-key' menu, the assigned value can be
+ changed at any time.
+
+'--check-trustdb'
+ Do trust database maintenance without user interaction. From time
+ to time the trust database must be updated so that expired keys or
+ signatures and the resulting changes in the Web of Trust can be
+ tracked. Normally, GnuPG will calculate when this is required and
+ do it automatically unless '--no-auto-check-trustdb' is set. This
+ command can be used to force a trust database check at any time.
+ The processing is identical to that of '--update-trustdb' but it
+ skips keys with a not yet defined "ownertrust".
+
+ For use with cron jobs, this command can be used together with
+ '--batch' in which case the trust database check is done only if a
+ check is needed. To force a run even in batch mode add the option
+ '--yes'.
+
+'--export-ownertrust'
+ Send the ownertrust values to STDOUT. This is useful for backup
+ purposes as these values are the only ones which can't be
+ re-created from a corrupted trustdb. Example:
+ 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.
+
+
+File: gnupg1.info, Node: OpenPGP Key Management, Prev: Operational GPG Commands, Up: GPG Commands
+
+1.1.3 How to manage your keys
+-----------------------------
+
+This section explains the main commands for key management
+
+'--gen-key'
+ Generate a new key pair using the current default parameters. This
+ is the standard command to create a new key.
+
+ There is also a feature which allows you to create keys in batch
+ mode. See the the manual section "Unattended key generation" on
+ how to use this.
+
+'--gen-revoke name'
+ Generate a revocation certificate for the complete key. To revoke
+ a subkey or a signature, use the '--edit' command.
+
+'--desig-revoke name'
+ Generate a designated revocation certificate for a key. This
+ allows a user (with the permission of the keyholder) to revoke
+ someone else's key.
+
+'--edit-key'
+ Present a menu which enables you to do most of the key management
+ related tasks. It expects the specification of a key on the
+ command line.
+
+ uid 'n'
+ Toggle selection of user ID or photographic user ID with index
+ 'n'. Use '*' to select all and '0' to deselect all.
+
+ key 'n'
+ Toggle selection of subkey with index 'n'. Use '*' to select
+ all and '0' to deselect all.
+
+ sign
+ Make a signature on key of user 'name' If the key is not yet
+ signed by the default user (or the users given with -u), the
+ program displays the information of the key again, together
+ with its fingerprint and asks whether it should be signed.
+ This question is repeated for all users specified with -u.
+
+ lsign
+ Same as "sign" but the signature is marked as non-exportable
+ and will therefore never be used by others. This may be used
+ to make keys valid only in the local environment.
+
+ nrsign
+ Same as "sign" but the signature is marked as non-revocable
+ and can therefore never be revoked.
+
+ tsign
+ Make a trust signature. This is a signature that combines the
+ notions of certification (like a regular signature), and trust
+ (like the "trust" command). It is generally only useful in
+ distinct communities or groups.
+
+ Note that "l" (for local / non-exportable), "nr" (for
+ non-revocable, and "t" (for trust) may be freely mixed and prefixed
+ to "sign" to create a signature of any type desired.
+
+ 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.
+
+ 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 (secondart 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
+ Toggle between public and secret key listing.
+
+ 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'.
+
+
+File: gnupg1.info, Node: GPG Options, Next: GPG Configuration, Prev: GPG Commands, Up: Invoking GPG
+
+1.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: gnupg1.info, Node: GPG Configuration Options, Next: GPG Key related Options, Up: GPG Options
+
+1.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.
+
+'--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. This option is commonly used
+ for unattended operations.
+
+ WARNING: Unattended operation bears a higher risk of being exposed
+ to security attacks. In particular any unattended use of GnuPG
+ which involves the use of secret keys should take care not to
+ provide an decryption oracle. There are several standard
+ pre-cautions against being used as an oracle. For example never
+ return detailed error messages or any diagnostics printed by your
+ software to the remote site. Consult with an expert in case of
+ doubt.
+
+ Note that even with a filename given on the command line, gpg might
+ still need to read from STDIN (in particular if gpg figures that
+ the input is a detached signature and no data file has been
+ specified). Thus if you do not want to feed data via STDIN, you
+ should connect STDIN to '/dev/null'.
+
+'--no-tty'
+ Make sure that the TTY (terminal) is never used for any output.
+ This option is needed in some cases because GnuPG sometimes prints
+ warnings to the TTY even if '--batch' is used.
+
+'--yes'
+ Assume "yes" on most questions.
+
+'--no'
+ Assume "no" on most questions.
+
+'--list-options parameters'
+ This is a space or comma delimited string that gives options used
+ when listing keys and signatures (that is, '--list-keys',
+ '--list-sigs', '--list-public-keys', '--list-secret-keys', and the
+ '--edit-key' functions). Options can be prepended with a 'no-'
+ (after the two dashes) to give the opposite meaning. The options
+ are:
+
+ show-photos
+ Causes '--list-keys', '--list-sigs', '--list-public-keys', and
+ '--list-secret-keys' to display any photo IDs attached to the
+ key. Defaults to no. See also '--photo-viewer'. Does not
+ work with '--with-colons': see '--attribute-fd' for the
+ appropriate way to get photo data for scripts and other
+ frontends.
+
+ show-usage
+ Show usage information for keys and subkeys in the standard
+ key listing. This is a list of letters indicating the allowed
+ usage for a key ('E'=encryption, 'S'=signing,
+ 'C'=certification, 'A'=authentication). Defaults to no.
+
+ show-policy-urls
+ Show policy URLs in the '--list-sigs' or '--check-sigs'
+ listings. Defaults to no.
+
+ show-notations
+ show-std-notations
+ show-user-notations
+ Show all, IETF standard, or user-defined signature notations
+ in the '--list-sigs' or '--check-sigs' listings. Defaults to
+ no.
+
+ show-keyserver-urls
+ Show any preferred keyserver URL in the '--list-sigs' or
+ '--check-sigs' listings. Defaults to no.
+
+ show-uid-validity
+ Display the calculated validity of user IDs during key
+ listings. Defaults to no.
+
+ show-unusable-uids
+ Show revoked and expired user IDs in key listings. Defaults
+ to no.
+
+ show-unusable-subkeys
+ Show revoked and expired subkeys in key listings. Defaults to
+ no.
+
+ show-keyring
+ Display the keyring name at the head of key listings to show
+ which keyring a given key resides on. Defaults to no.
+
+ show-sig-expire
+ Show signature expiration dates (if any) during '--list-sigs'
+ or '--check-sigs' listings. Defaults to no.
+
+ show-sig-subpackets
+ Include signature subpackets in the key listing. This option
+ can take an optional argument list of the subpackets to list.
+ If no argument is passed, list all subpackets. Defaults to
+ no. This option is only meaningful when using '--with-colons'
+ along with '--list-sigs' or '--check-sigs'.
+
+'--verify-options parameters'
+ This is a space or comma delimited string that gives options used
+ when verifying signatures. Options can be prepended with a 'no-'
+ to give the opposite meaning. The options are:
+
+ show-photos
+ Display any photo IDs present on the key that issued the
+ signature. Defaults to no. See also '--photo-viewer'.
+
+ show-policy-urls
+ Show policy URLs in the signature being verified. Defaults to
+ no.
+
+ show-notations
+ show-std-notations
+ show-user-notations
+ Show all, IETF standard, or user-defined signature notations
+ in the signature being verified. Defaults to IETF standard.
+
+ show-keyserver-urls
+ Show any preferred keyserver URL in the signature being
+ verified. Defaults to no.
+
+ show-uid-validity
+ Display the calculated validity of the user IDs on the key
+ that issued the signature. Defaults to no.
+
+ show-unusable-uids
+ Show revoked and expired user IDs during signature
+ verification. Defaults to no.
+
+ show-primary-uid-only
+ Show only the primary user ID during signature verification.
+ That is all the AKA lines as well as photo Ids are not shown
+ with the signature verification status.
+
+ pka-lookups
+ Enable PKA lookups to verify sender addresses. Note that PKA
+ is based on DNS, and so enabling this option may disclose
+ information on when and what signatures are verified or to
+ whom data is encrypted. This is similar to the "web bug"
+ described for the auto-key-retrieve feature.
+
+ pka-trust-increase
+ Raise the trust in a signature to full if the signature passes
+ PKA validation. This option is only meaningful if pka-lookups
+ is set.
+
+'--enable-large-rsa'
+'--disable-large-rsa'
+ With -gen-key and -batch, enable the creation of larger RSA secret
+ keys than is generally recommended (up to 8192 bits). These large
+ keys are more expensive to use, and their signatures and
+ certifications are also larger.
+
+'--enable-dsa2'
+'--disable-dsa2'
+ Enable hash truncation for all DSA keys even for old DSA Keys up to
+ 1024 bit. This is also the default with '--openpgp'. Note that
+ older versions of GnuPG also required this flag to allow the
+ generation of DSA larger than 1024 bit.
+
+'--photo-viewer string'
+ This is the command line that should be run to view a photo ID.
+ "%i" will be expanded to a filename containing the photo. "%I"
+ does the same, except the file will not be deleted once the viewer
+ exits. Other flags are "%k" for the key ID, "%K" for the long key
+ ID, "%f" for the key fingerprint, "%t" for the extension of the
+ image type (e.g. "jpg"), "%T" for the MIME type of the image (e.g.
+ "image/jpeg"), "%v" for the single-character calculated validity of
+ the image being viewed (e.g. "f"), "%V" for the calculated
+ validity as a string (e.g. "full"), "%U" for a base32 encoded hash
+ of the user ID, and "%%" for an actual percent sign. If neither %i
+ or %I are present, then the photo will be supplied to the viewer on
+ standard input.
+
+ The default viewer is "xloadimage -fork -quiet -title 'KeyID 0x%k'
+ STDIN". Note that if your image viewer program is not secure, then
+ executing it from GnuPG does not make it secure.
+
+'--exec-path string'
+ Sets a list of directories to search for photo viewers and
+ keyserver helpers. If not provided, keyserver helpers use the
+ compiled-in default directory, and photo viewers use the $PATH
+ environment variable. Note, that on W32 system this value is
+ ignored when searching for keyserver helpers.
+
+'--keyring file'
+ Add 'file' to the current list of keyrings. If 'file' begins with
+ a tilde and a slash, these are replaced by the $HOME directory. If
+ the filename does not contain a slash, it is assumed to be in the
+ GnuPG home directory ("~/.gnupg" if '--homedir' or $GNUPGHOME is
+ not used).
+
+ Note that this adds a keyring to the current list. If the intent
+ is to use the specified keyring alone, use '--keyring' along with
+ '--no-default-keyring'.
+
+'--secret-keyring file'
+ Same as '--keyring' but for the secret keyrings.
+
+'--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/var/cache/gnupg' for
+ internal cache files.
+
+'--pcsc-driver file'
+ Use 'file' to access the smartcard reader. The current default is
+ 'libpcsclite.so.1' for GLIBC based systems,
+ '/System/Library/Frameworks/PCSC.framework/PCSC' for MAC OS X,
+ 'winscard.dll' for Windows and 'libpcsclite.so' for other systems.
+
+'--disable-ccid'
+ Disable the integrated support for CCID compliant readers. This
- allows to fall back to one of the other drivers even if the
++ allows falling back to one of the other drivers even if the
+ internal CCID driver can handle the reader. Note, that CCID
+ support is only available if libusb was available at build time.
+
+'--reader-port number_or_string'
+ This option may be used to specify the port of the card terminal.
+ A value of 0 refers to the first serial device; add 32768 to access
+ USB devices. The default is 32768 (first USB device). PC/SC or
+ CCID readers might need a string here; run the program in verbose
+ mode to get a list of available readers. The default is then the
+ first reader found.
+
+'--display-charset name'
+ Set the name of the native character set. This is used to convert
+ some informational strings like user IDs to the proper UTF-8
+ encoding. Note that this has nothing to do with the character set
+ of data to be encrypted or signed; GnuPG does not recode
+ user-supplied data. If this option is not used, the default
+ character set is determined from the current locale. A verbosity
+ level of 3 shows the chosen set. Valid values for 'name' are:
+
+ iso-8859-1
+ This is the Latin 1 set.
+
+ iso-8859-2
+ The Latin 2 set.
+
+ iso-8859-15
+ This is currently an alias for the Latin 1 set.
+
+ koi8-r
+ The usual Russian set (rfc1489).
+
+ utf-8
+ Bypass all translations and assume that the OS uses native
+ UTF-8 encoding.
+
+'--utf8-strings'
+'--no-utf8-strings'
+ Assume that command line arguments are given as UTF8 strings. The
+ default ('--no-utf8-strings') is to assume that arguments are
+ encoded in the character set as specified by '--display-charset'.
+ These options affect all following arguments. Both options may be
+ used multiple times.
+
+'--options file'
+ Read options from 'file' and do not try to read them from the
+ default options file in the homedir (see '--homedir'). This option
+ is ignored if used in an options file.
+
+'--no-options'
+ Shortcut for '--options /dev/null'. This option is detected before
+ an attempt to open an option file. Using this option will also
+ prevent the creation of a '~/.gnupg' homedir.
+
+'-z n'
+'--compress-level n'
+'--bzip2-compress-level n'
+ Set compression level to 'n' for the ZIP and ZLIB compression
+ algorithms. The default is to use the default compression level of
+ zlib (normally 6). '--bzip2-compress-level' sets the compression
+ level for the BZIP2 compression algorithm (defaulting to 6 as
+ well). This is a different option from '--compress-level' since
+ BZIP2 uses a significant amount of memory for each additional
+ compression level. '-z' sets both. A value of 0 for 'n' disables
+ compression.
+
+'--bzip2-decompress-lowmem'
+ Use a different decompression method for BZIP2 compressed files.
+ This alternate method uses a bit more than half the memory, but
+ also runs at half the speed. This is useful under extreme low
+ memory circumstances when the file was originally compressed at a
+ high '--bzip2-compress-level'.
+
+'--mangle-dos-filenames'
+'--no-mangle-dos-filenames'
+ Older version of Windows cannot handle filenames with more than one
+ dot. '--mangle-dos-filenames' causes GnuPG to replace (rather than
+ add to) the extension of an output filename to avoid this problem.
+ This option is off by default and has no effect on non-Windows
+ platforms.
+
+'--ask-cert-level'
+'--no-ask-cert-level'
+ When making a key signature, prompt for a certification level. If
+ this option is not specified, the certification level used is set
+ via '--default-cert-level'. See '--default-cert-level' for
+ information on the specific levels and how they are used.
+ '--no-ask-cert-level' disables this option. This option defaults
+ to no.
+
+'--default-cert-level n'
+ The default to use for the check level when signing a key.
+
+ 0 means you make no particular claim as to how carefully you
+ verified the key.
+
+ 1 means you believe the key is owned by the person who claims to
+ own it but you could not, or did not verify the key at all. This
+ is useful for a "persona" verification, where you sign the key of a
+ pseudonymous user.
+
+ 2 means you did casual verification of the key. For example, this
+ could mean that you verified the key fingerprint and checked the
+ user ID on the key against a photo ID.
+
+ 3 means you did extensive verification of the key. For example,
+ this could mean that you verified the key fingerprint with the
+ owner of the key in person, and that you checked, by means of a
+ hard to forge document with a photo ID (such as a passport) that
+ the name of the key owner matches the name in the user ID on the
+ key, and finally that you verified (by exchange of email) that the
+ email address on the key belongs to the key owner.
+
+ Note that the examples given above for levels 2 and 3 are just
+ that: examples. In the end, it is up to you to decide just what
+ "casual" and "extensive" mean to you.
+
+ This option defaults to 0 (no particular claim).
+
+'--min-cert-level'
+ When building the trust database, treat any signatures with a
+ certification level below this as invalid. Defaults to 2, which
+ disregards level 1 signatures. Note that level 0 "no particular
+ claim" signatures are always accepted.
+
+'--trusted-key long key ID'
+ Assume that the specified key (which must be given as a full 8 byte
+ key ID) is as trustworthy as one of your own secret keys. This
+ option is useful if you don't want to keep your secret keys (or one
+ of them) online but still want to be able to check the validity of
+ a given recipient's or signator's key.
+
+'--trust-model pgp|classic|direct|always|auto'
+ 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.
+
+ 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.
+
+ ldap
+ Using DNS Service Discovery, check the domain in question for
+ any LDAP keyservers to use. If this fails, attempt to locate
+ the key using the PGP Universal method of checking
+ 'ldap://keys.(thedomain)'.
+
+ keyserver
+ Locate a key using whatever keyserver is defined using the
+ '--keyserver' option.
+
+ keyserver-URL
+ In addition, a keyserver URL as used in the '--keyserver'
+ option may be used here to query that particular keyserver.
+
+ local
+ Locate the key using the local keyrings. This mechanism
- allows to select the order a local key lookup is done. Thus
- using '--auto-key-locate local' is identical to
++ allows the user to select the order a local key lookup is
++ done. Thus using '--auto-key-locate local' is identical to
+ '--no-auto-key-locate'.
+
+ nodefault
+ This flag disables the standard local key lookup, done before
+ any of the mechanisms defined by the '--auto-key-locate' are
+ tried. The position of this mechanism in the list does not
+ matter. It is not required if 'local' is also used.
+
+ clear
+ Clear all defined mechanisms. This is useful to override
+ mechanisms given in a config file.
+
+'--keyid-format short|0xshort|long|0xlong'
+ Select how to display key IDs. "short" is the traditional
+ 8-character key ID. "long" is the more accurate (but less
+ convenient) 16-character key ID. Add an "0x" to either to include
+ an "0x" at the beginning of the key ID, as in 0x99242560. Note
+ that this option is ignored if the option -with-colons is used.
+
+'--keyserver name'
+ 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=value1 '
+ This is a space or comma delimited string that gives options for
+ the keyserver. Options can be prefixed with a 'no-' to give the
+ opposite meaning. Valid import-options or export-options may be
+ used here as well to apply to importing ('--recv-key') or exporting
+ ('--send-key') a key from a keyserver. While not all options are
+ available for all keyserver types, some common options are:
+
+ include-revoked
+ When searching for a key with '--search-keys', include keys
+ that are marked on the keyserver as revoked. Note that not
+ all keyservers differentiate between revoked and unrevoked
+ keys, and for such keyservers this option is meaningless.
+ Note also that most keyservers do not have cryptographic
+ verification of key revocations, and so turning this option
+ off may result in skipping keys that are incorrectly marked as
+ revoked.
+
+ include-disabled
+ When searching for a key with '--search-keys', include keys
+ that are marked on the keyserver as disabled. Note that this
+ option is not used with HKP keyservers.
+
+ auto-key-retrieve
+ This option enables the automatic retrieving of keys from a
+ keyserver when verifying signatures made by keys that are not
+ on the local keyring.
+
+ Note that this option makes a "web bug" like behavior
+ possible. Keyserver operators can see which keys you request,
+ so by sending you a message signed by a brand new key (which
+ you naturally will not have on your local keyring), the
+ operator can tell both your IP address and the time when you
+ verified the signature.
+
+ honor-keyserver-url
+ When using '--refresh-keys', if the key in question has a
+ preferred keyserver URL, then use that preferred keyserver to
+ refresh the key from. In addition, if auto-key-retrieve is
+ set, and the signature being verified has a preferred
+ keyserver URL, then use that preferred keyserver to fetch the
+ key from. Defaults to yes.
+
+ honor-pka-record
+ If auto-key-retrieve is set, and the signature being verified
+ has a PKA record, then use the PKA information to fetch the
+ key. Defaults to yes.
+
+ include-subkeys
+ When receiving a key, include subkeys as potential targets.
+ Note that this option is not used with HKP keyservers, as they
+ do not support retrieving keys by subkey id.
+
+ use-temp-files
+ On most Unix-like platforms, GnuPG communicates with the
+ keyserver helper program via pipes, which is the most
+ efficient method. This option forces GnuPG to use temporary
+ files to communicate. On some platforms (such as Win32 and
+ RISC OS), this option is always enabled.
+
+ keep-temp-files
+ If using 'use-temp-files', do not delete the temp files after
+ using them. This option is useful to learn the keyserver
+ communication protocol by reading the temporary files.
+
+ verbose
+ Tell the keyserver helper program to be more verbose. This
+ option can be repeated multiple times to increase the
+ verbosity level.
+
+ 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'
+ Set the proxy to use for HTTP and HKP keyservers. This
+ overrides the "http_proxy" environment variable, if any.
+
+ max-cert-size
+ When retrieving a key via DNS CERT, only accept keys up to
+ this size. Defaults to 16384 bytes.
+
+ debug
+ Turn on debug output in the keyserver helper program. Note
+ that the details of debug output depends on which keyserver
+ helper program is being used, and in turn, on any libraries
+ that the keyserver helper program uses internally (libcurl,
+ openldap, etc).
+
+ check-cert
+ Enable certificate checking if the keyserver presents one (for
+ hkps or ldaps). Defaults to on.
+
+ ca-cert-file
+ Provide a certificate store to override the system default.
+ Only necessary if check-cert is enabled, and the keyserver is
+ using a certificate that is not present in a system default
+ certificate list.
+
+ Note that depending on the SSL library that the keyserver
+ helper is built with, this may actually be a directory or a
+ file.
+
+'--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)
+
+'--max-cert-depth n'
+ Maximum depth of a certification chain (default is 5).
+
+'--simple-sk-checksum'
+ Secret keys are integrity protected by using a SHA-1 checksum.
+ This method is part of the upcoming enhanced OpenPGP specification
+ but GnuPG already uses it as a countermeasure against certain
+ attacks. Old applications don't understand this new format, so
+ this option may be used to switch back to the old behaviour. Using
+ this option bears a security risk. Note that using this option
+ only takes effect when the secret key is encrypted - the simplest
+ way to make this happen is to change the passphrase on the key
+ (even changing it to the same value is acceptable).
+
+'--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.
+
+'--no-sig-create-check'
+ This options is obsolete. It has no function.
+
+'--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'
+ Try to use the GnuPG-Agent. With this option, GnuPG first tries to
+ connect to the agent before it asks for a passphrase.
- '--no-use-agent' disables this option.
++ '--no-use-agent' disables this option. Note, that the tool
++ 'gpg-preset-passphrase', which comes with GnuPG-2, cannot be used
++ to preset a passphrase for this version of GnuPG.
+
+'--gpg-agent-info'
+ Override the value of the environment variable 'GPG_AGENT_INFO'.
+ This is only used when '--use-agent' has been given. Given that
+ this option is not anymore used by 'gpg2', it should be avoided if
+ possible.
+
+'--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: gnupg1.info, Node: GPG Key related Options, Next: GPG Input and Output, Prev: GPG Configuration Options, Up: GPG Options
+
+1.2.2 Key related options
+-------------------------
+
+'--recipient NAME'
+'-r'
+ Encrypt for user id NAME. If this option or '--hidden-recipient'
+ is not specified, GnuPG asks for the user-id unless
+ '--default-recipient' is given.
+
+'--hidden-recipient NAME'
+'-R'
+ Encrypt for user ID NAME, but hide the key ID of this user's key.
+ This option helps to hide the receiver of the message and is a
+ limited countermeasure against traffic analysis. If this option or
+ '--recipient' is not specified, GnuPG asks for the user ID unless
+ '--default-recipient' is given.
+
+'--encrypt-to name'
+ Same as '--recipient' but this one is intended for use in the
+ options file and may be used with your own user-id as an
+ "encrypt-to-self". These keys are only used when there are other
+ recipients given either by use of '--recipient' or by the asked
+ user id. No trust checking is performed for these user ids and
+ even disabled keys can be used.
+
+'--hidden-encrypt-to name'
+ Same as '--hidden-recipient' but this one is intended for use in
+ the options file and may be used with your own user-id as a hidden
+ "encrypt-to-self". These keys are only used when there are other
+ recipients given either by use of '--recipient' or by the asked
+ user id. No trust checking is performed for these user ids and
+ even disabled keys can be used.
+
+'--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-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 soemthing 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: gnupg1.info, Node: GPG Input and Output, Next: OpenPGP Options, Prev: GPG Key related Options, Up: GPG Options
+
+1.2.3 Input and Output
+----------------------
+
+'--armor'
+'-a'
+ Create ASCII armored output. The default is to create the binary
+ OpenPGP format.
+
+'--no-armor'
+ Assume the input data is not in ASCII armored format.
+
+'--output FILE'
+'-o FILE'
+ Write output to FILE.
+
+'--max-output n'
+ This option sets a limit on the number of bytes that will be
+ generated when processing a file. Since OpenPGP supports various
+ levels of compression, it is possible that the plaintext of a given
+ message may be significantly larger than the original OpenPGP
+ message. While GnuPG works properly with such messages, there is
+ often a desire to set a maximum file size that will be generated
+ before processing is forced to stop by the OS limits. Defaults to
+ 0, which means "no limit".
+
+'--import-options parameters'
+ This is a space or comma delimited string that gives options for
+ importing keys. Options can be prepended with a 'no-' to give the
+ opposite meaning. The options are:
+
+ import-local-sigs
+ Allow importing key signatures marked as "local". This is not
+ generally useful unless a shared keyring scheme is being used.
+ Defaults to no.
+
+ keep-ownertrust
+ Normally possible still existing ownertrust values of a key
+ are cleared if a key is imported. This is in general
+ desirable so that a formerly deleted key does not
+ automatically gain an ownertrust values merely due to import.
+ On the other hand it is sometimes necessary to re-import a
+ trusted set of keys again but keeping already assigned
+ ownertrust values. This can be achived by using this option.
+
+ repair-pks-subkey-bug
+ During import, attempt to repair the damage caused by the PKS
+ keyserver bug (pre version 0.9.6) that mangles keys with
+ multiple subkeys. Note that this cannot completely repair the
+ damaged key as some crucial data is removed by the keyserver,
+ but it does at least give you back one subkey. Defaults to no
+ for regular '--import' and to yes for keyserver '--recv-keys'.
+
+ merge-only
+ During import, allow key updates to existing keys, but do not
+ allow any new keys to be imported. Defaults to no.
+
+ import-clean
+ After import, compact (remove all signatures except the
+ self-signature) any user IDs from the new key that are not
+ usable. Then, remove any signatures from the new key that are
+ not usable. This includes signatures that were issued by keys
+ that are not present on the keyring. This option is the same
+ as running the '--edit-key' command "clean" after import.
+ Defaults to no.
+
+ import-minimal
+ Import the smallest key possible. This removes all signatures
+ except the most recent self-signature on each user ID. This
+ option is the same as running the '--edit-key' command
+ "minimize" after import. Defaults to no.
+
+'--export-options parameters'
+ This is a space or comma delimited string that gives options for
+ exporting keys. Options can be prepended with a 'no-' to give the
+ opposite meaning. The options are:
+
+ export-local-sigs
+ Allow exporting key signatures marked as "local". This is not
+ generally useful unless a shared keyring scheme is being used.
+ Defaults to no.
+
+ export-attributes
+ Include attribute user IDs (photo IDs) while exporting. This
+ is useful to export keys if they are going to be used by an
+ OpenPGP program that does not accept attribute user IDs.
+ Defaults to yes.
+
+ export-sensitive-revkeys
+ Include designated revoker information that was marked as
+ "sensitive". Defaults to no.
+
+ export-reset-subkey-passwd
+ When using the '--export-secret-subkeys' command, this option
+ resets the passphrases for all exported subkeys to empty.
+ This is useful when the exported subkey is to be used on an
+ unattended machine where a passphrase doesn't necessarily make
+ sense. Defaults to no.
+
+ export-clean
+ Compact (remove all signatures from) user IDs on the key being
+ exported if the user IDs are not usable. Also, do not export
+ any signatures that are not usable. This includes signatures
+ that were issued by keys that are not present on the keyring.
+ This option is the same as running the '--edit-key' command
+ "clean" before export except that the local copy of the key is
+ not modified. Defaults to no.
+
+ export-minimal
+ Export the smallest key possible. This removes all signatures
+ except the most recent self-signature on each user ID. This
+ option is the same as running the '--edit-key' command
+ "minimize" before export except that the local copy of the key
+ is not modified. Defaults to no.
+
+'--with-colons'
+ Print key listings delimited by colons. Note that the output will
+ be encoded in UTF-8 regardless of any '--display-charset' setting.
+ This format is useful when GnuPG is called from scripts and other
+ programs as it is easily machine parsed. The details of this
+ format are documented in the file 'doc/DETAILS', which is included
+ in the GnuPG source distribution.
+
+'--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.
+
+'--with-fingerprint'
+ Same as the command '--fingerprint' but changes only the format of
+ the output and may be used together with another command.
+
+
+File: gnupg1.info, Node: OpenPGP Options, Next: Compliance Options, Prev: GPG Input and Output, Up: GPG Options
+
+1.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.
+
+ If '-t' (but not '--textmode') is used together with armoring and
+ signing, this enables clearsigned messages. This kludge is needed
+ for command-line compatibility with command-line versions of PGP;
+ normally you would use '--sign' or '--clearsign' to select the type
+ of the signature.
+
+'--force-v3-sigs'
+'--no-force-v3-sigs'
+ OpenPGP states that an implementation should generate v4 signatures
+ but PGP versions 5 through 7 only recognize v4 signatures on key
+ material. This option forces v3 signatures for signatures on data.
+ Note that this option implies '--no-ask-sig-expire', and unsets
+ '--sig-policy-url', '--sig-notation', and '--sig-keyserver-url', as
+ these features cannot be used with v3 signatures.
+ '--no-force-v3-sigs' disables this option. Defaults to no.
+
+'--force-v4-certs'
+'--no-force-v4-certs'
+ Always use v4 key signatures even on v3 keys. This option also
+ changes the default hash algorithm for v3 RSA keys from MD5 to
+ SHA-1. '--no-force-v4-certs' disables this option.
+
+'--force-mdc'
+ Force the use of encryption with a modification detection code.
+ This is always used with the newer ciphers (those with a blocksize
+ greater than 64 bits), or if all of the recipient keys indicate MDC
+ support in their feature flags.
+
+'--disable-mdc'
+ Disable the use of the modification detection code. Note that by
+ using this option, the encrypted message becomes vulnerable to a
+ message modification attack.
+
+'--personal-cipher-preferences string'
+ Set the list of personal cipher preferences to 'string'. Use '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 used to protect secret keys.
+ The default cipher is AES128. This cipher is also used for
+ conventional encryption if '--personal-cipher-preferences' and
+ '--cipher-algo' is not given.
+
+'--s2k-digest-algo name'
+ Use 'name' as the digest algorithm used to mangle the passphrases.
+ The default algorithm is SHA-1.
+
+'--s2k-mode n'
+ Selects how passphrases are mangled. If 'n' is 0 a plain
+ passphrase (which is not recommended) will be used, a 1 adds a salt
+ to the passphrase and a 3 (the default) iterates the whole process
+ a number of times (see -s2k-count). Unless '--rfc1991' is used,
+ this mode is also used for conventional encryption.
+
+'--s2k-count n'
+ Specify how many times the passphrase mangling is repeated. This
+ value may range between 1024 and 65011712 inclusive. The default
+ is inquired from gpg-agent. Note that not all values in the
+ 1024-65011712 range are legal and if an illegal value is selected,
+ GnuPG will round up to the nearest legal value. This option is
+ only meaningful if '--s2k-mode' is 3.
+
+
+File: gnupg1.info, Node: Compliance Options, Next: GPG Esoteric Options, Prev: OpenPGP Options, Up: GPG Options
+
+1.2.5 Compliance options
+------------------------
+
+These options control what GnuPG is compliant to. Only one of these
+options may be active at a time. Note that the default setting of this
+is nearly always the correct one. See the INTEROPERABILITY WITH OTHER
+OPENPGP PROGRAMS section below before using one of these options.
+
+'--gnupg'
+ Use standard GnuPG behavior. This is essentially OpenPGP behavior
+ (see '--openpgp'), but with some additional workarounds for common
+ compatibility problems in different versions of PGP. This is the
+ default option, so it is not generally needed, but it may be useful
+ to override a different compliance option in the gpg.conf file.
+
+'--openpgp'
+ Reset all packet, cipher and digest options to strict OpenPGP
+ behavior. Use this option to reset all previous options like
+ '--s2k-*', '--cipher-algo', '--digest-algo' and '--compress-algo'
+ to OpenPGP compliant values. All PGP workarounds are disabled.
+
+'--rfc4880'
+ Reset all packet, cipher and digest options to strict RFC-4880
+ behavior. Note that this is currently the same thing as
+ '--openpgp'.
+
+'--rfc2440'
+ Reset all packet, cipher and digest options to strict RFC-2440
+ behavior.
+
+'--rfc1991'
+ Try to be more RFC-1991 (PGP 2.x) compliant. This option is
+ deprecated will be removed in GnuPG 2.1.
+
+'--pgp2'
+ Set up all options to be as PGP 2.x compliant as possible, and warn
+ if an action is taken (e.g. encrypting to a non-RSA key) that will
+ create a message that PGP 2.x will not be able to handle. Note
+ that 'PGP 2.x' here means 'MIT PGP 2.6.2'. There are other
+ versions of PGP 2.x available, but the MIT release is a good common
+ baseline.
+
+ This option implies '--rfc1991 --disable-mdc --no-force-v4-certs
+ --escape-from-lines --force-v3-sigs --allow-weak-digest-algos
+ --cipher-algo IDEA --digest-algo MD5 --compress-algo ZIP'. It also
+ disables '--textmode' when encrypting.
+
+ This option is deprecated will be removed in GnuPG 2.1. The reason
+ for dropping PGP-2 support is that the PGP 2 format is not anymore
+ considered safe (for example due to the use of the broken MD5
+ algorithm). Note that the decryption of PGP-2 created messages
+ will continue to work.
+
+'--pgp6'
+ Set up all options to be as PGP 6 compliant as possible. This
+ restricts you to the ciphers IDEA (if the IDEA plugin is
+ installed), 3DES, and CAST5, the hashes MD5, SHA1 and RIPEMD160,
+ and the compression algorithms none and ZIP. This also disables
+ -throw-keyids, and making signatures with signing subkeys as PGP 6
+ does not understand signatures made by signing subkeys.
+
+ This option implies '--disable-mdc --escape-from-lines
+ --force-v3-sigs'.
+
+'--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: gnupg1.info, Node: GPG Esoteric Options, Next: Deprecated Options, Prev: Compliance Options, Up: GPG Options
+
+1.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).
+
+'--debug-all'
+ Set all useful debugging flags.
+
+'--debug-ccid-driver'
+ Enable debug output from the included CCID driver for smartcards.
+ Note that this option is only available on some system.
+
+'--faked-system-time EPOCH'
+ This option is only useful for testing; it sets the system time
+ back or forth to EPOCH which is the number of seconds elapsed since
+ the year 1970. Alternatively EPOCH may be given as a full ISO time
+ string (e.g. "20070924T154812").
+
+'--enable-progress-filter'
+ Enable certain PROGRESS status outputs. This option allows
+ frontends to display a progress indicator while gpg is processing
+ larger files. There is a slight performance overhead using it.
+
+'--status-fd n'
+ Write special status strings to the file descriptor 'n'. See the
+ file DETAILS in the documentation for a listing of them.
+
+'--status-file file'
+ Same as '--status-fd', except the status data is written to file
+ 'file'.
+
+'--logger-fd n'
+ Write log output to file descriptor 'n' and not to STDERR.
+
+'--log-file file'
+'--logger-file file'
+ Same as '--logger-fd', except the logger data is written to file
+ 'file'. Note that '--log-file' is only implemented for GnuPG-2.
+
+'--attribute-fd n'
+ Write attribute subpackets to the file descriptor 'n'. This is
+ most useful for use with '--status-fd', since the status messages
+ are needed to separate out the various subpackets from the stream
+ delivered to the file descriptor.
+
+'--attribute-file file'
+ Same as '--attribute-fd', except the attribute data is written to
+ file 'file'.
+
+'--comment string'
+'--no-comments'
+ Use 'string' as a comment string in clear text signatures and ASCII
+ armored messages or keys (see '--armor'). The default behavior is
+ not to use a comment string. '--comment' may be repeated multiple
+ times to get multiple comment strings. '--no-comments' removes all
+ comments. It is a good idea to keep the length of a single comment
+ below 60 characters to avoid problems with mail programs wrapping
+ such lines. Note that comment lines, like all other header lines,
+ are not protected by the signature.
+
+'--emit-version'
+'--no-emit-version'
+ Force inclusion of the version string in ASCII armored output. If
+ given once only the name of the program and the major number is
- emitted (default), given twice the minor is also emitted, given
- triple the micro is added, and given quad an operating system
- identification is also emitted. '--no-emit-version' disables the
++ emitted, given twice the minor is also emitted, given triple the
++ micro is added, and given quad an operating system identification
++ is also emitted. '--no-emit-version' (default) disables the
+ version line.
+
+'--sig-notation name=value'
+'--cert-notation name=value'
+'-N, --set-notation name=value'
+ Put the name value pair into the signature as notation data.
+ 'name' must consist only of printable characters or spaces, and
+ must contain a '@' character in the form keyname at domain.example.com
+ (substituting the appropriate keyname and domain name, of course).
+ This is to help prevent pollution of the IETF reserved notation
+ namespace. The '--expert' flag overrides the '@' check. 'value'
+ may be any printable string; it will be encoded in UTF8, so you
+ should check that your '--display-charset' is set correctly. If
+ you prefix 'name' with an exclamation mark (!), the notation data
+ will be flagged as critical (rfc4880:5.2.3.16). '--sig-notation'
+ sets a notation for data signatures. '--cert-notation' sets a
+ notation for key signatures (certifications). '--set-notation'
+ sets both.
+
+ There are special codes that may be used in notation names. "%k"
+ will be expanded into the key ID of the key being signed, "%K" into
+ the long key ID of the key being signed, "%f" into the fingerprint
+ of the key being signed, "%s" into the key ID of the key making the
+ signature, "%S" into the long key ID of the key making the
+ signature, "%g" into the fingerprint of the key making the
+ signature (which might be a subkey), "%p" into the fingerprint of
+ the primary key of the key making the signature, "%c" into the
+ signature count from the OpenPGP smartcard, and "%%" results in a
+ single "%". %k, %K, and %f are only meaningful when making a key
+ signature (certification), and %c is only meaningful when using the
+ OpenPGP smartcard.
+
+'--sig-policy-url string'
+'--cert-policy-url string'
+'--set-policy-url string'
+ Use 'string' as a Policy URL for signatures (rfc4880:5.2.3.20). If
+ you prefix it with an exclamation mark (!), the policy URL packet
+ will be flagged as critical. '--sig-policy-url' sets a policy url
+ for data signatures. '--cert-policy-url' sets a policy url for key
+ signatures (certifications). '--set-policy-url' sets both.
+
+ The same %-expandos used for notation data are available here as
+ well.
+
+'--sig-keyserver-url string'
+ Use 'string' as a preferred keyserver URL for data signatures. If
+ you prefix it with an exclamation mark (!), the keyserver URL
+ packet will be flagged as critical.
+
+ The same %-expandos used for notation data are available here as
+ well.
+
+'--set-filename string'
+ Use 'string' as the filename which is stored inside messages. This
+ overrides the default, which is to use the actual filename of the
+ file being encrypted.
+
+'--for-your-eyes-only'
+'--no-for-your-eyes-only'
+ Set the 'for your eyes only' flag in the message. This causes
+ GnuPG to refuse to save the file unless the '--output' option is
+ given, and PGP to use a "secure viewer" with a claimed
+ Tempest-resistant font to display the message. This option
+ overrides '--set-filename'. '--no-for-your-eyes-only' disables
+ this option.
+
+'--use-embedded-filename'
+'--no-use-embedded-filename'
+ Try to create a file with a name as embedded in the data. This can
- be a dangerous option as it allows to overwrite files. Defaults to
++ be a dangerous option as it enables overwriting files. Defaults to
+ no.
+
+'--cipher-algo name'
+ Use 'name' as cipher algorithm. Running the program with the
+ command '--version' yields a list of supported algorithms. If this
+ is not used the cipher algorithm is selected from the preferences
+ stored with the key. In general, you do not want to use this
+ option as it allows you to violate the OpenPGP standard.
+ '--personal-cipher-preferences' is the safe way to accomplish the
+ same thing.
+
+'--digest-algo name'
+ Use 'name' as the message digest algorithm. Running the program
+ with the command '--version' yields a list of supported algorithms.
+ In general, you do not want to use this option as it allows you to
+ violate the OpenPGP standard. '--personal-digest-preferences' is
+ the safe way to accomplish the same thing.
+
+'--compress-algo name'
+ Use compression algorithm 'name'. "zlib" is RFC-1950 ZLIB
+ compression. "zip" is RFC-1951 ZIP compression which is used by
+ PGP. "bzip2" is a more modern compression scheme that can compress
+ some things better than zip or zlib, but at the cost of more memory
+ used during compression and decompression. "uncompressed" or
+ "none" disables compression. If this option is not used, the
+ default behavior is to examine the recipient key preferences to see
+ which algorithms the recipient supports. If all else fails, ZIP is
+ used for maximum compatibility.
+
+ ZLIB may give better compression results than ZIP, as the
+ compression window size is not limited to 8k. BZIP2 may give even
+ better compression results than that, but will use a significantly
+ larger amount of memory while compressing and decompressing. This
+ may be significant in low memory situations. Note, however, that
+ PGP (all versions) only supports ZIP compression. Using any
+ algorithm other than ZIP or "none" will make the message unreadable
+ with PGP. In general, you do not want to use this option as it
+ allows you to violate the OpenPGP standard.
+ '--personal-compress-preferences' is the safe way to accomplish the
+ same thing.
+
+'--cert-digest-algo name'
+ Use 'name' as the message digest algorithm used when signing a key.
+ Running the program with the command '--version' yields a list of
+ supported algorithms. Be aware that if you choose an algorithm
+ that GnuPG supports but other OpenPGP implementations do not, then
+ some users will not be able to use the key signatures you make, or
+ quite possibly your entire key.
+
+'--disable-cipher-algo name'
+ Never allow the use of 'name' as cipher algorithm. The given name
+ will not be checked so that a later loaded algorithm will still get
+ disabled.
+
+'--disable-pubkey-algo name'
+ Never allow the use of 'name' as public key algorithm. The given
+ name will not be checked so that a later loaded algorithm will
+ still get disabled.
+
+'--throw-keyids'
+'--no-throw-keyids'
+ Do not put the recipient key IDs into encrypted messages. This
+ helps to hide the receivers of the message and is a limited
+ countermeasure against traffic analysis.(1) On the receiving side,
+ it may slow down the decryption process because all available
+ secret keys must be tried. '--no-throw-keyids' disables this
+ option. This option is essentially the same as using
+ '--hidden-recipient' for all recipients.
+
+'--not-dash-escaped'
+ This option changes the behavior of cleartext signatures so that
+ they can be used for patch files. You should not send such an
+ armored file via email because all spaces and line endings are
+ hashed too. You can not use this option for data which has 5
+ dashes at the beginning of a line, patch files don't have this. A
+ special armor header line tells GnuPG about this cleartext
+ signature option.
+
+'--escape-from-lines'
+'--no-escape-from-lines'
+ Because some mailers change lines starting with "From " to ">From "
+ it is good to handle such lines in a special way when creating
+ cleartext signatures to prevent the mail system from breaking the
+ signature. Note that all other PGP versions do it this way too.
+ Enabled by default. '--no-escape-from-lines' disables this option.
+
+'--passphrase-repeat n'
+ Specify how many times 'gpg' will request a new passphrase be
+ repeated. This is useful for helping memorize a passphrase.
+ Defaults to 1 repetition.
+
+'--passphrase-fd n'
+ Read the passphrase from file descriptor 'n'. Only the first line
+ will be read from file descriptor 'n'. If you use 0 for 'n', the
+ passphrase will be read from STDIN. This can only be used if only
+ one passphrase is supplied.
+
+'--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.
+
+'--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.
+
+'--command-fd n'
+ This is a replacement for the deprecated shared-memory IPC mode.
+ If this option is enabled, user input on questions is not expected
+ from the TTY but from the given file descriptor. It should be used
+ together with '--status-fd'. See the file doc/DETAILS in the
+ source distribution for details on how to use it.
+
+'--command-file file'
+ Same as '--command-fd', except the commands are read out of file
+ 'file'
+
+'--allow-non-selfsigned-uid'
+'--no-allow-non-selfsigned-uid'
+ Allow the import and use of keys with user IDs which are not
+ self-signed. This is not recommended, as a non self-signed user ID
+ is trivial to forge. '--no-allow-non-selfsigned-uid' disables.
+
+'--allow-freeform-uid'
+ Disable all checks on the form of the user ID while generating a
+ new one. This option should only be used in very special
+ environments as it does not ensure the de-facto standard format of
+ user IDs.
+
+'--ignore-time-conflict'
+ GnuPG normally checks that the timestamps associated with keys and
+ signatures have plausible values. However, sometimes a signature
+ seems to be older than the key due to clock problems. This option
+ makes these checks just a warning. See also '--ignore-valid-from'
+ for timestamp issues on subkeys.
+
+'--ignore-valid-from'
+ GnuPG normally does not select and use subkeys created in the
+ future. This option allows the use of such keys and thus exhibits
+ the pre-1.0.7 behaviour. You should not use this option unless
+ there is some clock problem. See also '--ignore-time-conflict' for
+ timestamp issues with signatures.
+
+'--ignore-crc-error'
+ The ASCII armor used by OpenPGP is protected by a CRC checksum
+ against transmission errors. Occasionally the CRC gets mangled
+ somewhere on the transmission channel but the actual content (which
+ is protected by the OpenPGP protocol anyway) is still okay. This
+ option allows GnuPG to ignore CRC errors.
+
+'--ignore-mdc-error'
+ This option changes a MDC integrity protection failure into a
+ warning. This can be useful if a message is partially corrupt, but
+ it is necessary to get as much data as possible out of the corrupt
+ message. However, be aware that a MDC protection failure may also
+ mean that the message was tampered with intentionally by an
+ attacker.
+
+'--allow-weak-digest-algos'
+ Signatures made with known-weak digest algorithms are normally
+ rejected with an "invalid digest algorithm" message. This option
+ allows the verification of signatures made with such weak
+ algorithms. MD5 is the only digest algorithm considered weak by
+ default. See also '--weak-digest' to reject other digest
+ algorithms.
+
+'--weak-digest name'
+ Treat the specified digest algorithm as weak. Signatures made over
+ weak digests algorithms are normally rejected. This option can be
+ supplied multiple times if multiple algorithms should be considered
+ weak. See also '--allow-weak-digest-algos' to disable rejection of
+ weak digests. MD5 is always considered weak, and does not need to
+ be listed explicitly.
+
+'--no-default-keyring'
+ Do not add the default keyrings to the list of keyrings. Note that
+ GnuPG will not operate without any keyrings, so if you use this
+ option and do not provide alternate keyrings via '--keyring' or
+ '--secret-keyring', then GnuPG will still use the default public or
+ secret keyrings.
+
+'--skip-verify'
+ Skip the signature verification step. This may be used to make the
+ decryption faster if the signature verification is not needed.
+
+'--with-key-data'
+ Print key listings delimited by colons (like '--with-colons') and
+ print the public key data.
+
+'--fast-list-mode'
+ Changes the output of the list commands to work faster; this is
+ achieved by leaving some parts empty. Some applications don't need
+ the user ID and the trust information given in the listings. By
+ using this options they can get a faster listing. The exact
+ behaviour of this option may change in future versions. If you are
+ missing some information, don't use this option.
+
+'--no-literal'
+ This is not for normal use. Use the source to see for what it
+ might be useful.
+
+'--set-filesize'
+ This is not for normal use. Use the source to see for what it
+ might be useful.
+
+'--show-session-key'
+ Display the session key used for one message. See
+ '--override-session-key' for the counterpart of this option.
+
+ We think that Key Escrow is a Bad Thing; however the user should
+ have the freedom to decide whether to go to prison or to reveal the
+ content of one specific message without compromising all messages
+ ever encrypted for one secret key. DON'T USE IT UNLESS YOU ARE
+ REALLY FORCED TO DO SO.
+
+'--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.
+
+'--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: gnupg1.info, Node: Deprecated Options, Prev: GPG Esoteric Options, Up: GPG Options
+
+1.2.7 Deprecated options
+------------------------
+
+'--load-extension name'
+ Load an extension module. If 'name' does not contain a slash it is
+ searched for in the directory configured when GnuPG was built
+ (generally "/usr/local/lib/gnupg"). Extensions are not generally
+ useful anymore, and the use of this option is deprecated.
+
+'--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.
+
+'--ctapi-driver file'
+ Use 'file' 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.
+
+'--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: gnupg1.info, Node: GPG Configuration, Next: GPG Examples, Prev: GPG Options, Up: Invoking GPG
+
+1.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 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' may modify these files.
+
+'~/.gnupg/pubring.gpg'
+ The public keyring. You should backup this file.
+
+'~/.gnupg/pubring.gpg.lock'
+ The lock file for the public keyring.
+
+'~/.gnupg/pubring.kbx'
+'~/.gnupg/pubring.kbx.lock'
+ A public keyring and its lock file used by GnuPG versions >= 2. It
+ is ignored by GnuPG 1.x
+
+'~/.gnupg/secring.gpg'
+ The secret keyring. You should backup this file.
+
+'~/.gnupg/trustdb.gpg'
+ The trust database. There is no need to backup this file; it is
+ better to backup the ownertrust values (*note option
+ --export-ownertrust::).
+
+'~/.gnupg/trustdb.gpg.lock'
+ The lock file for the trust database.
+
+'~/.gnupg/random_seed'
+ A file used to preserve the state of the internal random pool.
+
+'~/.gnupg/secring.gpg.lock'
+ The lock file for the secret keyring.
+
+'~/.gnupg/openpgp-revocs.d/'
+ This is the directory where gpg stores pre-generated revocation
+ certificates. The file name corresponds to the OpenPGP fingerprint
+ of the respective key. It is suggested to backup those
+ certificates and if the primary private key is not stored on the
+ disk to move them to an external storage device. Anyone who can
+ access theses files is able to revoke the corresponding key. You
+ may want to print them out. You should backup all files in this
+ directory and take care to keep this backup closed away.
+
+'/usr[/local]/share/gnupg/options.skel'
+ The skeleton options file.
+
+'/usr[/local]/lib/gnupg/'
+ Default location for extensions.
+
+ Operation is further controlled by a few environment variables:
+
+HOME
+ Used to locate the default home directory.
+
+GNUPGHOME
+ If set directory used instead of "~/.gnupg".
+
+GPG_AGENT_INFO
+ Used to locate the gpg-agent. This is only honored when
+ '--use-agent' is set.
+
+ The value consists of 3 colon delimited fields: The first is the
+ path to the Unix Domain Socket, the second the PID of the gpg-agent
+ and the protocol version which should be set to 1. When starting
+ the gpg-agent as described in its documentation, this variable is
+ set to the correct value. The option '--gpg-agent-info' can be
+ used to override it.
+
+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: gnupg1.info, Node: GPG Examples, Next: Unattended Usage of GPG, Prev: GPG Configuration, Up: Invoking GPG
+
+1.4 Examples
+============
+
+gpg -se -r 'Bob' 'file'
+ sign and encrypt for user Bob
+
+gpg -clearsign 'file'
+ make a clear text signature
+
+gpg -sb 'file'
+ make a detached signature
+
+gpg -u 0x12345678 -sb 'file'
+ make a detached signature with the key 0x12345678
+
+gpg -list-keys 'user_ID'
+ show keys
+
+gpg -fingerprint 'user_ID'
+ show fingerprint
+
+gpg -verify 'pgpfile'
+gpg -verify 'sigfile'
+ Verify the signature of the file but do not output the data. The
+ second form is used for detached signatures, where 'sigfile' is the
+ detached signature (either ASCII armored or binary) and are the
+ signed data; if this is not given, the name of the file holding the
+ signed data is constructed by cutting off the extension (".asc" or
+ ".sig") of 'sigfile' or by asking the user for the filename.
+
+RETURN VALUE
+************
+
+The program returns 0 if everything was fine, 1 if at least a signature
+was bad, and other error codes for fatal errors.
+
+WARNINGS
+********
+
+Use a *good* password for your user account and a *good* passphrase to
+protect your secret key. This passphrase is the weakest part of the
+whole system. Programs to do dictionary attacks on your secret keyring
+are very easy to write and so you should protect your "~/.gnupg/"
+directory very well.
+
+ Keep in mind that, if this program is used over a network (telnet),
+it is *very* easy to spy out your passphrase!
+
+ If you are going to verify detached signatures, make sure that the
+program knows about it; either give both filenames on the command line
+or use '-' to specify STDIN.
+
+INTEROPERABILITY WITH OTHER OPENPGP PROGRAMS
+********************************************
+
+GnuPG tries to be a very flexible implementation of the OpenPGP
+standard. In particular, GnuPG implements many of the optional parts of
+the standard, such as the SHA-512 hash, and the ZLIB and BZIP2
+compression algorithms. It is important to be aware that not all
+OpenPGP programs implement these optional algorithms and that by forcing
+their use via the '--cipher-algo', '--digest-algo',
+'--cert-digest-algo', or '--compress-algo' options in GnuPG, it is
+possible to create a perfectly valid OpenPGP message, but one that
+cannot be read by the intended recipient.
+
+ There are dozens of variations of OpenPGP programs available, and
+each supports a slightly different subset of these optional algorithms.
+For example, until recently, no (unhacked) version of PGP supported the
+BLOWFISH cipher algorithm. A message using BLOWFISH simply could not be
+read by a PGP user. By default, GnuPG uses the standard OpenPGP
+preferences system that will always do the right thing and create
+messages that are usable by all recipients, regardless of which OpenPGP
+program they use. Only override this safe default if you really know
+what you are doing.
+
+ If you absolutely must override the safe default, or if the
+preferences on a given key are invalid for some reason, you are far
+better off using the '--pgp6', '--pgp7', or '--pgp8' options. These
+options are safe as they do not force any particular algorithms in
+violation of OpenPGP, but rather reduce the available algorithms to a
+"PGP-safe" list.
+
+BUGS
+****
+
+On older systems this program should be installed as setuid(root). This
+is necessary to lock memory pages. Locking memory pages prevents the
+operating system from writing memory pages (which may contain
+passphrases or other sensitive material) to disk. If you get no warning
+message about insecure memory your operating system supports locking
+without being root. The program drops root privileges as soon as locked
+memory is allocated.
+
+ Note also that some systems (especially laptops) have the ability to
+"suspend to disk" (also known as "safe sleep" or "hibernate"). This
+writes all memory to disk before going into a low power or even powered
+off mode. Unless measures are taken in the operating system to protect
+the saved memory, passphrases or other sensitive material may be
+recoverable from it later.
+
+ Before you report a bug you should first search the mailing list
+archives for similar problems and second check whether such a bug has
+already been reported to our bug tracker at http://bugs.gnupg.org .
+
+
+File: gnupg1.info, Node: Unattended Usage of GPG, Prev: GPG Examples, Up: Invoking GPG
+
+1.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: gnupg1.info, Node: Unattended GPG key generation, Up: Unattended Usage of GPG
+
+1.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
+ Enable (or disable) a mode where the command 'passphrase' is
+ ignored and instead the usual passphrase dialog is used. This does
+ not make sense for batch key generation; however the unattended key
+ generation feature is also used by GUIs and this feature
+ relinquishes the GUI from implementing its own passphrase entry
+ code. These are global control statements and affect all future
+ key genrations.
+
+%no-protection
+ Since GnuPG version 2.1 it is not anymore possible to specify a
+ passphrase for unattended key generation. The passphrase command
+ is simply ignored and '%ask-passpharse' is thus implicitly enabled.
+ Using this option allows the creation of keys without any
+ passphrase protection. This option is mainly intended for
+ regression tests.
+
+%transient-key
+ If given the keys are created using a faster and a somewhat less
+ secure random number generator. This option may be used for keys
+ which are only used for a short time and do not require full
+ cryptographic strength. It takes only effect if used together with
+ the control statement '%no-protection'.
+
+General Parameters:
+
+Key-Type: ALGO
+ Starts a new parameter block by giving the type of the primary key.
+ The algorithm must be capable of signing. This is a required
+ parameter. ALGO may either be an OpenPGP algorithm number or a
+ string with the algorithm name. The special value 'default' may be
+ used for ALGO to create the default key type; in this case a
+ 'Key-Usage' shall not be given and 'default' also be used for
+ 'Subkey-Type'.
+
+Key-Length: NBITS
+ The requested length of the generated key in bits. The default is
+ returned by running the command 'gpg2 --gpgconf-list'.
+
+Key-Grip: HEXSTRING
+ This is optional and used to generate a CSR or certificate for an
+ already existing key. Key-Length will be ignored when given.
+
+Key-Usage: USAGE-LIST
+ Space or comma delimited list of key usages. Allowed values are
+ 'encrypt', 'sign', and 'auth'. This is used to generate the key
+ flags. Please make sure that the algorithm is capable of this
+ usage. Note that OpenPGP requires that all primary keys are
+ capable of certification, so no matter what usage is given here,
+ the 'cert' flag will be on. If no 'Key-Usage' is specified and the
+ 'Key-Type' is not 'default', all allowed usages for that particular
+ algorithm are used; if it is not given but 'default' is used the
+ usage will be 'sign'.
+
+Subkey-Type: ALGO
+ This generates a secondary key (subkey). Currently only one subkey
+ can be handled. See also 'Key-Type' above.
+
+Subkey-Length: NBITS
+ Length of the secondary key (subkey) in bits. The default is
+ returned by running the command 'gpg2 --gpgconf-list'".
+
+Subkey-Usage: USAGE-LIST
+ Key usage lists for a subkey; similar to 'Key-Usage'.
+
+Passphrase: STRING
+ If you want to specify a passphrase for the secret key, enter it
+ here. Default is not to use any passphrase.
+
+Name-Real: NAME
+Name-Comment: COMMENT
+Name-Email: EMAIL
+ The three parts of a user name. Remember to use UTF-8 encoding
+ here. If you don't give any of them, no user ID is created.
+
+Expire-Date: ISO-DATE|(NUMBER[d|w|m|y])
+ Set the expiration date for the key (and the subkey). It may
+ either be entered in ISO date format (e.g. "20000815T145012") or
+ as number of days, weeks, month or years after the creation date.
+ The special notation "seconds=N" is also allowed to specify a
+ number of seconds since creation. Without a letter days are
+ assumed. Note that there is no check done on the overflow of the
+ type used by OpenPGP for timestamps. Thus you better make sure
+ that the given value make sense. Although OpenPGP works with time
+ intervals, GnuPG uses an absolute value internally and thus the
+ last year we can represent is 2105.
+
+Creation-Date: ISO-DATE
+ Set the creation date of the key as stored in the key information
+ and which is also part of the fingerprint calculation. Either a
+ date like "1986-04-26" or a full timestamp like "19860426T042640"
+ may be used. The time is considered to be UTC. The special
+ notation "seconds=N" may be used to directly specify a the number
+ of seconds since Epoch (Unix time). If it is not given the current
+ time is used.
+
+Preferences: STRING
+ Set the cipher, hash, and compression preference values for this
+ key. This expects the same type of string as the sub-command
+ 'setpref' in the '--edit-key' menu.
+
+Revoker: ALGO:FPR [sensitive]
+ Add a designated revoker to the generated key. Algo is the public
+ key algorithm of the designated revoker (i.e. RSA=1, DSA=17, etc.)
+ FPR is the fingerprint of the designated revoker. The optional
+ 'sensitive' flag marks the designated revoker as sensitive
+ information. Only v4 keys may be designated revokers.
+
+Keyserver: STRING
+ This is an optional parameter that specifies the preferred
+ keyserver URL for the key.
+
+Handle: STRING
+ This is an optional parameter only used with the status lines
+ KEY_CREATED and KEY_NOT_CREATED. STRING may be up to 100 characters
+ and should not contain spaces. It is useful for batch key
+ generation to associate a key parameter block with a status line.
+
+Here is an example on how to create a key:
+ $ cat >foo <<EOF
+ %echo Generating a basic OpenPGP key
+ Key-Type: DSA
+ Key-Length: 1024
+ Subkey-Type: ELG-E
+ Subkey-Length: 1024
+ Name-Real: Joe Tester
+ Name-Comment: with stupid passphrase
+ Name-Email: joe at foo.bar
+ Expire-Date: 0
+ Passphrase: abc
+ %pubring foo.pub
+ %secring foo.sec
+ # Do a commit here, so that we can later print "done" :-)
+ %commit
+ %echo done
+ EOF
+ $ gpg2 --batch --gen-key foo
+ [...]
+ $ gpg2 --no-default-keyring --secret-keyring ./foo.sec \
+ --keyring ./foo.pub --list-secret-keys
+ /home/wk/work/gnupg-stable/scratch/foo.sec
+ ------------------------------------------
+ sec 1024D/915A878D 2000-03-09 Joe Tester (with stupid passphrase) <joe at foo.bar>
+ ssb 1024g/8F70E2C0 2000-03-09
+
+If you want to create a key with the default algorithms you would use
+these parameters:
+ %echo Generating a default key
+ Key-Type: default
+ Subkey-Type: default
+ Name-Real: Joe Tester
+ Name-Comment: with stupid passphrase
+ Name-Email: joe at foo.bar
+ Expire-Date: 0
+ Passphrase: abc
+ %pubring foo.pub
+ %secring foo.sec
+ # Do a commit here, so that we can later print "done" :-)
+ %commit
+ %echo done
+
+
+File: gnupg1.info, Node: Specify a User ID, Next: Copying, Prev: Invoking GPG, Up: Top
+
+2 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 word match. All words must match exactly (not case sensitive)
+ but can appear in any order in the user ID or a subjects name.
+ Words are any sequences of letters, digits, the underscore and all
+ characters with bit 7 set.
+
+ +Heinrich Heine duesseldorf
+
+ * 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
+
+ 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: gnupg1.info, Node: Copying, Next: Option Index, Prev: Specify a User ID, 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: gnupg1.info, Node: Option Index, Next: Index, Prev: Copying, Up: Top
+
+Option Index
+************
+
+
+* Menu:
+
+* allow-freeform-uid: GPG Esoteric Options.
+ (line 310)
+* allow-multiple-messages: GPG Esoteric Options.
+ (line 442)
+* allow-non-selfsigned-uid: GPG Esoteric Options.
+ (line 305)
+* allow-secret-key-import: GPG Esoteric Options.
+ (line 438)
+* allow-weak-digest-algos: GPG Esoteric Options.
+ (line 345)
+* always-trust: Deprecated Options. (line 32)
+* armor: GPG Input and Output.
+ (line 8)
+* ask-cert-expire: GPG Esoteric Options.
+ (line 425)
+* ask-cert-level: GPG Configuration Options.
+ (line 359)
+* ask-sig-expire: GPG Esoteric Options.
+ (line 411)
+* attribute-fd: GPG Esoteric Options.
+ (line 85)
+* attribute-file: GPG Esoteric Options.
+ (line 91)
+* auto-check-trustdb: GPG Configuration Options.
+ (line 652)
+* auto-key-locate: GPG Configuration Options.
+ (line 439)
+* batch: GPG Configuration Options.
+ (line 39)
+* bzip2-compress-level: GPG Configuration Options.
+ (line 333)
+* bzip2-decompress-lowmem: GPG Configuration Options.
+ (line 343)
+* card-edit: Operational GPG Commands.
+ (line 165)
+* card-status: Operational GPG Commands.
+ (line 171)
+* cert-digest-algo: GPG Esoteric Options.
+ (line 224)
+* cert-notation: GPG Esoteric Options.
+ (line 117)
+* cert-policy-url: GPG Esoteric Options.
+ (line 147)
+* change-pin: Operational GPG Commands.
+ (line 174)
+* check-sigs: Operational GPG Commands.
+ (line 142)
+* check-trustdb: Operational GPG Commands.
+ (line 277)
+* cipher-algo: GPG Esoteric Options.
+ (line 185)
+* clearsign: Operational GPG Commands.
+ (line 17)
+* command-fd: GPG Esoteric Options.
+ (line 293)
+* command-file: GPG Esoteric Options.
+ (line 300)
+* comment: GPG Esoteric Options.
+ (line 96)
+* compliant-needed: GPG Configuration Options.
+ (line 617)
+* compress-algo: GPG Esoteric Options.
+ (line 201)
+* compress-level: GPG Configuration Options.
+ (line 333)
+* ctapi-driver: Deprecated Options. (line 27)
+* dearmor: Operational GPG Commands.
+ (line 331)
+* debug: GPG Esoteric Options.
+ (line 47)
+* debug-all: GPG Esoteric Options.
+ (line 51)
+* debug-ccid-driver: GPG Esoteric Options.
+ (line 54)
+* debug-level: GPG Esoteric Options.
+ (line 22)
+* decrypt: Operational GPG Commands.
+ (line 52)
+* decrypt-files: Operational GPG Commands.
+ (line 100)
+* default-cert-expire: GPG Esoteric Options.
+ (line 431)
+* default-cert-level: GPG Configuration Options.
+ (line 367)
+* default-key: GPG Configuration Options.
+ (line 10)
+* default-keyserver-url: GPG Esoteric Options.
+ (line 470)
+* default-preference-list: GPG Esoteric Options.
+ (line 465)
+* default-recipient: GPG Configuration Options.
+ (line 15)
+* default-recipient-self: GPG Configuration Options.
+ (line 19)
+* default-sig-expire: GPG Esoteric Options.
+ (line 417)
+* delete-key: Operational GPG Commands.
+ (line 179)
+* delete-secret-and-public-key: Operational GPG Commands.
+ (line 188)
+* delete-secret-key: Operational GPG Commands.
+ (line 184)
+* desig-revoke: OpenPGP Key Management.
+ (line 21)
+* detach-sign: Operational GPG Commands.
+ (line 27)
+* digest-algo: GPG Esoteric Options.
+ (line 194)
+* disable-ccid: GPG Configuration Options.
+ (line 274)
+* disable-cipher-algo: GPG Esoteric Options.
+ (line 232)
+* disable-dsa2: GPG Configuration Options.
+ (line 190)
+* disable-large-rsa: GPG Configuration Options.
+ (line 183)
+* disable-mdc: OpenPGP Options. (line 46)
+* disable-pubkey-algo: GPG Esoteric Options.
+ (line 237)
+* display-charset: GPG Configuration Options.
+ (line 288)
+* display-charset:iso-8859-1: GPG Configuration Options.
+ (line 297)
+* display-charset:iso-8859-15: GPG Configuration Options.
+ (line 303)
+* display-charset:iso-8859-2: GPG Configuration Options.
+ (line 300)
+* display-charset:koi8-r: GPG Configuration Options.
+ (line 306)
+* display-charset:utf-8: GPG Configuration Options.
+ (line 309)
+* dry-run: GPG Esoteric Options.
+ (line 8)
+* dump-options: General GPG Commands.
+ (line 19)
+* edit-key: OpenPGP Key Management.
+ (line 26)
+* emit-version: GPG Esoteric Options.
+ (line 107)
+* enable-dsa2: GPG Configuration Options.
+ (line 190)
+* enable-large-rsa: GPG Configuration Options.
+ (line 183)
+* enable-progress-filter: GPG Esoteric Options.
+ (line 64)
+* enable-special-filenames: GPG Esoteric Options.
+ (line 452)
+* enarmor: Operational GPG Commands.
+ (line 331)
+* encrypt: Operational GPG Commands.
+ (line 31)
+* encrypt-files: Operational GPG Commands.
+ (line 97)
+* encrypt-to: GPG Key related Options.
+ (line 21)
+* escape-from-lines: GPG Esoteric Options.
+ (line 262)
+* exec-path: GPG Configuration Options.
+ (line 214)
+* exit-on-status-write-error: GPG Configuration Options.
- (line 685)
++ (line 687)
+* expert: GPG Configuration Options.
- (line 743)
++ (line 745)
+* export: Operational GPG Commands.
+ (line 193)
+* export-options: GPG Input and Output.
+ (line 75)
+* export-ownertrust: Operational GPG Commands.
+ (line 292)
+* export-secret-keys: Operational GPG Commands.
+ (line 209)
+* export-secret-subkeys: Operational GPG Commands.
+ (line 209)
+* faked-system-time: GPG Esoteric Options.
+ (line 58)
+* fast-list-mode: GPG Esoteric Options.
+ (line 376)
+* fetch-keys: Operational GPG Commands.
+ (line 262)
+* fingerprint: Operational GPG Commands.
+ (line 154)
+* fixed-list-mode: GPG Input and Output.
+ (line 126)
+* for-your-eyes-only: GPG Esoteric Options.
+ (line 171)
+* force-mdc: OpenPGP Options. (line 40)
+* force-v3-sigs: OpenPGP Options. (line 25)
+* force-v4-certs: OpenPGP Options. (line 35)
+* gen-key: OpenPGP Key Management.
+ (line 9)
+* gen-prime: Operational GPG Commands.
+ (line 326)
+* gen-random: Operational GPG Commands.
+ (line 319)
+* gen-revoke: OpenPGP Key Management.
+ (line 17)
+* gnupg: Compliance Options. (line 12)
+* gpg-agent-info: GPG Configuration Options.
- (line 664)
++ (line 666)
+* gpgconf-list: GPG Esoteric Options.
+ (line 483)
+* gpgconf-test: GPG Esoteric Options.
+ (line 487)
+* group: GPG Key related Options.
+ (line 41)
+* help: General GPG Commands.
+ (line 12)
+* hidden-encrypt-to: GPG Key related Options.
+ (line 29)
+* hidden-recipient: GPG Key related Options.
+ (line 14)
+* homedir: GPG Configuration Options.
+ (line 247)
+* ignore-crc-error: GPG Esoteric Options.
+ (line 330)
+* ignore-mdc-error: GPG Esoteric Options.
+ (line 337)
+* ignore-time-conflict: GPG Esoteric Options.
+ (line 316)
+* ignore-valid-from: GPG Esoteric Options.
+ (line 323)
+* import: Operational GPG Commands.
+ (line 231)
+* import-options: GPG Input and Output.
+ (line 29)
+* import-ownertrust: Operational GPG Commands.
+ (line 298)
+* interactive: GPG Esoteric Options.
+ (line 19)
+* keyedit:addcardkey: OpenPGP Key Management.
+ (line 162)
+* keyedit:addkey: OpenPGP Key Management.
+ (line 159)
+* keyedit:addphoto: OpenPGP Key Management.
+ (line 81)
+* keyedit:addrevoker: OpenPGP Key Management.
+ (line 210)
+* keyedit:adduid: OpenPGP Key Management.
+ (line 78)
+* keyedit:bkuptocard: OpenPGP Key Management.
+ (line 176)
+* keyedit:check: OpenPGP Key Management.
+ (line 75)
+* keyedit:clean: OpenPGP Key Management.
+ (line 222)
+* keyedit:cross-certify: OpenPGP Key Management.
+ (line 236)
+* keyedit:delkey: OpenPGP Key Management.
+ (line 187)
+* keyedit:delsig: OpenPGP Key Management.
+ (line 65)
+* keyedit:deluid: OpenPGP Key Management.
+ (line 91)
+* keyedit:disable: OpenPGP Key Management.
+ (line 206)
+* keyedit:enable: OpenPGP Key Management.
+ (line 206)
+* keyedit:expire: OpenPGP Key Management.
+ (line 195)
+* keyedit:key: OpenPGP Key Management.
+ (line 35)
+* keyedit:keyserver: OpenPGP Key Management.
+ (line 108)
+* keyedit:keytocard: OpenPGP Key Management.
+ (line 165)
+* keyedit:lsign: OpenPGP Key Management.
+ (line 46)
+* keyedit:minimize: OpenPGP Key Management.
+ (line 231)
+* keyedit:notation: OpenPGP Key Management.
+ (line 115)
+* keyedit:nrsign: OpenPGP Key Management.
+ (line 51)
+* keyedit:passwd: OpenPGP Key Management.
+ (line 216)
+* keyedit:pref: OpenPGP Key Management.
+ (line 123)
+* keyedit:primary: OpenPGP Key Management.
+ (line 100)
+* keyedit:quit: OpenPGP Key Management.
+ (line 247)
+* keyedit:revkey: OpenPGP Key Management.
+ (line 192)
+* keyedit:revsig: OpenPGP Key Management.
+ (line 70)
+* keyedit:revuid: OpenPGP Key Management.
+ (line 97)
+* keyedit:save: OpenPGP Key Management.
+ (line 244)
+* keyedit:setpref: OpenPGP Key Management.
+ (line 135)
+* keyedit:showphoto: OpenPGP Key Management.
+ (line 88)
+* keyedit:showpref: OpenPGP Key Management.
+ (line 127)
+* keyedit:sign: OpenPGP Key Management.
+ (line 39)
+* keyedit:toggle: OpenPGP Key Management.
+ (line 219)
+* keyedit:trust: OpenPGP Key Management.
+ (line 201)
+* keyedit:tsign: OpenPGP Key Management.
+ (line 55)
+* keyedit:uid: OpenPGP Key Management.
+ (line 31)
+* keyid-format: GPG Configuration Options.
+ (line 482)
+* keyring: GPG Configuration Options.
+ (line 221)
+* keyserver: GPG Configuration Options.
+ (line 489)
+* keyserver-options: GPG Configuration Options.
+ (line 509)
+* limit-card-insert-tries: GPG Configuration Options.
- (line 694)
++ (line 696)
+* list-config: GPG Esoteric Options.
+ (line 475)
+* list-keys: Operational GPG Commands.
+ (line 105)
+* list-only: GPG Esoteric Options.
+ (line 11)
+* list-options: GPG Configuration Options.
+ (line 70)
+* list-options:show-keyring: GPG Configuration Options.
+ (line 119)
+* list-options:show-keyserver-urls: GPG Configuration Options.
+ (line 103)
+* list-options:show-notations: GPG Configuration Options.
+ (line 98)
+* list-options:show-photos: GPG Configuration Options.
+ (line 78)
+* list-options:show-policy-urls: GPG Configuration Options.
+ (line 92)
+* list-options:show-sig-expire: GPG Configuration Options.
+ (line 123)
+* list-options:show-sig-subpackets: GPG Configuration Options.
+ (line 127)
+* list-options:show-std-notations: GPG Configuration Options.
+ (line 98)
+* list-options:show-uid-validity: GPG Configuration Options.
+ (line 107)
+* list-options:show-unusable-subkeys: GPG Configuration Options.
+ (line 115)
+* list-options:show-unusable-uids: GPG Configuration Options.
+ (line 111)
+* list-options:show-usage: GPG Configuration Options.
+ (line 86)
+* list-options:show-user-notations: GPG Configuration Options.
+ (line 98)
+* list-packets: Operational GPG Commands.
+ (line 161)
+* list-secret-keys: Operational GPG Commands.
+ (line 120)
+* list-sigs: Operational GPG Commands.
+ (line 126)
+* load-extension: Deprecated Options. (line 7)
+* local-user: GPG Key related Options.
+ (line 63)
+* lock-multiple: GPG Configuration Options.
- (line 674)
++ (line 676)
+* lock-never: GPG Configuration Options.
- (line 678)
++ (line 680)
+* lock-once: GPG Configuration Options.
- (line 670)
++ (line 672)
+* log-file: GPG Esoteric Options.
+ (line 81)
+* logger-fd: GPG Esoteric Options.
+ (line 77)
+* lsign-key: OpenPGP Key Management.
+ (line 282)
+* mangle-dos-filenames: GPG Configuration Options.
+ (line 351)
+* marginals-needed: GPG Configuration Options.
+ (line 621)
+* max-cert-depth: GPG Configuration Options.
+ (line 625)
+* max-output: GPG Input and Output.
+ (line 19)
+* min-cert-level: GPG Configuration Options.
+ (line 396)
+* multifile: Operational GPG Commands.
+ (line 86)
+* no: GPG Configuration Options.
+ (line 67)
+* no-armor: GPG Input and Output.
+ (line 12)
+* no-batch: GPG Configuration Options.
+ (line 39)
+* no-default-keyring: GPG Esoteric Options.
+ (line 361)
+* no-default-recipient: GPG Configuration Options.
+ (line 25)
+* no-encrypt-to: GPG Key related Options.
+ (line 37)
+* no-expensive-trust-checks: GPG Esoteric Options.
+ (line 457)
+* no-greeting: GPG Configuration Options.
- (line 708)
++ (line 710)
+* no-groups: GPG Key related Options.
+ (line 59)
+* no-literal: GPG Esoteric Options.
+ (line 384)
+* no-mangle-dos-filenames: GPG Configuration Options.
+ (line 351)
+* no-mdc-warning: GPG Configuration Options.
- (line 727)
++ (line 729)
+* no-options: GPG Configuration Options.
+ (line 326)
+* no-random-seed-file: GPG Configuration Options.
- (line 702)
++ (line 704)
+* no-secmem-warning: GPG Configuration Options.
- (line 711)
++ (line 713)
+* no-sig-cache: GPG Configuration Options.
+ (line 639)
+* no-sig-create-check: GPG Configuration Options.
+ (line 648)
- * no-skip-hidden-recipients: GPG Key related Options.
- (line 75)
+* no-tty: GPG Configuration Options.
+ (line 59)
+* no-verbose: GPG Configuration Options.
+ (line 32)
+* not-dash-escaped: GPG Esoteric Options.
+ (line 252)
+* openpgp: Compliance Options. (line 19)
+* options: GPG Configuration Options.
+ (line 321)
+* output: GPG Input and Output.
+ (line 16)
+* override-session-key: GPG Esoteric Options.
+ (line 402)
+* passphrase: GPG Esoteric Options.
+ (line 287)
+* passphrase-fd: GPG Esoteric Options.
+ (line 274)
+* passphrase-file: GPG Esoteric Options.
+ (line 280)
+* passphrase-repeat: GPG Esoteric Options.
+ (line 269)
+* pcsc-driver: GPG Configuration Options.
+ (line 268)
+* permission-warning: GPG Configuration Options.
- (line 714)
++ (line 716)
+* personal-cipher-preferences: OpenPGP Options. (line 51)
+* personal-compress-preferences: OpenPGP Options. (line 69)
+* personal-digest-preferences: OpenPGP Options. (line 60)
+* pgp2: Compliance Options. (line 38)
+* pgp6: Compliance Options. (line 57)
+* pgp7: Compliance Options. (line 68)
+* pgp8: Compliance Options. (line 74)
+* photo-viewer: GPG Configuration Options.
+ (line 196)
+* preserve-permissions: GPG Esoteric Options.
+ (line 460)
+* primary-keyring: GPG Configuration Options.
+ (line 235)
+* print-md: Operational GPG Commands.
+ (line 314)
+* quiet: GPG Configuration Options.
+ (line 35)
+* reader-port: GPG Configuration Options.
+ (line 280)
+* rebuild-keydb-caches: Operational GPG Commands.
+ (line 308)
+* recipient: GPG Key related Options.
+ (line 8)
+* recv-keys: Operational GPG Commands.
+ (line 240)
+* refresh-keys: Operational GPG Commands.
+ (line 244)
+* require-cross-certification: GPG Configuration Options.
- (line 736)
++ (line 738)
+* require-secmem: GPG Configuration Options.
- (line 731)
++ (line 733)
+* rfc1991: Compliance Options. (line 34)
+* rfc2440: Compliance Options. (line 30)
+* rfc4880: Compliance Options. (line 25)
+* s2k-cipher-algo: OpenPGP Options. (line 79)
+* s2k-count: OpenPGP Options. (line 96)
+* s2k-digest-algo: OpenPGP Options. (line 85)
+* s2k-mode: OpenPGP Options. (line 89)
+* search-keys: Operational GPG Commands.
+ (line 253)
+* secret-keyring: GPG Configuration Options.
+ (line 232)
+* send-keys: Operational GPG Commands.
+ (line 200)
+* set-filename: GPG Esoteric Options.
+ (line 165)
+* set-filesize: GPG Esoteric Options.
+ (line 388)
+* set-notation: GPG Esoteric Options.
+ (line 117)
+* set-policy-url: GPG Esoteric Options.
+ (line 147)
+* show-keyring: Deprecated Options. (line 22)
+* show-notation: Deprecated Options. (line 36)
+* show-photos: Deprecated Options. (line 14)
+* show-policy-url: Deprecated Options. (line 44)
+* show-session-key: GPG Esoteric Options.
+ (line 392)
+* sig-keyserver-url: GPG Esoteric Options.
+ (line 157)
+* sig-notation: GPG Esoteric Options.
+ (line 117)
+* sig-policy-url: GPG Esoteric Options.
+ (line 147)
+* sign: Operational GPG Commands.
+ (line 8)
+* sign-key: OpenPGP Key Management.
+ (line 278)
+* simple-sk-checksum: GPG Configuration Options.
+ (line 628)
- * skip-hidden-recipients: GPG Key related Options.
- (line 75)
+* skip-verify: GPG Esoteric Options.
+ (line 368)
+* status-fd: GPG Esoteric Options.
+ (line 69)
+* status-file: GPG Esoteric Options.
+ (line 73)
+* store: Operational GPG Commands.
+ (line 48)
+* symmetric: Operational GPG Commands.
+ (line 39)
+* textmode: OpenPGP Options. (line 8)
+* throw-keyids: GPG Esoteric Options.
+ (line 243)
+* trust-mode:always: GPG Configuration Options.
+ (line 424)
+* trust-mode:auto: GPG Configuration Options.
+ (line 433)
+* trust-mode:classic: GPG Configuration Options.
+ (line 417)
+* trust-mode:direct: GPG Configuration Options.
+ (line 420)
+* trust-mode:pgp: GPG Configuration Options.
+ (line 412)
+* trust-model: GPG Configuration Options.
+ (line 409)
+* trustdb-name: GPG Configuration Options.
+ (line 240)
+* trusted-key: GPG Configuration Options.
+ (line 402)
+* try-all-secrets: GPG Key related Options.
+ (line 67)
+* ungroup: GPG Key related Options.
+ (line 56)
+* update-trustdb: Operational GPG Commands.
+ (line 267)
+* use-agent: GPG Configuration Options.
+ (line 659)
+* use-embedded-filename: GPG Esoteric Options.
+ (line 180)
+* utf8-strings: GPG Configuration Options.
+ (line 314)
+* verbose: GPG Configuration Options.
+ (line 28)
+* verify: Operational GPG Commands.
+ (line 60)
+* verify-files: Operational GPG Commands.
+ (line 94)
+* verify-options: GPG Configuration Options.
+ (line 134)
+* verify-options:pka-lookups: GPG Configuration Options.
+ (line 170)
+* verify-options:pka-trust-increase: GPG Configuration Options.
+ (line 177)
+* verify-options:show-keyserver-urls: GPG Configuration Options.
+ (line 153)
+* verify-options:show-notations: GPG Configuration Options.
+ (line 149)
+* verify-options:show-photos: GPG Configuration Options.
+ (line 139)
+* verify-options:show-policy-urls: GPG Configuration Options.
+ (line 143)
+* verify-options:show-primary-uid-only: GPG Configuration Options.
+ (line 165)
+* verify-options:show-std-notations: GPG Configuration Options.
+ (line 149)
+* verify-options:show-uid-validity: GPG Configuration Options.
+ (line 157)
+* verify-options:show-unusable-uids: GPG Configuration Options.
+ (line 161)
+* verify-options:show-user-notations: GPG Configuration Options.
+ (line 149)
+* version: General GPG Commands.
+ (line 7)
+* warranty: General GPG Commands.
+ (line 16)
+* weak-digest: GPG Esoteric Options.
+ (line 353)
+* with-colons: GPG Input and Output.
+ (line 118)
+* with-fingerprint: GPG Input and Output.
+ (line 130)
+* with-key-data: GPG Esoteric Options.
+ (line 372)
+* yes: GPG Configuration Options.
+ (line 64)
+
+
+File: gnupg1.info, Node: Index, Prev: Option Index, Up: Top
+
+Index
+*****
+
+
+* Menu:
+
+* command options: Invoking GPG. (line 6)
+* GPG command options: Invoking GPG. (line 6)
+* gpg.conf: GPG Configuration. (line 11)
+* options, GPG command: Invoking GPG. (line 6)
+
+
+
+Tag Table:
- Node: Top719
- Node: Invoking GPG1765
- Ref: Invoking GPG-Footnote-12692
- Node: GPG Commands2757
- Node: General GPG Commands3588
- Node: Operational GPG Commands4220
- Ref: option --export-ownertrust17481
- Node: OpenPGP Key Management19268
- Node: GPG Options31001
- Node: GPG Configuration Options32333
- Ref: option --homedir42343
- Ref: gpg-option --options45625
- Node: GPG Key related Options64971
- Node: GPG Input and Output68548
- Node: OpenPGP Options74479
- Node: Compliance Options79528
- Node: GPG Esoteric Options83020
- Ref: GPG Esoteric Options-Footnote-1104994
- Node: Deprecated Options105148
- Node: GPG Configuration107129
- Node: GPG Examples111067
- Node: Unattended Usage of GPG115410
- Node: Unattended GPG key generation115850
- Node: Specify a User ID125135
- Ref: how-to-specify-a-user-id125284
- Node: Copying130021
- Node: Option Index167550
- Node: Index209427
++Node: Top716
++Node: Invoking GPG1759
++Ref: Invoking GPG-Footnote-12686
++Node: GPG Commands2751
++Node: General GPG Commands3582
++Node: Operational GPG Commands4214
++Ref: option --export-ownertrust17475
++Node: OpenPGP Key Management19262
++Node: GPG Options30995
++Node: GPG Configuration Options32327
++Ref: option --homedir42337
++Ref: gpg-option --options45619
++Node: GPG Key related Options65121
++Node: GPG Input and Output68143
++Node: OpenPGP Options74074
++Node: Compliance Options79123
++Node: GPG Esoteric Options82615
++Ref: GPG Esoteric Options-Footnote-1104589
++Node: Deprecated Options104743
++Node: GPG Configuration106724
++Node: GPG Examples110662
++Node: Unattended Usage of GPG115005
++Node: Unattended GPG key generation115445
++Node: Specify a User ID124730
++Ref: how-to-specify-a-user-id124879
++Node: Copying129616
++Node: Option Index167145
++Node: Index208744
+
+End Tag Table
diff --cc doc/stamp-vti
index 8a61191,0000000..c96777a
mode 100644,000000..100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@@ -1,4 -1,0 +1,4 @@@
- @set UPDATED 19 December 2015
- @set UPDATED-MONTH December 2015
- @set EDITION 1.4.20
- @set VERSION 1.4.20
++ at set UPDATED 22 April 2016
++ at set UPDATED-MONTH April 2016
++ at set EDITION 1.4.21
++ at set VERSION 1.4.21
diff --cc doc/version.texi
index 8a61191,0000000..c96777a
mode 100644,000000..100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@@ -1,4 -1,0 +1,4 @@@
- @set UPDATED 19 December 2015
- @set UPDATED-MONTH December 2015
- @set EDITION 1.4.20
- @set VERSION 1.4.20
++ at set UPDATED 22 April 2016
++ at set UPDATED-MONTH April 2016
++ at set EDITION 1.4.21
++ at set VERSION 1.4.21
diff --cc gnupg.spec
index 92fcde5,0000000..9a6b2b9
mode 100644,000000..100644
--- a/gnupg.spec
+++ b/gnupg.spec
@@@ -1,211 -1,0 +1,211 @@@
+# -*- coding: utf-8 -*-
+# gnupg -- gnu privacy guard
+# This is a template. The dist target uses it to create the real file.
+#
- %define version 1.4.20
++%define version 1.4.21
+%define name gnupg
+Summary: GNU Utility for data encryption and digital signatures
+Summary(it): Utility GNU per la sicurezza nelle comunicazioni e nell'archiviazione dei dati.
+Summary(cs): GNU nástroj pro ¹ifrovanou komunikaci a bezpeèné ukládání dat
+Summary(fr): Utilitaire GNU de chiffrement et d'authentification des communications et des données
+Summary(pl): Narzêdzie GNU do szyfrowania i podpisywania danych
+Vendor: GNU Privacy Guard Project
+Name: %{name}
+Version: %{version}
+Release: 1
+Copyright: GPL
+Group: Applications/Cryptography
+Group(cs): Aplikace/©ifrování
+Group(fr): Applications/Cryptographie
+Group(it): Applicazioni/Crittografia
+Source: ftp://ftp.gnupg.org/gcrypt/gnupg/%{name}-%{version}.tar.gz
+URL: http://www.gnupg.org/
+Provides: gpg openpgp
+Requires(post,preun): /sbin/install-info
+BuildRoot: %{_tmppath}/rpmbuild_%{name}-%{version}
+
+%changelog
+* Sun Aug 21 2005 David Shaw <dshaw at jabberwocky.com>
+- Distribute gpg-zip.
+
+* Fri Apr 22 2005 David Shaw <dshaw at jabberwocky.com>
+- No longer any need to override libexecdir. The makefiles now
+ calculate this correctly internally.
+
+* Wed Feb 16 2005 David Shaw <dshaw at jabberwocky.com>
+- Fix problem with storing the gpgkeys helpers in libexec, but calling
+ them in libexec/gnupg.
+
+* Wed Jul 30 2003 David Shaw <dshaw at jabberwocky.com>
+- Rework much of the spec to use %-macros throughout.
+- Fix to work properly with RPM 4.1 (all files in buildroot must be packaged)
+- Package and install info files.
+- Tweak the English description.
+- There is no need to install gpgv and gpgsplit setuid root.
+
+* Sat Nov 30 2002 David Shaw <dshaw at jabberwocky.com>
+- Add convert-from-106 script
+
+* Sat Oct 26 2002 David Shaw <dshaw at jabberwocky.com>
+- Use new path for keyserver helpers.
+- /usr/lib is no longer used for cipher/hash plugins.
+- Include gpgv, gpgsplit, and the new gnupg.7 man page.
+
+* Fri Apr 19 2002 David Shaw <dshaw at jabberwocky.com>
+- Removed OPTIONS and pubring.asc - no longer used
+- Added doc/samplekeys.asc
+
+* Sun Mar 31 2002 David Shaw <dshaw at jabberwocky.com>
+- Added the gpgkeys_xxx keyserver helpers.
+- Added a * to catch variations on the basic gpg man page (gpg, gpgv).
+- Mark options.skel as a config file.
+- Do not include the FAQ/faq.html twice (in /doc/ and /share/).
+
+* Wed Sep 06 2000 Fabio Coatti <cova at ferrara.linux.it>
+- Added Polish description and summary (Kindly provided by
+ Lukasz Stelmach <stelmacl at ee.pw.edu.pl>)
+
+* Thu Jul 13 2000 Fabio Coatti <cova at ferrara.linux.it>
+- Added a * to catch all formats for man pages (plain, gz, bz2...)
+
+* Mon May 01 2000 Fabio Coatti <cova at ferrara.linux.it>
+- Some corrections in French description, thanks to Gaël Quéri
+ <gqueri at mail.dotcom.fr>; Some corrections to Italian descriptions.
+
+* Tue Apr 25 2000 Fabio Coatti <cova at ferrara.linux.it>
+- Removed the no longer needed patch for man page by Keith Owens
+
+* Wed Mar 1 2000 Petr Kri¹tof <Petr at Kristof.CZ>
+- Czech descriptions added; some fixes and updates.
+
+* Sat Jan 15 2000 Keith Owens <kaos at ocs.com.au>
+- Add missing man page as separate patch instead of updating the tar file.
+
+* Mon Dec 27 1999 Fabio Coatti <cova at ferrara.linux.it>
+- Upgraded for 1.0.1 (added missing gpg.1 man page)
+
+* Sat May 29 1999 Fabio Coatti <cova at ferrara.linux.it>
+- Some corrections in French description, thanks to Gaël Quéri <gqueri at mail.dotcom.fr>
+
+* Mon May 17 1999 Fabio Coatti <cova at felix.unife.it>
+- Added French description, provided by
+ Christophe Labouisse <labouiss at cybercable.fr>
+
+* Thu May 06 1999 Fabio Coatti <cova at felix.unife.it>
+- Upgraded for 0.9.6 (removed gpgm)
+
+* Tue Jan 12 1999 Fabio Coatti <cova at felix.unife.it>
+- LINGUAS variable is now unset in configure to ensure that all languages will be built. (Thanks to Luca Olivetti <luca at luca.ddns.org>)
+
+* Sat Jan 02 1999 Fabio Coatti <cova at felix.unife.it>
+- Added pl language file.
+- Included g10/pubring.asc in documentation files.
+
+* Sat Dec 19 1998 Fabio Coatti <cova at felix.unife.it>
+- Modified the spec file provided by Caskey L. Dickson <caskey-at-technocage.com>
+- Now it can be built also by non-root. Installation has to be done as
+ root, gpg is suid.
+- Added some changes by Ross Golder <rossigee at bigfoot.com>
+- Updates for version 0.4.5 of GnuPG (.mo files)
+
+%description
+
+GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and
+creating digital signatures. GnuPG has advanced key management
+capabilities and is compliant with the proposed OpenPGP Internet
+standard described in RFC-2440. Since GnuPG doesn't use any patented
+algorithms, it is not compatible with some versions of PGP 2 which use
+only the patented IDEA algorithm. See
+http://www.gnupg.org/why-not-idea.html for information on using IDEA
+if the patent does not apply to you and you need to be compatible with
+these versions of PGP 2.
+
+%description -l it
+GnuPG (GNU Privacy Guard) è una utility GNU per la cifratura di dati e
+la creazione di firme digitali. Possiede una gestione avanzata delle
+chiavi ed è conforme allo standard Internet OpenPGP, descritto nella
+RFC 2440. Non utilizzando algoritmi brevettati, non è compatibile con
+PGP2 (PGP2.x usa solo IDEA, coperto da brevetto mondiale, ed RSA,
+brevettato negli USA con scadenza 20/09/2000). Questi algoritmi sono
+utilizzabili da GnuPG tramite moduli esterni.
+
+%description -l fr
+GnuPG est un utilitaire GNU destiné à chiffrer des données et à créer
+des signatures électroniques. Il a des capacités avancées de gestion de
+clés et il est conforme à la norme proposée OpenPGP décrite dans la
+RFC2440. Comme GnuPG n'utilise pas d'algorithme breveté, il n'est
+compatible avec aucune version de PGP2 (PGP2.x ne sait utiliser que
+l'IDEA breveté dans le monde entier et RSA, breveté aux États-Unis
+jusqu'au 20 septembre 2000).
+
+%description -l cs
+GnuPG je GNU nástroj pro bezpeènou komunikaci a ukládání dat. Mù¾e být
+pou¾it na ¹ifrování dat a vytváøení digitálních podpisù. Obsahuje
+funkce pro pokroèilou správu klíèù a vyhovuje navrhovanému OpenPGP
+Internet standardu podle RFC2440. Byl vytvoøen jako kompletní
+náhrada za PGP. Proto¾e neobsahuje ¹ifrovací algoritmy IDEA nebo RSA,
+mù¾e být pou¾íván bez omezení.
+Proto¾e GnuPG nepou¾ívá ¾ádný patentovaný algoritmus, nemù¾e být úplnì
+kompatibilní s PGP verze 2. PGP 2.x pou¾ívá algoritmy IDEA (patentováno
+celosvìtovì) a RSA (patentováno ve Spojených státech do 20. záøí
+2000). Tyto algoritmy lze zavést do GnuPG pomocí externích modulù.
+
+%description -l pl
+GnuPG (GNU Privacy Guard) jest narzędziem do szyfrowania danych i tworzenia
+cyfrowych podpisów. GnuPG posiada zaawansowane możliwości obsługi kluczy
+i jest zgodne z proponowanym standardem internetowym OpenPGP, opisanym
+w RFC2440. Ponieważ GnuPG nie używa żadnych opatentowanych algorytmów,
+nie jest zgodne z jakąkolwiek wersją PGP2 (PGP2.x korzysta jedynie
+z algorytmów: IDEA, opatentowanego na calym świecie oraz RSA, którego
+patent na terenie Stanów Zjednoczonych wygasa 20. września 2000).
+
+%prep
+rm -rf $RPM_BUILD_ROOT
+
+%setup
+
+%build
+if test -n "$LINGUAS"; then
+ unset LINGUAS
+fi
+%configure --program-prefix=%{?_program_prefix:%{_program_prefix}}
+make
+
+%install
+%makeinstall
+%find_lang %{name}
+rm %{buildroot}%{_datadir}/%{name}/FAQ
+rm %{buildroot}%{_datadir}/%{name}/faq.html
+rm -f %{buildroot}%{_infodir}/dir
+
+%files -f %{name}.lang
+%defattr (-,root,root)
+
+%doc INSTALL AUTHORS COPYING NEWS README THANKS TODO PROJECTS doc/DETAILS
+%doc doc/FAQ doc/faq.html doc/HACKING doc/OpenPGP doc/samplekeys.asc
+%doc %attr (0755,root,root) tools/convert-from-106
+%config %{_datadir}/%{name}/options.skel
+%{_mandir}/man1/*
+%{_mandir}/man7/*
+%{_infodir}/gnupg1.info*
+%attr (4755,root,root) %{_bindir}/gpg
+%attr (0755,root,root) %{_bindir}/gpgv
+%attr (0755,root,root) %{_bindir}/gpgsplit
+%attr (0755,root,root) %{_bindir}/gpg-zip
+%attr (0755,root,root) %{_libexecdir}/gnupg/*
+
+%post
+/sbin/install-info %{_infodir}/gpg.info %{_infodir}/dir 2>/dev/null || :
+/sbin/install-info %{_infodir}/gpgv.info %{_infodir}/dir 2>/dev/null || :
+
+%preun
+if [ $1 = 0 ]; then
+ /sbin/install-info --delete %{_infodir}/gpg.info \
+ %{_infodir}/dir 2>/dev/null || :
+ /sbin/install-info --delete %{_infodir}/gpgv.info \
+ %{_infodir}/dir 2>/dev/null || :
+fi
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_DIR/%{name}-%{version}
diff --cc intl/Makefile.in
index 2c93126,2c93126..0000000
deleted file mode 100644,100644
--- a/intl/Makefile.in
+++ /dev/null
@@@ -1,662 -1,662 +1,0 @@@
--# Makefile for directory with message catalog handling library of GNU gettext
--# Copyright (C) 1995-1998, 2000-2007, 2009-2012 Free Software Foundation, Inc.
--#
--# This program is free software: you can redistribute it and/or modify
--# it under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
--#
--# You should have received a copy of the GNU Lesser General Public License
--# along with this program. If not, see <http://www.gnu.org/licenses/>.
--
--PACKAGE = @PACKAGE@
--VERSION = @VERSION@
--
--SHELL = @SHELL@
--
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
--top_builddir = ..
--
--# The VPATH variables allows builds with $builddir != $srcdir, assuming a
--# 'make' program that supports VPATH (such as GNU make). This line is removed
--# by autoconf automatically when "$(srcdir)" = ".".
--# In this directory, the VPATH handling is particular:
--# 1. If INTL_LIBTOOL_SUFFIX_PREFIX is 'l' (indicating a build with libtool),
--# the .c -> .lo rules carefully use $(srcdir), so that VPATH can be omitted.
--# 2. If PACKAGE = gettext-tools, VPATH _must_ be omitted, because otherwise
--# 'make' does the wrong thing if GNU gettext was configured with
--# "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la
--# files it finds in srcdir = ../../gettext-runtime/intl.
--VPATH = $(srcdir)
--
--prefix = @prefix@
--exec_prefix = @exec_prefix@
--transform = @program_transform_name@
--libdir = @libdir@
--includedir = @includedir@
--datarootdir = @datarootdir@
--datadir = @datadir@
--localedir = $(datadir)/locale
--gettextsrcdir = $(datadir)/gettext/intl
--aliaspath = $(localedir)
--subdir = intl
--
--INSTALL = @INSTALL@
--INSTALL_DATA = @INSTALL_DATA@
--
--# We use $(mkdir_p).
--# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
--# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
--# @install_sh@ does not start with $(SHELL), so we add it.
--# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
--# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
--# versions, $(mkinstalldirs) and $(install_sh) are unused.
--mkinstalldirs = $(SHELL) @install_sh@ -d
--install_sh = $(SHELL) @install_sh@
--MKDIR_P = @MKDIR_P@
--mkdir_p = @mkdir_p@
--
--l = @INTL_LIBTOOL_SUFFIX_PREFIX@
--
--AR = ar
--CC = @CC@
--LIBTOOL = @LIBTOOL@
--RANLIB = @RANLIB@
--YACC = @INTLBISON@ -y -d
--YFLAGS = --name-prefix=__gettext
--# Windows resource compiler (windres). Used when libtool is not used.
--WINDRES = @WINDRES@
--# Windows resource compiler (windres). Used via libtool.
--RC = @RC@
--
--# Support for silent-rules.
--AM_V_at = $(am__v_at_$(V))
--am__v_at_ = $(am__v_at_ at INTL_DEFAULT_VERBOSITY@)
--am__v_at_0 = @
--AM_V_AR = $(am__v_AR_$(V))
--am__v_AR_ = $(am__v_AR_ at INTL_DEFAULT_VERBOSITY@)
--am__v_AR_0 = @echo " AR " $@;
--AM_V_CC = $(am__v_CC_$(V))
--am__v_CC_ = $(am__v_CC_ at INTL_DEFAULT_VERBOSITY@)
--am__v_CC_0 = @echo " CC " $@;
--AM_V_GEN = $(am__v_GEN_$(V))
--am__v_GEN_ = $(am__v_GEN_ at INTL_DEFAULT_VERBOSITY@)
--am__v_GEN_0 = @echo " GEN " $@;
--AM_V_YACC = $(am__v_YACC_$(V))
--am__v_YACC_ = $(am__v_YACC_ at INTL_DEFAULT_VERBOSITY@)
--am__v_YACC_0 = @echo " YACC " $@;
--AM_V_lt = $(am__v_lt_$(V))
--am__v_lt_ = $(am__v_lt_ at INTL_DEFAULT_VERBOSITY@)
--am__v_lt_0 = --silent
--
--# -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro.
--# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
--DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
---DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL \
---DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
---Dset_relocation_prefix=libintl_set_relocation_prefix \
---Drelocate=libintl_relocate \
---DDEPENDS_ON_LIBICONV=1 @DEFS@
--CPPFLAGS = @CPPFLAGS@
--CFLAGS = @CFLAGS@ @CFLAG_VISIBILITY@
--LDFLAGS = @LDFLAGS@ $(LDFLAGS_ at WOE32DLL@)
--LDFLAGS_yes = -Wl,--export-all-symbols
--LDFLAGS_no =
--LIBS = @LIBS@
--
--COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
--
--HEADERS = \
-- gmo.h \
-- gettextP.h \
-- hash-string.h \
-- loadinfo.h \
-- plural-exp.h \
-- eval-plural.h \
-- localcharset.h \
-- lock.h \
-- relocatable.h \
-- tsearch.h tsearch.c \
-- verify.h \
-- xsize.h \
-- printf-args.h printf-args.c \
-- printf-parse.h wprintf-parse.h printf-parse.c \
-- vasnprintf.h vasnwprintf.h vasnprintf.c \
-- os2compat.h \
-- libgnuintl.in.h
--SOURCES = \
-- bindtextdom.c \
-- dcgettext.c \
-- dgettext.c \
-- gettext.c \
-- finddomain.c \
-- hash-string.c \
-- loadmsgcat.c \
-- localealias.c \
-- textdomain.c \
-- l10nflist.c \
-- explodename.c \
-- dcigettext.c \
-- dcngettext.c \
-- dngettext.c \
-- ngettext.c \
-- plural.y \
-- plural-exp.c \
-- localcharset.c \
-- threadlib.c \
-- lock.c \
-- relocatable.c \
-- langprefs.c \
-- localename.c \
-- log.c \
-- printf.c \
-- setlocale.c \
-- version.c \
-- xsize.c \
-- osdep.c \
-- os2compat.c \
-- intl-exports.c \
-- intl-compat.c
--OBJECTS = \
-- bindtextdom.$lo \
-- dcgettext.$lo \
-- dgettext.$lo \
-- gettext.$lo \
-- finddomain.$lo \
-- hash-string.$lo \
-- loadmsgcat.$lo \
-- localealias.$lo \
-- textdomain.$lo \
-- l10nflist.$lo \
-- explodename.$lo \
-- dcigettext.$lo \
-- dcngettext.$lo \
-- dngettext.$lo \
-- ngettext.$lo \
-- plural.$lo \
-- plural-exp.$lo \
-- localcharset.$lo \
-- threadlib.$lo \
-- lock.$lo \
-- relocatable.$lo \
-- langprefs.$lo \
-- localename.$lo \
-- log.$lo \
-- printf.$lo \
-- setlocale.$lo \
-- version.$lo \
-- xsize.$lo \
-- osdep.$lo \
-- intl-compat.$lo
--OBJECTS_RES_yes = libintl.res.$lo
--OBJECTS_RES_no =
--DISTFILES.common = Makefile.in \
--config.charset locale.alias ref-add.sin ref-del.sin export.h libintl.rc \
--$(HEADERS) $(SOURCES)
--DISTFILES.generated = plural.c
--DISTFILES.normal = VERSION
--DISTFILES.gettext = ChangeLog COPYING.LIB libintl.glibc README.woe32
--DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
--COPYING.LIB-2 COPYING.LIB-2.0 COPYING.LIB-2.1 \
--gettext.h libgettext.h plural-eval.c libgnuintl.h \
--libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \
--libgnuintl.h.msvc-shared Makefile.msvc
--
--all: all- at USE_INCLUDED_LIBINTL@
--all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
--all-no: all-no- at BUILD_INCLUDED_LIBINTL@
--all-no-yes: libgnuintl.$la
--all-no-no:
--
--libintl.a libgnuintl.a: $(OBJECTS)
-- $(AM_V_at)rm -f $@
-- $(AM_V_AR)$(AR) cru $@ $(OBJECTS)
-- $(AM_V_at)$(RANLIB) $@
--
--libintl.la libgnuintl.la: $(OBJECTS) $(OBJECTS_RES_ at WOE32@)
-- $(AM_V_GEN)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=link \
-- $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-- $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) @LTLIBTHREAD@ @LTLIBC@ \
-- $(OBJECTS_RES_ at WOE32@) \
-- -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
-- -rpath $(libdir) \
-- -no-undefined
--
--# Libtool's library version information for libintl.
--# Before making a gettext release, the gettext maintainer must change this
--# according to the libtool documentation, section "Library interface versions".
--# Maintainers of other packages that include the intl directory must *not*
--# change these values.
--LTV_CURRENT=9
--LTV_REVISION=2
--LTV_AGE=1
--
--.SUFFIXES:
--.SUFFIXES: .c .y .o .lo .sin .sed
--
--.c.o:
-- $(AM_V_CC)$(COMPILE) $<
--
--.y.c:
-- $(AM_V_YACC)$(YACC) $(YFLAGS) --output $@ $<
-- $(AM_V_at)rm -f $*.h
--
--bindtextdom.lo: $(srcdir)/bindtextdom.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
--dcgettext.lo: $(srcdir)/dcgettext.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
--dgettext.lo: $(srcdir)/dgettext.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dgettext.c
--gettext.lo: $(srcdir)/gettext.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/gettext.c
--finddomain.lo: $(srcdir)/finddomain.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/finddomain.c
--hash-string.lo: $(srcdir)/hash-string.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/hash-string.c
--loadmsgcat.lo: $(srcdir)/loadmsgcat.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
--localealias.lo: $(srcdir)/localealias.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/localealias.c
--textdomain.lo: $(srcdir)/textdomain.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/textdomain.c
--l10nflist.lo: $(srcdir)/l10nflist.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
--explodename.lo: $(srcdir)/explodename.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/explodename.c
--dcigettext.lo: $(srcdir)/dcigettext.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
--dcngettext.lo: $(srcdir)/dcngettext.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
--dngettext.lo: $(srcdir)/dngettext.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/dngettext.c
--ngettext.lo: $(srcdir)/ngettext.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/ngettext.c
--plural.lo: $(srcdir)/plural.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/plural.c
--plural-exp.lo: $(srcdir)/plural-exp.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
--localcharset.lo: $(srcdir)/localcharset.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/localcharset.c
--threadlib.lo: $(srcdir)/threadlib.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/threadlib.c
--lock.lo: $(srcdir)/lock.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/lock.c
--relocatable.lo: $(srcdir)/relocatable.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/relocatable.c
--langprefs.lo: $(srcdir)/langprefs.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/langprefs.c
--localename.lo: $(srcdir)/localename.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/localename.c
--log.lo: $(srcdir)/log.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/log.c
--printf.lo: $(srcdir)/printf.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/printf.c
--setlocale.lo: $(srcdir)/setlocale.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/setlocale.c
--version.lo: $(srcdir)/version.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/version.c
--xsize.lo: $(srcdir)/xsize.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/xsize.c
--osdep.lo: $(srcdir)/osdep.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/osdep.c
--intl-compat.lo: $(srcdir)/intl-compat.c
-- $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
--
--# This rule is executed only on Woe32 systems.
--# The following sed expressions come from the windres-options script. They are
--# inlined here, so that they can be written in a Makefile without requiring a
--# temporary file. They must contain literal newlines rather than semicolons,
--# so that they work with the sed-3.02 that is shipped with MSYS.
--libintl.res.o: $(srcdir)/libintl.rc
-- nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
-- sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
-- sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
-- sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
-- $(WINDRES) \
-- "-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \
-- "-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \
-- "-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_minor"` \
-- "-DPACKAGE_VERSION_SUBMINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_subminor"` \
-- -i $(srcdir)/libintl.rc -o libintl.res.o --output-format=coff
--libintl.res.lo: $(srcdir)/libintl.rc
-- nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
-- sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
-- sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
-- sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
-- $(LIBTOOL) --mode=compile --tag=RC $(RC) \
-- "-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \
-- "-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \
-- "-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_minor"` \
-- "-DPACKAGE_VERSION_SUBMINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_subminor"` \
-- -i $(srcdir)/libintl.rc -o libintl.res.lo --output-format=coff
--
--ref-add.sed: $(srcdir)/ref-add.sin
-- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
-- mv t-ref-add.sed ref-add.sed
--ref-del.sed: $(srcdir)/ref-del.sin
-- sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
-- mv t-ref-del.sed ref-del.sed
--
--INCLUDES = -I. -I$(srcdir) -I..
--
--libgnuintl.h: $(srcdir)/libgnuintl.in.h
-- sed -e '/IN_LIBGLOCALE/d' \
-- -e 's,@''HAVE_POSIX_PRINTF''@, at HAVE_POSIX_PRINTF@,g' \
-- -e 's,@''HAVE_ASPRINTF''@, at HAVE_ASPRINTF@,g' \
-- -e 's,@''HAVE_NEWLOCALE''@, at HAVE_NEWLOCALE@,g' \
-- -e 's,@''HAVE_SNPRINTF''@, at HAVE_SNPRINTF@,g' \
-- -e 's,@''HAVE_WPRINTF''@, at HAVE_WPRINTF@,g' \
-- < $(srcdir)/libgnuintl.in.h \
-- | if test '@WOE32DLL@' = yes; then \
-- sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \
-- else \
-- cat; \
-- fi \
-- | sed -e 's/extern \([^"]\)/extern LIBINTL_DLL_EXPORTED \1/' \
-- -e "/#define _LIBINTL_H/r $(srcdir)/export.h" \
-- | sed -e 's,@''HAVE_VISIBILITY''@, at HAVE_VISIBILITY@,g' \
-- > libgnuintl.h
--
--libintl.h: $(srcdir)/libgnuintl.in.h
-- sed -e '/IN_LIBGLOCALE/d' \
-- -e 's,@''HAVE_POSIX_PRINTF''@, at HAVE_POSIX_PRINTF@,g' \
-- -e 's,@''HAVE_ASPRINTF''@, at HAVE_ASPRINTF@,g' \
-- -e 's,@''HAVE_NEWLOCALE''@, at HAVE_NEWLOCALE@,g' \
-- -e 's,@''HAVE_SNPRINTF''@, at HAVE_SNPRINTF@,g' \
-- -e 's,@''HAVE_WPRINTF''@, at HAVE_WPRINTF@,g' \
-- < $(srcdir)/libgnuintl.in.h > libintl.h
--
--charset.alias: $(srcdir)/config.charset
-- $(SHELL) $(srcdir)/config.charset '@host@' > t-$@
-- mv t-$@ $@
--
--check: all
--
--# We must not install the libintl.h/libintl.a files if we are on a
--# system which has the GNU gettext() function in its C library or in a
--# separate library.
--# If you want to use the one which comes with this version of the
--# package, you have to use "configure --with-included-gettext".
--install: install-exec install-data
--install-exec: all
-- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-- && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-- $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-- $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
-- $(LIBTOOL) --mode=install \
-- $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
-- if test "@RELOCATABLE@" = yes; then \
-- dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
-- if test -n "$$dependencies"; then \
-- rm -f $(DESTDIR)$(libdir)/libintl.la; \
-- fi; \
-- fi; \
-- else \
-- : ; \
-- fi
-- if test "$(PACKAGE)" = "gettext-tools" \
-- && test '@USE_INCLUDED_LIBINTL@' = no \
-- && test @GLIBC2@ != no; then \
-- $(mkdir_p) $(DESTDIR)$(libdir); \
-- $(LIBTOOL) --mode=install \
-- $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
-- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-- $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-- $(LIBTOOL) --mode=uninstall \
-- rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
-- else \
-- : ; \
-- fi
-- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-- if test @GLIBC21@ = no; then \
-- case '@host_os@' in \
-- darwin[56]*) \
-- need_charset_alias=true ;; \
-- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-- need_charset_alias=false ;; \
-- *) \
-- need_charset_alias=true ;; \
-- esac; \
-- else \
-- need_charset_alias=false; \
-- fi; \
-- if $$need_charset_alias; then \
-- $(mkdir_p) $(DESTDIR)$(libdir); \
-- fi; \
-- temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-- dest=$(DESTDIR)$(libdir)/charset.alias; \
-- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-- orig=$(DESTDIR)$(libdir)/charset.alias; \
-- sed -f ref-add.sed $$orig > $$temp; \
-- $(INSTALL_DATA) $$temp $$dest; \
-- rm -f $$temp; \
-- else \
-- if $$need_charset_alias; then \
-- orig=charset.alias; \
-- sed -f ref-add.sed $$orig > $$temp; \
-- $(INSTALL_DATA) $$temp $$dest; \
-- rm -f $$temp; \
-- fi; \
-- fi; \
-- $(mkdir_p) $(DESTDIR)$(localedir); \
-- test -f $(DESTDIR)$(localedir)/locale.alias \
-- && orig=$(DESTDIR)$(localedir)/locale.alias \
-- || orig=$(srcdir)/locale.alias; \
-- temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-- dest=$(DESTDIR)$(localedir)/locale.alias; \
-- sed -f ref-add.sed $$orig > $$temp; \
-- $(INSTALL_DATA) $$temp $$dest; \
-- rm -f $$temp; \
-- else \
-- : ; \
-- fi
--install-data: all
-- if test "$(PACKAGE)" = "gettext-tools"; then \
-- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-- $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-- dists="COPYING.LIB $(DISTFILES.common)"; \
-- for file in $$dists; do \
-- $(INSTALL_DATA) $(srcdir)/$$file \
-- $(DESTDIR)$(gettextsrcdir)/$$file; \
-- done; \
-- chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \
-- dists="$(DISTFILES.generated)"; \
-- for file in $$dists; do \
-- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-- $(INSTALL_DATA) $$dir/$$file \
-- $(DESTDIR)$(gettextsrcdir)/$$file; \
-- done; \
-- dists="$(DISTFILES.obsolete)"; \
-- for file in $$dists; do \
-- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-- done; \
-- else \
-- : ; \
-- fi
--
--install-strip: install
--
--install-dvi install-html install-info install-ps install-pdf:
--
--installdirs:
-- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-- && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-- $(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
-- else \
-- : ; \
-- fi
-- if test "$(PACKAGE)" = "gettext-tools" \
-- && test '@USE_INCLUDED_LIBINTL@' = no \
-- && test @GLIBC2@ != no; then \
-- $(mkdir_p) $(DESTDIR)$(libdir); \
-- else \
-- : ; \
-- fi
-- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-- if test @GLIBC21@ = no; then \
-- case '@host_os@' in \
-- darwin[56]*) \
-- need_charset_alias=true ;; \
-- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-- need_charset_alias=false ;; \
-- *) \
-- need_charset_alias=true ;; \
-- esac; \
-- else \
-- need_charset_alias=false; \
-- fi; \
-- if $$need_charset_alias; then \
-- $(mkdir_p) $(DESTDIR)$(libdir); \
-- fi; \
-- $(mkdir_p) $(DESTDIR)$(localedir); \
-- else \
-- : ; \
-- fi
-- if test "$(PACKAGE)" = "gettext-tools"; then \
-- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-- else \
-- : ; \
-- fi
--
--# Define this as empty until I found a useful application.
--installcheck:
--
--uninstall:
-- if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
-- && test '@USE_INCLUDED_LIBINTL@' = yes; then \
-- rm -f $(DESTDIR)$(includedir)/libintl.h; \
-- $(LIBTOOL) --mode=uninstall \
-- rm -f $(DESTDIR)$(libdir)/libintl.$la; \
-- else \
-- : ; \
-- fi
-- if test "$(PACKAGE)" = "gettext-tools" \
-- && test '@USE_INCLUDED_LIBINTL@' = no \
-- && test @GLIBC2@ != no; then \
-- rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
-- else \
-- : ; \
-- fi
-- if test '@USE_INCLUDED_LIBINTL@' = yes; then \
-- if test -f $(DESTDIR)$(libdir)/charset.alias; then \
-- temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-- dest=$(DESTDIR)$(libdir)/charset.alias; \
-- sed -f ref-del.sed $$dest > $$temp; \
-- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-- rm -f $$dest; \
-- else \
-- $(INSTALL_DATA) $$temp $$dest; \
-- fi; \
-- rm -f $$temp; \
-- fi; \
-- if test -f $(DESTDIR)$(localedir)/locale.alias; then \
-- temp=$(DESTDIR)$(localedir)/t-locale.alias; \
-- dest=$(DESTDIR)$(localedir)/locale.alias; \
-- sed -f ref-del.sed $$dest > $$temp; \
-- if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-- rm -f $$dest; \
-- else \
-- $(INSTALL_DATA) $$temp $$dest; \
-- fi; \
-- rm -f $$temp; \
-- fi; \
-- else \
-- : ; \
-- fi
-- if test "$(PACKAGE)" = "gettext-tools"; then \
-- for file in VERSION COPYING.LIB $(DISTFILES.common) $(DISTFILES.generated); do \
-- rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-- done; \
-- else \
-- : ; \
-- fi
--
--info dvi ps pdf html:
--
--$(OBJECTS): ../config.h libgnuintl.h
--bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo setlocale.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
--localename.$lo: $(srcdir)/gettextP.h
--hash-string.$lo dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
--explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
--dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
--dcigettext.$lo: $(srcdir)/eval-plural.h
--localcharset.$lo: $(srcdir)/localcharset.h
--bindtextdom.$lo dcigettext.$lo finddomain.$lo loadmsgcat.$lo localealias.$lo lock.$lo log.$lo: $(srcdir)/lock.h
--localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
--printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/xsize.c $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
--
--# A bison-2.1 generated plural.c includes <libintl.h> if ENABLE_NLS.
--PLURAL_DEPS_yes = libintl.h
--PLURAL_DEPS_no =
--plural.$lo: $(PLURAL_DEPS_ at USE_INCLUDED_LIBINTL@)
--
--tags: TAGS
--
--TAGS: $(HEADERS) $(SOURCES)
-- here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
--
--ctags: CTAGS
--
--CTAGS: $(HEADERS) $(SOURCES)
-- here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
--
--id: ID
--
--ID: $(HEADERS) $(SOURCES)
-- here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
--
--
--mostlyclean:
-- rm -f *.a *.la *.o *.obj *.lo core core.*
-- rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
-- rm -f -r .libs _libs
--
--clean: mostlyclean
--
--distclean: clean
-- rm -f Makefile ID TAGS
-- if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
-- rm -f $(DISTFILES.normal); \
-- else \
-- : ; \
-- fi
--
--maintainer-clean: distclean
-- @echo "This command is intended for maintainers to use;"
-- @echo "it deletes files that may require special tools to rebuild."
--
--
--# GNU gettext needs not contain the file 'VERSION' but contains some
--# other files which should not be distributed in other packages.
--distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
--dist distdir: Makefile
-- if test "$(PACKAGE)" = "gettext-tools"; then \
-- : ; \
-- else \
-- if test "$(PACKAGE)" = "gettext-runtime"; then \
-- additional="$(DISTFILES.gettext)"; \
-- else \
-- additional="$(DISTFILES.normal)"; \
-- fi; \
-- $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-- for file in $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-- if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-- cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
-- done; \
-- fi
--
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-- cd $(top_builddir) && $(SHELL) ./config.status
--# This would be more efficient, but doesn't work any more with autoconf-2.57,
--# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
--# cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
--
--# Tell versions [3.59,3.63) of GNU make not to export all variables.
--# Otherwise a system limit (for SysV at least) may be exceeded.
--.NOEXPORT:
diff --cc intl/plural.c
index aae1d09,aae1d09..0000000
deleted file mode 100644,100644
--- a/intl/plural.c
+++ /dev/null
@@@ -1,2015 -1,2015 +1,0 @@@
--/* A Bison parser, made by GNU Bison 2.7. */
--
--/* Bison implementation for Yacc-like parsers in C
--
-- Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 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/>. */
--
--/* As a special exception, you may create a larger work that contains
-- part or all of the Bison parser skeleton and distribute that work
-- under terms of your choice, so long as that work isn't itself a
-- parser generator using the skeleton or a modified version thereof
-- as a parser skeleton. Alternatively, if you modify or redistribute
-- the parser skeleton itself, you may (at your option) remove this
-- special exception, which will cause the skeleton and the resulting
-- Bison output files to be licensed under the GNU General Public
-- License without this special exception.
--
-- This special exception was added by the Free Software Foundation in
-- version 2.2 of Bison. */
--
--/* C LALR(1) parser skeleton written by Richard Stallman, by
-- simplifying the original so-called "semantic" parser. */
--
--/* All symbols defined below should begin with yy or YY, to avoid
-- infringing on user name space. This should be done even for local
-- variables, as they might otherwise be expanded by user macros.
-- There are some unavoidable exceptions within include files to
-- define necessary library symbols; they are noted "INFRINGES ON
-- USER NAME SPACE" below. */
--
--/* Identify Bison output. */
--#define YYBISON 1
--
--/* Bison version. */
--#define YYBISON_VERSION "2.7"
--
--/* Skeleton name. */
--#define YYSKELETON_NAME "yacc.c"
--
--/* Pure parsers. */
--#define YYPURE 2
--
--/* Push parsers. */
--#define YYPUSH 0
--
--/* Pull parsers. */
--#define YYPULL 1
--
--
--/* Substitute the variable and function names. */
--#define yyparse __gettextparse
--#define yylex __gettextlex
--#define yyerror __gettexterror
--#define yylval __gettextlval
--#define yychar __gettextchar
--#define yydebug __gettextdebug
--#define yynerrs __gettextnerrs
--
--/* Copy the first part of user declarations. */
--/* Line 371 of yacc.c */
--#line 1 "plural.y"
--
--/* Expression parsing for plural form selection.
-- Copyright (C) 2000-2001, 2003, 2005-2006 Free Software Foundation, Inc.
-- Written by Ulrich Drepper <drepper at cygnus.com>, 2000.
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU Lesser General Public License as published by
-- the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. */
--
--/* For bison < 2.0, the bison generated parser uses alloca. AIX 3 forces us
-- to put this declaration at the beginning of the file. The declaration in
-- bison's skeleton file comes too late. This must come before <config.h>
-- because <config.h> may include arbitrary system headers.
-- This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0. */
--#if defined _AIX && !defined __GNUC__
-- #pragma alloca
--#endif
--
--#ifdef HAVE_CONFIG_H
--# include <config.h>
--#endif
--
--#include <stddef.h>
--#include <stdlib.h>
--#include <string.h>
--#include "plural-exp.h"
--
--/* The main function generated by the parser is called __gettextparse,
-- but we want it to be called PLURAL_PARSE. */
--#ifndef _LIBC
--# define __gettextparse PLURAL_PARSE
--#endif
--
--
--/* Line 371 of yacc.c */
--#line 119 "plural.c"
--
--# ifndef YY_NULL
--# if defined __cplusplus && 201103L <= __cplusplus
--# define YY_NULL nullptr
--# else
--# define YY_NULL 0
--# endif
--# endif
--
--/* Enabling verbose error messages. */
--#ifdef YYERROR_VERBOSE
--# undef YYERROR_VERBOSE
--# define YYERROR_VERBOSE 1
--#else
--# define YYERROR_VERBOSE 0
--#endif
--
--/* In a future release of Bison, this section will be replaced
-- by #include "plural.h". */
--#ifndef YY__GETTEXT_PLURAL_H_INCLUDED
--# define YY__GETTEXT_PLURAL_H_INCLUDED
--/* Enabling traces. */
--#ifndef YYDEBUG
--# define YYDEBUG 0
--#endif
--#if YYDEBUG
--extern int __gettextdebug;
--#endif
--
--/* Tokens. */
--#ifndef YYTOKENTYPE
--# define YYTOKENTYPE
-- /* Put the tokens into the symbol table, so that GDB and other debuggers
-- know about them. */
-- enum yytokentype {
-- EQUOP2 = 258,
-- CMPOP2 = 259,
-- ADDOP2 = 260,
-- MULOP2 = 261,
-- NUMBER = 262
-- };
--#endif
--/* Tokens. */
--#define EQUOP2 258
--#define CMPOP2 259
--#define ADDOP2 260
--#define MULOP2 261
--#define NUMBER 262
--
--
--
--#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
--typedef union YYSTYPE
--{
--/* Line 387 of yacc.c */
--#line 49 "plural.y"
--
-- unsigned long int num;
-- enum expression_operator op;
-- struct expression *exp;
--
--
--/* Line 387 of yacc.c */
--#line 183 "plural.c"
--} YYSTYPE;
--# define YYSTYPE_IS_TRIVIAL 1
--# define yystype YYSTYPE /* obsolescent; will be withdrawn */
--# define YYSTYPE_IS_DECLARED 1
--#endif
--
--
--#ifdef YYPARSE_PARAM
--#if defined __STDC__ || defined __cplusplus
--int __gettextparse (void *YYPARSE_PARAM);
--#else
--int __gettextparse ();
--#endif
--#else /* ! YYPARSE_PARAM */
--#if defined __STDC__ || defined __cplusplus
--int __gettextparse (struct parse_args *arg);
--#else
--int __gettextparse ();
--#endif
--#endif /* ! YYPARSE_PARAM */
--
--#endif /* !YY__GETTEXT_PLURAL_H_INCLUDED */
--
--/* Copy the second part of user declarations. */
--/* Line 390 of yacc.c */
--#line 55 "plural.y"
--
--/* Prototypes for local functions. */
--static int yylex (YYSTYPE *lval, struct parse_args *arg);
--static void yyerror (struct parse_args *arg, const char *str);
--
--/* Allocation of expressions. */
--
--static struct expression *
--new_exp (int nargs, enum expression_operator op,
-- struct expression * const *args)
--{
-- int i;
-- struct expression *newp;
--
-- /* If any of the argument could not be malloc'ed, just return NULL. */
-- for (i = nargs - 1; i >= 0; i--)
-- if (args[i] == NULL)
-- goto fail;
--
-- /* Allocate a new expression. */
-- newp = (struct expression *) malloc (sizeof (*newp));
-- if (newp != NULL)
-- {
-- newp->nargs = nargs;
-- newp->operation = op;
-- for (i = nargs - 1; i >= 0; i--)
-- newp->val.args[i] = args[i];
-- return newp;
-- }
--
-- fail:
-- for (i = nargs - 1; i >= 0; i--)
-- FREE_EXPRESSION (args[i]);
--
-- return NULL;
--}
--
--static inline struct expression *
--new_exp_0 (enum expression_operator op)
--{
-- return new_exp (0, op, NULL);
--}
--
--static inline struct expression *
--new_exp_1 (enum expression_operator op, struct expression *right)
--{
-- struct expression *args[1];
--
-- args[0] = right;
-- return new_exp (1, op, args);
--}
--
--static struct expression *
--new_exp_2 (enum expression_operator op, struct expression *left,
-- struct expression *right)
--{
-- struct expression *args[2];
--
-- args[0] = left;
-- args[1] = right;
-- return new_exp (2, op, args);
--}
--
--static inline struct expression *
--new_exp_3 (enum expression_operator op, struct expression *bexp,
-- struct expression *tbranch, struct expression *fbranch)
--{
-- struct expression *args[3];
--
-- args[0] = bexp;
-- args[1] = tbranch;
-- args[2] = fbranch;
-- return new_exp (3, op, args);
--}
--
--
--/* Line 390 of yacc.c */
--#line 287 "plural.c"
--
--#ifdef short
--# undef short
--#endif
--
--#ifdef YYTYPE_UINT8
--typedef YYTYPE_UINT8 yytype_uint8;
--#else
--typedef unsigned char yytype_uint8;
--#endif
--
--#ifdef YYTYPE_INT8
--typedef YYTYPE_INT8 yytype_int8;
--#elif (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--typedef signed char yytype_int8;
--#else
--typedef short int yytype_int8;
--#endif
--
--#ifdef YYTYPE_UINT16
--typedef YYTYPE_UINT16 yytype_uint16;
--#else
--typedef unsigned short int yytype_uint16;
--#endif
--
--#ifdef YYTYPE_INT16
--typedef YYTYPE_INT16 yytype_int16;
--#else
--typedef short int yytype_int16;
--#endif
--
--#ifndef YYSIZE_T
--# ifdef __SIZE_TYPE__
--# define YYSIZE_T __SIZE_TYPE__
--# elif defined size_t
--# define YYSIZE_T size_t
--# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
--# define YYSIZE_T size_t
--# else
--# define YYSIZE_T unsigned int
--# endif
--#endif
--
--#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
--
--#ifndef YY_
--# if defined YYENABLE_NLS && YYENABLE_NLS
--# if ENABLE_NLS
--# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
--# define YY_(Msgid) dgettext ("bison-runtime", Msgid)
--# endif
--# endif
--# ifndef YY_
--# define YY_(Msgid) Msgid
--# endif
--#endif
--
--/* Suppress unused-variable warnings by "using" E. */
--#if ! defined lint || defined __GNUC__
--# define YYUSE(E) ((void) (E))
--#else
--# define YYUSE(E) /* empty */
--#endif
--
--/* Identity function, used to suppress warnings about constant conditions. */
--#ifndef lint
--# define YYID(N) (N)
--#else
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static int
--YYID (int yyi)
--#else
--static int
--YYID (yyi)
-- int yyi;
--#endif
--{
-- return yyi;
--}
--#endif
--
--#if ! defined yyoverflow || YYERROR_VERBOSE
--
--/* The parser invokes alloca or malloc; define the necessary symbols. */
--
--# ifdef YYSTACK_USE_ALLOCA
--# if YYSTACK_USE_ALLOCA
--# ifdef __GNUC__
--# define YYSTACK_ALLOC __builtin_alloca
--# elif defined __BUILTIN_VA_ARG_INCR
--# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
--# elif defined _AIX
--# define YYSTACK_ALLOC __alloca
--# elif defined _MSC_VER
--# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
--# define alloca _alloca
--# else
--# define YYSTACK_ALLOC alloca
--# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-- /* Use EXIT_SUCCESS as a witness for stdlib.h. */
--# ifndef EXIT_SUCCESS
--# define EXIT_SUCCESS 0
--# endif
--# endif
--# endif
--# endif
--# endif
--
--# ifdef YYSTACK_ALLOC
-- /* Pacify GCC's `empty if-body' warning. */
--# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
--# ifndef YYSTACK_ALLOC_MAXIMUM
-- /* The OS might guarantee only one guard page at the bottom of the stack,
-- and a page size can be as small as 4096 bytes. So we cannot safely
-- invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
-- to allow for a few compiler-allocated temporary stack slots. */
--# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
--# endif
--# else
--# define YYSTACK_ALLOC YYMALLOC
--# define YYSTACK_FREE YYFREE
--# ifndef YYSTACK_ALLOC_MAXIMUM
--# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
--# endif
--# if (defined __cplusplus && ! defined EXIT_SUCCESS \
-- && ! ((defined YYMALLOC || defined malloc) \
-- && (defined YYFREE || defined free)))
--# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
--# ifndef EXIT_SUCCESS
--# define EXIT_SUCCESS 0
--# endif
--# endif
--# ifndef YYMALLOC
--# define YYMALLOC malloc
--# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
--# endif
--# endif
--# ifndef YYFREE
--# define YYFREE free
--# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--void free (void *); /* INFRINGES ON USER NAME SPACE */
--# endif
--# endif
--# endif
--#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
--
--
--#if (! defined yyoverflow \
-- && (! defined __cplusplus \
-- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
--
--/* A type that is properly aligned for any stack member. */
--union yyalloc
--{
-- yytype_int16 yyss_alloc;
-- YYSTYPE yyvs_alloc;
--};
--
--/* The size of the maximum gap between one aligned stack and the next. */
--# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
--
--/* The size of an array large to enough to hold all stacks, each with
-- N elements. */
--# define YYSTACK_BYTES(N) \
-- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-- + YYSTACK_GAP_MAXIMUM)
--
--# define YYCOPY_NEEDED 1
--
--/* Relocate STACK from its old location to the new one. The
-- local variables YYSIZE and YYSTACKSIZE give the old and new number of
-- elements in the stack, and YYPTR gives the new location of the
-- stack. Advance YYPTR to a properly aligned location for the next
-- stack. */
--# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
-- do \
-- { \
-- YYSIZE_T yynewbytes; \
-- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
-- Stack = &yyptr->Stack_alloc; \
-- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-- yyptr += yynewbytes / sizeof (*yyptr); \
-- } \
-- while (YYID (0))
--
--#endif
--
--#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
--/* Copy COUNT objects from SRC to DST. The source and destination do
-- not overlap. */
--# ifndef YYCOPY
--# if defined __GNUC__ && 1 < __GNUC__
--# define YYCOPY(Dst, Src, Count) \
-- __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
--# else
--# define YYCOPY(Dst, Src, Count) \
-- do \
-- { \
-- YYSIZE_T yyi; \
-- for (yyi = 0; yyi < (Count); yyi++) \
-- (Dst)[yyi] = (Src)[yyi]; \
-- } \
-- while (YYID (0))
--# endif
--# endif
--#endif /* !YYCOPY_NEEDED */
--
--/* YYFINAL -- State number of the termination state. */
--#define YYFINAL 9
--/* YYLAST -- Last index in YYTABLE. */
--#define YYLAST 54
--
--/* YYNTOKENS -- Number of terminals. */
--#define YYNTOKENS 16
--/* YYNNTS -- Number of nonterminals. */
--#define YYNNTS 3
--/* YYNRULES -- Number of rules. */
--#define YYNRULES 13
--/* YYNRULES -- Number of states. */
--#define YYNSTATES 27
--
--/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
--#define YYUNDEFTOK 2
--#define YYMAXUTOK 262
--
--#define YYTRANSLATE(YYX) \
-- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
--
--/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
--static const yytype_uint8 yytranslate[] =
--{
-- 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 10, 2, 2, 2, 2, 5, 2,
-- 14, 15, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 12, 2,
-- 2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 13, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-- 2, 2, 2, 2, 2, 2, 1, 2, 6, 7,
-- 8, 9, 11
--};
--
--#if YYDEBUG
--/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-- YYRHS. */
--static const yytype_uint8 yyprhs[] =
--{
-- 0, 0, 3, 5, 11, 15, 19, 23, 27, 31,
-- 35, 38, 40, 42
--};
--
--/* YYRHS -- A `-1'-separated list of the rules' RHS. */
--static const yytype_int8 yyrhs[] =
--{
-- 17, 0, -1, 18, -1, 18, 3, 18, 12, 18,
-- -1, 18, 4, 18, -1, 18, 5, 18, -1, 18,
-- 6, 18, -1, 18, 7, 18, -1, 18, 8, 18,
-- -1, 18, 9, 18, -1, 10, 18, -1, 13, -1,
-- 11, -1, 14, 18, 15, -1
--};
--
--/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
--static const yytype_uint8 yyrline[] =
--{
-- 0, 152, 152, 160, 164, 168, 172, 176, 180, 184,
-- 188, 192, 196, 201
--};
--#endif
--
--#if YYDEBUG || YYERROR_VERBOSE || 0
--/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-- First, the terminals, then, starting at YYNTOKENS, nonterminals. */
--static const char *const yytname[] =
--{
-- "$end", "error", "$undefined", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
-- "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
-- "$accept", "start", "exp", YY_NULL
--};
--#endif
--
--# ifdef YYPRINT
--/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-- token YYLEX-NUM. */
--static const yytype_uint16 yytoknum[] =
--{
-- 0, 256, 257, 63, 124, 38, 258, 259, 260, 261,
-- 33, 262, 58, 110, 40, 41
--};
--# endif
--
--/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
--static const yytype_uint8 yyr1[] =
--{
-- 0, 16, 17, 18, 18, 18, 18, 18, 18, 18,
-- 18, 18, 18, 18
--};
--
--/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
--static const yytype_uint8 yyr2[] =
--{
-- 0, 2, 1, 5, 3, 3, 3, 3, 3, 3,
-- 2, 1, 1, 3
--};
--
--/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-- Performed when YYTABLE doesn't specify something else to do. Zero
-- means the default is an error. */
--static const yytype_uint8 yydefact[] =
--{
-- 0, 0, 12, 11, 0, 0, 2, 10, 0, 1,
-- 0, 0, 0, 0, 0, 0, 0, 13, 0, 4,
-- 5, 6, 7, 8, 9, 0, 3
--};
--
--/* YYDEFGOTO[NTERM-NUM]. */
--static const yytype_int8 yydefgoto[] =
--{
-- -1, 5, 6
--};
--
--/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-- STATE-NUM. */
--#define YYPACT_NINF -10
--static const yytype_int8 yypact[] =
--{
-- -9, -9, -10, -10, -9, 8, 36, -10, 13, -10,
-- -9, -9, -9, -9, -9, -9, -9, -10, 26, 41,
-- 45, 18, -2, 14, -10, -9, 36
--};
--
--/* YYPGOTO[NTERM-NUM]. */
--static const yytype_int8 yypgoto[] =
--{
-- -10, -10, -1
--};
--
--/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
-- positive, shift that token. If negative, reduce the rule which
-- number is the opposite. If YYTABLE_NINF, syntax error. */
--#define YYTABLE_NINF -1
--static const yytype_uint8 yytable[] =
--{
-- 7, 1, 2, 8, 3, 4, 15, 16, 9, 18,
-- 19, 20, 21, 22, 23, 24, 10, 11, 12, 13,
-- 14, 15, 16, 16, 26, 14, 15, 16, 17, 10,
-- 11, 12, 13, 14, 15, 16, 0, 0, 25, 10,
-- 11, 12, 13, 14, 15, 16, 12, 13, 14, 15,
-- 16, 13, 14, 15, 16
--};
--
--#define yypact_value_is_default(Yystate) \
-- (!!((Yystate) == (-10)))
--
--#define yytable_value_is_error(Yytable_value) \
-- YYID (0)
--
--static const yytype_int8 yycheck[] =
--{
-- 1, 10, 11, 4, 13, 14, 8, 9, 0, 10,
-- 11, 12, 13, 14, 15, 16, 3, 4, 5, 6,
-- 7, 8, 9, 9, 25, 7, 8, 9, 15, 3,
-- 4, 5, 6, 7, 8, 9, -1, -1, 12, 3,
-- 4, 5, 6, 7, 8, 9, 5, 6, 7, 8,
-- 9, 6, 7, 8, 9
--};
--
--/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-- symbol of state STATE-NUM. */
--static const yytype_uint8 yystos[] =
--{
-- 0, 10, 11, 13, 14, 17, 18, 18, 18, 0,
-- 3, 4, 5, 6, 7, 8, 9, 15, 18, 18,
-- 18, 18, 18, 18, 18, 12, 18
--};
--
--#define yyerrok (yyerrstatus = 0)
--#define yyclearin (yychar = YYEMPTY)
--#define YYEMPTY (-2)
--#define YYEOF 0
--
--#define YYACCEPT goto yyacceptlab
--#define YYABORT goto yyabortlab
--#define YYERROR goto yyerrorlab
--
--
--/* Like YYERROR except do call yyerror. This remains here temporarily
-- to ease the transition to the new meaning of YYERROR, for GCC.
-- Once GCC version 2 has supplanted version 1, this can go. However,
-- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
-- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-- discussed. */
--
--#define YYFAIL goto yyerrlab
--#if defined YYFAIL
-- /* This is here to suppress warnings from the GCC cpp's
-- -Wunused-macros. Normally we don't worry about that warning, but
-- some users do, and we want to make it easy for users to remove
-- YYFAIL uses, which will produce warnings from Bison 2.5. */
--#endif
--
--#define YYRECOVERING() (!!yyerrstatus)
--
--#define YYBACKUP(Token, Value) \
--do \
-- if (yychar == YYEMPTY) \
-- { \
-- yychar = (Token); \
-- yylval = (Value); \
-- YYPOPSTACK (yylen); \
-- yystate = *yyssp; \
-- goto yybackup; \
-- } \
-- else \
-- { \
-- yyerror (arg, YY_("syntax error: cannot back up")); \
-- YYERROR; \
-- } \
--while (YYID (0))
--
--/* Error token number */
--#define YYTERROR 1
--#define YYERRCODE 256
--
--
--/* This macro is provided for backward compatibility. */
--#ifndef YY_LOCATION_PRINT
--# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
--#endif
--
--
--/* YYLEX -- calling `yylex' with the right arguments. */
--#ifdef YYLEX_PARAM
--# define YYLEX yylex (&yylval, YYLEX_PARAM)
--#else
--# define YYLEX yylex (&yylval, arg)
--#endif
--
--/* Enable debugging if requested. */
--#if YYDEBUG
--
--# ifndef YYFPRINTF
--# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
--# define YYFPRINTF fprintf
--# endif
--
--# define YYDPRINTF(Args) \
--do { \
-- if (yydebug) \
-- YYFPRINTF Args; \
--} while (YYID (0))
--
--# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
--do { \
-- if (yydebug) \
-- { \
-- YYFPRINTF (stderr, "%s ", Title); \
-- yy_symbol_print (stderr, \
-- Type, Value, arg); \
-- YYFPRINTF (stderr, "\n"); \
-- } \
--} while (YYID (0))
--
--
--/*--------------------------------.
--| Print this symbol on YYOUTPUT. |
--`--------------------------------*/
--
--/*ARGSUSED*/
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static void
--yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parse_args *arg)
--#else
--static void
--yy_symbol_value_print (yyoutput, yytype, yyvaluep, arg)
-- FILE *yyoutput;
-- int yytype;
-- YYSTYPE const * const yyvaluep;
-- struct parse_args *arg;
--#endif
--{
-- FILE *yyo = yyoutput;
-- YYUSE (yyo);
-- if (!yyvaluep)
-- return;
-- YYUSE (arg);
--# ifdef YYPRINT
-- if (yytype < YYNTOKENS)
-- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
--# else
-- YYUSE (yyoutput);
--# endif
-- switch (yytype)
-- {
-- default:
-- break;
-- }
--}
--
--
--/*--------------------------------.
--| Print this symbol on YYOUTPUT. |
--`--------------------------------*/
--
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static void
--yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, struct parse_args *arg)
--#else
--static void
--yy_symbol_print (yyoutput, yytype, yyvaluep, arg)
-- FILE *yyoutput;
-- int yytype;
-- YYSTYPE const * const yyvaluep;
-- struct parse_args *arg;
--#endif
--{
-- if (yytype < YYNTOKENS)
-- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-- else
-- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
--
-- yy_symbol_value_print (yyoutput, yytype, yyvaluep, arg);
-- YYFPRINTF (yyoutput, ")");
--}
--
--/*------------------------------------------------------------------.
--| yy_stack_print -- Print the state stack from its BOTTOM up to its |
--| TOP (included). |
--`------------------------------------------------------------------*/
--
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static void
--yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
--#else
--static void
--yy_stack_print (yybottom, yytop)
-- yytype_int16 *yybottom;
-- yytype_int16 *yytop;
--#endif
--{
-- YYFPRINTF (stderr, "Stack now");
-- for (; yybottom <= yytop; yybottom++)
-- {
-- int yybot = *yybottom;
-- YYFPRINTF (stderr, " %d", yybot);
-- }
-- YYFPRINTF (stderr, "\n");
--}
--
--# define YY_STACK_PRINT(Bottom, Top) \
--do { \
-- if (yydebug) \
-- yy_stack_print ((Bottom), (Top)); \
--} while (YYID (0))
--
--
--/*------------------------------------------------.
--| Report that the YYRULE is going to be reduced. |
--`------------------------------------------------*/
--
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static void
--yy_reduce_print (YYSTYPE *yyvsp, int yyrule, struct parse_args *arg)
--#else
--static void
--yy_reduce_print (yyvsp, yyrule, arg)
-- YYSTYPE *yyvsp;
-- int yyrule;
-- struct parse_args *arg;
--#endif
--{
-- int yynrhs = yyr2[yyrule];
-- int yyi;
-- unsigned long int yylno = yyrline[yyrule];
-- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-- yyrule - 1, yylno);
-- /* The symbols being reduced. */
-- for (yyi = 0; yyi < yynrhs; yyi++)
-- {
-- YYFPRINTF (stderr, " $%d = ", yyi + 1);
-- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-- &(yyvsp[(yyi + 1) - (yynrhs)])
-- , arg);
-- YYFPRINTF (stderr, "\n");
-- }
--}
--
--# define YY_REDUCE_PRINT(Rule) \
--do { \
-- if (yydebug) \
-- yy_reduce_print (yyvsp, Rule, arg); \
--} while (YYID (0))
--
--/* Nonzero means print parse trace. It is left uninitialized so that
-- multiple parsers can coexist. */
--int yydebug;
--#else /* !YYDEBUG */
--# define YYDPRINTF(Args)
--# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
--# define YY_STACK_PRINT(Bottom, Top)
--# define YY_REDUCE_PRINT(Rule)
--#endif /* !YYDEBUG */
--
--
--/* YYINITDEPTH -- initial size of the parser's stacks. */
--#ifndef YYINITDEPTH
--# define YYINITDEPTH 200
--#endif
--
--/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-- if the built-in stack extension method is used).
--
-- Do not make this value too large; the results are undefined if
-- YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-- evaluated with infinite-precision integer arithmetic. */
--
--#ifndef YYMAXDEPTH
--# define YYMAXDEPTH 10000
--#endif
--
--
--#if YYERROR_VERBOSE
--
--# ifndef yystrlen
--# if defined __GLIBC__ && defined _STRING_H
--# define yystrlen strlen
--# else
--/* Return the length of YYSTR. */
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static YYSIZE_T
--yystrlen (const char *yystr)
--#else
--static YYSIZE_T
--yystrlen (yystr)
-- const char *yystr;
--#endif
--{
-- YYSIZE_T yylen;
-- for (yylen = 0; yystr[yylen]; yylen++)
-- continue;
-- return yylen;
--}
--# endif
--# endif
--
--# ifndef yystpcpy
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
--# define yystpcpy stpcpy
--# else
--/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-- YYDEST. */
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static char *
--yystpcpy (char *yydest, const char *yysrc)
--#else
--static char *
--yystpcpy (yydest, yysrc)
-- char *yydest;
-- const char *yysrc;
--#endif
--{
-- char *yyd = yydest;
-- const char *yys = yysrc;
--
-- while ((*yyd++ = *yys++) != '\0')
-- continue;
--
-- return yyd - 1;
--}
--# endif
--# endif
--
--# ifndef yytnamerr
--/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-- quotes and backslashes, so that it's suitable for yyerror. The
-- heuristic is that double-quoting is unnecessary unless the string
-- contains an apostrophe, a comma, or backslash (other than
-- backslash-backslash). YYSTR is taken from yytname. If YYRES is
-- null, do not copy; instead, return the length of what the result
-- would have been. */
--static YYSIZE_T
--yytnamerr (char *yyres, const char *yystr)
--{
-- if (*yystr == '"')
-- {
-- YYSIZE_T yyn = 0;
-- char const *yyp = yystr;
--
-- for (;;)
-- switch (*++yyp)
-- {
-- case '\'':
-- case ',':
-- goto do_not_strip_quotes;
--
-- case '\\':
-- if (*++yyp != '\\')
-- goto do_not_strip_quotes;
-- /* Fall through. */
-- default:
-- if (yyres)
-- yyres[yyn] = *yyp;
-- yyn++;
-- break;
--
-- case '"':
-- if (yyres)
-- yyres[yyn] = '\0';
-- return yyn;
-- }
-- do_not_strip_quotes: ;
-- }
--
-- if (! yyres)
-- return yystrlen (yystr);
--
-- return yystpcpy (yyres, yystr) - yyres;
--}
--# endif
--
--/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-- about the unexpected token YYTOKEN for the state stack whose top is
-- YYSSP.
--
-- Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
-- not large enough to hold the message. In that case, also set
-- *YYMSG_ALLOC to the required number of bytes. Return 2 if the
-- required number of bytes is too large to store. */
--static int
--yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-- yytype_int16 *yyssp, int yytoken)
--{
-- YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
-- YYSIZE_T yysize = yysize0;
-- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-- /* Internationalized format string. */
-- const char *yyformat = YY_NULL;
-- /* Arguments of yyformat. */
-- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-- /* Number of reported tokens (one for the "unexpected", one per
-- "expected"). */
-- int yycount = 0;
--
-- /* There are many possibilities here to consider:
-- - Assume YYFAIL is not used. It's too flawed to consider. See
-- <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-- for details. YYERROR is fine as it does not invoke this
-- function.
-- - If this state is a consistent state with a default action, then
-- the only way this function was invoked is if the default action
-- is an error action. In that case, don't check for expected
-- tokens because there are none.
-- - The only way there can be no lookahead present (in yychar) is if
-- this state is a consistent state with a default action. Thus,
-- detecting the absence of a lookahead is sufficient to determine
-- that there is no unexpected or expected token to report. In that
-- case, just report a simple "syntax error".
-- - Don't assume there isn't a lookahead just because this state is a
-- consistent state with a default action. There might have been a
-- previous inconsistent state, consistent state with a non-default
-- action, or user semantic action that manipulated yychar.
-- - Of course, the expected token list depends on states to have
-- correct lookahead information, and it depends on the parser not
-- to perform extra reductions after fetching a lookahead from the
-- scanner and before detecting a syntax error. Thus, state merging
-- (from LALR or IELR) and default reductions corrupt the expected
-- token list. However, the list is correct for canonical LR with
-- one exception: it will still contain any token that will not be
-- accepted due to an error action in a later state.
-- */
-- if (yytoken != YYEMPTY)
-- {
-- int yyn = yypact[*yyssp];
-- yyarg[yycount++] = yytname[yytoken];
-- if (!yypact_value_is_default (yyn))
-- {
-- /* Start YYX at -YYN if negative to avoid negative indexes in
-- YYCHECK. In other words, skip the first -YYN actions for
-- this state because they are default actions. */
-- int yyxbegin = yyn < 0 ? -yyn : 0;
-- /* Stay within bounds of both yycheck and yytname. */
-- int yychecklim = YYLAST - yyn + 1;
-- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-- int yyx;
--
-- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-- && !yytable_value_is_error (yytable[yyx + yyn]))
-- {
-- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-- {
-- yycount = 1;
-- yysize = yysize0;
-- break;
-- }
-- yyarg[yycount++] = yytname[yyx];
-- {
-- YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-- if (! (yysize <= yysize1
-- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-- return 2;
-- yysize = yysize1;
-- }
-- }
-- }
-- }
--
-- switch (yycount)
-- {
--# define YYCASE_(N, S) \
-- case N: \
-- yyformat = S; \
-- break
-- YYCASE_(0, YY_("syntax error"));
-- YYCASE_(1, YY_("syntax error, unexpected %s"));
-- YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-- YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-- YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-- YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
--# undef YYCASE_
-- }
--
-- {
-- YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-- return 2;
-- yysize = yysize1;
-- }
--
-- if (*yymsg_alloc < yysize)
-- {
-- *yymsg_alloc = 2 * yysize;
-- if (! (yysize <= *yymsg_alloc
-- && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-- *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-- return 1;
-- }
--
-- /* Avoid sprintf, as that infringes on the user's name space.
-- Don't have undefined behavior even if the translation
-- produced a string with the wrong number of "%s"s. */
-- {
-- char *yyp = *yymsg;
-- int yyi = 0;
-- while ((*yyp = *yyformat) != '\0')
-- if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-- {
-- yyp += yytnamerr (yyp, yyarg[yyi++]);
-- yyformat += 2;
-- }
-- else
-- {
-- yyp++;
-- yyformat++;
-- }
-- }
-- return 0;
--}
--#endif /* YYERROR_VERBOSE */
--
--/*-----------------------------------------------.
--| Release the memory associated to this symbol. |
--`-----------------------------------------------*/
--
--/*ARGSUSED*/
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--static void
--yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct parse_args *arg)
--#else
--static void
--yydestruct (yymsg, yytype, yyvaluep, arg)
-- const char *yymsg;
-- int yytype;
-- YYSTYPE *yyvaluep;
-- struct parse_args *arg;
--#endif
--{
-- YYUSE (yyvaluep);
-- YYUSE (arg);
--
-- if (!yymsg)
-- yymsg = "Deleting";
-- YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
--
-- switch (yytype)
-- {
--
-- default:
-- break;
-- }
--}
--
--
--
--
--/*----------.
--| yyparse. |
--`----------*/
--
--#ifdef YYPARSE_PARAM
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--int
--yyparse (void *YYPARSE_PARAM)
--#else
--int
--yyparse (YYPARSE_PARAM)
-- void *YYPARSE_PARAM;
--#endif
--#else /* ! YYPARSE_PARAM */
--#if (defined __STDC__ || defined __C99__FUNC__ \
-- || defined __cplusplus || defined _MSC_VER)
--int
--yyparse (struct parse_args *arg)
--#else
--int
--yyparse (arg)
-- struct parse_args *arg;
--#endif
--#endif
--{
--/* The lookahead symbol. */
--int yychar;
--
--
--#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
--/* Suppress an incorrect diagnostic about yylval being uninitialized. */
--# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-- _Pragma ("GCC diagnostic push") \
-- _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-- _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
--# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-- _Pragma ("GCC diagnostic pop")
--#else
--/* Default value used for initialization, for pacifying older GCCs
-- or non-GCC compilers. */
--static YYSTYPE yyval_default;
--# define YY_INITIAL_VALUE(Value) = Value
--#endif
--#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
--# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
--# define YY_IGNORE_MAYBE_UNINITIALIZED_END
--#endif
--#ifndef YY_INITIAL_VALUE
--# define YY_INITIAL_VALUE(Value) /* Nothing. */
--#endif
--
--/* The semantic value of the lookahead symbol. */
--YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
--
-- /* Number of syntax errors so far. */
-- int yynerrs;
--
-- int yystate;
-- /* Number of tokens to shift before error messages enabled. */
-- int yyerrstatus;
--
-- /* The stacks and their tools:
-- `yyss': related to states.
-- `yyvs': related to semantic values.
--
-- Refer to the stacks through separate pointers, to allow yyoverflow
-- to reallocate them elsewhere. */
--
-- /* The state stack. */
-- yytype_int16 yyssa[YYINITDEPTH];
-- yytype_int16 *yyss;
-- yytype_int16 *yyssp;
--
-- /* The semantic value stack. */
-- YYSTYPE yyvsa[YYINITDEPTH];
-- YYSTYPE *yyvs;
-- YYSTYPE *yyvsp;
--
-- YYSIZE_T yystacksize;
--
-- int yyn;
-- int yyresult;
-- /* Lookahead token as an internal (translated) token number. */
-- int yytoken = 0;
-- /* The variables used to return semantic value and location from the
-- action routines. */
-- YYSTYPE yyval;
--
--#if YYERROR_VERBOSE
-- /* Buffer for error messages, and its allocated size. */
-- char yymsgbuf[128];
-- char *yymsg = yymsgbuf;
-- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
--#endif
--
--#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
--
-- /* The number of symbols on the RHS of the reduced rule.
-- Keep to zero when no symbol should be popped. */
-- int yylen = 0;
--
-- yyssp = yyss = yyssa;
-- yyvsp = yyvs = yyvsa;
-- yystacksize = YYINITDEPTH;
--
-- YYDPRINTF ((stderr, "Starting parse\n"));
--
-- yystate = 0;
-- yyerrstatus = 0;
-- yynerrs = 0;
-- yychar = YYEMPTY; /* Cause a token to be read. */
-- goto yysetstate;
--
--/*------------------------------------------------------------.
--| yynewstate -- Push a new state, which is found in yystate. |
--`------------------------------------------------------------*/
-- yynewstate:
-- /* In all cases, when you get here, the value and location stacks
-- have just been pushed. So pushing a state here evens the stacks. */
-- yyssp++;
--
-- yysetstate:
-- *yyssp = yystate;
--
-- if (yyss + yystacksize - 1 <= yyssp)
-- {
-- /* Get the current used size of the three stacks, in elements. */
-- YYSIZE_T yysize = yyssp - yyss + 1;
--
--#ifdef yyoverflow
-- {
-- /* Give user a chance to reallocate the stack. Use copies of
-- these so that the &'s don't force the real ones into
-- memory. */
-- YYSTYPE *yyvs1 = yyvs;
-- yytype_int16 *yyss1 = yyss;
--
-- /* Each stack pointer address is followed by the size of the
-- data in use in that stack, in bytes. This used to be a
-- conditional around just the two extra args, but that might
-- be undefined if yyoverflow is a macro. */
-- yyoverflow (YY_("memory exhausted"),
-- &yyss1, yysize * sizeof (*yyssp),
-- &yyvs1, yysize * sizeof (*yyvsp),
-- &yystacksize);
--
-- yyss = yyss1;
-- yyvs = yyvs1;
-- }
--#else /* no yyoverflow */
--# ifndef YYSTACK_RELOCATE
-- goto yyexhaustedlab;
--# else
-- /* Extend the stack our own way. */
-- if (YYMAXDEPTH <= yystacksize)
-- goto yyexhaustedlab;
-- yystacksize *= 2;
-- if (YYMAXDEPTH < yystacksize)
-- yystacksize = YYMAXDEPTH;
--
-- {
-- yytype_int16 *yyss1 = yyss;
-- union yyalloc *yyptr =
-- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-- if (! yyptr)
-- goto yyexhaustedlab;
-- YYSTACK_RELOCATE (yyss_alloc, yyss);
-- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
--# undef YYSTACK_RELOCATE
-- if (yyss1 != yyssa)
-- YYSTACK_FREE (yyss1);
-- }
--# endif
--#endif /* no yyoverflow */
--
-- yyssp = yyss + yysize - 1;
-- yyvsp = yyvs + yysize - 1;
--
-- YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-- (unsigned long int) yystacksize));
--
-- if (yyss + yystacksize - 1 <= yyssp)
-- YYABORT;
-- }
--
-- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
--
-- if (yystate == YYFINAL)
-- YYACCEPT;
--
-- goto yybackup;
--
--/*-----------.
--| yybackup. |
--`-----------*/
--yybackup:
--
-- /* Do appropriate processing given the current state. Read a
-- lookahead token if we need one and don't already have one. */
--
-- /* First try to decide what to do without reference to lookahead token. */
-- yyn = yypact[yystate];
-- if (yypact_value_is_default (yyn))
-- goto yydefault;
--
-- /* Not known => get a lookahead token if don't already have one. */
--
-- /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
-- if (yychar == YYEMPTY)
-- {
-- YYDPRINTF ((stderr, "Reading a token: "));
-- yychar = YYLEX;
-- }
--
-- if (yychar <= YYEOF)
-- {
-- yychar = yytoken = YYEOF;
-- YYDPRINTF ((stderr, "Now at end of input.\n"));
-- }
-- else
-- {
-- yytoken = YYTRANSLATE (yychar);
-- YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-- }
--
-- /* If the proper action on seeing token YYTOKEN is to reduce or to
-- detect an error, take that action. */
-- yyn += yytoken;
-- if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-- goto yydefault;
-- yyn = yytable[yyn];
-- if (yyn <= 0)
-- {
-- if (yytable_value_is_error (yyn))
-- goto yyerrlab;
-- yyn = -yyn;
-- goto yyreduce;
-- }
--
-- /* Count tokens shifted since error; after three, turn off error
-- status. */
-- if (yyerrstatus)
-- yyerrstatus--;
--
-- /* Shift the lookahead token. */
-- YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
--
-- /* Discard the shifted token. */
-- yychar = YYEMPTY;
--
-- yystate = yyn;
-- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-- *++yyvsp = yylval;
-- YY_IGNORE_MAYBE_UNINITIALIZED_END
--
-- goto yynewstate;
--
--
--/*-----------------------------------------------------------.
--| yydefault -- do the default action for the current state. |
--`-----------------------------------------------------------*/
--yydefault:
-- yyn = yydefact[yystate];
-- if (yyn == 0)
-- goto yyerrlab;
-- goto yyreduce;
--
--
--/*-----------------------------.
--| yyreduce -- Do a reduction. |
--`-----------------------------*/
--yyreduce:
-- /* yyn is the number of a rule to reduce with. */
-- yylen = yyr2[yyn];
--
-- /* If YYLEN is nonzero, implement the default value of the action:
-- `$$ = $1'.
--
-- Otherwise, the following line sets YYVAL to garbage.
-- This behavior is undocumented and Bison
-- users should not rely upon it. Assigning to YYVAL
-- unconditionally makes the parser a bit smaller, and it avoids a
-- GCC warning that YYVAL may be used uninitialized. */
-- yyval = yyvsp[1-yylen];
--
--
-- YY_REDUCE_PRINT (yyn);
-- switch (yyn)
-- {
-- case 2:
--/* Line 1792 of yacc.c */
--#line 153 "plural.y"
-- {
-- if ((yyvsp[(1) - (1)].exp) == NULL)
-- YYABORT;
-- arg->res = (yyvsp[(1) - (1)].exp);
-- }
-- break;
--
-- case 3:
--/* Line 1792 of yacc.c */
--#line 161 "plural.y"
-- {
-- (yyval.exp) = new_exp_3 (qmop, (yyvsp[(1) - (5)].exp), (yyvsp[(3) - (5)].exp), (yyvsp[(5) - (5)].exp));
-- }
-- break;
--
-- case 4:
--/* Line 1792 of yacc.c */
--#line 165 "plural.y"
-- {
-- (yyval.exp) = new_exp_2 (lor, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-- }
-- break;
--
-- case 5:
--/* Line 1792 of yacc.c */
--#line 169 "plural.y"
-- {
-- (yyval.exp) = new_exp_2 (land, (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-- }
-- break;
--
-- case 6:
--/* Line 1792 of yacc.c */
--#line 173 "plural.y"
-- {
-- (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-- }
-- break;
--
-- case 7:
--/* Line 1792 of yacc.c */
--#line 177 "plural.y"
-- {
-- (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-- }
-- break;
--
-- case 8:
--/* Line 1792 of yacc.c */
--#line 181 "plural.y"
-- {
-- (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-- }
-- break;
--
-- case 9:
--/* Line 1792 of yacc.c */
--#line 185 "plural.y"
-- {
-- (yyval.exp) = new_exp_2 ((yyvsp[(2) - (3)].op), (yyvsp[(1) - (3)].exp), (yyvsp[(3) - (3)].exp));
-- }
-- break;
--
-- case 10:
--/* Line 1792 of yacc.c */
--#line 189 "plural.y"
-- {
-- (yyval.exp) = new_exp_1 (lnot, (yyvsp[(2) - (2)].exp));
-- }
-- break;
--
-- case 11:
--/* Line 1792 of yacc.c */
--#line 193 "plural.y"
-- {
-- (yyval.exp) = new_exp_0 (var);
-- }
-- break;
--
-- case 12:
--/* Line 1792 of yacc.c */
--#line 197 "plural.y"
-- {
-- if (((yyval.exp) = new_exp_0 (num)) != NULL)
-- (yyval.exp)->val.num = (yyvsp[(1) - (1)].num);
-- }
-- break;
--
-- case 13:
--/* Line 1792 of yacc.c */
--#line 202 "plural.y"
-- {
-- (yyval.exp) = (yyvsp[(2) - (3)].exp);
-- }
-- break;
--
--
--/* Line 1792 of yacc.c */
--#line 1607 "plural.c"
-- default: break;
-- }
-- /* User semantic actions sometimes alter yychar, and that requires
-- that yytoken be updated with the new translation. We take the
-- approach of translating immediately before every use of yytoken.
-- One alternative is translating here after every semantic action,
-- but that translation would be missed if the semantic action invokes
-- YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-- if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
-- incorrect destructor might then be invoked immediately. In the
-- case of YYERROR or YYBACKUP, subsequent parser actions might lead
-- to an incorrect destructor call or verbose syntax error message
-- before the lookahead is translated. */
-- YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
--
-- YYPOPSTACK (yylen);
-- yylen = 0;
-- YY_STACK_PRINT (yyss, yyssp);
--
-- *++yyvsp = yyval;
--
-- /* Now `shift' the result of the reduction. Determine what state
-- that goes to, based on the state we popped back to and the rule
-- number reduced by. */
--
-- yyn = yyr1[yyn];
--
-- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-- yystate = yytable[yystate];
-- else
-- yystate = yydefgoto[yyn - YYNTOKENS];
--
-- goto yynewstate;
--
--
--/*------------------------------------.
--| yyerrlab -- here on detecting error |
--`------------------------------------*/
--yyerrlab:
-- /* Make sure we have latest lookahead translation. See comments at
-- user semantic actions for why this is necessary. */
-- yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
--
-- /* If not already recovering from an error, report this error. */
-- if (!yyerrstatus)
-- {
-- ++yynerrs;
--#if ! YYERROR_VERBOSE
-- yyerror (arg, YY_("syntax error"));
--#else
--# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-- yyssp, yytoken)
-- {
-- char const *yymsgp = YY_("syntax error");
-- int yysyntax_error_status;
-- yysyntax_error_status = YYSYNTAX_ERROR;
-- if (yysyntax_error_status == 0)
-- yymsgp = yymsg;
-- else if (yysyntax_error_status == 1)
-- {
-- if (yymsg != yymsgbuf)
-- YYSTACK_FREE (yymsg);
-- yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-- if (!yymsg)
-- {
-- yymsg = yymsgbuf;
-- yymsg_alloc = sizeof yymsgbuf;
-- yysyntax_error_status = 2;
-- }
-- else
-- {
-- yysyntax_error_status = YYSYNTAX_ERROR;
-- yymsgp = yymsg;
-- }
-- }
-- yyerror (arg, yymsgp);
-- if (yysyntax_error_status == 2)
-- goto yyexhaustedlab;
-- }
--# undef YYSYNTAX_ERROR
--#endif
-- }
--
--
--
-- if (yyerrstatus == 3)
-- {
-- /* If just tried and failed to reuse lookahead token after an
-- error, discard it. */
--
-- if (yychar <= YYEOF)
-- {
-- /* Return failure if at end of input. */
-- if (yychar == YYEOF)
-- YYABORT;
-- }
-- else
-- {
-- yydestruct ("Error: discarding",
-- yytoken, &yylval, arg);
-- yychar = YYEMPTY;
-- }
-- }
--
-- /* Else will try to reuse lookahead token after shifting the error
-- token. */
-- goto yyerrlab1;
--
--
--/*---------------------------------------------------.
--| yyerrorlab -- error raised explicitly by YYERROR. |
--`---------------------------------------------------*/
--yyerrorlab:
--
-- /* Pacify compilers like GCC when the user code never invokes
-- YYERROR and the label yyerrorlab therefore never appears in user
-- code. */
-- if (/*CONSTCOND*/ 0)
-- goto yyerrorlab;
--
-- /* Do not reclaim the symbols of the rule which action triggered
-- this YYERROR. */
-- YYPOPSTACK (yylen);
-- yylen = 0;
-- YY_STACK_PRINT (yyss, yyssp);
-- yystate = *yyssp;
-- goto yyerrlab1;
--
--
--/*-------------------------------------------------------------.
--| yyerrlab1 -- common code for both syntax error and YYERROR. |
--`-------------------------------------------------------------*/
--yyerrlab1:
-- yyerrstatus = 3; /* Each real token shifted decrements this. */
--
-- for (;;)
-- {
-- yyn = yypact[yystate];
-- if (!yypact_value_is_default (yyn))
-- {
-- yyn += YYTERROR;
-- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-- {
-- yyn = yytable[yyn];
-- if (0 < yyn)
-- break;
-- }
-- }
--
-- /* Pop the current state because it cannot handle the error token. */
-- if (yyssp == yyss)
-- YYABORT;
--
--
-- yydestruct ("Error: popping",
-- yystos[yystate], yyvsp, arg);
-- YYPOPSTACK (1);
-- yystate = *yyssp;
-- YY_STACK_PRINT (yyss, yyssp);
-- }
--
-- YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-- *++yyvsp = yylval;
-- YY_IGNORE_MAYBE_UNINITIALIZED_END
--
--
-- /* Shift the error token. */
-- YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
--
-- yystate = yyn;
-- goto yynewstate;
--
--
--/*-------------------------------------.
--| yyacceptlab -- YYACCEPT comes here. |
--`-------------------------------------*/
--yyacceptlab:
-- yyresult = 0;
-- goto yyreturn;
--
--/*-----------------------------------.
--| yyabortlab -- YYABORT comes here. |
--`-----------------------------------*/
--yyabortlab:
-- yyresult = 1;
-- goto yyreturn;
--
--#if !defined yyoverflow || YYERROR_VERBOSE
--/*-------------------------------------------------.
--| yyexhaustedlab -- memory exhaustion comes here. |
--`-------------------------------------------------*/
--yyexhaustedlab:
-- yyerror (arg, YY_("memory exhausted"));
-- yyresult = 2;
-- /* Fall through. */
--#endif
--
--yyreturn:
-- if (yychar != YYEMPTY)
-- {
-- /* Make sure we have latest lookahead translation. See comments at
-- user semantic actions for why this is necessary. */
-- yytoken = YYTRANSLATE (yychar);
-- yydestruct ("Cleanup: discarding lookahead",
-- yytoken, &yylval, arg);
-- }
-- /* Do not reclaim the symbols of the rule which action triggered
-- this YYABORT or YYACCEPT. */
-- YYPOPSTACK (yylen);
-- YY_STACK_PRINT (yyss, yyssp);
-- while (yyssp != yyss)
-- {
-- yydestruct ("Cleanup: popping",
-- yystos[*yyssp], yyvsp, arg);
-- YYPOPSTACK (1);
-- }
--#ifndef yyoverflow
-- if (yyss != yyssa)
-- YYSTACK_FREE (yyss);
--#endif
--#if YYERROR_VERBOSE
-- if (yymsg != yymsgbuf)
-- YYSTACK_FREE (yymsg);
--#endif
-- /* Make sure YYID is used. */
-- return YYID (yyresult);
--}
--
--
--/* Line 2055 of yacc.c */
--#line 207 "plural.y"
--
--
--void
--internal_function
--FREE_EXPRESSION (struct expression *exp)
--{
-- if (exp == NULL)
-- return;
--
-- /* Handle the recursive case. */
-- switch (exp->nargs)
-- {
-- case 3:
-- FREE_EXPRESSION (exp->val.args[2]);
-- /* FALLTHROUGH */
-- case 2:
-- FREE_EXPRESSION (exp->val.args[1]);
-- /* FALLTHROUGH */
-- case 1:
-- FREE_EXPRESSION (exp->val.args[0]);
-- /* FALLTHROUGH */
-- default:
-- break;
-- }
--
-- free (exp);
--}
--
--
--static int
--yylex (YYSTYPE *lval, struct parse_args *arg)
--{
-- const char *exp = arg->cp;
-- int result;
--
-- while (1)
-- {
-- if (exp[0] == '\0')
-- {
-- arg->cp = exp;
-- return YYEOF;
-- }
--
-- if (exp[0] != ' ' && exp[0] != '\t')
-- break;
--
-- ++exp;
-- }
--
-- result = *exp++;
-- switch (result)
-- {
-- case '0': case '1': case '2': case '3': case '4':
-- case '5': case '6': case '7': case '8': case '9':
-- {
-- unsigned long int n = result - '0';
-- while (exp[0] >= '0' && exp[0] <= '9')
-- {
-- n *= 10;
-- n += exp[0] - '0';
-- ++exp;
-- }
-- lval->num = n;
-- result = NUMBER;
-- }
-- break;
--
-- case '=':
-- if (exp[0] == '=')
-- {
-- ++exp;
-- lval->op = equal;
-- result = EQUOP2;
-- }
-- else
-- result = YYERRCODE;
-- break;
--
-- case '!':
-- if (exp[0] == '=')
-- {
-- ++exp;
-- lval->op = not_equal;
-- result = EQUOP2;
-- }
-- break;
--
-- case '&':
-- case '|':
-- if (exp[0] == result)
-- ++exp;
-- else
-- result = YYERRCODE;
-- break;
--
-- case '<':
-- if (exp[0] == '=')
-- {
-- ++exp;
-- lval->op = less_or_equal;
-- }
-- else
-- lval->op = less_than;
-- result = CMPOP2;
-- break;
--
-- case '>':
-- if (exp[0] == '=')
-- {
-- ++exp;
-- lval->op = greater_or_equal;
-- }
-- else
-- lval->op = greater_than;
-- result = CMPOP2;
-- break;
--
-- case '*':
-- lval->op = mult;
-- result = MULOP2;
-- break;
--
-- case '/':
-- lval->op = divide;
-- result = MULOP2;
-- break;
--
-- case '%':
-- lval->op = module;
-- result = MULOP2;
-- break;
--
-- case '+':
-- lval->op = plus;
-- result = ADDOP2;
-- break;
--
-- case '-':
-- lval->op = minus;
-- result = ADDOP2;
-- break;
--
-- case 'n':
-- case '?':
-- case ':':
-- case '(':
-- case ')':
-- /* Nothing, just return the character. */
-- break;
--
-- case ';':
-- case '\n':
-- case '\0':
-- /* Be safe and let the user call this function again. */
-- --exp;
-- result = YYEOF;
-- break;
--
-- default:
-- result = YYERRCODE;
--#if YYDEBUG != 0
-- --exp;
--#endif
-- break;
-- }
--
-- arg->cp = exp;
--
-- return result;
--}
--
--
--static void
--yyerror (struct parse_args *arg, const char *str)
--{
-- /* Do nothing. We don't print error messages here. */
--}
diff --cc intl/tsearch.h
index 02ae35e,02ae35e..0000000
deleted file mode 100644,100644
--- a/intl/tsearch.h
+++ /dev/null
@@@ -1,81 -1,81 +1,0 @@@
--/* Binary tree data structure.
-- Copyright (C) 2006 Free Software Foundation, Inc.
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU Lesser General Public License as published by
-- the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. */
--
--#ifndef _TSEARCH_H
--#define _TSEARCH_H
--
--#if HAVE_TSEARCH
--
--/* Get tseach(), tfind(), tdelete(), twalk() declarations. */
--#include <search.h>
--
--#else
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--/* See <http://www.opengroup.org/susv3xbd/search.h.html>,
-- <http://www.opengroup.org/susv3xsh/tsearch.html>
-- for details. */
--
--typedef enum
--{
-- preorder,
-- postorder,
-- endorder,
-- leaf
--}
--VISIT;
--
--/* Searches an element in the tree *VROOTP that compares equal to KEY.
-- If one is found, it is returned. Otherwise, a new element equal to KEY
-- is inserted in the tree and is returned. */
--extern void * tsearch (const void *key, void **vrootp,
-- int (*compar) (const void *, const void *));
--
--/* Searches an element in the tree *VROOTP that compares equal to KEY.
-- If one is found, it is returned. Otherwise, NULL is returned. */
--extern void * tfind (const void *key, void *const *vrootp,
-- int (*compar) (const void *, const void *));
--
--/* Searches an element in the tree *VROOTP that compares equal to KEY.
-- If one is found, it is removed from the tree, and its parent node is
-- returned. Otherwise, NULL is returned. */
--extern void * tdelete (const void *key, void **vrootp,
-- int (*compar) (const void *, const void *));
--
--/* Perform a depth-first, left-to-right traversal of the tree VROOT.
-- The ACTION function is called:
-- - for non-leaf nodes: 3 times, before the left subtree traversal,
-- after the left subtree traversal but before the right subtree traversal,
-- and after the right subtree traversal,
-- - for leaf nodes: once.
-- The arguments passed to ACTION are:
-- 1. the node; it can be casted to a 'const void * const *', i.e. into a
-- pointer to the key,
-- 2. an indicator which visit of the node this is,
-- 3. the level of the node in the tree (0 for the root). */
--extern void twalk (const void *vroot,
-- void (*action) (const void *, VISIT, int));
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif
--
--#endif /* _TSEARCH_H */
diff --cc po/be.po
index bbcbdc1,fdaa5e1..64c624e
--- a/po/be.po
+++ b/po/be.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:19+0200\n"
"Last-Translator: Ales Nyakhaychyk <nab at mail.by>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
@@@ -30,76 -26,54 +30,76 @@@ msgstr "
msgid "no entropy gathering module detected\n"
msgstr ""
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "немагчыма адкрыць \"%s\"\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "запіс у stdout\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr ""
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr ""
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr ""
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr ""
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr ""
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr ""
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr ""
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr ""
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr ""
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -840,8 -651,6 +840,8 @@@ msgstr "Паўтарыце пароль
msgid "PIN not correctly repeated; try again"
msgstr ""
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "немагчыма адкрыць \"%s\"\n"
@@@ -1314,15 -1022,12 +1314,15 @@@ msgstr "
" --list-keys [назвы] паказаць ключы\n"
" --fingerprint [назвы] паказаць адбіткі пальцаў\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1332,7 -1037,6 +1332,7 @@@ msgstr "
"sign, check, encrypt ці decrypt\n"
"Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1340,546 -1044,424 +1340,546 @@@ msgstr "
"\n"
"Альгарытмы, якія падтрымліваюцца:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr ""
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "Выкарыстаньне: gpg [выбары] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "несумяшчальныя загады\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "невядомая вэрсыя"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr ""
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr ""
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr ""
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr ""
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr ""
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr ""
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "недапушчальныя выбары імпартаваньня\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "недапушчальныя выбары імпартаваньня\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s - гэта недапушчальнае мноства знакаў\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "недапушчальныя выбары экспартаваньня\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr ""
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не дазваляецца разам з %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ня мае сэнсу разам з %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr ""
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "запіс у stdout\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr ""
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr ""
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr ""
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr ""
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr ""
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
- #: g10/gpg.c:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr ""
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "недапушчальныя дапомныя перавагі\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr ""
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr ""
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr ""
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ня мае сэнсу разам з %s!\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr ""
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [назва_файла]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [назва_файла]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "збой падпісаньня: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [назва_файла]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [назва_файла]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [назва_файла]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва_файла]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [назва_файла]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [назва_файла]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [загады]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr ""
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "збой падпісаньня: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "збой падпісаньня: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "збой падпісаньня: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "збой падпісаньня: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr ""
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr ""
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr ""
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[назва_файла]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr ""
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr ""
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr ""
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr ""
@@@ -5580,131 -4391,104 +5580,131 @@@ msgstr "памылка чытаньн�
msgid "trustdb: sync failed: %s\n"
msgstr ""
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "%s: немагчыма стварыць тэчку: %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "немагчыма адкрыць \"%s\"\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr ""
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "немагчыма адкрыць %s: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr ""
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "немагчыма адкрыць %s: %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr ""
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr ""
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr ""
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr ""
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr ""
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr ""
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr ""
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr ""
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr ""
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr ""
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr ""
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr ""
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr ""
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr ""
diff --cc po/ca.po
index 21781ec,13d4132..c123e78
--- a/po/ca.po
+++ b/po/ca.po
@@@ -27,7 -27,6 +27,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:20+0200\n"
"Last-Translator: Jordi Mallach <jordi at gnu.org>\n"
"Language-Team: Catalan <ca at dodds.net>\n"
@@@ -50,78 -46,56 +50,78 @@@ msgstr "no s'ha pogut generar un prim a
msgid "no entropy gathering module detected\n"
msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "no s'ha pogut obrir «%s»\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no s'ha pogut obrir «%s»: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "no es pot fer stat de «%s»: %s\n"
# Descartar, deixar passar... ignorar és un anglicisme. ivb
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "«%s» no és un fitxer regular: es descarta\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "nota: el fitxer random_seed és buit\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "no s'ha pogut llegir «%s»: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "no s'ha pogut crear «%s»: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "no s'ha pogut escriure «%s»: %s\n"
# No em passe! ;) ivb
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "AVÍS: esteu usant un generador de nombres aleatoris insegur!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -899,8 -710,6 +899,8 @@@ msgstr "Repetiu la contrasenya:
msgid "PIN not correctly repeated; try again"
msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "no s'ha pogut obrir «%s»\n"
@@@ -1405,15 -1113,12 +1405,15 @@@ msgstr "
" --list-keys [noms] mostra claus\n"
" --fingerprint [noms] mostra empremtes digitals\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1428,7 -1133,6 +1428,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:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1436,564 -1140,442 +1436,564 @@@ msgstr "
"\n"
"Algoritmes suportats:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Clau pública: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Xifratge: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Dispersió: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Compressió: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "forma d'ús: gpg [opcions] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "les ordres entren en conflicte\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
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:1264
++#: g10/gpg.c:1269
#, 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:1267
++#: g10/gpg.c:1272
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, 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:1276
++#: g10/gpg.c:1281
#, 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:1282
++#: g10/gpg.c:1287
#, 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:1285
++#: g10/gpg.c:1290
#, 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:1291
++#: g10/gpg.c:1296
#, 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:1294
++#: g10/gpg.c:1299
#, 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:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, 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:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostra en quin anell de claus està una clau llistada"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "fitxer d'opcions «%s»: %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "s'estan llegint opcions de «%s»\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s no és per a ús normal!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, 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:2569
++#: g10/gpg.c:2574
#, 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:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, 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:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opcions d'importanció no vàlides\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "opcions d'importació no vàlides\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, 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:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s no és un joc de caràcters vàlid\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, 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:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "opcions d'exportació no vàlides\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, 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:2850
++#: g10/gpg.c:2855
#, 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:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
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:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVÍS: %s té preferència sobre %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s no és permés amb %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s no té sentit amb %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent no està disponible en aquesta sessió\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "s'està escrivint la clau secreta a «%s»\n"
# clares -> en clar? ivb
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
"habilitat.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "l'algorisme de resum seleccionat no és vàlid\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorisme de xifratge triat no és vàlid\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ha de ser major que 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ha de ser major que 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
#, 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:3132
++#: g10/gpg.c:3137
#, 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:3135
++#: g10/gpg.c:3140
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:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "les preferències per defecte són invàlides\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "les preferències personals de xifrat són invàlides\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "les preferències personals de digest són invàlides\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "les preferències personals de compressió són invàlides\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s encara no funciona amb %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, 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:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [nom_del_fitxer]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [nom_del_fitxer]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "ha fallat el desxifratge: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [nom_del_fitxer]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nom_del_fitxer]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nom_del_fitxer]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [nom_del_fitxer]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [nom_del_fitxer]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [ordres]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [anell]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "l'enviament al servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "la recepció des del servidor de claus ha fallat: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "l'exportació de la clau ha fallat: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ha fallat la cerca al servidor de claus: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "ha fallat el refresc des del servidor de claus: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "no s'ha pogut llevar l'armadura: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "no s'ha pogut crear l'armadura: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "l'algoritme de dispersió és invàlid «%s»\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[nom_del_fitxer]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Endavant, escriviu el missatge...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
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:4269
++#: g10/gpg.c:4273
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:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL de política de signatura donada no és vàlida\n"
@@@ -6116,134 -4927,107 +6116,134 @@@ 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:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "no es pot crear el directori «%s»: %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "no s'ha pogut obrir «%s»\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, 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:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "la transacció de la base de dades de confiança és massa gran\n"
++#: g10/tdbio.c:537
+ #, c-format
+ msgid "%s: directory does not exist!\n"
+ msgstr "%s: el directori no existeix!\n"
+
# No em passe! ;) ivb
- #: g10/tdbio.c:520
++#: g10/tdbio.c:551
#, fuzzy, c-format
msgid "can't access `%s': %s\n"
msgstr "no s'ha pogut tancar «%s»: %s\n"
- #: g10/tdbio.c:536
- #, c-format
- msgid "%s: directory does not exist!\n"
- msgstr "%s: el directori no existeix!\n"
-
- #: g10/tdbio.c:557
++#: g10/tdbio.c:570
#, 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:561
++#: g10/tdbio.c:574
#, 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:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: s'ha creat la base de dades de confiança\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: la base de dades de confiança és invàlida\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, 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:656
++#: g10/tdbio.c:668
#, 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:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, 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:733
++#: g10/tdbio.c:745
#, 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:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de dades de confiança: ha fallat lseek: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, 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:1202
++#: g10/tdbio.c:1212
#, 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:1221
++#: g10/tdbio.c:1231
#, 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:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: la versió de fitxer %d és invàlida\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: error en llegir el registre lliure: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: error en escriure el registre de directoris: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, 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:1460
++#: g10/tdbio.c:1470
#, 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:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: s'ha creat la base de dades de confiança\n"
diff --cc po/cs.po
index 070b4d3,d4d04d6..152af80
--- a/po/cs.po
+++ b/po/cs.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-1.3.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:20+0200\n"
"Last-Translator: Roman Pavlik <rp at tns.cz>\n"
"Language-Team: Czech <translations.cs at gnupg.cz>\n"
@@@ -30,76 -26,54 +30,76 @@@ msgstr "nemohu vygenerovat prvočíslo
msgid "no entropy gathering module detected\n"
msgstr "nebyl detekován žádný modul pro získání entropie\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "nelze zamčít `%s': %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "čekám na zámek pro `%s'...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nemohu otevřít `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "nemohu použít příkaz stat na `%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' není normální soubor - ignoruji\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "poznámka: soubor random_seed je prázdný\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "VAROVÁNÍ: neplatná velikost random_seed - soubor nepoužit\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "nemohu číst `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "poznámka: soubor random_seed není aktualizován\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nemohu vytvořit `%s': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "nemohu zapisovat do `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "nemohu zavřít `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "VAROVÁNÍ: použitý generátor náhodných čísel není bezpečný!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -840,8 -651,6 +840,8 @@@ msgstr "Opakujte tento PIN:
msgid "PIN not correctly repeated; try again"
msgstr "PIN není zopakován správně; zkuste to znovu"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "nelze otevřít `%s'\n"
@@@ -1320,17 -1028,14 +1320,17 @@@ msgstr "
" --list-keys [jména] vypsat klíče\n"
" --fingerprint [jména] vypsat fingerprinty \n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"Chyby oznamte, prosím, na adresu <gnupg-bugs at gnu.org>.\n"
"Připomínky k překladu <rp at tns.cz>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Použití: gpg [možnosti] [soubory] (-h pro pomoc)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1340,7 -1045,6 +1340,7 @@@ msgstr "
"podepsat, ověřit, šifrovat nebo dešifrovat\n"
"implicitní operace závisí na vstupních datech\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1348,68 -1052,55 +1348,68 @@@ msgstr "
"\n"
"Podporované algoritmy:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Veřejný klíč: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Šifra: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Komprese: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "užití: gpg [možnosti]"
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "konfliktní příkazy\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no = podpis nalezen v definici skupiny `%s'\n"
# g10/g10.c:1179#, c-format
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví domovského adresáře není nastaveno bezpečně `%s'\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví konfiguračního souboru není nastaveno bezpečně `%s'\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
"VAROVÁNÍ: přístupová práva pro domovský adresáře nejsou bezpečná `%s'\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"VAROVÁNÍ: přístupová práva pro konfigurační soubor nejsou bezpečná `%s'\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"VAROVÁNÍ: vlastnictví adresáře s domovkým adresářem není nastaveno "
"nebezpečně `%s'\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1417,14 -1108,12 +1417,14 @@@ msgstr "
"VAROVÁNÍ: vlastnictví adresáře s konfiguračním souborem není nastaveno "
"nebezpečně `%s'\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"VAROVÁNÍ: přístupová práva k adresáři s domovským adresářem nejsou nastavena "
"bezpečně `%s'\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1433,475 -1122,368 +1433,475 @@@ msgstr "
"nastavena bezpečně `%s'\n"
# c-format
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "neznámá konfigurační položka \"%s\"\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "zobrazovat ID fotografií během výpisu klíčů"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "ukazovat URL politik během výpisu podpisů"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "ukazovat všechny údaje během výpisu klíčů"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "ukazovat uživatelem vložené údaje během výpisu podpisů"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "ukazovat URL preferovaných keyserverů během výpisu podpisů"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "ukazovat platnost ID uživatelů při výpisu klíčů"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
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:1580
++#: g10/gpg.c:1585
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:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "ukazovat jméno keyringu při výpisu klíčů"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "ukazovat datum expirace při výpisu podpisů"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, 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:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZNÁMKA: neexistuje implicitní soubor s možnostmi `%s'\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "soubor s možnostmi `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "čtu možnosti z `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, 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:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' není platná doba expirace podpisu\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' není platná znaková sada\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "nelze zpracovat URL serveru klíčů\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "neplatný parametr pro server klíčů\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatný parametr pro import\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "neplatný parametr pro import\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatný parametr pro export\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "neplatný parametr pro export\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatný parametr pro výpis\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "neplatný parametr pro výpis\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "zobrazovat ID fotografií při ověřování podpisu"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "ukazovat URL politik při ověřování podpisu"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "ukazovat všechnz údaje při ověřování podpisů"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "ukazovat URL preferovaných keyserverů při ověřování podpisů"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "ukazovat uživatelské ID při ověřování podpisů"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
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:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "ukazovat pouze primární užvatelské ID při ověřování podpisů"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "ověřovat podpisy s daty PKA"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatný parametr pro ověření\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "neplatný parametr pro ověření\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nelze nastavit exec-path na %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "neplatný seznam auto-key-locate\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVÁNÍ: %s přepíše %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Není dovoleno používat %s s %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nedává s %s smysl!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "POZNÁMKA: %s není v této verzi dostupné\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"v módu --pgp2 můžete vytvářet pouze oddělené podpisy nebo podpisy čitelné "
"jako text\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "v módu --pgp2 nelze současně šifrovat a podepisovat\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "v módu --pgp2 musíte použít soubor (ne rouru).\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "šifrování zpráv v módu --pgp2 vyžaduje algoritmus IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "vybraný šifrovací algoritmus je neplatný\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "vybraný komprimovací algoritmus je neplatný\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybraný hashovací algoritmus je neplatný\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
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:3126
++#: g10/gpg.c:3131
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:3128
++#: g10/gpg.c:3133
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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
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:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "neplatné defaultní předvolby\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "neplatné uživatelské předvolby pro šifrování\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "neplatné uživatelské předvolby pro hashování\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "neplatné uživatelské předvolby pro komprimaci\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s dosud není funkční s %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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 dovoleno\n"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, 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 dovoleno\n"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "použití komprimačního algoritmu `%s' v módu %s dovoleno\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nemohu inicializovat databázi důvěry: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [jméno souboru]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [jméno souboru]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symetrické šifrování `%s' se nepovedlo: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [jméno souboru]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [jméno souboru]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
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:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [jméno souboru]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [jméno souboru]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
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:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [jméno souboru]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [jméno souboru]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [jméno souboru]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key id uživatele"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key id uživatele"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id uživatele [příkazy]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id uživatele] [soubor s klíči (keyring)]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "odeslání na keyserver se nezdařilo: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "získání dat z keyserveru se nezdařilo: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "export klíče se nepodařil: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "hledání na keyserveru se nezdařilo: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "refresh dat na keyserveru se nezdařil: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dekódování z ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "kódování do ASCII formátu selhalo: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "neplatný hashovací algoritmus `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[jméno souboru]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Začněte psát svou zprávu ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "zadané URL pro certifikační politiku je neplatné\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "zadané URL pro podepisovací politiku je neplatné\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadané URL preferovaného serveru klíčů je neplaté\n"
@@@ -5811,131 -4622,104 +5811,131 @@@ msgstr "chyba při čtení v `%s': %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "databáze důvěry: synchronizace selhala %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "nemohu vytvořit zámek pro `%s'\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "nelze zamčít `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, 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:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transakce s databází důvěry je příliš dlouhá\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "nemohu otevřít `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: adresář neexistuje!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "nemohu otevřít `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: nepodařilo se vytvořit záznam verze: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: vytvořena neplatná databáze důvěry\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: databáze důvěry vytvořena\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "POZNÁMKA: do trustedb nezle zapisovat\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: neplatná databáze důvěry\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: nepodařilo se vytvořit hashovací tabulku: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: chyba při aktualizaci záznamu verze: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: chyba při čtení záznamu verze: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, 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:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "databáze důvěry: procedura lseek() selhala: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, 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:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: není soubor databáze důvěry\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: záznam verze s číslem %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: neplatná verze souboru %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, 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:1420
++#: g10/tdbio.c:1430
#, 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:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: vynulování záznamu selhalo: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: přidání záznamu selhalo: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Chyba: Databáze důvěry je poškozena.\n"
diff --cc po/da.po
index ca16ce8,8f3af6f..b35c8a6
--- a/po/da.po
+++ b/po/da.po
@@@ -15,7 -15,6 +15,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-11-04 20:27+0200\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@@ -39,76 -35,54 +39,76 @@@ msgstr "kan ikke oprette et primtal me
msgid "no entropy gathering module detected\n"
msgstr "intet modul for indsamling af entropi detekteret\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "kan ikke låse »%s«: %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "venter på lås på »%s« ...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke åbne »%s«: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "kan ikke køre »%s«: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "»%s« er ikke en regulær fil - ignoreret\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "bemærk: filen random_seed er tom\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "ADVARSEL: ugyldig størrelse på filen random_seed - bruges ikke\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "kan ikke læse »%s«: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "bemærk: filen random_seed er ikke opdateret\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "kan ikke oprette »%s«: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "kan ikke skrive »%s«: %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "kan ikke lukke »%s«: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "ADVARSEL: brug af usikkert vilkårligt taloprettelsesprogram!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -847,8 -658,6 +847,8 @@@ msgstr "Gentag denne PIN:
msgid "PIN not correctly repeated; try again"
msgstr "PIN er ikke korrekt gentaget; prøv igen"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "kan ikke åbne »%s«\n"
@@@ -1327,16 -1035,13 +1327,16 @@@ msgstr "
" --list-keys [navne] vis nøgler\n"
" --fingerprint [navne] vis fingeraftryk\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Rapporter venligst fejl til <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
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:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1346,7 -1051,6 +1346,7 @@@ msgstr "
"Sign, check, encrypt eller decrypt\n"
"standardhandling afhænger af inddata\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1354,544 -1058,422 +1354,544 @@@ msgstr "
"\n"
"Understøttede algoritmer:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "brug: gpg [tilvalg] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "kommandoer er i konflikt\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "ingen = tegn fundet i gruppedefinition »%s«\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ADVARSEL: Usikker ejerskab af hjemmemappe »%s«\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ADVARSEL: Usikker ejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ADVARSEL: Usikre rettigheder på hjemmemappe »%s«\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ADVARSEL: Usikre rettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på hjemmemappe »%s«\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "ADVARSEL: Usikre indelukkede mapperettigheder på hjemmemappe »%s«\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
"ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "ukendt konfigurationspunkt »%s«\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "vis billed-id'er under nøglevisninger"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "vil politikadresser under underskriftvisninger"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "vis alle notationer under underskriftvisninger"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "vis IETF-standardnotationer under underskriftvisninger"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "vis brugerangivne notationer under underskriftvisninger"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "vis bruger-id-validitet under nøglevisninger"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
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:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "vis nøgleringsnavnet i nøglevisninger"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "vis udløbsdatoer under underskriftvisninger"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "BEMÆRK: Gammel standardfil for tilvalg »%s« blev ignoreret\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "BEMÆRK: Ingen standardfil for tilvalg »%s«\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "tilvalgsfil »%s«: %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "læser tilvalg fra »%s«\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "BEMÆRK: %s er ikke til normal brug!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "»%s« er ikke et gyldigt tegnsæt\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke fortolke nøgleserveradresse\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "ugyldige indstillinger for nøgleserver\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importindstillinger\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "ugyldige importindstillinger\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportindstillinger\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "ugyldige eksportindstillinger\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listeindstillinger\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "ugyldige listeindstillinger\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "vis billed-id'er under underskriftverificering"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "vis politikadresser under underskriftverificering"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "vis alle notationer under underskriftverificering"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "vis IETF-standardnotationer under underskriftverificering"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "vis brugerangivne notationer under underskriftverificering"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "vis bruger-id-validitet under underskriftverificering"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "vis kun den primære bruger-id i underskriftverificering"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "valider underskrifter med PKA-data"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "hæv troværdigheden for underskrifter med gyldige PKA-data"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "ugyldige verificeringsindstillinger\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke angive kørselssti til %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "ugyldig liste for auto-key-locate\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: program kan oprette en kernefil!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overskriver %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ikke tilladt med %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er meningsløs sammen med %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "BEMÆRK: %s er ikke tilgængelig i denne session\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"du kan kun lave frakoblede eller rydde underskrifter i tilstanden --pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "du kan ikke underskrive og kryptere på samme tid i tilstanden --pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"du skal bruge filer (og ikke en datakanal) når du arbejder med --pgp2 "
"aktiveret\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "kryptering af en besked i tilstanden --pgp2 kræver IDEA-chifret\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt chifferalgoritme er ugyldig\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "valgt sammendragsalgoritme er ugyldig\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "valgt komprimeringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed skal være større end 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed skal være større end 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
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:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "ugyldige standardpræferencer\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "ugyldige præferencer for personlig chiffer\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "ugyldige præferencer for personlig sammendrag\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "ugyldige præferencer for personlig komprimering\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker endnu ikke med %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
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:3243
++#: g10/gpg.c:3248
#, c-format
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:3248
++#: g10/gpg.c:3253
#, c-format
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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "kunne ikke initialisere TrustDB: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symmetrisk kryptering af »%s« mislykkedes: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
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:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
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:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key bruger-id"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key bruger-id"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key bruger-id [kommandoer]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [bruger-id] [nøglering]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nøgleserver send mislykkedes: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nøgleserver modtag mislykkedes: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "nøgleeksport mislykkedes: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nøgleserver søg mislykkedes: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "nøgleserver opdater mislykkedes: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "fjernelse af panser mislykkedes: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "påklædning af panser mislykkedes: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ugyldig hash-algoritme »%s«\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Gå til sagen og skriv meddelelsen ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@@ -5823,131 -4634,104 +5823,131 @@@ msgstr "læsefejl i »%s«: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronisering mislykkedes: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "kan ikke oprette lås for »%s«\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "kan ikke låse »%s«\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek mislykkedes: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transaktion for trustdb er for stor\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "kan ikke tilgå »%s«: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: mappe findes ikke!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "kan ikke tilgå »%s«: %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: kunne ikke oprette versionspost: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ugyldig trustdb oprettet\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trustdb oprettet\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "BEMÆRK: trustdb ikke skrivbar\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ugyldig trustdb\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: kunne ikke oprette hashtabel: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: fejl ved opdatering af versionspost: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: fejl ved læsning af versionspost: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: fejl ved skrivning af versionspost: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek mislykkedes: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: læsning mislykkedes (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ikke en trustdb-fil\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versionspost med recnum %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: ugyldig filversion %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: fejl ved læsning af fri post: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: fejl ved skrivning af mappepost: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: mislykkedes med at nulle en post: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, 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:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Fejl: trustdb er ødelagt.\n"
diff --cc po/de.po
index 1a4ea08,a745205..660585e
--- a/po/de.po
+++ b/po/de.po
@@@ -8,7 -8,6 +8,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-1.4.8\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2015-12-19 15:38+0100\n"
"Last-Translator: Walter Koch <koch at u32.de>\n"
"Language-Team: German <de at li.org>\n"
@@@ -32,77 -28,55 +32,77 @@@ msgstr "Eine Primzahl mit weniger als %
msgid "no entropy gathering module detected\n"
msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "'%s' kann nicht gesperrt werden: %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "es wird auf die Sperre `%s' gewartet...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "'%s' kann nicht geöffnet werden: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "Status von '%s' ist nicht feststellbar: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
"WARNUNG: Falsche Größe der 'random_seed'-Datei - sie wird nicht verwendet\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "'%s' ist unlesbar: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "'%s' kann nicht erzeugt werden: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "kann '%s' nicht schreiben: %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "kann '%s' nicht schließen: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -848,8 -659,6 +848,8 @@@ msgstr "Geben Sie die PIN nochmal ein:
msgid "PIN not correctly repeated; try again"
msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "'%s' kann nicht geöffnet werden\n"
@@@ -1339,17 -1047,14 +1339,17 @@@ msgstr "
" --list-keys [Namen] Schlüssel anzeigen\n"
" --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"Berichte über Programmfehler bitte in englisch an <gnupg-bugs at gnu.org>.\n"
"Sinn- oder Schreibfehler in den deutschen Texten bitte an <de at li.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1359,7 -1064,6 +1359,7 @@@ msgstr "
"Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
"Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1367,63 -1071,50 +1367,63 @@@ msgstr "
"\n"
"Unterstützte Verfahren:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Öff. Schlüssel: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Verschlü.: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Komprimierung: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "Aufruf: gpg [Optionen] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "Widersprüchliche Befehle\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, 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:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1431,14 -1122,12 +1431,14 @@@ msgstr "
"WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
"Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, 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:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1446,486 -1135,379 +1446,486 @@@ msgstr "
"WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
"Konfigurationsdatei `%s'\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "Unbekanntes Konfigurationselement `%s'\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "Zeige Richtlinien-URL während der Unterschriftenlisten"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "Alle Notationen mit den Signaturen anlisten"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "Zeige IETF-Standard"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "Zeige anwenderseitige Notationen in den Unterschriftenlisten"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "Das Ablaufdatum mit den Signaturen anlisten"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei '%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden aus '%s' gelesen\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, 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:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' ist kein gültiger Zeichensatz\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "Ungültige Schlüsselserver-Option\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ungültige Import-Option\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "Ungültige Import-Option\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ungültige Export-Option.\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "Ungültige Export-Option\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ungültige Listen-Option.\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "Ungültige Listen-Option\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "Alle Notationen während der Signaturprüfung anzeigen"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "Zeige anwenderseitige Notationen während der Unterschriftenprüfung"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"Die URL für den bevorzugten Schlüsselserver während der "
"Unterschriftenprüfung anzeigen"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"Zeige widerrufene und verfallene User-IDs während der Unterschriftenprüfung"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "werte das Vertrauen zu Unterschriften durch gültige PKA-Daten auf"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "Ungültige Überprüfungs-Option\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, 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:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "ungültige \"auto-key-locate\"-Liste\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WARNUNG: %s ersetzt %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "HINWEIS: %s ist in dieser Version nicht vorhanden\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus können Sie nur abgetrennte oder Klartextunterschriften "
"machen\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"Im --pgp2-Modus können Sie nicht gleichzeitig unterschreiben und "
"verschlüsseln\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
"verwenden.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"Verschlüsseln einer Botschaft benötigt im --pgp2-Modus die IDEA-"
"Verschlüsselung\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed müssen größer als 0 sein\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed müssen größer als 1 sein\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "ungültige Standard-Voreinstellungen\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "ungültige private Hashvoreinstellungen\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "ungültige private Komprimierungsvoreinstellungen\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s arbeitet noch nicht mit %s zusammen\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [Dateiname]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [Dateiname]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [Dateiname]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [Dateiname]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
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:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [Dateiname]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [Dateiname]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [Dateiname]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
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:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [Dateiname]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [Dateiname]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [Dateiname]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key User-ID"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key User-ID"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key User-ID [Befehle]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "Schlüsselexport fehlgeschlagen: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "Ungültiges Hashverfahren '%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[Dateiname]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Auf geht's - Botschaft eintippen ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@@ -3549,13 -2834,10 +3549,12 @@@ msgstr "PGP 2.x-artige Schlüssel habe
msgid "This key was revoked on %s by %s key %s\n"
msgstr "Dieser Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
+#: g10/keyedit.c:2721
#, c-format
msgid "This key may be revoked by %s key %s"
- msgstr ""
- "Dieser Schlüssel könnte durch %s mit Schlüssel %s widerrufen worden sein"
+ msgstr "Dieser Schlüssel kann von %s-Schlüssel %s widerrufen werden"
+#: g10/keyedit.c:2727
msgid "(sensitive)"
msgstr "(empfindlich)"
@@@ -5934,131 -4744,104 +5933,131 @@@ msgstr "Lesefehler in `%s': %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "Datei `%s' konnte nicht gesperrt werden\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "'%s' kann nicht gesperrt werden\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "trustdb Transaktion zu groß\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "kann aus `%s' nicht zugreifen: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: Verzeichnis existiert nicht!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "kann aus `%s' nicht zugreifen: %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ungültige trust-db erzeugt\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trust-db erzeugt\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "Notiz: Die \"trustdb\" ist nicht schreibbar\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ungültige 'Trust'-Datenbank\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek fehlgeschlagen: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: keine trustdb Datei\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: version record with recnum %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: invalid file version %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: konnte Satz nicht anhängen: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Fehler: Die Vertrauensdatenbank ist fehlerhaft\n"
diff --cc po/el.po
index 72d82a2,a6a9a46..40aa291
--- a/po/el.po
+++ b/po/el.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-1.1.92\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:21+0200\n"
"Last-Translator: Dokianakis Theofanis <madf at hellug.gr>\n"
"Language-Team: Greek <nls at tux.hellug.gr>\n"
@@@ -29,78 -25,56 +29,78 @@@ msgstr "�������� ��������� ������ �����
msgid "no entropy gathering module detected\n"
msgstr "��� ����������� ������� �������� ���������\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "�������� ��������� ��� `%s'\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' ��� ����� �������� ������ - ���������\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "��������: �� ������ random_seed ����� �����\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
"�������������: �� ������ ������� ������� random_seed - ���\n"
"��������������\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "�������� ��������� ��� `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "�������� �������� ��� `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -869,8 -680,6 +869,8 @@@ msgstr "����������� �� ����� ������:
msgid "PIN not correctly repeated; try again"
msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
@@@ -1367,15 -1075,12 +1367,15 @@@ msgstr "
" --list-keys [�������] ���������� ��������\n"
" --fingerprint [�������] ���������� ������������ (fingerprints)\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "��������� �� ���������� ��� <gnupg-bugs at gnu.org>\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "�����: gpg [��������] [������] (-h ��� �������)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1385,7 -1090,6 +1385,7 @@@ msgstr "
"��������, �������, ������������� � ����������������\n"
"� �������������� ���������� ��������� ��� �� �������� �������\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1393,566 -1097,444 +1393,566 @@@ msgstr "
"\n"
"��������������� ����������:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "�����������:"
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "���������������: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "��������: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "�����: gpg [��������] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "������������� �������\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
"�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "������� ����������� ��������� \"%s\"\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "��������: �� �������������� ������ �������� `%s'\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "������ �������� `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "�������� �������� ��� `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �� ������� �������� ���������\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "�� ������� �������� ���������\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "�� %s ��� ����� ������ ��� ����������\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "�� ������� �������� ��������\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "�������� ������� ��� exec-path �� %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �� ������� �������� ��������\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "�������������: �� %s ����������� �� %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�� %s ��� ����������� �� �� %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "������� ��� �������� �������� ��� `%s'\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
"���������\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"� ����������� ���������� ��������� ��� �����������\n"
"��� ����� �������\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "�� ������� �����������\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "�� ������� ����������� ���������� ���������������\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "�� ������� ����������� ���������� ���������� ���������\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, fuzzy, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, fuzzy, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
"����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "�������� ������������� ��� TrustDB: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"�������������: ������� ���������� (-r) ����� ����� ��������������\n"
"�������� ��������\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [����� �������]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [����� �������]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "���������������� �������: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [����� �������]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, fuzzy, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [����� �������]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [����� �������]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, fuzzy, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [����� �������]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [����� �������]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [����� �������]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [�������]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [user-id] [����������]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "keyserver ���� �������: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "������� �������� �������: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "keyserver ��������� �������: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "keyserver �������� �������: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "����������� �������: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "�������� �������: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�� ������� ���������� hash `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[����� �������]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@@ -6011,131 -4822,104 +6011,131 @@@ msgstr "������ ���������: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync �������: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "�������� ����������� ��� `%s': %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "�������� ��������� ��� `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: �������� lseek: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: �������� write (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "���� ������ ��������� trustdb\n"
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "�������� ����������� ��� `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: � ������� ��� �������!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "�������� ����������� ��� `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: �������� ����������� ���� �������� �������: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ������������� �� ������ trustdb\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: ������������� � trustdb\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "��������: � trustdb ��� ����� ���������\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: �� ������ trustdb\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: �������� ����������� hashtable: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: ������ ���� ��������� ��� �������� �������: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: ������ ���� �������� ��� �������� �������: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: ������ ���� ������� ��� �������� �������: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: ������� lseek: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read ������� (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ��� ����� trustdb ������\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: ������� ������� �� recnum %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: �� ������ ������ ������� %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: ������ ���� ������� ��� �������� dir : %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: �������� ���� ��������� ���� ��������: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: �������� ���� �������� ���� ��������: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: ������������� � trustdb\n"
diff --cc po/en at boldquot.po
index a59af13,0000000..5fff69f
mode 100644,000000..100644
--- a/po/en at boldquot.po
+++ b/po/en at boldquot.po
@@@ -1,6395 -1,0 +1,6395 @@@
+# English translations for gnupg package.
- # Copyright (C) 2015 Free Software Foundation, Inc.
++# Copyright (C) 2016 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnupg package.
- # Automatically generated, 2015.
++# 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: gnupg 1.4.20\n"
++"Project-Id-Version: gnupg 1.4.21\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
- "PO-Revision-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
++"PO-Revision-Date: 2016-08-17 15:21+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en at boldquot\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"
+
+#: cipher/primegen.c:119
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "can't gen prime with pbits=%u qbits=%u\n"
+
+#: cipher/primegen.c:310
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "can't generate a prime with less than %d bits\n"
+
+#: cipher/random.c:181
+msgid "no entropy gathering module detected\n"
+msgstr "no entropy gathering module detected\n"
+
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
+#, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "can't lock ‘[1m%s[0m’: %s\n"
+
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
+#, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "waiting for lock on ‘[1m%s[0m’...\n"
+
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "can't open ‘[1m%s[0m’: %s\n"
+
- #: cipher/random.c:484
++#: cipher/random.c:483
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "can't stat ‘[1m%s[0m’: %s\n"
+
- #: cipher/random.c:489
++#: cipher/random.c:488
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "‘[1m%s[0m’ is not a regular file - ignored\n"
+
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
+msgid "note: random_seed file is empty\n"
+msgstr "note: random_seed file is empty\n"
+
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr "WARNING: invalid size of random_seed file - not used\n"
+
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "can't read ‘[1m%s[0m’: %s\n"
+
- #: cipher/random.c:570
++#: cipher/random.c:569
+msgid "note: random_seed file not updated\n"
+msgstr "note: random_seed file not updated\n"
+
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "can't create ‘[1m%s[0m’: %s\n"
+
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "can't write ‘[1m%s[0m’: %s\n"
+
- #: cipher/random.c:648
++#: cipher/random.c:647
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "can't close ‘[1m%s[0m’: %s\n"
+
- #: cipher/random.c:893
++#: cipher/random.c:892
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "WARNING: using insecure random number generator!!\n"
+
- #: cipher/random.c:894
++#: cipher/random.c:893
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+
+#: cipher/rndegd.c:200
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available. Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Not enough random bytes available. Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+
+#: g10/app-openpgp.c:698
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: g10/app-openpgp.c:711
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "failed to store the creation date: %s\n"
+
+#: g10/app-openpgp.c:1150
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#: g10/app-openpgp.c:1158 g10/app-openpgp.c:2875
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: g10/app-openpgp.c:1166 g10/app-openpgp.c:2883
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: g10/app-openpgp.c:1175 g10/app-openpgp.c:2893
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: g10/app-openpgp.c:1495
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: g10/app-openpgp.c:1502
+#, 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"
+
+#: g10/app-openpgp.c:1517
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
+
+#: g10/app-openpgp.c:1528 g10/app-openpgp.c:1982
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: g10/app-openpgp.c:1543 g10/app-openpgp.c:1562 g10/app-openpgp.c:1723
+#: g10/app-openpgp.c:1740 g10/app-openpgp.c:1988 g10/app-openpgp.c:2033
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN callback returned error: %s\n"
+
+#: g10/app-openpgp.c:1569 g10/app-openpgp.c:1747 g10/app-openpgp.c:1995
+#, 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"
+
+#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1621 g10/app-openpgp.c:1759
+#: g10/app-openpgp.c:3193
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:2014 g10/app-openpgp.c:3489
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: g10/app-openpgp.c:1656 g10/app-openpgp.c:3498
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: g10/app-openpgp.c:1663
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%d Admin PIN attempts remaining before card is permanently locked\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string. Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1670
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+
+#: g10/app-openpgp.c:1674
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: g10/app-openpgp.c:1695
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: g10/app-openpgp.c:2023 g10/card-util.c:108
+msgid "Reset Code not or not anymore available\n"
+msgstr "Reset Code not or not anymore available\n"
+
+#: g10/app-openpgp.c:2029
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: g10/app-openpgp.c:2039 g10/app-openpgp.c:2090
+#, 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.
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: g10/app-openpgp.c:2065
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error getting new PIN: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: g10/app-openpgp.c:2187
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: g10/app-openpgp.c:2193
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: g10/app-openpgp.c:2195
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA modulus missing or not of size %d bits\n"
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA public exponent missing or larger than %d bits\n"
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, 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"
+
+#: g10/app-openpgp.c:2766
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: g10/app-openpgp.c:2865
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "key generation completed (%d seconds)\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: g10/app-openpgp.c:3092
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: g10/app-openpgp.c:3503
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"verification of Admin PIN is currently prohibited through this command\n"
+
+#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "can't access %s - invalid OpenPGP card?\n"
+
+#: g10/armor.c:383
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
+#: g10/armor.c:448
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
+#: g10/armor.c:459
+msgid "armor header: "
+msgstr "armor header: "
+
+#: g10/armor.c:472
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
+#: g10/armor.c:485
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
+#: g10/armor.c:546
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
+#: g10/armor.c:681
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
+#: g10/armor.c:693
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
+#: g10/armor.c:848 g10/armor.c:1473
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
+#: g10/armor.c:891
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
+#: g10/armor.c:925
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
+#: g10/armor.c:933
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
+#: g10/armor.c:937 g10/armor.c:1510
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
+#: g10/armor.c:957
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:961
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
+#: g10/armor.c:1287
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
+#: g10/armor.c:1292
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
+#: g10/armor.c:1296
+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/card-util.c:85 g10/card-util.c:374
+#, c-format
+msgid "OpenPGP card not available: %s\n"
+msgstr "OpenPGP card not available: %s\n"
+
+#: g10/card-util.c:90
+#, c-format
+msgid "OpenPGP card no. %s detected\n"
+msgstr "OpenPGP card no. %s detected\n"
+
+#: g10/card-util.c:98 g10/card-util.c:1773 g10/delkey.c:126 g10/keyedit.c:1518
+#: g10/keygen.c:2757 g10/revoke.c:216 g10/revoke.c:454
+msgid "can't do this in batch mode\n"
+msgstr "can't do this in batch mode\n"
+
+#: g10/card-util.c:106
+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:141 g10/card-util.c:1458 g10/card-util.c:1568
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1433
+#: g10/keygen.c:1514
+msgid "Your selection? "
+msgstr "Your selection? "
+
+#: g10/card-util.c:272 g10/card-util.c:322
+msgid "[not set]"
+msgstr "[not set]"
+
+#: g10/card-util.c:512
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:513
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:513
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:540
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:540
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:631
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:633
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “[1m<[0m” character may not be used.\n"
+
+#: g10/card-util.c:635
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:652
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:654
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:672
+#, c-format
+msgid "Error: Combined name too long (limit is %d characters).\n"
+msgstr "Error: Combined name too long (limit is %d characters).\n"
+
+#: g10/card-util.c:693
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:701
+#, c-format
+msgid "Error: URL too long (limit is %d characters).\n"
+msgstr "Error: URL too long (limit is %d characters).\n"
+
+#: g10/card-util.c:794
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error allocating enough memory: %s\n"
+
+#: g10/card-util.c:806 g10/import.c:307
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "error reading ‘[1m%s[0m’: %s\n"
+
+#: g10/card-util.c:839
+#, c-format
+msgid "error writing `%s': %s\n"
+msgstr "error writing ‘[1m%s[0m’: %s\n"
+
+#: g10/card-util.c:866
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:876
+#, c-format
+msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "Error: Login data too long (limit is %d characters).\n"
+
+#: g10/card-util.c:912
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:922
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "Error: Private DO too long (limit is %d characters).\n"
+
+#: g10/card-util.c:1005
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: g10/card-util.c:1013
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
+#: g10/card-util.c:1022
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: g10/card-util.c:1044
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
+#: g10/card-util.c:1058
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1080
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1103
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: g10/card-util.c:1153
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
+#: g10/card-util.c:1154
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
+#: g10/card-util.c:1167
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1254
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: g10/card-util.c:1270
+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:1295
+#, 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:1297
+#, 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:1298
+#, 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:1309 g10/keygen.c:1649 g10/keygen.c:1655
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rounded up to %u bits\n"
+
+#: g10/card-util.c:1317 g10/keygen.c:1636
+#, 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:1322
+#, 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:1342
+#, 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:1364
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1378
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "NOTE: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1381
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1393
+#, 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:1449
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1451 g10/card-util.c:1559
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1452 g10/card-util.c:1561
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1453 g10/card-util.c:1563
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
+#: g10/card-util.c:1469 g10/card-util.c:1588 g10/keyedit.c:939
+#: g10/keygen.c:1437 g10/keygen.c:1465 g10/keygen.c:1566 g10/revoke.c:681
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1556
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1600
+msgid "unknown key protection algorithm\n"
+msgstr "unknown key protection algorithm\n"
+
+#: g10/card-util.c:1605
+msgid "secret parts of key are not available\n"
+msgstr "secret parts of key are not available\n"
+
+#: g10/card-util.c:1610
+msgid "secret key already stored on a card\n"
+msgstr "secret key already stored on a card\n"
+
+#: g10/card-util.c:1623
+#, c-format
+msgid "error writing key to card: %s\n"
+msgstr "error writing key to card: %s\n"
+
+#: g10/card-util.c:1682 g10/keyedit.c:1350
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1684
+msgid "show admin commands"
+msgstr "show admin commands"
+
+#: g10/card-util.c:1685 g10/keyedit.c:1353
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1687
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1690
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1691
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1692
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1693
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1694
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1695
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1696
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1697
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1698
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1699
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1700
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1701
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1823
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:1864
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:1895
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:1897
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
+#: g10/card-util.c:1988 g10/keyedit.c:2257
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “[1mhelp[0m”)\n"
+
+#: g10/cardglue.c:457
+msgid "card reader not available\n"
+msgstr "card reader not available\n"
+
+#: g10/cardglue.c:475
+msgid "Please insert the card and hit return or enter 'c' to cancel: "
+msgstr "Please insert the card and hit return or enter ‘[1mc[0m’ to cancel: "
+
+#: g10/cardglue.c:487
+#, c-format
+msgid "selecting openpgp failed: %s\n"
+msgstr "selecting openpgp failed: %s\n"
+
+#: g10/cardglue.c:614
+#, c-format
+msgid ""
+"Please remove the current card and insert the one with serial number:\n"
+" %.*s\n"
+msgstr ""
+"Please remove the current card and insert the one with serial number:\n"
+" %.*s\n"
+
+#: g10/cardglue.c:623
+msgid "Hit return when ready or enter 'c' to cancel: "
+msgstr "Hit return when ready or enter ‘[1mc[0m’ to cancel: "
+
+#: g10/cardglue.c:1013
+msgid "Enter New Admin PIN: "
+msgstr "Enter New Admin PIN: "
+
+#: g10/cardglue.c:1014
+msgid "Enter New PIN: "
+msgstr "Enter New PIN: "
+
+#: g10/cardglue.c:1015
+msgid "Enter Admin PIN: "
+msgstr "Enter Admin PIN: "
+
+#: g10/cardglue.c:1016
+msgid "Enter PIN: "
+msgstr "Enter PIN: "
+
+#: g10/cardglue.c:1033
+msgid "Repeat this PIN: "
+msgstr "Repeat this PIN: "
+
+#: g10/cardglue.c:1048
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "can't open ‘[1m%s[0m’\n"
+
+#: g10/decrypt.c:103 g10/encode.c:823
+msgid "--output doesn't work for this command\n"
+msgstr "--output doesn't work for this command\n"
+
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:1539 g10/keyedit.c:3450
+#: g10/keyserver.c:1884 g10/revoke.c:226
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “[1m%s[0m” not found: %s\n"
+
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2512 g10/keyserver.c:1898
+#: g10/revoke.c:232 g10/revoke.c:476
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
+#: g10/delkey.c:127 g10/delkey.c:134
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(unless you specify the key by fingerprint)\n"
+
+#: g10/delkey.c:133
+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:145
+msgid "Delete this key from the keyring? (y/N) "
+msgstr "Delete this key from the keyring? (y/N) "
+
+#: g10/delkey.c:153
+msgid "This is a secret key! - really delete? (y/N) "
+msgstr "This is a secret key! - really delete? (y/N) "
+
+#: g10/delkey.c:163
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
+#: g10/delkey.c:173
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
+#: g10/delkey.c:204
+#, 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:206
+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/encode.c:211 g10/sign.c:1258
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: g10/encode.c:216
+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/encode.c:229
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encode.c:239 g10/encode.c:534
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "‘[1m%s[0m’ already compressed\n"
+
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:563
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "WARNING: ‘[1m%s[0m’ is an empty file\n"
+
+#: g10/encode.c:454
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+
+#: g10/encode.c:478
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "reading from ‘[1m%s[0m’\n"
+
+#: g10/encode.c:506
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+
+#: g10/encode.c:516
+#, 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/encode.c:612 g10/sign.c:935
+#, 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/encode.c:699
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:858
+#, 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/encode.c:796
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “[1m%s[0m”\n"
+
+#: g10/encr-data.c:89 g10/mainproc.c:296
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
+#: g10/encr-data.c:91 g10/mainproc.c:300
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "encrypted with unknown algorithm %d\n"
+
+#: g10/encr-data.c:134
+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/encr-data.c:145
+msgid "problem handling encrypted packet\n"
+msgstr "problem handling encrypted packet\n"
+
+#: g10/exec.c:47
+msgid "no remote program execution supported\n"
+msgstr "no remote program execution supported\n"
+
+#: g10/exec.c:174 g10/openfile.c:468
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "can't create directory ‘[1m%s[0m’: %s\n"
+
+#: g10/exec.c:315
+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:345
+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:423
+#, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "unable to execute program ‘[1m%s[0m’: %s\n"
+
+#: g10/exec.c:426
+#, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "unable to execute shell ‘[1m%s[0m’: %s\n"
+
+#: g10/exec.c:511
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "system error while calling external program: %s\n"
+
+#: g10/exec.c:522 g10/exec.c:588
+msgid "unnatural exit of external program\n"
+msgstr "unnatural exit of external program\n"
+
+#: g10/exec.c:537
+msgid "unable to execute external program\n"
+msgstr "unable to execute external program\n"
+
+#: g10/exec.c:553
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "unable to read external program response: %s\n"
+
+#: g10/exec.c:599 g10/exec.c:606
+#, c-format
+msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
+msgstr "WARNING: unable to remove tempfile (%s) ‘[1m%s[0m’: %s\n"
+
+#: g10/exec.c:611
+#, c-format
+msgid "WARNING: unable to remove temp directory `%s': %s\n"
+msgstr "WARNING: unable to remove temp directory ‘[1m%s[0m’: %s\n"
+
+#: g10/export.c:59
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
+#: g10/export.c:61
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
+#: g10/export.c:63
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “[1msensitive[0m”"
+
+#: g10/export.c:65
+msgid "remove the passphrase from exported subkeys"
+msgstr "remove the passphrase from exported subkeys"
+
+#: g10/export.c:67
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
+#: g10/export.c:69
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
+#: g10/export.c:323
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
+#: g10/export.c:352
+#, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "key %s: not protected - skipped\n"
+
+#: g10/export.c:360
+#, 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:371
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
+#: g10/export.c:519
+msgid "about to export an unprotected subkey\n"
+msgstr "about to export an unprotected subkey\n"
+
+#: g10/export.c:542
+#, c-format
+msgid "failed to unprotect the subkey: %s\n"
+msgstr "failed to unprotect the subkey: %s\n"
+
+#: g10/export.c:563
+#, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "WARNING: secret key %s does not have a simple SK checksum\n"
+
+#: g10/export.c:596
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
+#: g10/gpg.c:388
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
+#: g10/gpg.c:390
+msgid "|[file]|make a signature"
+msgstr "|[file]|make a signature"
+
+#: g10/gpg.c:391
+msgid "|[file]|make a clear text signature"
+msgstr "|[file]|make a clear text signature"
+
+#: g10/gpg.c:392
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
+#: g10/gpg.c:393
+msgid "encrypt data"
+msgstr "encrypt data"
+
+#: g10/gpg.c:395
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
+#: g10/gpg.c:397
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
+#: g10/gpg.c:399
+msgid "verify a signature"
+msgstr "verify a signature"
+
+#: g10/gpg.c:401
+msgid "list keys"
+msgstr "list keys"
+
+#: g10/gpg.c:403
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
+#: g10/gpg.c:404
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
+#: g10/gpg.c:405
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
+#: g10/gpg.c:406
+msgid "list secret keys"
+msgstr "list secret keys"
+
+#: g10/gpg.c:407
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
+#: g10/gpg.c:408
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
+#: g10/gpg.c:410
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
+#: g10/gpg.c:411
+msgid "sign a key"
+msgstr "sign a key"
+
+#: g10/gpg.c:412
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
+#: g10/gpg.c:413
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
+#: g10/gpg.c:414
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
+#: g10/gpg.c:416
+msgid "export keys"
+msgstr "export keys"
+
+#: g10/gpg.c:417
+msgid "export keys to a key server"
+msgstr "export keys to a key server"
+
+#: g10/gpg.c:418
+msgid "import keys from a key server"
+msgstr "import keys from a key server"
+
+#: g10/gpg.c:420
+msgid "search for keys on a key server"
+msgstr "search for keys on a key server"
+
+#: g10/gpg.c:422
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
+#: g10/gpg.c:426
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
+#: g10/gpg.c:429
+msgid "print the card status"
+msgstr "print the card status"
+
+#: g10/gpg.c:430
+msgid "change data on a card"
+msgstr "change data on a card"
+
+#: g10/gpg.c:431
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
+#: g10/gpg.c:440
+msgid "update the trust database"
+msgstr "update the trust database"
+
+#: g10/gpg.c:447
+msgid "|algo [files]|print message digests"
+msgstr "|algo [files]|print message digests"
+
+#: g10/gpg.c:451 g10/gpgv.c:69
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: g10/gpg.c:453
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
+#: g10/gpg.c:455
+msgid "|NAME|encrypt for NAME"
+msgstr "|NAME|encrypt for NAME"
+
+#: g10/gpg.c:466
+msgid "use this user-id to sign or decrypt"
+msgstr "use this user-id to sign or decrypt"
+
+#: g10/gpg.c:467
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|set compress level N (0 disables)"
+
+#: g10/gpg.c:472
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
+#: g10/gpg.c:486
+msgid "use as output file"
+msgstr "use as output file"
+
+#: g10/gpg.c:488 g10/gpgv.c:71
+msgid "verbose"
+msgstr "verbose"
+
+#: g10/gpg.c:499
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
+#: g10/gpg.c:500
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
+#: g10/gpg.c:543
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
+#: g10/gpg.c:544
+msgid "generate PGP 2.x compatible messages"
+msgstr "generate PGP 2.x compatible messages"
+
+#: g10/gpg.c:573
+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:576
+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:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
+msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
+msgstr "Please report bugs to <gnupg-bugs at gnu.org>.\n"
+
- #: g10/gpg.c:798
++#: g10/gpg.c:803
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Usage: gpg [options] [files] (-h for help)"
+
- #: g10/gpg.c:801
++#: g10/gpg.c:806
+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:812
++#: g10/gpg.c:817
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:815
++#: g10/gpg.c:820
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:827
++#: g10/gpg.c:832
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:912
++#: g10/gpg.c:917
+msgid "usage: gpg [options] "
+msgstr "usage: gpg [options] "
+
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
+#, 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:1264
++#: g10/gpg.c:1269
+#, c-format
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
+#, 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:1273
++#: g10/gpg.c:1278
+#, c-format
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
+#, 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:1282
++#: g10/gpg.c:1287
+#, 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:1285
++#: g10/gpg.c:1290
+#, 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:1291
++#: g10/gpg.c:1296
+#, 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:1294
++#: g10/gpg.c:1299
+#, 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:1469
++#: g10/gpg.c:1474
+#, c-format
+msgid "unknown configuration item `%s'\n"
+msgstr "unknown configuration item ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
+#, 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:2053
++#: g10/gpg.c:2058
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTE: no default option file ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "option file ‘[1m%s[0m’: %s\n"
+
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "reading options from ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTE: %s is not for normal use!\n"
+
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
+#, 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:2569
++#: g10/gpg.c:2574
+#, 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:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
+#, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "NOTE: %s is not available in this version\n"
+
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
+#, 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:3002
++#: g10/gpg.c:3007
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
+
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr ""
+"you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
+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:3130
++#: g10/gpg.c:3135
+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:3132
++#: g10/gpg.c:3137
+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:3135
++#: g10/gpg.c:3140
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
+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:3146
++#: g10/gpg.c:3151
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
+#, 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:3243
++#: g10/gpg.c:3248
+#, 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:3248
++#: g10/gpg.c:3253
+#, 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:3357
++#: g10/gpg.c:3362
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
+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:3379
++#: g10/gpg.c:3384
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
+#, c-format
+msgid "symmetric encryption of `%s' failed: %s\n"
+msgstr "symmetric encryption of ‘[1m%s[0m’ failed: %s\n"
+
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
+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:3416
++#: g10/gpg.c:3421
+#, 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:3434
++#: g10/gpg.c:3439
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
+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:3467
++#: g10/gpg.c:3472
+#, 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:3487
++#: g10/gpg.c:3492
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [user-id] [keyring]"
+
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "invalid hash algorithm ‘[1m%s[0m’\n"
+
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: g10/getkey.c:151
+msgid "too many entries in pk cache - disabled\n"
+msgstr "too many entries in pk cache - disabled\n"
+
+#: g10/getkey.c:174
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
+#: g10/getkey.c:510 g10/getkey.c:2764
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "key %s: secret key without public key - skipped\n"
+
+#: g10/getkey.c:1001 g10/getkey.c:1011 g10/getkey.c:1021 g10/getkey.c:1037
+#: g10/getkey.c:1052
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr "automatically retrieved ‘[1m%s[0m’ via %s\n"
+
+#: g10/getkey.c:1890
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2496 g10/keyedit.c:3786
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "no secret subkey for public subkey %s - ignoring\n"
+
+#: g10/getkey.c:2717
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "using subkey %s instead of primary key %s\n"
+
+#: g10/gpgv.c:72
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
+#: g10/gpgv.c:73
+msgid "take the keys from this keyring"
+msgstr "take the keys from this keyring"
+
+#: g10/gpgv.c:75
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
+#: g10/gpgv.c:76
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
+#: g10/gpgv.c:101
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: g10/gpgv.c:104
+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:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+
+#: g10/helptext.c:53
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key. Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key. Answer “[1myes[0m” to set this key to\n"
+"ultimately trusted\n"
+
+#: g10/helptext.c:60
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr "If you want to use this untrusted key anyway, answer “[1myes[0m”."
+
+#: g10/helptext.c:64
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr ""
+"Enter the user ID of the addressee to whom you want to send the message."
+
+#: g10/helptext.c:68
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+
+#: g10/helptext.c:82
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption. This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption. This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+
+#: g10/helptext.c:89
+msgid "Enter the size of the key"
+msgstr "Enter the size of the key"
+
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
+msgid "Answer \"yes\" or \"no\""
+msgstr "Answer “[1myes[0m” or “[1mno[0m”"
+
+#: g10/helptext.c:103
+msgid ""
+"Enter the required value as shown in the prompt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Enter the required value as shown in the prompt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+
+#: g10/helptext.c:115
+msgid "Enter the name of the key holder"
+msgstr "Enter the name of the key holder"
+
+#: g10/helptext.c:120
+msgid "please enter an optional but highly suggested email address"
+msgstr "please enter an optional but highly suggested email address"
+
+#: g10/helptext.c:124
+msgid "Please enter an optional comment"
+msgstr "Please enter an optional comment"
+
+#: g10/helptext.c:129
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to quit the key generation."
+msgstr ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to quit the key generation."
+
+#: g10/helptext.c:138
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr ""
+"Answer “[1myes[0m” (or just “[1my[0m”) if it is okay to generate the sub key."
+
+#: g10/helptext.c:146
+msgid ""
+"When you sign a user ID on a key, you should first verify that the key\n"
+"belongs to the person named in the user ID. It is useful for others to\n"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+" key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+" but you could not, or did not verify the key at all. This is useful "
+"for\n"
+" a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key. For example, this "
+"could\n"
+" mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+" key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key. For example, this "
+"could\n"
+" mean that you verified the key fingerprint with the owner of the key in\n"
+" person, and that you checked, by means of a hard to forge document with "
+"a\n"
+" photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+" name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+" of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"When you sign a user ID on a key, you should first verify that the key\n"
+"belongs to the person named in the user ID. It is useful for others to\n"
+"know how carefully you verified this.\n"
+"\n"
+"“[1m0[0m” means you make no particular claim as to how carefully you "
+"verified the\n"
+" key.\n"
+"\n"
+"“[1m1[0m” means you believe the key is owned by the person who claims to own "
+"it\n"
+" but you could not, or did not verify the key at all. This is useful "
+"for\n"
+" a “[1mpersona[0m” verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"“[1m2[0m” means you did casual verification of the key. For example, this "
+"could\n"
+" mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+" key against a photo ID.\n"
+"\n"
+"“[1m3[0m” means you did extensive verification of the key. For example, "
+"this could\n"
+" mean that you verified the key fingerprint with the owner of the key in\n"
+" person, and that you checked, by means of a hard to forge document with "
+"a\n"
+" photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+" name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+" of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what “[1mcasual[0m” and "
+"“[1mextensive[0m”\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer “[1m0[0m”."
+
+#: g10/helptext.c:184
+msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+msgstr "Answer “[1myes[0m” if you want to sign ALL the user IDs"
+
+#: g10/helptext.c:188
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"Answer “[1myes[0m” if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+
+#: g10/helptext.c:193
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "Answer “[1myes[0m” if it is okay to delete the subkey"
+
+#: g10/helptext.c:198
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature because it may be important to establish a\n"
+"trust connection to the key or another key certified by this key."
+msgstr ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature because it may be important to establish a\n"
+"trust connection to the key or another key certified by this key."
+
+#: g10/helptext.c:203
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+
+#: g10/helptext.c:209
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
+
+#: g10/helptext.c:213
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"GnuPG might not be able to use this key anymore. So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"GnuPG might not be able to use this key anymore. So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+
+#: g10/helptext.c:221
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences. The timestamp of all affected\n"
+"self-signatures will be advanced by one second.\n"
+msgstr ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences. The timestamp of all affected\n"
+"self-signatures will be advanced by one second.\n"
+
+#: g10/helptext.c:228
+msgid "Please enter the passphrase; this is a secret sentence \n"
+msgstr "Please enter the passphrase; this is a secret sentence \n"
+
+#: g10/helptext.c:234
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "Please repeat the last passphrase, so you are sure what you typed in."
+
+#: g10/helptext.c:238
+msgid "Give the name of the file to which the signature applies"
+msgstr "Give the name of the file to which the signature applies"
+
+#: g10/helptext.c:243
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Answer “[1myes[0m” if it is okay to overwrite the file"
+
+#: g10/helptext.c:248
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+
+#: g10/helptext.c:254
+msgid ""
+"You should specify a reason for the certification. Depending on the\n"
+"context you have the ability to choose from this list:\n"
+" \"Key has been compromised\"\n"
+" Use this if you have a reason to believe that unauthorized persons\n"
+" got access to your secret key.\n"
+" \"Key is superseded\"\n"
+" Use this if you have replaced this key with a newer one.\n"
+" \"Key is no longer used\"\n"
+" Use this if you have retired this key.\n"
+" \"User ID is no longer valid\"\n"
+" Use this to state that the user ID should not longer be used;\n"
+" this is normally used to mark an email address invalid.\n"
+msgstr ""
+"You should specify a reason for the certification. Depending on the\n"
+"context you have the ability to choose from this list:\n"
+" “[1mKey has been compromised[0m”\n"
+" Use this if you have a reason to believe that unauthorized persons\n"
+" got access to your secret key.\n"
+" “[1mKey is superseded[0m”\n"
+" Use this if you have replaced this key with a newer one.\n"
+" “[1mKey is no longer used[0m”\n"
+" Use this if you have retired this key.\n"
+" “[1mUser ID is no longer valid[0m”\n"
+" Use this to state that the user ID should not longer be used;\n"
+" this is normally used to mark an email address invalid.\n"
+
+#: g10/helptext.c:270
+msgid ""
+"If you like, you can enter a text describing why you issue this\n"
+"revocation certificate. Please keep this text concise.\n"
+"An empty line ends the text.\n"
+msgstr ""
+"If you like, you can enter a text describing why you issue this\n"
+"revocation certificate. Please keep this text concise.\n"
+"An empty line ends the text.\n"
+
+#: g10/helptext.c:285
+msgid "No help available"
+msgstr "No help available"
+
+#: g10/helptext.c:293
+#, c-format
+msgid "No help available for `%s'"
+msgstr "No help available for ‘[1m%s[0m’"
+
+#: g10/import.c:98
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
+#: g10/import.c:101
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
+#: g10/import.c:104
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
+#: g10/import.c:107
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
+#: g10/import.c:110
+msgid "create a public key when importing a secret key"
+msgstr "create a public key when importing a secret key"
+
+#: g10/import.c:113
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
+#: g10/import.c:116
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
+#: g10/import.c:119
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
+#: g10/import.c:293
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
+#: g10/import.c:302
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
+#: g10/import.c:324
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
+#: g10/import.c:326
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
+#: g10/import.c:329
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
+#: g10/import.c:331
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
+#: g10/import.c:337
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
+#: g10/import.c:339
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
+#: g10/import.c:341
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
+#: g10/import.c:343
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
+#: g10/import.c:345
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
+#: g10/import.c:347
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
+#: g10/import.c:349
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
+#: g10/import.c:351
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
+#: g10/import.c:353
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
+#: g10/import.c:355
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
+#: g10/import.c:357
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
+#: g10/import.c:659
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr "WARNING: key %s contains preferences for unavailable\n"
+
+#. TRANSLATORS: This string is belongs to the previous one. They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:663
+msgid " algorithms on these user IDs:\n"
+msgstr " algorithms on these user IDs:\n"
+
+#: g10/import.c:700
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:712
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for digest algorithm %s\n"
+
+#: g10/import.c:724
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “[1m%s[0m”: preference for compression algorithm %s\n"
+
+#: g10/import.c:737
+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:739
+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:763
+#, 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:813 g10/import.c:1237
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
+#: g10/import.c:819
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
+#: g10/import.c:820 g10/import.c:1212
+msgid "rejected by import filter"
+msgstr "rejected by import filter"
+
+#: g10/import.c:849
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
+#: g10/import.c:864
+#, 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:870
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
+#: g10/import.c:872
+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:882 g10/import.c:1360
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
+#: g10/import.c:888
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
+#: g10/import.c:897
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
+#: g10/import.c:902 g10/openfile.c:291 g10/sign.c:803 g10/sign.c:1108
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "writing to ‘[1m%s[0m’\n"
+
+#: g10/import.c:906 g10/import.c:1007 g10/import.c:1277 g10/import.c:1421
+#: g10/import.c:2526 g10/import.c:2548
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "error writing keyring ‘[1m%s[0m’: %s\n"
+
+#: g10/import.c:926
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “[1m%s[0m” imported\n"
+
+#: g10/import.c:950
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
+#: g10/import.c:967 g10/import.c:1378
+#, 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:975 g10/import.c:1385
+#, 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:1017
+#, 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:1020
+#, 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:1023
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “[1m%s[0m” 1 new signature\n"
+
+#: g10/import.c:1026
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “[1m%s[0m” %d new signatures\n"
+
+#: g10/import.c:1029
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “[1m%s[0m” 1 new subkey\n"
+
+#: g10/import.c:1032
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “[1m%s[0m” %d new subkeys\n"
+
+#: g10/import.c:1035
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signature cleaned\n"
+
+#: g10/import.c:1038
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “[1m%s[0m” %d signatures cleaned\n"
+
+#: g10/import.c:1041
+#, 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:1044
+#, 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:1067
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “[1m%s[0m” not changed\n"
+
+#: g10/import.c:1211
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
+#: g10/import.c:1231 g10/import.c:1254
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
+#: g10/import.c:1243
+#, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "key %s: secret key with invalid cipher %d - skipped\n"
+
+#: g10/import.c:1271 g10/import.c:2541
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "no default secret keyring: %s\n"
+
+#: g10/import.c:1282
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
+#: g10/import.c:1313
+#, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "key %s: already in secret keyring\n"
+
+#: g10/import.c:1323
+#, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "key %s: secret key not found: %s\n"
+
+#: g10/import.c:1353
+#, 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:1396
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
+#: g10/import.c:1428
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate imported\n"
+
+#: g10/import.c:1494
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
+#: g10/import.c:1509
+#, 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:1511
+#, 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:1528 g10/import.c:1553 g10/import.c:1603
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
+#: g10/import.c:1529
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
+#: g10/import.c:1542
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
+#: g10/import.c:1555
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
+#: g10/import.c:1570
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
+#: g10/import.c:1592
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
+#: g10/import.c:1605
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
+#: g10/import.c:1620
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
+#: g10/import.c:1662
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “[1m%s[0m”\n"
+
+#: g10/import.c:1683
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
+#: g10/import.c:1710
+#, 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:1720
+#, 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:1737
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
+#: g10/import.c:1751
+#, 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:1759
+#, 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:1888
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
+#: g10/import.c:1950
+#, 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:1964
+#, 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:2023
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “[1m%s[0m” revocation certificate added\n"
+
+#: g10/import.c:2057
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/import.c:2446
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "NOTE: a key's S/N does not match the card's one\n"
+
+#: g10/import.c:2454
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "NOTE: primary key is online and stored on card\n"
+
+#: g10/import.c:2456
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "NOTE: secondary key is online and stored on card\n"
+
+#: g10/keydb.c:166
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "error creating keyring ‘[1m%s[0m’: %s\n"
+
+#: g10/keydb.c:173
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "keyring ‘[1m%s[0m’ created\n"
+
+#: g10/keydb.c:319 g10/keydb.c:322
+#, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "keyblock resource ‘[1m%s[0m’: %s\n"
+
+#: g10/keydb.c:703
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
+#: g10/keyedit.c:265
+msgid "[revocation]"
+msgstr "[revocation]"
+
+#: g10/keyedit.c:266
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
+#: g10/keyedit.c:344 g10/keylist.c:390
+msgid "1 bad signature\n"
+msgstr "1 bad signature\n"
+
+#: g10/keyedit.c:346 g10/keylist.c:392
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d bad signatures\n"
+
+#: g10/keyedit.c:348 g10/keylist.c:394
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 signature not checked due to a missing key\n"
+
+#: g10/keyedit.c:350 g10/keylist.c:396
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d signatures not checked due to missing keys\n"
+
+#: g10/keyedit.c:352 g10/keylist.c:398
+msgid "1 signature not checked due to an error\n"
+msgstr "1 signature not checked due to an error\n"
+
+#: g10/keyedit.c:354 g10/keylist.c:400
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d signatures not checked due to errors\n"
+
+#: g10/keyedit.c:356
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "1 user ID without valid self-signature detected\n"
+
+#: g10/keyedit.c:358
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "%d user IDs without valid self-signatures detected\n"
+
+#: g10/keyedit.c:414 g10/pkclist.c:265
+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:418 g10/pkclist.c:277
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
+#: g10/keyedit.c:419 g10/pkclist.c:279
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
+#: g10/keyedit.c:438
+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:454
+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:599
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “[1m%s[0m” is revoked."
+
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:829
+#: g10/keyedit.c:889 g10/keyedit.c:1752
+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:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:835
+#: g10/keyedit.c:1758
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
+#: g10/keyedit.c:627
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “[1m%s[0m” is expired."
+
+#: g10/keyedit.c:655
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “[1m%s[0m” is not self-signed."
+
+#: g10/keyedit.c:683
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “[1m%s[0m” is signable. "
+
+#: g10/keyedit.c:685
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
+#: g10/keyedit.c:707
+#, 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:716
+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:730
+#, 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:734
+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:755
+#, 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:759
+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:780
+#, 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:783
+#, 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:788
+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:810
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
+#: g10/keyedit.c:823
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
+#: g10/keyedit.c:841
+#, 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:847
+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:882
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+
+#: g10/keyedit.c:884
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "This would make the key unusable in PGP 2.x.\n"
+
+#: g10/keyedit.c:909
+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:914
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
+#: g10/keyedit.c:916
+#, 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:918
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
+#: g10/keyedit.c:920
+#, 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:926
+msgid "Your selection? (enter `?' for more information): "
+msgstr "Your selection? (enter ‘[1m?[0m’ for more information): "
+
+#: g10/keyedit.c:950
+#, 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:957
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
+#: g10/keyedit.c:963
+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:971
+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:981
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
+#: g10/keyedit.c:988
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
+#: g10/keyedit.c:995
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
+#: g10/keyedit.c:1000
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
+#: g10/keyedit.c:1005
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
+#: g10/keyedit.c:1015
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
+#: g10/keyedit.c:1060 g10/keyedit.c:4893 g10/keyedit.c:4984 g10/keyedit.c:5048
+#: g10/keyedit.c:5109 g10/sign.c:318
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
+#: g10/keyedit.c:1125
+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:1136 g10/keygen.c:3413
+msgid "This key is not protected.\n"
+msgstr "This key is not protected.\n"
+
+#: g10/keyedit.c:1140 g10/keygen.c:3401 g10/revoke.c:535
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
+#: g10/keyedit.c:1144 g10/keygen.c:3416
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Secret parts of primary key are stored on-card.\n"
+
+#: g10/keyedit.c:1148 g10/keygen.c:3420
+msgid "Key is protected.\n"
+msgstr "Key is protected.\n"
+
+#: g10/keyedit.c:1172
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Can't edit this key: %s\n"
+
+#: g10/keyedit.c:1178
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+
+#: g10/keyedit.c:1187 g10/keygen.c:2005
+msgid "passphrase not correctly repeated; try again"
+msgstr "passphrase not correctly repeated; try again"
+
+#: g10/keyedit.c:1192
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+
+#: g10/keyedit.c:1195
+msgid "Do you really want to do this? (y/N) "
+msgstr "Do you really want to do this? (y/N) "
+
+#: g10/keyedit.c:1266
+msgid "moving a key signature to the correct place\n"
+msgstr "moving a key signature to the correct place\n"
+
+#: g10/keyedit.c:1352
+msgid "save and quit"
+msgstr "save and quit"
+
+#: g10/keyedit.c:1355
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
+#: g10/keyedit.c:1356
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
+#: g10/keyedit.c:1358
+msgid "select user ID N"
+msgstr "select user ID N"
+
+#: g10/keyedit.c:1359
+msgid "select subkey N"
+msgstr "select subkey N"
+
+#: g10/keyedit.c:1360
+msgid "check signatures"
+msgstr "check signatures"
+
+#: g10/keyedit.c:1365
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
+#: g10/keyedit.c:1370
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
+#: g10/keyedit.c:1372
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
+#: g10/keyedit.c:1374
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
+#: g10/keyedit.c:1378
+msgid "add a user ID"
+msgstr "add a user ID"
+
+#: g10/keyedit.c:1380
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
+#: g10/keyedit.c:1382
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
+#: g10/keyedit.c:1387
+msgid "add a subkey"
+msgstr "add a subkey"
+
+#: g10/keyedit.c:1391
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1393
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1395
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
+#: g10/keyedit.c:1399
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
+#: g10/keyedit.c:1401
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
+#: g10/keyedit.c:1403
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
+#: g10/keyedit.c:1405
+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:1407
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
+#: g10/keyedit.c:1409
+msgid "toggle between the secret and public key listings"
+msgstr "toggle between the secret and public key listings"
+
+#: g10/keyedit.c:1412
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
+#: g10/keyedit.c:1414
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
+#: g10/keyedit.c:1416
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
+#: g10/keyedit.c:1421
+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:1423
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
+#: g10/keyedit.c:1425
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
+#: g10/keyedit.c:1429
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
+#: g10/keyedit.c:1431
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
+#: g10/keyedit.c:1433
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
+#: g10/keyedit.c:1438
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
+#: g10/keyedit.c:1439
+msgid "enable key"
+msgstr "enable key"
+
+#: g10/keyedit.c:1440
+msgid "disable key"
+msgstr "disable key"
+
+#: g10/keyedit.c:1441
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
+#: g10/keyedit.c:1443
+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:1445
+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:1572
+#, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
+msgstr "error reading secret keyblock “[1m%s[0m”: %s\n"
+
+#: g10/keyedit.c:1590
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
+#: g10/keyedit.c:1679
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
+#: g10/keyedit.c:1687
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "Please use the command “[1mtoggle[0m” first.\n"
+
+#: g10/keyedit.c:1706
+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:1746
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
+#: g10/keyedit.c:1765
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
+#: g10/keyedit.c:1772
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
+#: g10/keyedit.c:1781
+#, c-format
+msgid "Unknown signature type `%s'\n"
+msgstr "Unknown signature type ‘[1m%s[0m’\n"
+
+#: g10/keyedit.c:1804
+#, 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:1826 g10/keyedit.c:1846 g10/keyedit.c:2012
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
+#: g10/keyedit.c:1828
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
+#: g10/keyedit.c:1830
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:1831
+msgid "Really remove this user ID? (y/N) "
+msgstr "Really remove this user ID? (y/N) "
+
+#: g10/keyedit.c:1881
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
+#: g10/keyedit.c:1893
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:1921
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
+#: g10/keyedit.c:1935
+#, c-format
+msgid "Can't open `%s': %s\n"
+msgstr "Can't open ‘[1m%s[0m’: %s\n"
+
+#: g10/keyedit.c:1952
+#, c-format
+msgid "Error reading backup key from `%s': %s\n"
+msgstr "Error reading backup key from ‘[1m%s[0m’: %s\n"
+
+#: g10/keyedit.c:1976
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
+#: g10/keyedit.c:1979
+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:1980
+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:2015
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2016
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
+#: g10/keyedit.c:2034
+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:2045
+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:2047
+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:2098
+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:2140
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
+#: g10/keyedit.c:2146
+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:2148
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
+#: g10/keyedit.c:2218
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
+#: g10/keyedit.c:2221
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
+#: g10/keyedit.c:2231
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
+#: g10/keyedit.c:2238
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "update secret failed: %s\n"
+
+#: g10/keyedit.c:2245
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
+#: g10/keyedit.c:2346
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:2398
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keyedit.c:2409
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keyedit.c:2424 g10/keylist.c:308
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:2432 g10/keyedit.c:2433
+msgid "Notations: "
+msgstr "Notations: "
+
+#: g10/keyedit.c:2643
+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:2700
+#, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "This key was revoked on %s by %s key %s\n"
+
+#: g10/keyedit.c:2721
+#, 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:2727
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
+#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keyserver.c:526
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:2746 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:999
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:2748 g10/keylist.c:757 g10/keylist.c:792 g10/keylist.c:886
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
+#: g10/keylist.c:196 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:532 g10/mainproc.c:1005
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
+#: g10/keyedit.c:2752
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
+#: g10/keyedit.c:2767
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
+#: g10/keyedit.c:2771
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
+#: g10/keyedit.c:2778
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
+#: g10/keyedit.c:2806 g10/keylist.c:200
+msgid "card-no: "
+msgstr "card-no: "
+
+#: g10/keyedit.c:2830
+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:2894 g10/keyedit.c:3287 g10/keyserver.c:536
+#: g10/mainproc.c:1846 g10/trustdb.c:1243 g10/trustdb.c:1763
+msgid "revoked"
+msgstr "revoked"
+
+#: g10/keyedit.c:2896 g10/keyedit.c:3289 g10/keyserver.c:540
+#: g10/mainproc.c:1848 g10/trustdb.c:552 g10/trustdb.c:1765
+msgid "expired"
+msgstr "expired"
+
+#: g10/keyedit.c:2961
+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:3007
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
+#: g10/keyedit.c:3008
+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:3069
+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:3074 g10/keyedit.c:3409
+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:3080
+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:3220
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
+#: g10/keyedit.c:3230
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
+#: g10/keyedit.c:3234
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
+#: g10/keyedit.c:3240
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
+#: g10/keyedit.c:3254
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Deleted %d signature.\n"
+
+#: g10/keyedit.c:3255
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Deleted %d signatures.\n"
+
+#: g10/keyedit.c:3258
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
+#: g10/keyedit.c:3291 g10/trustdb.c:1767
+msgid "invalid"
+msgstr "invalid"
+
+#: g10/keyedit.c:3293
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “[1m%s[0m” compacted: %s\n"
+
+#: g10/keyedit.c:3300
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "User ID “[1m%s[0m”: %d signature removed\n"
+
+#: g10/keyedit.c:3301
+#, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "User ID “[1m%s[0m”: %d signatures removed\n"
+
+#: g10/keyedit.c:3309
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “[1m%s[0m”: already minimized\n"
+
+#: g10/keyedit.c:3310
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “[1m%s[0m”: already clean\n"
+
+#: g10/keyedit.c:3404
+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:3415
+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:3435
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
+#: g10/keyedit.c:3460
+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:3475
+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:3497
+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:3516
+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:3522
+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:3584
+msgid "Please remove selections from the secret keys.\n"
+msgstr "Please remove selections from the secret keys.\n"
+
+#: g10/keyedit.c:3590
+msgid "Please select at most one subkey.\n"
+msgstr "Please select at most one subkey.\n"
+
+#: g10/keyedit.c:3594
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
+#: g10/keyedit.c:3597
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
+#: g10/keyedit.c:3646
+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:3662
+msgid "No corresponding signature in secret ring\n"
+msgstr "No corresponding signature in secret ring\n"
+
+#: g10/keyedit.c:3747
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
+#: g10/keyedit.c:3753
+#, 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:3916
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
+#: g10/keyedit.c:3955 g10/keyedit.c:4065 g10/keyedit.c:4185 g10/keyedit.c:4326
+#, 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:4126
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
+#: g10/keyedit.c:4206
+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:4207
+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:4269
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
+#: g10/keyedit.c:4418
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
+#: g10/keyedit.c:4482
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
+#: g10/keyedit.c:4540
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
+#: g10/keyedit.c:4567
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
+#: g10/keyedit.c:4702
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “[1m%s[0m”\n"
+
+#: g10/keyedit.c:4705 g10/keyedit.c:4799 g10/keyedit.c:4842
+#, 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:4707 g10/keyedit.c:4801 g10/keyedit.c:4844
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
+#: g10/keyedit.c:4711
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
+#: g10/keyedit.c:4715
+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:4719
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
+#: g10/keyedit.c:4770
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:4776
+#, 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:4802
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
+#: g10/keyedit.c:4809
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
+#: g10/keyedit.c:4831
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
+#: g10/keyedit.c:4851
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
+#: g10/keyedit.c:4881
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
+#: g10/keyedit.c:4951
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “[1m%s[0m” is already revoked\n"
+
+#: g10/keyedit.c:4968
+#, 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:5032
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
+#: g10/keyedit.c:5094
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
+#: g10/keyedit.c:5189
+#, 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:264
+#, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "preference ‘[1m%s[0m’ duplicated\n"
+
+#: g10/keygen.c:271
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:273
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:275
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: g10/keygen.c:416
+#, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "invalid item ‘[1m%s[0m’ in preference string\n"
+
+#: g10/keygen.c:888
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:928
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:979
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1042 g10/keygen.c:1046 g10/keygen.c:1129 g10/keygen.c:1134
+#: g10/keygen.c:1260 g10/keygen.c:1264 g10/keygen.c:2953
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1051 g10/keygen.c:1140 g10/keygen.c:1148 g10/keygen.c:1269
+#: g10/keygen.c:2959
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1362
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1365
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1368
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1371
+msgid "Authenticate"
+msgstr "Authenticate"
+
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation. If this is not possible use single digits. Here is
+#. a description of the fucntions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1388
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1411
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1415
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1420
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1423
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1426
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1429
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1489
+msgid "Please select what kind of key you want:\n"
+msgstr "Please select what kind of key you want:\n"
+
+#: g10/keygen.c:1491
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1493
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1495
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1496
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1500
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1501
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1505
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1506
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1616
+#, 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:1624
+#, 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:1627
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:1642
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:1722
+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:1733
+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:1754
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:1759
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:1777 g10/keygen.c:1802
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:1784
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:1785
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:1790
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:1791
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:1795
+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:1808
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:1823
+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:1836
+msgid "Real name: "
+msgstr "Real name: "
+
+#: g10/keygen.c:1844
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:1846
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
+#: g10/keygen.c:1848
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
+#: g10/keygen.c:1856
+msgid "Email address: "
+msgstr "Email address: "
+
+#: g10/keygen.c:1862
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
+#: g10/keygen.c:1870
+msgid "Comment: "
+msgstr "Comment: "
+
+#: g10/keygen.c:1876
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
+#: g10/keygen.c:1899
+#, 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:1905
+#, 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:1910
+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:1926
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:1936
+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:1937
+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:1956
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
+#: g10/keygen.c:1996
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+
+#: g10/keygen.c:2006 g10/passphrase.c:819
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:2012
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway. You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway. You can change your passphrase at any time,\n"
+"using this program with the option “[1m--edit-key[0m”.\n"
+"\n"
+
+#: g10/keygen.c:2034
+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:2899
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
+#: g10/keygen.c:3099 g10/keygen.c:3266
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "writing public key to ‘[1m%s[0m’\n"
+
+#: g10/keygen.c:3101 g10/keygen.c:3269
+#, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "writing secret key stub to ‘[1m%s[0m’\n"
+
+#: g10/keygen.c:3104 g10/keygen.c:3272
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "writing secret key to ‘[1m%s[0m’\n"
+
+#: g10/keygen.c:3255
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
+#: g10/keygen.c:3261
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "no writable secret keyring found: %s\n"
+
+#: g10/keygen.c:3279
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "error writing public keyring ‘[1m%s[0m’: %s\n"
+
+#: g10/keygen.c:3286
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "error writing secret keyring ‘[1m%s[0m’: %s\n"
+
+#: g10/keygen.c:3309
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
+#: g10/keygen.c:3320
+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:3332 g10/keygen.c:3465 g10/keygen.c:3581
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
+#: g10/keygen.c:3384 g10/keygen.c:3514 g10/sign.c:242
+#, 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:3386 g10/keygen.c:3516 g10/sign.c:244
+#, 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:3395 g10/keygen.c:3527
+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:3434 g10/keygen.c:3560
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
+#: g10/keygen.c:3747
+#, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "storing key onto card failed: %s\n"
+
+#: g10/keygen.c:3794
+#, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "can't create backup file ‘[1m%s[0m’: %s\n"
+
+#: g10/keygen.c:3820
+#, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTE: backup of card key saved to ‘[1m%s[0m’\n"
+
+#: g10/keyid.c:505 g10/keyid.c:517 g10/keyid.c:529 g10/keyid.c:541
+msgid "never "
+msgstr "never "
+
+#: g10/keylist.c:265
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
+#: g10/keylist.c:267
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
+#: g10/keylist.c:306
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
+#: g10/keylist.c:359
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
+#: g10/keylist.c:361
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
+#: g10/keylist.c:471
+msgid "Keyring"
+msgstr "Keyring"
+
+#: g10/keylist.c:1516
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
+#: g10/keylist.c:1518
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1525
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
+#: g10/keylist.c:1527
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#: g10/keylist.c:1531 g10/keylist.c:1535
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
+#: g10/keylist.c:1602
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
+#: g10/keyring.c:1274
+#, c-format
+msgid "renaming `%s' to `%s' failed: %s\n"
+msgstr "renaming ‘[1m%s[0m’ to ‘[1m%s[0m’ failed: %s\n"
+
+#: g10/keyring.c:1304
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "WARNING: 2 files with confidential information exists.\n"
+
+#: g10/keyring.c:1305
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s is the unchanged one\n"
+
+#: g10/keyring.c:1306
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s is the new one\n"
+
+#: g10/keyring.c:1307
+msgid "Please fix this possible security flaw\n"
+msgstr "Please fix this possible security flaw\n"
+
+#: g10/keyring.c:1407
+#, c-format
+msgid "caching keyring `%s'\n"
+msgstr "caching keyring ‘[1m%s[0m’\n"
+
+#: g10/keyring.c:1466
+#, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu keys cached so far (%lu signatures)\n"
+
+#: g10/keyring.c:1478
+#, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu keys cached (%lu signatures)\n"
+
+#: g10/keyring.c:1549
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
+#: g10/keyserver.c:70
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
+#: g10/keyserver.c:71
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
+#: g10/keyserver.c:73
+msgid "use temporary files to pass data to keyserver helpers"
+msgstr "use temporary files to pass data to keyserver helpers"
+
+#: g10/keyserver.c:75
+msgid "do not delete temporary files after using them"
+msgstr "do not delete temporary files after using them"
+
+#: g10/keyserver.c:79
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
+#: g10/keyserver.c:81
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
+#: g10/keyserver.c:83
+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:149
+#, c-format
+msgid "WARNING: keyserver option `%s' is not used on this platform\n"
+msgstr "WARNING: keyserver option ‘[1m%s[0m’ is not used on this platform\n"
+
+#: g10/keyserver.c:538
+msgid "disabled"
+msgstr "disabled"
+
+#: g10/keyserver.c:739
+msgid "Enter number(s), N)ext, or Q)uit > "
+msgstr "Enter number(s), N)ext, or Q)uit > "
+
+#: g10/keyserver.c:823 g10/keyserver.c:1578
+#, c-format
+msgid "invalid keyserver protocol (us %d!=handler %d)\n"
+msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
+
+#: g10/keyserver.c:921
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “[1m%s[0m” not found on keyserver\n"
+
+#: g10/keyserver.c:923
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
+#: g10/keyserver.c:1269
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
+#: g10/keyserver.c:1273
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
+#: g10/keyserver.c:1297
+#, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "searching for names from %s server %s\n"
+
+#: g10/keyserver.c:1300
+#, c-format
+msgid "searching for names from %s\n"
+msgstr "searching for names from %s\n"
+
+#: g10/keyserver.c:1478
+#, c-format
+msgid "sending key %s to %s server %s\n"
+msgstr "sending key %s to %s server %s\n"
+
+#: g10/keyserver.c:1482
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
+#: g10/keyserver.c:1525
+#, c-format
+msgid "searching for \"%s\" from %s server %s\n"
+msgstr "searching for “[1m%s[0m” from %s server %s\n"
+
+#: g10/keyserver.c:1528
+#, c-format
+msgid "searching for \"%s\" from %s\n"
+msgstr "searching for “[1m%s[0m” from %s\n"
+
+#: g10/keyserver.c:1535 g10/keyserver.c:1657
+msgid "no keyserver action!\n"
+msgstr "no keyserver action!\n"
+
+#: g10/keyserver.c:1586
+#, c-format
+msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
+msgstr "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
+
+#: g10/keyserver.c:1603
+msgid "keyserver did not send VERSION\n"
+msgstr "keyserver did not send VERSION\n"
+
+#: g10/keyserver.c:1641 g10/keyserver.c:1736
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "keyserver communications error: %s\n"
+
+#: g10/keyserver.c:1679 g10/keyserver.c:2207
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
+#: g10/keyserver.c:1685
+msgid "external keyserver calls are not supported in this build\n"
+msgstr "external keyserver calls are not supported in this build\n"
+
+#: g10/keyserver.c:1699
+#, c-format
+msgid "no handler for keyserver scheme `%s'\n"
+msgstr "no handler for keyserver scheme ‘[1m%s[0m’\n"
+
+#: g10/keyserver.c:1704
+#, c-format
+msgid "action `%s' not supported with keyserver scheme `%s'\n"
+msgstr "action ‘[1m%s[0m’ not supported with keyserver scheme ‘[1m%s[0m’\n"
+
+#: g10/keyserver.c:1712
+#, c-format
+msgid "%s does not support handler version %d\n"
+msgstr "%s does not support handler version %d\n"
+
+#: g10/keyserver.c:1719
+msgid "keyserver timed out\n"
+msgstr "keyserver timed out\n"
+
+#: g10/keyserver.c:1727
+msgid "keyserver internal error\n"
+msgstr "keyserver internal error\n"
+
+#: g10/keyserver.c:1761 g10/keyserver.c:1795
+#, c-format
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr "“[1m%s[0m” not a key ID: skipping\n"
+
+#: g10/keyserver.c:2054
+#, 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:2076
+#, c-format
+msgid "refreshing 1 key from %s\n"
+msgstr "refreshing 1 key from %s\n"
+
+#: g10/keyserver.c:2078
+#, c-format
+msgid "refreshing %d keys from %s\n"
+msgstr "refreshing %d keys from %s\n"
+
+#: g10/keyserver.c:2134
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
+#: g10/keyserver.c:2140
+#, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "WARNING: unable to parse URI %s\n"
+
+#: g10/mainproc.c:249
+#, 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:294
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
+#: g10/mainproc.c:304
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
+#: g10/mainproc.c:385
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
+#: g10/mainproc.c:449
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
+#: g10/mainproc.c:482
+#, 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:486 g10/pkclist.c:220
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “[1m%s[0m”\n"
+
+#: g10/mainproc.c:490
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
+#: g10/mainproc.c:505
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
+#: g10/mainproc.c:526
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
+#: g10/mainproc.c:528
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
+#: g10/mainproc.c:561 g10/mainproc.c:582
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
+#: g10/mainproc.c:568
+#, 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:605
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
+#: g10/mainproc.c:609
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
+#: g10/mainproc.c:612
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
+#: g10/mainproc.c:618
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
+#: g10/mainproc.c:639
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "NOTE: sender requested “[1mfor-your-eyes-only[0m”\n"
+
+#: g10/mainproc.c:641
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
+#: g10/mainproc.c:726
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
+#: g10/mainproc.c:852
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “[1mgpg --import[0m” to apply\n"
+
+#: g10/mainproc.c:1200
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
+#: g10/mainproc.c:1471
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
+#: g10/mainproc.c:1580
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
+#: g10/mainproc.c:1591
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
+#: g10/mainproc.c:1592
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
+#: g10/mainproc.c:1596
+#, 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:1616
+msgid "Key available at: "
+msgstr "Key available at: "
+
+#: g10/mainproc.c:1749 g10/mainproc.c:1797
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “[1m%s[0m”"
+
+#: g10/mainproc.c:1751 g10/mainproc.c:1799
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “[1m%s[0m”"
+
+#: g10/mainproc.c:1753 g10/mainproc.c:1801
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “[1m%s[0m”"
+
+#: g10/mainproc.c:1805
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
+#: g10/mainproc.c:1839
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “[1m%s[0m”"
+
+#: g10/mainproc.c:1937
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
+#: g10/mainproc.c:1942
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
+#: g10/mainproc.c:1945
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s signature, digest algorithm %s\n"
+
+#: g10/mainproc.c:1946
+msgid "binary"
+msgstr "binary"
+
+#: g10/mainproc.c:1947
+msgid "textmode"
+msgstr "textmode"
+
+#: g10/mainproc.c:1947 g10/trustdb.c:551
+msgid "unknown"
+msgstr "unknown"
+
+#: g10/mainproc.c:1981
+#, 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:2005
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
+#: g10/mainproc.c:2074 g10/mainproc.c:2090 g10/mainproc.c:2176
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
+#: g10/mainproc.c:2117
+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:2125
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
+#: g10/mainproc.c:2182
+msgid "old style (PGP 2.x) signature\n"
+msgstr "old style (PGP 2.x) signature\n"
+
+#: g10/mainproc.c:2192
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "invalid root packet detected in proc_tree()\n"
+
+#: g10/misc.c:124
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "can't disable core dumps: %s\n"
+
+#: g10/misc.c:144 g10/misc.c:172 g10/misc.c:244
+#, 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:209
+#, c-format
+msgid "fstat(%d) failed in %s: %s\n"
+msgstr "fstat(%d) failed in %s: %s\n"
+
+#: g10/misc.c:307
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "WARNING: using experimental public key algorithm %s\n"
+
+#: g10/misc.c:313
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+
+#: g10/misc.c:326
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "WARNING: using experimental cipher algorithm %s\n"
+
+#: g10/misc.c:343
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "WARNING: using experimental digest algorithm %s\n"
+
+#: g10/misc.c:350 g10/misc.c:456
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNING: digest algorithm %s is deprecated\n"
+
+#: g10/misc.c:458 g10/misc.c:473 g10/sig-check.c:101
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: g10/misc.c:472
+#, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "NOTE: This feature is not available in %s\n"
+
+#: g10/misc.c:729
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “[1m%s[0m”\n"
+
+#: g10/misc.c:733
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “[1m%s[0m” is a deprecated option\n"
+
+#: g10/misc.c:735
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “[1m%s%s[0m” instead\n"
+
+#: g10/misc.c:742
+#, 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:755
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:780
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
+#: g10/misc.c:907
+#, 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:1082
+#, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "ambiguous option ‘[1m%s[0m’\n"
+
+#: g10/misc.c:1107
+#, c-format
+msgid "unknown option `%s'\n"
+msgstr "unknown option ‘[1m%s[0m’\n"
+
+#: g10/misc.c:1331
+#, c-format
+msgid "Unknown weak digest '%s'\n"
+msgstr "Unknown weak digest ‘[1m%s[0m’\n"
+
+#: g10/openfile.c:88
+#, c-format
+msgid "File `%s' exists. "
+msgstr "File ‘[1m%s[0m’ exists. "
+
+#: g10/openfile.c:92
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:129
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:152
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:197
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:357
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "assuming signed data in ‘[1m%s[0m’\n"
+
+#: g10/openfile.c:437
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "new configuration file ‘[1m%s[0m’ created\n"
+
+#: g10/openfile.c:439
+#, 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/openfile.c:471
+#, c-format
+msgid "directory `%s' created\n"
+msgstr "directory ‘[1m%s[0m’ created\n"
+
+#: g10/parse-packet.c:149
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
+#: g10/parse-packet.c:768
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
+#: g10/parse-packet.c:1227
+#, 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:319
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent is not available in this session\n"
+
+#: g10/passphrase.c:335
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "malformed GPG_AGENT_INFO environment variable\n"
+
+#: g10/passphrase.c:354
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent protocol version %d is not supported\n"
+
+#: g10/passphrase.c:371
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "can't connect to ‘[1m%s[0m’: %s\n"
+
+#: g10/passphrase.c:388 g10/passphrase.c:664 g10/passphrase.c:754
+msgid "problem with the agent - disabling agent use\n"
+msgstr "problem with the agent - disabling agent use\n"
+
+#: g10/passphrase.c:541 g10/passphrase.c:923
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
+#: g10/passphrase.c:555
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s, created %s%s\n"
+msgstr ""
+"You need a passphrase to unlock the secret key for user:\n"
+"“[1m%.*s[0m”\n"
+"%u-bit %s key, ID %s, created %s%s\n"
+
+#: g10/passphrase.c:580
+msgid "Repeat passphrase\n"
+msgstr "Repeat passphrase\n"
+
+#: g10/passphrase.c:582
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
+#: g10/passphrase.c:658
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
+#: g10/passphrase.c:814 g10/passphrase.c:983
+msgid "can't query passphrase in batch mode\n"
+msgstr "can't query passphrase in batch mode\n"
+
+#: g10/passphrase.c:821 g10/passphrase.c:988
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
+#: g10/passphrase.c:904
+#, 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:910
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
+#: g10/passphrase.c:919
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
+#: g10/passphrase.c:996
+msgid "Repeat passphrase: "
+msgstr "Repeat passphrase: "
+
+#: g10/photoid.c:72
+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:94
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Enter JPEG filename for photo ID: "
+
+#: g10/photoid.c:115
+#, c-format
+msgid "unable to open JPEG file `%s': %s\n"
+msgstr "unable to open JPEG file ‘[1m%s[0m’: %s\n"
+
+#: g10/photoid.c:126
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr "This JPEG is really large (%d bytes) !\n"
+
+#: g10/photoid.c:128
+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:144
+#, c-format
+msgid "`%s' is not a JPEG file\n"
+msgstr "‘[1m%s[0m’ is not a JPEG file\n"
+
+#: g10/photoid.c:163
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Is this photo correct (y/N/q)? "
+
+#: g10/photoid.c:333
+msgid "no photo viewer set\n"
+msgstr "no photo viewer set\n"
+
+#: g10/photoid.c:387
+msgid "unable to display photo ID!\n"
+msgstr "unable to display photo ID!\n"
+
+#: g10/pkclist.c:63 g10/revoke.c:619
+msgid "No reason specified"
+msgstr "No reason specified"
+
+#: g10/pkclist.c:65 g10/revoke.c:621
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
+#: g10/pkclist.c:67 g10/revoke.c:620
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
+#: g10/pkclist.c:69 g10/revoke.c:622
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
+#: g10/pkclist.c:71 g10/revoke.c:623
+msgid "User ID is no longer valid"
+msgstr "User ID is no longer valid"
+
+#: g10/pkclist.c:75
+msgid "reason for revocation: "
+msgstr "reason for revocation: "
+
+#: g10/pkclist.c:92
+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:207
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
+#: g10/pkclist.c:215
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
+
+#: g10/pkclist.c:248
+#, c-format
+msgid " aka \"%s\"\n"
+msgstr " aka “[1m%s[0m”\n"
+
+#: g10/pkclist.c:258
+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:273
+#, 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:275
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = I do NOT trust\n"
+
+#: g10/pkclist.c:281
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = I trust ultimately\n"
+
+#: g10/pkclist.c:287
+msgid " m = back to the main menu\n"
+msgstr " m = back to the main menu\n"
+
+#: g10/pkclist.c:290
+msgid " s = skip this key\n"
+msgstr " s = skip this key\n"
+
+#: g10/pkclist.c:291
+msgid " q = quit\n"
+msgstr " q = quit\n"
+
+#: g10/pkclist.c:295
+#, 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:301 g10/revoke.c:648
+msgid "Your decision? "
+msgstr "Your decision? "
+
+#: g10/pkclist.c:322
+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:336
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificates leading to an ultimately trusted key:\n"
+
+#: g10/pkclist.c:421
+#, 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:426
+#, 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:432
+msgid "This key probably belongs to the named user\n"
+msgstr "This key probably belongs to the named user\n"
+
+#: g10/pkclist.c:437
+msgid "This key belongs to us\n"
+msgstr "This key belongs to us\n"
+
+#: g10/pkclist.c:463
+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:470
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
+#: g10/pkclist.c:504
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
+#: g10/pkclist.c:511
+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:520
+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:523
+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:524
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
+#: g10/pkclist.c:530
+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:535
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
+#: g10/pkclist.c:555
+#, 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:562
+#, 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:574
+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:582
+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:593
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
+#: g10/pkclist.c:604
+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:606
+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:614
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
+#: g10/pkclist.c:615
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
+#: g10/pkclist.c:623
+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:625
+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:824 g10/pkclist.c:871 g10/pkclist.c:1083 g10/pkclist.c:1158
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
+#: g10/pkclist.c:841 g10/pkclist.c:1126
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
+#: g10/pkclist.c:892
+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:916
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
+#: g10/pkclist.c:942
+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:967
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
+#: g10/pkclist.c:976 g10/pkclist.c:1050
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
+#: g10/pkclist.c:997
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
+#: g10/pkclist.c:1006
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
+#: g10/pkclist.c:1041
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “[1m%s[0m”\n"
+
+#: g10/pkclist.c:1103
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
+#: g10/pkclist.c:1166
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
+#: g10/plaintext.c:102
+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:146 g10/plaintext.c:151 g10/plaintext.c:169
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "error creating ‘[1m%s[0m’: %s\n"
+
+#: g10/plaintext.c:476
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
+#: g10/plaintext.c:482
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
+#: g10/plaintext.c:514
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
+#: g10/plaintext.c:555
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
+#: g10/plaintext.c:569
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "can't open signed data ‘[1m%s[0m’\n"
+
+#: g10/pubkey-enc.c:102
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:133
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:221
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:240
+#, 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:276
+#, 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:296
+#, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "NOTE: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:302
+msgid "NOTE: key has been revoked"
+msgstr "NOTE: key has been revoked"
+
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:584
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:145
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
+#: g10/revoke.c:306
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
+#: g10/revoke.c:310
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
+#: g10/revoke.c:314
+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:327 g10/revoke.c:550
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
+#: g10/revoke.c:342 g10/revoke.c:564
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
+#: g10/revoke.c:405
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
+#: g10/revoke.c:411
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “[1m%s[0m”\n"
+
+#: g10/revoke.c:469
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “[1m%s[0m” not found: %s\n"
+
+#: g10/revoke.c:496
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "no corresponding public key: %s\n"
+
+#: g10/revoke.c:507
+msgid "public key does not match secret key!\n"
+msgstr "public key does not match secret key!\n"
+
+#: g10/revoke.c:514
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:531
+msgid "unknown protection algorithm\n"
+msgstr "unknown protection algorithm\n"
+
+#: g10/revoke.c:539
+msgid "NOTE: This key is not protected!\n"
+msgstr "NOTE: This key is not protected!\n"
+
+#: g10/revoke.c:590
+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:631
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
+#: g10/revoke.c:641
+msgid "Cancel"
+msgstr "Cancel"
+
+#: g10/revoke.c:643
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
+#: g10/revoke.c:684
+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:712
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
+#: g10/revoke.c:714
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
+#: g10/revoke.c:719
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: g10/seckey-cert.c:53
+msgid "secret key parts are not available\n"
+msgstr "secret key parts are not available\n"
+
+#: g10/seckey-cert.c:59
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "protection algorithm %d%s is not supported\n"
+
+#: g10/seckey-cert.c:65
+#, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "protection digest %d is not supported\n"
+
+#: g10/seckey-cert.c:266
+msgid "Invalid passphrase; please try again"
+msgstr "Invalid passphrase; please try again"
+
+#: g10/seckey-cert.c:267
+#, c-format
+msgid "%s ...\n"
+msgstr "%s ...\n"
+
+#: g10/seckey-cert.c:328
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "WARNING: Weak key detected - please change passphrase again.\n"
+
+#: g10/seckey-cert.c:366
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
+
+#: g10/seskey.c:51
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
+#: g10/seskey.c:56
+#, 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:218
+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"
+
+#: g10/seskey.c:232
+#, c-format
+msgid "DSA key %s uses an unsafe (%u bit) hash\n"
+msgstr "DSA key %s uses an unsafe (%u bit) hash\n"
+
+#: g10/seskey.c:244
+#, c-format
+msgid "DSA key %s requires a %u bit or larger hash\n"
+msgstr "DSA key %s requires a %u bit or larger hash\n"
+
+#: g10/sig-check.c:74
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
+#: g10/sig-check.c:99
+#, 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:111
+#, 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:191
+#, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "public key %s is %lu second newer than the signature\n"
+
+#: g10/sig-check.c:192
+#, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "public key %s is %lu seconds newer than the signature\n"
+
+#: g10/sig-check.c:203
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:205
+#, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:219
+#, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "NOTE: signature key %s expired %s\n"
+
+#: g10/sig-check.c:254
+#, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "Note: signatures using the %s algorithm are rejected\n"
+
+#: g10/sig-check.c:345
+#, 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:603
+#, 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:629
+#, 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:90
+#, 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:116
+#, 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:139
+#, 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
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "checking created signature failed: %s\n"
+
+#: g10/sign.c:322
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “[1m%s[0m”\n"
+
+#: g10/sign.c:760
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+
+#: g10/sign.c:834
+#, 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:960
+msgid "signing:"
+msgstr "signing:"
+
+#: g10/sign.c:1073
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+
+#: g10/sign.c:1252
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
+#: g10/skclist.c:126 g10/skclist.c:190
+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:157
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “[1m%s[0m”: duplicated\n"
+
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “[1m%s[0m”: %s\n"
+
+#: g10/skclist.c:170
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
+#: g10/skclist.c:185
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
+#: g10/tdbdump.c:58 g10/trustdb.c:365
+#, 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:103
+#, 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:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
+#, c-format
+msgid "error in `%s': %s\n"
+msgstr "error in ‘[1m%s[0m’: %s\n"
+
+#: g10/tdbdump.c:158
+msgid "line too long"
+msgstr "line too long"
+
+#: g10/tdbdump.c:166
+msgid "colon missing"
+msgstr "colon missing"
+
+#: g10/tdbdump.c:172
+msgid "invalid fingerprint"
+msgstr "invalid fingerprint"
+
+#: g10/tdbdump.c:177
+msgid "ownertrust value missing"
+msgstr "ownertrust value missing"
+
+#: g10/tdbdump.c:213
+#, c-format
+msgid "error finding trust record in `%s': %s\n"
+msgstr "error finding trust record in ‘[1m%s[0m’: %s\n"
+
+#: g10/tdbdump.c:217
+#, c-format
+msgid "read error in `%s': %s\n"
+msgstr "read error in ‘[1m%s[0m’: %s\n"
+
+#: g10/tdbdump.c:226 g10/trustdb.c:380
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
+#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "can't create lock for ‘[1m%s[0m’\n"
+
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "can't lock ‘[1m%s[0m’\n"
+
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek failed: %s\n"
+
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
+#, 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:269
++#: g10/tdbio.c:270
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaction too large\n"
+
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "can't access ‘[1m%s[0m’: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
++#, c-format
++msgid "can't access `%s': %s\n"
++msgstr "can't access ‘[1m%s[0m’: %s\n"
++
++#: g10/tdbio.c:570
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
+msgid "NOTE: trustdb not writable\n"
+msgstr "NOTE: trustdb not writable\n"
+
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
+#: g10/textfilter.c:147
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "can't handle text lines longer than %d characters\n"
+
+#: g10/textfilter.c:246
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
+#: g10/trustdb.c:226
+#, 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:257
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
+#: g10/trustdb.c:295
+#, 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:310
+#, 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:320
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
+#: g10/trustdb.c:344
+#, 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:350
+#, 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:423
+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:432
+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"
+
+#. 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/trustdb.c:525
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
+
+#: g10/trustdb.c:527
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trustdb.c:529 g10/trustdb.c:534
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trustdb.c:533
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trustdb.c:535
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: g10/trustdb.c:536
+msgid "[marginal]"
+msgstr "[marginal]"
+
+#: g10/trustdb.c:537
+msgid "[ full ]"
+msgstr "[ full ]"
+
+#: g10/trustdb.c:538
+msgid "[ultimate]"
+msgstr "[ultimate]"
+
+#: g10/trustdb.c:553
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trustdb.c:554
+msgid "never"
+msgstr "never"
+
+#: g10/trustdb.c:555
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trustdb.c:556
+msgid "full"
+msgstr "full"
+
+#: g10/trustdb.c:557
+msgid "ultimate"
+msgstr "ultimate"
+
+#: g10/trustdb.c:597
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
+#: g10/trustdb.c:603 g10/trustdb.c:2513
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:612
+#, 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:627
+#, 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:879 g10/trustdb.c:1341
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:1084
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:1088
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
+#: g10/trustdb.c:2256
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d keys processed (%d validity counts cleared)\n"
+
+#: g10/trustdb.c:2321
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
+#: g10/trustdb.c:2335
+#, 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:2358
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+
+#: g10/trustdb.c:2444
+#, 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:2519
+#, 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/verify.c:116
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+
+#: g10/verify.c:192
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "input line %u too long or missing LF\n"
+
+#: util/errors.c:53
+msgid "general error"
+msgstr "general error"
+
+#: util/errors.c:54
+msgid "unknown packet type"
+msgstr "unknown packet type"
+
+#: util/errors.c:55
+msgid "unknown version"
+msgstr "unknown version"
+
+#: util/errors.c:56
+msgid "unknown pubkey algorithm"
+msgstr "unknown pubkey algorithm"
+
+#: util/errors.c:57
+msgid "unknown digest algorithm"
+msgstr "unknown digest algorithm"
+
+#: util/errors.c:58
+msgid "bad public key"
+msgstr "bad public key"
+
+#: util/errors.c:59
+msgid "bad secret key"
+msgstr "bad secret key"
+
+#: util/errors.c:60
+msgid "bad signature"
+msgstr "bad signature"
+
+#: util/errors.c:61
+msgid "checksum error"
+msgstr "checksum error"
+
+#: util/errors.c:62
+msgid "bad passphrase"
+msgstr "bad passphrase"
+
+#: util/errors.c:63
+msgid "public key not found"
+msgstr "public key not found"
+
+#: util/errors.c:64
+msgid "unknown cipher algorithm"
+msgstr "unknown cipher algorithm"
+
+#: util/errors.c:65
+msgid "can't open the keyring"
+msgstr "can't open the keyring"
+
+#: util/errors.c:66
+msgid "invalid packet"
+msgstr "invalid packet"
+
+#: util/errors.c:67
+msgid "invalid armor"
+msgstr "invalid armor"
+
+#: util/errors.c:68
+msgid "no such user id"
+msgstr "no such user id"
+
+#: util/errors.c:69
+msgid "secret key not available"
+msgstr "secret key not available"
+
+#: util/errors.c:70
+msgid "wrong secret key used"
+msgstr "wrong secret key used"
+
+#: util/errors.c:71
+msgid "not supported"
+msgstr "not supported"
+
+#: util/errors.c:72
+msgid "bad key"
+msgstr "bad key"
+
+#: util/errors.c:73
+msgid "file read error"
+msgstr "file read error"
+
+#: util/errors.c:74
+msgid "file write error"
+msgstr "file write error"
+
+#: util/errors.c:75
+msgid "unknown compress algorithm"
+msgstr "unknown compress algorithm"
+
+#: util/errors.c:76
+msgid "file open error"
+msgstr "file open error"
+
+#: util/errors.c:77
+msgid "file create error"
+msgstr "file create error"
+
+#: util/errors.c:78
+msgid "invalid passphrase"
+msgstr "invalid passphrase"
+
+#: util/errors.c:79
+msgid "unimplemented pubkey algorithm"
+msgstr "unimplemented pubkey algorithm"
+
+#: util/errors.c:80
+msgid "unimplemented cipher algorithm"
+msgstr "unimplemented cipher algorithm"
+
+#: util/errors.c:81
+msgid "unknown signature class"
+msgstr "unknown signature class"
+
+#: util/errors.c:82
+msgid "trust database error"
+msgstr "trust database error"
+
+#: util/errors.c:83
+msgid "bad MPI"
+msgstr "bad MPI"
+
+#: util/errors.c:84
+msgid "resource limit"
+msgstr "resource limit"
+
+#: util/errors.c:85
+msgid "invalid keyring"
+msgstr "invalid keyring"
+
+#: util/errors.c:86
+msgid "bad certificate"
+msgstr "bad certificate"
+
+#: util/errors.c:87
+msgid "malformed user id"
+msgstr "malformed user id"
+
+#: util/errors.c:88
+msgid "file close error"
+msgstr "file close error"
+
+#: util/errors.c:89
+msgid "file rename error"
+msgstr "file rename error"
+
+#: util/errors.c:90
+msgid "file delete error"
+msgstr "file delete error"
+
+#: util/errors.c:91
+msgid "unexpected data"
+msgstr "unexpected data"
+
+#: util/errors.c:92
+msgid "timestamp conflict"
+msgstr "timestamp conflict"
+
+#: util/errors.c:93
+msgid "unusable pubkey algorithm"
+msgstr "unusable pubkey algorithm"
+
+#: util/errors.c:94
+msgid "file exists"
+msgstr "file exists"
+
+#: util/errors.c:95
+msgid "weak key"
+msgstr "weak key"
+
+#: util/errors.c:96
+msgid "invalid argument"
+msgstr "invalid argument"
+
+#: util/errors.c:97
+msgid "bad URI"
+msgstr "bad URI"
+
+#: util/errors.c:98
+msgid "unsupported URI"
+msgstr "unsupported URI"
+
+#: util/errors.c:99
+msgid "network error"
+msgstr "network error"
+
+#: util/errors.c:101
+msgid "not encrypted"
+msgstr "not encrypted"
+
+#: util/errors.c:102
+msgid "not processed"
+msgstr "not processed"
+
+#: util/errors.c:104
+msgid "unusable public key"
+msgstr "unusable public key"
+
+#: util/errors.c:105
+msgid "unusable secret key"
+msgstr "unusable secret key"
+
+#: util/errors.c:106
+msgid "keyserver error"
+msgstr "keyserver error"
+
+#: util/errors.c:107
+msgid "canceled"
+msgstr "canceled"
+
+#: util/errors.c:108
+msgid "no card"
+msgstr "no card"
+
+#: util/errors.c:109
+msgid "no data"
+msgstr "no data"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr "ERROR: "
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr "WARNING: "
+
+#: util/logger.c:249
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... this is a bug (%s:%d:%s)\n"
+
+#: util/logger.c:255
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "you found a bug ... (%s:%d)\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:399 util/miscutil.c:436
+msgid "yes"
+msgstr "yes"
+
+#: util/miscutil.c:400 util/miscutil.c:441
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:402 util/miscutil.c:438
+msgid "no"
+msgstr "no"
+
+#: util/miscutil.c:403 util/miscutil.c:442
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:440
+msgid "quit"
+msgstr "quit"
+
+#: util/miscutil.c:443
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:476
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:478
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: util/miscutil.c:479
+msgid "oO"
+msgstr "oO"
+
+#: util/miscutil.c:480
+msgid "cC"
+msgstr "cC"
+
+#: util/secmem.c:96
+msgid "WARNING: using insecure memory!\n"
+msgstr "WARNING: using insecure memory!\n"
+
+#: util/secmem.c:97
+msgid ""
+"please see http://www.gnupg.org/documentation/faqs.html for more "
+"information\n"
+msgstr ""
+"please see http://www.gnupg.org/documentation/faqs.html for more "
+"information\n"
+
+#: util/secmem.c:359
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "operation is not possible without initialized secure memory\n"
+
+#: util/secmem.c:360
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(you may have used the wrong program for this task)\n"
diff --cc po/en at quot.po
index be8a8fa,0000000..00fc001
mode 100644,000000..100644
--- a/po/en at quot.po
+++ b/po/en at quot.po
@@@ -1,6382 -1,0 +1,6382 @@@
+# English translations for gnupg package.
- # Copyright (C) 2015 Free Software Foundation, Inc.
++# Copyright (C) 2016 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnupg package.
- # Automatically generated, 2015.
++# 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: gnupg 1.4.20\n"
++"Project-Id-Version: gnupg 1.4.21\n"
+"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
- "PO-Revision-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
++"PO-Revision-Date: 2016-08-17 15:21+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: en at quot\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"
+
+#: cipher/primegen.c:119
+#, c-format
+msgid "can't gen prime with pbits=%u qbits=%u\n"
+msgstr "can't gen prime with pbits=%u qbits=%u\n"
+
+#: cipher/primegen.c:310
+#, c-format
+msgid "can't generate a prime with less than %d bits\n"
+msgstr "can't generate a prime with less than %d bits\n"
+
+#: cipher/random.c:181
+msgid "no entropy gathering module detected\n"
+msgstr "no entropy gathering module detected\n"
+
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
+#, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "can't lock ‘%s’: %s\n"
+
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
+#, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "waiting for lock on ‘%s’...\n"
+
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
+#, c-format
+msgid "can't open `%s': %s\n"
+msgstr "can't open ‘%s’: %s\n"
+
- #: cipher/random.c:484
++#: cipher/random.c:483
+#, c-format
+msgid "can't stat `%s': %s\n"
+msgstr "can't stat ‘%s’: %s\n"
+
- #: cipher/random.c:489
++#: cipher/random.c:488
+#, c-format
+msgid "`%s' is not a regular file - ignored\n"
+msgstr "‘%s’ is not a regular file - ignored\n"
+
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
+msgid "note: random_seed file is empty\n"
+msgstr "note: random_seed file is empty\n"
+
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
+msgid "WARNING: invalid size of random_seed file - not used\n"
+msgstr "WARNING: invalid size of random_seed file - not used\n"
+
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
+#, c-format
+msgid "can't read `%s': %s\n"
+msgstr "can't read ‘%s’: %s\n"
+
- #: cipher/random.c:570
++#: cipher/random.c:569
+msgid "note: random_seed file not updated\n"
+msgstr "note: random_seed file not updated\n"
+
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
+#, c-format
+msgid "can't create `%s': %s\n"
+msgstr "can't create ‘%s’: %s\n"
+
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
+#, c-format
+msgid "can't write `%s': %s\n"
+msgstr "can't write ‘%s’: %s\n"
+
- #: cipher/random.c:648
++#: cipher/random.c:647
+#, c-format
+msgid "can't close `%s': %s\n"
+msgstr "can't close ‘%s’: %s\n"
+
- #: cipher/random.c:893
++#: cipher/random.c:892
+msgid "WARNING: using insecure random number generator!!\n"
+msgstr "WARNING: using insecure random number generator!!\n"
+
- #: cipher/random.c:894
++#: cipher/random.c:893
+msgid ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+msgstr ""
+"The random number generator is only a kludge to let\n"
+"it run - it is in no way a strong RNG!\n"
+"\n"
+"DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
+"\n"
+
+#: cipher/rndegd.c:200
+msgid ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+msgstr ""
+"Please wait, entropy is being gathered. Do some work if it would\n"
+"keep you from getting bored, because it will improve the quality\n"
+"of the entropy.\n"
+
+#: cipher/rndlinux.c:134
+#, c-format
+msgid ""
+"\n"
+"Not enough random bytes available. Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+msgstr ""
+"\n"
+"Not enough random bytes available. Please do some other work to give\n"
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"
+
+#: g10/app-openpgp.c:698
+#, c-format
+msgid "failed to store the fingerprint: %s\n"
+msgstr "failed to store the fingerprint: %s\n"
+
+#: g10/app-openpgp.c:711
+#, c-format
+msgid "failed to store the creation date: %s\n"
+msgstr "failed to store the creation date: %s\n"
+
+#: g10/app-openpgp.c:1150
+#, c-format
+msgid "reading public key failed: %s\n"
+msgstr "reading public key failed: %s\n"
+
+#: g10/app-openpgp.c:1158 g10/app-openpgp.c:2875
+msgid "response does not contain the public key data\n"
+msgstr "response does not contain the public key data\n"
+
+#: g10/app-openpgp.c:1166 g10/app-openpgp.c:2883
+msgid "response does not contain the RSA modulus\n"
+msgstr "response does not contain the RSA modulus\n"
+
+#: g10/app-openpgp.c:1175 g10/app-openpgp.c:2893
+msgid "response does not contain the RSA public exponent\n"
+msgstr "response does not contain the RSA public exponent\n"
+
+#: g10/app-openpgp.c:1495
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr "using default PIN as %s\n"
+
+#: g10/app-openpgp.c:1502
+#, 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"
+
+#: g10/app-openpgp.c:1517
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||Please enter the PIN%%0A[sigs done: %lu]"
+
+#: g10/app-openpgp.c:1528 g10/app-openpgp.c:1982
+msgid "||Please enter the PIN"
+msgstr "||Please enter the PIN"
+
+#: g10/app-openpgp.c:1543 g10/app-openpgp.c:1562 g10/app-openpgp.c:1723
+#: g10/app-openpgp.c:1740 g10/app-openpgp.c:1988 g10/app-openpgp.c:2033
+#, c-format
+msgid "PIN callback returned error: %s\n"
+msgstr "PIN callback returned error: %s\n"
+
+#: g10/app-openpgp.c:1569 g10/app-openpgp.c:1747 g10/app-openpgp.c:1995
+#, 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"
+
+#: g10/app-openpgp.c:1582 g10/app-openpgp.c:1621 g10/app-openpgp.c:1759
+#: g10/app-openpgp.c:3193
+#, c-format
+msgid "verify CHV%d failed: %s\n"
+msgstr "verify CHV%d failed: %s\n"
+
+#: g10/app-openpgp.c:1650 g10/app-openpgp.c:2014 g10/app-openpgp.c:3489
+msgid "error retrieving CHV status from card\n"
+msgstr "error retrieving CHV status from card\n"
+
+#: g10/app-openpgp.c:1656 g10/app-openpgp.c:3498
+msgid "card is permanently locked!\n"
+msgstr "card is permanently locked!\n"
+
+#: g10/app-openpgp.c:1663
+#, c-format
+msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
+msgstr "%d Admin PIN attempts remaining before card is permanently locked\n"
+
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string. Use %%0A to force a linefeed.
+#: g10/app-openpgp.c:1670
+#, c-format
+msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+msgstr "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
+
+#: g10/app-openpgp.c:1674
+msgid "|A|Please enter the Admin PIN"
+msgstr "|A|Please enter the Admin PIN"
+
+#: g10/app-openpgp.c:1695
+msgid "access to admin commands is not configured\n"
+msgstr "access to admin commands is not configured\n"
+
+#: g10/app-openpgp.c:2023 g10/card-util.c:108
+msgid "Reset Code not or not anymore available\n"
+msgstr "Reset Code not or not anymore available\n"
+
+#: g10/app-openpgp.c:2029
+msgid "||Please enter the Reset Code for the card"
+msgstr "||Please enter the Reset Code for the card"
+
+#: g10/app-openpgp.c:2039 g10/app-openpgp.c:2090
+#, 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.
+#: g10/app-openpgp.c:2060
+msgid "|RN|New Reset Code"
+msgstr "|RN|New Reset Code"
+
+#: g10/app-openpgp.c:2061
+msgid "|AN|New Admin PIN"
+msgstr "|AN|New Admin PIN"
+
+#: g10/app-openpgp.c:2061
+msgid "|N|New PIN"
+msgstr "|N|New PIN"
+
+#: g10/app-openpgp.c:2065
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "error getting new PIN: %s\n"
+
+#: g10/app-openpgp.c:2171 g10/app-openpgp.c:2961
+msgid "error reading application data\n"
+msgstr "error reading application data\n"
+
+#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968
+msgid "error reading fingerprint DO\n"
+msgstr "error reading fingerprint DO\n"
+
+#: g10/app-openpgp.c:2187
+msgid "key already exists\n"
+msgstr "key already exists\n"
+
+#: g10/app-openpgp.c:2191
+msgid "existing key will be replaced\n"
+msgstr "existing key will be replaced\n"
+
+#: g10/app-openpgp.c:2193
+msgid "generating new key\n"
+msgstr "generating new key\n"
+
+#: g10/app-openpgp.c:2195
+msgid "writing new key\n"
+msgstr "writing new key\n"
+
+#: g10/app-openpgp.c:2620
+msgid "creation timestamp missing\n"
+msgstr "creation timestamp missing\n"
+
+#: g10/app-openpgp.c:2640
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr "RSA modulus missing or not of size %d bits\n"
+
+#: g10/app-openpgp.c:2652
+#, c-format
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA public exponent missing or larger than %d bits\n"
+
+#: g10/app-openpgp.c:2662 g10/app-openpgp.c:2670
+#, 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"
+
+#: g10/app-openpgp.c:2766
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "failed to store the key: %s\n"
+
+#: g10/app-openpgp.c:2852
+msgid "please wait while key is being generated ...\n"
+msgstr "please wait while key is being generated ...\n"
+
+#: g10/app-openpgp.c:2865
+msgid "generating key failed\n"
+msgstr "generating key failed\n"
+
+#: g10/app-openpgp.c:2868
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "key generation completed (%d seconds)\n"
+
+#: g10/app-openpgp.c:2926
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
+
+#: g10/app-openpgp.c:2976
+msgid "fingerprint on card does not match requested one\n"
+msgstr "fingerprint on card does not match requested one\n"
+
+#: g10/app-openpgp.c:3092
+#, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "card does not support digest algorithm %s\n"
+
+#: g10/app-openpgp.c:3168
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "signatures created so far: %lu\n"
+
+#: g10/app-openpgp.c:3503
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
+msgstr ""
+"verification of Admin PIN is currently prohibited through this command\n"
+
+#: g10/app-openpgp.c:3728 g10/app-openpgp.c:3739
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "can't access %s - invalid OpenPGP card?\n"
+
+#: g10/armor.c:383
+#, c-format
+msgid "armor: %s\n"
+msgstr "armor: %s\n"
+
+#: g10/armor.c:448
+msgid "invalid armor header: "
+msgstr "invalid armor header: "
+
+#: g10/armor.c:459
+msgid "armor header: "
+msgstr "armor header: "
+
+#: g10/armor.c:472
+msgid "invalid clearsig header\n"
+msgstr "invalid clearsig header\n"
+
+#: g10/armor.c:485
+msgid "unknown armor header: "
+msgstr "unknown armor header: "
+
+#: g10/armor.c:546
+msgid "nested clear text signatures\n"
+msgstr "nested clear text signatures\n"
+
+#: g10/armor.c:681
+msgid "unexpected armor: "
+msgstr "unexpected armor: "
+
+#: g10/armor.c:693
+msgid "invalid dash escaped line: "
+msgstr "invalid dash escaped line: "
+
+#: g10/armor.c:848 g10/armor.c:1473
+#, c-format
+msgid "invalid radix64 character %02X skipped\n"
+msgstr "invalid radix64 character %02X skipped\n"
+
+#: g10/armor.c:891
+msgid "premature eof (no CRC)\n"
+msgstr "premature eof (no CRC)\n"
+
+#: g10/armor.c:925
+msgid "premature eof (in CRC)\n"
+msgstr "premature eof (in CRC)\n"
+
+#: g10/armor.c:933
+msgid "malformed CRC\n"
+msgstr "malformed CRC\n"
+
+#: g10/armor.c:937 g10/armor.c:1510
+#, c-format
+msgid "CRC error; %06lX - %06lX\n"
+msgstr "CRC error; %06lX - %06lX\n"
+
+#: g10/armor.c:957
+msgid "premature eof (in trailer)\n"
+msgstr "premature eof (in trailer)\n"
+
+#: g10/armor.c:961
+msgid "error in trailer line\n"
+msgstr "error in trailer line\n"
+
+#: g10/armor.c:1287
+msgid "no valid OpenPGP data found.\n"
+msgstr "no valid OpenPGP data found.\n"
+
+#: g10/armor.c:1292
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr "invalid armor: line longer than %d characters\n"
+
+#: g10/armor.c:1296
+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/card-util.c:85 g10/card-util.c:374
+#, c-format
+msgid "OpenPGP card not available: %s\n"
+msgstr "OpenPGP card not available: %s\n"
+
+#: g10/card-util.c:90
+#, c-format
+msgid "OpenPGP card no. %s detected\n"
+msgstr "OpenPGP card no. %s detected\n"
+
+#: g10/card-util.c:98 g10/card-util.c:1773 g10/delkey.c:126 g10/keyedit.c:1518
+#: g10/keygen.c:2757 g10/revoke.c:216 g10/revoke.c:454
+msgid "can't do this in batch mode\n"
+msgstr "can't do this in batch mode\n"
+
+#: g10/card-util.c:106
+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:141 g10/card-util.c:1458 g10/card-util.c:1568
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1433
+#: g10/keygen.c:1514
+msgid "Your selection? "
+msgstr "Your selection? "
+
+#: g10/card-util.c:272 g10/card-util.c:322
+msgid "[not set]"
+msgstr "[not set]"
+
+#: g10/card-util.c:512
+msgid "male"
+msgstr "male"
+
+#: g10/card-util.c:513
+msgid "female"
+msgstr "female"
+
+#: g10/card-util.c:513
+msgid "unspecified"
+msgstr "unspecified"
+
+#: g10/card-util.c:540
+msgid "not forced"
+msgstr "not forced"
+
+#: g10/card-util.c:540
+msgid "forced"
+msgstr "forced"
+
+#: g10/card-util.c:631
+msgid "Error: Only plain ASCII is currently allowed.\n"
+msgstr "Error: Only plain ASCII is currently allowed.\n"
+
+#: g10/card-util.c:633
+msgid "Error: The \"<\" character may not be used.\n"
+msgstr "Error: The “<” character may not be used.\n"
+
+#: g10/card-util.c:635
+msgid "Error: Double spaces are not allowed.\n"
+msgstr "Error: Double spaces are not allowed.\n"
+
+#: g10/card-util.c:652
+msgid "Cardholder's surname: "
+msgstr "Cardholder's surname: "
+
+#: g10/card-util.c:654
+msgid "Cardholder's given name: "
+msgstr "Cardholder's given name: "
+
+#: g10/card-util.c:672
+#, c-format
+msgid "Error: Combined name too long (limit is %d characters).\n"
+msgstr "Error: Combined name too long (limit is %d characters).\n"
+
+#: g10/card-util.c:693
+msgid "URL to retrieve public key: "
+msgstr "URL to retrieve public key: "
+
+#: g10/card-util.c:701
+#, c-format
+msgid "Error: URL too long (limit is %d characters).\n"
+msgstr "Error: URL too long (limit is %d characters).\n"
+
+#: g10/card-util.c:794
+#, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "error allocating enough memory: %s\n"
+
+#: g10/card-util.c:806 g10/import.c:307
+#, c-format
+msgid "error reading `%s': %s\n"
+msgstr "error reading ‘%s’: %s\n"
+
+#: g10/card-util.c:839
+#, c-format
+msgid "error writing `%s': %s\n"
+msgstr "error writing ‘%s’: %s\n"
+
+#: g10/card-util.c:866
+msgid "Login data (account name): "
+msgstr "Login data (account name): "
+
+#: g10/card-util.c:876
+#, c-format
+msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "Error: Login data too long (limit is %d characters).\n"
+
+#: g10/card-util.c:912
+msgid "Private DO data: "
+msgstr "Private DO data: "
+
+#: g10/card-util.c:922
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "Error: Private DO too long (limit is %d characters).\n"
+
+#: g10/card-util.c:1005
+msgid "Language preferences: "
+msgstr "Language preferences: "
+
+#: g10/card-util.c:1013
+msgid "Error: invalid length of preference string.\n"
+msgstr "Error: invalid length of preference string.\n"
+
+#: g10/card-util.c:1022
+msgid "Error: invalid characters in preference string.\n"
+msgstr "Error: invalid characters in preference string.\n"
+
+#: g10/card-util.c:1044
+msgid "Sex ((M)ale, (F)emale or space): "
+msgstr "Sex ((M)ale, (F)emale or space): "
+
+#: g10/card-util.c:1058
+msgid "Error: invalid response.\n"
+msgstr "Error: invalid response.\n"
+
+#: g10/card-util.c:1080
+msgid "CA fingerprint: "
+msgstr "CA fingerprint: "
+
+#: g10/card-util.c:1103
+msgid "Error: invalid formatted fingerprint.\n"
+msgstr "Error: invalid formatted fingerprint.\n"
+
+#: g10/card-util.c:1153
+#, c-format
+msgid "key operation not possible: %s\n"
+msgstr "key operation not possible: %s\n"
+
+#: g10/card-util.c:1154
+msgid "not an OpenPGP card"
+msgstr "not an OpenPGP card"
+
+#: g10/card-util.c:1167
+#, c-format
+msgid "error getting current key info: %s\n"
+msgstr "error getting current key info: %s\n"
+
+#: g10/card-util.c:1254
+msgid "Replace existing key? (y/N) "
+msgstr "Replace existing key? (y/N) "
+
+#: g10/card-util.c:1270
+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:1295
+#, 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:1297
+#, 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:1298
+#, 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:1309 g10/keygen.c:1649 g10/keygen.c:1655
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "rounded up to %u bits\n"
+
+#: g10/card-util.c:1317 g10/keygen.c:1636
+#, 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:1322
+#, 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:1342
+#, 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:1364
+msgid "Make off-card backup of encryption key? (Y/n) "
+msgstr "Make off-card backup of encryption key? (Y/n) "
+
+#: g10/card-util.c:1378
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "NOTE: keys are already stored on the card!\n"
+
+#: g10/card-util.c:1381
+msgid "Replace existing keys? (y/N) "
+msgstr "Replace existing keys? (y/N) "
+
+#: g10/card-util.c:1393
+#, 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:1449
+msgid "Please select the type of key to generate:\n"
+msgstr "Please select the type of key to generate:\n"
+
+#: g10/card-util.c:1451 g10/card-util.c:1559
+msgid " (1) Signature key\n"
+msgstr " (1) Signature key\n"
+
+#: g10/card-util.c:1452 g10/card-util.c:1561
+msgid " (2) Encryption key\n"
+msgstr " (2) Encryption key\n"
+
+#: g10/card-util.c:1453 g10/card-util.c:1563
+msgid " (3) Authentication key\n"
+msgstr " (3) Authentication key\n"
+
+#: g10/card-util.c:1469 g10/card-util.c:1588 g10/keyedit.c:939
+#: g10/keygen.c:1437 g10/keygen.c:1465 g10/keygen.c:1566 g10/revoke.c:681
+msgid "Invalid selection.\n"
+msgstr "Invalid selection.\n"
+
+#: g10/card-util.c:1556
+msgid "Please select where to store the key:\n"
+msgstr "Please select where to store the key:\n"
+
+#: g10/card-util.c:1600
+msgid "unknown key protection algorithm\n"
+msgstr "unknown key protection algorithm\n"
+
+#: g10/card-util.c:1605
+msgid "secret parts of key are not available\n"
+msgstr "secret parts of key are not available\n"
+
+#: g10/card-util.c:1610
+msgid "secret key already stored on a card\n"
+msgstr "secret key already stored on a card\n"
+
+#: g10/card-util.c:1623
+#, c-format
+msgid "error writing key to card: %s\n"
+msgstr "error writing key to card: %s\n"
+
+#: g10/card-util.c:1682 g10/keyedit.c:1350
+msgid "quit this menu"
+msgstr "quit this menu"
+
+#: g10/card-util.c:1684
+msgid "show admin commands"
+msgstr "show admin commands"
+
+#: g10/card-util.c:1685 g10/keyedit.c:1353
+msgid "show this help"
+msgstr "show this help"
+
+#: g10/card-util.c:1687
+msgid "list all available data"
+msgstr "list all available data"
+
+#: g10/card-util.c:1690
+msgid "change card holder's name"
+msgstr "change card holder's name"
+
+#: g10/card-util.c:1691
+msgid "change URL to retrieve key"
+msgstr "change URL to retrieve key"
+
+#: g10/card-util.c:1692
+msgid "fetch the key specified in the card URL"
+msgstr "fetch the key specified in the card URL"
+
+#: g10/card-util.c:1693
+msgid "change the login name"
+msgstr "change the login name"
+
+#: g10/card-util.c:1694
+msgid "change the language preferences"
+msgstr "change the language preferences"
+
+#: g10/card-util.c:1695
+msgid "change card holder's sex"
+msgstr "change card holder's sex"
+
+#: g10/card-util.c:1696
+msgid "change a CA fingerprint"
+msgstr "change a CA fingerprint"
+
+#: g10/card-util.c:1697
+msgid "toggle the signature force PIN flag"
+msgstr "toggle the signature force PIN flag"
+
+#: g10/card-util.c:1698
+msgid "generate new keys"
+msgstr "generate new keys"
+
+#: g10/card-util.c:1699
+msgid "menu to change or unblock the PIN"
+msgstr "menu to change or unblock the PIN"
+
+#: g10/card-util.c:1700
+msgid "verify the PIN and list all data"
+msgstr "verify the PIN and list all data"
+
+#: g10/card-util.c:1701
+msgid "unblock the PIN using a Reset Code"
+msgstr "unblock the PIN using a Reset Code"
+
+#: g10/card-util.c:1823
+msgid "gpg/card> "
+msgstr "gpg/card> "
+
+#: g10/card-util.c:1864
+msgid "Admin-only command\n"
+msgstr "Admin-only command\n"
+
+#: g10/card-util.c:1895
+msgid "Admin commands are allowed\n"
+msgstr "Admin commands are allowed\n"
+
+#: g10/card-util.c:1897
+msgid "Admin commands are not allowed\n"
+msgstr "Admin commands are not allowed\n"
+
+#: g10/card-util.c:1988 g10/keyedit.c:2257
+msgid "Invalid command (try \"help\")\n"
+msgstr "Invalid command (try “help”)\n"
+
+#: g10/cardglue.c:457
+msgid "card reader not available\n"
+msgstr "card reader not available\n"
+
+#: g10/cardglue.c:475
+msgid "Please insert the card and hit return or enter 'c' to cancel: "
+msgstr "Please insert the card and hit return or enter ‘c’ to cancel: "
+
+#: g10/cardglue.c:487
+#, c-format
+msgid "selecting openpgp failed: %s\n"
+msgstr "selecting openpgp failed: %s\n"
+
+#: g10/cardglue.c:614
+#, c-format
+msgid ""
+"Please remove the current card and insert the one with serial number:\n"
+" %.*s\n"
+msgstr ""
+"Please remove the current card and insert the one with serial number:\n"
+" %.*s\n"
+
+#: g10/cardglue.c:623
+msgid "Hit return when ready or enter 'c' to cancel: "
+msgstr "Hit return when ready or enter ‘c’ to cancel: "
+
+#: g10/cardglue.c:1013
+msgid "Enter New Admin PIN: "
+msgstr "Enter New Admin PIN: "
+
+#: g10/cardglue.c:1014
+msgid "Enter New PIN: "
+msgstr "Enter New PIN: "
+
+#: g10/cardglue.c:1015
+msgid "Enter Admin PIN: "
+msgstr "Enter Admin PIN: "
+
+#: g10/cardglue.c:1016
+msgid "Enter PIN: "
+msgstr "Enter PIN: "
+
+#: g10/cardglue.c:1033
+msgid "Repeat this PIN: "
+msgstr "Repeat this PIN: "
+
+#: g10/cardglue.c:1048
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN not correctly repeated; try again"
+
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
+#, c-format
+msgid "can't open `%s'\n"
+msgstr "can't open ‘%s’\n"
+
+#: g10/decrypt.c:103 g10/encode.c:823
+msgid "--output doesn't work for this command\n"
+msgstr "--output doesn't work for this command\n"
+
+#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:1539 g10/keyedit.c:3450
+#: g10/keyserver.c:1884 g10/revoke.c:226
+#, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "key “%s” not found: %s\n"
+
+#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2512 g10/keyserver.c:1898
+#: g10/revoke.c:232 g10/revoke.c:476
+#, c-format
+msgid "error reading keyblock: %s\n"
+msgstr "error reading keyblock: %s\n"
+
+#: g10/delkey.c:127 g10/delkey.c:134
+msgid "(unless you specify the key by fingerprint)\n"
+msgstr "(unless you specify the key by fingerprint)\n"
+
+#: g10/delkey.c:133
+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:145
+msgid "Delete this key from the keyring? (y/N) "
+msgstr "Delete this key from the keyring? (y/N) "
+
+#: g10/delkey.c:153
+msgid "This is a secret key! - really delete? (y/N) "
+msgstr "This is a secret key! - really delete? (y/N) "
+
+#: g10/delkey.c:163
+#, c-format
+msgid "deleting keyblock failed: %s\n"
+msgstr "deleting keyblock failed: %s\n"
+
+#: g10/delkey.c:173
+msgid "ownertrust information cleared\n"
+msgstr "ownertrust information cleared\n"
+
+#: g10/delkey.c:204
+#, 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:206
+msgid "use option \"--delete-secret-keys\" to delete it first.\n"
+msgstr "use option “--delete-secret-keys” to delete it first.\n"
+
+#: g10/encode.c:211 g10/sign.c:1258
+#, c-format
+msgid "error creating passphrase: %s\n"
+msgstr "error creating passphrase: %s\n"
+
+#: g10/encode.c:216
+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/encode.c:229
+#, c-format
+msgid "using cipher %s\n"
+msgstr "using cipher %s\n"
+
+#: g10/encode.c:239 g10/encode.c:534
+#, c-format
+msgid "`%s' already compressed\n"
+msgstr "‘%s’ already compressed\n"
+
+#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:563
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "WARNING: ‘%s’ is an empty file\n"
+
+#: g10/encode.c:454
+msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+msgstr "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
+
+#: g10/encode.c:478
+#, c-format
+msgid "reading from `%s'\n"
+msgstr "reading from ‘%s’\n"
+
+#: g10/encode.c:506
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+
+#: g10/encode.c:516
+#, 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/encode.c:612 g10/sign.c:935
+#, 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/encode.c:699
+#, c-format
+msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n"
+
+#: g10/encode.c:769 g10/pkclist.c:805 g10/pkclist.c:858
+#, 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/encode.c:796
+#, c-format
+msgid "%s/%s encrypted for: \"%s\"\n"
+msgstr "%s/%s encrypted for: “%s”\n"
+
+#: g10/encr-data.c:89 g10/mainproc.c:296
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s encrypted data\n"
+
+#: g10/encr-data.c:91 g10/mainproc.c:300
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr "encrypted with unknown algorithm %d\n"
+
+#: g10/encr-data.c:134
+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/encr-data.c:145
+msgid "problem handling encrypted packet\n"
+msgstr "problem handling encrypted packet\n"
+
+#: g10/exec.c:47
+msgid "no remote program execution supported\n"
+msgstr "no remote program execution supported\n"
+
+#: g10/exec.c:174 g10/openfile.c:468
+#, c-format
+msgid "can't create directory `%s': %s\n"
+msgstr "can't create directory ‘%s’: %s\n"
+
+#: g10/exec.c:315
+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:345
+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:423
+#, c-format
+msgid "unable to execute program `%s': %s\n"
+msgstr "unable to execute program ‘%s’: %s\n"
+
+#: g10/exec.c:426
+#, c-format
+msgid "unable to execute shell `%s': %s\n"
+msgstr "unable to execute shell ‘%s’: %s\n"
+
+#: g10/exec.c:511
+#, c-format
+msgid "system error while calling external program: %s\n"
+msgstr "system error while calling external program: %s\n"
+
+#: g10/exec.c:522 g10/exec.c:588
+msgid "unnatural exit of external program\n"
+msgstr "unnatural exit of external program\n"
+
+#: g10/exec.c:537
+msgid "unable to execute external program\n"
+msgstr "unable to execute external program\n"
+
+#: g10/exec.c:553
+#, c-format
+msgid "unable to read external program response: %s\n"
+msgstr "unable to read external program response: %s\n"
+
+#: g10/exec.c:599 g10/exec.c:606
+#, 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:611
+#, 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:59
+msgid "export signatures that are marked as local-only"
+msgstr "export signatures that are marked as local-only"
+
+#: g10/export.c:61
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr "export attribute user IDs (generally photo IDs)"
+
+#: g10/export.c:63
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "export revocation keys marked as “sensitive”"
+
+#: g10/export.c:65
+msgid "remove the passphrase from exported subkeys"
+msgstr "remove the passphrase from exported subkeys"
+
+#: g10/export.c:67
+msgid "remove unusable parts from key during export"
+msgstr "remove unusable parts from key during export"
+
+#: g10/export.c:69
+msgid "remove as much as possible from key during export"
+msgstr "remove as much as possible from key during export"
+
+#: g10/export.c:323
+msgid "exporting secret keys not allowed\n"
+msgstr "exporting secret keys not allowed\n"
+
+#: g10/export.c:352
+#, c-format
+msgid "key %s: not protected - skipped\n"
+msgstr "key %s: not protected - skipped\n"
+
+#: g10/export.c:360
+#, 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:371
+#, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "key %s: key material on-card - skipped\n"
+
+#: g10/export.c:519
+msgid "about to export an unprotected subkey\n"
+msgstr "about to export an unprotected subkey\n"
+
+#: g10/export.c:542
+#, c-format
+msgid "failed to unprotect the subkey: %s\n"
+msgstr "failed to unprotect the subkey: %s\n"
+
+#: g10/export.c:563
+#, c-format
+msgid "WARNING: secret key %s does not have a simple SK checksum\n"
+msgstr "WARNING: secret key %s does not have a simple SK checksum\n"
+
+#: g10/export.c:596
+msgid "WARNING: nothing exported\n"
+msgstr "WARNING: nothing exported\n"
+
+#: g10/gpg.c:388
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Commands:\n"
+" "
+
+#: g10/gpg.c:390
+msgid "|[file]|make a signature"
+msgstr "|[file]|make a signature"
+
+#: g10/gpg.c:391
+msgid "|[file]|make a clear text signature"
+msgstr "|[file]|make a clear text signature"
+
+#: g10/gpg.c:392
+msgid "make a detached signature"
+msgstr "make a detached signature"
+
+#: g10/gpg.c:393
+msgid "encrypt data"
+msgstr "encrypt data"
+
+#: g10/gpg.c:395
+msgid "encryption only with symmetric cipher"
+msgstr "encryption only with symmetric cipher"
+
+#: g10/gpg.c:397
+msgid "decrypt data (default)"
+msgstr "decrypt data (default)"
+
+#: g10/gpg.c:399
+msgid "verify a signature"
+msgstr "verify a signature"
+
+#: g10/gpg.c:401
+msgid "list keys"
+msgstr "list keys"
+
+#: g10/gpg.c:403
+msgid "list keys and signatures"
+msgstr "list keys and signatures"
+
+#: g10/gpg.c:404
+msgid "list and check key signatures"
+msgstr "list and check key signatures"
+
+#: g10/gpg.c:405
+msgid "list keys and fingerprints"
+msgstr "list keys and fingerprints"
+
+#: g10/gpg.c:406
+msgid "list secret keys"
+msgstr "list secret keys"
+
+#: g10/gpg.c:407
+msgid "generate a new key pair"
+msgstr "generate a new key pair"
+
+#: g10/gpg.c:408
+msgid "remove keys from the public keyring"
+msgstr "remove keys from the public keyring"
+
+#: g10/gpg.c:410
+msgid "remove keys from the secret keyring"
+msgstr "remove keys from the secret keyring"
+
+#: g10/gpg.c:411
+msgid "sign a key"
+msgstr "sign a key"
+
+#: g10/gpg.c:412
+msgid "sign a key locally"
+msgstr "sign a key locally"
+
+#: g10/gpg.c:413
+msgid "sign or edit a key"
+msgstr "sign or edit a key"
+
+#: g10/gpg.c:414
+msgid "generate a revocation certificate"
+msgstr "generate a revocation certificate"
+
+#: g10/gpg.c:416
+msgid "export keys"
+msgstr "export keys"
+
+#: g10/gpg.c:417
+msgid "export keys to a key server"
+msgstr "export keys to a key server"
+
+#: g10/gpg.c:418
+msgid "import keys from a key server"
+msgstr "import keys from a key server"
+
+#: g10/gpg.c:420
+msgid "search for keys on a key server"
+msgstr "search for keys on a key server"
+
+#: g10/gpg.c:422
+msgid "update all keys from a keyserver"
+msgstr "update all keys from a keyserver"
+
+#: g10/gpg.c:426
+msgid "import/merge keys"
+msgstr "import/merge keys"
+
+#: g10/gpg.c:429
+msgid "print the card status"
+msgstr "print the card status"
+
+#: g10/gpg.c:430
+msgid "change data on a card"
+msgstr "change data on a card"
+
+#: g10/gpg.c:431
+msgid "change a card's PIN"
+msgstr "change a card's PIN"
+
+#: g10/gpg.c:440
+msgid "update the trust database"
+msgstr "update the trust database"
+
+#: g10/gpg.c:447
+msgid "|algo [files]|print message digests"
+msgstr "|algo [files]|print message digests"
+
+#: g10/gpg.c:451 g10/gpgv.c:69
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: g10/gpg.c:453
+msgid "create ascii armored output"
+msgstr "create ascii armored output"
+
+#: g10/gpg.c:455
+msgid "|NAME|encrypt for NAME"
+msgstr "|NAME|encrypt for NAME"
+
+#: g10/gpg.c:466
+msgid "use this user-id to sign or decrypt"
+msgstr "use this user-id to sign or decrypt"
+
+#: g10/gpg.c:467
+msgid "|N|set compress level N (0 disables)"
+msgstr "|N|set compress level N (0 disables)"
+
+#: g10/gpg.c:472
+msgid "use canonical text mode"
+msgstr "use canonical text mode"
+
+#: g10/gpg.c:486
+msgid "use as output file"
+msgstr "use as output file"
+
+#: g10/gpg.c:488 g10/gpgv.c:71
+msgid "verbose"
+msgstr "verbose"
+
+#: g10/gpg.c:499
+msgid "do not make any changes"
+msgstr "do not make any changes"
+
+#: g10/gpg.c:500
+msgid "prompt before overwriting"
+msgstr "prompt before overwriting"
+
+#: g10/gpg.c:543
+msgid "use strict OpenPGP behavior"
+msgstr "use strict OpenPGP behavior"
+
+#: g10/gpg.c:544
+msgid "generate PGP 2.x compatible messages"
+msgstr "generate PGP 2.x compatible messages"
+
+#: g10/gpg.c:573
+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:576
+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:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
+msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
+msgstr "Please report bugs to <gnupg-bugs at gnu.org>.\n"
+
- #: g10/gpg.c:798
++#: g10/gpg.c:803
+msgid "Usage: gpg [options] [files] (-h for help)"
+msgstr "Usage: gpg [options] [files] (-h for help)"
+
- #: g10/gpg.c:801
++#: g10/gpg.c:806
+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:812
++#: g10/gpg.c:817
+msgid ""
+"\n"
+"Supported algorithms:\n"
+msgstr ""
+"\n"
+"Supported algorithms:\n"
+
- #: g10/gpg.c:815
++#: g10/gpg.c:820
+msgid "Pubkey: "
+msgstr "Pubkey: "
+
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
+msgid "Cipher: "
+msgstr "Cipher: "
+
- #: g10/gpg.c:827
++#: g10/gpg.c:832
+msgid "Hash: "
+msgstr "Hash: "
+
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
+msgid "Compression: "
+msgstr "Compression: "
+
- #: g10/gpg.c:912
++#: g10/gpg.c:917
+msgid "usage: gpg [options] "
+msgstr "usage: gpg [options] "
+
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
+msgid "conflicting commands\n"
+msgstr "conflicting commands\n"
+
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
+#, c-format
+msgid "no = sign found in group definition `%s'\n"
+msgstr "no = sign found in group definition ‘%s’\n"
+
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
+#, c-format
+msgid "WARNING: unsafe ownership on homedir `%s'\n"
+msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
+
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
+#, c-format
+msgid "WARNING: unsafe ownership on configuration file `%s'\n"
+msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
+#, c-format
+msgid "WARNING: unsafe permissions on homedir `%s'\n"
+msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
+
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
+#, c-format
+msgid "WARNING: unsafe permissions on configuration file `%s'\n"
+msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
+
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
+#, 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:1285
++#: g10/gpg.c:1290
+#, 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:1291
++#: g10/gpg.c:1296
+#, 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:1294
++#: g10/gpg.c:1299
+#, 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:1469
++#: g10/gpg.c:1474
+#, c-format
+msgid "unknown configuration item `%s'\n"
+msgstr "unknown configuration item ‘%s’\n"
+
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
+msgid "display photo IDs during key listings"
+msgstr "display photo IDs during key listings"
+
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
+msgid "show policy URLs during signature listings"
+msgstr "show policy URLs during signature listings"
+
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
+msgid "show all notations during signature listings"
+msgstr "show all notations during signature listings"
+
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
+msgid "show IETF standard notations during signature listings"
+msgstr "show IETF standard notations during signature listings"
+
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
+msgid "show user-supplied notations during signature listings"
+msgstr "show user-supplied notations during signature listings"
+
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "show preferred keyserver URLs during signature listings"
+
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
+msgid "show user ID validity during key listings"
+msgstr "show user ID validity during key listings"
+
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
+msgid "show revoked and expired user IDs in key listings"
+msgstr "show revoked and expired user IDs in key listings"
+
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
+msgid "show revoked and expired subkeys in key listings"
+msgstr "show revoked and expired subkeys in key listings"
+
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
+msgid "show the keyring name in key listings"
+msgstr "show the keyring name in key listings"
+
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
+msgid "show expiration dates during signature listings"
+msgstr "show expiration dates during signature listings"
+
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
+#, c-format
+msgid "NOTE: old default options file `%s' ignored\n"
+msgstr "NOTE: old default options file ‘%s’ ignored\n"
+
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
+#, c-format
+msgid "NOTE: no default option file `%s'\n"
+msgstr "NOTE: no default option file ‘%s’\n"
+
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
+#, c-format
+msgid "option file `%s': %s\n"
+msgstr "option file ‘%s’: %s\n"
+
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
+#, c-format
+msgid "reading options from `%s'\n"
+msgstr "reading options from ‘%s’\n"
+
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
+#, c-format
+msgid "NOTE: %s is not for normal use!\n"
+msgstr "NOTE: %s is not for normal use!\n"
+
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
+#, c-format
+msgid "`%s' is not a valid signature expiration\n"
+msgstr "‘%s’ is not a valid signature expiration\n"
+
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
+#, c-format
+msgid "`%s' is not a valid character set\n"
+msgstr "‘%s’ is not a valid character set\n"
+
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
+msgid "could not parse keyserver URL\n"
+msgstr "could not parse keyserver URL\n"
+
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
+#, c-format
+msgid "%s:%d: invalid keyserver options\n"
+msgstr "%s:%d: invalid keyserver options\n"
+
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
+msgid "invalid keyserver options\n"
+msgstr "invalid keyserver options\n"
+
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
+#, c-format
+msgid "%s:%d: invalid import options\n"
+msgstr "%s:%d: invalid import options\n"
+
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
+msgid "invalid import options\n"
+msgstr "invalid import options\n"
+
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
+#, c-format
+msgid "%s:%d: invalid export options\n"
+msgstr "%s:%d: invalid export options\n"
+
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
+msgid "invalid export options\n"
+msgstr "invalid export options\n"
+
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
+#, c-format
+msgid "%s:%d: invalid list options\n"
+msgstr "%s:%d: invalid list options\n"
+
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
+msgid "invalid list options\n"
+msgstr "invalid list options\n"
+
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
+msgid "display photo IDs during signature verification"
+msgstr "display photo IDs during signature verification"
+
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
+msgid "show policy URLs during signature verification"
+msgstr "show policy URLs during signature verification"
+
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
+msgid "show all notations during signature verification"
+msgstr "show all notations during signature verification"
+
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
+msgid "show IETF standard notations during signature verification"
+msgstr "show IETF standard notations during signature verification"
+
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
+msgid "show user-supplied notations during signature verification"
+msgstr "show user-supplied notations during signature verification"
+
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "show preferred keyserver URLs during signature verification"
+
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
+msgid "show user ID validity during signature verification"
+msgstr "show user ID validity during signature verification"
+
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
+msgid "show revoked and expired user IDs in signature verification"
+msgstr "show revoked and expired user IDs in signature verification"
+
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
+msgid "show only the primary user ID in signature verification"
+msgstr "show only the primary user ID in signature verification"
+
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
+msgid "validate signatures with PKA data"
+msgstr "validate signatures with PKA data"
+
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr "elevate the trust of signatures with valid PKA data"
+
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
+#, c-format
+msgid "%s:%d: invalid verify options\n"
+msgstr "%s:%d: invalid verify options\n"
+
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
+msgid "invalid verify options\n"
+msgstr "invalid verify options\n"
+
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr "unable to set exec-path to %s\n"
+
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
+#, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: invalid auto-key-locate list\n"
+
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
+msgid "invalid auto-key-locate list\n"
+msgstr "invalid auto-key-locate list\n"
+
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
+msgid "WARNING: program may create a core file!\n"
+msgstr "WARNING: program may create a core file!\n"
+
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
+#, c-format
+msgid "WARNING: %s overrides %s\n"
+msgstr "WARNING: %s overrides %s\n"
+
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
+#, c-format
+msgid "%s not allowed with %s!\n"
+msgstr "%s not allowed with %s!\n"
+
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
+#, c-format
+msgid "%s makes no sense with %s!\n"
+msgstr "%s makes no sense with %s!\n"
+
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
+#, c-format
+msgid "NOTE: %s is not available in this version\n"
+msgstr "NOTE: %s is not available in this version\n"
+
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
+#, 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:3002
++#: g10/gpg.c:3007
+msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
+msgstr "you can only make detached or clear signatures while in --pgp2 mode\n"
+
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
+msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+msgstr "you can't sign and encrypt at the same time while in --pgp2 mode\n"
+
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
+msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+msgstr ""
+"you must use files (and not a pipe) when working with --pgp2 enabled.\n"
+
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
+msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+msgstr "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
+
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
+msgid "selected cipher algorithm is invalid\n"
+msgstr "selected cipher algorithm is invalid\n"
+
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
+msgid "selected digest algorithm is invalid\n"
+msgstr "selected digest algorithm is invalid\n"
+
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
+msgid "selected compression algorithm is invalid\n"
+msgstr "selected compression algorithm is invalid\n"
+
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
+msgid "selected certification digest algorithm is invalid\n"
+msgstr "selected certification digest algorithm is invalid\n"
+
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
+msgid "completes-needed must be greater than 0\n"
+msgstr "completes-needed must be greater than 0\n"
+
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
+msgid "marginals-needed must be greater than 1\n"
+msgstr "marginals-needed must be greater than 1\n"
+
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
+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:3130
++#: g10/gpg.c:3135
+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:3132
++#: g10/gpg.c:3137
+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:3135
++#: g10/gpg.c:3140
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n"
+
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
+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:3146
++#: g10/gpg.c:3151
+msgid "invalid default preferences\n"
+msgstr "invalid default preferences\n"
+
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
+msgid "invalid personal cipher preferences\n"
+msgstr "invalid personal cipher preferences\n"
+
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
+msgid "invalid personal digest preferences\n"
+msgstr "invalid personal digest preferences\n"
+
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
+msgid "invalid personal compress preferences\n"
+msgstr "invalid personal compress preferences\n"
+
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
+#, c-format
+msgid "%s does not yet work with %s\n"
+msgstr "%s does not yet work with %s\n"
+
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
+#, 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:3243
++#: g10/gpg.c:3248
+#, 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:3248
++#: g10/gpg.c:3253
+#, 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:3357
++#: g10/gpg.c:3362
+#, c-format
+msgid "failed to initialize the TrustDB: %s\n"
+msgstr "failed to initialize the TrustDB: %s\n"
+
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
+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:3379
++#: g10/gpg.c:3384
+msgid "--store [filename]"
+msgstr "--store [filename]"
+
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
+msgid "--symmetric [filename]"
+msgstr "--symmetric [filename]"
+
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
+#, c-format
+msgid "symmetric encryption of `%s' failed: %s\n"
+msgstr "symmetric encryption of ‘%s’ failed: %s\n"
+
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
+msgid "--encrypt [filename]"
+msgstr "--encrypt [filename]"
+
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
+msgid "--symmetric --encrypt [filename]"
+msgstr "--symmetric --encrypt [filename]"
+
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
+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:3416
++#: g10/gpg.c:3421
+#, 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:3434
++#: g10/gpg.c:3439
+msgid "--sign [filename]"
+msgstr "--sign [filename]"
+
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
+msgid "--sign --encrypt [filename]"
+msgstr "--sign --encrypt [filename]"
+
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
+msgid "--symmetric --sign --encrypt [filename]"
+msgstr "--symmetric --sign --encrypt [filename]"
+
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
+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:3467
++#: g10/gpg.c:3472
+#, 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:3487
++#: g10/gpg.c:3492
+msgid "--sign --symmetric [filename]"
+msgstr "--sign --symmetric [filename]"
+
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
+msgid "--clearsign [filename]"
+msgstr "--clearsign [filename]"
+
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
+msgid "--decrypt [filename]"
+msgstr "--decrypt [filename]"
+
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
+msgid "--sign-key user-id"
+msgstr "--sign-key user-id"
+
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
+msgid "--lsign-key user-id"
+msgstr "--lsign-key user-id"
+
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
+msgid "--edit-key user-id [commands]"
+msgstr "--edit-key user-id [commands]"
+
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
+msgid "-k[v][v][v][c] [user-id] [keyring]"
+msgstr "-k[v][v][v][c] [user-id] [keyring]"
+
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
+#, c-format
+msgid "keyserver send failed: %s\n"
+msgstr "keyserver send failed: %s\n"
+
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
+#, c-format
+msgid "keyserver receive failed: %s\n"
+msgstr "keyserver receive failed: %s\n"
+
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
+#, c-format
+msgid "key export failed: %s\n"
+msgstr "key export failed: %s\n"
+
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
+#, c-format
+msgid "keyserver search failed: %s\n"
+msgstr "keyserver search failed: %s\n"
+
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
+#, c-format
+msgid "keyserver refresh failed: %s\n"
+msgstr "keyserver refresh failed: %s\n"
+
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
+#, c-format
+msgid "dearmoring failed: %s\n"
+msgstr "dearmoring failed: %s\n"
+
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
+#, c-format
+msgid "enarmoring failed: %s\n"
+msgstr "enarmoring failed: %s\n"
+
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
+#, c-format
+msgid "invalid hash algorithm `%s'\n"
+msgstr "invalid hash algorithm ‘%s’\n"
+
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
+msgid "[filename]"
+msgstr "[filename]"
+
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
+msgid "Go ahead and type your message ...\n"
+msgstr "Go ahead and type your message ...\n"
+
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
+msgid "the given certification policy URL is invalid\n"
+msgstr "the given certification policy URL is invalid\n"
+
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
+msgid "the given signature policy URL is invalid\n"
+msgstr "the given signature policy URL is invalid\n"
+
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
+msgid "the given preferred keyserver URL is invalid\n"
+msgstr "the given preferred keyserver URL is invalid\n"
+
+#: g10/getkey.c:151
+msgid "too many entries in pk cache - disabled\n"
+msgstr "too many entries in pk cache - disabled\n"
+
+#: g10/getkey.c:174
+msgid "[User ID not found]"
+msgstr "[User ID not found]"
+
+#: g10/getkey.c:510 g10/getkey.c:2764
+#, c-format
+msgid "key %s: secret key without public key - skipped\n"
+msgstr "key %s: secret key without public key - skipped\n"
+
+#: g10/getkey.c:1001 g10/getkey.c:1011 g10/getkey.c:1021 g10/getkey.c:1037
+#: g10/getkey.c:1052
+#, c-format
+msgid "automatically retrieved `%s' via %s\n"
+msgstr "automatically retrieved ‘%s’ via %s\n"
+
+#: g10/getkey.c:1890
+#, c-format
+msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
+
+#: g10/getkey.c:2496 g10/keyedit.c:3786
+#, c-format
+msgid "no secret subkey for public subkey %s - ignoring\n"
+msgstr "no secret subkey for public subkey %s - ignoring\n"
+
+#: g10/getkey.c:2717
+#, c-format
+msgid "using subkey %s instead of primary key %s\n"
+msgstr "using subkey %s instead of primary key %s\n"
+
+#: g10/gpgv.c:72
+msgid "be somewhat more quiet"
+msgstr "be somewhat more quiet"
+
+#: g10/gpgv.c:73
+msgid "take the keys from this keyring"
+msgstr "take the keys from this keyring"
+
+#: g10/gpgv.c:75
+msgid "make timestamp conflicts only a warning"
+msgstr "make timestamp conflicts only a warning"
+
+#: g10/gpgv.c:76
+msgid "|FD|write status info to this FD"
+msgstr "|FD|write status info to this FD"
+
+#: g10/gpgv.c:101
+msgid "Usage: gpgv [options] [files] (-h for help)"
+msgstr "Usage: gpgv [options] [files] (-h for help)"
+
+#: g10/gpgv.c:104
+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:47
+msgid ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+msgstr ""
+"It's up to you to assign a value here; this value will never be exported\n"
+"to any 3rd party. We need it to implement the web-of-trust; it has nothing\n"
+"to do with the (implicitly created) web-of-certificates."
+
+#: g10/helptext.c:53
+msgid ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key. Answer \"yes\" to set this key to\n"
+"ultimately trusted\n"
+msgstr ""
+"To build the Web-of-Trust, GnuPG needs to know which keys are\n"
+"ultimately trusted - those are usually the keys for which you have\n"
+"access to the secret key. Answer “yes” to set this key to\n"
+"ultimately trusted\n"
+
+#: g10/helptext.c:60
+msgid "If you want to use this untrusted key anyway, answer \"yes\"."
+msgstr "If you want to use this untrusted key anyway, answer “yes”."
+
+#: g10/helptext.c:64
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
+msgstr ""
+"Enter the user ID of the addressee to whom you want to send the message."
+
+#: g10/helptext.c:68
+msgid ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+msgstr ""
+"Select the algorithm to use.\n"
+"\n"
+"DSA (aka DSS) is the Digital Signature Algorithm and can only be used\n"
+"for signatures.\n"
+"\n"
+"Elgamal is an encrypt-only algorithm.\n"
+"\n"
+"RSA may be used for signatures or encryption.\n"
+"\n"
+"The first (primary) key must always be a key which is capable of signing."
+
+#: g10/helptext.c:82
+msgid ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption. This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+msgstr ""
+"In general it is not a good idea to use the same key for signing and\n"
+"encryption. This algorithm should only be used in certain domains.\n"
+"Please consult your security expert first."
+
+#: g10/helptext.c:89
+msgid "Enter the size of the key"
+msgstr "Enter the size of the key"
+
+#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
+#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
+msgid "Answer \"yes\" or \"no\""
+msgstr "Answer “yes” or “no”"
+
+#: g10/helptext.c:103
+msgid ""
+"Enter the required value as shown in the prompt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+msgstr ""
+"Enter the required value as shown in the prompt.\n"
+"It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
+"get a good error response - instead the system tries to interpret\n"
+"the given value as an interval."
+
+#: g10/helptext.c:115
+msgid "Enter the name of the key holder"
+msgstr "Enter the name of the key holder"
+
+#: g10/helptext.c:120
+msgid "please enter an optional but highly suggested email address"
+msgstr "please enter an optional but highly suggested email address"
+
+#: g10/helptext.c:124
+msgid "Please enter an optional comment"
+msgstr "Please enter an optional comment"
+
+#: g10/helptext.c:129
+msgid ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to quit the key generation."
+msgstr ""
+"N to change the name.\n"
+"C to change the comment.\n"
+"E to change the email address.\n"
+"O to continue with key generation.\n"
+"Q to quit the key generation."
+
+#: g10/helptext.c:138
+msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
+msgstr "Answer “yes” (or just “y”) if it is okay to generate the sub key."
+
+#: g10/helptext.c:146
+msgid ""
+"When you sign a user ID on a key, you should first verify that the key\n"
+"belongs to the person named in the user ID. It is useful for others to\n"
+"know how carefully you verified this.\n"
+"\n"
+"\"0\" means you make no particular claim as to how carefully you verified "
+"the\n"
+" key.\n"
+"\n"
+"\"1\" means you believe the key is owned by the person who claims to own it\n"
+" but you could not, or did not verify the key at all. This is useful "
+"for\n"
+" a \"persona\" verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"\"2\" means you did casual verification of the key. For example, this "
+"could\n"
+" mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+" key against a photo ID.\n"
+"\n"
+"\"3\" means you did extensive verification of the key. For example, this "
+"could\n"
+" mean that you verified the key fingerprint with the owner of the key in\n"
+" person, and that you checked, by means of a hard to forge document with "
+"a\n"
+" photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+" name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+" of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive"
+"\"\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer \"0\"."
+msgstr ""
+"When you sign a user ID on a key, you should first verify that the key\n"
+"belongs to the person named in the user ID. It is useful for others to\n"
+"know how carefully you verified this.\n"
+"\n"
+"“0” means you make no particular claim as to how carefully you verified the\n"
+" key.\n"
+"\n"
+"“1” means you believe the key is owned by the person who claims to own it\n"
+" but you could not, or did not verify the key at all. This is useful "
+"for\n"
+" a “persona” verification, where you sign the key of a pseudonymous "
+"user.\n"
+"\n"
+"“2” means you did casual verification of the key. For example, this could\n"
+" mean that you verified the key fingerprint and checked the user ID on "
+"the\n"
+" key against a photo ID.\n"
+"\n"
+"“3” means you did extensive verification of the key. For example, this "
+"could\n"
+" mean that you verified the key fingerprint with the owner of the key in\n"
+" person, and that you checked, by means of a hard to forge document with "
+"a\n"
+" photo ID (such as a passport) that the name of the key owner matches "
+"the\n"
+" name in the user ID on the key, and finally that you verified (by "
+"exchange\n"
+" of email) that the email address on the key belongs to the key owner.\n"
+"\n"
+"Note that the examples given above for levels 2 and 3 are *only* examples.\n"
+"In the end, it is up to you to decide just what “casual” and “extensive”\n"
+"mean to you when you sign other keys.\n"
+"\n"
+"If you don't know what the right answer is, answer “0”."
+
+#: g10/helptext.c:184
+msgid "Answer \"yes\" if you want to sign ALL the user IDs"
+msgstr "Answer “yes” if you want to sign ALL the user IDs"
+
+#: g10/helptext.c:188
+msgid ""
+"Answer \"yes\" if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+msgstr ""
+"Answer “yes” if you really want to delete this user ID.\n"
+"All certificates are then also lost!"
+
+#: g10/helptext.c:193
+msgid "Answer \"yes\" if it is okay to delete the subkey"
+msgstr "Answer “yes” if it is okay to delete the subkey"
+
+#: g10/helptext.c:198
+msgid ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature because it may be important to establish a\n"
+"trust connection to the key or another key certified by this key."
+msgstr ""
+"This is a valid signature on the key; you normally don't want\n"
+"to delete this signature because it may be important to establish a\n"
+"trust connection to the key or another key certified by this key."
+
+#: g10/helptext.c:203
+msgid ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+msgstr ""
+"This signature can't be checked because you don't have the\n"
+"corresponding key. You should postpone its deletion until you\n"
+"know which key was used because this signing key might establish\n"
+"a trust connection through another already certified key."
+
+#: g10/helptext.c:209
+msgid ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
+msgstr ""
+"The signature is not valid. It does make sense to remove it from\n"
+"your keyring."
+
+#: g10/helptext.c:213
+msgid ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"GnuPG might not be able to use this key anymore. So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+msgstr ""
+"This is a signature which binds the user ID to the key. It is\n"
+"usually not a good idea to remove such a signature. Actually\n"
+"GnuPG might not be able to use this key anymore. So do this\n"
+"only if this self-signature is for some reason not valid and\n"
+"a second one is available."
+
+#: g10/helptext.c:221
+msgid ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences. The timestamp of all affected\n"
+"self-signatures will be advanced by one second.\n"
+msgstr ""
+"Change the preferences of all user IDs (or just of the selected ones)\n"
+"to the current list of preferences. The timestamp of all affected\n"
+"self-signatures will be advanced by one second.\n"
+
+#: g10/helptext.c:228
+msgid "Please enter the passphrase; this is a secret sentence \n"
+msgstr "Please enter the passphrase; this is a secret sentence \n"
+
+#: g10/helptext.c:234
+msgid "Please repeat the last passphrase, so you are sure what you typed in."
+msgstr "Please repeat the last passphrase, so you are sure what you typed in."
+
+#: g10/helptext.c:238
+msgid "Give the name of the file to which the signature applies"
+msgstr "Give the name of the file to which the signature applies"
+
+#: g10/helptext.c:243
+msgid "Answer \"yes\" if it is okay to overwrite the file"
+msgstr "Answer “yes” if it is okay to overwrite the file"
+
+#: g10/helptext.c:248
+msgid ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+msgstr ""
+"Please enter a new filename. If you just hit RETURN the default\n"
+"file (which is shown in brackets) will be used."
+
+#: g10/helptext.c:254
+msgid ""
+"You should specify a reason for the certification. Depending on the\n"
+"context you have the ability to choose from this list:\n"
+" \"Key has been compromised\"\n"
+" Use this if you have a reason to believe that unauthorized persons\n"
+" got access to your secret key.\n"
+" \"Key is superseded\"\n"
+" Use this if you have replaced this key with a newer one.\n"
+" \"Key is no longer used\"\n"
+" Use this if you have retired this key.\n"
+" \"User ID is no longer valid\"\n"
+" Use this to state that the user ID should not longer be used;\n"
+" this is normally used to mark an email address invalid.\n"
+msgstr ""
+"You should specify a reason for the certification. Depending on the\n"
+"context you have the ability to choose from this list:\n"
+" “Key has been compromised”\n"
+" Use this if you have a reason to believe that unauthorized persons\n"
+" got access to your secret key.\n"
+" “Key is superseded”\n"
+" Use this if you have replaced this key with a newer one.\n"
+" “Key is no longer used”\n"
+" Use this if you have retired this key.\n"
+" “User ID is no longer valid”\n"
+" Use this to state that the user ID should not longer be used;\n"
+" this is normally used to mark an email address invalid.\n"
+
+#: g10/helptext.c:270
+msgid ""
+"If you like, you can enter a text describing why you issue this\n"
+"revocation certificate. Please keep this text concise.\n"
+"An empty line ends the text.\n"
+msgstr ""
+"If you like, you can enter a text describing why you issue this\n"
+"revocation certificate. Please keep this text concise.\n"
+"An empty line ends the text.\n"
+
+#: g10/helptext.c:285
+msgid "No help available"
+msgstr "No help available"
+
+#: g10/helptext.c:293
+#, c-format
+msgid "No help available for `%s'"
+msgstr "No help available for ‘%s’"
+
+#: g10/import.c:98
+msgid "import signatures that are marked as local-only"
+msgstr "import signatures that are marked as local-only"
+
+#: g10/import.c:101
+msgid "repair damage from the pks keyserver during import"
+msgstr "repair damage from the pks keyserver during import"
+
+#: g10/import.c:104
+msgid "do not clear the ownertrust values during import"
+msgstr "do not clear the ownertrust values during import"
+
+#: g10/import.c:107
+msgid "do not update the trustdb after import"
+msgstr "do not update the trustdb after import"
+
+#: g10/import.c:110
+msgid "create a public key when importing a secret key"
+msgstr "create a public key when importing a secret key"
+
+#: g10/import.c:113
+msgid "only accept updates to existing keys"
+msgstr "only accept updates to existing keys"
+
+#: g10/import.c:116
+msgid "remove unusable parts from key after import"
+msgstr "remove unusable parts from key after import"
+
+#: g10/import.c:119
+msgid "remove as much as possible from key after import"
+msgstr "remove as much as possible from key after import"
+
+#: g10/import.c:293
+#, c-format
+msgid "skipping block of type %d\n"
+msgstr "skipping block of type %d\n"
+
+#: g10/import.c:302
+#, c-format
+msgid "%lu keys processed so far\n"
+msgstr "%lu keys processed so far\n"
+
+#: g10/import.c:324
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr "Total number processed: %lu\n"
+
+#: g10/import.c:326
+#, c-format
+msgid " skipped new keys: %lu\n"
+msgstr " skipped new keys: %lu\n"
+
+#: g10/import.c:329
+#, c-format
+msgid " w/o user IDs: %lu\n"
+msgstr " w/o user IDs: %lu\n"
+
+#: g10/import.c:331
+#, c-format
+msgid " imported: %lu"
+msgstr " imported: %lu"
+
+#: g10/import.c:337
+#, c-format
+msgid " unchanged: %lu\n"
+msgstr " unchanged: %lu\n"
+
+#: g10/import.c:339
+#, c-format
+msgid " new user IDs: %lu\n"
+msgstr " new user IDs: %lu\n"
+
+#: g10/import.c:341
+#, c-format
+msgid " new subkeys: %lu\n"
+msgstr " new subkeys: %lu\n"
+
+#: g10/import.c:343
+#, c-format
+msgid " new signatures: %lu\n"
+msgstr " new signatures: %lu\n"
+
+#: g10/import.c:345
+#, c-format
+msgid " new key revocations: %lu\n"
+msgstr " new key revocations: %lu\n"
+
+#: g10/import.c:347
+#, c-format
+msgid " secret keys read: %lu\n"
+msgstr " secret keys read: %lu\n"
+
+#: g10/import.c:349
+#, c-format
+msgid " secret keys imported: %lu\n"
+msgstr " secret keys imported: %lu\n"
+
+#: g10/import.c:351
+#, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr " secret keys unchanged: %lu\n"
+
+#: g10/import.c:353
+#, c-format
+msgid " not imported: %lu\n"
+msgstr " not imported: %lu\n"
+
+#: g10/import.c:355
+#, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr " signatures cleaned: %lu\n"
+
+#: g10/import.c:357
+#, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " user IDs cleaned: %lu\n"
+
+#: g10/import.c:659
+#, c-format
+msgid "WARNING: key %s contains preferences for unavailable\n"
+msgstr "WARNING: key %s contains preferences for unavailable\n"
+
+#. TRANSLATORS: This string is belongs to the previous one. They are
+#. only split up to allow printing of a common prefix.
+#: g10/import.c:663
+msgid " algorithms on these user IDs:\n"
+msgstr " algorithms on these user IDs:\n"
+
+#: g10/import.c:700
+#, c-format
+msgid " \"%s\": preference for cipher algorithm %s\n"
+msgstr " “%s”: preference for cipher algorithm %s\n"
+
+#: g10/import.c:712
+#, c-format
+msgid " \"%s\": preference for digest algorithm %s\n"
+msgstr " “%s”: preference for digest algorithm %s\n"
+
+#: g10/import.c:724
+#, c-format
+msgid " \"%s\": preference for compression algorithm %s\n"
+msgstr " “%s”: preference for compression algorithm %s\n"
+
+#: g10/import.c:737
+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:739
+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:763
+#, 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:813 g10/import.c:1237
+#, c-format
+msgid "key %s: no user ID\n"
+msgstr "key %s: no user ID\n"
+
+#: g10/import.c:819
+#, c-format
+msgid "key %s: %s\n"
+msgstr "key %s: %s\n"
+
+#: g10/import.c:820 g10/import.c:1212
+msgid "rejected by import filter"
+msgstr "rejected by import filter"
+
+#: g10/import.c:849
+#, c-format
+msgid "key %s: PKS subkey corruption repaired\n"
+msgstr "key %s: PKS subkey corruption repaired\n"
+
+#: g10/import.c:864
+#, 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:870
+#, c-format
+msgid "key %s: no valid user IDs\n"
+msgstr "key %s: no valid user IDs\n"
+
+#: g10/import.c:872
+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:882 g10/import.c:1360
+#, c-format
+msgid "key %s: public key not found: %s\n"
+msgstr "key %s: public key not found: %s\n"
+
+#: g10/import.c:888
+#, c-format
+msgid "key %s: new key - skipped\n"
+msgstr "key %s: new key - skipped\n"
+
+#: g10/import.c:897
+#, c-format
+msgid "no writable keyring found: %s\n"
+msgstr "no writable keyring found: %s\n"
+
+#: g10/import.c:902 g10/openfile.c:291 g10/sign.c:803 g10/sign.c:1108
+#, c-format
+msgid "writing to `%s'\n"
+msgstr "writing to ‘%s’\n"
+
+#: g10/import.c:906 g10/import.c:1007 g10/import.c:1277 g10/import.c:1421
+#: g10/import.c:2526 g10/import.c:2548
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "error writing keyring ‘%s’: %s\n"
+
+#: g10/import.c:926
+#, c-format
+msgid "key %s: public key \"%s\" imported\n"
+msgstr "key %s: public key “%s” imported\n"
+
+#: g10/import.c:950
+#, c-format
+msgid "key %s: doesn't match our copy\n"
+msgstr "key %s: doesn't match our copy\n"
+
+#: g10/import.c:967 g10/import.c:1378
+#, 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:975 g10/import.c:1385
+#, 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:1017
+#, c-format
+msgid "key %s: \"%s\" 1 new user ID\n"
+msgstr "key %s: “%s” 1 new user ID\n"
+
+#: g10/import.c:1020
+#, c-format
+msgid "key %s: \"%s\" %d new user IDs\n"
+msgstr "key %s: “%s” %d new user IDs\n"
+
+#: g10/import.c:1023
+#, c-format
+msgid "key %s: \"%s\" 1 new signature\n"
+msgstr "key %s: “%s” 1 new signature\n"
+
+#: g10/import.c:1026
+#, c-format
+msgid "key %s: \"%s\" %d new signatures\n"
+msgstr "key %s: “%s” %d new signatures\n"
+
+#: g10/import.c:1029
+#, c-format
+msgid "key %s: \"%s\" 1 new subkey\n"
+msgstr "key %s: “%s” 1 new subkey\n"
+
+#: g10/import.c:1032
+#, c-format
+msgid "key %s: \"%s\" %d new subkeys\n"
+msgstr "key %s: “%s” %d new subkeys\n"
+
+#: g10/import.c:1035
+#, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "key %s: “%s” %d signature cleaned\n"
+
+#: g10/import.c:1038
+#, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "key %s: “%s” %d signatures cleaned\n"
+
+#: g10/import.c:1041
+#, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "key %s: “%s” %d user ID cleaned\n"
+
+#: g10/import.c:1044
+#, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "key %s: “%s” %d user IDs cleaned\n"
+
+#: g10/import.c:1067
+#, c-format
+msgid "key %s: \"%s\" not changed\n"
+msgstr "key %s: “%s” not changed\n"
+
+#: g10/import.c:1211
+#, c-format
+msgid "secret key %s: %s\n"
+msgstr "secret key %s: %s\n"
+
+#: g10/import.c:1231 g10/import.c:1254
+msgid "importing secret keys not allowed\n"
+msgstr "importing secret keys not allowed\n"
+
+#: g10/import.c:1243
+#, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "key %s: secret key with invalid cipher %d - skipped\n"
+
+#: g10/import.c:1271 g10/import.c:2541
+#, c-format
+msgid "no default secret keyring: %s\n"
+msgstr "no default secret keyring: %s\n"
+
+#: g10/import.c:1282
+#, c-format
+msgid "key %s: secret key imported\n"
+msgstr "key %s: secret key imported\n"
+
+#: g10/import.c:1313
+#, c-format
+msgid "key %s: already in secret keyring\n"
+msgstr "key %s: already in secret keyring\n"
+
+#: g10/import.c:1323
+#, c-format
+msgid "key %s: secret key not found: %s\n"
+msgstr "key %s: secret key not found: %s\n"
+
+#: g10/import.c:1353
+#, 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:1396
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - rejected\n"
+msgstr "key %s: invalid revocation certificate: %s - rejected\n"
+
+#: g10/import.c:1428
+#, c-format
+msgid "key %s: \"%s\" revocation certificate imported\n"
+msgstr "key %s: “%s” revocation certificate imported\n"
+
+#: g10/import.c:1494
+#, c-format
+msgid "key %s: no user ID for signature\n"
+msgstr "key %s: no user ID for signature\n"
+
+#: g10/import.c:1509
+#, 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:1511
+#, 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:1528 g10/import.c:1553 g10/import.c:1603
+#, c-format
+msgid "key %s: unsupported public key algorithm\n"
+msgstr "key %s: unsupported public key algorithm\n"
+
+#: g10/import.c:1529
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "key %s: invalid direct key signature\n"
+
+#: g10/import.c:1542
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "key %s: no subkey for key binding\n"
+
+#: g10/import.c:1555
+#, c-format
+msgid "key %s: invalid subkey binding\n"
+msgstr "key %s: invalid subkey binding\n"
+
+#: g10/import.c:1570
+#, c-format
+msgid "key %s: removed multiple subkey binding\n"
+msgstr "key %s: removed multiple subkey binding\n"
+
+#: g10/import.c:1592
+#, c-format
+msgid "key %s: no subkey for key revocation\n"
+msgstr "key %s: no subkey for key revocation\n"
+
+#: g10/import.c:1605
+#, c-format
+msgid "key %s: invalid subkey revocation\n"
+msgstr "key %s: invalid subkey revocation\n"
+
+#: g10/import.c:1620
+#, c-format
+msgid "key %s: removed multiple subkey revocation\n"
+msgstr "key %s: removed multiple subkey revocation\n"
+
+#: g10/import.c:1662
+#, c-format
+msgid "key %s: skipped user ID \"%s\"\n"
+msgstr "key %s: skipped user ID “%s”\n"
+
+#: g10/import.c:1683
+#, c-format
+msgid "key %s: skipped subkey\n"
+msgstr "key %s: skipped subkey\n"
+
+#: g10/import.c:1710
+#, 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:1720
+#, 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:1737
+#, c-format
+msgid "key %s: invalid revocation certificate: %s - skipped\n"
+msgstr "key %s: invalid revocation certificate: %s - skipped\n"
+
+#: g10/import.c:1751
+#, 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:1759
+#, 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:1888
+#, c-format
+msgid "key %s: duplicated user ID detected - merged\n"
+msgstr "key %s: duplicated user ID detected - merged\n"
+
+#: g10/import.c:1950
+#, 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:1964
+#, 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:2023
+#, c-format
+msgid "key %s: \"%s\" revocation certificate added\n"
+msgstr "key %s: “%s” revocation certificate added\n"
+
+#: g10/import.c:2057
+#, c-format
+msgid "key %s: direct key signature added\n"
+msgstr "key %s: direct key signature added\n"
+
+#: g10/import.c:2446
+msgid "NOTE: a key's S/N does not match the card's one\n"
+msgstr "NOTE: a key's S/N does not match the card's one\n"
+
+#: g10/import.c:2454
+msgid "NOTE: primary key is online and stored on card\n"
+msgstr "NOTE: primary key is online and stored on card\n"
+
+#: g10/import.c:2456
+msgid "NOTE: secondary key is online and stored on card\n"
+msgstr "NOTE: secondary key is online and stored on card\n"
+
+#: g10/keydb.c:166
+#, c-format
+msgid "error creating keyring `%s': %s\n"
+msgstr "error creating keyring ‘%s’: %s\n"
+
+#: g10/keydb.c:173
+#, c-format
+msgid "keyring `%s' created\n"
+msgstr "keyring ‘%s’ created\n"
+
+#: g10/keydb.c:319 g10/keydb.c:322
+#, c-format
+msgid "keyblock resource `%s': %s\n"
+msgstr "keyblock resource ‘%s’: %s\n"
+
+#: g10/keydb.c:703
+#, c-format
+msgid "failed to rebuild keyring cache: %s\n"
+msgstr "failed to rebuild keyring cache: %s\n"
+
+#: g10/keyedit.c:265
+msgid "[revocation]"
+msgstr "[revocation]"
+
+#: g10/keyedit.c:266
+msgid "[self-signature]"
+msgstr "[self-signature]"
+
+#: g10/keyedit.c:344 g10/keylist.c:390
+msgid "1 bad signature\n"
+msgstr "1 bad signature\n"
+
+#: g10/keyedit.c:346 g10/keylist.c:392
+#, c-format
+msgid "%d bad signatures\n"
+msgstr "%d bad signatures\n"
+
+#: g10/keyedit.c:348 g10/keylist.c:394
+msgid "1 signature not checked due to a missing key\n"
+msgstr "1 signature not checked due to a missing key\n"
+
+#: g10/keyedit.c:350 g10/keylist.c:396
+#, c-format
+msgid "%d signatures not checked due to missing keys\n"
+msgstr "%d signatures not checked due to missing keys\n"
+
+#: g10/keyedit.c:352 g10/keylist.c:398
+msgid "1 signature not checked due to an error\n"
+msgstr "1 signature not checked due to an error\n"
+
+#: g10/keyedit.c:354 g10/keylist.c:400
+#, c-format
+msgid "%d signatures not checked due to errors\n"
+msgstr "%d signatures not checked due to errors\n"
+
+#: g10/keyedit.c:356
+msgid "1 user ID without valid self-signature detected\n"
+msgstr "1 user ID without valid self-signature detected\n"
+
+#: g10/keyedit.c:358
+#, c-format
+msgid "%d user IDs without valid self-signatures detected\n"
+msgstr "%d user IDs without valid self-signatures detected\n"
+
+#: g10/keyedit.c:414 g10/pkclist.c:265
+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:418 g10/pkclist.c:277
+#, c-format
+msgid " %d = I trust marginally\n"
+msgstr " %d = I trust marginally\n"
+
+#: g10/keyedit.c:419 g10/pkclist.c:279
+#, c-format
+msgid " %d = I trust fully\n"
+msgstr " %d = I trust fully\n"
+
+#: g10/keyedit.c:438
+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:454
+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:599
+#, c-format
+msgid "User ID \"%s\" is revoked."
+msgstr "User ID “%s” is revoked."
+
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:829
+#: g10/keyedit.c:889 g10/keyedit.c:1752
+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:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:835
+#: g10/keyedit.c:1758
+msgid " Unable to sign.\n"
+msgstr " Unable to sign.\n"
+
+#: g10/keyedit.c:627
+#, c-format
+msgid "User ID \"%s\" is expired."
+msgstr "User ID “%s” is expired."
+
+#: g10/keyedit.c:655
+#, c-format
+msgid "User ID \"%s\" is not self-signed."
+msgstr "User ID “%s” is not self-signed."
+
+#: g10/keyedit.c:683
+#, c-format
+msgid "User ID \"%s\" is signable. "
+msgstr "User ID “%s” is signable. "
+
+#: g10/keyedit.c:685
+msgid "Sign it? (y/N) "
+msgstr "Sign it? (y/N) "
+
+#: g10/keyedit.c:707
+#, 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:716
+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:730
+#, 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:734
+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:755
+#, 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:759
+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:780
+#, 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:783
+#, c-format
+msgid "\"%s\" was already signed by key %s\n"
+msgstr "“%s” was already signed by key %s\n"
+
+#: g10/keyedit.c:788
+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:810
+#, c-format
+msgid "Nothing to sign with key %s\n"
+msgstr "Nothing to sign with key %s\n"
+
+#: g10/keyedit.c:823
+msgid "This key has expired!"
+msgstr "This key has expired!"
+
+#: g10/keyedit.c:841
+#, 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:847
+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:882
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+msgstr ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
+
+#: g10/keyedit.c:884
+msgid "This would make the key unusable in PGP 2.x.\n"
+msgstr "This would make the key unusable in PGP 2.x.\n"
+
+#: g10/keyedit.c:909
+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:914
+#, c-format
+msgid " (0) I will not answer.%s\n"
+msgstr " (0) I will not answer.%s\n"
+
+#: g10/keyedit.c:916
+#, 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:918
+#, c-format
+msgid " (2) I have done casual checking.%s\n"
+msgstr " (2) I have done casual checking.%s\n"
+
+#: g10/keyedit.c:920
+#, 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:926
+msgid "Your selection? (enter `?' for more information): "
+msgstr "Your selection? (enter ‘?’ for more information): "
+
+#: g10/keyedit.c:950
+#, 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:957
+msgid "This will be a self-signature.\n"
+msgstr "This will be a self-signature.\n"
+
+#: g10/keyedit.c:963
+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:971
+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:981
+msgid "The signature will be marked as non-exportable.\n"
+msgstr "The signature will be marked as non-exportable.\n"
+
+#: g10/keyedit.c:988
+msgid "The signature will be marked as non-revocable.\n"
+msgstr "The signature will be marked as non-revocable.\n"
+
+#: g10/keyedit.c:995
+msgid "I have not checked this key at all.\n"
+msgstr "I have not checked this key at all.\n"
+
+#: g10/keyedit.c:1000
+msgid "I have checked this key casually.\n"
+msgstr "I have checked this key casually.\n"
+
+#: g10/keyedit.c:1005
+msgid "I have checked this key very carefully.\n"
+msgstr "I have checked this key very carefully.\n"
+
+#: g10/keyedit.c:1015
+msgid "Really sign? (y/N) "
+msgstr "Really sign? (y/N) "
+
+#: g10/keyedit.c:1060 g10/keyedit.c:4893 g10/keyedit.c:4984 g10/keyedit.c:5048
+#: g10/keyedit.c:5109 g10/sign.c:318
+#, c-format
+msgid "signing failed: %s\n"
+msgstr "signing failed: %s\n"
+
+#: g10/keyedit.c:1125
+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:1136 g10/keygen.c:3413
+msgid "This key is not protected.\n"
+msgstr "This key is not protected.\n"
+
+#: g10/keyedit.c:1140 g10/keygen.c:3401 g10/revoke.c:535
+msgid "Secret parts of primary key are not available.\n"
+msgstr "Secret parts of primary key are not available.\n"
+
+#: g10/keyedit.c:1144 g10/keygen.c:3416
+msgid "Secret parts of primary key are stored on-card.\n"
+msgstr "Secret parts of primary key are stored on-card.\n"
+
+#: g10/keyedit.c:1148 g10/keygen.c:3420
+msgid "Key is protected.\n"
+msgstr "Key is protected.\n"
+
+#: g10/keyedit.c:1172
+#, c-format
+msgid "Can't edit this key: %s\n"
+msgstr "Can't edit this key: %s\n"
+
+#: g10/keyedit.c:1178
+msgid ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+msgstr ""
+"Enter the new passphrase for this secret key.\n"
+"\n"
+
+#: g10/keyedit.c:1187 g10/keygen.c:2005
+msgid "passphrase not correctly repeated; try again"
+msgstr "passphrase not correctly repeated; try again"
+
+#: g10/keyedit.c:1192
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+msgstr ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"\n"
+
+#: g10/keyedit.c:1195
+msgid "Do you really want to do this? (y/N) "
+msgstr "Do you really want to do this? (y/N) "
+
+#: g10/keyedit.c:1266
+msgid "moving a key signature to the correct place\n"
+msgstr "moving a key signature to the correct place\n"
+
+#: g10/keyedit.c:1352
+msgid "save and quit"
+msgstr "save and quit"
+
+#: g10/keyedit.c:1355
+msgid "show key fingerprint"
+msgstr "show key fingerprint"
+
+#: g10/keyedit.c:1356
+msgid "list key and user IDs"
+msgstr "list key and user IDs"
+
+#: g10/keyedit.c:1358
+msgid "select user ID N"
+msgstr "select user ID N"
+
+#: g10/keyedit.c:1359
+msgid "select subkey N"
+msgstr "select subkey N"
+
+#: g10/keyedit.c:1360
+msgid "check signatures"
+msgstr "check signatures"
+
+#: g10/keyedit.c:1365
+msgid "sign selected user IDs [* see below for related commands]"
+msgstr "sign selected user IDs [* see below for related commands]"
+
+#: g10/keyedit.c:1370
+msgid "sign selected user IDs locally"
+msgstr "sign selected user IDs locally"
+
+#: g10/keyedit.c:1372
+msgid "sign selected user IDs with a trust signature"
+msgstr "sign selected user IDs with a trust signature"
+
+#: g10/keyedit.c:1374
+msgid "sign selected user IDs with a non-revocable signature"
+msgstr "sign selected user IDs with a non-revocable signature"
+
+#: g10/keyedit.c:1378
+msgid "add a user ID"
+msgstr "add a user ID"
+
+#: g10/keyedit.c:1380
+msgid "add a photo ID"
+msgstr "add a photo ID"
+
+#: g10/keyedit.c:1382
+msgid "delete selected user IDs"
+msgstr "delete selected user IDs"
+
+#: g10/keyedit.c:1387
+msgid "add a subkey"
+msgstr "add a subkey"
+
+#: g10/keyedit.c:1391
+msgid "add a key to a smartcard"
+msgstr "add a key to a smartcard"
+
+#: g10/keyedit.c:1393
+msgid "move a key to a smartcard"
+msgstr "move a key to a smartcard"
+
+#: g10/keyedit.c:1395
+msgid "move a backup key to a smartcard"
+msgstr "move a backup key to a smartcard"
+
+#: g10/keyedit.c:1399
+msgid "delete selected subkeys"
+msgstr "delete selected subkeys"
+
+#: g10/keyedit.c:1401
+msgid "add a revocation key"
+msgstr "add a revocation key"
+
+#: g10/keyedit.c:1403
+msgid "delete signatures from the selected user IDs"
+msgstr "delete signatures from the selected user IDs"
+
+#: g10/keyedit.c:1405
+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:1407
+msgid "flag the selected user ID as primary"
+msgstr "flag the selected user ID as primary"
+
+#: g10/keyedit.c:1409
+msgid "toggle between the secret and public key listings"
+msgstr "toggle between the secret and public key listings"
+
+#: g10/keyedit.c:1412
+msgid "list preferences (expert)"
+msgstr "list preferences (expert)"
+
+#: g10/keyedit.c:1414
+msgid "list preferences (verbose)"
+msgstr "list preferences (verbose)"
+
+#: g10/keyedit.c:1416
+msgid "set preference list for the selected user IDs"
+msgstr "set preference list for the selected user IDs"
+
+#: g10/keyedit.c:1421
+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:1423
+msgid "set a notation for the selected user IDs"
+msgstr "set a notation for the selected user IDs"
+
+#: g10/keyedit.c:1425
+msgid "change the passphrase"
+msgstr "change the passphrase"
+
+#: g10/keyedit.c:1429
+msgid "change the ownertrust"
+msgstr "change the ownertrust"
+
+#: g10/keyedit.c:1431
+msgid "revoke signatures on the selected user IDs"
+msgstr "revoke signatures on the selected user IDs"
+
+#: g10/keyedit.c:1433
+msgid "revoke selected user IDs"
+msgstr "revoke selected user IDs"
+
+#: g10/keyedit.c:1438
+msgid "revoke key or selected subkeys"
+msgstr "revoke key or selected subkeys"
+
+#: g10/keyedit.c:1439
+msgid "enable key"
+msgstr "enable key"
+
+#: g10/keyedit.c:1440
+msgid "disable key"
+msgstr "disable key"
+
+#: g10/keyedit.c:1441
+msgid "show selected photo IDs"
+msgstr "show selected photo IDs"
+
+#: g10/keyedit.c:1443
+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:1445
+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:1572
+#, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
+msgstr "error reading secret keyblock “%s”: %s\n"
+
+#: g10/keyedit.c:1590
+msgid "Secret key is available.\n"
+msgstr "Secret key is available.\n"
+
+#: g10/keyedit.c:1679
+msgid "Need the secret key to do this.\n"
+msgstr "Need the secret key to do this.\n"
+
+#: g10/keyedit.c:1687
+msgid "Please use the command \"toggle\" first.\n"
+msgstr "Please use the command “toggle” first.\n"
+
+#: g10/keyedit.c:1706
+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:1746
+msgid "Key is revoked."
+msgstr "Key is revoked."
+
+#: g10/keyedit.c:1765
+msgid "Really sign all user IDs? (y/N) "
+msgstr "Really sign all user IDs? (y/N) "
+
+#: g10/keyedit.c:1772
+msgid "Hint: Select the user IDs to sign\n"
+msgstr "Hint: Select the user IDs to sign\n"
+
+#: g10/keyedit.c:1781
+#, c-format
+msgid "Unknown signature type `%s'\n"
+msgstr "Unknown signature type ‘%s’\n"
+
+#: g10/keyedit.c:1804
+#, 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:1826 g10/keyedit.c:1846 g10/keyedit.c:2012
+msgid "You must select at least one user ID.\n"
+msgstr "You must select at least one user ID.\n"
+
+#: g10/keyedit.c:1828
+msgid "You can't delete the last user ID!\n"
+msgstr "You can't delete the last user ID!\n"
+
+#: g10/keyedit.c:1830
+msgid "Really remove all selected user IDs? (y/N) "
+msgstr "Really remove all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:1831
+msgid "Really remove this user ID? (y/N) "
+msgstr "Really remove this user ID? (y/N) "
+
+#: g10/keyedit.c:1881
+msgid "Really move the primary key? (y/N) "
+msgstr "Really move the primary key? (y/N) "
+
+#: g10/keyedit.c:1893
+msgid "You must select exactly one key.\n"
+msgstr "You must select exactly one key.\n"
+
+#: g10/keyedit.c:1921
+msgid "Command expects a filename argument\n"
+msgstr "Command expects a filename argument\n"
+
+#: g10/keyedit.c:1935
+#, c-format
+msgid "Can't open `%s': %s\n"
+msgstr "Can't open ‘%s’: %s\n"
+
+#: g10/keyedit.c:1952
+#, c-format
+msgid "Error reading backup key from `%s': %s\n"
+msgstr "Error reading backup key from ‘%s’: %s\n"
+
+#: g10/keyedit.c:1976
+msgid "You must select at least one key.\n"
+msgstr "You must select at least one key.\n"
+
+#: g10/keyedit.c:1979
+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:1980
+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:2015
+msgid "Really revoke all selected user IDs? (y/N) "
+msgstr "Really revoke all selected user IDs? (y/N) "
+
+#: g10/keyedit.c:2016
+msgid "Really revoke this user ID? (y/N) "
+msgstr "Really revoke this user ID? (y/N) "
+
+#: g10/keyedit.c:2034
+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:2045
+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:2047
+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:2098
+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:2140
+msgid "Set preference list to:\n"
+msgstr "Set preference list to:\n"
+
+#: g10/keyedit.c:2146
+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:2148
+msgid "Really update the preferences? (y/N) "
+msgstr "Really update the preferences? (y/N) "
+
+#: g10/keyedit.c:2218
+msgid "Save changes? (y/N) "
+msgstr "Save changes? (y/N) "
+
+#: g10/keyedit.c:2221
+msgid "Quit without saving? (y/N) "
+msgstr "Quit without saving? (y/N) "
+
+#: g10/keyedit.c:2231
+#, c-format
+msgid "update failed: %s\n"
+msgstr "update failed: %s\n"
+
+#: g10/keyedit.c:2238
+#, c-format
+msgid "update secret failed: %s\n"
+msgstr "update secret failed: %s\n"
+
+#: g10/keyedit.c:2245
+msgid "Key not changed so no update needed.\n"
+msgstr "Key not changed so no update needed.\n"
+
+#: g10/keyedit.c:2346
+msgid "Digest: "
+msgstr "Digest: "
+
+#: g10/keyedit.c:2398
+msgid "Features: "
+msgstr "Features: "
+
+#: g10/keyedit.c:2409
+msgid "Keyserver no-modify"
+msgstr "Keyserver no-modify"
+
+#: g10/keyedit.c:2424 g10/keylist.c:308
+msgid "Preferred keyserver: "
+msgstr "Preferred keyserver: "
+
+#: g10/keyedit.c:2432 g10/keyedit.c:2433
+msgid "Notations: "
+msgstr "Notations: "
+
+#: g10/keyedit.c:2643
+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:2700
+#, c-format
+msgid "This key was revoked on %s by %s key %s\n"
+msgstr "This key was revoked on %s by %s key %s\n"
+
+#: g10/keyedit.c:2721
+#, 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:2727
+msgid "(sensitive)"
+msgstr "(sensitive)"
+
+#: g10/keyedit.c:2743 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
+#: g10/keylist.c:194 g10/keyserver.c:526
+#, c-format
+msgid "created: %s"
+msgstr "created: %s"
+
+#: g10/keyedit.c:2746 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:999
+#, c-format
+msgid "revoked: %s"
+msgstr "revoked: %s"
+
+#: g10/keyedit.c:2748 g10/keylist.c:757 g10/keylist.c:792 g10/keylist.c:886
+#, c-format
+msgid "expired: %s"
+msgstr "expired: %s"
+
+#: g10/keyedit.c:2750 g10/keyedit.c:2801 g10/keyedit.c:2862 g10/keyedit.c:2877
+#: g10/keylist.c:196 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892
+#: g10/keylist.c:913 g10/keyserver.c:532 g10/mainproc.c:1005
+#, c-format
+msgid "expires: %s"
+msgstr "expires: %s"
+
+#: g10/keyedit.c:2752
+#, c-format
+msgid "usage: %s"
+msgstr "usage: %s"
+
+#: g10/keyedit.c:2767
+#, c-format
+msgid "trust: %s"
+msgstr "trust: %s"
+
+#: g10/keyedit.c:2771
+#, c-format
+msgid "validity: %s"
+msgstr "validity: %s"
+
+#: g10/keyedit.c:2778
+msgid "This key has been disabled"
+msgstr "This key has been disabled"
+
+#: g10/keyedit.c:2806 g10/keylist.c:200
+msgid "card-no: "
+msgstr "card-no: "
+
+#: g10/keyedit.c:2830
+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:2894 g10/keyedit.c:3287 g10/keyserver.c:536
+#: g10/mainproc.c:1846 g10/trustdb.c:1243 g10/trustdb.c:1763
+msgid "revoked"
+msgstr "revoked"
+
+#: g10/keyedit.c:2896 g10/keyedit.c:3289 g10/keyserver.c:540
+#: g10/mainproc.c:1848 g10/trustdb.c:552 g10/trustdb.c:1765
+msgid "expired"
+msgstr "expired"
+
+#: g10/keyedit.c:2961
+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:3007
+msgid "WARNING: Your encryption subkey expires soon.\n"
+msgstr "WARNING: Your encryption subkey expires soon.\n"
+
+#: g10/keyedit.c:3008
+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:3069
+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:3074 g10/keyedit.c:3409
+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:3080
+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:3220
+msgid "Delete this good signature? (y/N/q)"
+msgstr "Delete this good signature? (y/N/q)"
+
+#: g10/keyedit.c:3230
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr "Delete this invalid signature? (y/N/q)"
+
+#: g10/keyedit.c:3234
+msgid "Delete this unknown signature? (y/N/q)"
+msgstr "Delete this unknown signature? (y/N/q)"
+
+#: g10/keyedit.c:3240
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Really delete this self-signature? (y/N)"
+
+#: g10/keyedit.c:3254
+#, c-format
+msgid "Deleted %d signature.\n"
+msgstr "Deleted %d signature.\n"
+
+#: g10/keyedit.c:3255
+#, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "Deleted %d signatures.\n"
+
+#: g10/keyedit.c:3258
+msgid "Nothing deleted.\n"
+msgstr "Nothing deleted.\n"
+
+#: g10/keyedit.c:3291 g10/trustdb.c:1767
+msgid "invalid"
+msgstr "invalid"
+
+#: g10/keyedit.c:3293
+#, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "User ID “%s” compacted: %s\n"
+
+#: g10/keyedit.c:3300
+#, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "User ID “%s”: %d signature removed\n"
+
+#: g10/keyedit.c:3301
+#, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "User ID “%s”: %d signatures removed\n"
+
+#: g10/keyedit.c:3309
+#, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "User ID “%s”: already minimized\n"
+
+#: g10/keyedit.c:3310
+#, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID “%s”: already clean\n"
+
+#: g10/keyedit.c:3404
+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:3415
+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:3435
+msgid "Enter the user ID of the designated revoker: "
+msgstr "Enter the user ID of the designated revoker: "
+
+#: g10/keyedit.c:3460
+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:3475
+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:3497
+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:3516
+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:3522
+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:3584
+msgid "Please remove selections from the secret keys.\n"
+msgstr "Please remove selections from the secret keys.\n"
+
+#: g10/keyedit.c:3590
+msgid "Please select at most one subkey.\n"
+msgstr "Please select at most one subkey.\n"
+
+#: g10/keyedit.c:3594
+msgid "Changing expiration time for a subkey.\n"
+msgstr "Changing expiration time for a subkey.\n"
+
+#: g10/keyedit.c:3597
+msgid "Changing expiration time for the primary key.\n"
+msgstr "Changing expiration time for the primary key.\n"
+
+#: g10/keyedit.c:3646
+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:3662
+msgid "No corresponding signature in secret ring\n"
+msgstr "No corresponding signature in secret ring\n"
+
+#: g10/keyedit.c:3747
+#, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "signing subkey %s is already cross-certified\n"
+
+#: g10/keyedit.c:3753
+#, 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:3916
+msgid "Please select exactly one user ID.\n"
+msgstr "Please select exactly one user ID.\n"
+
+#: g10/keyedit.c:3955 g10/keyedit.c:4065 g10/keyedit.c:4185 g10/keyedit.c:4326
+#, 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:4126
+msgid "Enter your preferred keyserver URL: "
+msgstr "Enter your preferred keyserver URL: "
+
+#: g10/keyedit.c:4206
+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:4207
+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:4269
+msgid "Enter the notation: "
+msgstr "Enter the notation: "
+
+#: g10/keyedit.c:4418
+msgid "Proceed? (y/N) "
+msgstr "Proceed? (y/N) "
+
+#: g10/keyedit.c:4482
+#, c-format
+msgid "No user ID with index %d\n"
+msgstr "No user ID with index %d\n"
+
+#: g10/keyedit.c:4540
+#, c-format
+msgid "No user ID with hash %s\n"
+msgstr "No user ID with hash %s\n"
+
+#: g10/keyedit.c:4567
+#, c-format
+msgid "No subkey with index %d\n"
+msgstr "No subkey with index %d\n"
+
+#: g10/keyedit.c:4702
+#, c-format
+msgid "user ID: \"%s\"\n"
+msgstr "user ID: “%s”\n"
+
+#: g10/keyedit.c:4705 g10/keyedit.c:4799 g10/keyedit.c:4842
+#, 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:4707 g10/keyedit.c:4801 g10/keyedit.c:4844
+msgid " (non-exportable)"
+msgstr " (non-exportable)"
+
+#: g10/keyedit.c:4711
+#, c-format
+msgid "This signature expired on %s.\n"
+msgstr "This signature expired on %s.\n"
+
+#: g10/keyedit.c:4715
+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:4719
+msgid "Create a revocation certificate for this signature? (y/N) "
+msgstr "Create a revocation certificate for this signature? (y/N) "
+
+#: g10/keyedit.c:4770
+msgid "Not signed by you.\n"
+msgstr "Not signed by you.\n"
+
+#: g10/keyedit.c:4776
+#, 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:4802
+msgid " (non-revocable)"
+msgstr " (non-revocable)"
+
+#: g10/keyedit.c:4809
+#, c-format
+msgid "revoked by your key %s on %s\n"
+msgstr "revoked by your key %s on %s\n"
+
+#: g10/keyedit.c:4831
+msgid "You are about to revoke these signatures:\n"
+msgstr "You are about to revoke these signatures:\n"
+
+#: g10/keyedit.c:4851
+msgid "Really create the revocation certificates? (y/N) "
+msgstr "Really create the revocation certificates? (y/N) "
+
+#: g10/keyedit.c:4881
+msgid "no secret key\n"
+msgstr "no secret key\n"
+
+#: g10/keyedit.c:4951
+#, c-format
+msgid "user ID \"%s\" is already revoked\n"
+msgstr "user ID “%s” is already revoked\n"
+
+#: g10/keyedit.c:4968
+#, 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:5032
+#, c-format
+msgid "Key %s is already revoked.\n"
+msgstr "Key %s is already revoked.\n"
+
+#: g10/keyedit.c:5094
+#, c-format
+msgid "Subkey %s is already revoked.\n"
+msgstr "Subkey %s is already revoked.\n"
+
+#: g10/keyedit.c:5189
+#, 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:264
+#, c-format
+msgid "preference `%s' duplicated\n"
+msgstr "preference ‘%s’ duplicated\n"
+
+#: g10/keygen.c:271
+msgid "too many cipher preferences\n"
+msgstr "too many cipher preferences\n"
+
+#: g10/keygen.c:273
+msgid "too many digest preferences\n"
+msgstr "too many digest preferences\n"
+
+#: g10/keygen.c:275
+msgid "too many compression preferences\n"
+msgstr "too many compression preferences\n"
+
+#: g10/keygen.c:416
+#, c-format
+msgid "invalid item `%s' in preference string\n"
+msgstr "invalid item ‘%s’ in preference string\n"
+
+#: g10/keygen.c:888
+msgid "writing direct signature\n"
+msgstr "writing direct signature\n"
+
+#: g10/keygen.c:928
+msgid "writing self signature\n"
+msgstr "writing self signature\n"
+
+#: g10/keygen.c:979
+msgid "writing key binding signature\n"
+msgstr "writing key binding signature\n"
+
+#: g10/keygen.c:1042 g10/keygen.c:1046 g10/keygen.c:1129 g10/keygen.c:1134
+#: g10/keygen.c:1260 g10/keygen.c:1264 g10/keygen.c:2953
+#, c-format
+msgid "keysize invalid; using %u bits\n"
+msgstr "keysize invalid; using %u bits\n"
+
+#: g10/keygen.c:1051 g10/keygen.c:1140 g10/keygen.c:1148 g10/keygen.c:1269
+#: g10/keygen.c:2959
+#, c-format
+msgid "keysize rounded up to %u bits\n"
+msgstr "keysize rounded up to %u bits\n"
+
+#: g10/keygen.c:1362
+msgid "Sign"
+msgstr "Sign"
+
+#: g10/keygen.c:1365
+msgid "Certify"
+msgstr "Certify"
+
+#: g10/keygen.c:1368
+msgid "Encrypt"
+msgstr "Encrypt"
+
+#: g10/keygen.c:1371
+msgid "Authenticate"
+msgstr "Authenticate"
+
+#. TRANSLATORS: Please use only plain ASCII characters for the
+#. translation. If this is not possible use single digits. Here is
+#. a description of the fucntions:
+#.
+#. s = Toggle signing capability
+#. e = Toggle encryption capability
+#. a = Toggle authentication capability
+#. q = Finish
+#.
+#: g10/keygen.c:1388
+msgid "SsEeAaQq"
+msgstr "SsEeAaQq"
+
+#: g10/keygen.c:1411
+#, c-format
+msgid "Possible actions for a %s key: "
+msgstr "Possible actions for a %s key: "
+
+#: g10/keygen.c:1415
+msgid "Current allowed actions: "
+msgstr "Current allowed actions: "
+
+#: g10/keygen.c:1420
+#, c-format
+msgid " (%c) Toggle the sign capability\n"
+msgstr " (%c) Toggle the sign capability\n"
+
+#: g10/keygen.c:1423
+#, c-format
+msgid " (%c) Toggle the encrypt capability\n"
+msgstr " (%c) Toggle the encrypt capability\n"
+
+#: g10/keygen.c:1426
+#, c-format
+msgid " (%c) Toggle the authenticate capability\n"
+msgstr " (%c) Toggle the authenticate capability\n"
+
+#: g10/keygen.c:1429
+#, c-format
+msgid " (%c) Finished\n"
+msgstr " (%c) Finished\n"
+
+#: g10/keygen.c:1489
+msgid "Please select what kind of key you want:\n"
+msgstr "Please select what kind of key you want:\n"
+
+#: g10/keygen.c:1491
+#, c-format
+msgid " (%d) RSA and RSA (default)\n"
+msgstr " (%d) RSA and RSA (default)\n"
+
+#: g10/keygen.c:1493
+#, c-format
+msgid " (%d) DSA and Elgamal\n"
+msgstr " (%d) DSA and Elgamal\n"
+
+#: g10/keygen.c:1495
+#, c-format
+msgid " (%d) DSA (sign only)\n"
+msgstr " (%d) DSA (sign only)\n"
+
+#: g10/keygen.c:1496
+#, c-format
+msgid " (%d) RSA (sign only)\n"
+msgstr " (%d) RSA (sign only)\n"
+
+#: g10/keygen.c:1500
+#, c-format
+msgid " (%d) Elgamal (encrypt only)\n"
+msgstr " (%d) Elgamal (encrypt only)\n"
+
+#: g10/keygen.c:1501
+#, c-format
+msgid " (%d) RSA (encrypt only)\n"
+msgstr " (%d) RSA (encrypt only)\n"
+
+#: g10/keygen.c:1505
+#, c-format
+msgid " (%d) DSA (set your own capabilities)\n"
+msgstr " (%d) DSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1506
+#, c-format
+msgid " (%d) RSA (set your own capabilities)\n"
+msgstr " (%d) RSA (set your own capabilities)\n"
+
+#: g10/keygen.c:1616
+#, 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:1624
+#, 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:1627
+#, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "What keysize do you want? (%u) "
+
+#: g10/keygen.c:1642
+#, c-format
+msgid "Requested keysize is %u bits\n"
+msgstr "Requested keysize is %u bits\n"
+
+#: g10/keygen.c:1722
+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:1733
+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:1754
+msgid "Key is valid for? (0) "
+msgstr "Key is valid for? (0) "
+
+#: g10/keygen.c:1759
+#, c-format
+msgid "Signature is valid for? (%s) "
+msgstr "Signature is valid for? (%s) "
+
+#: g10/keygen.c:1777 g10/keygen.c:1802
+msgid "invalid value\n"
+msgstr "invalid value\n"
+
+#: g10/keygen.c:1784
+msgid "Key does not expire at all\n"
+msgstr "Key does not expire at all\n"
+
+#: g10/keygen.c:1785
+msgid "Signature does not expire at all\n"
+msgstr "Signature does not expire at all\n"
+
+#: g10/keygen.c:1790
+#, c-format
+msgid "Key expires at %s\n"
+msgstr "Key expires at %s\n"
+
+#: g10/keygen.c:1791
+#, c-format
+msgid "Signature expires at %s\n"
+msgstr "Signature expires at %s\n"
+
+#: g10/keygen.c:1795
+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:1808
+msgid "Is this correct? (y/N) "
+msgstr "Is this correct? (y/N) "
+
+#: g10/keygen.c:1823
+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:1836
+msgid "Real name: "
+msgstr "Real name: "
+
+#: g10/keygen.c:1844
+msgid "Invalid character in name\n"
+msgstr "Invalid character in name\n"
+
+#: g10/keygen.c:1846
+msgid "Name may not start with a digit\n"
+msgstr "Name may not start with a digit\n"
+
+#: g10/keygen.c:1848
+msgid "Name must be at least 5 characters long\n"
+msgstr "Name must be at least 5 characters long\n"
+
+#: g10/keygen.c:1856
+msgid "Email address: "
+msgstr "Email address: "
+
+#: g10/keygen.c:1862
+msgid "Not a valid email address\n"
+msgstr "Not a valid email address\n"
+
+#: g10/keygen.c:1870
+msgid "Comment: "
+msgstr "Comment: "
+
+#: g10/keygen.c:1876
+msgid "Invalid character in comment\n"
+msgstr "Invalid character in comment\n"
+
+#: g10/keygen.c:1899
+#, c-format
+msgid "You are using the `%s' character set.\n"
+msgstr "You are using the ‘%s’ character set.\n"
+
+#: g10/keygen.c:1905
+#, 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:1910
+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:1926
+msgid "NnCcEeOoQq"
+msgstr "NnCcEeOoQq"
+
+#: g10/keygen.c:1936
+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:1937
+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:1956
+msgid "Please correct the error first\n"
+msgstr "Please correct the error first\n"
+
+#: g10/keygen.c:1996
+msgid ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+msgstr ""
+"You need a Passphrase to protect your secret key.\n"
+"\n"
+
+#: g10/keygen.c:2006 g10/passphrase.c:819
+#, c-format
+msgid "%s.\n"
+msgstr "%s.\n"
+
+#: g10/keygen.c:2012
+msgid ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway. You can change your passphrase at any time,\n"
+"using this program with the option \"--edit-key\".\n"
+"\n"
+msgstr ""
+"You don't want a passphrase - this is probably a *bad* idea!\n"
+"I will do it anyway. You can change your passphrase at any time,\n"
+"using this program with the option “--edit-key”.\n"
+"\n"
+
+#: g10/keygen.c:2034
+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:2899
+msgid "Key generation canceled.\n"
+msgstr "Key generation canceled.\n"
+
+#: g10/keygen.c:3099 g10/keygen.c:3266
+#, c-format
+msgid "writing public key to `%s'\n"
+msgstr "writing public key to ‘%s’\n"
+
+#: g10/keygen.c:3101 g10/keygen.c:3269
+#, c-format
+msgid "writing secret key stub to `%s'\n"
+msgstr "writing secret key stub to ‘%s’\n"
+
+#: g10/keygen.c:3104 g10/keygen.c:3272
+#, c-format
+msgid "writing secret key to `%s'\n"
+msgstr "writing secret key to ‘%s’\n"
+
+#: g10/keygen.c:3255
+#, c-format
+msgid "no writable public keyring found: %s\n"
+msgstr "no writable public keyring found: %s\n"
+
+#: g10/keygen.c:3261
+#, c-format
+msgid "no writable secret keyring found: %s\n"
+msgstr "no writable secret keyring found: %s\n"
+
+#: g10/keygen.c:3279
+#, c-format
+msgid "error writing public keyring `%s': %s\n"
+msgstr "error writing public keyring ‘%s’: %s\n"
+
+#: g10/keygen.c:3286
+#, c-format
+msgid "error writing secret keyring `%s': %s\n"
+msgstr "error writing secret keyring ‘%s’: %s\n"
+
+#: g10/keygen.c:3309
+msgid "public and secret key created and signed.\n"
+msgstr "public and secret key created and signed.\n"
+
+#: g10/keygen.c:3320
+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:3332 g10/keygen.c:3465 g10/keygen.c:3581
+#, c-format
+msgid "Key generation failed: %s\n"
+msgstr "Key generation failed: %s\n"
+
+#: g10/keygen.c:3384 g10/keygen.c:3514 g10/sign.c:242
+#, 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:3386 g10/keygen.c:3516 g10/sign.c:244
+#, 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:3395 g10/keygen.c:3527
+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:3434 g10/keygen.c:3560
+msgid "Really create? (y/N) "
+msgstr "Really create? (y/N) "
+
+#: g10/keygen.c:3747
+#, c-format
+msgid "storing key onto card failed: %s\n"
+msgstr "storing key onto card failed: %s\n"
+
+#: g10/keygen.c:3794
+#, c-format
+msgid "can't create backup file `%s': %s\n"
+msgstr "can't create backup file ‘%s’: %s\n"
+
+#: g10/keygen.c:3820
+#, c-format
+msgid "NOTE: backup of card key saved to `%s'\n"
+msgstr "NOTE: backup of card key saved to ‘%s’\n"
+
+#: g10/keyid.c:505 g10/keyid.c:517 g10/keyid.c:529 g10/keyid.c:541
+msgid "never "
+msgstr "never "
+
+#: g10/keylist.c:265
+msgid "Critical signature policy: "
+msgstr "Critical signature policy: "
+
+#: g10/keylist.c:267
+msgid "Signature policy: "
+msgstr "Signature policy: "
+
+#: g10/keylist.c:306
+msgid "Critical preferred keyserver: "
+msgstr "Critical preferred keyserver: "
+
+#: g10/keylist.c:359
+msgid "Critical signature notation: "
+msgstr "Critical signature notation: "
+
+#: g10/keylist.c:361
+msgid "Signature notation: "
+msgstr "Signature notation: "
+
+#: g10/keylist.c:471
+msgid "Keyring"
+msgstr "Keyring"
+
+#: g10/keylist.c:1516
+msgid "Primary key fingerprint:"
+msgstr "Primary key fingerprint:"
+
+#: g10/keylist.c:1518
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#. TRANSLATORS: this should fit into 24 bytes to that the
+#. * fingerprint data is properly aligned with the user ID
+#: g10/keylist.c:1525
+msgid " Primary key fingerprint:"
+msgstr " Primary key fingerprint:"
+
+#: g10/keylist.c:1527
+msgid " Subkey fingerprint:"
+msgstr " Subkey fingerprint:"
+
+#: g10/keylist.c:1531 g10/keylist.c:1535
+msgid " Key fingerprint ="
+msgstr " Key fingerprint ="
+
+#: g10/keylist.c:1602
+msgid " Card serial no. ="
+msgstr " Card serial no. ="
+
+#: g10/keyring.c:1274
+#, c-format
+msgid "renaming `%s' to `%s' failed: %s\n"
+msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
+
+#: g10/keyring.c:1304
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr "WARNING: 2 files with confidential information exists.\n"
+
+#: g10/keyring.c:1305
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr "%s is the unchanged one\n"
+
+#: g10/keyring.c:1306
+#, c-format
+msgid "%s is the new one\n"
+msgstr "%s is the new one\n"
+
+#: g10/keyring.c:1307
+msgid "Please fix this possible security flaw\n"
+msgstr "Please fix this possible security flaw\n"
+
+#: g10/keyring.c:1407
+#, c-format
+msgid "caching keyring `%s'\n"
+msgstr "caching keyring ‘%s’\n"
+
+#: g10/keyring.c:1466
+#, c-format
+msgid "%lu keys cached so far (%lu signatures)\n"
+msgstr "%lu keys cached so far (%lu signatures)\n"
+
+#: g10/keyring.c:1478
+#, c-format
+msgid "%lu keys cached (%lu signatures)\n"
+msgstr "%lu keys cached (%lu signatures)\n"
+
+#: g10/keyring.c:1549
+#, c-format
+msgid "%s: keyring created\n"
+msgstr "%s: keyring created\n"
+
+#: g10/keyserver.c:70
+msgid "include revoked keys in search results"
+msgstr "include revoked keys in search results"
+
+#: g10/keyserver.c:71
+msgid "include subkeys when searching by key ID"
+msgstr "include subkeys when searching by key ID"
+
+#: g10/keyserver.c:73
+msgid "use temporary files to pass data to keyserver helpers"
+msgstr "use temporary files to pass data to keyserver helpers"
+
+#: g10/keyserver.c:75
+msgid "do not delete temporary files after using them"
+msgstr "do not delete temporary files after using them"
+
+#: g10/keyserver.c:79
+msgid "automatically retrieve keys when verifying signatures"
+msgstr "automatically retrieve keys when verifying signatures"
+
+#: g10/keyserver.c:81
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "honor the preferred keyserver URL set on the key"
+
+#: g10/keyserver.c:83
+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:149
+#, c-format
+msgid "WARNING: keyserver option `%s' is not used on this platform\n"
+msgstr "WARNING: keyserver option ‘%s’ is not used on this platform\n"
+
+#: g10/keyserver.c:538
+msgid "disabled"
+msgstr "disabled"
+
+#: g10/keyserver.c:739
+msgid "Enter number(s), N)ext, or Q)uit > "
+msgstr "Enter number(s), N)ext, or Q)uit > "
+
+#: g10/keyserver.c:823 g10/keyserver.c:1578
+#, c-format
+msgid "invalid keyserver protocol (us %d!=handler %d)\n"
+msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
+
+#: g10/keyserver.c:921
+#, c-format
+msgid "key \"%s\" not found on keyserver\n"
+msgstr "key “%s” not found on keyserver\n"
+
+#: g10/keyserver.c:923
+msgid "key not found on keyserver\n"
+msgstr "key not found on keyserver\n"
+
+#: g10/keyserver.c:1269
+#, c-format
+msgid "requesting key %s from %s server %s\n"
+msgstr "requesting key %s from %s server %s\n"
+
+#: g10/keyserver.c:1273
+#, c-format
+msgid "requesting key %s from %s\n"
+msgstr "requesting key %s from %s\n"
+
+#: g10/keyserver.c:1297
+#, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "searching for names from %s server %s\n"
+
+#: g10/keyserver.c:1300
+#, c-format
+msgid "searching for names from %s\n"
+msgstr "searching for names from %s\n"
+
+#: g10/keyserver.c:1478
+#, c-format
+msgid "sending key %s to %s server %s\n"
+msgstr "sending key %s to %s server %s\n"
+
+#: g10/keyserver.c:1482
+#, c-format
+msgid "sending key %s to %s\n"
+msgstr "sending key %s to %s\n"
+
+#: g10/keyserver.c:1525
+#, c-format
+msgid "searching for \"%s\" from %s server %s\n"
+msgstr "searching for “%s” from %s server %s\n"
+
+#: g10/keyserver.c:1528
+#, c-format
+msgid "searching for \"%s\" from %s\n"
+msgstr "searching for “%s” from %s\n"
+
+#: g10/keyserver.c:1535 g10/keyserver.c:1657
+msgid "no keyserver action!\n"
+msgstr "no keyserver action!\n"
+
+#: g10/keyserver.c:1586
+#, c-format
+msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
+msgstr "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
+
+#: g10/keyserver.c:1603
+msgid "keyserver did not send VERSION\n"
+msgstr "keyserver did not send VERSION\n"
+
+#: g10/keyserver.c:1641 g10/keyserver.c:1736
+#, c-format
+msgid "keyserver communications error: %s\n"
+msgstr "keyserver communications error: %s\n"
+
+#: g10/keyserver.c:1679 g10/keyserver.c:2207
+msgid "no keyserver known (use option --keyserver)\n"
+msgstr "no keyserver known (use option --keyserver)\n"
+
+#: g10/keyserver.c:1685
+msgid "external keyserver calls are not supported in this build\n"
+msgstr "external keyserver calls are not supported in this build\n"
+
+#: g10/keyserver.c:1699
+#, c-format
+msgid "no handler for keyserver scheme `%s'\n"
+msgstr "no handler for keyserver scheme ‘%s’\n"
+
+#: g10/keyserver.c:1704
+#, c-format
+msgid "action `%s' not supported with keyserver scheme `%s'\n"
+msgstr "action ‘%s’ not supported with keyserver scheme ‘%s’\n"
+
+#: g10/keyserver.c:1712
+#, c-format
+msgid "%s does not support handler version %d\n"
+msgstr "%s does not support handler version %d\n"
+
+#: g10/keyserver.c:1719
+msgid "keyserver timed out\n"
+msgstr "keyserver timed out\n"
+
+#: g10/keyserver.c:1727
+msgid "keyserver internal error\n"
+msgstr "keyserver internal error\n"
+
+#: g10/keyserver.c:1761 g10/keyserver.c:1795
+#, c-format
+msgid "\"%s\" not a key ID: skipping\n"
+msgstr "“%s” not a key ID: skipping\n"
+
+#: g10/keyserver.c:2054
+#, 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:2076
+#, c-format
+msgid "refreshing 1 key from %s\n"
+msgstr "refreshing 1 key from %s\n"
+
+#: g10/keyserver.c:2078
+#, c-format
+msgid "refreshing %d keys from %s\n"
+msgstr "refreshing %d keys from %s\n"
+
+#: g10/keyserver.c:2134
+#, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "WARNING: unable to fetch URI %s: %s\n"
+
+#: g10/keyserver.c:2140
+#, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "WARNING: unable to parse URI %s\n"
+
+#: g10/mainproc.c:249
+#, 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:294
+#, c-format
+msgid "%s encrypted session key\n"
+msgstr "%s encrypted session key\n"
+
+#: g10/mainproc.c:304
+#, c-format
+msgid "passphrase generated with unknown digest algorithm %d\n"
+msgstr "passphrase generated with unknown digest algorithm %d\n"
+
+#: g10/mainproc.c:385
+#, c-format
+msgid "public key is %s\n"
+msgstr "public key is %s\n"
+
+#: g10/mainproc.c:449
+msgid "public key encrypted data: good DEK\n"
+msgstr "public key encrypted data: good DEK\n"
+
+#: g10/mainproc.c:482
+#, 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:486 g10/pkclist.c:220
+#, c-format
+msgid " \"%s\"\n"
+msgstr " “%s”\n"
+
+#: g10/mainproc.c:490
+#, c-format
+msgid "encrypted with %s key, ID %s\n"
+msgstr "encrypted with %s key, ID %s\n"
+
+#: g10/mainproc.c:505
+#, c-format
+msgid "public key decryption failed: %s\n"
+msgstr "public key decryption failed: %s\n"
+
+#: g10/mainproc.c:526
+#, c-format
+msgid "encrypted with %lu passphrases\n"
+msgstr "encrypted with %lu passphrases\n"
+
+#: g10/mainproc.c:528
+msgid "encrypted with 1 passphrase\n"
+msgstr "encrypted with 1 passphrase\n"
+
+#: g10/mainproc.c:561 g10/mainproc.c:582
+#, c-format
+msgid "assuming %s encrypted data\n"
+msgstr "assuming %s encrypted data\n"
+
+#: g10/mainproc.c:568
+#, 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:605
+msgid "decryption okay\n"
+msgstr "decryption okay\n"
+
+#: g10/mainproc.c:609
+msgid "WARNING: message was not integrity protected\n"
+msgstr "WARNING: message was not integrity protected\n"
+
+#: g10/mainproc.c:612
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "WARNING: encrypted message has been manipulated!\n"
+
+#: g10/mainproc.c:618
+#, c-format
+msgid "decryption failed: %s\n"
+msgstr "decryption failed: %s\n"
+
+#: g10/mainproc.c:639
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr "NOTE: sender requested “for-your-eyes-only”\n"
+
+#: g10/mainproc.c:641
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr "original file name='%.*s'\n"
+
+#: g10/mainproc.c:726
+msgid "WARNING: multiple plaintexts seen\n"
+msgstr "WARNING: multiple plaintexts seen\n"
+
+#: g10/mainproc.c:852
+msgid "standalone revocation - use \"gpg --import\" to apply\n"
+msgstr "standalone revocation - use “gpg --import” to apply\n"
+
+#: g10/mainproc.c:1200
+msgid "no signature found\n"
+msgstr "no signature found\n"
+
+#: g10/mainproc.c:1471
+msgid "signature verification suppressed\n"
+msgstr "signature verification suppressed\n"
+
+#: g10/mainproc.c:1580
+msgid "can't handle this ambiguous signature data\n"
+msgstr "can't handle this ambiguous signature data\n"
+
+#: g10/mainproc.c:1591
+#, c-format
+msgid "Signature made %s\n"
+msgstr "Signature made %s\n"
+
+#: g10/mainproc.c:1592
+#, c-format
+msgid " using %s key %s\n"
+msgstr " using %s key %s\n"
+
+#: g10/mainproc.c:1596
+#, 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:1616
+msgid "Key available at: "
+msgstr "Key available at: "
+
+#: g10/mainproc.c:1749 g10/mainproc.c:1797
+#, c-format
+msgid "BAD signature from \"%s\""
+msgstr "BAD signature from “%s”"
+
+#: g10/mainproc.c:1751 g10/mainproc.c:1799
+#, c-format
+msgid "Expired signature from \"%s\""
+msgstr "Expired signature from “%s”"
+
+#: g10/mainproc.c:1753 g10/mainproc.c:1801
+#, c-format
+msgid "Good signature from \"%s\""
+msgstr "Good signature from “%s”"
+
+#: g10/mainproc.c:1805
+msgid "[uncertain]"
+msgstr "[uncertain]"
+
+#: g10/mainproc.c:1839
+#, c-format
+msgid " aka \"%s\""
+msgstr " aka “%s”"
+
+#: g10/mainproc.c:1937
+#, c-format
+msgid "Signature expired %s\n"
+msgstr "Signature expired %s\n"
+
+#: g10/mainproc.c:1942
+#, c-format
+msgid "Signature expires %s\n"
+msgstr "Signature expires %s\n"
+
+#: g10/mainproc.c:1945
+#, c-format
+msgid "%s signature, digest algorithm %s\n"
+msgstr "%s signature, digest algorithm %s\n"
+
+#: g10/mainproc.c:1946
+msgid "binary"
+msgstr "binary"
+
+#: g10/mainproc.c:1947
+msgid "textmode"
+msgstr "textmode"
+
+#: g10/mainproc.c:1947 g10/trustdb.c:551
+msgid "unknown"
+msgstr "unknown"
+
+#: g10/mainproc.c:1981
+#, 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:2005
+#, c-format
+msgid "Can't check signature: %s\n"
+msgstr "Can't check signature: %s\n"
+
+#: g10/mainproc.c:2074 g10/mainproc.c:2090 g10/mainproc.c:2176
+msgid "not a detached signature\n"
+msgstr "not a detached signature\n"
+
+#: g10/mainproc.c:2117
+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:2125
+#, c-format
+msgid "standalone signature of class 0x%02x\n"
+msgstr "standalone signature of class 0x%02x\n"
+
+#: g10/mainproc.c:2182
+msgid "old style (PGP 2.x) signature\n"
+msgstr "old style (PGP 2.x) signature\n"
+
+#: g10/mainproc.c:2192
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr "invalid root packet detected in proc_tree()\n"
+
+#: g10/misc.c:124
+#, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "can't disable core dumps: %s\n"
+
+#: g10/misc.c:144 g10/misc.c:172 g10/misc.c:244
+#, c-format
+msgid "fstat of `%s' failed in %s: %s\n"
+msgstr "fstat of ‘%s’ failed in %s: %s\n"
+
+#: g10/misc.c:209
+#, c-format
+msgid "fstat(%d) failed in %s: %s\n"
+msgstr "fstat(%d) failed in %s: %s\n"
+
+#: g10/misc.c:307
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "WARNING: using experimental public key algorithm %s\n"
+
+#: g10/misc.c:313
+msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+msgstr "WARNING: Elgamal sign+encrypt keys are deprecated\n"
+
+#: g10/misc.c:326
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "WARNING: using experimental cipher algorithm %s\n"
+
+#: g10/misc.c:343
+#, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "WARNING: using experimental digest algorithm %s\n"
+
+#: g10/misc.c:350 g10/misc.c:456
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "WARNING: digest algorithm %s is deprecated\n"
+
+#: g10/misc.c:458 g10/misc.c:473 g10/sig-check.c:101
+#, c-format
+msgid "please see %s for more information\n"
+msgstr "please see %s for more information\n"
+
+#: g10/misc.c:472
+#, c-format
+msgid "NOTE: This feature is not available in %s\n"
+msgstr "NOTE: This feature is not available in %s\n"
+
+#: g10/misc.c:729
+#, c-format
+msgid "%s:%d: deprecated option \"%s\"\n"
+msgstr "%s:%d: deprecated option “%s”\n"
+
+#: g10/misc.c:733
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “%s” is a deprecated option\n"
+
+#: g10/misc.c:735
+#, c-format
+msgid "please use \"%s%s\" instead\n"
+msgstr "please use “%s%s” instead\n"
+
+#: g10/misc.c:742
+#, 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:755
+msgid "Uncompressed"
+msgstr "Uncompressed"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: g10/misc.c:780
+msgid "uncompressed|none"
+msgstr "uncompressed|none"
+
+#: g10/misc.c:907
+#, 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:1082
+#, c-format
+msgid "ambiguous option `%s'\n"
+msgstr "ambiguous option ‘%s’\n"
+
+#: g10/misc.c:1107
+#, c-format
+msgid "unknown option `%s'\n"
+msgstr "unknown option ‘%s’\n"
+
+#: g10/misc.c:1331
+#, c-format
+msgid "Unknown weak digest '%s'\n"
+msgstr "Unknown weak digest ‘%s’\n"
+
+#: g10/openfile.c:88
+#, c-format
+msgid "File `%s' exists. "
+msgstr "File ‘%s’ exists. "
+
+#: g10/openfile.c:92
+msgid "Overwrite? (y/N) "
+msgstr "Overwrite? (y/N) "
+
+#: g10/openfile.c:129
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr "%s: unknown suffix\n"
+
+#: g10/openfile.c:152
+msgid "Enter new filename"
+msgstr "Enter new filename"
+
+#: g10/openfile.c:197
+msgid "writing to stdout\n"
+msgstr "writing to stdout\n"
+
+#: g10/openfile.c:357
+#, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "assuming signed data in ‘%s’\n"
+
+#: g10/openfile.c:437
+#, c-format
+msgid "new configuration file `%s' created\n"
+msgstr "new configuration file ‘%s’ created\n"
+
+#: g10/openfile.c:439
+#, 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/openfile.c:471
+#, c-format
+msgid "directory `%s' created\n"
+msgstr "directory ‘%s’ created\n"
+
+#: g10/parse-packet.c:149
+#, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "can't handle public key algorithm %d\n"
+
+#: g10/parse-packet.c:768
+msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
+msgstr "WARNING: potentially insecure symmetrically encrypted session key\n"
+
+#: g10/parse-packet.c:1227
+#, 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:319
+msgid "gpg-agent is not available in this session\n"
+msgstr "gpg-agent is not available in this session\n"
+
+#: g10/passphrase.c:335
+msgid "malformed GPG_AGENT_INFO environment variable\n"
+msgstr "malformed GPG_AGENT_INFO environment variable\n"
+
+#: g10/passphrase.c:354
+#, c-format
+msgid "gpg-agent protocol version %d is not supported\n"
+msgstr "gpg-agent protocol version %d is not supported\n"
+
+#: g10/passphrase.c:371
+#, c-format
+msgid "can't connect to `%s': %s\n"
+msgstr "can't connect to ‘%s’: %s\n"
+
+#: g10/passphrase.c:388 g10/passphrase.c:664 g10/passphrase.c:754
+msgid "problem with the agent - disabling agent use\n"
+msgstr "problem with the agent - disabling agent use\n"
+
+#: g10/passphrase.c:541 g10/passphrase.c:923
+#, c-format
+msgid " (main key ID %s)"
+msgstr " (main key ID %s)"
+
+#: g10/passphrase.c:555
+#, c-format
+msgid ""
+"You need a passphrase to unlock the secret key for user:\n"
+"\"%.*s\"\n"
+"%u-bit %s key, ID %s, created %s%s\n"
+msgstr ""
+"You need a passphrase to unlock the secret key for user:\n"
+"“%.*s”\n"
+"%u-bit %s key, ID %s, created %s%s\n"
+
+#: g10/passphrase.c:580
+msgid "Repeat passphrase\n"
+msgstr "Repeat passphrase\n"
+
+#: g10/passphrase.c:582
+msgid "Enter passphrase\n"
+msgstr "Enter passphrase\n"
+
+#: g10/passphrase.c:658
+msgid "cancelled by user\n"
+msgstr "cancelled by user\n"
+
+#: g10/passphrase.c:814 g10/passphrase.c:983
+msgid "can't query passphrase in batch mode\n"
+msgstr "can't query passphrase in batch mode\n"
+
+#: g10/passphrase.c:821 g10/passphrase.c:988
+msgid "Enter passphrase: "
+msgstr "Enter passphrase: "
+
+#: g10/passphrase.c:904
+#, 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:910
+#, c-format
+msgid "%u-bit %s key, ID %s, created %s"
+msgstr "%u-bit %s key, ID %s, created %s"
+
+#: g10/passphrase.c:919
+#, c-format
+msgid " (subkey on main key ID %s)"
+msgstr " (subkey on main key ID %s)"
+
+#: g10/passphrase.c:996
+msgid "Repeat passphrase: "
+msgstr "Repeat passphrase: "
+
+#: g10/photoid.c:72
+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:94
+msgid "Enter JPEG filename for photo ID: "
+msgstr "Enter JPEG filename for photo ID: "
+
+#: g10/photoid.c:115
+#, c-format
+msgid "unable to open JPEG file `%s': %s\n"
+msgstr "unable to open JPEG file ‘%s’: %s\n"
+
+#: g10/photoid.c:126
+#, c-format
+msgid "This JPEG is really large (%d bytes) !\n"
+msgstr "This JPEG is really large (%d bytes) !\n"
+
+#: g10/photoid.c:128
+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:144
+#, c-format
+msgid "`%s' is not a JPEG file\n"
+msgstr "‘%s’ is not a JPEG file\n"
+
+#: g10/photoid.c:163
+msgid "Is this photo correct (y/N/q)? "
+msgstr "Is this photo correct (y/N/q)? "
+
+#: g10/photoid.c:333
+msgid "no photo viewer set\n"
+msgstr "no photo viewer set\n"
+
+#: g10/photoid.c:387
+msgid "unable to display photo ID!\n"
+msgstr "unable to display photo ID!\n"
+
+#: g10/pkclist.c:63 g10/revoke.c:619
+msgid "No reason specified"
+msgstr "No reason specified"
+
+#: g10/pkclist.c:65 g10/revoke.c:621
+msgid "Key is superseded"
+msgstr "Key is superseded"
+
+#: g10/pkclist.c:67 g10/revoke.c:620
+msgid "Key has been compromised"
+msgstr "Key has been compromised"
+
+#: g10/pkclist.c:69 g10/revoke.c:622
+msgid "Key is no longer used"
+msgstr "Key is no longer used"
+
+#: g10/pkclist.c:71 g10/revoke.c:623
+msgid "User ID is no longer valid"
+msgstr "User ID is no longer valid"
+
+#: g10/pkclist.c:75
+msgid "reason for revocation: "
+msgstr "reason for revocation: "
+
+#: g10/pkclist.c:92
+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:207
+msgid "iImMqQsS"
+msgstr "iImMqQsS"
+
+#: g10/pkclist.c:215
+msgid "No trust value assigned to:\n"
+msgstr "No trust value assigned to:\n"
+
+#: g10/pkclist.c:248
+#, c-format
+msgid " aka \"%s\"\n"
+msgstr " aka “%s”\n"
+
+#: g10/pkclist.c:258
+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:273
+#, 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:275
+#, c-format
+msgid " %d = I do NOT trust\n"
+msgstr " %d = I do NOT trust\n"
+
+#: g10/pkclist.c:281
+#, c-format
+msgid " %d = I trust ultimately\n"
+msgstr " %d = I trust ultimately\n"
+
+#: g10/pkclist.c:287
+msgid " m = back to the main menu\n"
+msgstr " m = back to the main menu\n"
+
+#: g10/pkclist.c:290
+msgid " s = skip this key\n"
+msgstr " s = skip this key\n"
+
+#: g10/pkclist.c:291
+msgid " q = quit\n"
+msgstr " q = quit\n"
+
+#: g10/pkclist.c:295
+#, 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:301 g10/revoke.c:648
+msgid "Your decision? "
+msgstr "Your decision? "
+
+#: g10/pkclist.c:322
+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:336
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr "Certificates leading to an ultimately trusted key:\n"
+
+#: g10/pkclist.c:421
+#, 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:426
+#, 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:432
+msgid "This key probably belongs to the named user\n"
+msgstr "This key probably belongs to the named user\n"
+
+#: g10/pkclist.c:437
+msgid "This key belongs to us\n"
+msgstr "This key belongs to us\n"
+
+#: g10/pkclist.c:463
+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:470
+msgid "Use this key anyway? (y/N) "
+msgstr "Use this key anyway? (y/N) "
+
+#: g10/pkclist.c:504
+msgid "WARNING: Using untrusted key!\n"
+msgstr "WARNING: Using untrusted key!\n"
+
+#: g10/pkclist.c:511
+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:520
+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:523
+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:524
+msgid " This could mean that the signature is forged.\n"
+msgstr " This could mean that the signature is forged.\n"
+
+#: g10/pkclist.c:530
+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:535
+msgid "Note: This key has been disabled.\n"
+msgstr "Note: This key has been disabled.\n"
+
+#: g10/pkclist.c:555
+#, c-format
+msgid "Note: Verified signer's address is `%s'\n"
+msgstr "Note: Verified signer's address is ‘%s’\n"
+
+#: g10/pkclist.c:562
+#, 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:574
+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:582
+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:593
+msgid "Note: This key has expired!\n"
+msgstr "Note: This key has expired!\n"
+
+#: g10/pkclist.c:604
+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:606
+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:614
+msgid "WARNING: We do NOT trust this key!\n"
+msgstr "WARNING: We do NOT trust this key!\n"
+
+#: g10/pkclist.c:615
+msgid " The signature is probably a FORGERY.\n"
+msgstr " The signature is probably a FORGERY.\n"
+
+#: g10/pkclist.c:623
+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:625
+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:824 g10/pkclist.c:871 g10/pkclist.c:1083 g10/pkclist.c:1158
+#, c-format
+msgid "%s: skipped: %s\n"
+msgstr "%s: skipped: %s\n"
+
+#: g10/pkclist.c:841 g10/pkclist.c:1126
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: skipped: public key already present\n"
+
+#: g10/pkclist.c:892
+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:916
+msgid "Current recipients:\n"
+msgstr "Current recipients:\n"
+
+#: g10/pkclist.c:942
+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:967
+msgid "No such user ID.\n"
+msgstr "No such user ID.\n"
+
+#: g10/pkclist.c:976 g10/pkclist.c:1050
+msgid "skipped: public key already set as default recipient\n"
+msgstr "skipped: public key already set as default recipient\n"
+
+#: g10/pkclist.c:997
+msgid "Public key is disabled.\n"
+msgstr "Public key is disabled.\n"
+
+#: g10/pkclist.c:1006
+msgid "skipped: public key already set\n"
+msgstr "skipped: public key already set\n"
+
+#: g10/pkclist.c:1041
+#, c-format
+msgid "unknown default recipient \"%s\"\n"
+msgstr "unknown default recipient “%s”\n"
+
+#: g10/pkclist.c:1103
+#, c-format
+msgid "%s: skipped: public key is disabled\n"
+msgstr "%s: skipped: public key is disabled\n"
+
+#: g10/pkclist.c:1166
+msgid "no valid addressees\n"
+msgstr "no valid addressees\n"
+
+#: g10/plaintext.c:102
+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:146 g10/plaintext.c:151 g10/plaintext.c:169
+#, c-format
+msgid "error creating `%s': %s\n"
+msgstr "error creating ‘%s’: %s\n"
+
+#: g10/plaintext.c:476
+msgid "Detached signature.\n"
+msgstr "Detached signature.\n"
+
+#: g10/plaintext.c:482
+msgid "Please enter name of data file: "
+msgstr "Please enter name of data file: "
+
+#: g10/plaintext.c:514
+msgid "reading stdin ...\n"
+msgstr "reading stdin ...\n"
+
+#: g10/plaintext.c:555
+msgid "no signed data\n"
+msgstr "no signed data\n"
+
+#: g10/plaintext.c:569
+#, c-format
+msgid "can't open signed data `%s'\n"
+msgstr "can't open signed data ‘%s’\n"
+
+#: g10/pubkey-enc.c:102
+#, c-format
+msgid "anonymous recipient; trying secret key %s ...\n"
+msgstr "anonymous recipient; trying secret key %s ...\n"
+
+#: g10/pubkey-enc.c:133
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "okay, we are the anonymous recipient.\n"
+
+#: g10/pubkey-enc.c:221
+msgid "old encoding of the DEK is not supported\n"
+msgstr "old encoding of the DEK is not supported\n"
+
+#: g10/pubkey-enc.c:240
+#, 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:276
+#, 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:296
+#, c-format
+msgid "NOTE: secret key %s expired at %s\n"
+msgstr "NOTE: secret key %s expired at %s\n"
+
+#: g10/pubkey-enc.c:302
+msgid "NOTE: key has been revoked"
+msgstr "NOTE: key has been revoked"
+
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:584
+#, c-format
+msgid "build_packet failed: %s\n"
+msgstr "build_packet failed: %s\n"
+
+#: g10/revoke.c:145
+#, c-format
+msgid "key %s has no user IDs\n"
+msgstr "key %s has no user IDs\n"
+
+#: g10/revoke.c:306
+msgid "To be revoked by:\n"
+msgstr "To be revoked by:\n"
+
+#: g10/revoke.c:310
+msgid "(This is a sensitive revocation key)\n"
+msgstr "(This is a sensitive revocation key)\n"
+
+#: g10/revoke.c:314
+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:327 g10/revoke.c:550
+msgid "ASCII armored output forced.\n"
+msgstr "ASCII armored output forced.\n"
+
+#: g10/revoke.c:342 g10/revoke.c:564
+#, c-format
+msgid "make_keysig_packet failed: %s\n"
+msgstr "make_keysig_packet failed: %s\n"
+
+#: g10/revoke.c:405
+msgid "Revocation certificate created.\n"
+msgstr "Revocation certificate created.\n"
+
+#: g10/revoke.c:411
+#, c-format
+msgid "no revocation keys found for \"%s\"\n"
+msgstr "no revocation keys found for “%s”\n"
+
+#: g10/revoke.c:469
+#, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "secret key “%s” not found: %s\n"
+
+#: g10/revoke.c:496
+#, c-format
+msgid "no corresponding public key: %s\n"
+msgstr "no corresponding public key: %s\n"
+
+#: g10/revoke.c:507
+msgid "public key does not match secret key!\n"
+msgstr "public key does not match secret key!\n"
+
+#: g10/revoke.c:514
+msgid "Create a revocation certificate for this key? (y/N) "
+msgstr "Create a revocation certificate for this key? (y/N) "
+
+#: g10/revoke.c:531
+msgid "unknown protection algorithm\n"
+msgstr "unknown protection algorithm\n"
+
+#: g10/revoke.c:539
+msgid "NOTE: This key is not protected!\n"
+msgstr "NOTE: This key is not protected!\n"
+
+#: g10/revoke.c:590
+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:631
+msgid "Please select the reason for the revocation:\n"
+msgstr "Please select the reason for the revocation:\n"
+
+#: g10/revoke.c:641
+msgid "Cancel"
+msgstr "Cancel"
+
+#: g10/revoke.c:643
+#, c-format
+msgid "(Probably you want to select %d here)\n"
+msgstr "(Probably you want to select %d here)\n"
+
+#: g10/revoke.c:684
+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:712
+#, c-format
+msgid "Reason for revocation: %s\n"
+msgstr "Reason for revocation: %s\n"
+
+#: g10/revoke.c:714
+msgid "(No description given)\n"
+msgstr "(No description given)\n"
+
+#: g10/revoke.c:719
+msgid "Is this okay? (y/N) "
+msgstr "Is this okay? (y/N) "
+
+#: g10/seckey-cert.c:53
+msgid "secret key parts are not available\n"
+msgstr "secret key parts are not available\n"
+
+#: g10/seckey-cert.c:59
+#, c-format
+msgid "protection algorithm %d%s is not supported\n"
+msgstr "protection algorithm %d%s is not supported\n"
+
+#: g10/seckey-cert.c:65
+#, c-format
+msgid "protection digest %d is not supported\n"
+msgstr "protection digest %d is not supported\n"
+
+#: g10/seckey-cert.c:266
+msgid "Invalid passphrase; please try again"
+msgstr "Invalid passphrase; please try again"
+
+#: g10/seckey-cert.c:267
+#, c-format
+msgid "%s ...\n"
+msgstr "%s ...\n"
+
+#: g10/seckey-cert.c:328
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
+msgstr "WARNING: Weak key detected - please change passphrase again.\n"
+
+#: g10/seckey-cert.c:366
+msgid "generating the deprecated 16-bit checksum for secret key protection\n"
+msgstr "generating the deprecated 16-bit checksum for secret key protection\n"
+
+#: g10/seskey.c:51
+msgid "weak key created - retrying\n"
+msgstr "weak key created - retrying\n"
+
+#: g10/seskey.c:56
+#, 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:218
+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"
+
+#: g10/seskey.c:232
+#, c-format
+msgid "DSA key %s uses an unsafe (%u bit) hash\n"
+msgstr "DSA key %s uses an unsafe (%u bit) hash\n"
+
+#: g10/seskey.c:244
+#, c-format
+msgid "DSA key %s requires a %u bit or larger hash\n"
+msgstr "DSA key %s requires a %u bit or larger hash\n"
+
+#: g10/sig-check.c:74
+msgid "WARNING: signature digest conflict in message\n"
+msgstr "WARNING: signature digest conflict in message\n"
+
+#: g10/sig-check.c:99
+#, 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:111
+#, 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:191
+#, c-format
+msgid "public key %s is %lu second newer than the signature\n"
+msgstr "public key %s is %lu second newer than the signature\n"
+
+#: g10/sig-check.c:192
+#, c-format
+msgid "public key %s is %lu seconds newer than the signature\n"
+msgstr "public key %s is %lu seconds newer than the signature\n"
+
+#: g10/sig-check.c:203
+#, c-format
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgstr ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:205
+#, c-format
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgstr ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+
+#: g10/sig-check.c:219
+#, c-format
+msgid "NOTE: signature key %s expired %s\n"
+msgstr "NOTE: signature key %s expired %s\n"
+
+#: g10/sig-check.c:254
+#, c-format
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "Note: signatures using the %s algorithm are rejected\n"
+
+#: g10/sig-check.c:345
+#, 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:603
+#, 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:629
+#, 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:90
+#, 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:116
+#, 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:139
+#, 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
+#, c-format
+msgid "checking created signature failed: %s\n"
+msgstr "checking created signature failed: %s\n"
+
+#: g10/sign.c:322
+#, c-format
+msgid "%s/%s signature from: \"%s\"\n"
+msgstr "%s/%s signature from: “%s”\n"
+
+#: g10/sign.c:760
+msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr ""
+"you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
+
+#: g10/sign.c:834
+#, 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:960
+msgid "signing:"
+msgstr "signing:"
+
+#: g10/sign.c:1073
+msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+msgstr "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
+
+#: g10/sign.c:1252
+#, c-format
+msgid "%s encryption will be used\n"
+msgstr "%s encryption will be used\n"
+
+#: g10/skclist.c:126 g10/skclist.c:190
+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:157
+#, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "skipped “%s”: duplicated\n"
+
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "skipped “%s”: %s\n"
+
+#: g10/skclist.c:170
+msgid "skipped: secret key already present\n"
+msgstr "skipped: secret key already present\n"
+
+#: g10/skclist.c:185
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
+msgstr ""
+"this is a PGP generated Elgamal key which is not secure for signatures!"
+
+#: g10/tdbdump.c:58 g10/trustdb.c:365
+#, 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:103
+#, 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:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
+#, c-format
+msgid "error in `%s': %s\n"
+msgstr "error in ‘%s’: %s\n"
+
+#: g10/tdbdump.c:158
+msgid "line too long"
+msgstr "line too long"
+
+#: g10/tdbdump.c:166
+msgid "colon missing"
+msgstr "colon missing"
+
+#: g10/tdbdump.c:172
+msgid "invalid fingerprint"
+msgstr "invalid fingerprint"
+
+#: g10/tdbdump.c:177
+msgid "ownertrust value missing"
+msgstr "ownertrust value missing"
+
+#: g10/tdbdump.c:213
+#, c-format
+msgid "error finding trust record in `%s': %s\n"
+msgstr "error finding trust record in ‘%s’: %s\n"
+
+#: g10/tdbdump.c:217
+#, c-format
+msgid "read error in `%s': %s\n"
+msgstr "read error in ‘%s’: %s\n"
+
+#: g10/tdbdump.c:226 g10/trustdb.c:380
+#, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "trustdb: sync failed: %s\n"
+
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
+#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "can't create lock for ‘%s’\n"
+
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "can't lock ‘%s’\n"
+
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
+#, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "trustdb rec %lu: lseek failed: %s\n"
+
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
+#, 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:269
++#: g10/tdbio.c:270
+msgid "trustdb transaction too large\n"
+msgstr "trustdb transaction too large\n"
+
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "can't access ‘%s’: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr "%s: directory does not exist!\n"
+
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
++#, c-format
++msgid "can't access `%s': %s\n"
++msgstr "can't access ‘%s’: %s\n"
++
++#: g10/tdbio.c:570
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr "%s: failed to create version record: %s"
+
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: invalid trustdb created\n"
+
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr "%s: trustdb created\n"
+
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
+msgid "NOTE: trustdb not writable\n"
+msgstr "NOTE: trustdb not writable\n"
+
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "%s: invalid trustdb\n"
+
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr "%s: failed to create hashtable: %s\n"
+
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
+#, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "%s: error updating version record: %s\n"
+
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
+#, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "%s: error reading version record: %s\n"
+
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
+#, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "%s: error writing version record: %s\n"
+
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
+#, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "trustdb: lseek failed: %s\n"
+
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
+#, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "trustdb: read failed (n=%d): %s\n"
+
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr "%s: not a trustdb file\n"
+
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr "%s: version record with recnum %lu\n"
+
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr "%s: invalid file version %d\n"
+
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
+#, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "%s: error reading free record: %s\n"
+
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
+#, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "%s: error writing dir record: %s\n"
+
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr "%s: failed to zero a record: %s\n"
+
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr "%s: failed to append a record: %s\n"
+
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "Error: The trustdb is corrupted.\n"
+
+#: g10/textfilter.c:147
+#, c-format
+msgid "can't handle text lines longer than %d characters\n"
+msgstr "can't handle text lines longer than %d characters\n"
+
+#: g10/textfilter.c:246
+#, c-format
+msgid "input line longer than %d characters\n"
+msgstr "input line longer than %d characters\n"
+
+#: g10/trustdb.c:226
+#, c-format
+msgid "`%s' is not a valid long keyID\n"
+msgstr "‘%s’ is not a valid long keyID\n"
+
+#: g10/trustdb.c:257
+#, c-format
+msgid "key %s: accepted as trusted key\n"
+msgstr "key %s: accepted as trusted key\n"
+
+#: g10/trustdb.c:295
+#, 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:310
+#, 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:320
+#, c-format
+msgid "key %s marked as ultimately trusted\n"
+msgstr "key %s marked as ultimately trusted\n"
+
+#: g10/trustdb.c:344
+#, 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:350
+#, 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:423
+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:432
+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"
+
+#. 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/trustdb.c:525
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
+
+#: g10/trustdb.c:527
+msgid "[ revoked]"
+msgstr "[ revoked]"
+
+#: g10/trustdb.c:529 g10/trustdb.c:534
+msgid "[ expired]"
+msgstr "[ expired]"
+
+#: g10/trustdb.c:533
+msgid "[ unknown]"
+msgstr "[ unknown]"
+
+#: g10/trustdb.c:535
+msgid "[ undef ]"
+msgstr "[ undef ]"
+
+#: g10/trustdb.c:536
+msgid "[marginal]"
+msgstr "[marginal]"
+
+#: g10/trustdb.c:537
+msgid "[ full ]"
+msgstr "[ full ]"
+
+#: g10/trustdb.c:538
+msgid "[ultimate]"
+msgstr "[ultimate]"
+
+#: g10/trustdb.c:553
+msgid "undefined"
+msgstr "undefined"
+
+#: g10/trustdb.c:554
+msgid "never"
+msgstr "never"
+
+#: g10/trustdb.c:555
+msgid "marginal"
+msgstr "marginal"
+
+#: g10/trustdb.c:556
+msgid "full"
+msgstr "full"
+
+#: g10/trustdb.c:557
+msgid "ultimate"
+msgstr "ultimate"
+
+#: g10/trustdb.c:597
+msgid "no need for a trustdb check\n"
+msgstr "no need for a trustdb check\n"
+
+#: g10/trustdb.c:603 g10/trustdb.c:2513
+#, c-format
+msgid "next trustdb check due at %s\n"
+msgstr "next trustdb check due at %s\n"
+
+#: g10/trustdb.c:612
+#, 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:627
+#, 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:879 g10/trustdb.c:1341
+#, c-format
+msgid "public key %s not found: %s\n"
+msgstr "public key %s not found: %s\n"
+
+#: g10/trustdb.c:1084
+msgid "please do a --check-trustdb\n"
+msgstr "please do a --check-trustdb\n"
+
+#: g10/trustdb.c:1088
+msgid "checking the trustdb\n"
+msgstr "checking the trustdb\n"
+
+#: g10/trustdb.c:2256
+#, c-format
+msgid "%d keys processed (%d validity counts cleared)\n"
+msgstr "%d keys processed (%d validity counts cleared)\n"
+
+#: g10/trustdb.c:2321
+msgid "no ultimately trusted keys found\n"
+msgstr "no ultimately trusted keys found\n"
+
+#: g10/trustdb.c:2335
+#, 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:2358
+#, c-format
+msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+msgstr "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
+
+#: g10/trustdb.c:2444
+#, 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:2519
+#, 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/verify.c:116
+msgid ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+msgstr ""
+"the signature could not be verified.\n"
+"Please remember that the signature file (.sig or .asc)\n"
+"should be the first file given on the command line.\n"
+
+#: g10/verify.c:192
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr "input line %u too long or missing LF\n"
+
+#: util/errors.c:53
+msgid "general error"
+msgstr "general error"
+
+#: util/errors.c:54
+msgid "unknown packet type"
+msgstr "unknown packet type"
+
+#: util/errors.c:55
+msgid "unknown version"
+msgstr "unknown version"
+
+#: util/errors.c:56
+msgid "unknown pubkey algorithm"
+msgstr "unknown pubkey algorithm"
+
+#: util/errors.c:57
+msgid "unknown digest algorithm"
+msgstr "unknown digest algorithm"
+
+#: util/errors.c:58
+msgid "bad public key"
+msgstr "bad public key"
+
+#: util/errors.c:59
+msgid "bad secret key"
+msgstr "bad secret key"
+
+#: util/errors.c:60
+msgid "bad signature"
+msgstr "bad signature"
+
+#: util/errors.c:61
+msgid "checksum error"
+msgstr "checksum error"
+
+#: util/errors.c:62
+msgid "bad passphrase"
+msgstr "bad passphrase"
+
+#: util/errors.c:63
+msgid "public key not found"
+msgstr "public key not found"
+
+#: util/errors.c:64
+msgid "unknown cipher algorithm"
+msgstr "unknown cipher algorithm"
+
+#: util/errors.c:65
+msgid "can't open the keyring"
+msgstr "can't open the keyring"
+
+#: util/errors.c:66
+msgid "invalid packet"
+msgstr "invalid packet"
+
+#: util/errors.c:67
+msgid "invalid armor"
+msgstr "invalid armor"
+
+#: util/errors.c:68
+msgid "no such user id"
+msgstr "no such user id"
+
+#: util/errors.c:69
+msgid "secret key not available"
+msgstr "secret key not available"
+
+#: util/errors.c:70
+msgid "wrong secret key used"
+msgstr "wrong secret key used"
+
+#: util/errors.c:71
+msgid "not supported"
+msgstr "not supported"
+
+#: util/errors.c:72
+msgid "bad key"
+msgstr "bad key"
+
+#: util/errors.c:73
+msgid "file read error"
+msgstr "file read error"
+
+#: util/errors.c:74
+msgid "file write error"
+msgstr "file write error"
+
+#: util/errors.c:75
+msgid "unknown compress algorithm"
+msgstr "unknown compress algorithm"
+
+#: util/errors.c:76
+msgid "file open error"
+msgstr "file open error"
+
+#: util/errors.c:77
+msgid "file create error"
+msgstr "file create error"
+
+#: util/errors.c:78
+msgid "invalid passphrase"
+msgstr "invalid passphrase"
+
+#: util/errors.c:79
+msgid "unimplemented pubkey algorithm"
+msgstr "unimplemented pubkey algorithm"
+
+#: util/errors.c:80
+msgid "unimplemented cipher algorithm"
+msgstr "unimplemented cipher algorithm"
+
+#: util/errors.c:81
+msgid "unknown signature class"
+msgstr "unknown signature class"
+
+#: util/errors.c:82
+msgid "trust database error"
+msgstr "trust database error"
+
+#: util/errors.c:83
+msgid "bad MPI"
+msgstr "bad MPI"
+
+#: util/errors.c:84
+msgid "resource limit"
+msgstr "resource limit"
+
+#: util/errors.c:85
+msgid "invalid keyring"
+msgstr "invalid keyring"
+
+#: util/errors.c:86
+msgid "bad certificate"
+msgstr "bad certificate"
+
+#: util/errors.c:87
+msgid "malformed user id"
+msgstr "malformed user id"
+
+#: util/errors.c:88
+msgid "file close error"
+msgstr "file close error"
+
+#: util/errors.c:89
+msgid "file rename error"
+msgstr "file rename error"
+
+#: util/errors.c:90
+msgid "file delete error"
+msgstr "file delete error"
+
+#: util/errors.c:91
+msgid "unexpected data"
+msgstr "unexpected data"
+
+#: util/errors.c:92
+msgid "timestamp conflict"
+msgstr "timestamp conflict"
+
+#: util/errors.c:93
+msgid "unusable pubkey algorithm"
+msgstr "unusable pubkey algorithm"
+
+#: util/errors.c:94
+msgid "file exists"
+msgstr "file exists"
+
+#: util/errors.c:95
+msgid "weak key"
+msgstr "weak key"
+
+#: util/errors.c:96
+msgid "invalid argument"
+msgstr "invalid argument"
+
+#: util/errors.c:97
+msgid "bad URI"
+msgstr "bad URI"
+
+#: util/errors.c:98
+msgid "unsupported URI"
+msgstr "unsupported URI"
+
+#: util/errors.c:99
+msgid "network error"
+msgstr "network error"
+
+#: util/errors.c:101
+msgid "not encrypted"
+msgstr "not encrypted"
+
+#: util/errors.c:102
+msgid "not processed"
+msgstr "not processed"
+
+#: util/errors.c:104
+msgid "unusable public key"
+msgstr "unusable public key"
+
+#: util/errors.c:105
+msgid "unusable secret key"
+msgstr "unusable secret key"
+
+#: util/errors.c:106
+msgid "keyserver error"
+msgstr "keyserver error"
+
+#: util/errors.c:107
+msgid "canceled"
+msgstr "canceled"
+
+#: util/errors.c:108
+msgid "no card"
+msgstr "no card"
+
+#: util/errors.c:109
+msgid "no data"
+msgstr "no data"
+
+#: util/logger.c:183
+msgid "ERROR: "
+msgstr "ERROR: "
+
+#: util/logger.c:186
+msgid "WARNING: "
+msgstr "WARNING: "
+
+#: util/logger.c:249
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr "... this is a bug (%s:%d:%s)\n"
+
+#: util/logger.c:255
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr "you found a bug ... (%s:%d)\n"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:399 util/miscutil.c:436
+msgid "yes"
+msgstr "yes"
+
+#: util/miscutil.c:400 util/miscutil.c:441
+msgid "yY"
+msgstr "yY"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:402 util/miscutil.c:438
+msgid "no"
+msgstr "no"
+
+#: util/miscutil.c:403 util/miscutil.c:442
+msgid "nN"
+msgstr "nN"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:440
+msgid "quit"
+msgstr "quit"
+
+#: util/miscutil.c:443
+msgid "qQ"
+msgstr "qQ"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:476
+msgid "okay|okay"
+msgstr "okay|okay"
+
+#. TRANSLATORS: See doc/TRANSLATE about this string.
+#: util/miscutil.c:478
+msgid "cancel|cancel"
+msgstr "cancel|cancel"
+
+#: util/miscutil.c:479
+msgid "oO"
+msgstr "oO"
+
+#: util/miscutil.c:480
+msgid "cC"
+msgstr "cC"
+
+#: util/secmem.c:96
+msgid "WARNING: using insecure memory!\n"
+msgstr "WARNING: using insecure memory!\n"
+
+#: util/secmem.c:97
+msgid ""
+"please see http://www.gnupg.org/documentation/faqs.html for more "
+"information\n"
+msgstr ""
+"please see http://www.gnupg.org/documentation/faqs.html for more "
+"information\n"
+
+#: util/secmem.c:359
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "operation is not possible without initialized secure memory\n"
+
+#: util/secmem.c:360
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(you may have used the wrong program for this task)\n"
diff --cc po/eo.po
index 91e3c88,5ab4beb..afb069c
--- a/po/eo.po
+++ b/po/eo.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.0.6d\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:22+0200\n"
"Last-Translator: Edmund GRIMLEY EVANS <edmundo at rano.org>\n"
"Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@@ -29,77 -25,55 +29,77 @@@ msgstr "
msgid "no entropy gathering module detected\n"
msgstr ""
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "ne povas malfermi '%s'\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "ne povas malfermi '%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "ne povas stat-i '%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "'%s' ne estas normala dosiero - ignorita\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "noto: dosiero random_seed estas malplena\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
#, fuzzy
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "ne povas legi '%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "noto: dosiero random_seed ne aktualigita\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "ne povas krei '%s': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "ne povas skribi '%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "ne povas fermi '%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -870,8 -681,6 +870,8 @@@ msgstr "Ripetu pasfrazon:
msgid "PIN not correctly repeated; try again"
msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "ne povas malfermi '%s'\n"
@@@ -1350,15 -1058,12 +1350,15 @@@ msgstr "
" --list-keys [nomoj] montri �losilojn\n"
" --fingerprint [nomoj] montri fingro�purojn\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Bonvolu raporti cimojn al <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1368,7 -1073,6 +1368,7 @@@ msgstr "
"subskribi, kontroli, �ifri a� mal�ifri\n"
"implicita operacio dependas de la enigataj datenoj\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1376,564 -1080,442 +1376,564 @@@ msgstr "
"\n"
"Realigitaj metodoj:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
#, fuzzy
msgid "Compression: "
msgstr "Komento: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "uzado: gpg [opcioj] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "malkongruaj komandoj\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, 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:1291
++#: g10/gpg.c:1296
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, 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:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "%s: nova opcio-dosiero kreita\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "montri, en kiu �losilaro estas listigita �losilo"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Mankas responda subskribo en sekreta �losilaro\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "opcio-dosiero '%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "legas opciojn el '%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTO: %s ne estas por normala uzado!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ne povis analizi URI de �losilservilo\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
#, fuzzy
msgid "invalid import options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
#, fuzzy
msgid "invalid export options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "nevalida kiraso"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ne estas valida signaro\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "nevalida �losilaro"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVERTO: '%s' estas malplena dosiero\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTO: programo povas krei core-dosieron!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTO: %s nuligas %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ne eblas kun %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "skribas sekretan �losilon al '%s'\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "elektita �ifrad-metodo ne validas\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "elektita kompendi-metodo ne validas\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed devas esti pli granda ol 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed devas esti pli granda ol 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
#, 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:3132
++#: g10/gpg.c:3137
#, 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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
#, fuzzy
msgid "invalid default preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "nevalidaj preferoj\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne havas sencon kun %s!\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [dosiero]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [dosiero]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "mal�ifrado malsukcesis: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [dosiero]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [dosiero]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [dosiero]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [dosiero]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [dosiero]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [dosiero]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key uzantidentigilo"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key uzantidentigilo"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key uzantidentigilo [komandoj]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "Kreado de �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record malsukcesis: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "elkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enkirasigo malsukcesis: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "nevalida kompendi-metodo '%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[dosiero]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Ektajpu vian mesa�on ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "la donita gvidlinia URL por atestado ne validas\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@@ -5950,131 -4761,104 +5950,131 @@@ msgstr "kiraso: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "fido-datenaro: sync malsukcesis: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "ne povas krei '%s': %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "ne povas malfermi '%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "fido-datenaro-transakcio tro granda\n"
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "ne povas fermi '%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: dosierujo ne ekzistas!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "ne povas fermi '%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: malsukcesis krei versiregistron: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: nevalida fido-datenaro kreita\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: fido-datenaro kreita\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr ""
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: nevalida fido-datenaro\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: malsukcesis krei haktabelon: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: eraro dum legado de versiregistro: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: eraro dum skribado de versiregistro: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "fido-datenaro: lseek malsukcesis: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ne estas fido-datenaro\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versiregistro kun registronumero %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: nevalida dosiero-versio %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: eraro dum legado de libera registro: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: malsukcesis nuligi registron: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: malsukcesis aldoni registron: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: fido-datenaro kreita\n"
diff --cc po/es.po
index be13d07,ba65dd1..69a9955
--- a/po/es.po
+++ b/po/es.po
@@@ -11,7 -11,6 +11,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GnuPG 1.4.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2014-11-23 01:52+0100\n"
"Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi at openmailbox."
"org>\n"
@@@ -37,27 -33,18 +37,27 @@@ msgstr "no se puede generar un primo co
msgid "no entropy gathering module detected\n"
msgstr "no se ha detectado módulo acumulador de entropía\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "no se puede bloquear `%s': %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "esperando que se bloquee `%s'...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "no se puede abrir `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "no se puede obtener información de `%s': %s\n"
@@@ -67,52 -54,39 +67,52 @@@
# Sugerencia a la sugerencia: ¿qué tal omitido? (pasar en silencio una
# cosa; excluirla de lo que se habla o escribe) dice el diccionario.
# Bien. También se puede poner "descartado".
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' no es un fichero regular - omitido\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "nota: el fichero «random_seed» está vacío\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
"ATENCIÓN: tamaño incorrecto del fichero «random_seed» - no se utilizó\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "no se puede leer `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "nota: no se ha actualizado el fichero «random_seed»\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "no se puede crear %s: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "no se puede escribir `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "no se puede cerrar `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "ATENCIÓN: ¡está usando un generador de números aleatorios no seguro!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -855,8 -666,6 +855,8 @@@ msgstr "Repita este PIN:
msgid "PIN not correctly repeated; try again"
msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "no se puede abrir `%s'\n"
@@@ -1345,15 -1053,12 +1345,15 @@@ msgstr "
" --list-keys [nombres] muestra las claves\n"
" --fingerprint [nombres] muestra las huellas digitales\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Informe de posibles «bugs» a <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1363,7 -1068,6 +1363,7 @@@ msgstr "
"Firma, comprueba, cifra o descifra\n"
"La operación predeterminada depende de los datos de entrada\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1371,61 -1075,48 +1371,61 @@@ msgstr "
"\n"
"Algoritmos admitidos:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Clave pública: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Cifrado: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Resumen: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Compresión: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "uso: gpg [opciones] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "órdenes conflictivas\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
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:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ATENCIÓN: titularidad no segura del directorio personal `%s'\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ATENCIÓN: titularidad no segura del fichero de configuración `%s'\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ATENCIÓN: permisos no seguros sobre el directorio personal `%s'\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ATENCIÓN: permisos no seguros sobre el fichero de configuración `%s'\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "ATENCIÓN: titularidad no segura del directorio contenedor de `%s'\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1433,14 -1124,12 +1433,14 @@@ msgstr "
"ATENCIÓN: titularidad no segura del directorio contenedor del fichero de\n"
"configuración `%s'\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"ATENCIÓN: permisos no seguros del directorio contenedor del directorio "
"personal `%s'\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1448,453 -1137,350 +1448,453 @@@ msgstr "
"ATENCIÓN: permisos no seguros del directorio contenedor del fichero de\n"
"configuración `%s'\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "artículo de configuración desconocido `%s'\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "mostrar foto IDs al listar claves"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "mostrar URLs de directrices al listar firmas"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "mostrar todas las notaciones al listar firmas"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "mostrar notaciones estándar IETF al listar firmas"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "mostrar notaciones personalizadas al listar firmas"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "mostrar URLs del servidor de claves favorito al listar firmas"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "mostrar validez del identificador de usuario al listar claves"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "mostrar IDs de usuario revocados y caducados al listar claves"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "mostrar subclaves revocadas y caducadas al listar claves"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "mostrar nombre del almacén al listar claves"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "mostrar fechas de caducidad al listar firmas"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: se omite el antiguo fichero de opciones predeterminadas `%s'\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: no existe el fichero de opciones predeterminado `%s'\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichero de opciones `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "leyendo opciones desde `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: ¡%s no es para uso normal!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' no es una fecha de caducación de firma válida\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' no es un juego de caracteres válido\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "no se puede interpretar la URL del servidor de claves\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opciones del servidor de claves inválidas\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "opciones del servidor de claves inválidas\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opciones de importación inválidas\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "opciones de importación inválidas\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opciones de exportación inválidas\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "opciones de exportación inválidas\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: lista de opciones inválida\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "lista de opciones inválida\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "mostrar foto IDs al verificar firmas"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "mostrar URLs de directrices al verificar firmas"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "mostrar todas las notaciones al verificar firmas"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "mostrar notaciones estándar IETF al verificar firmas"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "mostrar notaciones personalizadas al verificar firmas"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "mostrar URLs del servidor de claves favorito al verificar firmas"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "mostrar validez del identificador de usuario al verificar firmas"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "mostrar solo la ID principal del usuario al verificar firmas"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "validar firmas con datos PKA"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "aumentar la confianza en las firmas con datos PKA válidos"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opciones de verificación inválidas\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "opciones de verificación inválidas\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "imposible establecer %s como ruta de ejecución\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: lista inválida de auto-localización de claves\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "lista inválida de auto-localización de claves\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr ""
"ATENCIÓN: ¡el programa podría crear un fichero de volcado de memoria!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATENCIÓN: %s sustituye a %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "¡%s no permitido con %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "¡%s no tiene sentido con %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "NOTA: %s no disponible en esta versión\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "no se ejecutará con memoria no segura debido a %s\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "solo puede hacer firmas separadas o en claro en modo --pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "debe usar ficheros (y no tuberías) si trabaja con --pgp2 activo.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "el algoritmo de cifrado seleccionado es inválido\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "el algoritmo de resumen seleccionado no inválido\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "el algoritmo de compresión seleccionado es inválido\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "el algoritmo de certificación por resumen elegido es inválido\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser mayor que 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser mayor que 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
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:3130
++#: g10/gpg.c:3135
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "default-cert-level inválido; debe ser 0, 1, 2 o 3\n"
- #: g10/gpg.c:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "min-cert-level inválido; debe ser 0, 1, 2 o 3\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: no se recomienda en absoluto el modo S2K simple (0)\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "preferencias predeterminadas inválidas\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "preferencias personales de cifrado inválidas\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "preferencias personales de algoritmo de resumen inválidas\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "preferencias personales de compresión inválidas\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s aún no funciona con %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
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:3243
++#: g10/gpg.c:3248
#, c-format
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:3248
++#: g10/gpg.c:3253
#, c-format
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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "fallida la inicialización de la base de datos de confianza: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ATENCIÓN: se indicaron destinatarios (-r) sin clave pública de cifrado\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [nombre_fichero]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [nombre_fichero]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "el cifrado simétrico de `%s' falló: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [nombre_fichero]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nombre_fichero]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
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:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [nombre_fichero]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nombre_fichero]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
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:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nombre_fichero]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [nombre_fichero]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [nombre_fichero]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key id-usuario"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usuario"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usuario [órdenes]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usuario] [almacén]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "envío al servidor de claves fallido: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepción del servidor de claves fallida: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "exportación de clave fallida: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "búsqueda en el servidor de claves fallida: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualización al servidor de claves fallida: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminación de armadura fallida: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creación de armadura fallida: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de resumen de cifrado inválido `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[nombre_fichero]"
@@@ -1902,19 -1488,15 +1902,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:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Adelante, teclee su mensaje...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "la URL de política de certificación suministrada no es válida\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "la URL de política de firmas suministrada no es válida\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "la URL del servidor de claves preferido suministrada no es válida\n"
@@@ -5860,132 -4671,105 +5860,132 @@@ msgstr "error de lectura `%s': %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: sincronización fallida: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "no se puede crear el bloqueo para `%s'\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "no se puede bloquear `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, 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:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transacción en la base de datos de confianza demasiado grande\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "no se puede acceder a `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: ¡el directorio no existe!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "no se puede acceder a `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: fallo al crear el registro de versión: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: se ha creado base de datos de confianza inválida\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: se ha creado base de datos de confianza\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "NOTA: no se puede escribir base de datos de confianza\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de datos de confianza inválida\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, 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:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: error actualizando el registro de versión: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: error leyendo registro de versión: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: error escribiendo registro de versión: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de datos de confianza: fallo lseek: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "base de datos de confianza: lectura fallida (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: no es un fichero de base de datos de confianza\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, 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:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versión inválida del fichero %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: error leyendo registro libre: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: error escribiendo registro de directorio: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, 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:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: fallo al añadir un registro: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Error: La base de datos de confianza está corrupta\n"
diff --cc po/et.po
index 1c40447,a42bcb8..34be880
--- a/po/et.po
+++ b/po/et.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:22+0200\n"
"Last-Translator: Toomas Soome <Toomas.Soome at microlink.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@@ -29,76 -25,54 +29,76 @@@ msgstr "v�hem kui %d bitiga ei saa alga
msgid "no entropy gathering module detected\n"
msgstr "entroopia kogumise moodul puudub\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "`%s' ei �nnestu avada\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "kirjutan salajase v�tme faili `%s'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' ei �nnestu avada: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "m�rkus: random_seed fail on t�hi\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "`%s' ei �nnestu lugeda: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "m�rkus: random_seed faili ei uuendatud\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "`%s' ei �nnestu kirjutada: %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "`%s' ei �nnestu sulgeda: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -866,8 -677,6 +866,8 @@@ msgstr "Korrake parooli:
msgid "PIN not correctly repeated; try again"
msgstr "parooli ei korratud �ieti; proovige uuesti"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' ei �nnestu avada\n"
@@@ -1356,15 -1064,12 +1356,15 @@@ msgstr "
" --list-keys [nimed] n�ita v�tmeid\n"
" --fingerprint [nimed] n�ita s�rmej�lgi\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Palun saatke veateated aadressil <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1374,7 -1079,6 +1374,7 @@@ msgstr "
"allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
"vaikimisi operatsioon s�ltub sisendandmetest\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1382,556 -1086,434 +1382,556 @@@ msgstr "
"\n"
"Toetatud algoritmid:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Avalik v�ti: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "�iffer: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "R�si: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Pakkimine: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "kasuta: gpg [v�tmed] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "vastuolulised k�sud\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, 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:1291
++#: g10/gpg.c:1296
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, 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:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "tundmatu seade \"%s\"\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "v�tmete fail `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "loen v�tmeid failist `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "ei saa parsida v�tmeserveri URI\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: vigased impordi v�tmed\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "vigased impordi v�tmed\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei ole lubatud kooditabel\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: vigased ekspordi v�tmed\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "HOIATUS: %s m��rab �le %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s ei ole koos lubatud!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s ei oma koos m�tet!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "valitud l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valitud �ifri algoritm ei ole lubatud\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed peab olema suurem, kui 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed peab olema suurem, kui 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "vigased vaikimisi eelistused\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "vigased isikliku �ifri eelistused\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "vigased isikliku l�hendi eelistused\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "vigased isikliku pakkimise eelistused\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ei t��ta veel koos %s-ga\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [failinimi]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [failinimi]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [failinimi]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [failinimi]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [failinimi]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [failinimi]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [failinimi]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [failinimi]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key kasutaja-id"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key kasutaja-id"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kasutaja-id [k�sud]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "v�tme eksport eba�nnestus: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "lahtipakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "pakendamine eba�nnestus: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "vigane r�sialgoritm `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[failinimi]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Kirjutage n��d oma teade ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "antud sertifikaadi poliisi URL on vigane\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "antud allkirja poliisi URL on vigane\n"
@@@ -5923,131 -4734,104 +5923,131 @@@ msgstr "viga lugemisel: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync eba�nnestus: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "`%s' ei �nnestu luua: %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "`%s' ei �nnestu avada\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "trustdb transaktsioon on liiga suur\n"
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "`%s' ei �nnestu sulgeda: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: kataloogi ei ole!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "`%s' ei �nnestu sulgeda: %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: versioonikirje loomine ei �nnestu: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: loodi vigane usalduse andmebaas\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trustdb on loodud\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "M�RKUS: trustdb pole kirjutatav\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: vigane trustdb\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: viga versioonikirje uuendamisel: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: viga versioonikirje lugemisel: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek eba�nnestus: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ei ole trustdb fail\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versioonikirje kirje numbriga %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: vigane faili versioon %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: viga vaba kirje lugemisel: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: kirje nullimine eba�nnestus: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: kirje lisamine eba�nnestus: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: trustdb on loodud\n"
diff --cc po/fi.po
index a4a93de,203bedb..338007f
--- a/po/fi.po
+++ b/po/fi.po
@@@ -22,7 -22,6 +22,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.2\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:23+0200\n"
"Last-Translator: Tommi Vainikainen <Tommi.Vainikainen at iki.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@@ -45,77 -41,55 +45,77 @@@ msgstr "alkulukua, jossa on alle %d bit
msgid "no entropy gathering module detected\n"
msgstr "entropian keräysmoduulia ei havaittu\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "\"%s\" on erikoistiedosto - ohitettiin\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "huom: random_seed-tiedosto on tyhjä\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
"VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "tiedostoon \"%s\" ei voi kirjoittaa: %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "VAROITUS: käytetty satunnaislukugeneraattori ei ole turvallinen.\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -887,8 -698,6 +887,8 @@@ msgstr "Toista salasana:
msgid "PIN not correctly repeated; try again"
msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
@@@ -1375,16 -1083,13 +1375,16 @@@ msgstr "
" --list-keys [nimet] näytä avaimet\n"
" --fingerprint [nimet] näytä sormenjäljet\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1394,7 -1099,6 +1394,7 @@@ msgstr "
"allekirjoita, tarkista, salaa tai avaa\n"
"oletustoiminto riippuu syötteestä\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1402,557 -1106,435 +1402,557 @@@ msgstr "
"\n"
"Tuetut algoritmit:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "JulkAvain: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Salaus: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Tiiviste: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Pakkaus: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "käyttö: gpg [valitsimet] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "ristiriitainen komento\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, 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:1264
++#: g10/gpg.c:1269
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, 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:1273
++#: g10/gpg.c:1278
#, 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:1276
++#: g10/gpg.c:1281
#, 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:1282
++#: g10/gpg.c:1287
#, 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:1285
++#: g10/gpg.c:1290
#, 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:1291
++#: g10/gpg.c:1296
#, 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:1294
++#: g10/gpg.c:1299
#, 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:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "tuntematon asetus \"%s\"\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "asetustiedosto \"%s\": %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "luetaan asetukset tiedostosta \"%s\"\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "virheelliset tuontivalitsimet\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s ei kelpaa merkistöksi\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: virheelliset vientivalitsimet\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROITUS: %s korvaa %s:n\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ja %s yhdessä on järjetöntä!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "valittu tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "valittu salausalgoritmi ei kelpaa\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed täytyy olla suurempi kuin 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
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:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "virheelliset oletusarvoiset valinnat\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ja %s eivät vielä toimi yhdessä\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [tiedostonimi]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [tiedostonimi]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "avaus epäonnistui: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [tiedostonimi]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--allekirjoita [tiedostonimi]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [tiedostonimi]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [tiedostonimi]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [tiedostonimi]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [tiedostonimi]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key käyttäjätunnus"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key käyttäjätunnus"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key käyttäjätunnus [komennot]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "avaimen vienti epäonnistui: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ascii-koodauksen purku epäonnistui: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ascii-koodaaminen epäonnistui: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[tiedostonimi]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Kirjoita viestisi...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "annettu varmennekäytännön URL on virheellinen\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@@ -5997,131 -4808,104 +5997,131 @@@ msgstr "lukuvirhe: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronointi epäonnistui: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "tiedostoa \"%s\" ei voi avata\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "trustdb-tapahtuma on liian suuri\n"
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: hakemistoa ei ole olemassa!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: versiotietueen luonti epäonnistui: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: luotu trustdb ei kelpaa\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: trustdb luotu\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb ei kelpaa\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek epäonnistui: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: ei ole trustdb-tiedosto\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versiotietue tietuenumerolla %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: tiedostoversio %d ei kelpaa\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: trustdb luotu\n"
diff --cc po/fr.po
index 54b666b,a664e59..05f3588
--- a/po/fr.po
+++ b/po/fr.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.19\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2014-09-06 15:56-0400\n"
"Last-Translator: David Prévot <david at tilapin.org>\n"
"Language-Team: French <traduc at traduc.org>\n"
@@@ -32,79 -28,57 +32,79 @@@ msgstr "impossible de générer un nomb
msgid "no entropy gathering module detected\n"
msgstr "aucun module de récupération d'entropie n'a été trouvé\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "impossible de verrouiller « %s » : %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "attente du verrou sur « %s »…\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossible d'ouvrir « %s » : %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "impossible d'accéder à « %s » : %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "« %s » n'est pas un fichier régulier — ignoré\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "remarque : le fichier random_seed est vide\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
"Attention : la taille du fichier random_seed est incorrecte.\n"
" Il ne sera pas utilisé.\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "impossible de lire « %s » : %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "remarque : le fichier random_seed n'a pas été mis à jour\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "impossible de créer « %s » : %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "impossible d'écrire « %s » : %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "impossible de fermer « %s » : %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
"Attention : utilisation d'un générateur de nombres aléatoires non sûr.\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -864,8 -675,6 +864,8 @@@ msgstr "Répétez ce code personnel :
msgid "PIN not correctly repeated; try again"
msgstr "les codes personnels ne correspondent pas ; veuillez réessayer"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "impossible d'ouvrir « %s »\n"
@@@ -1355,17 -1063,14 +1355,17 @@@ msgstr "
" --list-keys [noms] montrer les clefs\n"
" --fingerprint [noms] montrer les empreintes\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"Veuillez signaler toutes anomalies à <gnupg-bugs at gnu.org> (en anglais)\n"
"et tout problème de traduction à <traduc at traduc.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Utilisation : gpg [options] [fichiers] (-h pour l'aide)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1375,7 -1080,6 +1375,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:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1383,71 -1087,58 +1383,71 @@@ msgstr "
"\n"
"Algorithmes pris en charge :\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Clef publique : "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Chiffrement : "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hachage : "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Compression : "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "utilisation : gpg [options] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "commandes en conflit\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, 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:1264
++#: g10/gpg.c:1269
#, 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:1267
++#: g10/gpg.c:1272
#, 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:1273
++#: g10/gpg.c:1278
#, 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:1276
++#: g10/gpg.c:1281
#, 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:1282
++#: g10/gpg.c:1287
#, 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:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1455,14 -1146,12 +1455,14 @@@ msgstr "
"Attention : le propriétaire du répertoire contenant le fichier de\n"
" configuration « %s » n'est pas sûr\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, 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:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1470,479 -1159,372 +1470,479 @@@ msgstr "
"Attention : les droits du répertoire contenant le fichier de configuration\n"
" « %s » ne sont pas sûrs\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "élément de configuration « %s » inconnu\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "montrer les photos d'identité en affichant les clefs"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "montrer les URL de politique en affichant les signatures"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "montrer toutes les notations en affichant les signatures"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "utiliser les notations aux normes IETF en affichant les signatures"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
"utiliser les notations fournies par l'utilisateur en affichant les signatures"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"montrer les URL des serveurs de clefs favoris en affichant les signatures"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "indiquer la validité de l'identité en affichant les clefs"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
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:1580
++#: g10/gpg.c:1585
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:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "montrer le nom du porte-clefs en affichant les clefs"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "montrer les dates d'expiration en affichant les signatures"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, 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:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "fichier d'options « %s » : %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "lecture des options de « %s »\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, 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:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, 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:2569
++#: g10/gpg.c:2574
#, 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:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "impossible d'analyser l'URL du serveur de clefs\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "les options du serveur de clefs sont incorrectes\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s : %d : options d'importation incorrectes\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "options d'importation incorrectes\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s : %d : options d'exportation incorrectes\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "options d'exportation incorrectes\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s : %d : options de liste incorrectes\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "options de liste incorrectes\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "montrer les photos d'identité en vérifiant les signatures"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "montrer les URL de politique en vérifiant les signatures"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "montrer toutes les notations en vérifiant les signatures"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
"utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
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:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "indiquer la validité de l'identité en vérifiant les signatures"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
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:2664
++#: g10/gpg.c:2669
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:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "valider les signatures avec les données PKA"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
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:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s : %d : options de vérification incorrectes\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "options de vérification incorrectes\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, 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:2850
++#: g10/gpg.c:2855
#, 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:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "liste de recherche automatique de clef incorrecte\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "Attention : %s remplace %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n'est pas permis avec %s.\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n'a aucun sens avec %s.\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "Remarque : %s n'est pas disponible dans cette version\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"une signature détachée ou en texte clair n'est possible qu'en mode --pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "signer et chiffrer en même temps n'est possible qu'en mode --pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"des fichiers (et pas un tube) doivent être utilisés lorsque --pgp2\n"
"est activé.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"chiffrer un message en mode --pgp2 nécessite l'algorithme de chiffrement "
"IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "la fonction de hachage sélectionnée est incorrecte\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "l'algorithme de compression sélectionné est incorrect\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "« completes-needed » doit être supérieur à 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "« marginals-needed » doit être supérieur à 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
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:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "préférences par défaut incorrectes\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "préférences personnelles de chiffrement incorrectes\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "préférences personnelles de hachage incorrectes\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "préférences personnelles de compression incorrectes\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ne fonctionne pas encore avec %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "impossible d'initialiser la base de confiance : %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [fichier]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [fichier]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "échec du chiffrement symétrique de « %s » : %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [fichier]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [fichier]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
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:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [fichier]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [fichier]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [fichier]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
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:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [fichier]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [fichier]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [fichier]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key identité"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key identité"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key identité [commandes]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [identité] [porte-clefs]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "échec d'envoi vers le serveur de clefs : %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "échec de réception depuis le serveur de clefs : %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "échec d'exportation de la clef : %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "échec de recherche au sein du serveur de clefs : %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "échec de déconstruction d'une armure : %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "échec de construction d'une armure : %s \n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algorithme de hachage « %s » incorrect\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[fichier]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Vous pouvez taper votre message…\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL de politique de certification donnée est incorrecte\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL de politique de signature donnée est incorrecte\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
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"
@@@ -5943,132 -4754,105 +5943,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:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "impossible de créer un verrou pour « %s »\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "impossible de verrouiller « %s »\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, 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:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transaction de base de confiance trop grande\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "impossible d'accéder à « %s » : %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s : le répertoire n'existe pas.\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "impossible d'accéder à « %s » : %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s : impossible de créer un enregistrement de version : %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s : base de confiance incorrecte créée\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s : base de confiance créée\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "Remarque : la base de confiance n'est pas accessible en écriture\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s : base de confiance incorrecte\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, 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:656
++#: g10/tdbio.c:668
#, 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:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s : erreur de lecture d'enregistrement de version : %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, 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:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de confiance : échec de lseek : %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "base de confiance : échec de lecture (n=%d) : %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, 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:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s : enregistrement de version avec le numéro %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s : version %d du fichier incorrecte\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s : erreur de lecture d'enregistrement libre : %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, 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:1430
++#: g10/tdbio.c:1440
#, 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:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s : impossible d'ajouter un enregistrement : %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Erreur : la base de confiance est corrompue\n"
diff --cc po/gl.po
index 03c4ec3,58a680c..6dd13a1
--- a/po/gl.po
+++ b/po/gl.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.4\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:23+0200\n"
"Last-Translator: Jacobo Tarrio <jtarrio at trasno.net>\n"
"Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@@ -29,76 -25,54 +29,76 @@@ msgstr "non se pode xerar un n�mero pri
msgid "no entropy gathering module detected\n"
msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "non se puido abrir `%s'\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "gravando a chave secreta en `%s'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "non se puido abrir `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "non se puido facer stat sobre `%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' non � un ficheiro normal - ign�rase\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "nota: o ficheiro random_seed est� baleiro\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "non se pode ler de `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "nota: o ficheiro random_seed non se actualiza\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "non se pode crear `%s': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "non se pode escribir en `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "non se pode pechar `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -874,8 -685,6 +874,8 @@@ msgstr "Repita o contrasinal:
msgid "PIN not correctly repeated; try again"
msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "non se puido abrir `%s'\n"
@@@ -1366,17 -1074,14 +1366,17 @@@ msgstr "
" --list-keys [nomes] amosa-las chaves\n"
" --fingerprint [nomes] amosa-las pegadas dactilares\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"Por favor, informe dos erros no programa a <gnupg-bugs at gnu.org>,\n"
"e dos erros na traducci�n a <proxecto at trasno.net>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1386,7 -1091,6 +1386,7 @@@ msgstr "
"asinar, verificar, cifrar ou descifrar\n"
"a operaci�n por defecto depende dos datos de entrada\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1394,559 -1098,437 +1394,559 @@@ msgstr "
"\n"
"Algoritmos soportados:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "P�blica: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Compresi�n: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "uso: gpg [opci�ns] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "comandos conflictivos\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, 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:1264
++#: g10/gpg.c:1269
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, 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:1285
++#: g10/gpg.c:1290
#, 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:1291
++#: g10/gpg.c:1296
#, 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:1294
++#: g10/gpg.c:1299
#, 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:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "amosar en que chaveiro est� unha chave listada"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
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:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de opci�ns `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo as opci�ns de `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: �%s non � para uso normal!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, 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:2569
++#: g10/gpg.c:2574
#, 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:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "non se puido analisa-lo URI do servidor de chaves\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, 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:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, 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:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "opci�ns de importaci�n non v�lidas\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s non � un xogo de caracteres v�lido\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, 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:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "opci�ns de exportaci�n non v�lidas\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "non se puido estabrecer exec-path a %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, 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:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s fai que se ignore %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "�%s non se admite con %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
"activado.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed debe ser superior a 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed debe ser superior a 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
#, 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:3132
++#: g10/gpg.c:3137
#, 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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "preferencias por defecto non v�lidas\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "preferencias de cifrado personais non v�lidas\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "preferencias de resumo personais non v�lidas\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "preferencias de compresi�n personais non v�lidas\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "�%s a�nda non traballa con %s!\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, 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:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [ficheiro]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [ficheiro]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "o descifrado fallou: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [ficheiro]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [ficheiro]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [ficheiro]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ficheiro]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [ficheiro]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [ficheiro]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key id-de-usuario"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key id-de-usuario"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-de-usuario [comandos]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "o env�o ao servidor de chaves fallou: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "a recepci�n do servidor de chaves fallou: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "a exportaci�n da chave fallou: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "a busca no servidor de chaves fallou fallou: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "non se puido quita-la armadura: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "non se puido po�e-la armadura: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash non v�lido `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[ficheiro]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Escriba a s�a mensaxe ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
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:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@@ -5989,132 -4800,105 +5989,132 @@@ 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:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "non se pode crear `%s': %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "non se puido abrir `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, 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:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transacci�n da base de datos de confianza demasiado grande\n"
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "non se pode pechar `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: �o directorio non existe!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "non se pode pechar `%s': %s\n"
+
++#: g10/tdbio.c:570
#, 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:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: creouse a base de datos de confianza\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de datos de confianza non v�lida\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, 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:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, 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:733
++#: g10/tdbio.c:745
#, 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:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de datos de confianza: lseek fallou: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, 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:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: non � un ficheiro de base de datos de confianza\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, 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:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versi�n do ficheiro incorrecta %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: erro ao ler un rexistro libre: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, 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:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: non se puido engadir un rexistro: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: creouse a base de datos de confianza\n"
diff --cc po/gnupg.pot
index a246d62,fdaa5e1..f4a5421
--- a/po/gnupg.pot
+++ b/po/gnupg.pot
@@@ -1,23 -1,20 +1,23 @@@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Ales Nyakhaychyk <nab at mail.by>, 2003.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
+#, fuzzy
msgid ""
msgstr ""
- "Project-Id-Version: gnupg 1.4.20\n"
-"Project-Id-Version: gnupg 1.2.2\n"
++"Project-Id-Version: gnupg 1.4.21\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
-"PO-Revision-Date: 2012-08-24 17:19+0200\n"
-"Last-Translator: Ales Nyakhaychyk <nab at mail.by>\n"
-"Language-Team: Belarusian <i18n at mova.org>\n"
-"Language: be\n"
++"POT-Creation-Date: 2016-08-17 15:21+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-Generator: KBabel 1.0.2\n"
+#: cipher/primegen.c:119
#, c-format
msgid "can't gen prime with pbits=%u qbits=%u\n"
msgstr ""
@@@ -31,76 -26,54 +31,76 @@@ msgstr "
msgid "no entropy gathering module detected\n"
msgstr ""
- #: cipher/random.c:426 cipher/random.c:604
-#, fuzzy, c-format
++#: cipher/random.c:425 cipher/random.c:603
+#, c-format
msgid "can't lock `%s': %s\n"
-msgstr "немагчыма адкрыць \"%s\"\n"
+msgstr ""
- #: cipher/random.c:431 cipher/random.c:610
-#, fuzzy, c-format
++#: cipher/random.c:430 cipher/random.c:609
+#, c-format
msgid "waiting for lock on `%s'...\n"
-msgstr "запіс у stdout\n"
+msgstr ""
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr ""
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr ""
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr ""
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr ""
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr ""
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr ""
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr ""
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr ""
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr ""
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -812,13 -651,10 +812,13 @@@ msgstr "
msgid "PIN not correctly repeated; try again"
msgstr ""
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
-msgstr "немагчыма адкрыць \"%s\"\n"
+msgstr ""
+#: g10/decrypt.c:103 g10/encode.c:823
msgid "--output doesn't work for this command\n"
msgstr ""
@@@ -1264,560 -1013,455 +1264,560 @@@ msgid "
" --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:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
-msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs at gnu.org>.\n"
+msgstr ""
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
-msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
+msgstr ""
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
"Default operation depends on the input data\n"
msgstr ""
-"Сынтаксіс: gpg [выбары] [файлы]\n"
-"sign, check, encrypt ці decrypt\n"
-"Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
msgstr ""
-"\n"
-"Альгарытмы, якія падтрымліваюцца:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr ""
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
-msgstr "Выкарыстаньне: gpg [выбары] "
+msgstr ""
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
-msgstr "несумяшчальныя загады\n"
+msgstr ""
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr ""
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr ""
- #: g10/gpg.c:1469
-#, fuzzy, c-format
++#: g10/gpg.c:1474
+#, c-format
msgid "unknown configuration item `%s'\n"
-msgstr "невядомая вэрсыя"
+msgstr ""
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr ""
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr ""
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr ""
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr ""
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr ""
- #: g10/gpg.c:2480 g10/gpg.c:2492
-#, fuzzy, c-format
++#: g10/gpg.c:2485 g10/gpg.c:2497
+#, c-format
msgid "`%s' is not a valid signature expiration\n"
-msgstr "%s - гэта недапушчальнае мноства знакаў\n"
+msgstr ""
- #: g10/gpg.c:2569
-#, fuzzy, c-format
++#: g10/gpg.c:2574
+#, c-format
msgid "`%s' is not a valid character set\n"
-msgstr "%s - гэта недапушчальнае мноства знакаў\n"
+msgstr ""
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr ""
- #: g10/gpg.c:2605
-#, fuzzy, c-format
++#: g10/gpg.c:2610
+#, c-format
msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2608
-#, fuzzy
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
-msgstr "недапушчальныя выбары экспартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
-msgstr "недапушчальныя выбары імпартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
-msgstr "недапушчальныя выбары экспартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2635
-#, fuzzy, c-format
++#: g10/gpg.c:2640
+#, c-format
msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2638
-#, fuzzy
++#: g10/gpg.c:2643
msgid "invalid list options\n"
-msgstr "недапушчальныя выбары імпартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
-#, fuzzy
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
-msgstr "%s - гэта недапушчальнае мноства знакаў\n"
+msgstr ""
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2660
-#, fuzzy
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
-msgstr "%s - гэта недапушчальнае мноства знакаў\n"
+msgstr ""
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
-#, fuzzy
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
-msgstr "%s - гэта недапушчальнае мноства знакаў\n"
+msgstr ""
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
-#, fuzzy, c-format
++#: g10/gpg.c:2680
+#, c-format
msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2678
-#, fuzzy
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
-msgstr "недапушчальныя выбары экспартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:2850
-#, fuzzy, c-format
++#: g10/gpg.c:2855
+#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
+msgstr ""
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr ""
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
-msgstr "%s не дазваляецца разам з %s!\n"
+msgstr ""
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
-msgstr "%s ня мае сэнсу разам з %s!\n"
+msgstr ""
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr ""
- #: g10/gpg.c:2988
-#, fuzzy, c-format
++#: g10/gpg.c:2993
+#, c-format
msgid "will not run with insecure memory due to %s\n"
-msgstr "запіс у stdout\n"
+msgstr ""
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr ""
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr ""
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr ""
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr ""
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr ""
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr ""
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr ""
- #: g10/gpg.c:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr ""
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr ""
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
-msgstr "недапушчальныя дапомныя перавагі\n"
+msgstr ""
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr ""
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr ""
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr ""
- #: g10/gpg.c:3191
-#, fuzzy, c-format
++#: g10/gpg.c:3196
+#, c-format
msgid "%s does not yet work with %s\n"
-msgstr "%s ня мае сэнсу разам з %s!\n"
+msgstr ""
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr ""
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
-msgstr "--store [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
-msgstr "--symmetric [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3388
-#, fuzzy, c-format
++#: g10/gpg.c:3393
+#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "збой падпісаньня: %s\n"
+msgstr ""
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
-msgstr "--encrypt [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3411
-#, fuzzy
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
-msgstr "--sign [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
-msgstr "--sign --encrypt [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3462
-#, fuzzy
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
-msgstr "--sign --symmetric [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
-msgstr "--clearsign [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
-msgstr "--decrypt [назва_файла]"
+msgstr ""
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
-msgstr "--sign-key user-id"
+msgstr ""
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
-msgstr "--lsign-key user-id"
+msgstr ""
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
-msgstr "--edit-key user-id [загады]"
+msgstr ""
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr ""
- #: g10/gpg.c:3667
-#, fuzzy, c-format
++#: g10/gpg.c:3672
+#, c-format
msgid "keyserver send failed: %s\n"
-msgstr "збой падпісаньня: %s\n"
+msgstr ""
- #: g10/gpg.c:3669
-#, fuzzy, c-format
++#: g10/gpg.c:3674
+#, c-format
msgid "keyserver receive failed: %s\n"
-msgstr "збой падпісаньня: %s\n"
+msgstr ""
- #: g10/gpg.c:3671
-#, fuzzy, c-format
++#: g10/gpg.c:3676
+#, c-format
msgid "key export failed: %s\n"
-msgstr "збой падпісаньня: %s\n"
+msgstr ""
- #: g10/gpg.c:3682
-#, fuzzy, c-format
++#: g10/gpg.c:3687
+#, c-format
msgid "keyserver search failed: %s\n"
-msgstr "збой падпісаньня: %s\n"
+msgstr ""
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr ""
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr ""
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr ""
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
-msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+msgstr ""
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
-msgstr "[назва_файла]"
+msgstr ""
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr ""
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr ""
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr ""
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr ""
@@@ -5456,131 -4391,104 +5456,131 @@@ msgstr "
msgid "trustdb: sync failed: %s\n"
msgstr ""
- #: g10/tdbio.c:103
-#, fuzzy, c-format
++#: g10/tdbio.c:104
+#, c-format
msgid "can't create lock for `%s'\n"
-msgstr "%s: немагчыма стварыць тэчку: %s\n"
+msgstr ""
- #: g10/tdbio.c:108
-#, fuzzy, c-format
++#: g10/tdbio.c:109
+#, c-format
msgid "can't lock `%s'\n"
-msgstr "немагчыма адкрыць \"%s\"\n"
+msgstr ""
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr ""
- #: g10/tdbio.c:520
++#: g10/tdbio.c:537
#, c-format
- msgid "can't access `%s': %s\n"
+ msgid "%s: directory does not exist!\n"
msgstr ""
- #: g10/tdbio.c:536
-#, fuzzy, c-format
++#: g10/tdbio.c:551
+#, c-format
- msgid "%s: directory does not exist!\n"
+ msgid "can't access `%s': %s\n"
-msgstr "немагчыма адкрыць %s: %s\n"
+msgstr ""
- #: g10/tdbio.c:557
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr ""
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr ""
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr ""
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr ""
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr ""
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+msgstr ""
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr ""
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr ""
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr ""
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr ""
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr ""
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr ""
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr ""
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr ""
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr ""
diff --cc po/hu.po
index 305222d,20c6c8b..084137b
--- a/po/hu.po
+++ b/po/hu.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:24+0200\n"
"Last-Translator: Nagy Ferenc L�szl� <nfl at nfllab.com>\n"
"Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@@ -29,77 -25,55 +29,77 @@@ msgstr "Nem tudok l�trehozni %d bitesn�
msgid "no entropy gathering module detected\n"
msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "Nem tudom megnyitni %s-t!\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "\"%s\" nem szab�lyos �llom�ny. Figyelmen k�v�l hagyom.\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr ""
"Megjegyz�s: random_seed �llom�ny (v�letlensz�m-gener�tor �llapota) �res.\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "Nem tudom �rni a(z) \"%s\" �llom�nyt: %s.\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "FIGYELEM: Nem biztons�gos v�letlensz�m-gener�tort haszn�lok!!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -868,8 -679,6 +868,8 @@@ msgstr "Ism�telje meg a jelsz�t:
msgid "PIN not correctly repeated; try again"
msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
@@@ -1354,15 -1062,12 +1354,15 @@@ msgstr "
" --list-keys [nevek] kulcsok ki�rat�sa\n"
" --fingerprint [nevek] ujjlenyomatok ki�rat�sa\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "A hib�kat (angolul) a <gnupg-bugs at gnu.org> c�mre �rja meg!\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1372,7 -1077,6 +1372,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:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1380,557 -1084,435 +1380,557 @@@ msgstr "
"\n"
"T�mogatott algoritmusok:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Nyilv�nos kulcs� (pubkey): "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Rejtjelez� (cipher): "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Kivonatol� (hash): "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "T�m�r�t� (compression): "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "Haszn�lat: gpg [opci�k] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "Egym�snak ellentmond� parancsok!\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, 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:1264
++#: g10/gpg.c:1269
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, 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:1282
++#: g10/gpg.c:1287
#, 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:1285
++#: g10/gpg.c:1290
#, 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:1291
++#: g10/gpg.c:1296
#, 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:1294
++#: g10/gpg.c:1299
#, 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:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, 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:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
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:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "\"%s\" opci�s f�jl: %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: �rv�nytelen import opci�k!\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "�rv�nytelen import opci�k!\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, 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:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "�rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, 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:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: �rv�nytelen export opci�k!\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s �rtelmetlen %s mellett!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
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:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, 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:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [f�jln�v]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [f�jln�v]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "Visszafejt�s sikertelen: %s.\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [f�jln�v]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [f�jln�v]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [f�jln�v]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [f�jln�v]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [f�jln�v]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [f�jln�v]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key felh-azonos�t�"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key felh-azonos�t�"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key felh-azonos�t� [parancsok]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "Kulcsexport�l�s sikertelen: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "P�nc�loz�s nem siker�lt: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[f�jln�v]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Kezdheti g�pelni az �zenetet...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
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:4269
++#: g10/gpg.c:4273
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:4302
++#: g10/gpg.c:4306
#, 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"
@@@ -5964,131 -4775,104 +5964,131 @@@ msgstr "Olvas�si hiba: %s.\n
msgid "trustdb: sync failed: %s\n"
msgstr "Bizalmi adatb�zis: szinkroniz�ci� sikertelen: %s.\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, 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:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "Nem tudom megnyitni %s-t!\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "Bizalmi adatb�zis %lu. rekord: lseek sikertelen: %s.\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "Bizalmi adatb�zis tranzakci�ja t�l nagy.\n"
- #: g10/tdbio.c:520
- #, 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:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: K�nyvt�r nem l�tezik!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, 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:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: Nem siker�lt verzi�rekordot l�trehoznom: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: �rv�nytelen bizalmi adatb�zis j�tt l�tre.\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "MEGJEGYZ�S: Bizalmi adatb�zis nem �rhat�.\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: �rv�nytelen bizalmi adatb�zis.\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: Hiba a verzi�rekord friss�t�sekor: %s.\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: Hiba a verzi�rekord olvas�sakor: %s.\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: Hiba a verzi�rekord �r�sakor: %s.\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "Bizalmi adatb�zis: lseek sikertelen: %s.\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: Nem bizalmi adatb�zis.\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: Verzi�rekord, rekordsz�m: %lu.\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: �rv�nytelen �llom�nyverzi� (%d).\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: Hiba k�nyvt�rrekord �r�sakor: %s.\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, 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:1460
++#: g10/tdbio.c:1470
#, 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:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: Bizalmi adatb�zis l�trej�tt.\n"
diff --cc po/id.po
index b66f460,b0022c0..76795da
--- a/po/id.po
+++ b/po/id.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-id\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:24+0200\n"
"Last-Translator: Tedi Heriyanto <tedi_h at gmx.net>\n"
"Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@@ -31,76 -27,54 +31,76 @@@ msgstr "tidak dapat membuat bilangan pr
msgid "no entropy gathering module detected\n"
msgstr "modul entropi gathering tidak terdeteksi\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "tidak dapat membuka `%s'\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "tidak dapat membuka `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "tidak dapat melakukan statistik `%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "'%s' bukan file reguler - diabaikan\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "catatan: file random_seed kosong\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "tidak dapat membaca `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "catatan: file random_seed tidak diupdate\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "tidak dapat menulis `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "tidak dapat menutup `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -870,8 -681,6 +870,8 @@@ msgstr "Ulangi passphrase:
msgid "PIN not correctly repeated; try again"
msgstr "passphrase tidak diulang dengan benar; coba lagi"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "tidak dapat membuka `%s'\n"
@@@ -1358,15 -1066,12 +1358,15 @@@ msgstr "
" --list-keys [nama] tampilkan kunci\n"
" --fingerprint [nama] tampilkan fingerprint\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Laporkan bug ke <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1376,7 -1081,6 +1376,7 @@@ msgstr "
"tandai, cek, enkripsi atau dekripsi\n"
"operasi baku tergantung pada data input\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1384,565 -1088,443 +1384,565 @@@ msgstr "
"\n"
"Algoritma yang didukung:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Kompresi: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "pemakaian: gpg [pilihan] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "perintah saling konflik\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, fuzzy, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, 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:1285
++#: g10/gpg.c:1290
#, 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:1291
++#: g10/gpg.c:1296
#, 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:1294
++#: g10/gpg.c:1299
#, 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:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "tampilkan keyring tempat kunci yang dipilih berada"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Tidak ada signature koresponden di ring rahasia\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "file pilihan `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "membaca pilihan dari `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "tidak dapat memparsing URI keyserver\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opsi impor tidak valid\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "opsi impor tidak valid\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s bukanlah set karakter yang valid\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "opsi ekspor tidak valid\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "tidak dapat menset path exec ke %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: opsi ekspor tidak valid\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "PERINGATAN: program mungkin membuat file core!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "PERINGATAN: %s menimpa %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s tidak dibolehkan dengan %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s tidak masuk akal dengan %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "menulis kunci rahasia ke `%s'\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"anda hanya dapat membuat signature detached atau clear saat dalam mode --"
"pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
"pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
"pgpg2\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "algoritma digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "algoritma cipher yang dipilih tidak valid\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed harus lebih dari 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed harus lebih dari 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "preferensi baku tidak valid\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "preferensi cipher personal tidak valid\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "preferensi digest personal tidak valid\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "preferensi kompresi personal tidak valid\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s belum dapat dipakai dengan %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "gagal inisialisasi TrustDB: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [namafile]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [namafile]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "dekripsi gagal: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [namafile]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [namafile]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [namafile]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [namafile]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [namafile]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [namafile]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key id-user"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key id-user"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-user [perintah]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-user] [keyring]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "Pengiriman keyserver gagal: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "Penerimaan keyserver gagal: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "Ekspor kunci gagal: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "Pencarian keyserver gagal: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "Refresh keyserver gagal: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "gagal dearmoring: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "gagal enarmoring: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritma hash tidak valid `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[namafile]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Teruskan dan ketikkan pesan anda ....\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@@ -5964,131 -4775,104 +5964,131 @@@ msgstr "kesalahan pembacaan: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: gagal sync: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "tidak dapat membuat %s: %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "tidak dapat membuka `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek gagal: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transaksi trustdb terlalu besar\n"
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "tidak dapat menutup `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: direktori tidak ada!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "tidak dapat menutup `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: gagal membuat catatan versi: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: tercipta trustdb tidak valid\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: tercipta trustdb\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb tidak valid\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: gagal membuat hashtable: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: kesalahan membaca catatan versi: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: kesalahan menulis catatan versi: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek gagal: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read failed (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: bukan file trustdb\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: catatan versi dengan recnum %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versi file %d tidak valid\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: kesalahan membaca record bebas: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: kesalahan menulis dir record: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: gagal mengosongkan record: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: gagal menambahkan record: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: tercipta trustdb\n"
diff --cc po/it.po
index 2c74620,1108836..418e1b9
--- a/po/it.po
+++ b/po/it.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2014-11-16 16:08+0100\n"
"Last-Translator: Milo Casagrande <milo at milo.name>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@@ -35,76 -31,54 +35,76 @@@ msgstr "impossibile generare un numero
msgid "no entropy gathering module detected\n"
msgstr "modulo di raccolta entropia non rilevato\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "impossibile bloccare \"%s\": %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "attesa del blocco su \"%s\"...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "impossibile aprire \"%s\": %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "impossibile eseguire stat su \"%s\": %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "\"%s\" non è un file regolare - ignorato\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "nota: il file random_seed è vuoto\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "ATTENZIONE: dimensioni del file random_seed non valide - non usato\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "impossibile leggere \"%s\": %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "nota: il file random_seed non è stato aggiornato\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "impossibile creare \"%s\": %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "impossibile scrivere su \"%s\": %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "impossibile chiudere \"%s\": %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "ATTENZIONE: in uso generatore di numeri casuali non sicuro.\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -848,8 -659,6 +848,8 @@@ msgstr "Ripetere questo PIN:
msgid "PIN not correctly repeated; try again"
msgstr "PIN ripetuto non correttamente; provare di nuovo"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "impossibile aprire \"%s\"\n"
@@@ -1334,15 -1042,12 +1334,15 @@@ msgstr "
" --list-keys [FILE] Mostra le chiavi\n"
" --fingerprint [FILE] Mostra le impronte digitali\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Segnalare eventuali bug a <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [OPZIONE...] [FILE...] (-h per l'aiuto)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1352,7 -1057,6 +1352,7 @@@ msgstr "
"Firma, controlla, cifra o decifra.\n"
"L'operazione predefinita dipende dai dati di input.\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1360,64 -1064,51 +1360,64 @@@ msgstr "
"\n"
"Algoritmi supportati:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "A chiave pubblica: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Cifrari: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Compressione: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "Uso: gpg [OPZIONE...] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "comandi in conflitto\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "nessun segno \"=\" trovato nella definizione del gruppo \"%s\"\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ATTENZIONE: proprietario della directory home \"%s\" non sicuro\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"ATTENZIONE: proprietario del file di configurazione \"%s\" non sicuro\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ATTENZIONE: permessi non sicuri per la directory home \"%s\"\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ATTENZIONE: permessi non sicuri per il file di configurazione \"%s\"\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"ATTENZIONE: l'inclusione della proprietà nella directory home '%s' non è "
"sicura\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1425,14 -1116,12 +1425,14 @@@ msgstr "
"ATTENZIONE: l'inclusione della proprietà nel file di configurazione \"%s\" "
"non è sicura\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"ATTENZIONE: i permessi della directory correlata alla directory home \"%s\" "
"non sono sicuri\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1440,475 -1129,368 +1440,475 @@@ msgstr "
"ATTENZIONE: i permessi della directory correlata al file di configurazione "
"\"%s\" non sono sicuri\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "elemento di configurazione \"%s\" sconosciuto\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "Mostra ID fotografici nell'elencare le chiavi"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "Mostra gli URL delle politiche nell'elencare le firme"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "Mostra tutte le annotazioni nell'elencare le firme"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "Mostra le annotazioni standard IETF nell'elencare le firme"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "Mostra le annotazioni fornite dall'utente nell'elencare le firme"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "Mostra gli URL dei server di chiavi preferiti nell'elencare le firme"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "Mostra la validità dell'ID utente nell'elencare le chiavi"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "Mostra gli ID utenti revocati e scaduti nell'elencare le chiavi"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "Mostra le sottochiavi revocate e scadute nell'elencare le chiavi"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "Mostra il nome del portachiavi nell'elencare le chiavi"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "Mostra le date di scadenza nell'elencare le firme"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "Nota: ignorato il vecchio file \"%s\" delle opzioni predefinite\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Nota: nessun file \"%s\" delle opzioni predefinite\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "file delle opzioni \"%s\": %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "lettura delle opzioni da \"%s\"\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "Nota: normalmente %s non deve essere usato.\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "\"%s\" non è una data di scadenza firma valida\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "\"%s\" non è un set di caratteri valido\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "impossibile analizzare l'URL del server di chiavi\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opzioni del server di chiavi non valide\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "opzioni del server di chiavi non valide\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opzioni di importazione non valide\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "opzioni di importazione non valide\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opzioni di esportazione non valide\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "opzioni di esportazione non valide\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opzioni di elenco non valide\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "opzioni di elenco non valide\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "Mostra ID fotografici nel verificare le firme"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "Mostra gli URL delle politiche nel verificare le firme"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "Mostra tutte le annotazioni nel verificare le firme"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "Mostra l'annotazione standard IETF nel verificare le firme"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "Mostra le annotatazioni fornite dall'utente nel verificare le firme"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "Mostra gli URL dei server di chiavi preferiti nel verificare le firme"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "Mostra la validità dell'ID nel verificare le firme"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr "Mostra gli ID utenti revocati o scaduti nel verificare le firme"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "Mostra solo l'ID utente primario nel verificare le firme"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "Convalida le firme con dati PKA"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "Innalza la fiducia delle firme con dati PKA validi"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opzioni di verifica non valide\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "opzioni di verifica non valide\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "impossibile impostare exec-path a %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: elenco auto-key-locate non valido\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "elenco auto-key-locate non valido\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "ATTENZIONE: il programma potrebbe creare un file core.\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ATTENZIONE: %s prevale su %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s non consentito assieme a %s.\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s non ha senso usato assieme a %s.\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "Nota: %s non è disponibile in questa versione\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "non verrà eseguito con la memoria insicura a causa di %s\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"nella modalità --pgp2 è possibile creare solo firme in chiaro o separate\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"nella modalità --pgp2 non è possibile firmare e cifrare contemporaneamente\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"è necessario usare dei file (e non una pipe) quando si opera con --pgp2 "
"abilitato.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"nella modalità --pgp2 è richiesto il cifrario IDEA per cifrare un messaggio\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "l'algoritmo di cifratura selezionato non è valido\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "l'algoritmo di digest selezionato non è valido\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "l'algoritmo di compressione selezionato non è valido\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "l'algoritmo di certificazione digest selezionato non è valido\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve essere maggiore di 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve essere maggiore di 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth deve essere compreso tra 1 e 255\n"
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "Nota: l'uso della modalità S2K semplice (0) è fortemente scoraggiato\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "modalità S2K non valido; deve essere 0, 1 o 3\n"
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "preferenze predefinite non valide\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "preferenze personali del cifrario non valide\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "preferenze personali del digest non valide\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "preferenze personali di compressione non valide\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s non funziona ancora con %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inizializzazione del TrustDB non riuscita: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ATTENZIONE: indicati destinatari (-r) senza usare la crittografia a chiave "
"pubblica\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [NOMEFILE]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [NOMEFILE]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "cifratura simmetrica di \"%s\" non riuscita: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [NOMEFILE]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [NOMEFILE]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "non è possibile usare --symmetric --encrypt con --s2k-mode 0\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "non è possibile usare --symmetric --encrypt in modalità %s\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [NOMEFILE]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [NOMEFILE]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [NOMEFILE]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "non è possibile usare --symmetric --sign --encrypt con --s2k-mode 0\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "non è possibile usare --symmetric --sign --encrypt in modalità %s\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [NOMEFILE]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [NOMEFILE]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [NOMEFILE]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [COMANDI]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [ID_UTENTE] [PORTACHIAVI]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "invio al server di chiavi non riuscito: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "ricezione dal server di chiavi non riuscita: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "esportazione della chiave non riuscita: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "ricerca nel server di chiavi non riuscita: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aggiornamento dal server di chiavi non riuscito: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "rimozione dell'armatura non riuscita: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "creazione dell'armatura non riuscita: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo di hash \"%s\" non valido\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[NOMEFILE]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Procedere e digitare il proprio messaggio...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "l'URL della politica di certificazione indicato non è valido\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "l'URL della politica di firma indicato non è valido\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "l'URL fornito per il server di chiavi principale non è valido\n"
@@@ -5881,131 -4692,104 +5881,131 @@@ msgstr "errore di lettura in \"%s\": %s
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sincronizzazione non riuscita: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "impossibile creare il blocco per \"%s\"\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "impossibile bloccare \"%s\"\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek non riuscita: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "trustdb rec %lu: scrittura non riuscita (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transazione del trustdb troppo grande\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "impossibile accedere a \"%s\": %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: la directory non esiste.\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "impossibile accedere a \"%s\": %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: creazione del record della versione non riuscita: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: è stato creato un trustdb non valido\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: creato il trustdb\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "Nota: non è possibile scrivere sul trustdb\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb non valido\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: creazione della tabella hash non riuscita: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, 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:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, 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:733
++#: g10/tdbio.c:745
#, 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:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek non riuscita: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: read non riuscita (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: non è un file di trustdb\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: record di versione con recnum %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versione %d del file non valida\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: errore durante la lettura del record libero: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: errore durante la scrittura del record dir: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: azzeramento di un record non riuscito: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: aggiunta in coda a un record non riuscita: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Errore: Il trustdb è danneggiato.\n"
diff --cc po/ja.po
index 5a1c694,76383a3..b80c175
--- a/po/ja.po
+++ b/po/ja.po
@@@ -7,10 -7,9 +7,10 @@@
#
msgid ""
msgstr ""
- "Project-Id-Version: gnupg 1.4.19\n"
+ "Project-Id-Version: gnupg 1.4.20\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
- "PO-Revision-Date: 2015-09-17 17:02+0900\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
+ "PO-Revision-Date: 2015-12-21 21:25+0900\n"
"Last-Translator: NIIBE Yutaka <gniibe at fsij.org>\n"
"Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\n"
"Language: ja\n"
@@@ -33,76 -29,54 +33,76 @@@ msgstr "%d ビット未満の素数は�
msgid "no entropy gathering module detected\n"
msgstr "エントロピー収集モジュールが、検出されていません\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "「%s」がロックできません: %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "「%s」のロックを待ちます...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "「%s」が開けません: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "「%s」を調べることができません: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "「%s」は普通のファイルではありません - 無視\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "注意: random_seed ファイルは空です\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "*警告*: 無効な長さの random_seed ファイル - 使いません\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "「%s」を読めません: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "注意: random_seed ファイルの更新をしません\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "「%s」が作成できません: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "「%s」に書き込めません: %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "「%s」をクローズできません: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "*警告*: セキュアでない乱数生成器を使っています!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -836,8 -647,6 +836,8 @@@ msgstr "このPINをもう一度入力�
msgid "PIN not correctly repeated; try again"
msgstr "PINが正しく繰り返されていません。もう一度"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "「%s」が開けません\n"
@@@ -1309,15 -1017,12 +1309,15 @@@ msgstr "
" --list-keys [名前] 鍵を表示\n"
" --fingerprint [名前] フィンガー・プリントを表示\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "バグは <gnupg-bugs at gnu.org> までご報告ください。\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "使い方: gpg [オプション] [ファイル] (ヘルプは -h)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1327,7 -1032,6 +1327,7 @@@ msgstr "
"署名、検査、暗号化や復号\n"
"デフォルトの操作は、入力データに依存\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1335,539 -1039,417 +1335,539 @@@ msgstr "
"\n"
"サポートしているアルゴリズム:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "公開鍵: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "暗号方式: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "ハッシュ: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "圧縮: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "使い方: gpg [オプション] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "対立するコマンド\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "=記号が、グループ定義「%s」内に見つかりません\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "*警告*: homedir 「%s」の安全でない所有\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "*警告*: 構成ファイル「%s」の安全でない所有\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "*警告*: homedir 「%s」の安全でない許可\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "*警告*: 構成ファイル「%s」の安全でない許可\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "*警告*: homedir 「%s」の安全でない上位ディレクトリ所有者\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "*警告*: 構成ファイル「%s」の安全でない上位ディレクトリ所有者\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "*警告*: homedir 「%s」の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "*警告*: 構成ファイル「%s」の安全でない上位ディレクトリ許可\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知の構成項目「%s」\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "鍵の一覧時にフォトIDを表示する"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "署名の一覧時にポリシーURLを表示する"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "署名の一覧時にすべての注釈を表示する"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "署名の一覧時にIETF標準注釈を表示する"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "署名の一覧時にユーザの注釈を表示する"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "署名の一覧時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "鍵の一覧時にユーザIDの有効性を表示する"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "鍵の一覧に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "鍵の一覧に失効した副鍵、期限切れとなった副鍵を表示する"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "鍵の一覧に鍵リングの名前を表示する"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "署名の一覧時に有効期限の日付を表示する"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr ""
"*注意*: 以前デフォルトだったオプション・ファイル「%s」は、無視されます\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "*注意*: デフォルトのオプション・ファイル「%s」がありません\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "オプション・ファイル「%s」: %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "「%s」からオプションを読み込みます\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "*注意*: 普通%sは使いません!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "「%s」は、有効な署名期限ではありません\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "「%s」は、有効な文字集合ではありません\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "鍵サーバのURLを解析不能\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "無効な鍵サーバ・オプションです\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無効なインポート・オプションです\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "無効なインポート・オプションです\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無効なエクスポート・オプションです\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "無効なエクスポート・オプションです\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無効な一覧オプションです\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "無効な一覧オプションです\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "署名の検証時にフォトIDを表示する"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "署名の検証時にポリシーURLを表示する"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "署名の検証時にすべての注釈を表示する"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "署名の検証時にIETF標準注釈を表示する"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "署名の検証時にユーザの注釈を表示する"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "署名の検証時に優先鍵サーバURLを表示する"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "署名の検証時にユーザIDの有効性を表示する"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr "署名の検証時に失効したユーザID、期限切れとなったユーザIDを表示する"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "署名の検証時に主なユーザIDだけをを表示する"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "PKAデータで署名を検証する"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "有効なPKAデータで署名の信用度を上昇させる"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無効な検証オプションです\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "無効な検証オプションです\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "exec-pathを%sに設定不能\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無効な auto-key-locate リストです\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "無効な auto-key-locate リストです\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "*警告*: プログラムはcoreファイルを作成することがあります!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "*警告*: %sは%sより優先\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%sは%sとともに使うことはできません!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%sは%sとともに使っても無意味です!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "*注意*: このバージョンで%sは利用できません\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "%s のため、セキュアでないメモリで実行しません\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2モードでは分遣署名かクリア署名だけしかできません\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2モードでは署名と暗号化を同時にできません\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2を指定したら、(パイプでなく) ファイルを指定せねばなりません。\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2モードのメッセージ暗号化では、IDEA暗号方式が必要です\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "選択された暗号アルゴリズムは、無効です\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "選択された圧縮アルゴリズムは、無効です\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "選択された証明書ダイジェスト・アルゴリズムは、無効です\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-neededは正の値が必要です\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neededは1より大きな値が必要です\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depthは1から255の範囲でなければなりません\n"
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無効なmin-cert-level。0か1か2か3でなければなりません\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "*注意*: 単純なS2Kモード(0)の使用には強く反対します\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無効なS2Kモード。0か1か3でなければなりません\n"
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "無効なデフォルトの優先指定\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "無効な個人用暗号方式の優先指定\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "無効な個人用ダイジェストの優先指定\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "無効な個人用圧縮の優先指定\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%sは%sで機能しません\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "暗号アルゴリズム「%s」を%sモードで使うことはできません\n"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "ダイジェスト・アルゴリズム「%s」を%sモードで使うことはできません\n"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "圧縮アルゴリズム「%s」を%sモードで使うことはできません\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信用データベースの初期化に失敗しました: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "*警告*: 公開鍵暗号を使わずに、受取人 (-r) を指定しています\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [ファイル名]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [ファイル名]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "「%s」の共通鍵暗号に失敗しました: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [ファイル名]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [ファイル名]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "--symmetric --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [ファイル名]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [ファイル名]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [ファイル名]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "--symmetric --sign --encryptを--s2k-mode 0で使うことはできません\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "--symmetric --sign --encryptを%sモードで使うことはできません\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [ファイル名]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [ファイル名]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [ファイル名]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key ユーザid"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key ユーザid"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key ユーザid [コマンド]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [ユーザid] [鍵リング]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "鍵サーバへの送信に失敗しました: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "鍵サーバからの受信に失敗しました: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "鍵の書出しに失敗しました: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "鍵サーバの検索に失敗しました: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "鍵サーバの更新に失敗しました: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "外装除去に失敗しました: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "外装に失敗しました: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "無効なハッシュ・アルゴリズム「%s」です\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[ファイル名]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "開始します。メッセージを打ってください ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "あたえられた証明書ポリシーURLは無効です\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "あたえられた署名ポリシーURLは無効です\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "指定された優先指定鍵サーバURLは無効です\n"
@@@ -2267,13 -1800,9 +2267,11 @@@ msgstr "ローカルだけとマーク�
msgid "repair damage from the pks keyserver during import"
msgstr "インポートの際、にpksキーサーバからのダメージを修正します"
+#: g10/import.c:104
- #, fuzzy
- #| msgid "do not update the trustdb after import"
msgid "do not clear the ownertrust values during import"
- msgstr "インポート後、信用データベースを更新しない"
+ msgstr "インポートの際、所有者信用の値をクリアしない"
+#: g10/import.c:107
msgid "do not update the trustdb after import"
msgstr "インポート後、信用データベースを更新しない"
@@@ -2422,17 -1921,13 +2420,16 @@@ msgstr "以下で、優先指定が更�
msgid "key %s: no user ID\n"
msgstr "鍵%s: ユーザIDがありません\n"
+#: g10/import.c:819
- #, fuzzy, c-format
- #| msgid "skipped \"%s\": %s\n"
+ #, c-format
msgid "key %s: %s\n"
- msgstr "\"%s\"をスキップします: %s\n"
+ msgstr "鍵 %s: %s\n"
+#: g10/import.c:820 g10/import.c:1212
msgid "rejected by import filter"
- msgstr ""
+ msgstr "インポート・フィルタで拒否されました"
+#: g10/import.c:849
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "鍵%s: PKSの副鍵変造を修復\n"
@@@ -2552,13 -2023,10 +2549,12 @@@ msgstr "鍵%s: \"%s\" %d個のユーザ
msgid "key %s: \"%s\" not changed\n"
msgstr "鍵%s:\"%s\"変更なし\n"
+#: g10/import.c:1211
- #, fuzzy, c-format
- #| msgid "secret key \"%s\" not found: %s\n"
+ #, c-format
msgid "secret key %s: %s\n"
- msgstr "秘密鍵\"%s\"が見つかりません: %s\n"
+ msgstr "秘密鍵 %s: %s\n"
+#: g10/import.c:1231 g10/import.c:1254
msgid "importing secret keys not allowed\n"
msgstr "秘密鍵のインポートは禁止です\n"
@@@ -3502,17 -2763,12 +3498,15 @@@ msgstr "
"*警告*: 主たるユーザIDがありません。このコマンドは、別な\n"
" ユーザIDが主になると仮定する場合があります。\n"
+#: g10/keyedit.c:3007
msgid "WARNING: Your encryption subkey expires soon.\n"
- msgstr ""
+ msgstr "*警告*: あなたの暗号副鍵はもうすぐ期限切れとなります。\n"
+#: g10/keyedit.c:3008
- #, 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"
+ msgstr "その有効期限も変更したいでしょう\n"
+#: g10/keyedit.c:3069
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@@ -4706,8 -3718,8 +4700,9 @@@ msgstr "未知の
#, c-format
msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
msgstr ""
+ "*警告*: 分遣署名ではありません。ファイル「%s」は検証され*ませんでした*!\n"
+#: g10/mainproc.c:2005
#, c-format
msgid "Can't check signature: %s\n"
msgstr "署名を検査できません: %s\n"
@@@ -4827,13 -3815,10 +4822,12 @@@ msgstr "あいまいなオプション�
msgid "unknown option `%s'\n"
msgstr "未知のオプション「%s」\n"
+#: g10/misc.c:1331
- #, fuzzy, c-format
- #| msgid "Unknown signature type `%s'\n"
+ #, c-format
msgid "Unknown weak digest '%s'\n"
- msgstr "不明の署名タイプ「%s」\n"
+ msgstr "不明の弱いダイジェスト'%s'\n"
+#: g10/openfile.c:88
#, c-format
msgid "File `%s' exists. "
msgstr "ファイル「%s」は既に存在します。"
@@@ -5560,13 -4394,10 +5554,12 @@@ msgstr "鍵%sは%lu秒未来にでき�
msgid "NOTE: signature key %s expired %s\n"
msgstr "注意: 署名鍵%sは%sに期限切れです\n"
+#: g10/sig-check.c:254
- #, fuzzy, c-format
- #| msgid "%s signature, digest algorithm %s\n"
+ #, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
- msgstr "%s署名、ダイジェスト・アルゴリズム %s\n"
+ msgstr "注意: アルゴリズム %s を用いた署名は拒否されました\n"
+#: g10/sig-check.c:345
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "未知のクリティカル・ビットにより、鍵%sの署名を不正とみなします\n"
@@@ -5708,131 -4512,104 +5701,131 @@@ msgstr "「%s」で読み込みエラ�
msgid "trustdb: sync failed: %s\n"
msgstr "信用データベース: 同期に失敗しました: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "「%s」のロックを作成できません\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "「%s」がロックできません\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信用データベース レコード%lu: シークに失敗しました: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信用データベース レコード%lu: 書き込みに失敗しました (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "信用データベースのトランザクションが大きすぎます\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "「%s」にアクセスできません: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: ディレクトリがありません!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "「%s」にアクセスできません: %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: バージョン・レコードの作成に失敗しました: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: 無効な信用データベースを作成\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: 信用データベースができました\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "注意: 信用データベースが、書き込み不能です\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: 無効な信用データベース\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: ハッシュ表の作成に失敗しました: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: バージョン・レコードの更新エラー: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: バージョン・レコードの読み込みエラー: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: バージョン・レコードの書き込みエラー: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信用データベース: シークに失敗しました: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信用データベース: 読み込みに失敗しました (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: 信用データベース・ファイルではありません\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: レコード番号%lu番のバージョン・レコード\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: 無効なファイル・バージョン%d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: 空きレコードの読み込みエラー: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: ディレクトリ・レコードの書き込みエラー: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: レコードの初期化に失敗しました: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: レコードの追加に失敗しました: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "エラー: 信用データベースが壊れています。\n"
diff --cc po/nb.po
index 8e2a626,eafef85..72fa272
--- a/po/nb.po
+++ b/po/nb.po
@@@ -10,7 -10,6 +10,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.3\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:11+0200\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"
@@@ -33,76 -29,54 +33,76 @@@ msgstr "kan ikke generere et primtall m
msgid "no entropy gathering module detected\n"
msgstr "ingen entropy-innsamlingsmodul ble oppdaget\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "kan ikke l�se �%s�: %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "venter p� l�sing av �%s� ...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan ikke �pne �%s�: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "kan ikke stat() �%s�: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "�%s� er ikke en vanlig fil - ignorert\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "merk: random_seed-fila er tom\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "ADVARSEL: ugyldig st�rrelse p� random_seed-fila - ikke brukt\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "kan ikke lese �%s�: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "merk: random_seed-fila ble ikke oppdatert\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "kan ikke opprette �%s�: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "kan ikke skrive �%s�: %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "kan ikke lukke �%s�: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "ADVARSEL: bruke usikker tilfeldig-tall-generator!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -840,8 -651,6 +840,8 @@@ msgstr "Gjenta denne PIN:
msgid "PIN not correctly repeated; try again"
msgstr "PIN ble ikke gjentatt korrekt; pr�v igjen"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "kan ikke �pne �%s�\n"
@@@ -1321,15 -1029,12 +1321,15 @@@ msgstr "
" --list-keys [navn] vise n�kler\n"
" --fingerprint [navn] vise fingeravtrykk\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Vennligst rapporter feil til <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1339,7 -1044,6 +1339,7 @@@ msgstr "
"signere, sjekke, kryptere eller dekryptere\n"
"standard operasjon avhenger av inputdata\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1347,63 -1051,50 +1347,63 @@@ msgstr "
"\n"
"St�ttede algoritmer:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Offentlig n�kkel: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Cipher: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Kompresjon: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "bruksm�te: gpg [valg] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "motstridende kommandoer\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "fant ingen �=�-tegn i gruppedefinisjonen �%s�\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� hjemmekatalogen �%s�\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ADVARSEL: utrygt eierskap p� konfigurasjonsfilen �%s�\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� hjemmekatalogen �%s�\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ADVARSEL: utrygge rettigheter p� konfigurasjonsfilen �%s�\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over hjemmekatalogen "
"�%s�\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1411,14 -1102,12 +1411,14 @@@ msgstr "
"ADVARSEL: utrygt eierskap p� katalogene p� niv�ene over konfigurasjonsfilen "
"�%s�\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over hjemmekatalogen "
"�%s�\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1426,469 -1115,362 +1426,469 @@@ msgstr "
"ADVARSEL: utrygge rettigheter p� katalogene p� niv�ene over "
"konfigurasjonsfilen �%s�\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "ukjent konfigurasjonspunkt �%s�\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr ""
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "vise navnet til n�kkelknippene i n�kkellister"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr ""
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "MERK: ingen standard valgfil �%s�\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "valgfil �%s�: %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "leser valg fra �%s�\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "MERK: %s er ikke for vanlig bruk!\n"
# Tenk litt p� denne du, Trond.
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "�%s� er ikke en gyldig signaturutg�else\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "�%s� er ikke et gyldig tegnsett\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "kunne ikke parse n�kkelserverens URL\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "ugyldige valg for n�kkelserver\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ugyldige importvalg\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "ugyldige importvalg\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ugyldige eksportvalg\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "ugyldige eksportvalg\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ugyldige listevalg\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "ugyldige listevalg\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr ""
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr ""
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr ""
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ugyldige valg for bekreftelse\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "ugyldige valg for bekreftelse\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kunne ikke sette exec-path til %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ADVARSEL: %s overstyrere %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s er ikke tillatt sammen med %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s er ikke fornuftig med %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr ""
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr ""
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "valgt krypteringsalgoritme er ugyldig\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "valg digestalgoritme er ugyldig\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "valgt kompresjonsalgoritme er ugyldig\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed m� v�re st�rre enn 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-neede m� v�re st�rre enn 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
- #: g10/gpg.c:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "ugyldig standard preferanser\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "ugyldig personlig cipherpreferanser\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "ugyldig personlig digestpreferanser\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "ugyldig personlig kompresjonspreferanser\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s virker ikke enn� med %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, 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"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, 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"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [filnavn]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [filnavn]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [filnavn]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnavn]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [filnavn]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnavn]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnavn]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnavn]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [filnavn]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [filnavn]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key brukerid"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key brukerid"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key brukerid [kommandoer]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [brukerid] [n�kkelknippe]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sending til n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "mottak fra n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "n�kkeleksport mislyktes: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "s�k p� n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "refresh p� n�kkelserver mislyktes: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dearmoring failed: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "enarmoring failed: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ugyldig hashalgoritme �%s�\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[filnavn]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Sett i gang og tast inn meldingen din ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
@@@ -5672,131 -4483,104 +5672,131 @@@ msgstr "lesefeil ved �%s�: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr ""
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "kan ikke opprette l�s for �%s�\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "kan ikke l�se �%s�\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr ""
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "kan ikke aksere �%s�: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr ""
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "kan ikke aksere �%s�: %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr ""
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr ""
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr ""
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr ""
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr ""
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr ""
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr ""
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr ""
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr ""
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr ""
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr ""
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr ""
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr ""
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr ""
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr ""
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr ""
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr ""
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr ""
diff --cc po/nl.po
index 107357e,b24ce55..0f223a6
--- a/po/nl.po
+++ b/po/nl.po
@@@ -30,7 -30,6 +30,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.6\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2014-11-24 12:23+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert at yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch at lists.debian.org>\n"
@@@ -54,80 -50,58 +54,80 @@@ msgstr "kan geen priemgetal genereren v
msgid "no entropy gathering module detected\n"
msgstr "geen module gevonden om entropie te verzamelen\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "kan `%s' niet vergrendelen: %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "wachten op het vergrendelen van `%s'...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan `%s' niet openen: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "kan status van `%s' niet vaststellen: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' is geen gewoon bestand - wordt genegeerd\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "noot: bestand random_seed is leeg\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
"WAARSCHUWING: ongeldige grootte van het bestand random_seed - wordt\n"
"niet gebruikt\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "kan `%s' niet lezen: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "noot: bestand random_seed wordt niet bijgewerkt\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "kan `%s' niet aanmaken: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "kan `%s' niet wegschrijven: %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "kan `%s' niet afsluiten: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
"WAARSCHUWING: er wordt een onveilige generator van willekeurige getallen "
"gebruikt!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -874,8 -685,6 +874,8 @@@ msgstr "Herhaal deze pincode:
msgid "PIN not correctly repeated; try again"
msgstr "Pincode was niet tweemaal hetzelfde; probeer opnieuw"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "kan `%s' niet openen\n"
@@@ -1364,15 -1072,12 +1364,15 @@@ msgstr "
" --list-keys [namen] toon sleutels\n"
" --fingerprint [namen] toon vingerafdrukken\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Fouten graag melden aan <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1382,7 -1087,6 +1382,7 @@@ msgstr "
"Onderteken, controleer, versleutel of ontcijfer\n"
"Standaardactie is afhankelijk van de gegevensinvoer\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1390,65 -1094,52 +1390,65 @@@ msgstr "
"\n"
"Ondersteunde algoritmes:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Publieke sleutel: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Versleutelingsalgoritme: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hashalgoritme: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Compressiealgoritme: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "gebruik: gpg [opties] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "conflicterende commando's\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "geen '='-teken gevonden in de groepsdefinitie `%s'\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "WAARSCHUWING: onveilige eigendomsinstellingen van thuismap `%s'\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"WAARSCHUWING: onveilige eigendomsinstellingen van configuratiebestand `%s'\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "WAARSCHUWING: toegangsrechten van thuismap `%s' zijn onveilig\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"WAARSCHUWING: toegangsrechten van configuratiebestand `%s' zijn onveilig\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"WAARSCHUWING: de eigendomsinstellingen van de map\n"
"waarin de thuismap `%s' zich bevindt, zijn onveilig\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1456,14 -1147,12 +1456,14 @@@ msgstr "
"WAARSCHUWING: de eigendomsinstellingen van de map waarin\n"
"configuratiebestand `%s' zich bevindt, zijn onveilig\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"WAARSCHUWING: de toegangsrechten van de map waarin\n"
"de thuismap `%s' zich bevindt, zijn onveilig\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1471,490 -1160,383 +1471,490 @@@ msgstr "
"WAARSCHUWING: de toegangsrechten van de map waarin\n"
"configuratiebestand `%s' zich bevindt, zijn onveilig\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "onbekend configuratie-item `%s'\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "toon identiteitsfoto's bij de lijst van sleutels"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "toon richtlijn-URL's bij de lijst van handtekeningen"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "toon alle notaties bij het weergeven van de lijst van handtekeningen"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
"toon IETF-standaardnotaties bij het weergeven van de lijst van handtekeningen"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
"toon door de gebruiker aangeleverde notaties\n"
"bij het weergeven van de lijst van handtekeningen"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"toon de URL van de voorkeurssleutelserver bij de lijst van handtekeningen"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "toon de geldigheid van de gebruikers-ID bij de lijst van sleutels"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"toon de ingetrokken en verlopen gebruikers-ID's bij de lijst van sleutels"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "toon de ingetrokken en vervallen subsleutels bij de lijst van sleutels"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "toon de naam van de sleutelring bij de lijst van sleutels"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "toon de vervaldata bij de lijst van handtekeningen"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOOT: oud bestand `%s' met standaardopties werd genegeerd\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOOT: geen bestand `%s' met standaardopties\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "optiebestand `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "lezen van opties uit `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOOT: %s is niet bedoeld voor normaal gebruik!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' is geen geldige vervaldatum voor handtekeningen\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' is geen geldige tekenset\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "kon de URL van de sleutelserver niet ontleden\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ongeldige sleutelserveropties\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "ongeldige sleutelserveropties\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ongeldige importopties\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "ongeldige importopties\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ongeldige exportopties\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "ongeldige exportopties\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ongeldige lijstopties\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "ongeldige lijstopties\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "toon identiteitsfoto's bij het controleren van de handtekening"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "toon richtlijn-URL's bij het controleren van de handtekening"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "toon alle notaties bij het controleren van de handtekening"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "toon IETF-standaardnotaties bij het controleren van de handtekening"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
"toon door de gebruiker aangeleverde notaties bij het controleren van de "
"handtekening"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"toon de URL van de voorkeurssleutelserver bij het controleren van de "
"handtekening"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr ""
"toon de geldigheid van het gebruikers-ID bij het controleren van de "
"handtekening"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"toon de ingetrokken en vervallen gebruikers-ID's\n"
"bij het controleren van de handtekening"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr ""
"toon enkel de primaire gebruikers-ID bij het controleren van de handtekening"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "valideereer ondertekeningen met PKA-gegevens"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
"verhoog de betrouwbaarheid van ondertekeningen met geldige PKA-gegevens"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ongeldige controleopties\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "ongeldige controleopties\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "kon het pad naar het programma niet instellen op %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: lijst voor het automatisch opzoeken van sleutels is ongeldig\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "lijst voor het automatisch opzoeken van sleutels is ongeldig\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "WAARSCHUWING: het programma zou een core-dump-bestand kunnen maken!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "WAARSCHUWING: %s heeft voorrang op %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s mag niet gebruikt worden met %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s is zinloos in combinatie met %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "NOOT: %s is niet beschikbaar in deze versie\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zal met onveilig geheugen niet werken wegens %s\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"enkel ontkoppelde ondertekeningen of handtekeningen in klare tekst\n"
"zijn mogelijk in de modus --pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "u kunt miet tegelijk ondertekenen en versleutelen in de modus --pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "U moet bestanden (en geen pipe) gebruiken in de modus --pgp2.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"om een bericht te versleutelen in de modus --pgp2\n"
"is het IDEA-versleutelingsalgoritme nodig\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "ongeldig versleutelingsalgoritme gekozen\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "ongeldig hashalgoritme gekozen\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "ongeldig compressiealgoritme gekozen\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "het gekozen hashalgoritme voor certificatie is ongeldig\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed moet groter zijn dan 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed moet groter zijn dan 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth moet liggen tussen 1 en 255\n"
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "ongeldig default-cert-level; moet 0, 1, 2 of 3 zijn\n"
- #: g10/gpg.c:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "ongeldig min-cert-level; moet 1, 2 of 3 zijn\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOOT: eenvoudige S2K-modus (0) wordt sterk afgeraden\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "ongeldige S2K-modus; moet 0, 1 of 3 zijn\n"
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "ongeldige standaardvoorkeuren\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "ongeldige voorkeuren in het persoonlijk versleutelingsalgoritme\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "ongeldige voorkeuren in het persoonlijk hashalgoritme\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "ongeldige voorkeuren in het persoonlijk compressiealgoritme\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s werkt nog niet met %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "u mag versleutelingsalgoritme `%s' niet gebruiken in %s-modus\n"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "u mag hashalgoritme `%s' niet gebruiken in %s-modus\n"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "u mag compressiealgoritme `%s' niet gebruiken in %s-modus\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr ""
"initialiseren van de TrustDB (database van vertrouwen) is mislukt: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"WAARSCHUWING: er werden ontvangers (-r) opgegeven\n"
"zonder dat versleuteling met een publieke sleutel toegepast wordt\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [bestandsnaam]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [bestandsnaam]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symmetrische versleuteling van `%s' is mislukt: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [bestandsnaam]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [bestandsnaam]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "u kunt --symmetric --encrypt niet gebruiken samen met --s2k-mode 0\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "u kunt --symmetric --encrypt niet in %s-modus gebruiken\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [bestandsnaam]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [bestandsnaam]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [bestandsnaam]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"u kunt --symmetric --sign --encrypt niet gebruiken samen met --s2k-mode 0\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "u kunt --symmetric --sign --encrypt niet in %s-modus gebruiken\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [bestandsnaam]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [bestandsnaam]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [bestandsnaam]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key gebruikers-id"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key gebruikers-id"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key gebruikers-id [commando's]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [gebruikers-id] [sleutelring]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "verzenden naar sleutelserver is mislukt: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "opvragen van sleutelserver is mislukt: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "sleutel exporteren is mislukt: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "opzoeking op sleutelserver is mislukt: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "verversen vanaf sleutelserver is mislukt: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ontmantelen van harnas is mislukt: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opnieuw aanmaken van harnas is mislukt: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ongeldig hashalgoritme `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[bestandsnaam]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "U kunt uw bericht typen ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "de opgegeven URL voor certificeringsrichtlijnen is ongeldig\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "de opgegeven URL voor ondertekeningsrichtlijnen is ongeldig\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "de opgegeven URL voor de voorkeurssleutelserver is ongeldig\n"
@@@ -6009,136 -4820,109 +6009,136 @@@ msgstr "leesfout in `%s': %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "betrouwbaarheidsdatabank (trustdb): synchronisatie mislukt: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "kan geen grendel maken voor `%s'\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "kan `%s' niet vergrendelen\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr ""
"betrouwbaarheidsdatabank (trustdb): element %lu: lseek is mislukt: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr ""
"betrouwbaarheidsdatabank (trustdb): element %lu:\n"
"wegschrijven is mislukt (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "betrouwbaarheidsdatabank (trustdb): transactie is te groot\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "krijg geen toegang tot `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: map bestaat niet!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "krijg geen toegang tot `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: het registreren van de versie is mislukt: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ongeldige betrouwbaarheidsdatabank (trustdb) aangemaakt\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: betrouwbaarheidsdatabank (trustdb) aangemaakt\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr ""
"NOOT: er kan niet geschreven worden in de betrouwbaarheidsdatabank "
"(trustdb)\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ongeldige betrouwbaarheidsdatabank (trustdb)\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: aanmaken van de hashtabel is mislukt: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: fout bij het bijwerken van de registratie van de versie: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: fout bij het lezen van de registratie van de versie: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: fout bij het maken van een registratie van de versie: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "betrouwbaarheidsdatabank (trustdb): lseek is mislukt: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "betrouwbaarheidsdatabank (trustdb): lezen is mislukt (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: bestand is geen betrouwbaarheidsdatabank (trustdb)\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versieregistratie met nummer %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: ongeldige bestandsversie %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: fout bij het lezen van vrije registratie: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: fout bij het wegschrijven van de registratie van de map: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: fout bij het op nul zetten van een registratie: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: het toevoegen van een registratie is mislukt: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Fout: de betrouwbaarheidsdatabank (trustdb) is beschadigd.\n"
diff --cc po/pl.po
index dd1c89d,62531c6..e784a1a
--- a/po/pl.po
+++ b/po/pl.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg-1.4.18\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2014-11-21 20:41+0100\n"
"Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@@ -30,79 -26,57 +30,79 @@@ msgstr "nie można wygenerować liczby
msgid "no entropy gathering module detected\n"
msgstr "moduł gromadzenia entropii nie został wykryty\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "nie można zablokować ,,%s'': %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "oczekiwanie na blokadę ,,%s''...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nie można otworzyć ,,%s'': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "nie można sprawdzić ,,%s'': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr ",,%s'' nie jest zwykłym plikiem - zostaje pominięty\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "uwaga: plik random_seed jest pusty\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
"OSTRZEŻENIE: niewłaściwy rozmiar pliku random_seed - nie zostanie użyty\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "nie można odczytać ,,%s'': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nie można utworzyć ,,%s'': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "nie można zapisać ,,%s'': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "nie można zamknąć ,,%s'': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
"OSTRZEŻENIE: używany generator liczb losowych\n"
"nie jest kryptograficznie bezpieczny!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -844,8 -655,6 +844,8 @@@ msgstr "Powtórz PIN:
msgid "PIN not correctly repeated; try again"
msgstr "PIN nie został poprawnie powtórzony; jeszcze jedna próba"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "nie można otworzyć ,,%s''\n"
@@@ -1324,15 -1032,12 +1324,15 @@@ msgstr "
" --list-keys [nazwy] pokazanie kluczy\n"
" --fingerprint [nazwy] pokazanie odcisków kluczy\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Błędy prosimy zgłaszać na adres <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Wywołanie: gpg [opcje] [pliki] (-h podaje pomoc)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1342,7 -1047,6 +1342,7 @@@ msgstr "
"podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n"
"domyślnie wykonywana operacja zależy od danych wejściowych\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1350,65 -1054,52 +1350,65 @@@ msgstr "
"\n"
"Obsługiwane algorytmy:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Asymetryczne: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Symetryczne: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Skrótów: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Kompresji: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "wywołanie: gpg [opcje]"
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "sprzeczne polecenia\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "OSTRZEŻENIE: niebezpieczne prawa własności katalogu domowego ,,%s''.\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"OSTRZEŻENIE: niebezpieczne prawa własności do pliku konfiguracji ,,%s''.\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu domowego ,,%s''\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"OSTRZEŻENIE: niebezpieczne prawa dostępu do pliku konfiguracji ,,%s''.\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"OSTRZEŻENIE: niebezpieczne prawa własności do katalogu nadrzędnego do\n"
" domowego ,,%s''\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1416,14 -1107,12 +1416,14 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa własności do katalogu\n"
" zawierającego plik konfiguracji ,,%s''\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu nadrzędnego do\n"
" domowego ,,%s''\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1431,473 -1120,366 +1431,473 @@@ msgstr "
"OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu\n"
" zawierającego plik konfiguracji ,,%s''\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "nieznana opcja konfiguracji ,,%s''\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "okazywanie zdjęć w liście kluczy"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "pokazywanie URL-i regulaminów w liście podpisów"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "pokazywanie wszystkich adnotacji w liście podpisów"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "pokazywanie adnotacji standardu IETF w liście podpisów"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "pokazywanie adnotacji użytkownika w liście podpisów"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "pokazywanie URL-i preferowanych serwerów kluczy w liście podpisów"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "pokazywanie poziomu ważności identyfikatora w liście kluczy"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "pokazywanie unieważnionych i wygasłych identyfikatorów w liście kluczy"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "pokazywanie unieważnionych i wygasłych podkluczy w liście"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "pokazywanie nazwy zbioru kluczy w liście kluczy"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "pokazywanie dat wygaśnięcia w liście podpisów"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "UWAGA: stary domyślny plik opcji ,,%s'' został zignorowany\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "UWAGA: brak domyślnego pliku opcji ,,%s''\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "plik opcji ,,%s'': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "odczyt opcji z ,,%s''\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "UWAGA: %s nie jest do normalnego użytku!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr ",,%s'' nie jest poprawną datą wygasania ważności podpisu\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr ",,%s'' nie jest poprawną nazwą zestawu znaków\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "niezrozumiały URI serwera kluczy\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "niepoprawne opcje serwera kluczy\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "niepoprawne opcje wczytania kluczy\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "niepoprawne opcje eksportu kluczy\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: niepoprawne opcje listy kluczy\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "niepoprawne opcje listy kluczy\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "okazywanie zdjęć podczas sprawdzania podpisu"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "okazywanie URL-i do regulaminów podczas sprawdzania podpisu"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisu"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "pokazywanie adnotacji standardu IETF przy sprawdzaniu podpisu"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisu"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "pokazywanie URL-i wybranych serwerów kluczy"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "pokazywanie poziomów zaufania przy sprawdzaniu podpisu"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"okazywanie unieważnionych i wygasłych identyfikatorów przy sprawdzaniu "
"podpisu"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "pokazywanie tylko głównego identyfikatora przy sprawdzaniu podpisu"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "sprawdzanie podpisów z użyciem danych PKA"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "podnoszenie zaufania do podpisów na podstawie danych PKA"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "niepoprawne opcje sprawdzania\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, 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:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "niepoprawna lista auto-key-locate\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "OSTRZEŻENIE: program może stworzyć plik zrzutu pamięci!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie wolno używać %s z %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nie ma sensu w połączeniu z %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "UWAGA: %s nie jest dostępny w tej wersji\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "z powodu %s nie będzie wykonane w niezabezpieczonej pamięci\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"w trybie --pgp2 można składać tylko podpisy oddzielne lub dołączone do "
"tekstu\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "w trybie --pgp2 nie można jednocześnie szyfrować i podpisywać\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "w trybie --pgp2 trzeba używać plików a nie potoków.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "szyfrowanie wiadomości w trybie --pgp2 wymaga modułu szyfru IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "wybrany algorytm szyfrujący jest niepoprawny\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "wybrany algorytm kompresji jest niepoprawny\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "wartość completes-needed musi być większa od 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "wartość marginals-needed musi być większa od 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "niewłaściwe domyślne ustawienia\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "niewłaściwe ustawienia szyfrów\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "niewłaściwe ustawienia skrótów\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s jeszcze nie działa z %s!\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
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:3243
++#: g10/gpg.c:3248
#, c-format
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:3248
++#: g10/gpg.c:3253
#, c-format
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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [plik]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [plik]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "błąd szyfrowania symetrycznego ,,%s'': %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [plik]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [plik]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "w trybie --s2k-mode 0 nie można użyć --symmetric --encrypt\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "w trybie %s nie można użyć --symmetric --encrypt\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [plik]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [plik]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [plik]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "w trybie --s2k-mode 0 nie można użyć --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "w trybie %s nie można użyć --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [plik]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [plik]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [plik]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key nazwa użytkownika"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key nazwa użytkownika"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key nazwa użytkownika [polecenia]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "eksport kluczy nie powiódł się: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "opakowywanie ASCII nie powiodło się: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[nazwa pliku]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Wpisz tutaj swoją wiadomość ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "podany URL serwera klucza jest niepoprawny\n"
@@@ -5832,131 -4643,104 +5832,131 @@@ 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:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "nie można utworzyć blokady ,,%s''\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "nie można zablokować ,,%s''\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, 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:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "zbyt duże zlecenie dla bazy zaufania\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "nie ma dostępu do ,,%s'': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: katalog nie istnieje!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "nie ma dostępu do ,,%s'': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: stworzenie zapisu o wersji nie powiodło się: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: baza zaufania utworzona\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "UWAGA: nie można zapisywać bazy zaufania\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: niepoprawny plik bazy zaufania\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, 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:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: błąd przy uaktualnianiu numeru wersji: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: błąd odczytu numeru wersji: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: błąd zapisu numeru wersji: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "baza zaufania: funkcja lseek() zawiodła: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "baza zaufania: funkcja read() (n=%d) zawiodła: %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: to nie jest plik bazy zaufania\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: wpis wersji z numerem %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: niewłaściwa wersja pliku %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: błąd odczytu pustego wpisu: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: zerowanie rekordu nie powiodło się: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: dopisanie rekordu nie powiodło się: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Błąd: uszkodzona baza zaufania.\n"
diff --cc po/pt.po
index f824589,1cde13d..fe66654
--- a/po/pt.po
+++ b/po/pt.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:25+0200\n"
"Last-Translator: Pedro Morais <morais at kde.org>\n"
"Language-Team: pt <morais at kde.org>\n"
@@@ -32,77 -28,55 +32,77 @@@ msgstr "
msgid "no entropy gathering module detected\n"
msgstr "nenhum m�dulo de recolha de entropia detectado\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "imposs�vel abrir `%s'\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "a escrever chave privada para `%s'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "imposs�vel 'stat' a `%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "nota: random_seed est� vazia\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
"AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "imposs�vel ler `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "nota: ficheiro random_seed n�o actualizado\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "imposs�vel escrever `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "imposs�vel fechar `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -869,8 -680,6 +869,8 @@@ msgstr "Repita a frase secreta:
msgid "PIN not correctly repeated; try again"
msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
@@@ -1360,15 -1068,12 +1360,15 @@@ msgstr "
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Por favor comunique bugs para <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1378,7 -1083,6 +1378,7 @@@ msgstr "
"assina, verifica, cifra ou decifra\n"
"a opera��o por omiss�o depende dos dados de entrada\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1386,558 -1090,436 +1386,558 @@@ msgstr "
"\n"
"Algoritmos suportados:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Chave p�blica: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Cifra: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Dispers�o: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Compress�o: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "comandos em conflito\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, 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:1264
++#: g10/gpg.c:1269
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, 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:1282
++#: g10/gpg.c:1287
#, 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:1285
++#: g10/gpg.c:1290
#, 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:1291
++#: g10/gpg.c:1296
#, 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:1294
++#: g10/gpg.c:1299
#, 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:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "criado um novo ficheiro de configura��o `%s'\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "mostrar em que porta-chave a chave est�"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
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:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "ficheiro de op��es `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "a ler op��es de `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, 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:2569
++#: g10/gpg.c:2574
#, 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:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "n�o consegui processar a URI do servidor de chaves\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "op��es de importa��o inv�lidas\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, 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:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "op��es de exporta��o inv�lidas\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, 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:2850
++#: g10/gpg.c:2855
#, 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:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um ficheiro core!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVISO: %s sobrep�e %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
#, 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:3132
++#: g10/gpg.c:3137
#, 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:3135
++#: g10/gpg.c:3140
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:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "prefer�ncias por omiss�o inv�lidas\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, 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:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [nome_do_ficheiro]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "decifragem falhou: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [nome_do_ficheiro]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nome_do_ficheiro]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_ficheiro]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_ficheiro]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizador"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizador"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizador [comandos]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualiza��o da chave secreta falhou: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de dispers�o inv�lido `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[nome_do_ficheiro]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Digite a sua mensagem ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
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:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@@ -5959,131 -4770,104 +5959,131 @@@ 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:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "imposs�vel criar `%s': %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, 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:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transa��o de base de dados de confian�a muito grande\n"
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "imposs�vel fechar `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: diretoria inexistente!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "imposs�vel fechar `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: falha ao criar registo de vers�o: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: base de dados de confian�a inv�lida criada\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: base de dados de confian�a criada\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "NOTA: n�o � poss�vel escrever na trustdb\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: base de dados de confian�a inv�lida\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: erro a actualizar registo de vers�o: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: erro ao ler registo de vers�o: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: erro ao escrever registo de vers�o: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "base de dados de confian�a: lseek falhou: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, 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:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: n�o � um base de dados de confian�a\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: registo de vers�o com recnum %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: vers�o de ficheiro inv�lida %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: erro ao ler registo livre: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: falha ao zerar um registo: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: falha ao anexar um registo: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: base de dados de confian�a criada\n"
diff --cc po/pt_BR.po
index 06a7c34,c42a774..6bcbae3
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -13,7 -13,6 +13,7 @@@ msgid "
msgstr ""
"Project-Id-Version: GnuPG 1.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:14+0200\n"
"Last-Translator:\n"
"Language-Team: ?\n"
@@@ -36,77 -32,55 +36,77 @@@ msgstr "
msgid "no entropy gathering module detected\n"
msgstr ""
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "imposs�vel abrir `%s'\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "escrevendo certificado privado para `%s'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, fuzzy, c-format
msgid "can't stat `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr ""
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr ""
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
#, fuzzy
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, fuzzy, c-format
msgid "can't read `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr ""
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, fuzzy, c-format
msgid "can't create `%s': %s\n"
msgstr "imposs�vel criar %s: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, fuzzy, c-format
msgid "can't write `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, fuzzy, c-format
msgid "can't close `%s': %s\n"
msgstr "imposs�vel abrir `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -879,8 -690,6 +879,8 @@@ msgstr "Repita a frase secreta:
msgid "PIN not correctly repeated; try again"
msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
@@@ -1370,15 -1078,12 +1370,15 @@@ msgstr "
" --list-keys [nomes] mostrar chaves\n"
" --fingerprint [nomes] mostrar impress�es digitais\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Por favor comunique bugs para <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1388,7 -1093,6 +1388,7 @@@ msgstr "
"assina, verifica, criptografa ou descriptografa\n"
"a opera��o padr�o depende dos dados de entrada\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1396,568 -1100,446 +1396,568 @@@ msgstr "
"\n"
"Algoritmos suportados:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr ""
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr ""
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr ""
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
#, fuzzy
msgid "Compression: "
msgstr "Coment�rio: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "uso: gpg [op��es] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "comandos conflitantes\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr ""
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, fuzzy, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, fuzzy, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, fuzzy, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, fuzzy, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "%s: novo arquivo de op��es criado\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "a URL de pol�tica dada � inv�lida\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "alterna entre listagem de chave secreta e p�blica"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, fuzzy, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "arquivo de op��es `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "lendo op��es de `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTA: %s n�o � para uso normal!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, 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:2569
++#: g10/gpg.c:2574
#, 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:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, fuzzy
msgid "could not parse keyserver URL\n"
msgstr "imposs�vel escrever para o chaveiro: %s\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "chaveiro inv�lido"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, fuzzy, c-format
msgid "%s:%d: invalid import options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
#, fuzzy
msgid "invalid import options\n"
msgstr "armadura inv�lida"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, fuzzy, c-format
msgid "%s:%d: invalid export options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
#, fuzzy
msgid "invalid export options\n"
msgstr "chaveiro inv�lido"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "armadura inv�lida"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "a URL de pol�tica dada � inv�lida\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s n�o � um conjunto de caracteres v�lido\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, 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:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "chaveiro inv�lido"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr ""
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "AVISO: `%s' � um arquivo vazio\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "AVISO: O programa pode criar um arquivo core!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr ""
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s n�o � permitido com %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "escrevendo certificado privado para `%s'\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
#, fuzzy
msgid "selected certification digest algorithm is invalid\n"
msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed deve ser maior que 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed deve ser maior que 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
#, fuzzy
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
- #: g10/gpg.c:3132
++#: g10/gpg.c:3137
#, fuzzy
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
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:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
#, fuzzy
msgid "invalid default preferences\n"
msgstr "lista prefer�ncias"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
#, fuzzy
msgid "invalid personal cipher preferences\n"
msgstr "lista prefer�ncias"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
#, fuzzy
msgid "invalid personal digest preferences\n"
msgstr "lista prefer�ncias"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
#, fuzzy
msgid "invalid personal compress preferences\n"
msgstr "lista prefer�ncias"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, fuzzy, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s n�o faz sentido com %s!\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, fuzzy, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [nome_do_arquivo]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "descriptografia falhou: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [nome_do_arquivo]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [nome_do_arquivo]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [nome_do_arquivo]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
#, fuzzy
msgid "--sign --symmetric [filename]"
msgstr "--symmetric [nome_do_arquivo]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [nome_do_arquivo]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [nome_do_arquivo]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key id-usu�rio"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key id-usu�rio"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-usu�rio [comandos]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, fuzzy, c-format
msgid "keyserver send failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, fuzzy, c-format
msgid "keyserver receive failed: %s\n"
msgstr "enumera��o de chaves secretas falhou: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, fuzzy, c-format
msgid "key export failed: %s\n"
msgstr "A gera��o de chaves falhou: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, fuzzy, c-format
msgid "keyserver search failed: %s\n"
msgstr "get_dir_record: search_record falhou: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, fuzzy, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "enumera��o de chaves secretas falhou: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "retirada de armadura falhou: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "cria��o de armadura falhou: %s\n"
# "hash" poderia ser "espalhamento", mas n�o fica claro
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritmo de hash inv�lido `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[nome_do_arquivo]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "V� em frente e digite sua mensagem ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
#, fuzzy
msgid "the given certification policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
#, fuzzy
msgid "the given signature policy URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "a URL de pol�tica dada � inv�lida\n"
@@@ -5910,131 -4721,104 +5910,131 @@@ msgstr "erro de leitura: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "banco de dados de confiabilidade: sincroniza��o falhou: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "imposs�vel criar %s: %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "imposs�vel abrir `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transa��o de banco de dados de confiabilidade muito grande\n"
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "imposs�vel abrir `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: diret�rio inexistente!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "imposs�vel abrir `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: falha ao criar registro de vers�o: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: banco de dados de confiabilidade inv�lido criado\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: banco de dados de confiabilidade criado\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr ""
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: banco de dados de confiabilidade inv�lido\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: erro atualizando registro de vers�o: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: erro lendo registro de vers�o: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: erro escrevendo registro de vers�o: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: n�o � um banco de dados de confiabilidade\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: registro de vers�o com recnum %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: vers�o de arquivo inv�lida %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: erro lendo registro livre: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: falha ao zerar um registro: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: falha ao anexar um registro: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: banco de dados de confiabilidade criado\n"
diff --cc po/ro.po
index ae60e10,9e02f26..3eaa135
--- a/po/ro.po
+++ b/po/ro.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.10\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:15+0200\n"
"Last-Translator: Laurențiu Buzdugan <lbuz at rolix.org>\n"
"Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@@ -34,80 -30,58 +34,80 @@@ msgstr "nu pot genera un număr prim c
msgid "no entropy gathering module detected\n"
msgstr "nu a fost găsit nici un modul de adunare a entropiei\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "nu pot bloca `%s': %s'\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "aștept blocarea pentru `%s...'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nu pot deschide `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "nu pot obține statistici `%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' nu este un fișier normal - ignorat\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "notă: fișier random_seed este gol\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr ""
"AVERTISMENT: dimensiune invalidă pentru fișierul random_seed - nu va fi "
"folosită\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "nu pot citi `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "notă: fișierul random_seed nu a fost actualizat\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nu pot crea `%s': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "nu pot scrie `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "nu pot închide `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
"AVERISMENT: este folosit un generator de numere aleatoare nesigur "
"(insecure)!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -847,8 -658,6 +847,8 @@@ msgstr "Repetați acest PIN:
msgid "PIN not correctly repeated; try again"
msgstr "PIN-ul nu a fost repetat corect; mai încercați o dată"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "nu pot deschide `%s'\n"
@@@ -1328,15 -1036,12 +1328,15 @@@ msgstr "
" --list-keys [nume] arată chei\n"
" --fingerprint [nume] arată amprente\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "Raportați bug-uri la <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Folosire: gpg [opțiuni] [fișiere] (-h pentru ajutor)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1346,7 -1051,6 +1346,7 @@@ msgstr "
"sign, check, encrypt sau decrypt\n"
"operațiunea implicită depinde de datele de intrare\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1354,67 -1058,54 +1354,67 @@@ msgstr "
"\n"
"Algoritmuri suportate:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Pubkey: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Cifru: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Compresie: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "folosire: gpg [opțiuni] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "comenzi în conflict\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
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:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigură (unsafe) pentru directorul home `%s'\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr ""
"AVERTISMENT: proprietate nesigură (unsafe) pentru fișier configurare `%s'\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni nesigure (unsafe) pentru fișier configurare `%s'\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1422,14 -1113,12 +1422,14 @@@ msgstr "
"AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fișier "
"configurare `%s'\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
"directorul home `%s'\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1437,477 -1126,370 +1437,477 @@@ msgstr "
"AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fișier "
"configurare `%s'\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "articol configurare necunoscut `%s'\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "afișează ID-urile photo la enumerarea cheilor"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "afișează politicile URL-urilor la enumerarea semnăturilor"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "arată toate notațiile la enumerarea semnăturilor"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "arată notațiile standard IETF la enumerarea semnăturilor"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "arată notațiile utilizatorilor la enumerarea semnăturilor"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr ""
"arată URL-urile serverelor de chei preferate la enumerarea semnăturilor"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "arată validitatea ID-ului utilizatorilor la enumerarea cheilor"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "arată ID-urile utilizator revocate și expirate la enumerarea cheilor"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "arată subcheile revocate și expirate la enumerarea cheilor"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "arată numele inelului de chei la enumerarea cheilor"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "arată datele de expirare la enumerarea semnăturilor"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "NOTĂ: fișier opțiuni implicite vechi `%s' ignorat\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "NOTĂ: nici un fișier opțiuni implicit `%s'\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "fișier opțiuni `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "citesc opțiuni din `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "NOTĂ: %s nu este pentru o folosire normală!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' nu este expirare de semnătură validă\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' nu este un set de carectere valid\n"
#
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "nu am putut interpreta URL-ul serverului de chei\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: opțiuni server de chei invalide\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "opțiuni server de chei invalide\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: opțiuni import invalide\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "opțiuni import invalide\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: opțiuni export invalide\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "opțiuni export invalide\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: opțiuni enumerare invalide\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "opțiuni enumerare invalide\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "arată ID-urile photo la verificare semnăturii"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "arată URL-urile politicilor la verificarea semnăturii"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "arată toate notațiile la verificarea semnăturii"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "arată toate notațiile standard IETF la verificarea semnăturii"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "arată toate notațiile utilizatorului la verificarea semnăturii"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "arată URL-urile serverelor de chei preferate la verificarea semnăturii"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "arată validitatea ID-ului utilizator la verificarea semnăturii"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"arată ID-urile utilizator revocate și expirate la verificarea semnăturii"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "arată numai ID-ul utilizator principal la verificarea semnăturii"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "validează semnăturile cu date PKA"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "ridică nivelul de încredere a semnăturilor cu date PKA valide"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: opțiuni verificare invalide\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "opțiuni verificare invalide\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nu pot seta cale-execuție ca %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: listă auto-key-locate invalidă\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "listă auto-key-locate invalidă\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "AVERTISMENT: programul ar putea crea un fișier core!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "AVERTISMENT: %s înlocuiește %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s nu este permis cu %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s nu are sens cu %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "NOTĂ: %s nu este disponibil în această sesiune\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"puteți crea doar semnături detașate sau în clar câtă vreme sunteți în modul "
"--pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr ""
"nu puteți semna și cifra în același timp câtă vreme sunteți în modul --pgp2\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"trebuie să folosiți fișiere (și nu un pipe) când lucrați cu modul --pgp2 "
"activat.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "cifrarea unui mesaj în modul --pgp2 necesită un cifru IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "algoritm cifrare selectat este invalid\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "algoritm rezumat selectat este invalid\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "algoritm compresie selectat este invalid\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "algoritm rezumat certificare selectat este invalid\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed trebuie să fie mai mare decât 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed trebuie să fie mai mare decât 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "NOTĂ: modul S2K simplu (0) este contraindicat cu insistență\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "preferințe implicite invalide\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "preferințe cifrare personale invalide\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "preferințe rezumat personale invalide\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "preferințe compresie personale invalide\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s nu merge încă cu %s!\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
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:3243
++#: g10/gpg.c:3248
#, c-format
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:3248
++#: g10/gpg.c:3253
#, c-format
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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "am eșuat să inițializez TrustDB:%s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [nume_fișier]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [nume_fișier]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "cifrarea simetrică a lui `%s' a eșuat: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [nume_fișier]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [nume_fișier]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
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:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [nume_fișier]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [nume_fișier]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [nume_fișier]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
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:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [nume_fișier]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [nume_fișier]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [nume_fișier]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key id-utilizator"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key id-utilizator"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id-utilizator [comenzi]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "trimitere server de chei eșuată: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "recepție server de chei eșuată: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "export cheie eșuat: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "căutare server de chei eșuată: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "actualizare server de chei eșuată: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "eliminarea armurii a eșuat: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "punerea armurii a eșuat: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "algoritm hash invalid `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[nume_fișier]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Dați-i drumul și scrieți mesajul ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "URL-ul politicii de certificare furnizat este invalid\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "URL-ul politicii de semnături furnizat este invalid\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@@ -5858,131 -4669,104 +5858,131 @@@ msgstr "eroare citire în `%s': %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sincronizarea a eșuat: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "nu pot crea încuietoare (lock) pentru `%s'\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "nu pot încuia (lock) `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek a eșuat: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "tranzacția trustdb prea mare\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "nu pot accesa `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: directorul nu există!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "nu pot accesa `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: am eșuat să creez înregistrare versiune: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: a fost creat trustdb invalid\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: a fost creat trustdb\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "NOTĂ: nu poate fi scris în trustdb\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: trustdb invalid\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: am eșuat să creez hashtable: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: eroare actualizare înregistrare versiune: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: eroare citire înregistrare versiune: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: eroare scriere înregistrare versiune: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: lseek a eșuat: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: citirea a eșuat (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: nu e un fișier trustdb\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: înregistrare versiune cu recnum %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: versiune fișier invalidă %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: eroare citire înregistrare liberă: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: eroare scriere înregistrare dir: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, 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:1460
++#: g10/tdbio.c:1470
#, 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:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Eroare: trustdb este coruptă\n"
diff --cc po/ru.po
index 191dd89,1394d98..6ffeb62
--- a/po/ru.po
+++ b/po/ru.po
@@@ -9,8 -9,7 +9,8 @@@ msgid "
msgstr ""
"Project-Id-Version: GnuPG 1.4.18\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
- "PO-Revision-Date: 2015-06-25 17:16+0200\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
+ "PO-Revision-Date: 2015-12-21 17:16+0200\n"
"Last-Translator: Ineiev <ineiev at gnu.org>\n"
"Language-Team: Russian <gnupg-ru at gnupg.org>\n"
"Language: ru\n"
@@@ -32,76 -28,54 +32,76 @@@ msgstr "не могу сгенерир�
msgid "no entropy gathering module detected\n"
msgstr "не найден модуль накопления энтропии\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "невозможно заблокировать `%s': %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "ожидание блокировки `%s'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "не могу открыть `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "не могу выполнить stat `%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' не обычный файл - игнорирую\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "замечание: файл random_seed пуст\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "ВНИМАНИЕ: недопустимый размер файла random_seed - не использую\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "не могу прочитать `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "замечание: файл random_seed не обновлен\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "не могу создать `%s': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "не могу записать `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "не могу закрыть `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "ВНИМАНИЕ: используется небезопасный генератор случайных чисел!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -333,12 -261,10 +333,12 @@@ msgstr "недопустимая стр
msgid "fingerprint on card does not match requested one\n"
msgstr "отпечаток на карте не совпадает с запрошенным\n"
+#: g10/app-openpgp.c:3092
#, c-format
msgid "card does not support digest algorithm %s\n"
- msgstr "карта не поддерживает хэш-функцию %s\n"
+ msgstr "карта не поддерживает хеш-функцию %s\n"
+#: g10/app-openpgp.c:3168
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "создано подписей: %lu\n"
@@@ -693,15 -539,12 +693,15 @@@ msgstr "Выберите, где хра
msgid "unknown key protection algorithm\n"
msgstr "неизвестный алгоритм защиты ключа\n"
+#: g10/card-util.c:1605
msgid "secret parts of key are not available\n"
- msgstr "закрытые части ключа недоступны\n"
+ msgstr "секретные части ключа недоступны\n"
+#: g10/card-util.c:1610
msgid "secret key already stored on a card\n"
- msgstr "закрытый ключ уже хранится на карте\n"
+ msgstr "секретный ключ уже хранится на карте\n"
+#: g10/card-util.c:1623
#, c-format
msgid "error writing key to card: %s\n"
msgstr "ошибка записи ключа на карту: %s\n"
@@@ -840,8 -651,6 +840,8 @@@ msgstr "Повторите ввод PIN
msgid "PIN not correctly repeated; try again"
msgstr "PIN повторен неверно; попробуйте еще раз"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "не могу открыть `%s'\n"
@@@ -874,11 -675,9 +874,11 @@@ msgstr "не могу выполнит�
msgid "Delete this key from the keyring? (y/N) "
msgstr "Удалить данный ключ из таблицы? (y/N) "
+#: g10/delkey.c:153
msgid "This is a secret key! - really delete? (y/N) "
- msgstr "Это закрытый ключ! - все равно удалить? (y/N) "
+ msgstr "Это секретный ключ! - все равно удалить? (y/N) "
+#: g10/delkey.c:163
#, c-format
msgid "deleting keyblock failed: %s\n"
msgstr "сбой при удалении блока ключа: %s\n"
@@@ -887,12 -685,10 +887,12 @@@
msgid "ownertrust information cleared\n"
msgstr "сведения о доверии владельцу сброшены\n"
+#: g10/delkey.c:204
#, c-format
msgid "there is a secret key for public key \"%s\"!\n"
- msgstr "имеется закрытый ключ для открытого ключа \"%s\"!\n"
+ msgstr "для открытого ключа \"%s\" есть секретный ключ!\n"
+#: g10/delkey.c:206
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "сначала удалите его командой \"--delete-secret-keys\".\n"
@@@ -1070,11 -831,9 +1070,11 @@@ msgstr "удалить при эксп�
msgid "remove as much as possible from key during export"
msgstr "удалить как можно больше из ключа при экспорте"
+#: g10/export.c:323
msgid "exporting secret keys not allowed\n"
- msgstr "экспорт закрытых ключей не разрешен\n"
+ msgstr "экспорт секретных ключей не разрешен\n"
+#: g10/export.c:352
#, c-format
msgid "key %s: not protected - skipped\n"
msgstr "ключ %s: не защищен - пропущен\n"
@@@ -1098,12 -853,10 +1098,12 @@@ msgstr "перехожу к экспо�
msgid "failed to unprotect the subkey: %s\n"
msgstr "сбой снятия защиты с ключа: %s\n"
+#: g10/export.c:563
#, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n"
- msgstr "ВНИМАНИЕ: закрытый ключ %s не имеет простой контрольной суммы SK\n"
+ msgstr "ВНИМАНИЕ: у секретного ключа %s нет простой контрольной суммы SK\n"
+#: g10/export.c:596
msgid "WARNING: nothing exported\n"
msgstr "ВНИМАНИЕ: нечего экспортировать\n"
@@@ -1159,11 -900,9 +1159,11 @@@ msgstr "вывести и провер�
msgid "list keys and fingerprints"
msgstr "вывести список ключей и их отпечатков"
+#: g10/gpg.c:406
msgid "list secret keys"
- msgstr "вывести список закрытых ключей"
+ msgstr "вывести список секретных ключей"
+#: g10/gpg.c:407
msgid "generate a new key pair"
msgstr "создать новую пару ключей"
@@@ -1171,11 -909,9 +1171,11 @@@
msgid "remove keys from the public keyring"
msgstr "удалить ключи из таблицы открытых ключей"
+#: g10/gpg.c:410
msgid "remove keys from the secret keyring"
- msgstr "удалить ключи из таблицы закрытых ключей"
+ msgstr "удалить ключи из таблицы секретных ключей"
+#: g10/gpg.c:411
msgid "sign a key"
msgstr "подписать ключ"
@@@ -1231,11 -954,9 +1231,11 @@@ msgstr "сменить PIN карты
msgid "update the trust database"
msgstr "обновить таблицу доверия"
+#: g10/gpg.c:447
msgid "|algo [files]|print message digests"
- msgstr "|algo [files]|вывести хэши файлов"
+ msgstr "|algo [files]|вывести хеши файлов"
+#: g10/gpg.c:451 g10/gpgv.c:69
msgid ""
"@\n"
"Options:\n"
@@@ -1317,15 -1025,12 +1317,15 @@@ msgstr "
" --list-keys [имена] показать ключи\n"
" --fingerprint [имена] показать отпечатки\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr "О найденных ошибка сообщайте на <gnupg-bugs at gnu.org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1335,7 -1040,6 +1335,7 @@@ msgstr "
"подписать, проверить, зашифровать или расшифровать\n"
"операция по умолчанию зависит от входных данных\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1343,62 -1047,49 +1343,62 @@@ msgstr "
"\n"
"Поддерживаются следующие алгоритмы:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "С открытым ключом: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Симметричные шифры: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Хэш-функции: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Алгоритмы сжатия: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "использование: gpg [параметры] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "несовместимые команды\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "отсутствует знак = в определении группы `%s'\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к домашнему каталогу `%s'\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу конфигурации `%s'\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасный владелец каталога, содержащего домашний каталог `%s'\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1406,14 -1097,12 +1406,14 @@@ msgstr "
"ВНИМАНИЕ: небезопасный владелец каталога, содержащего файл конфигурации `"
"%s'\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
" содержащему домашний каталог `%s'\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1421,478 -1110,371 +1421,478 @@@ msgstr "
"ВНИМАНИЕ: небезопасные права доступа к каталогу,\n"
" содержащему файл конфигурации `%s'\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "неизвестный параметр в файле конфигурации `%s'\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "показать в списке ключей фотоидентификаторы"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "показать в списке подписей URL правил"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "показать в списке подписей все примечания"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "показать в списке подписей примечания стандарта IETF"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "показать в списке подписей пользовательские примечания"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "показать в списке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "показать в списке ключей действительность ID пользователя"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "показать в списке ключей отозванные и просроченные ID пользователей"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "показать в списке ключей отозванные и просроченные подключи"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "показать в списке ключей название таблицы ключей"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "показать в списке подписей сроки действия"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл конфигурации `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "чтение конфигурации из `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' недопустимый срок действия подписи\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' недопустимая таблица символов\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "не могу интерпретировать URL сервера ключей\n"
# test it
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
# test it
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "недопустимые параметры для сервера ключей\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: недопустимые параметры импорта\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "недопустимые параметры импорта\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: недопустимые параметры экспорта\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "недопустимые параметры экспорта\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: недопустимый список параметров\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "недопустимый список параметров\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "показать при проверке подписи фотоидентификаторы"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "показать при проверке подписи URL правил"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "показать при проверке подписей все примечания"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "показать при проверке подписей примечания стандарта IETF"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "показать при проверке подписей пользовательские примечания"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "показать при проверке подписей URL предпочтительных серверов ключей"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "показать при проверке подписей действительность ID пользователя"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показать при проверке подписей отозванные и просроченные ID пользователя"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "показать при проверке подписей только главный ID пользователя"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "проверить подписи по данным PKA"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "поднять доверие подписей с действительными данными PKA"
# test it
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: недопустимые параметры проверки \n"
# test it
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "недопустимые параметры проверки\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не могу определить путь запуска для %s\n"
# test it
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: недопустимый список auto-key-locate\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "недопустимый список auto-key-locate\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "ВНИМАНИЕ: возможно создание файла образа памяти!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "ВНИМАНИЕ: %s заместит %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s с %s недопустимо!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s с %s не имеет смысла!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "ЗАМЕЧАНИЕ: %s недоступен в данной версии\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не будет работать с небезопасной памятью из-за %s\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"в режиме --pgp2 можно сделать только отделенную или текстовую подпись\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "в режиме --pgp2 нельзя одновременно подписать и зашифровать\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"в режиме --pgp2 нужно использовать файлы (а не конвейер командной строки).\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "для шифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "выбран неверный алгоритм шифрования\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
- msgstr "выбрана неверная хэш-функция\n"
+ msgstr "выбрана неверная хеш-функция\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "выбран неверный алгоритм сжатия\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
- msgstr "выбрана неверная хэш-функция для сертификации\n"
+ msgstr "выбрана неверная хеш-функция для сертификации\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed должен быть больше 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed должен быть больше 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго противопоказан\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "недопустимые предпочтения по умолчанию\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "недопустимые персональные предпочтения шифра\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
- msgstr "недопустимые персональные предпочтения хэш-функции\n"
+ msgstr "недопустимые персональные предпочтения хеш-функции\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s пока не работает совместно с %s!\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
- msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
+ msgstr "Вы не можете использовать хеш-функцию `%s' в режиме %s\n"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "сбой инициализации таблицы доверия: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
"ключом\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [файл]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [файл]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "сбой симметричного шифрования `%s': %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [файл]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [файл]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "нельзя использовать --symmetric --encrypt в режиме %s\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [файл]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [файл]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [файл]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "нельзя использовать --symmetric --sign --encrypt в режиме %s\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [файл]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [файл]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [файл]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key [ID пользователя]"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key [ID пользователя]"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key [ID пользователя] [команды]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [ID пользователя] [таблица ключей]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "сбой при отправке на сервер ключей: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "сбой при получении с сервера ключей: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "сбой при экспорте ключа: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "сбой при поиске на сервере ключей: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "сбой при обновлении с сервера ключей: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "ошибка преобразования из текстового формата: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "ошибка преобразования в текстовый формат: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
- msgstr "недопустимая хэш-функция `%s'\n"
+ msgstr "недопустимая хеш-функция `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[файл]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Пишите сообщение ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "заданный URL правил сертификации неверен\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "заданный URL правил подписи неверен\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "заданный URL предпочтительного сервера ключей неверен\n"
@@@ -1904,13 -1484,10 +1904,13 @@@ msgstr "слишком много эл�
msgid "[User ID not found]"
msgstr "[ID пользователя не найден]"
+#: g10/getkey.c:510 g10/getkey.c:2764
#, c-format
msgid "key %s: secret key without public key - skipped\n"
- msgstr "ключ %s: закрытый ключ без открытого ключа - пропущен\n"
+ msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
+#: g10/getkey.c:1001 g10/getkey.c:1011 g10/getkey.c:1021 g10/getkey.c:1037
+#: g10/getkey.c:1052
#, c-format
msgid "automatically retrieved `%s' via %s\n"
msgstr "автоматически получили `%s' через %s\n"
@@@ -1921,12 -1497,10 +1921,12 @@@ msgid "Invalid key %s made valid by --a
msgstr ""
"Параметр --allow-non-selfsigned-uid сделал дефектный ключ %s пригодным\n"
+#: g10/getkey.c:2496 g10/keyedit.c:3786
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
- msgstr "нет закрытого подключа для открытого подключа %s - игнорируем\n"
+ msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
+#: g10/getkey.c:2717
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "использую подключ %s вместо главного ключа %s\n"
@@@ -1978,10 -1544,9 +1978,10 @@@ msgid "
msgstr ""
"Для построения Сети доверия GnuPG должен знать, к каким ключам\n"
"имеется абсолютное доверие - обычно это ключи, для которых у Вас есть\n"
- "закрытый ключ. Ответьте \"yes\" для присвоения абсолютного доверия\n"
+ "секретный ключ. Ответьте \"yes\" для присвоения абсолютного доверия\n"
"данному ключу\n"
+#: g10/helptext.c:60
msgid "If you want to use this untrusted key anyway, answer \"yes\"."
msgstr ""
"Если Вы хотите использовать данный недоверенный ключ - ответьте \"yes\"."
@@@ -2308,11 -1839,9 +2308,11 @@@ msgstr "не сбрасывать та�
msgid "do not update the trustdb after import"
msgstr "не обновлять таблицу доверия после импорта"
+#: g10/import.c:110
msgid "create a public key when importing a secret key"
- msgstr "создать открытый ключ при импорте закрытого ключа"
+ msgstr "создать открытый ключ при импорте секретного ключа"
+#: g10/import.c:113
msgid "only accept updates to existing keys"
msgstr "обновлять только существующие ключи"
@@@ -2380,22 -1896,18 +2380,22 @@@ msgstr " новых по�
msgid " new key revocations: %lu\n"
msgstr " новых отзывов ключей: %lu\n"
+#: g10/import.c:347
#, c-format
msgid " secret keys read: %lu\n"
- msgstr " считано закрытых ключей: %lu\n"
+ msgstr " считано секретных ключей: %lu\n"
+#: g10/import.c:349
#, c-format
msgid " secret keys imported: %lu\n"
- msgstr "импортировано закрытых ключей: %lu\n"
+ msgstr "импортировано секретных ключей: %lu\n"
+#: g10/import.c:351
#, c-format
msgid " secret keys unchanged: %lu\n"
- msgstr " неизмененных закрытых ключей: %lu\n"
+ msgstr " неизмененных секретных ключей: %lu\n"
+#: g10/import.c:353
#, c-format
msgid " not imported: %lu\n"
msgstr " не импортировано: %lu\n"
@@@ -2426,12 -1933,10 +2426,12 @@@ msgstr "алгоритмов для э�
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " \"%s\": предпочитает шифр %s\n"
+#: g10/import.c:712
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
- msgstr " \"%s\": предпочитает хэш-функцию %s\n"
+ msgstr " \"%s\": предпочитает хеш-функцию %s\n"
+#: g10/import.c:724
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " \"%s\": предпочитает сжатие %s\n"
@@@ -2585,41 -2059,33 +2585,41 @@@ msgstr "ключ %s: \"%s\" %d ID по�
msgid "key %s: \"%s\" not changed\n"
msgstr "ключ %s: \"%s\" не изменен\n"
+#: g10/import.c:1211
#, c-format
msgid "secret key %s: %s\n"
- msgstr "закрытый ключ %s: %s\n"
+ msgstr "секретный ключ %s: %s\n"
+#: g10/import.c:1231 g10/import.c:1254
msgid "importing secret keys not allowed\n"
- msgstr "импорт закрытого ключа не допускается\n"
+ msgstr "импорт секретного ключа не допускается\n"
+#: g10/import.c:1243
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
- msgstr "ключ %s: закрытый ключ с недопустимым шифром %d - пропущен\n"
+ msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
+#: g10/import.c:1271 g10/import.c:2541
#, c-format
msgid "no default secret keyring: %s\n"
- msgstr "нет основной таблицы закрытых ключей: %s\n"
+ msgstr "нет основной таблицы секретных ключей: %s\n"
+#: g10/import.c:1282
#, c-format
msgid "key %s: secret key imported\n"
- msgstr "ключ %s: импортирован закрытый ключ\n"
+ msgstr "ключ %s: импортирован секретный ключ\n"
+#: g10/import.c:1313
#, c-format
msgid "key %s: already in secret keyring\n"
- msgstr "ключ %s: уже есть в таблице закрытых ключей\n"
+ msgstr "ключ %s: уже есть в таблице секретных ключей\n"
+#: g10/import.c:1323
#, c-format
msgid "key %s: secret key not found: %s\n"
- msgstr "ключ %s: закрытый ключ не найден: %s\n"
+ msgstr "ключ %s: секретный ключ не найден: %s\n"
+#: g10/import.c:1353
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
@@@ -3076,15 -2451,12 +3076,15 @@@ msgstr "
msgid "This key is not protected.\n"
msgstr "Данный ключ не защищен.\n"
+#: g10/keyedit.c:1140 g10/keygen.c:3401 g10/revoke.c:535
msgid "Secret parts of primary key are not available.\n"
- msgstr "Закрытые части главного ключа отсутствуют.\n"
+ msgstr "Секретные части главного ключа отсутствуют.\n"
+#: g10/keyedit.c:1144 g10/keygen.c:3416
msgid "Secret parts of primary key are stored on-card.\n"
- msgstr "Закрытые части главного ключа сохранены на карте.\n"
+ msgstr "Секретные части главного ключа сохранены на карте.\n"
+#: g10/keyedit.c:1148 g10/keygen.c:3420
msgid "Key is protected.\n"
msgstr "Ключ защищен.\n"
@@@ -3098,10 -2468,9 +3098,10 @@@ msgid "
"Enter the new passphrase for this secret key.\n"
"\n"
msgstr ""
- "Введите новую фразу-пароль для данного закрытого ключа.\n"
+ "Введите новую фразу-пароль для данного секретного ключа.\n"
"\n"
+#: g10/keyedit.c:1187 g10/keygen.c:2005
msgid "passphrase not correctly repeated; try again"
msgstr "фраза-пароль повторена неверно; попробуйте еще раз"
@@@ -3209,11 -2553,9 +3209,11 @@@ msgstr "сменить срок дей�
msgid "flag the selected user ID as primary"
msgstr "пометить выбранный ID пользователя как главный"
+#: g10/keyedit.c:1409
msgid "toggle between the secret and public key listings"
- msgstr "переключение между просмотром открытых и закрытых ключей"
+ msgstr "переключение между просмотром открытых и секретных ключей"
+#: g10/keyedit.c:1412
msgid "list preferences (expert)"
msgstr "список предпочтений (экспертам)"
@@@ -3275,20 -2603,16 +3275,20 @@@ msgstr "
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "сжать непригодные ID пользователей и удалить все подписи из ключа"
+#: g10/keyedit.c:1572
#, c-format
msgid "error reading secret keyblock \"%s\": %s\n"
- msgstr "ошибка чтения закрытого блока ключа \"%s\": %s\n"
+ msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
+#: g10/keyedit.c:1590
msgid "Secret key is available.\n"
- msgstr "Закрытый ключ доступен.\n"
+ msgstr "Секретный ключ доступен.\n"
+#: g10/keyedit.c:1679
msgid "Need the secret key to do this.\n"
- msgstr "Для данного действия нужен закрытый ключ.\n"
+ msgstr "Для данного действия нужен секретный ключ.\n"
+#: g10/keyedit.c:1687
msgid "Please use the command \"toggle\" first.\n"
msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
@@@ -3427,12 -2721,10 +3427,12 @@@ msgstr "Выйти без сохран�
msgid "update failed: %s\n"
msgstr "сбой при обновлении: %s\n"
+#: g10/keyedit.c:2238
#, c-format
msgid "update secret failed: %s\n"
- msgstr "сбой при обновлений закрытого ключа: %s\n"
+ msgstr "сбой при обновлении секретного ключа: %s\n"
+#: g10/keyedit.c:2245
msgid "Key not changed so no update needed.\n"
msgstr "Ключ не изменялся - обновление не нужно.\n"
@@@ -3671,11 -2910,9 +3671,11 @@@ msgid "
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
+#: g10/keyedit.c:3584
msgid "Please remove selections from the secret keys.\n"
- msgstr "Снимите выделение с закрытых ключей.\n"
+ msgstr "Снимите выделение с секретных ключей.\n"
+#: g10/keyedit.c:3590
msgid "Please select at most one subkey.\n"
msgstr "Выделите не более одного подключа.\n"
@@@ -3691,11 -2925,9 +3691,11 @@@ msgstr "Смена срока дейс�
msgid "You can't change the expiration date of a v3 key\n"
msgstr "Нельзя изменить срок действия ключа v3\n"
+#: g10/keyedit.c:3662
msgid "No corresponding signature in secret ring\n"
- msgstr "Нет соответствующей подписи в таблице закрытых ключей\n"
+ msgstr "Нет соответствующей подписи в таблице секретных ключей\n"
+#: g10/keyedit.c:3747
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "подписывающий подключ %s уже перекрестно заверен\n"
@@@ -3739,13 -2962,11 +3739,13 @@@ msgstr "Продолжить (y/N)?
msgid "No user ID with index %d\n"
msgstr "Нет ID пользователя с индексом %d\n"
+#: g10/keyedit.c:4540
#, c-format
msgid "No user ID with hash %s\n"
- msgstr "Нет ID пользователя с хэшем %s\n"
+ msgstr "Нет ID пользователя с хешем %s\n"
# c-format
+#: g10/keyedit.c:4567
#, c-format
msgid "No subkey with index %d\n"
msgstr "Нет подключа с индексом %d\n"
@@@ -3803,11 -3012,9 +3803,11 @@@ msgstr "Вы отзываете сле�
msgid "Really create the revocation certificates? (y/N) "
msgstr "Действительно создать сертификат отзыва? (y/N) "
+#: g10/keyedit.c:4881
msgid "no secret key\n"
- msgstr "нет закрытого ключа\n"
+ msgstr "нет секретного ключа\n"
+#: g10/keyedit.c:4951
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "ID пользователя \"%s\" уже отозван\n"
@@@ -3841,11 -3042,9 +3841,11 @@@ msgstr "предпочтение `%s' �
msgid "too many cipher preferences\n"
msgstr "слишком много шифровых предпочтений\n"
+#: g10/keygen.c:273
msgid "too many digest preferences\n"
- msgstr "слишком много предпочтений для хэш-функций\n"
+ msgstr "слишком много предпочтений для хеш-функций\n"
+#: g10/keygen.c:275
msgid "too many compression preferences\n"
msgstr "слишком много предпочтений для методов сжатия\n"
@@@ -4176,10 -3315,9 +4176,10 @@@ msgid "
"You need a Passphrase to protect your secret key.\n"
"\n"
msgstr ""
- "Для защиты закрытого ключа необходима фраза-пароль.\n"
+ "Для защиты секретного ключа необходима фраза-пароль.\n"
"\n"
+#: g10/keygen.c:2006 g10/passphrase.c:819
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
@@@ -4218,41 -3352,33 +4218,41 @@@ msgstr "Создание ключа п�
msgid "writing public key to `%s'\n"
msgstr "сохранение открытого ключа в `%s'\n"
+#: g10/keygen.c:3101 g10/keygen.c:3269
#, c-format
msgid "writing secret key stub to `%s'\n"
- msgstr "сохранение заготовки закрытого ключа в `%s'\n"
+ msgstr "сохранение заготовки секретного ключа в `%s'\n"
+#: g10/keygen.c:3104 g10/keygen.c:3272
#, c-format
msgid "writing secret key to `%s'\n"
- msgstr "сохранение закрытого ключа в `%s'\n"
+ msgstr "сохранение секретного ключа в `%s'\n"
+#: g10/keygen.c:3255
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
+#: g10/keygen.c:3261
#, c-format
msgid "no writable secret keyring found: %s\n"
- msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
+ msgstr "нет доступной для записи таблицы секретных ключей: %s\n"
+#: g10/keygen.c:3279
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
+#: g10/keygen.c:3286
#, c-format
msgid "error writing secret keyring `%s': %s\n"
- msgstr "ошибка записи таблицы закрытых ключей `%s': %s\n"
+ msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
+#: g10/keygen.c:3309
msgid "public and secret key created and signed.\n"
- msgstr "открытый и закрытый ключи созданы и подписаны.\n"
+ msgstr "открытый и секретный ключи созданы и подписаны.\n"
+#: g10/keygen.c:3320
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"
@@@ -4589,12 -3645,10 +4589,12 @@@ msgstr "странный размер �
msgid "%s encrypted session key\n"
msgstr "сеансовый ключ зашифрован %s\n"
+#: g10/mainproc.c:304
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
- msgstr "фраза-пароль создана с незнакомой хэш-функцией %d\n"
+ msgstr "фраза-пароль создана с незнакомой хеш-функцией %d\n"
+#: g10/mainproc.c:385
#, c-format
msgid "public key is %s\n"
msgstr "открытый ключ %s\n"
@@@ -4741,12 -3764,10 +4741,12 @@@ msgstr "Подпись просроче
msgid "Signature expires %s\n"
msgstr "Подпись действительна до %s\n"
+#: g10/mainproc.c:1945
#, c-format
msgid "%s signature, digest algorithm %s\n"
- msgstr "подпись в %s форме, хэш-функция %s\n"
+ msgstr "подпись в %s форме, хеш-функция %s\n"
+#: g10/mainproc.c:1946
msgid "binary"
msgstr "двоичной"
@@@ -4824,17 -3830,14 +4824,17 @@@ msgstr "
"ВНИМАНИЕ: используется экспериментальный алгоритм симметричного шифрования "
"%s\n"
+#: g10/misc.c:343
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
- msgstr "ВНИМАНИЕ: используется экспериментальная хэш-функция %s\n"
+ msgstr "ВНИМАНИЕ: используется экспериментальная хеш-функция %s\n"
+#: g10/misc.c:350 g10/misc.c:456
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
- msgstr "ВНИМАНИЕ: хэш-функция %s не рекомендуется\n"
+ msgstr "ВНИМАНИЕ: хеш-функция %s не рекомендуется\n"
+#: g10/misc.c:458 g10/misc.c:473 g10/sig-check.c:101
#, c-format
msgid "please see %s for more information\n"
msgstr "за подробностями обращайтесь к %s\n"
@@@ -4889,13 -3882,10 +4889,12 @@@ msgstr "неоднозначный па
msgid "unknown option `%s'\n"
msgstr "неизвестный параметр `%s'\n"
+#: g10/misc.c:1331
- #, fuzzy, c-format
- #| msgid "Unknown signature type `%s'\n"
+ #, c-format
msgid "Unknown weak digest '%s'\n"
- msgstr "Неизвестный тип подписи `%s'\n"
+ msgstr "Неизвестный слабый хеш '%s'\n"
+#: g10/openfile.c:88
#, c-format
msgid "File `%s' exists. "
msgstr "Файл `%s' существует. "
@@@ -5017,9 -3983,8 +5016,9 @@@ msgid "
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr ""
- "Необходима фраза-пароль для доступа к закрытому ключу пользователя: \"%s\"\n"
+ "Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
+#: g10/passphrase.c:910
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u-битный ключ %s, ID %s, создан %s"
@@@ -5390,12 -4280,10 +5389,12 @@@ msgstr "нет подписанных �
msgid "can't open signed data `%s'\n"
msgstr "не могу открыть подписанные данные `%s'\n"
+#: g10/pubkey-enc.c:102
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
- msgstr "анонимный получатель; пробую закрытый ключ %s ...\n"
+ msgstr "анонимный получатель; пробую секретный ключ %s ...\n"
+#: g10/pubkey-enc.c:133
msgid "okay, we are the anonymous recipient.\n"
msgstr "Отлично, мы - анонимный получатель.\n"
@@@ -5414,12 -4299,10 +5413,12 @@@ msgid "WARNING: cipher algorithm %s no
msgstr ""
"ВНИМАНИЕ: алгоритм шифрования %s не найден в списке предпочтений получателя\n"
+#: g10/pubkey-enc.c:296
#, c-format
msgid "NOTE: secret key %s expired at %s\n"
- msgstr "ЗАМЕЧАНИЕ: закрытый ключ %s просрочен с %s\n"
+ msgstr "ЗАМЕЧАНИЕ: секретный ключ %s просрочен с %s\n"
+#: g10/pubkey-enc.c:302
msgid "NOTE: key has been revoked"
msgstr "ЗАМЕЧАНИЕ: ключ был отозван"
@@@ -5465,21 -4338,17 +5464,21 @@@ msgstr "Сертификат отзыв
msgid "no revocation keys found for \"%s\"\n"
msgstr "ключи отзыва для \"%s\" не найдены\n"
+#: g10/revoke.c:469
#, c-format
msgid "secret key \"%s\" not found: %s\n"
- msgstr "закрытый ключ \"%s\" не найден: %s\n"
+ msgstr "секретный ключ \"%s\" не найден: %s\n"
+#: g10/revoke.c:496
#, c-format
msgid "no corresponding public key: %s\n"
msgstr "нет соответствующего открытого ключа: %s\n"
+#: g10/revoke.c:507
msgid "public key does not match secret key!\n"
- msgstr "открытый ключ не соответствует закрытому!\n"
+ msgstr "открытый ключ не соответствует секретному!\n"
+#: g10/revoke.c:514
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "Создать сертификат отзыва данного ключа? (y/N) "
@@@ -5540,21 -4399,17 +5539,21 @@@ msgstr "(Пояснения отсут�
msgid "Is this okay? (y/N) "
msgstr "Все правильно? (y/N) "
+#: g10/seckey-cert.c:53
msgid "secret key parts are not available\n"
- msgstr "закрытая часть ключа недоступна\n"
+ msgstr "секретная часть ключа недоступна\n"
+#: g10/seckey-cert.c:59
#, c-format
msgid "protection algorithm %d%s is not supported\n"
msgstr "метод защиты %d%s не поддерживается\n"
+#: g10/seckey-cert.c:65
#, c-format
msgid "protection digest %d is not supported\n"
- msgstr "метод защиты %d не поддерживается\n"
+ msgstr "метод защиты хеша %d не поддерживается\n"
+#: g10/seckey-cert.c:266
msgid "Invalid passphrase; please try again"
msgstr "Неверная фраза-пароль; попробуйте еще раз"
@@@ -5582,25 -4432,20 +5581,25 @@@ msgid "cannot avoid weak key for symmet
msgstr ""
"невозможно избежать слабого ключа для симметричного шифра; %d попыток!\n"
+#: g10/seskey.c:218
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
- msgstr "DSA требует длины хэша, кратной 8 битам\n"
+ msgstr "DSA требует длины хеша, кратной 8 битам\n"
+#: g10/seskey.c:232
#, c-format
msgid "DSA key %s uses an unsafe (%u bit) hash\n"
- msgstr "Ключ DSA %s использует небезопасный (%u-битный) хэш\n"
+ msgstr "Ключ DSA %s использует небезопасный (%u-битный) хеш\n"
+#: g10/seskey.c:244
#, c-format
msgid "DSA key %s requires a %u bit or larger hash\n"
- msgstr "Ключ DSA %s требует %u-битного или более длинного хэша\n"
+ msgstr "Ключ DSA %s требует %u-битного или более длинного хеша\n"
+#: g10/sig-check.c:74
msgid "WARNING: signature digest conflict in message\n"
- msgstr "ВНИМАНИЕ: конфликт хэшей подписей в сообщении\n"
+ msgstr "ВНИМАНИЕ: конфликт хешей подписей в сообщении\n"
+#: g10/sig-check.c:99
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "ВНИМАНИЕ: подписывающий подключ %s не был перекрестно заверен\n"
@@@ -5641,13 -4480,10 +5640,12 @@@ msgstr "
msgid "NOTE: signature key %s expired %s\n"
msgstr "ЗАМЕЧАНИЕ: срок действия подписавшего ключа %s истек %s\n"
+#: g10/sig-check.c:254
- #, fuzzy, c-format
- #| msgid "%s signature, digest algorithm %s\n"
+ #, c-format
msgid "Note: signatures using the %s algorithm are rejected\n"
- msgstr "подпись в %s форме, хэш-функция %s\n"
+ msgstr "Замечание: подписи с использованием алгоритма %s не учитываются\n"
+#: g10/sig-check.c:345
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr ""
@@@ -5707,10 -4534,9 +5705,10 @@@ msgstr "
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr ""
- "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
+ "ВНИМАНИЕ: использование хеш-функции %s (%d) нарушает предпочтения "
"получателя\n"
+#: g10/sign.c:960
msgid "signing:"
msgstr "подпись:"
@@@ -5740,11 -4561,9 +5738,11 @@@ msgstr "пропущено \"%s\": ду
msgid "skipped \"%s\": %s\n"
msgstr "пропущено \"%s\": %s\n"
+#: g10/skclist.c:170
msgid "skipped: secret key already present\n"
- msgstr "пропущено: закрытый ключ уже имеется\n"
+ msgstr "пропущено: секретный ключ уже имеется\n"
+#: g10/skclist.c:185
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr ""
"это ключ Elgamal, созданный PGP, он не обеспечивает безопасность подписи!"
@@@ -5799,131 -4608,104 +5797,131 @@@ msgstr "ошибка чтения в `%
msgid "trustdb: sync failed: %s\n"
msgstr "таблица доверия: сбой синхронизации: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "невозможно создать блокировку для `%s'\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "невозможно заблокировать `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "таблица доверия, запись %lu: сбой lseek: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "таблица доверия, запись %lu: сбой записи (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "слишком длинная транзакция таблицы доверия\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "нет доступа к `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: каталог не существует!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "нет доступа к `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: сбой создания записи о версии: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: создана непригодная таблица доверия\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: создана таблица доверия\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "ЗАМЕЧАНИЕ: таблица доверия недоступна для записи\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: непригодная таблица доверия\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
- msgstr "%s: сбой создания таблицы хэшей: %s\n"
+ msgstr "%s: сбой создания таблицы хешей: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: ошибка обновления записи о версии: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: ошибка чтения записи о версии: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: ошибка сохранения записи о версии: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "таблица доверия: сбой lseek: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "таблица доверия: сбой чтения (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: не является файлом таблицы доверия\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: запись о версии с номером записи %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: неправильная версия файла %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: ошибка чтения свободной записи: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: ошибка внесения записи каталога: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: сбой обнуления записи: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: сбой добавления записи: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Ошибка: таблица доверия повреждена.\n"
@@@ -6150,19 -4887,15 +6148,19 @@@ msgstr "неизвестная верс
msgid "unknown pubkey algorithm"
msgstr "неизвестный алгоритм с открытым ключом"
+#: util/errors.c:57
msgid "unknown digest algorithm"
- msgstr "неизвестная хэш-функция"
+ msgstr "неизвестная хеш-функция"
+#: util/errors.c:58
msgid "bad public key"
msgstr "плохой открытый ключ"
+#: util/errors.c:59
msgid "bad secret key"
- msgstr "плохой закрытый ключ"
+ msgstr "плохой секретный ключ"
+#: util/errors.c:60
msgid "bad signature"
msgstr "подпись неверна"
@@@ -6198,15 -4923,12 +6196,15 @@@ msgstr "неправильный тек
msgid "no such user id"
msgstr "нет такого ID пользователя"
+#: util/errors.c:69
msgid "secret key not available"
- msgstr "закрытый ключ не найден"
+ msgstr "секретный ключ не найден"
+#: util/errors.c:70
msgid "wrong secret key used"
- msgstr "использован неправильный закрытый ключ"
+ msgstr "использован неправильный секретный ключ"
+#: util/errors.c:71
msgid "not supported"
msgstr "не поддерживается"
@@@ -6334,11 -5025,9 +6332,11 @@@ msgstr "не выполнено
msgid "unusable public key"
msgstr "непригодный открытый ключ"
+#: util/errors.c:105
msgid "unusable secret key"
- msgstr "непригодный закрытый ключ"
+ msgstr "непригодный секретный ключ"
+#: util/errors.c:106
msgid "keyserver error"
msgstr "ошибка сервера ключей"
diff --cc po/sk.po
index 2043b90,7820c9c..d1b713a
--- a/po/sk.po
+++ b/po/sk.po
@@@ -5,7 -5,6 +5,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.2.5\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:16+0200\n"
"Last-Translator: Michal Majer <mmajer at econ.umb.sk>\n"
"Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@@ -28,76 -24,54 +28,76 @@@ msgstr "nem�em vytvori� prvo��slo s d�
msgid "no entropy gathering module detected\n"
msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "nemo�no otvori� `%s'\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "nem�em otvori� `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "nem�em pou�i� pr�kaz stat na `%s': %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' nie je norm�lny s�bor - ignorovan�\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "pozn�mka: s�bor random_seed je pr�zdny\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "nem�em ��ta� `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "nem�em zapisova� do `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "nem�em zavrie� `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "VAROVANIE: pou�it� gener�tor n�hodn�ch ��sel nie je bezpe�n�!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -866,8 -677,6 +866,8 @@@ msgstr "Opakujte heslo:
msgid "PIN not correctly repeated; try again"
msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "nemo�no otvori� `%s'\n"
@@@ -1359,17 -1067,14 +1359,17 @@@ msgstr "
" --list-keys [men�] vyp�sa� k���e\n"
" --fingerprint [men�] vyp�sa� fingerprinty\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"Chyby ozn�mte, pros�m, na adresu <gnupg-bugs at gnu.org>.\n"
"Pripomienky k prekladu <sk-i18n at lists.linux.sk>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1379,7 -1084,6 +1379,7 @@@ msgstr "
"podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
"implicitn� oper�cie z�visia od vstupn�ch d�t\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1387,563 -1091,441 +1387,563 @@@ msgstr "
"\n"
"Podporovan� algoritmy:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Verejn� k���e: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "�ifry: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Kompresia: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "pou�itie: gpg [mo�nosti] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "konfliktn� pr�kazy\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, 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:1264
++#: g10/gpg.c:1269
#, 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:1267
++#: g10/gpg.c:1272
#, 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:1273
++#: g10/gpg.c:1278
#, 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:1276
++#: g10/gpg.c:1281
#, 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:1282
++#: g10/gpg.c:1287
#, 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:1285
++#: g10/gpg.c:1290
#, 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:1291
++#: g10/gpg.c:1296
#, 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:1294
++#: g10/gpg.c:1299
#, 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:1469
++#: g10/gpg.c:1474
#, fuzzy, c-format
msgid "unknown configuration item `%s'\n"
msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, 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:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, 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:1786
++#: g10/gpg.c:1791
#, c-format
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:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "s�bor s mo�nos�ami `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "��tam mo�nosti z `%s'\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, fuzzy, c-format
msgid "`%s' is not a valid character set\n"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
#, 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:2605
++#: g10/gpg.c:2610
#, fuzzy, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
#, fuzzy
msgid "invalid keyserver options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, fuzzy, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: neplatn� parameter pre import\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
#, fuzzy
msgid "invalid list options\n"
msgstr "neplatn� parameter pre import\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "%s nie je platn� znakov� sada\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, fuzzy, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
#, fuzzy
msgid "invalid verify options\n"
msgstr "neplatn� parameter pre export\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "nemo�no nastavi� exec-path na %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: neplatn� parameter pre export\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "VAROVANIE: program m�e vytvori� s�bor core!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VAROVANIE: %s prep�e %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "Nie je dovolen� pou��va� %s s %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s ned�va s %s zmysel!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, fuzzy, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "zapisujem tajn� k��� do `%s'\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"v m�de --pgp2 m�ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
"ako text\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
#, fuzzy
msgid "selected compression algorithm is invalid\n"
msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "vybran� hashovac� algoritmus je neplatn�\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
#, 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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
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:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "neplatn� defaultn� predvo�by\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s e�te nepracuje s %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, 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:3243
++#: g10/gpg.c:3248
#, 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:3248
++#: g10/gpg.c:3253
#, 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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "nem�em inicializova� datab�zu d�very: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [meno s�boru]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [meno s�boru]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, fuzzy, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "de�ifrovanie zlyhalo: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [meno s�boru]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
#, fuzzy
msgid "--symmetric --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [meno s�boru]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
#, fuzzy
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--sign --encrypt [meno s�boru]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [meno s�boru]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [meno s�boru]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [meno s�boru]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key id u��vate�a"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key id u��vate�a"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key id u��vate�a [pr�kazy]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "nepodarilo posla� k��� na server: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "nepodaril sa export k���a: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "nepodarilo sa n�js� server: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "aktualiz�cia servera zlyhala: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "neplatn� hashovac� algoritmus `%s'\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[meno s�boru]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Za�nite p�sa� svoju spr�vu ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
#, fuzzy
msgid "the given preferred keyserver URL is invalid\n"
msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@@ -5972,131 -4783,104 +5972,131 @@@ 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:103
++#: g10/tdbio.c:104
#, fuzzy, c-format
msgid "can't create lock for `%s'\n"
msgstr "nem�em vytvori� `%s': %s\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, fuzzy, c-format
msgid "can't lock `%s'\n"
msgstr "nemo�no otvori� `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, 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:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "transakcia s datab�zou d�very je pr�li� dlh�\n"
- #: g10/tdbio.c:520
- #, fuzzy, c-format
- msgid "can't access `%s': %s\n"
- msgstr "nem�em zavrie� `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: adres�r neexistuje!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, fuzzy, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "nem�em zavrie� `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: nepodarilo sa vytvori� z�znam verzie: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: vytvoren� neplatn� datab�za d�very\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: datab�za d�very vytvoren�\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "POZN�MKA: do trustdb nemo�no zapisova�\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: neplatn� datab�ze d�very\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: chyba pri aktualiz�cii z�znamu verzie: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: chyba pri ��tan� z�znamu verzie: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: chyba pri z�pise z�znamu verzie: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "datab�ze d�very: proced�ra lseek() zlyhala: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, 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:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: nie je s�bor datab�zy d�very\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: z�znam verzie s ��slom %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: neplatn� verzia s�boru %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, 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:1420
++#: g10/tdbio.c:1430
#, 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:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: vynulovanie z�znamu zlyhalo: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: pridanie z�znamu zlyhalo: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: datab�za d�very vytvoren�\n"
diff --cc po/sv.po
index a85c412,4945b76..ee4f030
--- a/po/sv.po
+++ b/po/sv.po
@@@ -24,7 -24,6 +24,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 2.0\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:17+0200\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@@ -48,76 -44,54 +48,76 @@@ msgid "no entropy gathering module dete
msgstr "ingen entropi-insamlingsmodul identifierades\n"
# se förra kommentaren
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "kan inte låsa \"%s\": %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "väntar på lås på \"%s\"...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "kan inte öppna \"%s\": %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "kan inte ta status på \"%s\": %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "\"%s\" är inte en vanlig fil - ignoreras\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "observera: filen random_seed är tom\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "VARNING: ogiltig storlek på filen random_seed - används inte\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "kan inte läsa \"%s\": %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "observera: filen random_seed är inte uppdaterad\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "kan inte skapa \"%s\": %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "kan inte skriva \"%s\": %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "kan inte stänga \"%s\": %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -865,8 -676,6 +865,8 @@@ msgid "PIN not correctly repeated; try
msgstr "PIN-kod repeterades inte korrekt; försök igen"
# se förra kommentaren
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "kan inte öppna \"%s\"\n"
@@@ -1350,18 -1058,15 +1350,18 @@@ msgstr "
"--list-keys [namn] visa nycklar\n"
"--fingerprint [namn] visa fingeravtryck\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"Rapportera fel till <gnupg-bugs at gnu.org>\n"
"Skicka synpunkter på översättningen till <tp-sv at listor.tp-sv.se>\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
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:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1371,7 -1076,6 +1371,7 @@@ msgstr "
"signera, kontrollera, kryptera eller dekryptera\n"
"standardåtgärden beror på inmatningsdata\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1379,63 -1083,50 +1379,63 @@@ msgstr "
"\n"
"Algoritmer som stöds:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Publik nyckel: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Chiffer: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Kontrollsumma: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Komprimering: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "användning: gpg [flaggor] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "motstridiga kommandon\n"
# Vad betyder detta?
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
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:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1443,13 -1134,11 +1443,13 @@@ msgstr "
"VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
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:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1457,483 -1146,376 +1457,483 @@@ msgstr "
"VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
"\"%s\"\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "okänd konfigurationspost \"%s\"\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "visa foto-id vid nyckellistning"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "visa policy-url:er vid signaturlistningar"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "visa alla notationer vid signaturlistningar"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "visa IETF-standardnotationer vid signaturlistningar"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "visa användarangivna notationer vid signaturlistningar"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "visa url:er till föredragna nyckelservrar vid signaturlistningar"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "visa giltighet för användaridentitet vid nyckellistningar"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "visa nyckelringens namn i nyckellistningar"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "visa utgångsdatum vid signaturlistningar"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "OBS: inställningsfilen \"%s\" saknas\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "inställningsfil \"%s\": %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "läser inställningar från \"%s\"\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "OBS: %s är inte för normal användning!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
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:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "\"%s\" är ingen giltig teckentabell\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "kunde inte tolka url till nyckelserver\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "ogiltiga flaggor för nyckelserver\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: ogiltiga importeringsflaggor\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "ogiltiga importflaggor\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: ogiltiga exportflaggor\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "ogiltiga exportinställningar\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: ogiltiga listflaggor\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "ogiltiga listflaggor\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "visa foto-id vid signaturvalidering"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "visa policy-url:er vid signaturvalidering"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "visa alla notationer vid signaturvalidering"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "visa IETF-standardnotationer vid signaturvalidering"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "visa användarangivna notationer vid signaturvalidering"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "visa url:er till föredragna nyckelserver vid signaturvalidering"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "visa giltighet för användaridentitet vid signaturvalidering"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "visa endast den primära användaridentiteten i signaturvalidering"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "validera signaturer med PKA-data"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "öka tillit på signaturer med giltigt PKA-data"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: ogiltiga flaggor för validering\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "ogiltiga flaggor för validering\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, 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:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
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:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "VARNING: %s gäller istället för %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s är inte tillåten tillsammans med %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, 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:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "OBSERVERA: %s är inte tillgänglig i den här versionen\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr ""
"du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
"i --pgp2-läge\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
# IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "den valda chifferalgoritmen är ogiltig\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "vald sammandragsalgoritm är ogiltig\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "vald komprimeringsalgoritm är ogiltig\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
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:3124
++#: g10/gpg.c:3129
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:3126
++#: g10/gpg.c:3131
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:3128
++#: g10/gpg.c:3133
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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
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:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "ogiltig inställning av föredragna krypteringsalgoritmer\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s fungerar ännu inte med %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
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:3243
++#: g10/gpg.c:3248
#, c-format
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:3248
++#: g10/gpg.c:3253
#, c-format
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:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [filnamn]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [filnamn]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [filnamn]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [filnamn]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
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:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [filnamn]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [filnamn]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [filnamn]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
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:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [filnamn]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [filnamn]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [filnamn]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key användaridentitet"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key användaridentitet"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key användaridentitet [kommandon]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "sändning till nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "hämtning från nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "export av nyckeln misslyckades: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "sökning på nyckelservern misslyckades: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "uppdatering av nyckeln från en nyckelserver misslyckades: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "misslyckades med att skapa ASCII-skal: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[filnamn]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Skriv ditt meddelande här ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@@ -5935,132 -4746,105 +5935,132 @@@ msgstr "läsfel i \"%s\": %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
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:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "kan inte låsa \"%s\"\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "tillitsdatabastransaktion för stor\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "kan inte komma åt \"%s\": %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: katalogen finns inte!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "kan inte komma åt \"%s\": %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: misslyckades med att skapa versionspost: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: ogiltig tillitsdatabas skapad\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: tillitsdatabas skapad\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: ogiltig tillitsdatabas\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: fel vid uppdatering av versionspost: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: fel vid läsning av versionspost: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: fel vid skrivning av versionspost: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "tillitsdatabas: lseek misslyckades: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: detta är inte en tillitsdatabasfil\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: versionspost med postnummer %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: ogiltig filversion %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: fel vid läsning av ledig post: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: fel vid läsning av katalogpost: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, 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:1460
++#: g10/tdbio.c:1470
#, 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:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: tillitsdatabas skapad\n"
diff --cc po/tr.po
index 50fb0be,f162a53..4ec3a5b
--- a/po/tr.po
+++ b/po/tr.po
@@@ -6,7 -6,6 +6,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:17+0200\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun at superonline.com>\n"
"Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@@ -30,76 -26,54 +30,76 @@@ msgstr "%d bitten daha küçük bir asa
msgid "no entropy gathering module detected\n"
msgstr "rasgele bayt elde etme modülü bulunamadı\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, fuzzy, c-format
msgid "can't lock `%s': %s\n"
msgstr "`%s' kiltlenemedi\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, fuzzy, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "gizli anahtarı `%s'e yazıyor\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "`%s' açılamıyor: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "`%s' durumlanamıyor: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "not: \"random_seed\" dosyası boş\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "\"%s\" okunamıyor: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "\"%s\" oluşturulamıyor: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "\"%s\" yazılamıyor: %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "\"%s\" kapatılamıyor: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -841,8 -652,6 +841,8 @@@ msgstr "Bu PIN'i tekrarlayın:
msgid "PIN not correctly repeated; try again"
msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "`%s' açılamadı\n"
@@@ -1323,17 -1031,14 +1323,17 @@@ msgstr "
" --list-keys [isimler] anahtarları listeler\n"
" --fingerprint [isimler] parmak izlerini gösterir\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"Yazılım hatalarını lütfen <gnupg-bugs at gnu.org> adresine,\n"
"çeviri hatalarını ise <gnu-tr at belgeler.org> adresine bildiriniz.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1343,7 -1048,6 +1343,7 @@@ msgstr "
"imzalama, kontrol, şifreleme veya çözme\n"
"öntanımlı işlem girilen veriye bağımlıdır\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1351,547 -1055,425 +1351,547 @@@ msgstr "
"\n"
"Desteklenen algoritmalar:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "GenAnah: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Şifre: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Hash: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Sıkıştırma: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "kullanımı: gpg [seçenekler] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "çelişen komutlar\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "grup tanımı '%s' içinde = işareti yok\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
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:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
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:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr ""
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr ""
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
#, fuzzy
msgid "show all notations during signature listings"
msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr ""
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr ""
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr ""
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr ""
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
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:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "seçenek dosyası \"%s\": %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "\"%s\"den seçenekler okunuyor\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "BİLGİ: %s normal kullanım için değil!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "anahtar sunucusu seçenekleri geçersiz\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "içselleştirme seçenekleri geçersiz\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "dışsallaştırma seçenekleri geçersiz\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: liste seçenekleri geçersiz\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "liste seçenekleri geçersiz\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr ""
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr ""
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
#, fuzzy
msgid "show all notations during signature verification"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr ""
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr ""
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "'%s' geçerli bir karakter kümesi değil\n"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr ""
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, 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:2850
++#: g10/gpg.c:2855
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr ""
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "UYARI: %s %s'i aşıyor\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s ile %s birlikte kullanılmaz!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s, %s ile etkisiz olur!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent bu oturumda kullanılamaz\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, 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:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "seçilen özümleme algoritması geçersiz\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "seçilen şifre algoritması geçersiz\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
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:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
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:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
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:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "öntanımlı tercihler geçersiz\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "kişisel şifre tercihleri geçersiz\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "kişisel özümleme tercihleri geçersiz\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s, %s ile henüz çalışmıyor\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
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:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
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:3357
++#: g10/gpg.c:3362
#, 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:3368
++#: g10/gpg.c:3373
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:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [dosyaismi]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [dosyaismi]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [dosyaismi]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [dosyaismi]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
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:3416
++#: g10/gpg.c:3421
#, 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:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [dosyaismi]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [dosyaismi]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
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:3467
++#: g10/gpg.c:3472
#, 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:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [DOSYA]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [dosyaismi]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [dosyaismi]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key kullanıcı-kimliği"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key kullanıcı-kimliği"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key kullanıcı-kimliği [komutlar]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, 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:3669
++#: g10/gpg.c:3674
#, 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:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "anahtar sunucusunda arama başarısız: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "zırhın kaldırılması başarısız: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "zırhlama başarısız: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "`%s' hash algoritması geçersiz\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[dosyaismi]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "İletinizi yazın ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "belirtilen sertifika güvence adresi geçersiz\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "belirtilen imza güvence adresi geçersiz\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@@ -5857,131 -4668,104 +5857,131 @@@ 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:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "`%s' için kilit oluşturulamıyor\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "`%s' kiltlenemedi\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, 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:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, 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:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "güvence veritabanı işlemi çok uzun\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "'%s' erişilemiyor: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: dizin yok!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "'%s' erişilemiyor: %s\n"
+
++#: g10/tdbio.c:570
#, 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:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: güvence veritabanı oluşturuldu\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: güvence veritabanı geçersiz\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: nitelemeli tablo oluşturulamadı: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, 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:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, 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:733
++#: g10/tdbio.c:745
#, 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:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "güvence veritabanı: erişim başarısız: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, 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:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: bir güvence veritabanı dosyası değil\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, 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:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: dosya sürümü %d geçersiz\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: serbest kaydı okuma hatası: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: dizin kaydını yazma hatası: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, 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:1460
++#: g10/tdbio.c:1470
#, 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:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s: güvence veritabanı oluşturuldu\n"
diff --cc po/uk.po
index 193d764,de46213..b83e18d
--- a/po/uk.po
+++ b/po/uk.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2014-11-15 18:41+0200\n"
"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
"Language-Team: Ukrainian <kde-i18n-uk at kde.org>\n"
@@@ -32,77 -28,55 +32,77 @@@ msgstr "неможливо створи
msgid "no entropy gathering module detected\n"
msgstr "не виявлено модуля збирання ентропії\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "не вдалося заблокувати «%s»: %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "очікуємо на блокування «%s»…\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "не вдалося відкрити «%s»: %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "не вдалося обробити «%s»: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "«%s» не є звичайним файлом — проігноровано\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "зауваження: файл random_seed є порожнім\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "УВАГА: некоректний розмір файла random_seed — не використано\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "не вдалося прочитати «%s»: %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "зауваження: файл random_seed не оновлено\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "не вдалося створити «%s»: %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "не вдалося записати «%s»: %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "не вдалося закрити «%s»: %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr ""
"УВАГА: використовуємо незахищений засіб генерації псевдовипадкових чисел!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -849,8 -660,6 +849,8 @@@ msgstr "Повторіть введен
msgid "PIN not correctly repeated; try again"
msgstr "Помилка під час повторного введення пінкоду, повторіть спробу"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "не вдалося відкрити «%s»\n"
@@@ -1340,17 -1048,14 +1340,17 @@@ msgstr "
" --list-keys [назви] показати ключі\n"
" --fingerprint [назви] показати відбитки\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"Будь ласка, надсилайте повідомлення про помилки на адресу <gnupg-bugs at gnu."
"org>.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "Використання: gpg [параметри] [файли] (-h — довідка)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1360,7 -1065,6 +1360,7 @@@ msgstr "
"Підписування, перевірка підписів, шифрування або розшифрування\n"
"Типова дія залежатиме від вхідних даних\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1368,65 -1072,52 +1368,65 @@@ msgstr "
"\n"
"Підтримувані алгоритми:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "Відкритий ключ: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "Шифр: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "Хеш: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "Стиснення: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "використання: gpg [параметри] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "несумісні команди\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "у визначенні групи «%s» немає знаку «=»\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "УВАГА: визначення власника домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "УВАГА: визначення власника у файлі налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до домашнього каталогу «%s» не є безпечним\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до файла налаштувань «%s» не є безпечним\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr ""
"УВАГА: визначення власника підлеглого каталогу домашнього каталогу «%s» не є "
"безпечним\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@@ -1434,14 -1125,12 +1434,14 @@@ msgstr "
"УВАГА: визначення власника у підлеглому каталозі, визначеному файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr ""
"УВАГА: визначення прав доступу до підлеглого каталогу домашнього каталогу "
"«%s» не є безпечним\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@@ -1449,491 -1138,384 +1449,491 @@@ msgstr "
"УВАГА: визначення прав доступу до підлеглого каталогу, визначеного файлом "
"налаштувань «%s», не є безпечним\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "невідомий пункт налаштувань «%s»\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "показувати фотоідентифікатори у списках ключів"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "показувати адреси правил у списках підписів"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "показувати всі примітки у списках підписів"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "показувати стандартні примітки IETF у списках підписів"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "показувати примітки користувача у списках підписів"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "показувати адреси основних серверів ключів у списках підписів"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "показувати чинність ідентифікаторів користувачів у списках ключів"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"ключів"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "показувати відкликані та застарілі підключі у списках ключів"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "показувати назву сховища ключів у списках ключів"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "показувати дати завершення строків дії у списку підписів"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "ЗАУВАЖЕННЯ: застарілий файл типових параметрів «%s» проігноровано\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "файл параметрів «%s»: %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "прочитати параметри з «%s»\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "ЗАУВАЖЕННЯ: %s не призначено для звичайного використання!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "«%s» не є коректним записом завершення строку дії підпису\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "«%s» не є коректним набором символів\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "не вдалося обробити адресу сервера ключів\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: некоректні параметри сервера ключів\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "некоректні параметри сервера ключів\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: некоректні параметри імпортування\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "некоректні параметри імпортування\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: некоректні параметри експортування\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "некоректні параметри експортування\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: некоректні параметри побудови списку\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "некоректні параметри побудови списку\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "показувати фотоідентифікатори під час перевірки підписів"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "показувати адреси правил під час перевірки підписів"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "показувати всі примітки під час перевірки підписів"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "показувати стандартні примітки IETF під час перевірки підписів"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "показувати вказані користувачем примітки під час перевірки підписів"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr ""
"показувати адреси основних серверів ключів у списках перевірки підписів"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr ""
"показувати чинність ідентифікаторів користувача під час перевірки підписів"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
"показувати відкликані та застарілі ідентифікатори користувачів у списках "
"перевірки підписів"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr ""
"показувати лише основний ідентифікатор користувача під час перевірки підписів"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "перевірити підписи за допомогою даних PKA"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "підняти рівень довіри до підписів з коректними даними PKA"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: некоректні параметри перевірки\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "некоректні параметри перевірки\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "не вдалося встановити шлях для запуску у значення %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: некоректний список auto-key-locate\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "некоректний список auto-key-locate\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "УВАГА: можливе створення дампу пам’яті програми!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "УВАГА: %s перевизначає %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s не можна використовувати разом з %s!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s є зайвим, якщо використано %s!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "ЗАУВАЖЕННЯ: %s недоступні у цій версії\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "не буде запущено з помилками у захисті пам’яті через %s\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "від’єднані та текстові підписи можна створювати лише у режимі --pgp2\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "у режимі --pgp2 не можна одночасно підписувати і зашифровувати дані\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr ""
"вам слід використовувати файли (не канали даних) під час роботи з увімкненим "
"--pgp2.\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr ""
"шифрування повідомлень у режимі --pgp2 потребує використання шифру IDEA\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "вибраний алгоритм шифрування є некоректним\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "вибраний алгоритм стискання є некоректним\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr ""
"вибраний алгоритм створення контрольних сум для сертифікації є некоректним\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "значення completes-needed має бути більшим за 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "значення marginals-needed має перевищувати 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "значення max-cert-depth має перебувати у діапазоні від 1 до 255\n"
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "некоректне значення min-cert-level; має бути 1, 2 або 3\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr ""
"ЗАУВАЖЕННЯ: наполегливо не рекомендуємо вам користуватися простим режимом "
"S2K (0)\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "некоректні типові параметри\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "некоректні особисті параметри шифрування\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "некоректні особисті параметри контрольної суми\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "некоректні особисті параметри стискання\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s ще не може працювати разом з %s\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм шифрування «%s» у режимі %s\n"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr ""
"не можна використовувати алгоритм створення контрольних сум «%s» у режимі "
"%s\n"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "не можна використовувати алгоритм стискання «%s» у режимі %s\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "не вдалося ініціалізувати базу даних надійності (TrustDB): %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr ""
"УВАГА: отримувачів (-r) вказано без використання шифрування відкритим "
"ключем\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [назва файла]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [назва файла]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "помилка під час спроби симетричного шифрування «%s»: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [назва файла]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [назва файла]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі --s2k-"
"mode 0\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --encrypt у режимі %s\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [назва файла]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [назва файла]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [назва файла]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі --"
"s2k-mode 0\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr ""
"не можна використовувати комбінацію --symmetric --sign --encrypt у режимі "
"%s\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [назва файла]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [назва файла]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [назва файла]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key user-id"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key user-id"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key user-id [команди]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [ідентифікатор користувача] [сховище ключів]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "помилка під час надсилання даних на сервер ключів: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "помилка під час спроби отримання даних з сервера ключів: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "помилка під час спроби експортування ключа: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "помилка пошуку на сервері ключів: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "помилка оновлення з сервера ключів: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "помилка перетворення з формату ASCII: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "помилка перетворення у формат ASCII: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "некоректний алгоритм хешування «%s»\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[назва файла]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "Почніть вводити ваше повідомлення...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "вказана адреса правил сертифікації є некоректною\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "вказана адреса правил підписування є некоректною\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "вказана адреса основного сервера ключів є некоректною\n"
@@@ -5888,131 -4699,104 +5888,131 @@@ msgstr "помилка читання �
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: помилка синхронізації: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "не вдалося створити блокування для «%s»\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "не вдалося заблокувати «%s»\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "запис trustdb %lu: помилка lseek: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "запис trustdb %lu: помилка запису (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "занадто велика операція trustdb\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "немає доступу до «%s»: %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: каталогу не існує!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "немає доступу до «%s»: %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: не вдалося створити запис щодо версії: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: створено некоректну trustdb\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: створено trustdb\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "ЗАУВАЖЕННЯ: запис до trustdb заборонено\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: некоректна trustdb\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: не вдалося створити таблицю хешів: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: помилка оновлення запису версії: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: помилка читання запису версії: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: помилка записування запису версії: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "trustdb: помилка lseek: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "trustdb: помилка читання (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: не є файлом trustdb\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: запис версії з номером запису %lu\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: некоректна версія файла %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: помилка під час спроби читання вільного запису: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: помилка записування запису каталогу (dir): %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: не вдалося обнулити запис: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: не вдалося додати запис: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "Помилка: trustdb пошкоджено.\n"
diff --cc po/zh_CN.po
index 9329828,e6d5f78..f845ba2
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -7,7 -7,6 +7,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.7\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2012-08-24 17:18+0200\n"
"Last-Translator: Meng Jie <zuxy.meng at gmail.com>\n"
"Language-Team: Chinese (simplified) <translation-team-zh-cn at lists."
@@@ -35,76 -31,54 +35,76 @@@ msgstr "少于 %d 位时不能生成质
msgid "no entropy gathering module detected\n"
msgstr "检测不到熵搜集模块\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "无法锁定‘%s’：%s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "等待‘%s’上的锁\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’： %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "无法获得文件‘%s’的信息： %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "‘%s’不是一个普通文件――已忽略\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "注意：随机数种子文件为空\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "警告：随机数种子文件大小无效――未使用\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "无法读取‘%s’：%s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "注意：随机数种子文件未被更新\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "无法建立‘%s’：%s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "无法写入‘%s’：%s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "无法关闭‘%s’：%s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "警告：正在使用不安全的随机数发生器！！\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -839,8 -650,6 +839,8 @@@ msgstr "再次输入此 PIN：
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符；请再试一次"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
@@@ -1308,17 -1016,14 +1308,17 @@@ msgstr "
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"请向 <gnupg-bugs at gnu.org> 报告程序缺陷。\n"
"请向 <i18n-zh at googlegroups.com> 反映简体中文翻译的问题。\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1328,7 -1033,6 +1328,7 @@@ msgstr "
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1336,538 -1040,416 +1336,538 @@@ msgstr "
"\n"
"支持的算法：\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "公钥："
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "对称加密："
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "散列："
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "压缩："
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "用法：gpg [选项] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告：用户目录‘%s’所有权不安全\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’所有权不安全\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告：用户目录‘%s’权限不安全\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’权限不安全\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意：没有默认配置文件‘%s’\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’：%s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意：一般情况下不会用到 %s！\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "在签名验证中只显示主用户标识"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s：%d：无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "注意：%s 本版本中不可用\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
- #: g10/gpg.c:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [文件名]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败：%s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [文件名]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[文件名]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@@ -5683,131 -4494,104 +5683,131 @@@ msgstr "读取‘%s’错误：%s\n
msgid "trustdb: sync failed: %s\n"
msgstr "信任度数据库：同步失败：%s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "不能为‘%s’创建锁定\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "无法锁定‘%s’\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "信任度数据库处理量过大\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "无法存取‘%s’：%s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s：目录不存在！\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "无法存取‘%s’：%s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s：建立版本记录失败：%s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s：建立了无效的信任度数据库\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s：建立了信任度数据库\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "注意：信任度数据库不可写入\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s：无效的信任度数据库\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s：建立散列表失败：%s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s：更新版本记录时出错： %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s：读取版本记录时出错： %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s：写入版本记录时出错：%s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信任度数据库：lseek 失败：%s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信任度数据库：read 失败(n=%d)：%s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s：不是一个信任度数据库文件\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s：记录编号为%lu的版本记录\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s：无效的文件版本%d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s：读取自由记录时出错：%s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s：写入目录记录时出错：%s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s：记录归零时失败：%s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s：附加记录时失败：%s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s：建立了信任度数据库\n"
diff --cc po/zh_TW.po
index d73c0cc,dc61180..90fcb27
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -9,7 -9,6 +9,7 @@@ msgid "
msgstr ""
"Project-Id-Version: gnupg 1.4.18\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
- "POT-Creation-Date: 2015-12-20 08:53+0100\n"
++"POT-Creation-Date: 2016-08-17 15:21+0200\n"
"PO-Revision-Date: 2014-11-21 23:17+0800\n"
"Last-Translator: Jedi Lin <Jedi at Jedi.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@@ -35,76 -31,54 +35,76 @@@ msgstr "無法產生少於 %d 位元的
msgid "no entropy gathering module detected\n"
msgstr "偵測不到亂數蒐集模組\n"
- #: cipher/random.c:426 cipher/random.c:604
++#: cipher/random.c:425 cipher/random.c:603
#, c-format
msgid "can't lock `%s': %s\n"
msgstr "無法鎖定 `%s': %s\n"
- #: cipher/random.c:431 cipher/random.c:610
++#: cipher/random.c:430 cipher/random.c:609
#, c-format
msgid "waiting for lock on `%s'...\n"
msgstr "正在等候 `%s' 鎖定...\n"
- #: cipher/random.c:474 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
- #: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1023 g10/gpg.c:3610
++#: cipher/random.c:473 g10/card-util.c:787 g10/dearmor.c:59 g10/dearmor.c:108
++#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1028 g10/gpg.c:3615
+#: g10/import.c:209 g10/keygen.c:2573 g10/keyring.c:1569 g10/openfile.c:193
+#: g10/openfile.c:395 g10/plaintext.c:505 g10/sign.c:780 g10/sign.c:973
+#: g10/sign.c:1087 g10/sign.c:1238 g10/tdbdump.c:139 g10/tdbdump.c:147
- #: g10/tdbio.c:553 g10/tdbio.c:602
++#: g10/tdbio.c:566 g10/tdbio.c:614
#, c-format
msgid "can't open `%s': %s\n"
msgstr "無法開啟 `%s': %s\n"
- #: cipher/random.c:484
++#: cipher/random.c:483
#, c-format
msgid "can't stat `%s': %s\n"
msgstr "無法取得檔案 `%s' 的資訊: %s\n"
- #: cipher/random.c:489
++#: cipher/random.c:488
#, c-format
msgid "`%s' is not a regular file - ignored\n"
msgstr "`%s' 不是一個標準的檔案 - 已略過\n"
- #: cipher/random.c:494 cipher/random.c:512
++#: cipher/random.c:493 cipher/random.c:511
msgid "note: random_seed file is empty\n"
msgstr "請注意: random_seed 檔案是空的\n"
- #: cipher/random.c:500 cipher/random.c:532
++#: cipher/random.c:499 cipher/random.c:531
msgid "WARNING: invalid size of random_seed file - not used\n"
msgstr "警告: random_seed 檔案大小無效 - 不予採用\n"
- #: cipher/random.c:520 cipher/random.c:527
++#: cipher/random.c:519 cipher/random.c:526
#, c-format
msgid "can't read `%s': %s\n"
msgstr "無法讀取 `%s': %s\n"
- #: cipher/random.c:570
++#: cipher/random.c:569
msgid "note: random_seed file not updated\n"
msgstr "請注意: random_seed 檔案未更新\n"
- #: cipher/random.c:623 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1022
++#: cipher/random.c:622 g10/card-util.c:833 g10/exec.c:479 g10/gpg.c:1027
+#: g10/keygen.c:3056 g10/keygen.c:3086 g10/keyring.c:1222 g10/keyring.c:1545
+#: g10/openfile.c:287 g10/openfile.c:410 g10/sign.c:798 g10/sign.c:1103
- #: g10/tdbio.c:549
++#: g10/tdbio.c:562
#, c-format
msgid "can't create `%s': %s\n"
msgstr "無法建立 `%s': %s\n"
- #: cipher/random.c:635 cipher/random.c:645
++#: cipher/random.c:634 cipher/random.c:644
#, c-format
msgid "can't write `%s': %s\n"
msgstr "無法寫入 `%s': %s\n"
- #: cipher/random.c:648
++#: cipher/random.c:647
#, c-format
msgid "can't close `%s': %s\n"
msgstr "無法關閉 `%s': %s\n"
- #: cipher/random.c:893
++#: cipher/random.c:892
msgid "WARNING: using insecure random number generator!!\n"
msgstr "警告: 正在使用不安全的隨機數字產生器!!\n"
- #: cipher/random.c:894
++#: cipher/random.c:893
msgid ""
"The random number generator is only a kludge to let\n"
"it run - it is in no way a strong RNG!\n"
@@@ -834,8 -645,6 +834,8 @@@ msgstr "請再次輸入個人識別碼
msgid "PIN not correctly repeated; try again"
msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
- #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3973 g10/keyring.c:375
++#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3977 g10/keyring.c:375
+#: g10/keyring.c:684 g10/verify.c:101 g10/verify.c:156
#, c-format
msgid "can't open `%s'\n"
msgstr "無法開啟 `%s'\n"
@@@ -1303,16 -1011,13 +1303,16 @@@ msgstr "
" --list-keys [名字] 顯示金鑰\n"
" --fingerprint [名字] 顯示指紋\n"
- #: g10/gpg.c:781 g10/gpgv.c:97
++#: g10/gpg.c:786 g10/gpgv.c:97
msgid "Please report bugs to <gnupg-bugs at gnu.org>.\n"
msgstr ""
"請向 <gnupg-bugs at gnu.org> 回報程式瑕疵, 向 <Jedi at Jedi.org> 回報翻譯瑕疵.\n"
- #: g10/gpg.c:798
++#: g10/gpg.c:803
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
- #: g10/gpg.c:801
++#: g10/gpg.c:806
msgid ""
"Syntax: gpg [options] [files]\n"
"Sign, check, encrypt or decrypt\n"
@@@ -1322,7 -1027,6 +1322,7 @@@ msgstr "
"簽署, 檢查, 加密, 解密\n"
"預設的操作會依輸入資料而定\n"
- #: g10/gpg.c:812
++#: g10/gpg.c:817
msgid ""
"\n"
"Supported algorithms:\n"
@@@ -1330,538 -1034,416 +1330,538 @@@ msgstr "
"\n"
"已支援的演算法:\n"
- #: g10/gpg.c:815
++#: g10/gpg.c:820
msgid "Pubkey: "
msgstr "公鑰: "
- #: g10/gpg.c:821 g10/keyedit.c:2323
++#: g10/gpg.c:826 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "編密法: "
- #: g10/gpg.c:827
++#: g10/gpg.c:832
msgid "Hash: "
msgstr "雜湊: "
- #: g10/gpg.c:833 g10/keyedit.c:2369
++#: g10/gpg.c:838 g10/keyedit.c:2369
msgid "Compression: "
msgstr "壓縮: "
- #: g10/gpg.c:912
++#: g10/gpg.c:917
msgid "usage: gpg [options] "
msgstr "用法: gpg [選項] "
- #: g10/gpg.c:1060
++#: g10/gpg.c:1065
msgid "conflicting commands\n"
msgstr "指令彼此矛盾\n"
- #: g10/gpg.c:1078
++#: g10/gpg.c:1083
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
- #: g10/gpg.c:1264
++#: g10/gpg.c:1269
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
- #: g10/gpg.c:1267
++#: g10/gpg.c:1272
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
- #: g10/gpg.c:1273
++#: g10/gpg.c:1278
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
- #: g10/gpg.c:1276
++#: g10/gpg.c:1281
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
- #: g10/gpg.c:1282
++#: g10/gpg.c:1287
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1285
++#: g10/gpg.c:1290
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
- #: g10/gpg.c:1291
++#: g10/gpg.c:1296
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1294
++#: g10/gpg.c:1299
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
- #: g10/gpg.c:1469
++#: g10/gpg.c:1474
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的組態項目 `%s'\n"
- #: g10/gpg.c:1562
++#: g10/gpg.c:1567
msgid "display photo IDs during key listings"
msgstr "列出金鑰時顯示照片 ID"
- #: g10/gpg.c:1564
++#: g10/gpg.c:1569
msgid "show policy URLs during signature listings"
msgstr "列出簽章時顯示原則 URL"
- #: g10/gpg.c:1566
++#: g10/gpg.c:1571
msgid "show all notations during signature listings"
msgstr "列出簽章時顯示所有的註記"
- #: g10/gpg.c:1568
++#: g10/gpg.c:1573
msgid "show IETF standard notations during signature listings"
msgstr "列出簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:1572
++#: g10/gpg.c:1577
msgid "show user-supplied notations during signature listings"
msgstr "列出簽章時顯示使用者提供的註記"
- #: g10/gpg.c:1574
++#: g10/gpg.c:1579
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:1576
++#: g10/gpg.c:1581
msgid "show user ID validity during key listings"
msgstr "列出金鑰時顯示使用者 ID 有效性"
- #: g10/gpg.c:1578
++#: g10/gpg.c:1583
msgid "show revoked and expired user IDs in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:1580
++#: g10/gpg.c:1585
msgid "show revoked and expired subkeys in key listings"
msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
- #: g10/gpg.c:1582
++#: g10/gpg.c:1587
msgid "show the keyring name in key listings"
msgstr "在金鑰清單中顯示鑰匙圈名稱"
- #: g10/gpg.c:1584
++#: g10/gpg.c:1589
msgid "show expiration dates during signature listings"
msgstr "列出簽章時顯示有效期限"
- #: g10/gpg.c:1786
++#: g10/gpg.c:1791
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
- #: g10/gpg.c:2053
++#: g10/gpg.c:2058
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "請注意: 沒有預設選項檔 `%s'\n"
- #: g10/gpg.c:2057
++#: g10/gpg.c:2062
#, c-format
msgid "option file `%s': %s\n"
msgstr "選項檔 `%s': %s\n"
- #: g10/gpg.c:2064
++#: g10/gpg.c:2069
#, c-format
msgid "reading options from `%s'\n"
msgstr "從 `%s' 讀取選項中\n"
- #: g10/gpg.c:2290 g10/gpg.c:2961 g10/gpg.c:2980
++#: g10/gpg.c:2295 g10/gpg.c:2966 g10/gpg.c:2985
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "請注意: 一般情況下不會用到 %s!\n"
- #: g10/gpg.c:2480 g10/gpg.c:2492
++#: g10/gpg.c:2485 g10/gpg.c:2497
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "`%s' 不是個有效的簽章使用期限\n"
- #: g10/gpg.c:2569
++#: g10/gpg.c:2574
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "`%s' 不是個有效的字元集\n"
- #: g10/gpg.c:2593 g10/gpg.c:2781 g10/keyedit.c:4144
++#: g10/gpg.c:2598 g10/gpg.c:2786 g10/keyedit.c:4144
msgid "could not parse keyserver URL\n"
msgstr "無法剖析金鑰伺服器 URL\n"
- #: g10/gpg.c:2605
++#: g10/gpg.c:2610
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d: 無效的金鑰伺服器選項\n"
- #: g10/gpg.c:2608
++#: g10/gpg.c:2613
msgid "invalid keyserver options\n"
msgstr "無效的金鑰伺服器選項\n"
- #: g10/gpg.c:2615
++#: g10/gpg.c:2620
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d: 無效的匯入選項\n"
- #: g10/gpg.c:2618
++#: g10/gpg.c:2623
msgid "invalid import options\n"
msgstr "無效的匯入選項\n"
- #: g10/gpg.c:2625
++#: g10/gpg.c:2630
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d: 無效的匯出選項\n"
- #: g10/gpg.c:2628
++#: g10/gpg.c:2633
msgid "invalid export options\n"
msgstr "無效的匯出選項\n"
- #: g10/gpg.c:2635
++#: g10/gpg.c:2640
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d: 無效的清單選項\n"
- #: g10/gpg.c:2638
++#: g10/gpg.c:2643
msgid "invalid list options\n"
msgstr "無效的清單選項\n"
- #: g10/gpg.c:2646
++#: g10/gpg.c:2651
msgid "display photo IDs during signature verification"
msgstr "驗證簽章時顯示照片 ID"
- #: g10/gpg.c:2648
++#: g10/gpg.c:2653
msgid "show policy URLs during signature verification"
msgstr "驗證簽章時顯示原則 URL"
- #: g10/gpg.c:2650
++#: g10/gpg.c:2655
msgid "show all notations during signature verification"
msgstr "驗證簽章時顯示所有的註記"
- #: g10/gpg.c:2652
++#: g10/gpg.c:2657
msgid "show IETF standard notations during signature verification"
msgstr "驗證簽章時顯示 IETF 標準註記"
- #: g10/gpg.c:2656
++#: g10/gpg.c:2661
msgid "show user-supplied notations during signature verification"
msgstr "驗證簽章時顯示使用者提供的註記"
- #: g10/gpg.c:2658
++#: g10/gpg.c:2663
msgid "show preferred keyserver URLs during signature verification"
msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
- #: g10/gpg.c:2660
++#: g10/gpg.c:2665
msgid "show user ID validity during signature verification"
msgstr "驗證簽章時顯示使用者 ID 有效性"
- #: g10/gpg.c:2662
++#: g10/gpg.c:2667
msgid "show revoked and expired user IDs in signature verification"
msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
- #: g10/gpg.c:2664
++#: g10/gpg.c:2669
msgid "show only the primary user ID in signature verification"
msgstr "驗證簽章時祇顯示主要的使用者 ID"
- #: g10/gpg.c:2666
++#: g10/gpg.c:2671
msgid "validate signatures with PKA data"
msgstr "以 PKA 資料驗證簽章"
- #: g10/gpg.c:2668
++#: g10/gpg.c:2673
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提高對持有有效 PKA 資料之簽章的信任"
- #: g10/gpg.c:2675
++#: g10/gpg.c:2680
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d: 無效的驗證選項\n"
- #: g10/gpg.c:2678
++#: g10/gpg.c:2683
msgid "invalid verify options\n"
msgstr "無效的驗證選項\n"
- #: g10/gpg.c:2685
++#: g10/gpg.c:2690
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "無法把執行檔路徑設成 %s\n"
- #: g10/gpg.c:2850
++#: g10/gpg.c:2855
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d: 無效的自動金鑰定址清單\n"
- #: g10/gpg.c:2853
++#: g10/gpg.c:2858
msgid "invalid auto-key-locate list\n"
msgstr "無效的自動金鑰定址清單\n"
- #: g10/gpg.c:2950
++#: g10/gpg.c:2955
msgid "WARNING: program may create a core file!\n"
msgstr "警告: 程式可能會傾印出核心檔!\n"
- #: g10/gpg.c:2954
++#: g10/gpg.c:2959
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告: %s 會推翻 %s\n"
- #: g10/gpg.c:2963
++#: g10/gpg.c:2968
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不允許跟 %s 併用!\n"
- #: g10/gpg.c:2966
++#: g10/gpg.c:2971
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 跟 %s 放在一起沒有意義!\n"
- #: g10/gpg.c:2973
++#: g10/gpg.c:2978
#, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "請注意: %s 在本版中無法使用\n"
- #: g10/gpg.c:2988
++#: g10/gpg.c:2993
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
- #: g10/gpg.c:3002
++#: g10/gpg.c:3007
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "你祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
- #: g10/gpg.c:3008
++#: g10/gpg.c:3013
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "你在 --pgp2 模式下時, 不能同時簽署和加密\n"
- #: g10/gpg.c:3014
++#: g10/gpg.c:3019
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
- #: g10/gpg.c:3027
++#: g10/gpg.c:3032
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
- #: g10/gpg.c:3091 g10/gpg.c:3115
++#: g10/gpg.c:3096 g10/gpg.c:3120
msgid "selected cipher algorithm is invalid\n"
msgstr "所選的編密演算法無效\n"
- #: g10/gpg.c:3097 g10/gpg.c:3121
++#: g10/gpg.c:3102 g10/gpg.c:3126
msgid "selected digest algorithm is invalid\n"
msgstr "所選的摘要演算法無效\n"
- #: g10/gpg.c:3103
++#: g10/gpg.c:3108
msgid "selected compression algorithm is invalid\n"
msgstr "所選的壓縮演算法無效\n"
- #: g10/gpg.c:3109
++#: g10/gpg.c:3114
msgid "selected certification digest algorithm is invalid\n"
msgstr "所選的憑證摘要演算法無效\n"
- #: g10/gpg.c:3124
++#: g10/gpg.c:3129
msgid "completes-needed must be greater than 0\n"
msgstr "completes-needed 一定要大於 0\n"
- #: g10/gpg.c:3126
++#: g10/gpg.c:3131
msgid "marginals-needed must be greater than 1\n"
msgstr "marginals-needed 一定要大於 1\n"
- #: g10/gpg.c:3128
++#: g10/gpg.c:3133
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
- #: g10/gpg.c:3130
++#: g10/gpg.c:3135
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:3132
++#: g10/gpg.c:3137
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
- #: g10/gpg.c:3135
++#: g10/gpg.c:3140
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
- #: g10/gpg.c:3139
++#: g10/gpg.c:3144
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
- #: g10/gpg.c:3146
++#: g10/gpg.c:3151
msgid "invalid default preferences\n"
msgstr "無效的預設偏好\n"
- #: g10/gpg.c:3150
++#: g10/gpg.c:3155
msgid "invalid personal cipher preferences\n"
msgstr "無效的個人編密法偏好\n"
- #: g10/gpg.c:3154
++#: g10/gpg.c:3159
msgid "invalid personal digest preferences\n"
msgstr "無效的個人摘要偏好\n"
- #: g10/gpg.c:3158
++#: g10/gpg.c:3163
msgid "invalid personal compress preferences\n"
msgstr "無效的個人壓縮偏好\n"
- #: g10/gpg.c:3191
++#: g10/gpg.c:3196
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 還沒辦法跟 %s 一起運作\n"
- #: g10/gpg.c:3238
++#: g10/gpg.c:3243
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "你不該將 `%s' 編密演算法用於 %s 模式中\n"
- #: g10/gpg.c:3243
++#: g10/gpg.c:3248
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "你不該將 `%s' 摘要演算法用於 %s 模式中\n"
- #: g10/gpg.c:3248
++#: g10/gpg.c:3253
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "你不該將 `%s' 壓縮演算法用於 %s 模式中\n"
- #: g10/gpg.c:3357
++#: g10/gpg.c:3362
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "信任資料庫啟始失敗: %s\n"
- #: g10/gpg.c:3368
++#: g10/gpg.c:3373
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
- #: g10/gpg.c:3379
++#: g10/gpg.c:3384
msgid "--store [filename]"
msgstr "--store [檔名]"
- #: g10/gpg.c:3386
++#: g10/gpg.c:3391
msgid "--symmetric [filename]"
msgstr "--symmetric [檔名]"
- #: g10/gpg.c:3388
++#: g10/gpg.c:3393
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "`%s' 對稱式加密失敗: %s\n"
- #: g10/gpg.c:3398
++#: g10/gpg.c:3403
msgid "--encrypt [filename]"
msgstr "--encrypt [檔名]"
- #: g10/gpg.c:3411
++#: g10/gpg.c:3416
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [檔名]"
- #: g10/gpg.c:3413
++#: g10/gpg.c:3418
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3416
++#: g10/gpg.c:3421
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
- #: g10/gpg.c:3434
++#: g10/gpg.c:3439
msgid "--sign [filename]"
msgstr "--sign [檔名]"
- #: g10/gpg.c:3447
++#: g10/gpg.c:3452
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [檔名]"
- #: g10/gpg.c:3462
++#: g10/gpg.c:3467
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [檔名]"
- #: g10/gpg.c:3464
++#: g10/gpg.c:3469
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3467
++#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
- #: g10/gpg.c:3487
++#: g10/gpg.c:3492
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [檔名]"
- #: g10/gpg.c:3496
++#: g10/gpg.c:3501
msgid "--clearsign [filename]"
msgstr "--clearsign [檔名]"
- #: g10/gpg.c:3521
++#: g10/gpg.c:3526
msgid "--decrypt [filename]"
msgstr "--decrypt [檔名]"
- #: g10/gpg.c:3529
++#: g10/gpg.c:3534
msgid "--sign-key user-id"
msgstr "--sign-key 使用者ID"
- #: g10/gpg.c:3533
++#: g10/gpg.c:3538
msgid "--lsign-key user-id"
msgstr "--lsign-key 使用者ID"
- #: g10/gpg.c:3554
++#: g10/gpg.c:3559
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 使用者ID [指令]"
- #: g10/gpg.c:3625
++#: g10/gpg.c:3630
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
- #: g10/gpg.c:3667
++#: g10/gpg.c:3672
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "送至金鑰伺服器失敗: %s\n"
- #: g10/gpg.c:3669
++#: g10/gpg.c:3674
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "從金鑰伺服器接收失敗: %s\n"
- #: g10/gpg.c:3671
++#: g10/gpg.c:3676
#, c-format
msgid "key export failed: %s\n"
msgstr "金鑰匯出失敗: %s\n"
- #: g10/gpg.c:3682
++#: g10/gpg.c:3687
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "用金鑰伺服器搜尋失敗: %s\n"
- #: g10/gpg.c:3692
++#: g10/gpg.c:3697
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "從金鑰伺服器更新失敗: %s\n"
- #: g10/gpg.c:3743
++#: g10/gpg.c:3748
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解開封裝失敗: %s\n"
- #: g10/gpg.c:3751
++#: g10/gpg.c:3756
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "進行封裝失敗: %s\n"
- #: g10/gpg.c:3838
++#: g10/gpg.c:3843
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "無效的 `%s' 雜湊演算法\n"
- #: g10/gpg.c:3959
++#: g10/gpg.c:3963
msgid "[filename]"
msgstr "[檔名]"
- #: g10/gpg.c:3963
++#: g10/gpg.c:3967
msgid "Go ahead and type your message ...\n"
msgstr "請開始輸入你的訊息 ...\n"
- #: g10/gpg.c:4267
++#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "給定的的憑證原則 URL 無效\n"
- #: g10/gpg.c:4269
++#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "給定的簽章原則 URL 無效\n"
- #: g10/gpg.c:4302
++#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "給定的偏好金鑰伺服器 URL 無效\n"
@@@ -5695,131 -4506,104 +5695,131 @@@ msgstr "讀取 `%s' 錯誤: %s\n
msgid "trustdb: sync failed: %s\n"
msgstr "信任資料庫: 同步化失敗: %s\n"
- #: g10/tdbio.c:103
++#: g10/tdbio.c:104
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "無法為 `%s' 建立鎖定\n"
- #: g10/tdbio.c:108
++#: g10/tdbio.c:109
#, c-format
msgid "can't lock `%s'\n"
msgstr "無法鎖定 `%s'\n"
- #: g10/tdbio.c:153 g10/tdbio.c:1446
++#: g10/tdbio.c:154 g10/tdbio.c:1456
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
- #: g10/tdbio.c:159 g10/tdbio.c:1453
++#: g10/tdbio.c:160 g10/tdbio.c:1463
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
- #: g10/tdbio.c:269
++#: g10/tdbio.c:270
msgid "trustdb transaction too large\n"
msgstr "信任資料庫更動量過大\n"
- #: g10/tdbio.c:520
- #, c-format
- msgid "can't access `%s': %s\n"
- msgstr "無法存取 `%s': %s\n"
-
- #: g10/tdbio.c:536
++#: g10/tdbio.c:537
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s: 目錄不存在!\n"
- #: g10/tdbio.c:557
++#: g10/tdbio.c:551
+ #, c-format
+ msgid "can't access `%s': %s\n"
+ msgstr "無法存取 `%s': %s\n"
+
++#: g10/tdbio.c:570
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: 建立版本記錄失敗: %s"
- #: g10/tdbio.c:561
++#: g10/tdbio.c:574
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s: 建立了無效的信任資料庫\n"
- #: g10/tdbio.c:564
++#: g10/tdbio.c:577
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s: 建立了信任資料庫\n"
- #: g10/tdbio.c:599
++#: g10/tdbio.c:611
msgid "NOTE: trustdb not writable\n"
msgstr "請注意: 信任資料庫不可寫入\n"
- #: g10/tdbio.c:616
++#: g10/tdbio.c:628
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s: 無效的信任資料庫\n"
- #: g10/tdbio.c:648
++#: g10/tdbio.c:660
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s: 建立雜湊表失敗: %s\n"
- #: g10/tdbio.c:656
++#: g10/tdbio.c:668
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s: 更新版本記錄時錯誤: %s\n"
- #: g10/tdbio.c:673 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
- #: g10/tdbio.c:754 g10/tdbio.c:1379 g10/tdbio.c:1406
++#: g10/tdbio.c:685 g10/tdbio.c:706 g10/tdbio.c:722 g10/tdbio.c:736
++#: g10/tdbio.c:766 g10/tdbio.c:1389 g10/tdbio.c:1416
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s: 讀取版本記錄時錯誤: %s\n"
- #: g10/tdbio.c:733
++#: g10/tdbio.c:745
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s: 寫入版本記錄時錯誤: %s\n"
- #: g10/tdbio.c:1173
++#: g10/tdbio.c:1183
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信任資料庫: 本機搜尋失敗: %s\n"
- #: g10/tdbio.c:1181
++#: g10/tdbio.c:1191
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信任資料庫: 讀取失敗 (n=%d): %s\n"
- #: g10/tdbio.c:1202
++#: g10/tdbio.c:1212
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s: 不是一個信任資料庫檔案\n"
- #: g10/tdbio.c:1221
++#: g10/tdbio.c:1231
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
- #: g10/tdbio.c:1226
++#: g10/tdbio.c:1236
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s: 無效的檔案版本 %d\n"
- #: g10/tdbio.c:1412
++#: g10/tdbio.c:1422
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
- #: g10/tdbio.c:1420
++#: g10/tdbio.c:1430
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s: 寫入目錄記錄時出錯: %s\n"
- #: g10/tdbio.c:1430
++#: g10/tdbio.c:1440
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s: 記錄歸零失敗: %s\n"
- #: g10/tdbio.c:1460
++#: g10/tdbio.c:1470
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s: 附加記錄失敗: %s\n"
- #: g10/tdbio.c:1504
++#: g10/tdbio.c:1514
msgid "Error: The trustdb is corrupted.\n"
msgstr "錯誤: 信任資料庫已毀損.\n"
diff --cc scripts/compile
index 531136b,531136b..0000000
deleted file mode 100755,100755
--- a/scripts/compile
+++ /dev/null
@@@ -1,347 -1,347 +1,0 @@@
--#! /bin/sh
--# Wrapper for compilers which do not understand '-c -o'.
--
--scriptversion=2012-10-14.11; # UTC
--
--# Copyright (C) 1999-2013 Free Software Foundation, Inc.
--# Written by Tom Tromey <tromey at cygnus.com>.
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program. If not, see <http://www.gnu.org/licenses/>.
--
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# This file is maintained in Automake, please report
--# bugs to <bug-automake at gnu.org> or send patches to
--# <automake-patches at gnu.org>.
--
--nl='
--'
--
--# We need space, tab and new line, in precisely that order. Quoting is
--# there to prevent tools from complaining about whitespace usage.
--IFS=" "" $nl"
--
--file_conv=
--
--# func_file_conv build_file lazy
--# Convert a $build file to $host form and store it in $file
--# Currently only supports Windows hosts. If the determined conversion
--# type is listed in (the comma separated) LAZY, no conversion will
--# take place.
--func_file_conv ()
--{
-- file=$1
-- case $file in
-- / | /[!/]*) # absolute file, and not a UNC file
-- if test -z "$file_conv"; then
-- # lazily determine how to convert abs files
-- case `uname -s` in
-- MINGW*)
-- file_conv=mingw
-- ;;
-- CYGWIN*)
-- file_conv=cygwin
-- ;;
-- *)
-- file_conv=wine
-- ;;
-- esac
-- fi
-- case $file_conv/,$2, in
-- *,$file_conv,*)
-- ;;
-- mingw/*)
-- file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-- ;;
-- cygwin/*)
-- file=`cygpath -m "$file" || echo "$file"`
-- ;;
-- wine/*)
-- file=`winepath -w "$file" || echo "$file"`
-- ;;
-- esac
-- ;;
-- esac
--}
--
--# func_cl_dashL linkdir
--# Make cl look for libraries in LINKDIR
--func_cl_dashL ()
--{
-- func_file_conv "$1"
-- if test -z "$lib_path"; then
-- lib_path=$file
-- else
-- lib_path="$lib_path;$file"
-- fi
-- linker_opts="$linker_opts -LIBPATH:$file"
--}
--
--# func_cl_dashl library
--# Do a library search-path lookup for cl
--func_cl_dashl ()
--{
-- lib=$1
-- found=no
-- save_IFS=$IFS
-- IFS=';'
-- for dir in $lib_path $LIB
-- do
-- IFS=$save_IFS
-- if $shared && test -f "$dir/$lib.dll.lib"; then
-- found=yes
-- lib=$dir/$lib.dll.lib
-- break
-- fi
-- if test -f "$dir/$lib.lib"; then
-- found=yes
-- lib=$dir/$lib.lib
-- break
-- fi
-- if test -f "$dir/lib$lib.a"; then
-- found=yes
-- lib=$dir/lib$lib.a
-- break
-- fi
-- done
-- IFS=$save_IFS
--
-- if test "$found" != yes; then
-- lib=$lib.lib
-- fi
--}
--
--# func_cl_wrapper cl arg...
--# Adjust compile command to suit cl
--func_cl_wrapper ()
--{
-- # Assume a capable shell
-- lib_path=
-- shared=:
-- linker_opts=
-- for arg
-- do
-- if test -n "$eat"; then
-- eat=
-- else
-- case $1 in
-- -o)
-- # configure might choose to run compile as 'compile cc -o foo foo.c'.
-- eat=1
-- case $2 in
-- *.o | *.[oO][bB][jJ])
-- func_file_conv "$2"
-- set x "$@" -Fo"$file"
-- shift
-- ;;
-- *)
-- func_file_conv "$2"
-- set x "$@" -Fe"$file"
-- shift
-- ;;
-- esac
-- ;;
-- -I)
-- eat=1
-- func_file_conv "$2" mingw
-- set x "$@" -I"$file"
-- shift
-- ;;
-- -I*)
-- func_file_conv "${1#-I}" mingw
-- set x "$@" -I"$file"
-- shift
-- ;;
-- -l)
-- eat=1
-- func_cl_dashl "$2"
-- set x "$@" "$lib"
-- shift
-- ;;
-- -l*)
-- func_cl_dashl "${1#-l}"
-- set x "$@" "$lib"
-- shift
-- ;;
-- -L)
-- eat=1
-- func_cl_dashL "$2"
-- ;;
-- -L*)
-- func_cl_dashL "${1#-L}"
-- ;;
-- -static)
-- shared=false
-- ;;
-- -Wl,*)
-- arg=${1#-Wl,}
-- save_ifs="$IFS"; IFS=','
-- for flag in $arg; do
-- IFS="$save_ifs"
-- linker_opts="$linker_opts $flag"
-- done
-- IFS="$save_ifs"
-- ;;
-- -Xlinker)
-- eat=1
-- linker_opts="$linker_opts $2"
-- ;;
-- -*)
-- set x "$@" "$1"
-- shift
-- ;;
-- *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-- func_file_conv "$1"
-- set x "$@" -Tp"$file"
-- shift
-- ;;
-- *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-- func_file_conv "$1" mingw
-- set x "$@" "$file"
-- shift
-- ;;
-- *)
-- set x "$@" "$1"
-- shift
-- ;;
-- esac
-- fi
-- shift
-- done
-- if test -n "$linker_opts"; then
-- linker_opts="-link$linker_opts"
-- fi
-- exec "$@" $linker_opts
-- exit 1
--}
--
--eat=
--
--case $1 in
-- '')
-- echo "$0: No command. Try '$0 --help' for more information." 1>&2
-- exit 1;
-- ;;
-- -h | --h*)
-- cat <<\EOF
--Usage: compile [--help] [--version] PROGRAM [ARGS]
--
--Wrapper for compilers which do not understand '-c -o'.
--Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
--arguments, and rename the output as expected.
--
--If you are trying to build a whole package this is not the
--right script to run: please start by reading the file 'INSTALL'.
--
--Report bugs to <bug-automake at gnu.org>.
--EOF
-- exit $?
-- ;;
-- -v | --v*)
-- echo "compile $scriptversion"
-- exit $?
-- ;;
-- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-- func_cl_wrapper "$@" # Doesn't return...
-- ;;
--esac
--
--ofile=
--cfile=
--
--for arg
--do
-- if test -n "$eat"; then
-- eat=
-- else
-- case $1 in
-- -o)
-- # configure might choose to run compile as 'compile cc -o foo foo.c'.
-- # So we strip '-o arg' only if arg is an object.
-- eat=1
-- case $2 in
-- *.o | *.obj)
-- ofile=$2
-- ;;
-- *)
-- set x "$@" -o "$2"
-- shift
-- ;;
-- esac
-- ;;
-- *.c)
-- cfile=$1
-- set x "$@" "$1"
-- shift
-- ;;
-- *)
-- set x "$@" "$1"
-- shift
-- ;;
-- esac
-- fi
-- shift
--done
--
--if test -z "$ofile" || test -z "$cfile"; then
-- # If no '-o' option was seen then we might have been invoked from a
-- # pattern rule where we don't need one. That is ok -- this is a
-- # normal compilation that the losing compiler can handle. If no
-- # '.c' file was seen then we are probably linking. That is also
-- # ok.
-- exec "$@"
--fi
--
--# Name of file we expect compiler to create.
--cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
--
--# Create the lock directory.
--# Note: use '[/\\:.-]' here to ensure that we don't use the same name
--# that we are using for the .o file. Also, base the name on the expected
--# object file name, since that is what matters with a parallel build.
--lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
--while true; do
-- if mkdir "$lockdir" >/dev/null 2>&1; then
-- break
-- fi
-- sleep 1
--done
--# FIXME: race condition here if user kills between mkdir and trap.
--trap "rmdir '$lockdir'; exit 1" 1 2 15
--
--# Run the compile.
--"$@"
--ret=$?
--
--if test -f "$cofile"; then
-- test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
--elif test -f "${cofile}bj"; then
-- test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
--fi
--
--rmdir "$lockdir"
--exit $ret
--
--# Local Variables:
--# mode: shell-script
--# sh-indentation: 2
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
--# End:
diff --cc scripts/depcomp
index 4ebd5b3,4ebd5b3..0000000
deleted file mode 100755,100755
--- a/scripts/depcomp
+++ /dev/null
@@@ -1,791 -1,791 +1,0 @@@
--#! /bin/sh
--# depcomp - compile a program generating dependencies as side-effects
--
--scriptversion=2013-05-30.07; # UTC
--
--# Copyright (C) 1999-2013 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program. If not, see <http://www.gnu.org/licenses/>.
--
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
--
--case $1 in
-- '')
-- echo "$0: No command. Try '$0 --help' for more information." 1>&2
-- exit 1;
-- ;;
-- -h | --h*)
-- cat <<\EOF
--Usage: depcomp [--help] [--version] PROGRAM [ARGS]
--
--Run PROGRAMS ARGS to compile a file, generating dependencies
--as side-effects.
--
--Environment variables:
-- depmode Dependency tracking mode.
-- source Source file read by 'PROGRAMS ARGS'.
-- object Object file output by 'PROGRAMS ARGS'.
-- DEPDIR directory where to store dependencies.
-- depfile Dependency file to output.
-- tmpdepfile Temporary file to use when outputting dependencies.
-- libtool Whether libtool is used (yes/no).
--
--Report bugs to <bug-automake at gnu.org>.
--EOF
-- exit $?
-- ;;
-- -v | --v*)
-- echo "depcomp $scriptversion"
-- exit $?
-- ;;
--esac
--
--# Get the directory component of the given path, and save it in the
--# global variables '$dir'. Note that this directory component will
--# be either empty or ending with a '/' character. This is deliberate.
--set_dir_from ()
--{
-- case $1 in
-- */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
-- *) dir=;;
-- esac
--}
--
--# Get the suffix-stripped basename of the given path, and save it the
--# global variable '$base'.
--set_base_from ()
--{
-- base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
--}
--
--# If no dependency file was actually created by the compiler invocation,
--# we still have to create a dummy depfile, to avoid errors with the
--# Makefile "include basename.Plo" scheme.
--make_dummy_depfile ()
--{
-- echo "#dummy" > "$depfile"
--}
--
--# Factor out some common post-processing of the generated depfile.
--# Requires the auxiliary global variable '$tmpdepfile' to be set.
--aix_post_process_depfile ()
--{
-- # If the compiler actually managed to produce a dependency file,
-- # post-process it.
-- if test -f "$tmpdepfile"; then
-- # Each line is of the form 'foo.o: dependency.h'.
-- # Do two passes, one to just change these to
-- # $object: dependency.h
-- # and one to simply output
-- # dependency.h:
-- # which is needed to avoid the deleted-header problem.
-- { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
-- sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
-- } > "$depfile"
-- rm -f "$tmpdepfile"
-- else
-- make_dummy_depfile
-- fi
--}
--
--# A tabulation character.
--tab=' '
--# A newline character.
--nl='
--'
--# Character ranges might be problematic outside the C locale.
--# These definitions help.
--upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
--lower=abcdefghijklmnopqrstuvwxyz
--digits=0123456789
--alpha=${upper}${lower}
--
--if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-- echo "depcomp: Variables source, object and depmode must be set" 1>&2
-- exit 1
--fi
--
--# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
--depfile=${depfile-`echo "$object" |
-- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
--tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
--
--rm -f "$tmpdepfile"
--
--# Avoid interferences from the environment.
--gccflag= dashmflag=
--
--# Some modes work just like other modes, but use different flags. We
--# parameterize here, but still list the modes in the big case below,
--# to make depend.m4 easier to write. Note that we *cannot* use a case
--# here, because this file can only contain one case statement.
--if test "$depmode" = hp; then
-- # HP compiler uses -M and no extra arg.
-- gccflag=-M
-- depmode=gcc
--fi
--
--if test "$depmode" = dashXmstdout; then
-- # This is just like dashmstdout with a different argument.
-- dashmflag=-xM
-- depmode=dashmstdout
--fi
--
--cygpath_u="cygpath -u -f -"
--if test "$depmode" = msvcmsys; then
-- # This is just like msvisualcpp but w/o cygpath translation.
-- # Just convert the backslash-escaped backslashes to single forward
-- # slashes to satisfy depend.m4
-- cygpath_u='sed s,\\\\,/,g'
-- depmode=msvisualcpp
--fi
--
--if test "$depmode" = msvc7msys; then
-- # This is just like msvc7 but w/o cygpath translation.
-- # Just convert the backslash-escaped backslashes to single forward
-- # slashes to satisfy depend.m4
-- cygpath_u='sed s,\\\\,/,g'
-- depmode=msvc7
--fi
--
--if test "$depmode" = xlc; then
-- # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-- gccflag=-qmakedep=gcc,-MF
-- depmode=gcc
--fi
--
--case "$depmode" in
--gcc3)
--## gcc 3 implements dependency tracking that does exactly what
--## we want. Yay! Note: for some reason libtool 1.4 doesn't like
--## it if -MD -MP comes after the -MF stuff. Hmm.
--## Unfortunately, FreeBSD c89 acceptance of flags depends upon
--## the command line argument order; so add the flags where they
--## appear in depend2.am. Note that the slowdown incurred here
--## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-- for arg
-- do
-- case $arg in
-- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-- *) set fnord "$@" "$arg" ;;
-- esac
-- shift # fnord
-- shift # $arg
-- done
-- "$@"
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- mv "$tmpdepfile" "$depfile"
-- ;;
--
--gcc)
--## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
--## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
--## (see the conditional assignment to $gccflag above).
--## There are various ways to get dependency output from gcc. Here's
--## why we pick this rather obscure method:
--## - Don't want to use -MD because we'd like the dependencies to end
--## up in a subdir. Having to rename by hand is ugly.
--## (We might end up doing this anyway to support other compilers.)
--## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
--## -MM, not -M (despite what the docs say). Also, it might not be
--## supported by the other compilers which use the 'gcc' depmode.
--## - Using -M directly means running the compiler twice (even worse
--## than renaming).
-- if test -z "$gccflag"; then
-- gccflag=-MD,
-- fi
-- "$@" -Wp,"$gccflag$tmpdepfile"
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- # The second -e expression handles DOS-style file names with drive
-- # letters.
-- sed -e 's/^[^:]*: / /' \
-- -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
--## This next piece of magic avoids the "deleted header file" problem.
--## The problem is that when a header file which appears in a .P file
--## is deleted, the dependency causes make to die (because there is
--## typically no way to rebuild the header). We avoid this by adding
--## dummy dependencies for each header file. Too bad gcc doesn't do
--## this for us directly.
--## Some versions of gcc put a space before the ':'. On the theory
--## that the space means something, we add a space to the output as
--## well. hp depmode also adds that space, but also prefixes the VPATH
--## to the object. Take care to not repeat it in the output.
--## Some versions of the HPUX 10.20 sed can't process this invocation
--## correctly. Breaking it into two sed invocations is a workaround.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-- | sed -e 's/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--hp)
-- # This case exists only to let depend.m4 do its work. It works by
-- # looking at the text of this script. This case will never be run,
-- # since it is checked for above.
-- exit 1
-- ;;
--
--sgi)
-- if test "$libtool" = yes; then
-- "$@" "-Wp,-MDupdate,$tmpdepfile"
-- else
-- "$@" -MDupdate "$tmpdepfile"
-- fi
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
--
-- if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
-- echo "$object : \\" > "$depfile"
-- # Clip off the initial element (the dependent). Don't try to be
-- # clever and replace this with sed code, as IRIX sed won't handle
-- # lines with more than a fixed number of characters (4096 in
-- # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
-- # the IRIX cc adds comments like '#:fec' to the end of the
-- # dependency line.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
-- | tr "$nl" ' ' >> "$depfile"
-- echo >> "$depfile"
-- # The second pass generates a dummy entry for each header file.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-- >> "$depfile"
-- else
-- make_dummy_depfile
-- fi
-- rm -f "$tmpdepfile"
-- ;;
--
--xlc)
-- # This case exists only to let depend.m4 do its work. It works by
-- # looking at the text of this script. This case will never be run,
-- # since it is checked for above.
-- exit 1
-- ;;
--
--aix)
-- # The C for AIX Compiler uses -M and outputs the dependencies
-- # in a .u file. In older versions, this file always lives in the
-- # current directory. Also, the AIX compiler puts '$object:' at the
-- # start of each line; $object doesn't have directory information.
-- # Version 6 uses the directory in both cases.
-- set_dir_from "$object"
-- set_base_from "$object"
-- if test "$libtool" = yes; then
-- tmpdepfile1=$dir$base.u
-- tmpdepfile2=$base.u
-- tmpdepfile3=$dir.libs/$base.u
-- "$@" -Wc,-M
-- else
-- tmpdepfile1=$dir$base.u
-- tmpdepfile2=$dir$base.u
-- tmpdepfile3=$dir$base.u
-- "$@" -M
-- fi
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- exit $stat
-- fi
--
-- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- do
-- test -f "$tmpdepfile" && break
-- done
-- aix_post_process_depfile
-- ;;
--
--tcc)
-- # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
-- # FIXME: That version still under development at the moment of writing.
-- # Make that this statement remains true also for stable, released
-- # versions.
-- # It will wrap lines (doesn't matter whether long or short) with a
-- # trailing '\', as in:
-- #
-- # foo.o : \
-- # foo.c \
-- # foo.h \
-- #
-- # It will put a trailing '\' even on the last line, and will use leading
-- # spaces rather than leading tabs (at least since its commit 0394caf7
-- # "Emit spaces for -MD").
-- "$@" -MD -MF "$tmpdepfile"
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
-- # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-- # We have to change lines of the first kind to '$object: \'.
-- sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-- # And for each line of the second kind, we have to emit a 'dep.h:'
-- # dummy dependency, to avoid the deleted-header problem.
-- sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--## The order of this option in the case statement is important, since the
--## shell code in configure will try each of these formats in the order
--## listed in this file. A plain '-MD' option would be understood by many
--## compilers, so we must ensure this comes after the gcc and icc options.
--pgcc)
-- # Portland's C compiler understands '-MD'.
-- # Will always output deps to 'file.d' where file is the root name of the
-- # source file under compilation, even if file resides in a subdirectory.
-- # The object file name does not affect the name of the '.d' file.
-- # pgcc 10.2 will output
-- # foo.o: sub/foo.c sub/foo.h
-- # and will wrap long lines using '\' :
-- # foo.o: sub/foo.c ... \
-- # sub/foo.h ... \
-- # ...
-- set_dir_from "$object"
-- # Use the source, not the object, to determine the base name, since
-- # that's sadly what pgcc will do too.
-- set_base_from "$source"
-- tmpdepfile=$base.d
--
-- # For projects that build the same source file twice into different object
-- # files, the pgcc approach of using the *source* file root name can cause
-- # problems in parallel builds. Use a locking strategy to avoid stomping on
-- # the same $tmpdepfile.
-- lockdir=$base.d-lock
-- trap "
-- echo '$0: caught signal, cleaning up...' >&2
-- rmdir '$lockdir'
-- exit 1
-- " 1 2 13 15
-- numtries=100
-- i=$numtries
-- while test $i -gt 0; do
-- # mkdir is a portable test-and-set.
-- if mkdir "$lockdir" 2>/dev/null; then
-- # This process acquired the lock.
-- "$@" -MD
-- stat=$?
-- # Release the lock.
-- rmdir "$lockdir"
-- break
-- else
-- # If the lock is being held by a different process, wait
-- # until the winning process is done or we timeout.
-- while test -d "$lockdir" && test $i -gt 0; do
-- sleep 1
-- i=`expr $i - 1`
-- done
-- fi
-- i=`expr $i - 1`
-- done
-- trap - 1 2 13 15
-- if test $i -le 0; then
-- echo "$0: failed to acquire lock after $numtries attempts" >&2
-- echo "$0: check lockdir '$lockdir'" >&2
-- exit 1
-- fi
--
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
-- # Each line is of the form `foo.o: dependent.h',
-- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-- # Do two passes, one to just change these to
-- # `$object: dependent.h' and one to simply `dependent.h:'.
-- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-- # Some versions of the HPUX 10.20 sed can't process this invocation
-- # correctly. Breaking it into two sed invocations is a workaround.
-- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
-- | sed -e 's/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--hp2)
-- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-- # compilers, which have integrated preprocessors. The correct option
-- # to use with these is +Maked; it writes dependencies to a file named
-- # 'foo.d', which lands next to the object file, wherever that
-- # happens to be.
-- # Much of this is similar to the tru64 case; see comments there.
-- set_dir_from "$object"
-- set_base_from "$object"
-- if test "$libtool" = yes; then
-- tmpdepfile1=$dir$base.d
-- tmpdepfile2=$dir.libs/$base.d
-- "$@" -Wc,+Maked
-- else
-- tmpdepfile1=$dir$base.d
-- tmpdepfile2=$dir$base.d
-- "$@" +Maked
-- fi
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile1" "$tmpdepfile2"
-- exit $stat
-- fi
--
-- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-- do
-- test -f "$tmpdepfile" && break
-- done
-- if test -f "$tmpdepfile"; then
-- sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
-- # Add 'dependent.h:' lines.
-- sed -ne '2,${
-- s/^ *//
-- s/ \\*$//
-- s/$/:/
-- p
-- }' "$tmpdepfile" >> "$depfile"
-- else
-- make_dummy_depfile
-- fi
-- rm -f "$tmpdepfile" "$tmpdepfile2"
-- ;;
--
--tru64)
-- # The Tru64 compiler uses -MD to generate dependencies as a side
-- # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-- # dependencies in 'foo.d' instead, so we check for that too.
-- # Subdirectories are respected.
-- set_dir_from "$object"
-- set_base_from "$object"
--
-- if test "$libtool" = yes; then
-- # Libtool generates 2 separate objects for the 2 libraries. These
-- # two compilations output dependencies in $dir.libs/$base.o.d and
-- # in $dir$base.o.d. We have to check for both files, because
-- # one of the two compilations can be disabled. We should prefer
-- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-- # automatically cleaned when .libs/ is deleted, while ignoring
-- # the former would cause a distcleancheck panic.
-- tmpdepfile1=$dir$base.o.d # libtool 1.5
-- tmpdepfile2=$dir.libs/$base.o.d # Likewise.
-- tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
-- "$@" -Wc,-MD
-- else
-- tmpdepfile1=$dir$base.d
-- tmpdepfile2=$dir$base.d
-- tmpdepfile3=$dir$base.d
-- "$@" -MD
-- fi
--
-- stat=$?
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- exit $stat
-- fi
--
-- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-- do
-- test -f "$tmpdepfile" && break
-- done
-- # Same post-processing that is required for AIX mode.
-- aix_post_process_depfile
-- ;;
--
--msvc7)
-- if test "$libtool" = yes; then
-- showIncludes=-Wc,-showIncludes
-- else
-- showIncludes=-showIncludes
-- fi
-- "$@" $showIncludes > "$tmpdepfile"
-- stat=$?
-- grep -v '^Note: including file: ' "$tmpdepfile"
-- if test $stat -ne 0; then
-- rm -f "$tmpdepfile"
-- exit $stat
-- fi
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- # The first sed program below extracts the file names and escapes
-- # backslashes for cygpath. The second sed program outputs the file
-- # name when reading, but also accumulates all include files in the
-- # hold buffer in order to output them again at the end. This only
-- # works with sed implementations that can handle large buffers.
-- sed < "$tmpdepfile" -n '
--/^Note: including file: *\(.*\)/ {
-- s//\1/
-- s/\\/\\\\/g
-- p
--}' | $cygpath_u | sort -u | sed -n '
--s/ /\\ /g
--s/\(.*\)/'"$tab"'\1 \\/p
--s/.\(.*\) \\/\1:/
--H
--$ {
-- s/.*/'"$tab"'/
-- G
-- p
--}' >> "$depfile"
-- echo >> "$depfile" # make sure the fragment doesn't end with a backslash
-- rm -f "$tmpdepfile"
-- ;;
--
--msvc7msys)
-- # This case exists only to let depend.m4 do its work. It works by
-- # looking at the text of this script. This case will never be run,
-- # since it is checked for above.
-- exit 1
-- ;;
--
--#nosideeffect)
-- # This comment above is used by automake to tell side-effect
-- # dependency tracking mechanisms from slower ones.
--
--dashmstdout)
-- # Important note: in order to support this mode, a compiler *must*
-- # always write the preprocessed file to stdout, regardless of -o.
-- "$@" || exit $?
--
-- # Remove the call to Libtool.
-- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-- shift
-- done
-- shift
-- fi
--
-- # Remove '-o $object'.
-- IFS=" "
-- for arg
-- do
-- case $arg in
-- -o)
-- shift
-- ;;
-- $object)
-- shift
-- ;;
-- *)
-- set fnord "$@" "$arg"
-- shift # fnord
-- shift # $arg
-- ;;
-- esac
-- done
--
-- test -z "$dashmflag" && dashmflag=-M
-- # Require at least two characters before searching for ':'
-- # in the target name. This is to cope with DOS-style filenames:
-- # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
-- "$@" $dashmflag |
-- sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
-- rm -f "$depfile"
-- cat < "$tmpdepfile" > "$depfile"
-- # Some versions of the HPUX 10.20 sed can't process this sed invocation
-- # correctly. Breaking it into two sed invocations is a workaround.
-- tr ' ' "$nl" < "$tmpdepfile" \
-- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-- | sed -e 's/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--dashXmstdout)
-- # This case only exists to satisfy depend.m4. It is never actually
-- # run, as this mode is specially recognized in the preamble.
-- exit 1
-- ;;
--
--makedepend)
-- "$@" || exit $?
-- # Remove any Libtool call
-- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-- shift
-- done
-- shift
-- fi
-- # X makedepend
-- shift
-- cleared=no eat=no
-- for arg
-- do
-- case $cleared in
-- no)
-- set ""; shift
-- cleared=yes ;;
-- esac
-- if test $eat = yes; then
-- eat=no
-- continue
-- fi
-- case "$arg" in
-- -D*|-I*)
-- set fnord "$@" "$arg"; shift ;;
-- # Strip any option that makedepend may not understand. Remove
-- # the object too, otherwise makedepend will parse it as a source file.
-- -arch)
-- eat=yes ;;
-- -*|$object)
-- ;;
-- *)
-- set fnord "$@" "$arg"; shift ;;
-- esac
-- done
-- obj_suffix=`echo "$object" | sed 's/^.*\././'`
-- touch "$tmpdepfile"
-- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-- rm -f "$depfile"
-- # makedepend may prepend the VPATH from the source file name to the object.
-- # No need to regex-escape $object, excess matching of '.' is harmless.
-- sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-- # Some versions of the HPUX 10.20 sed can't process the last invocation
-- # correctly. Breaking it into two sed invocations is a workaround.
-- sed '1,2d' "$tmpdepfile" \
-- | tr ' ' "$nl" \
-- | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-- | sed -e 's/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile" "$tmpdepfile".bak
-- ;;
--
--cpp)
-- # Important note: in order to support this mode, a compiler *must*
-- # always write the preprocessed file to stdout.
-- "$@" || exit $?
--
-- # Remove the call to Libtool.
-- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-- shift
-- done
-- shift
-- fi
--
-- # Remove '-o $object'.
-- IFS=" "
-- for arg
-- do
-- case $arg in
-- -o)
-- shift
-- ;;
-- $object)
-- shift
-- ;;
-- *)
-- set fnord "$@" "$arg"
-- shift # fnord
-- shift # $arg
-- ;;
-- esac
-- done
--
-- "$@" -E \
-- | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-- -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-- | sed '$ s: \\$::' > "$tmpdepfile"
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- cat < "$tmpdepfile" >> "$depfile"
-- sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--msvisualcpp)
-- # Important note: in order to support this mode, a compiler *must*
-- # always write the preprocessed file to stdout.
-- "$@" || exit $?
--
-- # Remove the call to Libtool.
-- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-- shift
-- done
-- shift
-- fi
--
-- IFS=" "
-- for arg
-- do
-- case "$arg" in
-- -o)
-- shift
-- ;;
-- $object)
-- shift
-- ;;
-- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-- set fnord "$@"
-- shift
-- shift
-- ;;
-- *)
-- set fnord "$@" "$arg"
-- shift
-- shift
-- ;;
-- esac
-- done
-- "$@" -E 2>/dev/null |
-- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-- rm -f "$depfile"
-- echo "$object : \\" > "$depfile"
-- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-- echo "$tab" >> "$depfile"
-- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-- rm -f "$tmpdepfile"
-- ;;
--
--msvcmsys)
-- # This case exists only to let depend.m4 do its work. It works by
-- # looking at the text of this script. This case will never be run,
-- # since it is checked for above.
-- exit 1
-- ;;
--
--none)
-- exec "$@"
-- ;;
--
--*)
-- echo "Unknown depmode $depmode" 1>&2
-- exit 1
-- ;;
--esac
--
--exit 0
--
--# Local Variables:
--# mode: shell-script
--# sh-indentation: 2
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
--# End:
diff --cc scripts/install-sh
index 377bb86,377bb86..0000000
deleted file mode 100755,100755
--- a/scripts/install-sh
+++ /dev/null
@@@ -1,527 -1,527 +1,0 @@@
--#!/bin/sh
--# install - install a program, script, or datafile
--
--scriptversion=2011-11-20.07; # UTC
--
--# This originates from X11R5 (mit/util/scripts/install.sh), which was
--# later released in X11R6 (xc/config/util/install.sh) with the
--# following copyright and license.
--#
--# Copyright (C) 1994 X Consortium
--#
--# Permission is hereby granted, free of charge, to any person obtaining a copy
--# of this software and associated documentation files (the "Software"), to
--# deal in the Software without restriction, including without limitation the
--# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
--# sell copies of the Software, and to permit persons to whom the Software is
--# furnished to do so, subject to the following conditions:
--#
--# The above copyright notice and this permission notice shall be included in
--# all copies or substantial portions of the Software.
--#
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
--# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
--# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--#
--# Except as contained in this notice, the name of the X Consortium shall not
--# be used in advertising or otherwise to promote the sale, use or other deal-
--# ings in this Software without prior written authorization from the X Consor-
--# tium.
--#
--#
--# FSF changes to this file are in the public domain.
--#
--# Calling this script install-sh is preferred over install.sh, to prevent
--# 'make' implicit rules from creating a file called install from it
--# when there is no Makefile.
--#
--# This script is compatible with the BSD install script, but was written
--# from scratch.
--
--nl='
--'
--IFS=" "" $nl"
--
--# set DOITPROG to echo to test this script
--
--# Don't use :- since 4.3BSD and earlier shells don't like it.
--doit=${DOITPROG-}
--if test -z "$doit"; then
-- doit_exec=exec
--else
-- doit_exec=$doit
--fi
--
--# Put in absolute file names if you don't have them in your path;
--# or use environment vars.
--
--chgrpprog=${CHGRPPROG-chgrp}
--chmodprog=${CHMODPROG-chmod}
--chownprog=${CHOWNPROG-chown}
--cmpprog=${CMPPROG-cmp}
--cpprog=${CPPROG-cp}
--mkdirprog=${MKDIRPROG-mkdir}
--mvprog=${MVPROG-mv}
--rmprog=${RMPROG-rm}
--stripprog=${STRIPPROG-strip}
--
--posix_glob='?'
--initialize_posix_glob='
-- test "$posix_glob" != "?" || {
-- if (set -f) 2>/dev/null; then
-- posix_glob=
-- else
-- posix_glob=:
-- fi
-- }
--'
--
--posix_mkdir=
--
--# Desired mode of installed file.
--mode=0755
--
--chgrpcmd=
--chmodcmd=$chmodprog
--chowncmd=
--mvcmd=$mvprog
--rmcmd="$rmprog -f"
--stripcmd=
--
--src=
--dst=
--dir_arg=
--dst_arg=
--
--copy_on_change=false
--no_target_directory=
--
--usage="\
--Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-- or: $0 [OPTION]... SRCFILES... DIRECTORY
-- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-- or: $0 [OPTION]... -d DIRECTORIES...
--
--In the 1st form, copy SRCFILE to DSTFILE.
--In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
--In the 4th, create DIRECTORIES.
--
--Options:
-- --help display this help and exit.
-- --version display version info and exit.
--
-- -c (ignored)
-- -C install only if different (preserve the last data modification time)
-- -d create directories instead of installing files.
-- -g GROUP $chgrpprog installed files to GROUP.
-- -m MODE $chmodprog installed files to MODE.
-- -o USER $chownprog installed files to USER.
-- -s $stripprog installed files.
-- -t DIRECTORY install into DIRECTORY.
-- -T report an error if DSTFILE is a directory.
--
--Environment variables override the default commands:
-- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-- RMPROG STRIPPROG
--"
--
--while test $# -ne 0; do
-- case $1 in
-- -c) ;;
--
-- -C) copy_on_change=true;;
--
-- -d) dir_arg=true;;
--
-- -g) chgrpcmd="$chgrpprog $2"
-- shift;;
--
-- --help) echo "$usage"; exit $?;;
--
-- -m) mode=$2
-- case $mode in
-- *' '* | *' '* | *'
--'* | *'*'* | *'?'* | *'['*)
-- echo "$0: invalid mode: $mode" >&2
-- exit 1;;
-- esac
-- shift;;
--
-- -o) chowncmd="$chownprog $2"
-- shift;;
--
-- -s) stripcmd=$stripprog;;
--
-- -t) dst_arg=$2
-- # Protect names problematic for 'test' and other utilities.
-- case $dst_arg in
-- -* | [=\(\)!]) dst_arg=./$dst_arg;;
-- esac
-- shift;;
--
-- -T) no_target_directory=true;;
--
-- --version) echo "$0 $scriptversion"; exit $?;;
--
-- --) shift
-- break;;
--
-- -*) echo "$0: invalid option: $1" >&2
-- exit 1;;
--
-- *) break;;
-- esac
-- shift
--done
--
--if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-- # When -d is used, all remaining arguments are directories to create.
-- # When -t is used, the destination is already specified.
-- # Otherwise, the last argument is the destination. Remove it from $@.
-- for arg
-- do
-- if test -n "$dst_arg"; then
-- # $@ is not empty: it contains at least $arg.
-- set fnord "$@" "$dst_arg"
-- shift # fnord
-- fi
-- shift # arg
-- dst_arg=$arg
-- # Protect names problematic for 'test' and other utilities.
-- case $dst_arg in
-- -* | [=\(\)!]) dst_arg=./$dst_arg;;
-- esac
-- done
--fi
--
--if test $# -eq 0; then
-- if test -z "$dir_arg"; then
-- echo "$0: no input file specified." >&2
-- exit 1
-- fi
-- # It's OK to call 'install-sh -d' without argument.
-- # This can happen when creating conditional directories.
-- exit 0
--fi
--
--if test -z "$dir_arg"; then
-- do_exit='(exit $ret); exit $ret'
-- trap "ret=129; $do_exit" 1
-- trap "ret=130; $do_exit" 2
-- trap "ret=141; $do_exit" 13
-- trap "ret=143; $do_exit" 15
--
-- # Set umask so as not to create temps with too-generous modes.
-- # However, 'strip' requires both read and write access to temps.
-- case $mode in
-- # Optimize common cases.
-- *644) cp_umask=133;;
-- *755) cp_umask=22;;
--
-- *[0-7])
-- if test -z "$stripcmd"; then
-- u_plus_rw=
-- else
-- u_plus_rw='% 200'
-- fi
-- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-- *)
-- if test -z "$stripcmd"; then
-- u_plus_rw=
-- else
-- u_plus_rw=,u+rw
-- fi
-- cp_umask=$mode$u_plus_rw;;
-- esac
--fi
--
--for src
--do
-- # Protect names problematic for 'test' and other utilities.
-- case $src in
-- -* | [=\(\)!]) src=./$src;;
-- esac
--
-- if test -n "$dir_arg"; then
-- dst=$src
-- dstdir=$dst
-- test -d "$dstdir"
-- dstdir_status=$?
-- else
--
-- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-- # might cause directories to be created, which would be especially bad
-- # if $src (and thus $dsttmp) contains '*'.
-- if test ! -f "$src" && test ! -d "$src"; then
-- echo "$0: $src does not exist." >&2
-- exit 1
-- fi
--
-- if test -z "$dst_arg"; then
-- echo "$0: no destination specified." >&2
-- exit 1
-- fi
-- dst=$dst_arg
--
-- # If destination is a directory, append the input filename; won't work
-- # if double slashes aren't ignored.
-- if test -d "$dst"; then
-- if test -n "$no_target_directory"; then
-- echo "$0: $dst_arg: Is a directory" >&2
-- exit 1
-- fi
-- dstdir=$dst
-- dst=$dstdir/`basename "$src"`
-- dstdir_status=0
-- else
-- # Prefer dirname, but fall back on a substitute if dirname fails.
-- dstdir=`
-- (dirname "$dst") 2>/dev/null ||
-- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$dst" : 'X\(//\)[^/]' \| \
-- X"$dst" : 'X\(//\)$' \| \
-- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-- echo X"$dst" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)[^/].*/{
-- s//\1/
-- q
-- }
-- /^X\(\/\/\)$/{
-- s//\1/
-- q
-- }
-- /^X\(\/\).*/{
-- s//\1/
-- q
-- }
-- s/.*/./; q'
-- `
--
-- test -d "$dstdir"
-- dstdir_status=$?
-- fi
-- fi
--
-- obsolete_mkdir_used=false
--
-- if test $dstdir_status != 0; then
-- case $posix_mkdir in
-- '')
-- # Create intermediate dirs using mode 755 as modified by the umask.
-- # This is like FreeBSD 'install' as of 1997-10-28.
-- umask=`umask`
-- case $stripcmd.$umask in
-- # Optimize common cases.
-- *[2367][2367]) mkdir_umask=$umask;;
-- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
--
-- *[0-7])
-- mkdir_umask=`expr $umask + 22 \
-- - $umask % 100 % 40 + $umask % 20 \
-- - $umask % 10 % 4 + $umask % 2
-- `;;
-- *) mkdir_umask=$umask,go-w;;
-- esac
--
-- # With -d, create the new directory with the user-specified mode.
-- # Otherwise, rely on $mkdir_umask.
-- if test -n "$dir_arg"; then
-- mkdir_mode=-m$mode
-- else
-- mkdir_mode=
-- fi
--
-- posix_mkdir=false
-- case $umask in
-- *[123567][0-7][0-7])
-- # POSIX mkdir -p sets u+wx bits regardless of umask, which
-- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-- ;;
-- *)
-- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
--
-- if (umask $mkdir_umask &&
-- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-- then
-- if test -z "$dir_arg" || {
-- # Check for POSIX incompatibilities with -m.
-- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-- # other-writable bit of parent directory when it shouldn't.
-- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-- ls_ld_tmpdir=`ls -ld "$tmpdir"`
-- case $ls_ld_tmpdir in
-- d????-?r-*) different_mode=700;;
-- d????-?--*) different_mode=755;;
-- *) false;;
-- esac &&
-- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-- }
-- }
-- then posix_mkdir=:
-- fi
-- rmdir "$tmpdir/d" "$tmpdir"
-- else
-- # Remove any dirs left behind by ancient mkdir implementations.
-- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-- fi
-- trap '' 0;;
-- esac;;
-- esac
--
-- if
-- $posix_mkdir && (
-- umask $mkdir_umask &&
-- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-- )
-- then :
-- else
--
-- # The umask is ridiculous, or mkdir does not conform to POSIX,
-- # or it failed possibly due to a race condition. Create the
-- # directory the slow way, step by step, checking for races as we go.
--
-- case $dstdir in
-- /*) prefix='/';;
-- [-=\(\)!]*) prefix='./';;
-- *) prefix='';;
-- esac
--
-- eval "$initialize_posix_glob"
--
-- oIFS=$IFS
-- IFS=/
-- $posix_glob set -f
-- set fnord $dstdir
-- shift
-- $posix_glob set +f
-- IFS=$oIFS
--
-- prefixes=
--
-- for d
-- do
-- test X"$d" = X && continue
--
-- prefix=$prefix$d
-- if test -d "$prefix"; then
-- prefixes=
-- else
-- if $posix_mkdir; then
-- (umask=$mkdir_umask &&
-- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-- # Don't fail if two instances are running concurrently.
-- test -d "$prefix" || exit 1
-- else
-- case $prefix in
-- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) qprefix=$prefix;;
-- esac
-- prefixes="$prefixes '$qprefix'"
-- fi
-- fi
-- prefix=$prefix/
-- done
--
-- if test -n "$prefixes"; then
-- # Don't fail if two instances are running concurrently.
-- (umask $mkdir_umask &&
-- eval "\$doit_exec \$mkdirprog $prefixes") ||
-- test -d "$dstdir" || exit 1
-- obsolete_mkdir_used=true
-- fi
-- fi
-- fi
--
-- if test -n "$dir_arg"; then
-- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-- else
--
-- # Make a couple of temp file names in the proper directory.
-- dsttmp=$dstdir/_inst.$$_
-- rmtmp=$dstdir/_rm.$$_
--
-- # Trap to clean up those temp files at exit.
-- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
--
-- # Copy the file name to the temp name.
-- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
--
-- # and set any options; do chmod last to preserve setuid bits.
-- #
-- # If any of these fail, we abort the whole thing. If we want to
-- # ignore errors from any of these, just make sure not to ignore
-- # errors from the above "$doit $cpprog $src $dsttmp" command.
-- #
-- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
--
-- # If -C, don't bother to copy if it wouldn't change the file.
-- if $copy_on_change &&
-- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
-- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
--
-- eval "$initialize_posix_glob" &&
-- $posix_glob set -f &&
-- set X $old && old=:$2:$4:$5:$6 &&
-- set X $new && new=:$2:$4:$5:$6 &&
-- $posix_glob set +f &&
--
-- test "$old" = "$new" &&
-- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-- then
-- rm -f "$dsttmp"
-- else
-- # Rename the file to the real destination.
-- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
--
-- # The rename failed, perhaps because mv can't rename something else
-- # to itself, or perhaps because mv is so ancient that it does not
-- # support -f.
-- {
-- # Now remove or move aside any old file at destination location.
-- # We try this two ways since rm can't unlink itself on some
-- # systems and the destination file might be busy for other
-- # reasons. In this case, the final cleanup might fail but the new
-- # file should still install successfully.
-- {
-- test ! -f "$dst" ||
-- $doit $rmcmd -f "$dst" 2>/dev/null ||
-- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-- } ||
-- { echo "$0: cannot unlink or rename $dst" >&2
-- (exit 1); exit 1
-- }
-- } &&
--
-- # Now rename the file to the real destination.
-- $doit $mvcmd "$dsttmp" "$dst"
-- }
-- fi || exit 1
--
-- trap '' 0
-- fi
--done
--
--# Local variables:
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
--# End:
diff --cc scripts/mdate-sh
index b3719cf,b3719cf..0000000
deleted file mode 100755,100755
--- a/scripts/mdate-sh
+++ /dev/null
@@@ -1,224 -1,224 +1,0 @@@
--#!/bin/sh
--# Get modification time of a file or directory and pretty-print it.
--
--scriptversion=2010-08-21.06; # UTC
--
--# Copyright (C) 1995-2013 Free Software Foundation, Inc.
--# written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, June 1995
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--#
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program. If not, see <http://www.gnu.org/licenses/>.
--
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# This file is maintained in Automake, please report
--# bugs to <bug-automake at gnu.org> or send patches to
--# <automake-patches at gnu.org>.
--
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-- emulate sh
-- NULLCMD=:
-- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-- # is contrary to our usage. Disable this feature.
-- alias -g '${1+"$@"}'='"$@"'
-- setopt NO_GLOB_SUBST
--fi
--
--case $1 in
-- '')
-- echo "$0: No file. Try '$0 --help' for more information." 1>&2
-- exit 1;
-- ;;
-- -h | --h*)
-- cat <<\EOF
--Usage: mdate-sh [--help] [--version] FILE
--
--Pretty-print the modification day of FILE, in the format:
--1 January 1970
--
--Report bugs to <bug-automake at gnu.org>.
--EOF
-- exit $?
-- ;;
-- -v | --v*)
-- echo "mdate-sh $scriptversion"
-- exit $?
-- ;;
--esac
--
--error ()
--{
-- echo "$0: $1" >&2
-- exit 1
--}
--
--
--# Prevent date giving response in another language.
--LANG=C
--export LANG
--LC_ALL=C
--export LC_ALL
--LC_TIME=C
--export LC_TIME
--
--# GNU ls changes its time format in response to the TIME_STYLE
--# variable. Since we cannot assume 'unset' works, revert this
--# variable to its documented default.
--if test "${TIME_STYLE+set}" = set; then
-- TIME_STYLE=posix-long-iso
-- export TIME_STYLE
--fi
--
--save_arg1=$1
--
--# Find out how to get the extended ls output of a file or directory.
--if ls -L /dev/null 1>/dev/null 2>&1; then
-- ls_command='ls -L -l -d'
--else
-- ls_command='ls -l -d'
--fi
--# Avoid user/group names that might have spaces, when possible.
--if ls -n /dev/null 1>/dev/null 2>&1; then
-- ls_command="$ls_command -n"
--fi
--
--# A 'ls -l' line looks as follows on OS/2.
--# drwxrwx--- 0 Aug 11 2001 foo
--# This differs from Unix, which adds ownership information.
--# drwxrwx--- 2 root root 4096 Aug 11 2001 foo
--#
--# To find the date, we split the line on spaces and iterate on words
--# until we find a month. This cannot work with files whose owner is a
--# user named "Jan", or "Feb", etc. However, it's unlikely that '/'
--# will be owned by a user whose name is a month. So we first look at
--# the extended ls output of the root directory to decide how many
--# words should be skipped to get the date.
--
--# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
--set x`$ls_command /`
--
--# Find which argument is the month.
--month=
--command=
--until test $month
--do
-- test $# -gt 0 || error "failed parsing '$ls_command /' output"
-- shift
-- # Add another shift to the command.
-- command="$command shift;"
-- case $1 in
-- Jan) month=January; nummonth=1;;
-- Feb) month=February; nummonth=2;;
-- Mar) month=March; nummonth=3;;
-- Apr) month=April; nummonth=4;;
-- May) month=May; nummonth=5;;
-- Jun) month=June; nummonth=6;;
-- Jul) month=July; nummonth=7;;
-- Aug) month=August; nummonth=8;;
-- Sep) month=September; nummonth=9;;
-- Oct) month=October; nummonth=10;;
-- Nov) month=November; nummonth=11;;
-- Dec) month=December; nummonth=12;;
-- esac
--done
--
--test -n "$month" || error "failed parsing '$ls_command /' output"
--
--# Get the extended ls output of the file or directory.
--set dummy x`eval "$ls_command \"\\\$save_arg1\""`
--
--# Remove all preceding arguments
--eval $command
--
--# Because of the dummy argument above, month is in $2.
--#
--# On a POSIX system, we should have
--#
--# $# = 5
--# $1 = file size
--# $2 = month
--# $3 = day
--# $4 = year or time
--# $5 = filename
--#
--# On Darwin 7.7.0 and 7.6.0, we have
--#
--# $# = 4
--# $1 = day
--# $2 = month
--# $3 = year or time
--# $4 = filename
--
--# Get the month.
--case $2 in
-- Jan) month=January; nummonth=1;;
-- Feb) month=February; nummonth=2;;
-- Mar) month=March; nummonth=3;;
-- Apr) month=April; nummonth=4;;
-- May) month=May; nummonth=5;;
-- Jun) month=June; nummonth=6;;
-- Jul) month=July; nummonth=7;;
-- Aug) month=August; nummonth=8;;
-- Sep) month=September; nummonth=9;;
-- Oct) month=October; nummonth=10;;
-- Nov) month=November; nummonth=11;;
-- Dec) month=December; nummonth=12;;
--esac
--
--case $3 in
-- ???*) day=$1;;
-- *) day=$3; shift;;
--esac
--
--# Here we have to deal with the problem that the ls output gives either
--# the time of day or the year.
--case $3 in
-- *:*) set `date`; eval year=\$$#
-- case $2 in
-- Jan) nummonthtod=1;;
-- Feb) nummonthtod=2;;
-- Mar) nummonthtod=3;;
-- Apr) nummonthtod=4;;
-- May) nummonthtod=5;;
-- Jun) nummonthtod=6;;
-- Jul) nummonthtod=7;;
-- Aug) nummonthtod=8;;
-- Sep) nummonthtod=9;;
-- Oct) nummonthtod=10;;
-- Nov) nummonthtod=11;;
-- Dec) nummonthtod=12;;
-- esac
-- # For the first six month of the year the time notation can also
-- # be used for files modified in the last year.
-- if (expr $nummonth \> $nummonthtod) > /dev/null;
-- then
-- year=`expr $year - 1`
-- fi;;
-- *) year=$3;;
--esac
--
--# The result.
--echo $day $month $year
--
--# Local Variables:
--# mode: shell-script
--# sh-indentation: 2
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
--# End:
diff --cc scripts/missing
index db98974,db98974..0000000
deleted file mode 100755,100755
--- a/scripts/missing
+++ /dev/null
@@@ -1,215 -1,215 +1,0 @@@
--#! /bin/sh
--# Common wrapper for a few potentially missing GNU programs.
--
--scriptversion=2013-10-28.13; # UTC
--
--# Copyright (C) 1996-2013 Free Software Foundation, Inc.
--# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program. If not, see <http://www.gnu.org/licenses/>.
--
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--if test $# -eq 0; then
-- echo 1>&2 "Try '$0 --help' for more information"
-- exit 1
--fi
--
--case $1 in
--
-- --is-lightweight)
-- # Used by our autoconf macros to check whether the available missing
-- # script is modern enough.
-- exit 0
-- ;;
--
-- --run)
-- # Back-compat with the calling convention used by older automake.
-- shift
-- ;;
--
-- -h|--h|--he|--hel|--help)
-- echo "\
--$0 [OPTION]... PROGRAM [ARGUMENT]...
--
--Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
--to PROGRAM being missing or too old.
--
--Options:
-- -h, --help display this help and exit
-- -v, --version output version information and exit
--
--Supported PROGRAM values:
-- aclocal autoconf autoheader autom4te automake makeinfo
-- bison yacc flex lex help2man
--
--Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
--'g' are ignored when checking the name.
--
--Send bug reports to <bug-automake at gnu.org>."
-- exit $?
-- ;;
--
-- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-- echo "missing $scriptversion (GNU Automake)"
-- exit $?
-- ;;
--
-- -*)
-- echo 1>&2 "$0: unknown '$1' option"
-- echo 1>&2 "Try '$0 --help' for more information"
-- exit 1
-- ;;
--
--esac
--
--# Run the given program, remember its exit status.
--"$@"; st=$?
--
--# If it succeeded, we are done.
--test $st -eq 0 && exit 0
--
--# Also exit now if we it failed (or wasn't found), and '--version' was
--# passed; such an option is passed most likely to detect whether the
--# program is present and works.
--case $2 in --version|--help) exit $st;; esac
--
--# Exit code 63 means version mismatch. This often happens when the user
--# tries to use an ancient version of a tool on a file that requires a
--# minimum version.
--if test $st -eq 63; then
-- msg="probably too old"
--elif test $st -eq 127; then
-- # Program was missing.
-- msg="missing on your system"
--else
-- # Program was found and executed, but failed. Give up.
-- exit $st
--fi
--
--perl_URL=http://www.perl.org/
--flex_URL=http://flex.sourceforge.net/
--gnu_software_URL=http://www.gnu.org/software
--
--program_details ()
--{
-- case $1 in
-- aclocal|automake)
-- echo "The '$1' program is part of the GNU Automake package:"
-- echo "<$gnu_software_URL/automake>"
-- echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-- echo "<$gnu_software_URL/autoconf>"
-- echo "<$gnu_software_URL/m4/>"
-- echo "<$perl_URL>"
-- ;;
-- autoconf|autom4te|autoheader)
-- echo "The '$1' program is part of the GNU Autoconf package:"
-- echo "<$gnu_software_URL/autoconf/>"
-- echo "It also requires GNU m4 and Perl in order to run:"
-- echo "<$gnu_software_URL/m4/>"
-- echo "<$perl_URL>"
-- ;;
-- esac
--}
--
--give_advice ()
--{
-- # Normalize program name to check for.
-- normalized_program=`echo "$1" | sed '
-- s/^gnu-//; t
-- s/^gnu//; t
-- s/^g//; t'`
--
-- printf '%s\n' "'$1' is $msg."
--
-- configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-- case $normalized_program in
-- autoconf*)
-- echo "You should only need it if you modified 'configure.ac',"
-- echo "or m4 files included by it."
-- program_details 'autoconf'
-- ;;
-- autoheader*)
-- echo "You should only need it if you modified 'acconfig.h' or"
-- echo "$configure_deps."
-- program_details 'autoheader'
-- ;;
-- automake*)
-- echo "You should only need it if you modified 'Makefile.am' or"
-- echo "$configure_deps."
-- program_details 'automake'
-- ;;
-- aclocal*)
-- echo "You should only need it if you modified 'acinclude.m4' or"
-- echo "$configure_deps."
-- program_details 'aclocal'
-- ;;
-- autom4te*)
-- echo "You might have modified some maintainer files that require"
-- echo "the 'autom4te' program to be rebuilt."
-- program_details 'autom4te'
-- ;;
-- bison*|yacc*)
-- echo "You should only need it if you modified a '.y' file."
-- echo "You may want to install the GNU Bison package:"
-- echo "<$gnu_software_URL/bison/>"
-- ;;
-- lex*|flex*)
-- echo "You should only need it if you modified a '.l' file."
-- echo "You may want to install the Fast Lexical Analyzer package:"
-- echo "<$flex_URL>"
-- ;;
-- help2man*)
-- echo "You should only need it if you modified a dependency" \
-- "of a man page."
-- echo "You may want to install the GNU Help2man package:"
-- echo "<$gnu_software_URL/help2man/>"
-- ;;
-- makeinfo*)
-- echo "You should only need it if you modified a '.texi' file, or"
-- echo "any other file indirectly affecting the aspect of the manual."
-- echo "You might want to install the Texinfo package:"
-- echo "<$gnu_software_URL/texinfo/>"
-- echo "The spurious makeinfo call might also be the consequence of"
-- echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-- echo "want to install GNU make:"
-- echo "<$gnu_software_URL/make/>"
-- ;;
-- *)
-- echo "You might have modified some files without having the proper"
-- echo "tools for further handling them. Check the 'README' file, it"
-- echo "often tells you about the needed prerequisites for installing"
-- echo "this package. You may also peek at any GNU archive site, in"
-- echo "case some other package contains this missing '$1' program."
-- ;;
-- esac
--}
--
--give_advice "$1" | sed -e '1s/^/WARNING: /' \
-- -e '2,$s/^/ /' >&2
--
--# Propagate the correct exit status (expected to be 127 for a program
--# not found, 63 for a program that failed due to version mismatch).
--exit $st
--
--# Local variables:
--# eval: (add-hook 'write-file-hooks 'time-stamp)
--# time-stamp-start: "scriptversion="
--# time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
--# End:
diff --cc scripts/texinfo.tex
index 47008b0,47008b0..0000000
deleted file mode 100644,100644
--- a/scripts/texinfo.tex
+++ /dev/null
@@@ -1,10079 -1,10079 +1,0 @@@
--% texinfo.tex -- TeX macros to handle Texinfo files.
--%
--% Load plain if necessary, i.e., if running under initex.
--\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
--%
--\def\texinfoversion{2013-02-01.11}
--%
--% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
--% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
--%
--% This texinfo.tex file is free software: you can redistribute it and/or
--% modify it under the terms of the GNU General Public License as
--% published by the Free Software Foundation, either version 3 of the
--% License, or (at your option) any later version.
--%
--% This texinfo.tex file is distributed in the hope that it will be
--% useful, but WITHOUT ANY WARRANTY; without even the implied warranty
--% of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--% General Public License for more details.
--%
--% You should have received a copy of the GNU General Public License
--% along with this program. If not, see <http://www.gnu.org/licenses/>.
--%
--% As a special exception, when this file is read by TeX when processing
--% a Texinfo source document, you may use the result without
--% restriction. This Exception is an additional permission under section 7
--% of the GNU General Public License, version 3 ("GPLv3").
--%
--% Please try the latest version of texinfo.tex before submitting bug
--% reports; you can get the latest version from:
--% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
--% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
--% http://www.gnu.org/software/texinfo/ (the Texinfo home page)
--% The texinfo.tex in any given distribution could well be out
--% of date, so if that's what you're using, please check.
--%
--% Send bug reports to bug-texinfo at gnu.org. Please include including a
--% complete document in each bug report with which we can reproduce the
--% problem. Patches are, of course, greatly appreciated.
--%
--% To process a Texinfo manual with TeX, it's most reliable to use the
--% texi2dvi shell script that comes with the distribution. For a simple
--% manual foo.texi, however, you can get away with this:
--% tex foo.texi
--% texindex foo.??
--% tex foo.texi
--% tex foo.texi
--% dvips foo.dvi -o # or whatever; this makes foo.ps.
--% The extra TeX runs get the cross-reference information correct.
--% Sometimes one run after texindex suffices, and sometimes you need more
--% than two; texi2dvi does it as many times as necessary.
--%
--% It is possible to adapt texinfo.tex for other languages, to some
--% extent. You can get the existing language-specific files from the
--% full Texinfo distribution.
--%
--% The GNU Texinfo home page is http://www.gnu.org/software/texinfo.
--
--
--\message{Loading texinfo [version \texinfoversion]:}
--
--% If in a .fmt file, print the version number
--% and turn on active characters that we couldn't do earlier because
--% they might have appeared in the input file name.
--\everyjob{\message{[Texinfo version \texinfoversion]}%
-- \catcode`+=\active \catcode`\_=\active}
--
--\chardef\other=12
--
--% We never want plain's \outer definition of \+ in Texinfo.
--% For @tex, we can use \tabalign.
--\let\+ = \relax
--
--% Save some plain tex macros whose names we will redefine.
--\let\ptexb=\b
--\let\ptexbullet=\bullet
--\let\ptexc=\c
--\let\ptexcomma=\,
--\let\ptexdot=\.
--\let\ptexdots=\dots
--\let\ptexend=\end
--\let\ptexequiv=\equiv
--\let\ptexexclam=\!
--\let\ptexfootnote=\footnote
--\let\ptexgtr=>
--\let\ptexhat=^
--\let\ptexi=\i
--\let\ptexindent=\indent
--\let\ptexinsert=\insert
--\let\ptexlbrace=\{
--\let\ptexless=<
--\let\ptexnewwrite\newwrite
--\let\ptexnoindent=\noindent
--\let\ptexplus=+
--\let\ptexraggedright=\raggedright
--\let\ptexrbrace=\}
--\let\ptexslash=\/
--\let\ptexstar=\*
--\let\ptext=\t
--\let\ptextop=\top
--{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode
--
--% If this character appears in an error message or help string, it
--% starts a new line in the output.
--\newlinechar = `^^J
--
--% Use TeX 3.0's \inputlineno to get the line number, for better error
--% messages, but if we're using an old version of TeX, don't do anything.
--%
--\ifx\inputlineno\thisisundefined
-- \let\linenumber = \empty % Pre-3.0.
--\else
-- \def\linenumber{l.\the\inputlineno:\space}
--\fi
--
--% Set up fixed words for English if not already set.
--\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi
--\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi
--\ifx\putworderror\undefined \gdef\putworderror{error}\fi
--\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi
--\ifx\putwordin\undefined \gdef\putwordin{in}\fi
--\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
--\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
--\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi
--\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
--\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi
--\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi
--\ifx\putwordof\undefined \gdef\putwordof{of}\fi
--\ifx\putwordon\undefined \gdef\putwordon{on}\fi
--\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi
--\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi
--\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi
--\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi
--\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi
--\ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi
--\ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi
--%
--\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi
--\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi
--\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi
--\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi
--\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi
--\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi
--\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi
--\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi
--\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi
--\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi
--\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi
--\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi
--%
--\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi
--\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi
--\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi
--\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi
--\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi
--
--% Since the category of space is not known, we have to be careful.
--\chardef\spacecat = 10
--\def\spaceisspace{\catcode`\ =\spacecat}
--
--% sometimes characters are active, so we need control sequences.
--\chardef\ampChar = `\&
--\chardef\colonChar = `\:
--\chardef\commaChar = `\,
--\chardef\dashChar = `\-
--\chardef\dotChar = `\.
--\chardef\exclamChar= `\!
--\chardef\hashChar = `\#
--\chardef\lquoteChar= `\`
--\chardef\questChar = `\?
--\chardef\rquoteChar= `\'
--\chardef\semiChar = `\;
--\chardef\slashChar = `\/
--\chardef\underChar = `\_
--
--% Ignore a token.
--%
--\def\gobble#1{}
--
--% The following is used inside several \edef's.
--\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname}
--
--% Hyphenation fixes.
--\hyphenation{
-- Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script
-- ap-pen-dix bit-map bit-maps
-- data-base data-bases eshell fall-ing half-way long-est man-u-script
-- man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm
-- par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces
-- spell-ing spell-ings
-- stand-alone strong-est time-stamp time-stamps which-ever white-space
-- wide-spread wrap-around
--}
--
--% Margin to add to right of even pages, to left of odd pages.
--\newdimen\bindingoffset
--\newdimen\normaloffset
--\newdimen\pagewidth \newdimen\pageheight
--
--% For a final copy, take out the rectangles
--% that mark overfull boxes (in case you have decided
--% that the text looks ok even though it passes the margin).
--%
--\def\finalout{\overfullrule=0pt }
--
--% Sometimes it is convenient to have everything in the transcript file
--% and nothing on the terminal. We don't just call \tracingall here,
--% since that produces some useless output on the terminal. We also make
--% some effort to order the tracing commands to reduce output in the log
--% file; cf. trace.sty in LaTeX.
--%
--\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
--\def\loggingall{%
-- \tracingstats2
-- \tracingpages1
-- \tracinglostchars2 % 2 gives us more in etex
-- \tracingparagraphs1
-- \tracingoutput1
-- \tracingmacros2
-- \tracingrestores1
-- \showboxbreadth\maxdimen \showboxdepth\maxdimen
-- \ifx\eTeXversion\thisisundefined\else % etex gives us more logging
-- \tracingscantokens1
-- \tracingifs1
-- \tracinggroups1
-- \tracingnesting2
-- \tracingassigns1
-- \fi
-- \tracingcommands3 % 3 gives us more in etex
-- \errorcontextlines16
--}%
--
--% @errormsg{MSG}. Do the index-like expansions on MSG, but if things
--% aren't perfect, it's not the end of the world, being an error message,
--% after all.
--%
--\def\errormsg{\begingroup \indexnofonts \doerrormsg}
--\def\doerrormsg#1{\errmessage{#1}}
--
--% add check for \lastpenalty to plain's definitions. If the last thing
--% we did was a \nobreak, we don't want to insert more space.
--%
--\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount
-- \removelastskip\penalty-50\smallskip\fi\fi}
--\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount
-- \removelastskip\penalty-100\medskip\fi\fi}
--\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
-- \removelastskip\penalty-200\bigskip\fi\fi}
--
--% Do @cropmarks to get crop marks.
--%
--\newif\ifcropmarks
--\let\cropmarks = \cropmarkstrue
--%
--% Dimensions to add cropmarks at corners.
--% Added by P. A. MacKay, 12 Nov. 1986
--%
--\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
--\newdimen\cornerlong \cornerlong=1pc
--\newdimen\cornerthick \cornerthick=.3pt
--\newdimen\topandbottommargin \topandbottommargin=.75in
--
--% Output a mark which sets \thischapter, \thissection and \thiscolor.
--% We dump everything together because we only have one kind of mark.
--% This works because we only use \botmark / \topmark, not \firstmark.
--%
--% A mark contains a subexpression of the \ifcase ... \fi construct.
--% \get*marks macros below extract the needed part using \ifcase.
--%
--% Another complication is to let the user choose whether \thischapter
--% (\thissection) refers to the chapter (section) in effect at the top
--% of a page, or that at the bottom of a page. The solution is
--% described on page 260 of The TeXbook. It involves outputting two
--% marks for the sectioning macros, one before the section break, and
--% one after. I won't pretend I can describe this better than DEK...
--\def\domark{%
-- \toks0=\expandafter{\lastchapterdefs}%
-- \toks2=\expandafter{\lastsectiondefs}%
-- \toks4=\expandafter{\prevchapterdefs}%
-- \toks6=\expandafter{\prevsectiondefs}%
-- \toks8=\expandafter{\lastcolordefs}%
-- \mark{%
-- \the\toks0 \the\toks2
-- \noexpand\or \the\toks4 \the\toks6
-- \noexpand\else \the\toks8
-- }%
--}
--% \topmark doesn't work for the very first chapter (after the title
--% page or the contents), so we use \firstmark there -- this gets us
--% the mark with the chapter defs, unless the user sneaks in, e.g.,
--% @setcolor (or @url, or @link, etc.) between @contents and the very
--% first @chapter.
--\def\gettopheadingmarks{%
-- \ifcase0\topmark\fi
-- \ifx\thischapter\empty \ifcase0\firstmark\fi \fi
--}
--\def\getbottomheadingmarks{\ifcase1\botmark\fi}
--\def\getcolormarks{\ifcase2\topmark\fi}
--
--% Avoid "undefined control sequence" errors.
--\def\lastchapterdefs{}
--\def\lastsectiondefs{}
--\def\prevchapterdefs{}
--\def\prevsectiondefs{}
--\def\lastcolordefs{}
--
--% Main output routine.
--\chardef\PAGE = 255
--\output = {\onepageout{\pagecontents\PAGE}}
--
--\newbox\headlinebox
--\newbox\footlinebox
--
--% \onepageout takes a vbox as an argument. Note that \pagecontents
--% does insertions, but you have to call it yourself.
--\def\onepageout#1{%
-- \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
-- %
-- \ifodd\pageno \advance\hoffset by \bindingoffset
-- \else \advance\hoffset by -\bindingoffset\fi
-- %
-- % Do this outside of the \shipout so @code etc. will be expanded in
-- % the headline as they should be, not taken literally (outputting ''code).
-- \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
-- \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
-- \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
-- \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
-- %
-- {%
-- % Have to do this stuff outside the \shipout because we want it to
-- % take effect in \write's, yet the group defined by the \vbox ends
-- % before the \shipout runs.
-- %
-- \indexdummies % don't expand commands in the output.
-- \normalturnoffactive % \ in index entries must not stay \, e.g., if
-- % the page break happens to be in the middle of an example.
-- % We don't want .vr (or whatever) entries like this:
-- % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
-- % "\acronym" won't work when it's read back in;
-- % it needs to be
-- % {\code {{\tt \backslashcurfont }acronym}
-- \shipout\vbox{%
-- % Do this early so pdf references go to the beginning of the page.
-- \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
-- %
-- \ifcropmarks \vbox to \outervsize\bgroup
-- \hsize = \outerhsize
-- \vskip-\topandbottommargin
-- \vtop to0pt{%
-- \line{\ewtop\hfil\ewtop}%
-- \nointerlineskip
-- \line{%
-- \vbox{\moveleft\cornerthick\nstop}%
-- \hfill
-- \vbox{\moveright\cornerthick\nstop}%
-- }%
-- \vss}%
-- \vskip\topandbottommargin
-- \line\bgroup
-- \hfil % center the page within the outer (page) hsize.
-- \ifodd\pageno\hskip\bindingoffset\fi
-- \vbox\bgroup
-- \fi
-- %
-- \unvbox\headlinebox
-- \pagebody{#1}%
-- \ifdim\ht\footlinebox > 0pt
-- % Only leave this space if the footline is nonempty.
-- % (We lessened \vsize for it in \oddfootingyyy.)
-- % The \baselineskip=24pt in plain's \makefootline has no effect.
-- \vskip 24pt
-- \unvbox\footlinebox
-- \fi
-- %
-- \ifcropmarks
-- \egroup % end of \vbox\bgroup
-- \hfil\egroup % end of (centering) \line\bgroup
-- \vskip\topandbottommargin plus1fill minus1fill
-- \boxmaxdepth = \cornerthick
-- \vbox to0pt{\vss
-- \line{%
-- \vbox{\moveleft\cornerthick\nsbot}%
-- \hfill
-- \vbox{\moveright\cornerthick\nsbot}%
-- }%
-- \nointerlineskip
-- \line{\ewbot\hfil\ewbot}%
-- }%
-- \egroup % \vbox from first cropmarks clause
-- \fi
-- }% end of \shipout\vbox
-- }% end of group with \indexdummies
-- \advancepageno
-- \ifnum\outputpenalty>-20000 \else\dosupereject\fi
--}
--
--\newinsert\margin \dimen\margin=\maxdimen
--
--\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}}
--{\catcode`\@ =11
--\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi
--% marginal hacks, juha at viisa.uucp (Juha Takala)
--\ifvoid\margin\else % marginal info is present
-- \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi
--\dimen@=\dp#1\relax \unvbox#1\relax
--\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
--\ifr at ggedbottom \kern-\dimen@ \vfil \fi}
--}
--
--% Here are the rules for the cropmarks. Note that they are
--% offset so that the space between them is truly \outerhsize or \outervsize
--% (P. A. MacKay, 12 November, 1986)
--%
--\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong}
--\def\nstop{\vbox
-- {\hrule height\cornerthick depth\cornerlong width\cornerthick}}
--\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong}
--\def\nsbot{\vbox
-- {\hrule height\cornerlong depth\cornerthick width\cornerthick}}
--
--% Parse an argument, then pass it to #1. The argument is the rest of
--% the input line (except we remove a trailing comment). #1 should be a
--% macro which expects an ordinary undelimited TeX argument.
--%
--\def\parsearg{\parseargusing{}}
--\def\parseargusing#1#2{%
-- \def\argtorun{#2}%
-- \begingroup
-- \obeylines
-- \spaceisspace
-- #1%
-- \parseargline\empty% Insert the \empty token, see \finishparsearg below.
--}
--
--{\obeylines %
-- \gdef\parseargline#1^^M{%
-- \endgroup % End of the group started in \parsearg.
-- \argremovecomment #1\comment\ArgTerm%
-- }%
--}
--
--% First remove any @comment, then any @c comment.
--\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
--\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
--
--% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
--%
--% \argremovec might leave us with trailing space, e.g.,
--% @end itemize @c foo
--% This space token undergoes the same procedure and is eventually removed
--% by \finishparsearg.
--%
--\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M}
--\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M}
--\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
-- \def\temp{#3}%
-- \ifx\temp\empty
-- % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
-- \let\temp\finishparsearg
-- \else
-- \let\temp\argcheckspaces
-- \fi
-- % Put the space token in:
-- \temp#1 #3\ArgTerm
--}
--
--% If a _delimited_ argument is enclosed in braces, they get stripped; so
--% to get _exactly_ the rest of the line, we had to prevent such situation.
--% We prepended an \empty token at the very beginning and we expand it now,
--% just before passing the control to \argtorun.
--% (Similarly, we have to think about #3 of \argcheckspacesY above: it is
--% either the null string, or it ends with \^^M---thus there is no danger
--% that a pair of braces would be stripped.
--%
--% But first, we have to remove the trailing space token.
--%
--\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
--
--% \parseargdef\foo{...}
--% is roughly equivalent to
--% \def\foo{\parsearg\Xfoo}
--% \def\Xfoo#1{...}
--%
--% Actually, I use \csname\string\foo\endcsname, ie. \\foo, as it is my
--% favourite TeX trick. --kasal, 16nov03
--
--\def\parseargdef#1{%
-- \expandafter \doparseargdef \csname\string#1\endcsname #1%
--}
--\def\doparseargdef#1#2{%
-- \def#2{\parsearg#1}%
-- \def#1##1%
--}
--
--% Several utility definitions with active space:
--{
-- \obeyspaces
-- \gdef\obeyedspace{ }
--
-- % Make each space character in the input produce a normal interword
-- % space in the output. Don't allow a line break at this space, as this
-- % is used only in environments like @example, where each line of input
-- % should produce a line of output anyway.
-- %
-- \gdef\sepspaces{\obeyspaces\let =\tie}
--
-- % If an index command is used in an @example environment, any spaces
-- % therein should become regular spaces in the raw index file, not the
-- % expansion of \tie (\leavevmode \penalty \@M \ ).
-- \gdef\unsepspaces{\let =\space}
--}
--
--
--\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next}
--
--% Define the framework for environments in texinfo.tex. It's used like this:
--%
--% \envdef\foo{...}
--% \def\Efoo{...}
--%
--% It's the responsibility of \envdef to insert \begingroup before the
--% actual body; @end closes the group after calling \Efoo. \envdef also
--% defines \thisenv, so the current environment is known; @end checks
--% whether the environment name matches. The \checkenv macro can also be
--% used to check whether the current environment is the one expected.
--%
--% Non-false conditionals (@iftex, @ifset) don't fit into this, so they
--% are not treated as environments; they don't open a group. (The
--% implementation of @end takes care not to call \endgroup in this
--% special case.)
--
--
--% At run-time, environments start with this:
--\def\startenvironment#1{\begingroup\def\thisenv{#1}}
--% initialize
--\let\thisenv\empty
--
--% ... but they get defined via ``\envdef\foo{...}'':
--\long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
--\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
--
--% Check whether we're in the right environment:
--\def\checkenv#1{%
-- \def\temp{#1}%
-- \ifx\thisenv\temp
-- \else
-- \badenverr
-- \fi
--}
--
--% Environment mismatch, #1 expected:
--\def\badenverr{%
-- \errhelp = \EMsimple
-- \errmessage{This command can appear only \inenvironment\temp,
-- not \inenvironment\thisenv}%
--}
--\def\inenvironment#1{%
-- \ifx#1\empty
-- outside of any environment%
-- \else
-- in environment \expandafter\string#1%
-- \fi
--}
--
--% @end foo executes the definition of \Efoo.
--% But first, it executes a specialized version of \checkenv
--%
--\parseargdef\end{%
-- \if 1\csname iscond.#1\endcsname
-- \else
-- % The general wording of \badenverr may not be ideal.
-- \expandafter\checkenv\csname#1\endcsname
-- \csname E#1\endcsname
-- \endgroup
-- \fi
--}
--
--\newhelp\EMsimple{Press RETURN to continue.}
--
--
--% Be sure we're in horizontal mode when doing a tie, since we make space
--% equivalent to this in @example-like environments. Otherwise, a space
--% at the beginning of a line will start with \penalty -- and
--% since \penalty is valid in vertical mode, we'd end up putting the
--% penalty on the vertical list instead of in the new paragraph.
--{\catcode`@ = 11
-- % Avoid using \@M directly, because that causes trouble
-- % if the definition is written into an index file.
-- \global\let\tiepenalty = \@M
-- \gdef\tie{\leavevmode\penalty\tiepenalty\ }
--}
--
--% @: forces normal size whitespace following.
--\def\:{\spacefactor=1000 }
--
--% @* forces a line break.
--\def\*{\unskip\hfil\break\hbox{}\ignorespaces}
--
--% @/ allows a line break.
--\let\/=\allowbreak
--
--% @. is an end-of-sentence period.
--\def\.{.\spacefactor=\endofsentencespacefactor\space}
--
--% @! is an end-of-sentence bang.
--\def\!{!\spacefactor=\endofsentencespacefactor\space}
--
--% @? is an end-of-sentence query.
--\def\?{?\spacefactor=\endofsentencespacefactor\space}
--
--% @frenchspacing on|off says whether to put extra space after punctuation.
--%
--\def\onword{on}
--\def\offword{off}
--%
--\parseargdef\frenchspacing{%
-- \def\temp{#1}%
-- \ifx\temp\onword \plainfrenchspacing
-- \else\ifx\temp\offword \plainnonfrenchspacing
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @frenchspacing option `\temp', must be on|off}%
-- \fi\fi
--}
--
--% @w prevents a word break. Without the \leavevmode, @w at the
--% beginning of a paragraph, when TeX is still in vertical mode, would
--% produce a whole line of output instead of starting the paragraph.
--\def\w#1{\leavevmode\hbox{#1}}
--
--% @group ... @end group forces ... to be all on one page, by enclosing
--% it in a TeX vbox. We use \vtop instead of \vbox to construct the box
--% to keep its height that of a normal line. According to the rules for
--% \topskip (p.114 of the TeXbook), the glue inserted is
--% max (\topskip - \ht (first item), 0). If that height is large,
--% therefore, no glue is inserted, and the space between the headline and
--% the text is small, which looks bad.
--%
--% Another complication is that the group might be very large. This can
--% cause the glue on the previous page to be unduly stretched, because it
--% does not have much material. In this case, it's better to add an
--% explicit \vfill so that the extra space is at the bottom. The
--% threshold for doing this is if the group is more than \vfilllimit
--% percent of a page (\vfilllimit can be changed inside of @tex).
--%
--\newbox\groupbox
--\def\vfilllimit{0.7}
--%
--\envdef\group{%
-- \ifnum\catcode`\^^M=\active \else
-- \errhelp = \groupinvalidhelp
-- \errmessage{@group invalid in context where filling is enabled}%
-- \fi
-- \startsavinginserts
-- %
-- \setbox\groupbox = \vtop\bgroup
-- % Do @comment since we are called inside an environment such as
-- % @example, where each end-of-line in the input causes an
-- % end-of-line in the output. We don't want the end-of-line after
-- % the `@group' to put extra space in the output. Since @group
-- % should appear on a line by itself (according to the Texinfo
-- % manual), we don't worry about eating any user text.
-- \comment
--}
--%
--% The \vtop produces a box with normal height and large depth; thus, TeX puts
--% \baselineskip glue before it, and (when the next line of text is done)
--% \lineskip glue after it. Thus, space below is not quite equal to space
--% above. But it's pretty close.
--\def\Egroup{%
-- % To get correct interline space between the last line of the group
-- % and the first line afterwards, we have to propagate \prevdepth.
-- \endgraf % Not \par, as it may have been set to \lisppar.
-- \global\dimen1 = \prevdepth
-- \egroup % End the \vtop.
-- % \dimen0 is the vertical size of the group's box.
-- \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox
-- % \dimen2 is how much space is left on the page (more or less).
-- \dimen2 = \pageheight \advance\dimen2 by -\pagetotal
-- % if the group doesn't fit on the current page, and it's a big big
-- % group, force a page break.
-- \ifdim \dimen0 > \dimen2
-- \ifdim \pagetotal < \vfilllimit\pageheight
-- \page
-- \fi
-- \fi
-- \box\groupbox
-- \prevdepth = \dimen1
-- \checkinserts
--}
--%
--% TeX puts in an \escapechar (i.e., `@') at the beginning of the help
--% message, so this ends up printing `@group can only ...'.
--%
--\newhelp\groupinvalidhelp{%
--group can only be used in environments such as @example,^^J%
--where each line of input produces a line of output.}
--
--% @need space-in-mils
--% forces a page break if there is not space-in-mils remaining.
--
--\newdimen\mil \mil=0.001in
--
--\parseargdef\need{%
-- % Ensure vertical mode, so we don't make a big box in the middle of a
-- % paragraph.
-- \par
-- %
-- % If the @need value is less than one line space, it's useless.
-- \dimen0 = #1\mil
-- \dimen2 = \ht\strutbox
-- \advance\dimen2 by \dp\strutbox
-- \ifdim\dimen0 > \dimen2
-- %
-- % Do a \strut just to make the height of this box be normal, so the
-- % normal leading is inserted relative to the preceding line.
-- % And a page break here is fine.
-- \vtop to #1\mil{\strut\vfil}%
-- %
-- % TeX does not even consider page breaks if a penalty added to the
-- % main vertical list is 10000 or more. But in order to see if the
-- % empty box we just added fits on the page, we must make it consider
-- % page breaks. On the other hand, we don't want to actually break the
-- % page after the empty box. So we use a penalty of 9999.
-- %
-- % There is an extremely small chance that TeX will actually break the
-- % page at this \penalty, if there are no other feasible breakpoints in
-- % sight. (If the user is using lots of big @group commands, which
-- % almost-but-not-quite fill up a page, TeX will have a hard time doing
-- % good page breaking, for example.) However, I could not construct an
-- % example where a page broke at this \penalty; if it happens in a real
-- % document, then we can reconsider our strategy.
-- \penalty9999
-- %
-- % Back up by the size of the box, whether we did a page break or not.
-- \kern -#1\mil
-- %
-- % Do not allow a page break right after this kern.
-- \nobreak
-- \fi
--}
--
--% @br forces paragraph break (and is undocumented).
--
--\let\br = \par
--
--% @page forces the start of a new page.
--%
--\def\page{\par\vfill\supereject}
--
--% @exdent text....
--% outputs text on separate line in roman font, starting at standard page margin
--
--% This records the amount of indent in the innermost environment.
--% That's how much \exdent should take out.
--\newskip\exdentamount
--
--% This defn is used inside fill environments such as @defun.
--\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break}
--
--% This defn is used inside nofill environments such as @example.
--\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount
-- \leftline{\hskip\leftskip{\rm#1}}}}
--
--% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
--% paragraph. For more general purposes, use the \margin insertion
--% class. WHICH is `l' or `r'. Not documented, written for gawk manual.
--%
--\newskip\inmarginspacing \inmarginspacing=1cm
--\def\strutdepth{\dp\strutbox}
--%
--\def\doinmargin#1#2{\strut\vadjust{%
-- \nobreak
-- \kern-\strutdepth
-- \vtop to \strutdepth{%
-- \baselineskip=\strutdepth
-- \vss
-- % if you have multiple lines of stuff to put here, you'll need to
-- % make the vbox yourself of the appropriate size.
-- \ifx#1l%
-- \llap{\ignorespaces #2\hskip\inmarginspacing}%
-- \else
-- \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}%
-- \fi
-- \null
-- }%
--}}
--\def\inleftmargin{\doinmargin l}
--\def\inrightmargin{\doinmargin r}
--%
--% @inmargin{TEXT [, RIGHT-TEXT]}
--% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right;
--% else use TEXT for both).
--%
--\def\inmargin#1{\parseinmargin #1,,\finish}
--\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing.
-- \setbox0 = \hbox{\ignorespaces #2}%
-- \ifdim\wd0 > 0pt
-- \def\lefttext{#1}% have both texts
-- \def\righttext{#2}%
-- \else
-- \def\lefttext{#1}% have only one text
-- \def\righttext{#1}%
-- \fi
-- %
-- \ifodd\pageno
-- \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin
-- \else
-- \def\temp{\inleftmargin\lefttext}%
-- \fi
-- \temp
--}
--
--% @| inserts a changebar to the left of the current line. It should
--% surround any changed text. This approach does *not* work if the
--% change spans more than two lines of output. To handle that, we would
--% have adopt a much more difficult approach (putting marks into the main
--% vertical list for the beginning and end of each change). This command
--% is not documented, not supported, and doesn't work.
--%
--\def\|{%
-- % \vadjust can only be used in horizontal mode.
-- \leavevmode
-- %
-- % Append this vertical mode material after the current line in the output.
-- \vadjust{%
-- % We want to insert a rule with the height and depth of the current
-- % leading; that is exactly what \strutbox is supposed to record.
-- \vskip-\baselineskip
-- %
-- % \vadjust-items are inserted at the left edge of the type. So
-- % the \llap here moves out into the left-hand margin.
-- \llap{%
-- %
-- % For a thicker or thinner bar, change the `1pt'.
-- \vrule height\baselineskip width1pt
-- %
-- % This is the space between the bar and the text.
-- \hskip 12pt
-- }%
-- }%
--}
--
--% @include FILE -- \input text of FILE.
--%
--\def\include{\parseargusing\filenamecatcodes\includezzz}
--\def\includezzz#1{%
-- \pushthisfilestack
-- \def\thisfile{#1}%
-- {%
-- \makevalueexpandable % we want to expand any @value in FILE.
-- \turnoffactive % and allow special characters in the expansion
-- \indexnofonts % Allow `@@' and other weird things in file names.
-- \wlog{texinfo.tex: doing @include of #1^^J}%
-- \edef\temp{\noexpand\input #1 }%
-- %
-- % This trickery is to read FILE outside of a group, in case it makes
-- % definitions, etc.
-- \expandafter
-- }\temp
-- \popthisfilestack
--}
--\def\filenamecatcodes{%
-- \catcode`\\=\other
-- \catcode`~=\other
-- \catcode`^=\other
-- \catcode`_=\other
-- \catcode`|=\other
-- \catcode`<=\other
-- \catcode`>=\other
-- \catcode`+=\other
-- \catcode`-=\other
-- \catcode`\`=\other
-- \catcode`\'=\other
--}
--
--\def\pushthisfilestack{%
-- \expandafter\pushthisfilestackX\popthisfilestack\StackTerm
--}
--\def\pushthisfilestackX{%
-- \expandafter\pushthisfilestackY\thisfile\StackTerm
--}
--\def\pushthisfilestackY #1\StackTerm #2\StackTerm {%
-- \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}%
--}
--
--\def\popthisfilestack{\errthisfilestackempty}
--\def\errthisfilestackempty{\errmessage{Internal error:
-- the stack of filenames is empty.}}
--%
--\def\thisfile{}
--
--% @center line
--% outputs that line, centered.
--%
--\parseargdef\center{%
-- \ifhmode
-- \let\centersub\centerH
-- \else
-- \let\centersub\centerV
-- \fi
-- \centersub{\hfil \ignorespaces#1\unskip \hfil}%
-- \let\centersub\relax % don't let the definition persist, just in case
--}
--\def\centerH#1{{%
-- \hfil\break
-- \advance\hsize by -\leftskip
-- \advance\hsize by -\rightskip
-- \line{#1}%
-- \break
--}}
--%
--\newcount\centerpenalty
--\def\centerV#1{%
-- % The idea here is the same as in \startdefun, \cartouche, etc.: if
-- % @center is the first thing after a section heading, we need to wipe
-- % out the negative parskip inserted by \sectionheading, but still
-- % prevent a page break here.
-- \centerpenalty = \lastpenalty
-- \ifnum\centerpenalty>10000 \vskip\parskip \fi
-- \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi
-- \line{\kern\leftskip #1\kern\rightskip}%
--}
--
--% @sp n outputs n lines of vertical space
--%
--\parseargdef\sp{\vskip #1\baselineskip}
--
--% @comment ...line which is ignored...
--% @c is the same as @comment
--% @ignore ... @end ignore is another way to write a comment
--%
--\def\comment{\begingroup \catcode`\^^M=\other%
--\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
--\commentxxx}
--{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
--%
--\let\c=\comment
--
--% @paragraphindent NCHARS
--% We'll use ems for NCHARS, close enough.
--% NCHARS can also be the word `asis' or `none'.
--% We cannot feasibly implement @paragraphindent asis, though.
--%
--\def\asisword{asis} % no translation, these are keywords
--\def\noneword{none}
--%
--\parseargdef\paragraphindent{%
-- \def\temp{#1}%
-- \ifx\temp\asisword
-- \else
-- \ifx\temp\noneword
-- \defaultparindent = 0pt
-- \else
-- \defaultparindent = #1em
-- \fi
-- \fi
-- \parindent = \defaultparindent
--}
--
--% @exampleindent NCHARS
--% We'll use ems for NCHARS like @paragraphindent.
--% It seems @exampleindent asis isn't necessary, but
--% I preserve it to make it similar to @paragraphindent.
--\parseargdef\exampleindent{%
-- \def\temp{#1}%
-- \ifx\temp\asisword
-- \else
-- \ifx\temp\noneword
-- \lispnarrowing = 0pt
-- \else
-- \lispnarrowing = #1em
-- \fi
-- \fi
--}
--
--% @firstparagraphindent WORD
--% If WORD is `none', then suppress indentation of the first paragraph
--% after a section heading. If WORD is `insert', then do indent at such
--% paragraphs.
--%
--% The paragraph indentation is suppressed or not by calling
--% \suppressfirstparagraphindent, which the sectioning commands do.
--% We switch the definition of this back and forth according to WORD.
--% By default, we suppress indentation.
--%
--\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent}
--\def\insertword{insert}
--%
--\parseargdef\firstparagraphindent{%
-- \def\temp{#1}%
-- \ifx\temp\noneword
-- \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent
-- \else\ifx\temp\insertword
-- \let\suppressfirstparagraphindent = \relax
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @firstparagraphindent option `\temp'}%
-- \fi\fi
--}
--
--% Here is how we actually suppress indentation. Redefine \everypar to
--% \kern backwards by \parindent, and then reset itself to empty.
--%
--% We also make \indent itself not actually do anything until the next
--% paragraph.
--%
--\gdef\dosuppressfirstparagraphindent{%
-- \gdef\indent{%
-- \restorefirstparagraphindent
-- \indent
-- }%
-- \gdef\noindent{%
-- \restorefirstparagraphindent
-- \noindent
-- }%
-- \global\everypar = {%
-- \kern -\parindent
-- \restorefirstparagraphindent
-- }%
--}
--
--\gdef\restorefirstparagraphindent{%
-- \global \let \indent = \ptexindent
-- \global \let \noindent = \ptexnoindent
-- \global \everypar = {}%
--}
--
--
--% @refill is a no-op.
--\let\refill=\relax
--
--% If working on a large document in chapters, it is convenient to
--% be able to disable indexing, cross-referencing, and contents, for test runs.
--% This is done with @novalidate (before @setfilename).
--%
--\newif\iflinks \linkstrue % by default we want the aux files.
--\let\novalidate = \linksfalse
--
--% @setfilename is done at the beginning of every texinfo file.
--% So open here the files we need to have open while reading the input.
--% This makes it possible to make a .fmt file for texinfo.
--\def\setfilename{%
-- \fixbackslash % Turn off hack to swallow `\input texinfo'.
-- \iflinks
-- \tryauxfile
-- % Open the new aux file. TeX will close it automatically at exit.
-- \immediate\openout\auxfile=\jobname.aux
-- \fi % \openindices needs to do some work in any case.
-- \openindices
-- \let\setfilename=\comment % Ignore extra @setfilename cmds.
-- %
-- % If texinfo.cnf is present on the system, read it.
-- % Useful for site-wide @afourpaper, etc.
-- \openin 1 texinfo.cnf
-- \ifeof 1 \else \input texinfo.cnf \fi
-- \closein 1
-- %
-- \comment % Ignore the actual filename.
--}
--
--% Called from \setfilename.
--%
--\def\openindices{%
-- \newindex{cp}%
-- \newcodeindex{fn}%
-- \newcodeindex{vr}%
-- \newcodeindex{tp}%
-- \newcodeindex{ky}%
-- \newcodeindex{pg}%
--}
--
--% @bye.
--\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
--
--
--\message{pdf,}
--% adobe `portable' document format
--\newcount\tempnum
--\newcount\lnkcount
--\newtoks\filename
--\newcount\filenamelength
--\newcount\pgn
--\newtoks\toksA
--\newtoks\toksB
--\newtoks\toksC
--\newtoks\toksD
--\newbox\boxA
--\newcount\countA
--\newif\ifpdf
--\newif\ifpdfmakepagedest
--
--% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
--% can be set). So we test for \relax and 0 as well as being undefined.
--\ifx\pdfoutput\thisisundefined
--\else
-- \ifx\pdfoutput\relax
-- \else
-- \ifcase\pdfoutput
-- \else
-- \pdftrue
-- \fi
-- \fi
--\fi
--
--% PDF uses PostScript string constants for the names of xref targets,
--% for display in the outlines, and in other places. Thus, we have to
--% double any backslashes. Otherwise, a name like "\node" will be
--% interpreted as a newline (\n), followed by o, d, e. Not good.
--%
--% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and
--% related messages. The final outcome is that it is up to the TeX user
--% to double the backslashes and otherwise make the string valid, so
--% that's what we do. pdftex 1.30.0 (ca.2005) introduced a primitive to
--% do this reliably, so we use it.
--
--% #1 is a control sequence in which to do the replacements,
--% which we \xdef.
--\def\txiescapepdf#1{%
-- \ifx\pdfescapestring\thisisundefined
-- % No primitive available; should we give a warning or log?
-- % Many times it won't matter.
-- \else
-- % The expandable \pdfescapestring primitive escapes parentheses,
-- % backslashes, and other special chars.
-- \xdef#1{\pdfescapestring{#1}}%
-- \fi
--}
--
--\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
--with PDF output, and none of those formats could be found. (.eps cannot
--be supported due to the design of the PDF format; use regular TeX (DVI
--output) for that.)}
--
--\ifpdf
-- %
-- % Color manipulation macros based on pdfcolor.tex,
-- % except using rgb instead of cmyk; the latter is said to render as a
-- % very dark gray on-screen and a very dark halftone in print, instead
-- % of actual black.
-- \def\rgbDarkRed{0.50 0.09 0.12}
-- \def\rgbBlack{0 0 0}
-- %
-- % k sets the color for filling (usual text, etc.);
-- % K sets the color for stroking (thin rules, e.g., normal _'s).
-- \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}}
-- %
-- % Set color, and create a mark which defines \thiscolor accordingly,
-- % so that \makeheadline knows which color to restore.
-- \def\setcolor#1{%
-- \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
-- \domark
-- \pdfsetcolor{#1}%
-- }
-- %
-- \def\maincolor{\rgbBlack}
-- \pdfsetcolor{\maincolor}
-- \edef\thiscolor{\maincolor}
-- \def\lastcolordefs{}
-- %
-- \def\makefootline{%
-- \baselineskip24pt
-- \line{\pdfsetcolor{\maincolor}\the\footline}%
-- }
-- %
-- \def\makeheadline{%
-- \vbox to 0pt{%
-- \vskip-22.5pt
-- \line{%
-- \vbox to8.5pt{}%
-- % Extract \thiscolor definition from the marks.
-- \getcolormarks
-- % Typeset the headline with \maincolor, then restore the color.
-- \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
-- }%
-- \vss
-- }%
-- \nointerlineskip
-- }
-- %
-- %
-- \pdfcatalog{/PageMode /UseOutlines}
-- %
-- % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
-- \def\dopdfimage#1#2#3{%
-- \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
-- \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
-- %
-- % pdftex (and the PDF format) support .pdf, .png, .jpg (among
-- % others). Let's try in that order, PDF first since if
-- % someone has a scalable image, presumably better to use that than a
-- % bitmap.
-- \let\pdfimgext=\empty
-- \begingroup
-- \openin 1 #1.pdf \ifeof 1
-- \openin 1 #1.PDF \ifeof 1
-- \openin 1 #1.png \ifeof 1
-- \openin 1 #1.jpg \ifeof 1
-- \openin 1 #1.jpeg \ifeof 1
-- \openin 1 #1.JPG \ifeof 1
-- \errhelp = \nopdfimagehelp
-- \errmessage{Could not find image file #1 for pdf}%
-- \else \gdef\pdfimgext{JPG}%
-- \fi
-- \else \gdef\pdfimgext{jpeg}%
-- \fi
-- \else \gdef\pdfimgext{jpg}%
-- \fi
-- \else \gdef\pdfimgext{png}%
-- \fi
-- \else \gdef\pdfimgext{PDF}%
-- \fi
-- \else \gdef\pdfimgext{pdf}%
-- \fi
-- \closein 1
-- \endgroup
-- %
-- % without \immediate, ancient pdftex seg faults when the same image is
-- % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.)
-- \ifnum\pdftexversion < 14
-- \immediate\pdfimage
-- \else
-- \immediate\pdfximage
-- \fi
-- \ifdim \wd0 >0pt width \pdfimagewidth \fi
-- \ifdim \wd2 >0pt height \pdfimageheight \fi
-- \ifnum\pdftexversion<13
-- #1.\pdfimgext
-- \else
-- {#1.\pdfimgext}%
-- \fi
-- \ifnum\pdftexversion < 14 \else
-- \pdfrefximage \pdflastximage
-- \fi}
-- %
-- \def\pdfmkdest#1{{%
-- % We have to set dummies so commands such as @code, and characters
-- % such as \, aren't expanded when present in a section title.
-- \indexnofonts
-- \turnoffactive
-- \makevalueexpandable
-- \def\pdfdestname{#1}%
-- \txiescapepdf\pdfdestname
-- \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
-- }}
-- %
-- % used to mark target names; must be expandable.
-- \def\pdfmkpgn#1{#1}
-- %
-- % by default, use a color that is dark enough to print on paper as
-- % nearly black, but still distinguishable for online viewing.
-- \def\urlcolor{\rgbDarkRed}
-- \def\linkcolor{\rgbDarkRed}
-- \def\endlink{\setcolor{\maincolor}\pdfendlink}
-- %
-- % Adding outlines to PDF; macros for calculating structure of outlines
-- % come from Petr Olsak
-- \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
-- \else \csname#1\endcsname \fi}
-- \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
-- \advance\tempnum by 1
-- \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
-- %
-- % #1 is the section text, which is what will be displayed in the
-- % outline by the pdf viewer. #2 is the pdf expression for the number
-- % of subentries (or empty, for subsubsections). #3 is the node text,
-- % which might be empty if this toc entry had no corresponding node.
-- % #4 is the page number
-- %
-- \def\dopdfoutline#1#2#3#4{%
-- % Generate a link to the node text if that exists; else, use the
-- % page number. We could generate a destination for the section
-- % text in the case where a section has no node, but it doesn't
-- % seem worth the trouble, since most documents are normally structured.
-- \edef\pdfoutlinedest{#3}%
-- \ifx\pdfoutlinedest\empty
-- \def\pdfoutlinedest{#4}%
-- \else
-- \txiescapepdf\pdfoutlinedest
-- \fi
-- %
-- % Also escape PDF chars in the display string.
-- \edef\pdfoutlinetext{#1}%
-- \txiescapepdf\pdfoutlinetext
-- %
-- \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
-- }
-- %
-- \def\pdfmakeoutlines{%
-- \begingroup
-- % Read toc silently, to get counts of subentries for \pdfoutline.
-- \def\partentry##1##2##3##4{}% ignore parts in the outlines
-- \def\numchapentry##1##2##3##4{%
-- \def\thischapnum{##2}%
-- \def\thissecnum{0}%
-- \def\thissubsecnum{0}%
-- }%
-- \def\numsecentry##1##2##3##4{%
-- \advancenumber{chap\thischapnum}%
-- \def\thissecnum{##2}%
-- \def\thissubsecnum{0}%
-- }%
-- \def\numsubsecentry##1##2##3##4{%
-- \advancenumber{sec\thissecnum}%
-- \def\thissubsecnum{##2}%
-- }%
-- \def\numsubsubsecentry##1##2##3##4{%
-- \advancenumber{subsec\thissubsecnum}%
-- }%
-- \def\thischapnum{0}%
-- \def\thissecnum{0}%
-- \def\thissubsecnum{0}%
-- %
-- % use \def rather than \let here because we redefine \chapentry et
-- % al. a second time, below.
-- \def\appentry{\numchapentry}%
-- \def\appsecentry{\numsecentry}%
-- \def\appsubsecentry{\numsubsecentry}%
-- \def\appsubsubsecentry{\numsubsubsecentry}%
-- \def\unnchapentry{\numchapentry}%
-- \def\unnsecentry{\numsecentry}%
-- \def\unnsubsecentry{\numsubsecentry}%
-- \def\unnsubsubsecentry{\numsubsubsecentry}%
-- \readdatafile{toc}%
-- %
-- % Read toc second time, this time actually producing the outlines.
-- % The `-' means take the \expnumber as the absolute number of
-- % subentries, which we calculated on our first read of the .toc above.
-- %
-- % We use the node names as the destinations.
-- \def\numchapentry##1##2##3##4{%
-- \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}%
-- \def\numsecentry##1##2##3##4{%
-- \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}%
-- \def\numsubsecentry##1##2##3##4{%
-- \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}%
-- \def\numsubsubsecentry##1##2##3##4{% count is always zero
-- \dopdfoutline{##1}{}{##3}{##4}}%
-- %
-- % PDF outlines are displayed using system fonts, instead of
-- % document fonts. Therefore we cannot use special characters,
-- % since the encoding is unknown. For example, the eogonek from
-- % Latin 2 (0xea) gets translated to a | character. Info from
-- % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
-- %
-- % TODO this right, we have to translate 8-bit characters to
-- % their "best" equivalent, based on the @documentencoding. Too
-- % much work for too little return. Just use the ASCII equivalents
-- % we use for the index sort strings.
-- %
-- \indexnofonts
-- \setupdatafile
-- % We can have normal brace characters in the PDF outlines, unlike
-- % Texinfo index files. So set that up.
-- \def\{{\lbracecharliteral}%
-- \def\}{\rbracecharliteral}%
-- \catcode`\\=\active \otherbackslash
-- \input \tocreadfilename
-- \endgroup
-- }
-- {\catcode`[=1 \catcode`]=2
-- \catcode`{=\other \catcode`}=\other
-- \gdef\lbracecharliteral[{]%
-- \gdef\rbracecharliteral[}]%
-- ]
-- %
-- \def\skipspaces#1{\def\PP{#1}\def\D{|}%
-- \ifx\PP\D\let\nextsp\relax
-- \else\let\nextsp\skipspaces
-- \addtokens{\filename}{\PP}%
-- \advance\filenamelength by 1
-- \fi
-- \nextsp}
-- \def\getfilename#1{%
-- \filenamelength=0
-- % If we don't expand the argument now, \skipspaces will get
-- % snagged on things like "@value{foo}".
-- \edef\temp{#1}%
-- \expandafter\skipspaces\temp|\relax
-- }
-- \ifnum\pdftexversion < 14
-- \let \startlink \pdfannotlink
-- \else
-- \let \startlink \pdfstartlink
-- \fi
-- % make a live url in pdf output.
-- \def\pdfurl#1{%
-- \begingroup
-- % it seems we really need yet another set of dummies; have not
-- % tried to figure out what each command should do in the context
-- % of @url. for now, just make @/ a no-op, that's the only one
-- % people have actually reported a problem with.
-- %
-- \normalturnoffactive
-- \def\@{@}%
-- \let\/=\empty
-- \makevalueexpandable
-- % do we want to go so far as to use \indexnofonts instead of just
-- % special-casing \var here?
-- \def\var##1{##1}%
-- %
-- \leavevmode\setcolor{\urlcolor}%
-- \startlink attr{/Border [0 0 0]}%
-- user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
-- \endgroup}
-- \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
-- \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
-- \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
-- \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
-- \def\maketoks{%
-- \expandafter\poptoks\the\toksA|ENDTOKS|\relax
-- \ifx\first0\adn0
-- \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
-- \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
-- \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9
-- \else
-- \ifnum0=\countA\else\makelink\fi
-- \ifx\first.\let\next=\done\else
-- \let\next=\maketoks
-- \addtokens{\toksB}{\the\toksD}
-- \ifx\first,\addtokens{\toksB}{\space}\fi
-- \fi
-- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
-- \next}
-- \def\makelink{\addtokens{\toksB}%
-- {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
-- \def\pdflink#1{%
-- \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
-- \setcolor{\linkcolor}#1\endlink}
-- \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
--\else
-- % non-pdf mode
-- \let\pdfmkdest = \gobble
-- \let\pdfurl = \gobble
-- \let\endlink = \relax
-- \let\setcolor = \gobble
-- \let\pdfsetcolor = \gobble
-- \let\pdfmakeoutlines = \relax
--\fi % \ifx\pdfoutput
--
--
--\message{fonts,}
--
--% Change the current font style to #1, remembering it in \curfontstyle.
--% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in
--% italics, not bold italics.
--%
--\def\setfontstyle#1{%
-- \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd.
-- \csname ten#1\endcsname % change the current font
--}
--
--% Select #1 fonts with the current style.
--%
--\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname}
--
--\def\rm{\fam=0 \setfontstyle{rm}}
--\def\it{\fam=\itfam \setfontstyle{it}}
--\def\sl{\fam=\slfam \setfontstyle{sl}}
--\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf}
--\def\tt{\fam=\ttfam \setfontstyle{tt}}
--
--% Unfortunately, we have to override this for titles and the like, since
--% in those cases "rm" is bold. Sigh.
--\def\rmisbold{\rm\def\curfontstyle{bf}}
--
--% Texinfo sort of supports the sans serif font style, which plain TeX does not.
--% So we set up a \sf.
--\newfam\sffam
--\def\sf{\fam=\sffam \setfontstyle{sf}}
--\let\li = \sf % Sometimes we call it \li, not \sf.
--
--% We don't need math for this font style.
--\def\ttsl{\setfontstyle{ttsl}}
--
--
--% Set the baselineskip to #1, and the lineskip and strut size
--% correspondingly. There is no deep meaning behind these magic numbers
--% used as factors; they just match (closely enough) what Knuth defined.
--%
--\def\lineskipfactor{.08333}
--\def\strutheightpercent{.70833}
--\def\strutdepthpercent {.29167}
--%
--% can get a sort of poor man's double spacing by redefining this.
--\def\baselinefactor{1}
--%
--\newdimen\textleading
--\def\setleading#1{%
-- \dimen0 = #1\relax
-- \normalbaselineskip = \baselinefactor\dimen0
-- \normallineskip = \lineskipfactor\normalbaselineskip
-- \normalbaselines
-- \setbox\strutbox =\hbox{%
-- \vrule width0pt height\strutheightpercent\baselineskip
-- depth \strutdepthpercent \baselineskip
-- }%
--}
--
--% PDF CMaps. See also LaTeX's t1.cmap.
--%
--% do nothing with this by default.
--\expandafter\let\csname cmapOT1\endcsname\gobble
--\expandafter\let\csname cmapOT1IT\endcsname\gobble
--\expandafter\let\csname cmapOT1TT\endcsname\gobble
--
--% if we are producing pdf, and we have \pdffontattr, then define cmaps.
--% (\pdffontattr was introduced many years ago, but people still run
--% older pdftex's; it's easy to conditionalize, so we do.)
--\ifpdf \ifx\pdffontattr\thisisundefined \else
-- \begingroup
-- \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
-- \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
--%%DocumentNeededResources: ProcSet (CIDInit)
--%%IncludeResource: ProcSet (CIDInit)
--%%BeginResource: CMap (TeX-OT1-0)
--%%Title: (TeX-OT1-0 TeX OT1 0)
--%%Version: 1.000
--%%EndComments
--/CIDInit /ProcSet findresource begin
--12 dict begin
--begincmap
--/CIDSystemInfo
--<< /Registry (TeX)
--/Ordering (OT1)
--/Supplement 0
-->> def
--/CMapName /TeX-OT1-0 def
--/CMapType 2 def
--1 begincodespacerange
--<00> <7F>
--endcodespacerange
--8 beginbfrange
--<00> <01> <0393>
--<09> <0A> <03A8>
--<23> <26> <0023>
--<28> <3B> <0028>
--<3F> <5B> <003F>
--<5D> <5E> <005D>
--<61> <7A> <0061>
--<7B> <7C> <2013>
--endbfrange
--40 beginbfchar
--<02> <0398>
--<03> <039B>
--<04> <039E>
--<05> <03A0>
--<06> <03A3>
--<07> <03D2>
--<08> <03A6>
--<0B> <00660066>
--<0C> <00660069>
--<0D> <0066006C>
--<0E> <006600660069>
--<0F> <00660066006C>
--<10> <0131>
--<11> <0237>
--<12> <0060>
--<13> <00B4>
--<14> <02C7>
--<15> <02D8>
--<16> <00AF>
--<17> <02DA>
--<18> <00B8>
--<19> <00DF>
--<1A> <00E6>
--<1B> <0153>
--<1C> <00F8>
--<1D> <00C6>
--<1E> <0152>
--<1F> <00D8>
--<21> <0021>
--<22> <201D>
--<27> <2019>
--<3C> <00A1>
--<3D> <003D>
--<3E> <00BF>
--<5C> <201C>
--<5F> <02D9>
--<60> <2018>
--<7D> <02DD>
--<7E> <007E>
--<7F> <00A8>
--endbfchar
--endcmap
--CMapName currentdict /CMap defineresource pop
--end
--end
--%%EndResource
--%%EOF
-- }\endgroup
-- \expandafter\edef\csname cmapOT1\endcsname#1{%
-- \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
-- }%
--%
--% \cmapOT1IT
-- \begingroup
-- \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
-- \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
--%%DocumentNeededResources: ProcSet (CIDInit)
--%%IncludeResource: ProcSet (CIDInit)
--%%BeginResource: CMap (TeX-OT1IT-0)
--%%Title: (TeX-OT1IT-0 TeX OT1IT 0)
--%%Version: 1.000
--%%EndComments
--/CIDInit /ProcSet findresource begin
--12 dict begin
--begincmap
--/CIDSystemInfo
--<< /Registry (TeX)
--/Ordering (OT1IT)
--/Supplement 0
-->> def
--/CMapName /TeX-OT1IT-0 def
--/CMapType 2 def
--1 begincodespacerange
--<00> <7F>
--endcodespacerange
--8 beginbfrange
--<00> <01> <0393>
--<09> <0A> <03A8>
--<25> <26> <0025>
--<28> <3B> <0028>
--<3F> <5B> <003F>
--<5D> <5E> <005D>
--<61> <7A> <0061>
--<7B> <7C> <2013>
--endbfrange
--42 beginbfchar
--<02> <0398>
--<03> <039B>
--<04> <039E>
--<05> <03A0>
--<06> <03A3>
--<07> <03D2>
--<08> <03A6>
--<0B> <00660066>
--<0C> <00660069>
--<0D> <0066006C>
--<0E> <006600660069>
--<0F> <00660066006C>
--<10> <0131>
--<11> <0237>
--<12> <0060>
--<13> <00B4>
--<14> <02C7>
--<15> <02D8>
--<16> <00AF>
--<17> <02DA>
--<18> <00B8>
--<19> <00DF>
--<1A> <00E6>
--<1B> <0153>
--<1C> <00F8>
--<1D> <00C6>
--<1E> <0152>
--<1F> <00D8>
--<21> <0021>
--<22> <201D>
--<23> <0023>
--<24> <00A3>
--<27> <2019>
--<3C> <00A1>
--<3D> <003D>
--<3E> <00BF>
--<5C> <201C>
--<5F> <02D9>
--<60> <2018>
--<7D> <02DD>
--<7E> <007E>
--<7F> <00A8>
--endbfchar
--endcmap
--CMapName currentdict /CMap defineresource pop
--end
--end
--%%EndResource
--%%EOF
-- }\endgroup
-- \expandafter\edef\csname cmapOT1IT\endcsname#1{%
-- \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
-- }%
--%
--% \cmapOT1TT
-- \begingroup
-- \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
-- \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
--%%DocumentNeededResources: ProcSet (CIDInit)
--%%IncludeResource: ProcSet (CIDInit)
--%%BeginResource: CMap (TeX-OT1TT-0)
--%%Title: (TeX-OT1TT-0 TeX OT1TT 0)
--%%Version: 1.000
--%%EndComments
--/CIDInit /ProcSet findresource begin
--12 dict begin
--begincmap
--/CIDSystemInfo
--<< /Registry (TeX)
--/Ordering (OT1TT)
--/Supplement 0
-->> def
--/CMapName /TeX-OT1TT-0 def
--/CMapType 2 def
--1 begincodespacerange
--<00> <7F>
--endcodespacerange
--5 beginbfrange
--<00> <01> <0393>
--<09> <0A> <03A8>
--<21> <26> <0021>
--<28> <5F> <0028>
--<61> <7E> <0061>
--endbfrange
--32 beginbfchar
--<02> <0398>
--<03> <039B>
--<04> <039E>
--<05> <03A0>
--<06> <03A3>
--<07> <03D2>
--<08> <03A6>
--<0B> <2191>
--<0C> <2193>
--<0D> <0027>
--<0E> <00A1>
--<0F> <00BF>
--<10> <0131>
--<11> <0237>
--<12> <0060>
--<13> <00B4>
--<14> <02C7>
--<15> <02D8>
--<16> <00AF>
--<17> <02DA>
--<18> <00B8>
--<19> <00DF>
--<1A> <00E6>
--<1B> <0153>
--<1C> <00F8>
--<1D> <00C6>
--<1E> <0152>
--<1F> <00D8>
--<20> <2423>
--<27> <2019>
--<60> <2018>
--<7F> <00A8>
--endbfchar
--endcmap
--CMapName currentdict /CMap defineresource pop
--end
--end
--%%EndResource
--%%EOF
-- }\endgroup
-- \expandafter\edef\csname cmapOT1TT\endcsname#1{%
-- \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
-- }%
--\fi\fi
--
--
--% Set the font macro #1 to the font named \fontprefix#2.
--% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
--% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit).
--% Example:
--% #1 = \textrm
--% #2 = \rmshape
--% #3 = 10
--% #4 = \mainmagstep
--% #5 = OT1
--%
--\def\setfont#1#2#3#4#5{%
-- \font#1=\fontprefix#2#3 scaled #4
-- \csname cmap#5\endcsname#1%
--}
--% This is what gets called when #5 of \setfont is empty.
--\let\cmap\gobble
--%
--% (end of cmaps)
--
--% Use cm as the default font prefix.
--% To specify the font prefix, you must define \fontprefix
--% before you read in texinfo.tex.
--\ifx\fontprefix\thisisundefined
--\def\fontprefix{cm}
--\fi
--% Support font families that don't use the same naming scheme as CM.
--\def\rmshape{r}
--\def\rmbshape{bx} % where the normal face is bold
--\def\bfshape{b}
--\def\bxshape{bx}
--\def\ttshape{tt}
--\def\ttbshape{tt}
--\def\ttslshape{sltt}
--\def\itshape{ti}
--\def\itbshape{bxti}
--\def\slshape{sl}
--\def\slbshape{bxsl}
--\def\sfshape{ss}
--\def\sfbshape{ss}
--\def\scshape{csc}
--\def\scbshape{csc}
--
--% Definitions for a main text size of 11pt. (The default in Texinfo.)
--%
--\def\definetextfontsizexi{%
--% Text fonts (11.2pt, magstep1).
--\def\textnominalsize{11pt}
--\edef\mainmagstep{\magstephalf}
--\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
--\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
--\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
--\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
--\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
--\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
--\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
--\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
--\font\texti=cmmi10 scaled \mainmagstep
--\font\textsy=cmsy10 scaled \mainmagstep
--\def\textecsize{1095}
--
--% A few fonts for @defun names and args.
--\setfont\defbf\bfshape{10}{\magstep1}{OT1}
--\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
--\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
--\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
--
--% Fonts for indices, footnotes, small examples (9pt).
--\def\smallnominalsize{9pt}
--\setfont\smallrm\rmshape{9}{1000}{OT1}
--\setfont\smalltt\ttshape{9}{1000}{OT1TT}
--\setfont\smallbf\bfshape{10}{900}{OT1}
--\setfont\smallit\itshape{9}{1000}{OT1IT}
--\setfont\smallsl\slshape{9}{1000}{OT1}
--\setfont\smallsf\sfshape{9}{1000}{OT1}
--\setfont\smallsc\scshape{10}{900}{OT1}
--\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
--\font\smalli=cmmi9
--\font\smallsy=cmsy9
--\def\smallecsize{0900}
--
--% Fonts for small examples (8pt).
--\def\smallernominalsize{8pt}
--\setfont\smallerrm\rmshape{8}{1000}{OT1}
--\setfont\smallertt\ttshape{8}{1000}{OT1TT}
--\setfont\smallerbf\bfshape{10}{800}{OT1}
--\setfont\smallerit\itshape{8}{1000}{OT1IT}
--\setfont\smallersl\slshape{8}{1000}{OT1}
--\setfont\smallersf\sfshape{8}{1000}{OT1}
--\setfont\smallersc\scshape{10}{800}{OT1}
--\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
--\font\smalleri=cmmi8
--\font\smallersy=cmsy8
--\def\smallerecsize{0800}
--
--% Fonts for title page (20.4pt):
--\def\titlenominalsize{20pt}
--\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
--\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
--\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
--\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
--\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
--\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
--\let\titlebf=\titlerm
--\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
--\font\titlei=cmmi12 scaled \magstep3
--\font\titlesy=cmsy10 scaled \magstep4
--\def\titleecsize{2074}
--
--% Chapter (and unnumbered) fonts (17.28pt).
--\def\chapnominalsize{17pt}
--\setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
--\setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
--\setfont\chapsl\slbshape{10}{\magstep3}{OT1}
--\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
--\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
--\setfont\chapsf\sfbshape{17}{1000}{OT1}
--\let\chapbf=\chaprm
--\setfont\chapsc\scbshape{10}{\magstep3}{OT1}
--\font\chapi=cmmi12 scaled \magstep2
--\font\chapsy=cmsy10 scaled \magstep3
--\def\chapecsize{1728}
--
--% Section fonts (14.4pt).
--\def\secnominalsize{14pt}
--\setfont\secrm\rmbshape{12}{\magstep1}{OT1}
--\setfont\secit\itbshape{10}{\magstep2}{OT1IT}
--\setfont\secsl\slbshape{10}{\magstep2}{OT1}
--\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
--\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
--\setfont\secsf\sfbshape{12}{\magstep1}{OT1}
--\let\secbf\secrm
--\setfont\secsc\scbshape{10}{\magstep2}{OT1}
--\font\seci=cmmi12 scaled \magstep1
--\font\secsy=cmsy10 scaled \magstep2
--\def\sececsize{1440}
--
--% Subsection fonts (13.15pt).
--\def\ssecnominalsize{13pt}
--\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
--\setfont\ssecit\itbshape{10}{1315}{OT1IT}
--\setfont\ssecsl\slbshape{10}{1315}{OT1}
--\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
--\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
--\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
--\let\ssecbf\ssecrm
--\setfont\ssecsc\scbshape{10}{1315}{OT1}
--\font\sseci=cmmi12 scaled \magstephalf
--\font\ssecsy=cmsy10 scaled 1315
--\def\ssececsize{1200}
--
--% Reduced fonts for @acro in text (10pt).
--\def\reducednominalsize{10pt}
--\setfont\reducedrm\rmshape{10}{1000}{OT1}
--\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
--\setfont\reducedbf\bfshape{10}{1000}{OT1}
--\setfont\reducedit\itshape{10}{1000}{OT1IT}
--\setfont\reducedsl\slshape{10}{1000}{OT1}
--\setfont\reducedsf\sfshape{10}{1000}{OT1}
--\setfont\reducedsc\scshape{10}{1000}{OT1}
--\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
--\font\reducedi=cmmi10
--\font\reducedsy=cmsy10
--\def\reducedecsize{1000}
--
--\textleading = 13.2pt % line spacing for 11pt CM
--\textfonts % reset the current fonts
--\rm
--} % end of 11pt text font size definitions, \definetextfontsizexi
--
--
--% Definitions to make the main text be 10pt Computer Modern, with
--% section, chapter, etc., sizes following suit. This is for the GNU
--% Press printing of the Emacs 22 manual. Maybe other manuals in the
--% future. Used with @smallbook, which sets the leading to 12pt.
--%
--\def\definetextfontsizex{%
--% Text fonts (10pt).
--\def\textnominalsize{10pt}
--\edef\mainmagstep{1000}
--\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
--\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
--\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
--\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
--\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
--\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
--\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
--\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
--\font\texti=cmmi10 scaled \mainmagstep
--\font\textsy=cmsy10 scaled \mainmagstep
--\def\textecsize{1000}
--
--% A few fonts for @defun names and args.
--\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
--\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
--\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
--\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
--
--% Fonts for indices, footnotes, small examples (9pt).
--\def\smallnominalsize{9pt}
--\setfont\smallrm\rmshape{9}{1000}{OT1}
--\setfont\smalltt\ttshape{9}{1000}{OT1TT}
--\setfont\smallbf\bfshape{10}{900}{OT1}
--\setfont\smallit\itshape{9}{1000}{OT1IT}
--\setfont\smallsl\slshape{9}{1000}{OT1}
--\setfont\smallsf\sfshape{9}{1000}{OT1}
--\setfont\smallsc\scshape{10}{900}{OT1}
--\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
--\font\smalli=cmmi9
--\font\smallsy=cmsy9
--\def\smallecsize{0900}
--
--% Fonts for small examples (8pt).
--\def\smallernominalsize{8pt}
--\setfont\smallerrm\rmshape{8}{1000}{OT1}
--\setfont\smallertt\ttshape{8}{1000}{OT1TT}
--\setfont\smallerbf\bfshape{10}{800}{OT1}
--\setfont\smallerit\itshape{8}{1000}{OT1IT}
--\setfont\smallersl\slshape{8}{1000}{OT1}
--\setfont\smallersf\sfshape{8}{1000}{OT1}
--\setfont\smallersc\scshape{10}{800}{OT1}
--\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
--\font\smalleri=cmmi8
--\font\smallersy=cmsy8
--\def\smallerecsize{0800}
--
--% Fonts for title page (20.4pt):
--\def\titlenominalsize{20pt}
--\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
--\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
--\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
--\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
--\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
--\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
--\let\titlebf=\titlerm
--\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
--\font\titlei=cmmi12 scaled \magstep3
--\font\titlesy=cmsy10 scaled \magstep4
--\def\titleecsize{2074}
--
--% Chapter fonts (14.4pt).
--\def\chapnominalsize{14pt}
--\setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
--\setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
--\setfont\chapsl\slbshape{10}{\magstep2}{OT1}
--\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
--\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
--\setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
--\let\chapbf\chaprm
--\setfont\chapsc\scbshape{10}{\magstep2}{OT1}
--\font\chapi=cmmi12 scaled \magstep1
--\font\chapsy=cmsy10 scaled \magstep2
--\def\chapecsize{1440}
--
--% Section fonts (12pt).
--\def\secnominalsize{12pt}
--\setfont\secrm\rmbshape{12}{1000}{OT1}
--\setfont\secit\itbshape{10}{\magstep1}{OT1IT}
--\setfont\secsl\slbshape{10}{\magstep1}{OT1}
--\setfont\sectt\ttbshape{12}{1000}{OT1TT}
--\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
--\setfont\secsf\sfbshape{12}{1000}{OT1}
--\let\secbf\secrm
--\setfont\secsc\scbshape{10}{\magstep1}{OT1}
--\font\seci=cmmi12
--\font\secsy=cmsy10 scaled \magstep1
--\def\sececsize{1200}
--
--% Subsection fonts (10pt).
--\def\ssecnominalsize{10pt}
--\setfont\ssecrm\rmbshape{10}{1000}{OT1}
--\setfont\ssecit\itbshape{10}{1000}{OT1IT}
--\setfont\ssecsl\slbshape{10}{1000}{OT1}
--\setfont\ssectt\ttbshape{10}{1000}{OT1TT}
--\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
--\setfont\ssecsf\sfbshape{10}{1000}{OT1}
--\let\ssecbf\ssecrm
--\setfont\ssecsc\scbshape{10}{1000}{OT1}
--\font\sseci=cmmi10
--\font\ssecsy=cmsy10
--\def\ssececsize{1000}
--
--% Reduced fonts for @acro in text (9pt).
--\def\reducednominalsize{9pt}
--\setfont\reducedrm\rmshape{9}{1000}{OT1}
--\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
--\setfont\reducedbf\bfshape{10}{900}{OT1}
--\setfont\reducedit\itshape{9}{1000}{OT1IT}
--\setfont\reducedsl\slshape{9}{1000}{OT1}
--\setfont\reducedsf\sfshape{9}{1000}{OT1}
--\setfont\reducedsc\scshape{10}{900}{OT1}
--\setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
--\font\reducedi=cmmi9
--\font\reducedsy=cmsy9
--\def\reducedecsize{0900}
--
--\divide\parskip by 2 % reduce space between paragraphs
--\textleading = 12pt % line spacing for 10pt CM
--\textfonts % reset the current fonts
--\rm
--} % end of 10pt text font size definitions, \definetextfontsizex
--
--
--% We provide the user-level command
--% @fonttextsize 10
--% (or 11) to redefine the text font size. pt is assumed.
--%
--\def\xiword{11}
--\def\xword{10}
--\def\xwordpt{10pt}
--%
--\parseargdef\fonttextsize{%
-- \def\textsizearg{#1}%
-- %\wlog{doing @fonttextsize \textsizearg}%
-- %
-- % Set \globaldefs so that documents can use this inside @tex, since
-- % makeinfo 4.8 does not support it, but we need it nonetheless.
-- %
-- \begingroup \globaldefs=1
-- \ifx\textsizearg\xword \definetextfontsizex
-- \else \ifx\textsizearg\xiword \definetextfontsizexi
-- \else
-- \errhelp=\EMsimple
-- \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
-- \fi\fi
-- \endgroup
--}
--
--
--% In order for the font changes to affect most math symbols and letters,
--% we have to define the \textfont of the standard families. Since
--% texinfo doesn't allow for producing subscripts and superscripts except
--% in the main text, we don't bother to reset \scriptfont and
--% \scriptscriptfont (which would also require loading a lot more fonts).
--%
--\def\resetmathfonts{%
-- \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy
-- \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf
-- \textfont\ttfam=\tentt \textfont\sffam=\tensf
--}
--
--% The font-changing commands redefine the meanings of \tenSTYLE, instead
--% of just \STYLE. We do this because \STYLE needs to also set the
--% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire
--% \tenSTYLE to set the current font.
--%
--% Each font-changing command also sets the names \lsize (one size lower)
--% and \lllsize (three sizes lower). These relative commands are used in
--% the LaTeX logo and acronyms.
--%
--% This all needs generalizing, badly.
--%
--\def\textfonts{%
-- \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl
-- \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc
-- \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy
-- \let\tenttsl=\textttsl
-- \def\curfontsize{text}%
-- \def\lsize{reduced}\def\lllsize{smaller}%
-- \resetmathfonts \setleading{\textleading}}
--\def\titlefonts{%
-- \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
-- \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
-- \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
-- \let\tenttsl=\titlettsl
-- \def\curfontsize{title}%
-- \def\lsize{chap}\def\lllsize{subsec}%
-- \resetmathfonts \setleading{27pt}}
--\def\titlefont#1{{\titlefonts\rmisbold #1}}
--\def\chapfonts{%
-- \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
-- \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
-- \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy
-- \let\tenttsl=\chapttsl
-- \def\curfontsize{chap}%
-- \def\lsize{sec}\def\lllsize{text}%
-- \resetmathfonts \setleading{19pt}}
--\def\secfonts{%
-- \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl
-- \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc
-- \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy
-- \let\tenttsl=\secttsl
-- \def\curfontsize{sec}%
-- \def\lsize{subsec}\def\lllsize{reduced}%
-- \resetmathfonts \setleading{16pt}}
--\def\subsecfonts{%
-- \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl
-- \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc
-- \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy
-- \let\tenttsl=\ssecttsl
-- \def\curfontsize{ssec}%
-- \def\lsize{text}\def\lllsize{small}%
-- \resetmathfonts \setleading{15pt}}
--\let\subsubsecfonts = \subsecfonts
--\def\reducedfonts{%
-- \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl
-- \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc
-- \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy
-- \let\tenttsl=\reducedttsl
-- \def\curfontsize{reduced}%
-- \def\lsize{small}\def\lllsize{smaller}%
-- \resetmathfonts \setleading{10.5pt}}
--\def\smallfonts{%
-- \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
-- \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
-- \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
-- \let\tenttsl=\smallttsl
-- \def\curfontsize{small}%
-- \def\lsize{smaller}\def\lllsize{smaller}%
-- \resetmathfonts \setleading{10.5pt}}
--\def\smallerfonts{%
-- \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl
-- \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc
-- \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy
-- \let\tenttsl=\smallerttsl
-- \def\curfontsize{smaller}%
-- \def\lsize{smaller}\def\lllsize{smaller}%
-- \resetmathfonts \setleading{9.5pt}}
--
--% Fonts for short table of contents.
--\setfont\shortcontrm\rmshape{12}{1000}{OT1}
--\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
--\setfont\shortcontsl\slshape{12}{1000}{OT1}
--\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
--
--% Define these just so they can be easily changed for other fonts.
--\def\angleleft{$\langle$}
--\def\angleright{$\rangle$}
--
--% Set the fonts to use with the @small... environments.
--\let\smallexamplefonts = \smallfonts
--
--% About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample
--% can fit this many characters:
--% 8.5x11=86 smallbook=72 a4=90 a5=69
--% If we use \scriptfonts (8pt), then we can fit this many characters:
--% 8.5x11=90+ smallbook=80 a4=90+ a5=77
--% For me, subjectively, the few extra characters that fit aren't worth
--% the additional smallness of 8pt. So I'm making the default 9pt.
--%
--% By the way, for comparison, here's what fits with @example (10pt):
--% 8.5x11=71 smallbook=60 a4=75 a5=58
--% --karl, 24jan03.
--
--% Set up the default fonts, so we can use them for creating boxes.
--%
--\definetextfontsizexi
--
--
--\message{markup,}
--
--% Check if we are currently using a typewriter font. Since all the
--% Computer Modern typewriter fonts have zero interword stretch (and
--% shrink), and it is reasonable to expect all typewriter fonts to have
--% this property, we can check that font parameter.
--%
--\def\ifmonospace{\ifdim\fontdimen3\font=0pt }
--
--% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will
--% define and register \INITMACRO to be called on markup style changes.
--% \INITMACRO can check \currentmarkupstyle for the innermost
--% style and the set of \ifmarkupSTYLE switches for all styles
--% currently in effect.
--\newif\ifmarkupvar
--\newif\ifmarkupsamp
--\newif\ifmarkupkey
--%\newif\ifmarkupfile % @file == @samp.
--%\newif\ifmarkupoption % @option == @samp.
--\newif\ifmarkupcode
--\newif\ifmarkupkbd
--%\newif\ifmarkupenv % @env == @code.
--%\newif\ifmarkupcommand % @command == @code.
--\newif\ifmarkuptex % @tex (and part of @math, for now).
--\newif\ifmarkupexample
--\newif\ifmarkupverb
--\newif\ifmarkupverbatim
--
--\let\currentmarkupstyle\empty
--
--\def\setupmarkupstyle#1{%
-- \csname markup#1true\endcsname
-- \def\currentmarkupstyle{#1}%
-- \markupstylesetup
--}
--
--\let\markupstylesetup\empty
--
--\def\defmarkupstylesetup#1{%
-- \expandafter\def\expandafter\markupstylesetup
-- \expandafter{\markupstylesetup #1}%
-- \def#1%
--}
--
--% Markup style setup for left and right quotes.
--\defmarkupstylesetup\markupsetuplq{%
-- \expandafter\let\expandafter \temp
-- \csname markupsetuplq\currentmarkupstyle\endcsname
-- \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
--}
--
--\defmarkupstylesetup\markupsetuprq{%
-- \expandafter\let\expandafter \temp
-- \csname markupsetuprq\currentmarkupstyle\endcsname
-- \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
--}
--
--{
--\catcode`\'=\active
--\catcode`\`=\active
--
--\gdef\markupsetuplqdefault{\let`\lq}
--\gdef\markupsetuprqdefault{\let'\rq}
--
--\gdef\markupsetcodequoteleft{\let`\codequoteleft}
--\gdef\markupsetcodequoteright{\let'\codequoteright}
--}
--
--\let\markupsetuplqcode \markupsetcodequoteleft
--\let\markupsetuprqcode \markupsetcodequoteright
--%
--\let\markupsetuplqexample \markupsetcodequoteleft
--\let\markupsetuprqexample \markupsetcodequoteright
--%
--\let\markupsetuplqkbd \markupsetcodequoteleft
--\let\markupsetuprqkbd \markupsetcodequoteright
--%
--\let\markupsetuplqsamp \markupsetcodequoteleft
--\let\markupsetuprqsamp \markupsetcodequoteright
--%
--\let\markupsetuplqverb \markupsetcodequoteleft
--\let\markupsetuprqverb \markupsetcodequoteright
--%
--\let\markupsetuplqverbatim \markupsetcodequoteleft
--\let\markupsetuprqverbatim \markupsetcodequoteright
--
--% Allow an option to not use regular directed right quote/apostrophe
--% (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
--% The undirected quote is ugly, so don't make it the default, but it
--% works for pasting with more pdf viewers (at least evince), the
--% lilypond developers report. xpdf does work with the regular 0x27.
--%
--\def\codequoteright{%
-- \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
-- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
-- '%
-- \else \char'15 \fi
-- \else \char'15 \fi
--}
--%
--% and a similar option for the left quote char vs. a grave accent.
--% Modern fonts display ASCII 0x60 as a grave accent, so some people like
--% the code environments to do likewise.
--%
--\def\codequoteleft{%
-- \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
-- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
-- % [Knuth] pp. 380,381,391
-- % \relax disables Spanish ligatures ?` and !` of \tt font.
-- \relax`%
-- \else \char'22 \fi
-- \else \char'22 \fi
--}
--
--% Commands to set the quote options.
--%
--\parseargdef\codequoteundirected{%
-- \def\temp{#1}%
-- \ifx\temp\onword
-- \expandafter\let\csname SETtxicodequoteundirected\endcsname
-- = t%
-- \else\ifx\temp\offword
-- \expandafter\let\csname SETtxicodequoteundirected\endcsname
-- = \relax
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}%
-- \fi\fi
--}
--%
--\parseargdef\codequotebacktick{%
-- \def\temp{#1}%
-- \ifx\temp\onword
-- \expandafter\let\csname SETtxicodequotebacktick\endcsname
-- = t%
-- \else\ifx\temp\offword
-- \expandafter\let\csname SETtxicodequotebacktick\endcsname
-- = \relax
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}%
-- \fi\fi
--}
--
--% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
--\def\noligaturesquoteleft{\relax\lq}
--
--% Count depth in font-changes, for error checks
--\newcount\fontdepth \fontdepth=0
--
--% Font commands.
--
--% #1 is the font command (\sl or \it), #2 is the text to slant.
--% If we are in a monospaced environment, however, 1) always use \ttsl,
--% and 2) do not add an italic correction.
--\def\dosmartslant#1#2{%
-- \ifusingtt
-- {{\ttsl #2}\let\next=\relax}%
-- {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}%
-- \next
--}
--\def\smartslanted{\dosmartslant\sl}
--\def\smartitalic{\dosmartslant\it}
--
--% Output an italic correction unless \next (presumed to be the following
--% character) is such as not to need one.
--\def\smartitaliccorrection{%
-- \ifx\next,%
-- \else\ifx\next-%
-- \else\ifx\next.%
-- \else\ptexslash
-- \fi\fi\fi
-- \aftersmartic
--}
--
--% Unconditional use \ttsl, and no ic. @var is set to this for defuns.
--\def\ttslanted#1{{\ttsl #1}}
--
--% @cite is like \smartslanted except unconditionally use \sl. We never want
--% ttsl for book titles, do we?
--\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection}
--
--\def\aftersmartic{}
--\def\var#1{%
-- \let\saveaftersmartic = \aftersmartic
-- \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
-- \smartslanted{#1}%
--}
--
--\let\i=\smartitalic
--\let\slanted=\smartslanted
--\let\dfn=\smartslanted
--\let\emph=\smartitalic
--
--% Explicit font changes: @r, @sc, undocumented @ii.
--\def\r#1{{\rm #1}} % roman font
--\def\sc#1{{\smallcaps#1}} % smallcaps font
--\def\ii#1{{\it #1}} % italic font
--
--% @b, explicit bold. Also @strong.
--\def\b#1{{\bf #1}}
--\let\strong=\b
--
--% @sansserif, explicit sans.
--\def\sansserif#1{{\sf #1}}
--
--% We can't just use \exhyphenpenalty, because that only has effect at
--% the end of a paragraph. Restore normal hyphenation at the end of the
--% group within which \nohyphenation is presumably called.
--%
--\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation}
--\def\restorehyphenation{\hyphenchar\font = `- }
--
--% Set sfcode to normal for the chars that usually have another value.
--% Can't use plain's \frenchspacing because it uses the `\x notation, and
--% sometimes \x has an active definition that messes things up.
--%
--\catcode`@=11
-- \def\plainfrenchspacing{%
-- \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
-- \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
-- \def\endofsentencespacefactor{1000}% for @. and friends
-- }
-- \def\plainnonfrenchspacing{%
-- \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
-- \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
-- \def\endofsentencespacefactor{3000}% for @. and friends
-- }
--\catcode`@=\other
--\def\endofsentencespacefactor{3000}% default
--
--% @t, explicit typewriter.
--\def\t#1{%
-- {\tt \rawbackslash \plainfrenchspacing #1}%
-- \null
--}
--
--% @samp.
--\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
--
--% @indicateurl is \samp, that is, with quotes.
--\let\indicateurl=\samp
--
--% @code (and similar) prints in typewriter, but with spaces the same
--% size as normal in the surrounding text, without hyphenation, etc.
--% This is a subroutine for that.
--\def\tclose#1{%
-- {%
-- % Change normal interword space to be same as for the current font.
-- \spaceskip = \fontdimen2\font
-- %
-- % Switch to typewriter.
-- \tt
-- %
-- % But `\ ' produces the large typewriter interword space.
-- \def\ {{\spaceskip = 0pt{} }}%
-- %
-- % Turn off hyphenation.
-- \nohyphenation
-- %
-- \rawbackslash
-- \plainfrenchspacing
-- #1%
-- }%
-- \null % reset spacefactor to 1000
--}
--
--% We *must* turn on hyphenation at `-' and `_' in @code.
--% Otherwise, it is too hard to avoid overfull hboxes
--% in the Emacs manual, the Library manual, etc.
--%
--% Unfortunately, TeX uses one parameter (\hyphenchar) to control
--% both hyphenation at - and hyphenation within words.
--% We must therefore turn them both off (\tclose does that)
--% and arrange explicitly to hyphenate at a dash.
--% -- rms.
--{
-- \catcode`\-=\active \catcode`\_=\active
-- \catcode`\'=\active \catcode`\`=\active
-- \global\let'=\rq \global\let`=\lq % default definitions
-- %
-- \global\def\code{\begingroup
-- \setupmarkupstyle{code}%
-- % The following should really be moved into \setupmarkupstyle handlers.
-- \catcode\dashChar=\active \catcode\underChar=\active
-- \ifallowcodebreaks
-- \let-\codedash
-- \let_\codeunder
-- \else
-- \let-\normaldash
-- \let_\realunder
-- \fi
-- \codex
-- }
--}
--
--\def\codex #1{\tclose{#1}\endgroup}
--
--\def\normaldash{-}
--\def\codedash{-\discretionary{}{}{}}
--\def\codeunder{%
-- % this is all so @math{@code{var_name}+1} can work. In math mode, _
-- % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.)
-- % will therefore expand the active definition of _, which is us
-- % (inside @code that is), therefore an endless loop.
-- \ifusingtt{\ifmmode
-- \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_.
-- \else\normalunderscore \fi
-- \discretionary{}{}{}}%
-- {\_}%
--}
--
--% An additional complication: the above will allow breaks after, e.g.,
--% each of the four underscores in __typeof__. This is bad.
--% @allowcodebreaks provides a document-level way to turn breaking at -
--% and _ on and off.
--%
--\newif\ifallowcodebreaks \allowcodebreakstrue
--
--\def\keywordtrue{true}
--\def\keywordfalse{false}
--
--\parseargdef\allowcodebreaks{%
-- \def\txiarg{#1}%
-- \ifx\txiarg\keywordtrue
-- \allowcodebreakstrue
-- \else\ifx\txiarg\keywordfalse
-- \allowcodebreaksfalse
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}%
-- \fi\fi
--}
--
--% For @command, @env, @file, @option quotes seem unnecessary,
--% so use \code rather than \samp.
--\let\command=\code
--\let\env=\code
--\let\file=\code
--\let\option=\code
--
--% @uref (abbreviation for `urlref') takes an optional (comma-separated)
--% second argument specifying the text to display and an optional third
--% arg as text to display instead of (rather than in addition to) the url
--% itself. First (mandatory) arg is the url.
--% (This \urefnobreak definition isn't used now, leaving it for a while
--% for comparison.)
--\def\urefnobreak#1{\dourefnobreak #1,,,\finish}
--\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup
-- \unsepspaces
-- \pdfurl{#1}%
-- \setbox0 = \hbox{\ignorespaces #3}%
-- \ifdim\wd0 > 0pt
-- \unhbox0 % third arg given, show only that
-- \else
-- \setbox0 = \hbox{\ignorespaces #2}%
-- \ifdim\wd0 > 0pt
-- \ifpdf
-- \unhbox0 % PDF: 2nd arg given, show only it
-- \else
-- \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
-- \fi
-- \else
-- \code{#1}% only url given, so show it
-- \fi
-- \fi
-- \endlink
--\endgroup}
--
--% This \urefbreak definition is the active one.
--\def\urefbreak{\begingroup \urefcatcodes \dourefbreak}
--\let\uref=\urefbreak
--\def\dourefbreak#1{\urefbreakfinish #1,,,\finish}
--\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example
-- \unsepspaces
-- \pdfurl{#1}%
-- \setbox0 = \hbox{\ignorespaces #3}%
-- \ifdim\wd0 > 0pt
-- \unhbox0 % third arg given, show only that
-- \else
-- \setbox0 = \hbox{\ignorespaces #2}%
-- \ifdim\wd0 > 0pt
-- \ifpdf
-- \unhbox0 % PDF: 2nd arg given, show only it
-- \else
-- \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url
-- \fi
-- \else
-- \urefcode{#1}% only url given, so show it
-- \fi
-- \fi
-- \endlink
--\endgroup}
--
--% Allow line breaks around only a few characters (only).
--\def\urefcatcodes{%
-- \catcode\ampChar=\active \catcode\dotChar=\active
-- \catcode\hashChar=\active \catcode\questChar=\active
-- \catcode\slashChar=\active
--}
--{
-- \urefcatcodes
-- %
-- \global\def\urefcode{\begingroup
-- \setupmarkupstyle{code}%
-- \urefcatcodes
-- \let&\urefcodeamp
-- \let.\urefcodedot
-- \let#\urefcodehash
-- \let?\urefcodequest
-- \let/\urefcodeslash
-- \codex
-- }
-- %
-- % By default, they are just regular characters.
-- \global\def&{\normalamp}
-- \global\def.{\normaldot}
-- \global\def#{\normalhash}
-- \global\def?{\normalquest}
-- \global\def/{\normalslash}
--}
--
--% we put a little stretch before and after the breakable chars, to help
--% line breaking of long url's. The unequal skips make look better in
--% cmtt at least, especially for dots.
--\def\urefprestretch{\urefprebreak \hskip0pt plus.13em }
--\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em }
--%
--\def\urefcodeamp{\urefprestretch \&\urefpoststretch}
--\def\urefcodedot{\urefprestretch .\urefpoststretch}
--\def\urefcodehash{\urefprestretch \#\urefpoststretch}
--\def\urefcodequest{\urefprestretch ?\urefpoststretch}
--\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
--{
-- \catcode`\/=\active
-- \global\def\urefcodeslashfinish{%
-- \urefprestretch \slashChar
-- % Allow line break only after the final / in a sequence of
-- % slashes, to avoid line break between the slashes in http://.
-- \ifx\next/\else \urefpoststretch \fi
-- }
--}
--
--% One more complication: by default we'll break after the special
--% characters, but some people like to break before the special chars, so
--% allow that. Also allow no breaking at all, for manual control.
--%
--\parseargdef\urefbreakstyle{%
-- \def\txiarg{#1}%
-- \ifx\txiarg\wordnone
-- \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak}
-- \else\ifx\txiarg\wordbefore
-- \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak}
-- \else\ifx\txiarg\wordafter
-- \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak}
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @urefbreakstyle setting `\txiarg'}%
-- \fi\fi\fi
--}
--\def\wordafter{after}
--\def\wordbefore{before}
--\def\wordnone{none}
--
--\urefbreakstyle after
--
--% @url synonym for @uref, since that's how everyone uses it.
--%
--\let\url=\uref
--
--% rms does not like angle brackets --karl, 17may97.
--% So now @email is just like @uref, unless we are pdf.
--%
--%\def\email#1{\angleleft{\tt #1}\angleright}
--\ifpdf
-- \def\email#1{\doemail#1,,\finish}
-- \def\doemail#1,#2,#3\finish{\begingroup
-- \unsepspaces
-- \pdfurl{mailto:#1}%
-- \setbox0 = \hbox{\ignorespaces #2}%
-- \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
-- \endlink
-- \endgroup}
--\else
-- \let\email=\uref
--\fi
--
--% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
--% `example' (@kbd uses ttsl only inside of @example and friends),
--% or `code' (@kbd uses normal tty font always).
--\parseargdef\kbdinputstyle{%
-- \def\txiarg{#1}%
-- \ifx\txiarg\worddistinct
-- \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-- \else\ifx\txiarg\wordexample
-- \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-- \else\ifx\txiarg\wordcode
-- \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @kbdinputstyle setting `\txiarg'}%
-- \fi\fi\fi
--}
--\def\worddistinct{distinct}
--\def\wordexample{example}
--\def\wordcode{code}
--
--% Default is `distinct'.
--\kbdinputstyle distinct
--
--% @kbd is like @code, except that if the argument is just one @key command,
--% then @kbd has no effect.
--\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
--
--\def\xkey{\key}
--\def\kbdsub#1#2#3\par{%
-- \def\one{#1}\def\three{#3}\def\threex{??}%
-- \ifx\one\xkey\ifx\threex\three \key{#2}%
-- \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-- \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
--}
--
--% definition of @key that produces a lozenge. Doesn't adjust to text size.
--%\setfont\keyrm\rmshape{8}{1000}{OT1}
--%\font\keysy=cmsy9
--%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
--% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
--% \vbox{\hrule\kern-0.4pt
--% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
--% \kern-0.4pt\hrule}%
--% \kern-.06em\raise0.4pt\hbox{\angleright}}}}
--
--% definition of @key with no lozenge. If the current font is already
--% monospace, don't change it; that way, we respect @kbdinputstyle. But
--% if it isn't monospace, then use \tt.
--%
--\def\key#1{{\setupmarkupstyle{key}%
-- \nohyphenation
-- \ifmonospace\else\tt\fi
-- #1}\null}
--
--% @clicksequence{File @click{} Open ...}
--\def\clicksequence#1{\begingroup #1\endgroup}
--
--% @clickstyle @arrow (by default)
--\parseargdef\clickstyle{\def\click{#1}}
--\def\click{\arrow}
--
--% Typeset a dimension, e.g., `in' or `pt'. The only reason for the
--% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
--%
--\def\dmn#1{\thinspace #1}
--
--% @l was never documented to mean ``switch to the Lisp font'',
--% and it is not used as such in any manual I can find. We need it for
--% Polish suppressed-l. --karl, 22sep96.
--%\def\l#1{{\li #1}\null}
--
--% @acronym for "FBI", "NATO", and the like.
--% We print this one point size smaller, since it's intended for
--% all-uppercase.
--%
--\def\acronym#1{\doacronym #1,,\finish}
--\def\doacronym#1,#2,#3\finish{%
-- {\selectfonts\lsize #1}%
-- \def\temp{#2}%
-- \ifx\temp\empty \else
-- \space ({\unsepspaces \ignorespaces \temp \unskip})%
-- \fi
-- \null % reset \spacefactor=1000
--}
--
--% @abbr for "Comput. J." and the like.
--% No font change, but don't do end-of-sentence spacing.
--%
--\def\abbr#1{\doabbr #1,,\finish}
--\def\doabbr#1,#2,#3\finish{%
-- {\plainfrenchspacing #1}%
-- \def\temp{#2}%
-- \ifx\temp\empty \else
-- \space ({\unsepspaces \ignorespaces \temp \unskip})%
-- \fi
-- \null % reset \spacefactor=1000
--}
--
--% @asis just yields its argument. Used with @table, for example.
--%
--\def\asis#1{#1}
--
--% @math outputs its argument in math mode.
--%
--% One complication: _ usually means subscripts, but it could also mean
--% an actual _ character, as in @math{@var{some_variable} + 1}. So make
--% _ active, and distinguish by seeing if the current family is \slfam,
--% which is what @var uses.
--{
-- \catcode`\_ = \active
-- \gdef\mathunderscore{%
-- \catcode`\_=\active
-- \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-- }
--}
--% Another complication: we want \\ (and @\) to output a math (or tt) \.
--% FYI, plain.tex uses \\ as a temporary control sequence (for no
--% particular reason), but this is not advertised and we don't care.
--%
--% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
--\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
--%
--\def\math{%
-- \tex
-- \mathunderscore
-- \let\\ = \mathbackslash
-- \mathactive
-- % make the texinfo accent commands work in math mode
-- \let\"=\ddot
-- \let\'=\acute
-- \let\==\bar
-- \let\^=\hat
-- \let\`=\grave
-- \let\u=\breve
-- \let\v=\check
-- \let\~=\tilde
-- \let\dotaccent=\dot
-- $\finishmath
--}
--\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex.
--
--% Some active characters (such as <) are spaced differently in math.
--% We have to reset their definitions in case the @math was an argument
--% to a command which sets the catcodes (such as @item or @section).
--%
--{
-- \catcode`^ = \active
-- \catcode`< = \active
-- \catcode`> = \active
-- \catcode`+ = \active
-- \catcode`' = \active
-- \gdef\mathactive{%
-- \let^ = \ptexhat
-- \let< = \ptexless
-- \let> = \ptexgtr
-- \let+ = \ptexplus
-- \let' = \ptexquoteright
-- }
--}
--
--% ctrl is no longer a Texinfo command, but leave this definition for fun.
--\def\ctrl #1{{\tt \rawbackslash \hat}#1}
--
--% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
--% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
--% except specified as a normal braced arg, so no newlines to worry about.
--%
--\def\outfmtnametex{tex}
--%
--\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
--\long\def\doinlinefmt#1,#2,\finish{%
-- \def\inlinefmtname{#1}%
-- \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
--}
--% For raw, must switch into @tex before parsing the argument, to avoid
--% setting catcodes prematurely. Doing it this way means that, for
--% example, @inlineraw{html, foo{bar} gets a parse error instead of being
--% ignored. But this isn't important because if people want a literal
--% *right* brace they would have to use a command anyway, so they may as
--% well use a command to get a left brace too. We could re-use the
--% delimiter character idea from \verb, but it seems like overkill.
--%
--\long\def\inlineraw{\tex \doinlineraw}
--\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
--\def\doinlinerawtwo#1,#2,\finish{%
-- \def\inlinerawname{#1}%
-- \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
-- \endgroup % close group opened by \tex.
--}
--
--
--\message{glyphs,}
--% and logos.
--
--% @@ prints an @, as does @atchar{}.
--\def\@{\char64 }
--\let\atchar=\@
--
--% @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
--% Unless we're in typewriter, use \ecfont because the CM text fonts do
--% not have braces, and we don't want to switch into math.
--\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
--\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
--\let\{=\mylbrace \let\lbracechar=\{
--\let\}=\myrbrace \let\rbracechar=\}
--\begingroup
-- % Definitions to produce \{ and \} commands for indices,
-- % and @{ and @} for the aux/toc files.
-- \catcode`\{ = \other \catcode`\} = \other
-- \catcode`\[ = 1 \catcode`\] = 2
-- \catcode`\! = 0 \catcode`\\ = \other
-- !gdef!lbracecmd[\{]%
-- !gdef!rbracecmd[\}]%
-- !gdef!lbraceatcmd[@{]%
-- !gdef!rbraceatcmd[@}]%
--!endgroup
--
--% @comma{} to avoid , parsing problems.
--\let\comma = ,
--
--% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
--% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
--\let\, = \ptexc
--\let\dotaccent = \ptexdot
--\def\ringaccent#1{{\accent23 #1}}
--\let\tieaccent = \ptext
--\let\ubaraccent = \ptexb
--\let\udotaccent = \d
--
--% Other special characters: @questiondown @exclamdown @ordf @ordm
--% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
--\def\questiondown{?`}
--\def\exclamdown{!`}
--\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
--\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
--
--% Dotless i and dotless j, used for accents.
--\def\imacro{i}
--\def\jmacro{j}
--\def\dotless#1{%
-- \def\temp{#1}%
-- \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
-- \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
-- \else \errmessage{@dotless can be used only with i or j}%
-- \fi\fi
--}
--
--% The \TeX{} logo, as in plain, but resetting the spacing so that a
--% period following counts as ending a sentence. (Idea found in latex.)
--%
--\edef\TeX{\TeX \spacefactor=1000 }
--
--% @LaTeX{} logo. Not quite the same results as the definition in
--% latex.ltx, since we use a different font for the raised A; it's most
--% convenient for us to use an explicitly smaller font, rather than using
--% the \scriptstyle font (since we don't reset \scriptstyle and
--% \scriptscriptstyle).
--%
--\def\LaTeX{%
-- L\kern-.36em
-- {\setbox0=\hbox{T}%
-- \vbox to \ht0{\hbox{%
-- \ifx\textnominalsize\xwordpt
-- % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX.
-- % Revert to plain's \scriptsize, which is 7pt.
-- \count255=\the\fam $\fam\count255 \scriptstyle A$%
-- \else
-- % For 11pt, we can use our lllsize.
-- \selectfonts\lllsize A%
-- \fi
-- }%
-- \vss
-- }}%
-- \kern-.15em
-- \TeX
--}
--
--% Some math mode symbols.
--\def\bullet{$\ptexbullet$}
--\def\geq{\ifmmode \ge\else $\ge$\fi}
--\def\leq{\ifmmode \le\else $\le$\fi}
--\def\minus{\ifmmode -\else $-$\fi}
--
--% @dots{} outputs an ellipsis using the current font.
--% We do .5em per period so that it has the same spacing in the cm
--% typewriter fonts as three actual period characters; on the other hand,
--% in other typewriter fonts three periods are wider than 1.5em. So do
--% whichever is larger.
--%
--\def\dots{%
-- \leavevmode
-- \setbox0=\hbox{...}% get width of three periods
-- \ifdim\wd0 > 1.5em
-- \dimen0 = \wd0
-- \else
-- \dimen0 = 1.5em
-- \fi
-- \hbox to \dimen0{%
-- \hskip 0pt plus.25fil
-- .\hskip 0pt plus1fil
-- .\hskip 0pt plus1fil
-- .\hskip 0pt plus.5fil
-- }%
--}
--
--% @enddots{} is an end-of-sentence ellipsis.
--%
--\def\enddots{%
-- \dots
-- \spacefactor=\endofsentencespacefactor
--}
--
--% @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
--%
--% Since these characters are used in examples, they should be an even number of
--% \tt widths. Each \tt character is 1en, so two makes it 1em.
--%
--\def\point{$\star$}
--\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}}
--\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}}
--\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}}
--\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}}
--\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}}
--
--% The @error{} command.
--% Adapted from the TeXbook's \boxit.
--%
--\newbox\errorbox
--%
--{\tentt \global\dimen0 = 3em}% Width of the box.
--\dimen2 = .55pt % Thickness of rules
--% The text. (`r' is open on the right, `e' somewhat less so on the left.)
--\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt}
--%
--\setbox\errorbox=\hbox to \dimen0{\hfil
-- \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
-- \advance\hsize by -2\dimen2 % Rules.
-- \vbox{%
-- \hrule height\dimen2
-- \hbox{\vrule width\dimen2 \kern3pt % Space to left of text.
-- \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below.
-- \kern3pt\vrule width\dimen2}% Space to right.
-- \hrule height\dimen2}
-- \hfil}
--%
--\def\error{\leavevmode\lower.7ex\copy\errorbox}
--
--% @pounds{} is a sterling sign, which Knuth put in the CM italic font.
--%
--\def\pounds{{\it\$}}
--
--% @euro{} comes from a separate font, depending on the current style.
--% We use the free feym* fonts from the eurosym package by Henrik
--% Theiling, which support regular, slanted, bold and bold slanted (and
--% "outlined" (blackboard board, sort of) versions, which we don't need).
--% It is available from http://www.ctan.org/tex-archive/fonts/eurosym.
--%
--% Although only regular is the truly official Euro symbol, we ignore
--% that. The Euro is designed to be slightly taller than the regular
--% font height.
--%
--% feymr - regular
--% feymo - slanted
--% feybr - bold
--% feybo - bold slanted
--%
--% There is no good (free) typewriter version, to my knowledge.
--% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide.
--% Hmm.
--%
--% Also doesn't work in math. Do we need to do math with euro symbols?
--% Hope not.
--%
--%
--\def\euro{{\eurofont e}}
--\def\eurofont{%
-- % We set the font at each command, rather than predefining it in
-- % \textfonts and the other font-switching commands, so that
-- % installations which never need the symbol don't have to have the
-- % font installed.
-- %
-- % There is only one designed size (nominal 10pt), so we always scale
-- % that to the current nominal size.
-- %
-- % By the way, simply using "at 1em" works for cmr10 and the like, but
-- % does not work for cmbx10 and other extended/shrunken fonts.
-- %
-- \def\eurosize{\csname\curfontsize nominalsize\endcsname}%
-- %
-- \ifx\curfontstyle\bfstylename
-- % bold:
-- \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize
-- \else
-- % regular:
-- \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize
-- \fi
-- \thiseurofont
--}
--
--% Glyphs from the EC fonts. We don't use \let for the aliases, because
--% sometimes we redefine the original macro, and the alias should reflect
--% the redefinition.
--%
--% Use LaTeX names for the Icelandic letters.
--\def\DH{{\ecfont \char"D0}} % Eth
--\def\dh{{\ecfont \char"F0}} % eth
--\def\TH{{\ecfont \char"DE}} % Thorn
--\def\th{{\ecfont \char"FE}} % thorn
--%
--\def\guillemetleft{{\ecfont \char"13}}
--\def\guillemotleft{\guillemetleft}
--\def\guillemetright{{\ecfont \char"14}}
--\def\guillemotright{\guillemetright}
--\def\guilsinglleft{{\ecfont \char"0E}}
--\def\guilsinglright{{\ecfont \char"0F}}
--\def\quotedblbase{{\ecfont \char"12}}
--\def\quotesinglbase{{\ecfont \char"0D}}
--%
--% This positioning is not perfect (see the ogonek LaTeX package), but
--% we have the precomposed glyphs for the most common cases. We put the
--% tests to use those glyphs in the single \ogonek macro so we have fewer
--% dummy definitions to worry about for index entries, etc.
--%
--% ogonek is also used with other letters in Lithuanian (IOU), but using
--% the precomposed glyphs for those is not so easy since they aren't in
--% the same EC font.
--\def\ogonek#1{{%
-- \def\temp{#1}%
-- \ifx\temp\macrocharA\Aogonek
-- \else\ifx\temp\macrochara\aogonek
-- \else\ifx\temp\macrocharE\Eogonek
-- \else\ifx\temp\macrochare\eogonek
-- \else
-- \ecfont \setbox0=\hbox{#1}%
-- \ifdim\ht0=1ex\accent"0C #1%
-- \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}%
-- \fi
-- \fi\fi\fi\fi
-- }%
--}
--\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A}
--\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a}
--\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E}
--\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e}
--%
--% Use the ec* fonts (cm-super in outline format) for non-CM glyphs.
--\def\ecfont{%
-- % We can't distinguish serif/sans and italic/slanted, but this
-- % is used for crude hacks anyway (like adding French and German
-- % quotes to documents typeset with CM, where we lose kerning), so
-- % hopefully nobody will notice/care.
-- \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
-- \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
-- \ifmonospace
-- % typewriter:
-- \font\thisecfont = ectt\ecsize \space at \nominalsize
-- \else
-- \ifx\curfontstyle\bfstylename
-- % bold:
-- \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
-- \else
-- % regular:
-- \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
-- \fi
-- \fi
-- \thisecfont
--}
--
--% @registeredsymbol - R in a circle. The font for the R should really
--% be smaller yet, but lllsize is the best we can do for now.
--% Adapted from the plain.tex definition of \copyright.
--%
--\def\registeredsymbol{%
-- $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}%
-- \hfil\crcr\Orb}}%
-- }$%
--}
--
--% @textdegree - the normal degrees sign.
--%
--\def\textdegree{$^\circ$}
--
--% Laurent Siebenmann reports \Orb undefined with:
--% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38
--% so we'll define it if necessary.
--%
--\ifx\Orb\thisisundefined
--\def\Orb{\mathhexbox20D}
--\fi
--
--% Quotes.
--\chardef\quotedblleft="5C
--\chardef\quotedblright=`\"
--\chardef\quoteleft=`\`
--\chardef\quoteright=`\'
--
--
--\message{page headings,}
--
--\newskip\titlepagetopglue \titlepagetopglue = 1.5in
--\newskip\titlepagebottomglue \titlepagebottomglue = 2pc
--
--% First the title page. Must do @settitle before @titlepage.
--\newif\ifseenauthor
--\newif\iffinishedtitlepage
--
--% Do an implicit @contents or @shortcontents after @end titlepage if the
--% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
--%
--\newif\ifsetcontentsaftertitlepage
-- \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
--\newif\ifsetshortcontentsaftertitlepage
-- \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
--
--\parseargdef\shorttitlepage{%
-- \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-- \endgroup\page\hbox{}\page}
--
--\envdef\titlepage{%
-- % Open one extra group, as we want to close it in the middle of \Etitlepage.
-- \begingroup
-- \parindent=0pt \textfonts
-- % Leave some space at the very top of the page.
-- \vglue\titlepagetopglue
-- % No rule at page bottom unless we print one at the top with @title.
-- \finishedtitlepagetrue
-- %
-- % Most title ``pages'' are actually two pages long, with space
-- % at the top of the second. We don't want the ragged left on the second.
-- \let\oldpage = \page
-- \def\page{%
-- \iffinishedtitlepage\else
-- \finishtitlepage
-- \fi
-- \let\page = \oldpage
-- \page
-- \null
-- }%
--}
--
--\def\Etitlepage{%
-- \iffinishedtitlepage\else
-- \finishtitlepage
-- \fi
-- % It is important to do the page break before ending the group,
-- % because the headline and footline are only empty inside the group.
-- % If we use the new definition of \page, we always get a blank page
-- % after the title page, which we certainly don't want.
-- \oldpage
-- \endgroup
-- %
-- % Need this before the \...aftertitlepage checks so that if they are
-- % in effect the toc pages will come out with page numbers.
-- \HEADINGSon
-- %
-- % If they want short, they certainly want long too.
-- \ifsetshortcontentsaftertitlepage
-- \shortcontents
-- \contents
-- \global\let\shortcontents = \relax
-- \global\let\contents = \relax
-- \fi
-- %
-- \ifsetcontentsaftertitlepage
-- \contents
-- \global\let\contents = \relax
-- \global\let\shortcontents = \relax
-- \fi
--}
--
--\def\finishtitlepage{%
-- \vskip4pt \hrule height 2pt width \hsize
-- \vskip\titlepagebottomglue
-- \finishedtitlepagetrue
--}
--
--% Settings used for typesetting titles: no hyphenation, no indentation,
--% don't worry much about spacing, ragged right. This should be used
--% inside a \vbox, and fonts need to be set appropriately first. Because
--% it is always used for titles, nothing else, we call \rmisbold. \par
--% should be specified before the end of the \vbox, since a vbox is a group.
--%
--\def\raggedtitlesettings{%
-- \rmisbold
-- \hyphenpenalty=10000
-- \parindent=0pt
-- \tolerance=5000
-- \ptexraggedright
--}
--
--% Macros to be used within @titlepage:
--
--\let\subtitlerm=\tenrm
--\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
--
--\parseargdef\title{%
-- \checkenv\titlepage
-- \vbox{\titlefonts \raggedtitlesettings #1\par}%
-- % print a rule at the page bottom also.
-- \finishedtitlepagefalse
-- \vskip4pt \hrule height 4pt width \hsize \vskip4pt
--}
--
--\parseargdef\subtitle{%
-- \checkenv\titlepage
-- {\subtitlefont \rightline{#1}}%
--}
--
--% @author should come last, but may come many times.
--% It can also be used inside @quotation.
--%
--\parseargdef\author{%
-- \def\temp{\quotation}%
-- \ifx\thisenv\temp
-- \def\quotationauthor{#1}% printed in \Equotation.
-- \else
-- \checkenv\titlepage
-- \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi
-- {\secfonts\rmisbold \leftline{#1}}%
-- \fi
--}
--
--
--% Set up page headings and footings.
--
--\let\thispage=\folio
--
--\newtoks\evenheadline % headline on even pages
--\newtoks\oddheadline % headline on odd pages
--\newtoks\evenfootline % footline on even pages
--\newtoks\oddfootline % footline on odd pages
--
--% Now make TeX use those variables
--\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline
-- \else \the\evenheadline \fi}}
--\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline
-- \else \the\evenfootline \fi}\HEADINGShook}
--\let\HEADINGShook=\relax
--
--% Commands to set those variables.
--% For example, this is what @headings on does
--% @evenheading @thistitle|@thispage|@thischapter
--% @oddheading @thischapter|@thispage|@thistitle
--% @evenfooting @thisfile||
--% @oddfooting ||@thisfile
--
--
--\def\evenheading{\parsearg\evenheadingxxx}
--\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish}
--\def\evenheadingyyy #1\|#2\|#3\|#4\finish{%
--\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
--
--\def\oddheading{\parsearg\oddheadingxxx}
--\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish}
--\def\oddheadingyyy #1\|#2\|#3\|#4\finish{%
--\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
--
--\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
--
--\def\evenfooting{\parsearg\evenfootingxxx}
--\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish}
--\def\evenfootingyyy #1\|#2\|#3\|#4\finish{%
--\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
--
--\def\oddfooting{\parsearg\oddfootingxxx}
--\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish}
--\def\oddfootingyyy #1\|#2\|#3\|#4\finish{%
-- \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
-- %
-- % Leave some space for the footline. Hopefully ok to assume
-- % @evenfooting will not be used by itself.
-- \global\advance\pageheight by -12pt
-- \global\advance\vsize by -12pt
--}
--
--\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
--
--% @evenheadingmarks top \thischapter <- chapter at the top of a page
--% @evenheadingmarks bottom \thischapter <- chapter at the bottom of a page
--%
--% The same set of arguments for:
--%
--% @oddheadingmarks
--% @evenfootingmarks
--% @oddfootingmarks
--% @everyheadingmarks
--% @everyfootingmarks
--
--\def\evenheadingmarks{\headingmarks{even}{heading}}
--\def\oddheadingmarks{\headingmarks{odd}{heading}}
--\def\evenfootingmarks{\headingmarks{even}{footing}}
--\def\oddfootingmarks{\headingmarks{odd}{footing}}
--\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
-- \headingmarks{odd}{heading}{#1} }
--\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
-- \headingmarks{odd}{footing}{#1} }
--% #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
--\def\headingmarks#1#2#3 {%
-- \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname
-- \global\expandafter\let\csname get#1#2marks\endcsname \temp
--}
--
--\everyheadingmarks bottom
--\everyfootingmarks bottom
--
--% @headings double turns headings on for double-sided printing.
--% @headings single turns headings on for single-sided printing.
--% @headings off turns them off.
--% @headings on same as @headings double, retained for compatibility.
--% @headings after turns on double-sided headings after this page.
--% @headings doubleafter turns on double-sided headings after this page.
--% @headings singleafter turns on single-sided headings after this page.
--% By default, they are off at the start of a document,
--% and turned `on' after @end titlepage.
--
--\def\headings #1 {\csname HEADINGS#1\endcsname}
--
--\def\headingsoff{% non-global headings elimination
-- \evenheadline={\hfil}\evenfootline={\hfil}%
-- \oddheadline={\hfil}\oddfootline={\hfil}%
--}
--
--\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting
--\HEADINGSoff % it's the default
--
--% When we turn headings on, set the page number to 1.
--% For double-sided printing, put current file name in lower left corner,
--% chapter name on inside top of right hand pages, document
--% title on inside top of left hand pages, and page numbers on outside top
--% edge of all pages.
--\def\HEADINGSdouble{%
--\global\pageno=1
--\global\evenfootline={\hfil}
--\global\oddfootline={\hfil}
--\global\evenheadline={\line{\folio\hfil\thistitle}}
--\global\oddheadline={\line{\thischapter\hfil\folio}}
--\global\let\contentsalignmacro = \chapoddpage
--}
--\let\contentsalignmacro = \chappager
--
--% For single-sided printing, chapter title goes across top left of page,
--% page number on top right.
--\def\HEADINGSsingle{%
--\global\pageno=1
--\global\evenfootline={\hfil}
--\global\oddfootline={\hfil}
--\global\evenheadline={\line{\thischapter\hfil\folio}}
--\global\oddheadline={\line{\thischapter\hfil\folio}}
--\global\let\contentsalignmacro = \chappager
--}
--\def\HEADINGSon{\HEADINGSdouble}
--
--\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
--\let\HEADINGSdoubleafter=\HEADINGSafter
--\def\HEADINGSdoublex{%
--\global\evenfootline={\hfil}
--\global\oddfootline={\hfil}
--\global\evenheadline={\line{\folio\hfil\thistitle}}
--\global\oddheadline={\line{\thischapter\hfil\folio}}
--\global\let\contentsalignmacro = \chapoddpage
--}
--
--\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
--\def\HEADINGSsinglex{%
--\global\evenfootline={\hfil}
--\global\oddfootline={\hfil}
--\global\evenheadline={\line{\thischapter\hfil\folio}}
--\global\oddheadline={\line{\thischapter\hfil\folio}}
--\global\let\contentsalignmacro = \chappager
--}
--
--% Subroutines used in generating headings
--% This produces Day Month Year style of output.
--% Only define if not already defined, in case a txi-??.tex file has set
--% up a different format (e.g., txi-cs.tex does this).
--\ifx\today\thisisundefined
--\def\today{%
-- \number\day\space
-- \ifcase\month
-- \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
-- \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
-- \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
-- \fi
-- \space\number\year}
--\fi
--
--% @settitle line... specifies the title of the document, for headings.
--% It generates no output of its own.
--\def\thistitle{\putwordNoTitle}
--\def\settitle{\parsearg{\gdef\thistitle}}
--
--
--\message{tables,}
--% Tables -- @table, @ftable, @vtable, @item(x).
--
--% default indentation of table text
--\newdimen\tableindent \tableindent=.8in
--% default indentation of @itemize and @enumerate text
--\newdimen\itemindent \itemindent=.3in
--% margin between end of table item and start of table text.
--\newdimen\itemmargin \itemmargin=.1in
--
--% used internally for \itemindent minus \itemmargin
--\newdimen\itemmax
--
--% Note @table, @ftable, and @vtable define @item, @itemx, etc., with
--% these defs.
--% They also define \itemindex
--% to index the item name in whatever manner is desired (perhaps none).
--
--\newif\ifitemxneedsnegativevskip
--
--\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi}
--
--\def\internalBitem{\smallbreak \parsearg\itemzzz}
--\def\internalBitemx{\itemxpar \parsearg\itemzzz}
--
--\def\itemzzz #1{\begingroup %
-- \advance\hsize by -\rightskip
-- \advance\hsize by -\tableindent
-- \setbox0=\hbox{\itemindicate{#1}}%
-- \itemindex{#1}%
-- \nobreak % This prevents a break before @itemx.
-- %
-- % If the item text does not fit in the space we have, put it on a line
-- % by itself, and do not allow a page break either before or after that
-- % line. We do not start a paragraph here because then if the next
-- % command is, e.g., @kindex, the whatsit would get put into the
-- % horizontal list on a line by itself, resulting in extra blank space.
-- \ifdim \wd0>\itemmax
-- %
-- % Make this a paragraph so we get the \parskip glue and wrapping,
-- % but leave it ragged-right.
-- \begingroup
-- \advance\leftskip by-\tableindent
-- \advance\hsize by\tableindent
-- \advance\rightskip by0pt plus1fil\relax
-- \leavevmode\unhbox0\par
-- \endgroup
-- %
-- % We're going to be starting a paragraph, but we don't want the
-- % \parskip glue -- logically it's part of the @item we just started.
-- \nobreak \vskip-\parskip
-- %
-- % Stop a page break at the \parskip glue coming up. However, if
-- % what follows is an environment such as @example, there will be no
-- % \parskip glue; then the negative vskip we just inserted would
-- % cause the example and the item to crash together. So we use this
-- % bizarre value of 10001 as a signal to \aboveenvbreak to insert
-- % \parskip glue after all. Section titles are handled this way also.
-- %
-- \penalty 10001
-- \endgroup
-- \itemxneedsnegativevskipfalse
-- \else
-- % The item text fits into the space. Start a paragraph, so that the
-- % following text (if any) will end up on the same line.
-- \noindent
-- % Do this with kerns and \unhbox so that if there is a footnote in
-- % the item text, it can migrate to the main vertical list and
-- % eventually be printed.
-- \nobreak\kern-\tableindent
-- \dimen0 = \itemmax \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0
-- \unhbox0
-- \nobreak\kern\dimen0
-- \endgroup
-- \itemxneedsnegativevskiptrue
-- \fi
--}
--
--\def\item{\errmessage{@item while not in a list environment}}
--\def\itemx{\errmessage{@itemx while not in a list environment}}
--
--% @table, @ftable, @vtable.
--\envdef\table{%
-- \let\itemindex\gobble
-- \tablecheck{table}%
--}
--\envdef\ftable{%
-- \def\itemindex ##1{\doind {fn}{\code{##1}}}%
-- \tablecheck{ftable}%
--}
--\envdef\vtable{%
-- \def\itemindex ##1{\doind {vr}{\code{##1}}}%
-- \tablecheck{vtable}%
--}
--\def\tablecheck#1{%
-- \ifnum \the\catcode`\^^M=\active
-- \endgroup
-- \errmessage{This command won't work in this context; perhaps the problem is
-- that we are \inenvironment\thisenv}%
-- \def\next{\doignore{#1}}%
-- \else
-- \let\next\tablex
-- \fi
-- \next
--}
--\def\tablex#1{%
-- \def\itemindicate{#1}%
-- \parsearg\tabley
--}
--\def\tabley#1{%
-- {%
-- \makevalueexpandable
-- \edef\temp{\noexpand\tablez #1\space\space\space}%
-- \expandafter
-- }\temp \endtablez
--}
--\def\tablez #1 #2 #3 #4\endtablez{%
-- \aboveenvbreak
-- \ifnum 0#1>0 \advance \leftskip by #1\mil \fi
-- \ifnum 0#2>0 \tableindent=#2\mil \fi
-- \ifnum 0#3>0 \advance \rightskip by #3\mil \fi
-- \itemmax=\tableindent
-- \advance \itemmax by -\itemmargin
-- \advance \leftskip by \tableindent
-- \exdentamount=\tableindent
-- \parindent = 0pt
-- \parskip = \smallskipamount
-- \ifdim \parskip=0pt \parskip=2pt \fi
-- \let\item = \internalBitem
-- \let\itemx = \internalBitemx
--}
--\def\Etable{\endgraf\afterenvbreak}
--\let\Eftable\Etable
--\let\Evtable\Etable
--\let\Eitemize\Etable
--\let\Eenumerate\Etable
--
--% This is the counter used by @enumerate, which is really @itemize
--
--\newcount \itemno
--
--\envdef\itemize{\parsearg\doitemize}
--
--\def\doitemize#1{%
-- \aboveenvbreak
-- \itemmax=\itemindent
-- \advance\itemmax by -\itemmargin
-- \advance\leftskip by \itemindent
-- \exdentamount=\itemindent
-- \parindent=0pt
-- \parskip=\smallskipamount
-- \ifdim\parskip=0pt \parskip=2pt \fi
-- %
-- % Try typesetting the item mark that if the document erroneously says
-- % something like @itemize @samp (intending @table), there's an error
-- % right away at the @itemize. It's not the best error message in the
-- % world, but it's better than leaving it to the @item. This means if
-- % the user wants an empty mark, they have to say @w{} not just @w.
-- \def\itemcontents{#1}%
-- \setbox0 = \hbox{\itemcontents}%
-- %
-- % @itemize with no arg is equivalent to @itemize @bullet.
-- \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi
-- %
-- \let\item=\itemizeitem
--}
--
--% Definition of @item while inside @itemize and @enumerate.
--%
--\def\itemizeitem{%
-- \advance\itemno by 1 % for enumerations
-- {\let\par=\endgraf \smallbreak}% reasonable place to break
-- {%
-- % If the document has an @itemize directly after a section title, a
-- % \nobreak will be last on the list, and \sectionheading will have
-- % done a \vskip-\parskip. In that case, we don't want to zero
-- % parskip, or the item text will crash with the heading. On the
-- % other hand, when there is normal text preceding the item (as there
-- % usually is), we do want to zero parskip, or there would be too much
-- % space. In that case, we won't have a \nobreak before. At least
-- % that's the theory.
-- \ifnum\lastpenalty<10000 \parskip=0in \fi
-- \noindent
-- \hbox to 0pt{\hss \itemcontents \kern\itemmargin}%
-- %
-- \vadjust{\penalty 1200}}% not good to break after first line of item.
-- \flushcr
--}
--
--% \splitoff TOKENS\endmark defines \first to be the first token in
--% TOKENS, and \rest to be the remainder.
--%
--\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}%
--
--% Allow an optional argument of an uppercase letter, lowercase letter,
--% or number, to specify the first label in the enumerated list. No
--% argument is the same as `1'.
--%
--\envparseargdef\enumerate{\enumeratey #1 \endenumeratey}
--\def\enumeratey #1 #2\endenumeratey{%
-- % If we were given no argument, pretend we were given `1'.
-- \def\thearg{#1}%
-- \ifx\thearg\empty \def\thearg{1}\fi
-- %
-- % Detect if the argument is a single token. If so, it might be a
-- % letter. Otherwise, the only valid thing it can be is a number.
-- % (We will always have one token, because of the test we just made.
-- % This is a good thing, since \splitoff doesn't work given nothing at
-- % all -- the first parameter is undelimited.)
-- \expandafter\splitoff\thearg\endmark
-- \ifx\rest\empty
-- % Only one token in the argument. It could still be anything.
-- % A ``lowercase letter'' is one whose \lccode is nonzero.
-- % An ``uppercase letter'' is one whose \lccode is both nonzero, and
-- % not equal to itself.
-- % Otherwise, we assume it's a number.
-- %
-- % We need the \relax at the end of the \ifnum lines to stop TeX from
-- % continuing to look for a <number>.
-- %
-- \ifnum\lccode\expandafter`\thearg=0\relax
-- \numericenumerate % a number (we hope)
-- \else
-- % It's a letter.
-- \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax
-- \lowercaseenumerate % lowercase letter
-- \else
-- \uppercaseenumerate % uppercase letter
-- \fi
-- \fi
-- \else
-- % Multiple tokens in the argument. We hope it's a number.
-- \numericenumerate
-- \fi
--}
--
--% An @enumerate whose labels are integers. The starting integer is
--% given in \thearg.
--%
--\def\numericenumerate{%
-- \itemno = \thearg
-- \startenumeration{\the\itemno}%
--}
--
--% The starting (lowercase) letter is in \thearg.
--\def\lowercaseenumerate{%
-- \itemno = \expandafter`\thearg
-- \startenumeration{%
-- % Be sure we're not beyond the end of the alphabet.
-- \ifnum\itemno=0
-- \errmessage{No more lowercase letters in @enumerate; get a bigger
-- alphabet}%
-- \fi
-- \char\lccode\itemno
-- }%
--}
--
--% The starting (uppercase) letter is in \thearg.
--\def\uppercaseenumerate{%
-- \itemno = \expandafter`\thearg
-- \startenumeration{%
-- % Be sure we're not beyond the end of the alphabet.
-- \ifnum\itemno=0
-- \errmessage{No more uppercase letters in @enumerate; get a bigger
-- alphabet}
-- \fi
-- \char\uccode\itemno
-- }%
--}
--
--% Call \doitemize, adding a period to the first argument and supplying the
--% common last two arguments. Also subtract one from the initial value in
--% \itemno, since @item increments \itemno.
--%
--\def\startenumeration#1{%
-- \advance\itemno by -1
-- \doitemize{#1.}\flushcr
--}
--
--% @alphaenumerate and @capsenumerate are abbreviations for giving an arg
--% to @enumerate.
--%
--\def\alphaenumerate{\enumerate{a}}
--\def\capsenumerate{\enumerate{A}}
--\def\Ealphaenumerate{\Eenumerate}
--\def\Ecapsenumerate{\Eenumerate}
--
--
--% @multitable macros
--% Amy Hendrickson, 8/18/94, 3/6/96
--%
--% @multitable ... @end multitable will make as many columns as desired.
--% Contents of each column will wrap at width given in preamble. Width
--% can be specified either with sample text given in a template line,
--% or in percent of \hsize, the current width of text on page.
--
--% Table can continue over pages but will only break between lines.
--
--% To make preamble:
--%
--% Either define widths of columns in terms of percent of \hsize:
--% @multitable @columnfractions .25 .3 .45
--% @item ...
--%
--% Numbers following @columnfractions are the percent of the total
--% current hsize to be used for each column. You may use as many
--% columns as desired.
--
--
--% Or use a template:
--% @multitable {Column 1 template} {Column 2 template} {Column 3 template}
--% @item ...
--% using the widest term desired in each column.
--
--% Each new table line starts with @item, each subsequent new column
--% starts with @tab. Empty columns may be produced by supplying @tab's
--% with nothing between them for as many times as empty columns are needed,
--% ie, @tab at tab@tab will produce two empty columns.
--
--% @item, @tab do not need to be on their own lines, but it will not hurt
--% if they are.
--
--% Sample multitable:
--
--% @multitable {Column 1 template} {Column 2 template} {Column 3 template}
--% @item first col stuff @tab second col stuff @tab third col
--% @item
--% first col stuff
--% @tab
--% second col stuff
--% @tab
--% third col
--% @item first col stuff @tab second col stuff
--% @tab Many paragraphs of text may be used in any column.
--%
--% They will wrap at the width determined by the template.
--% @item at tab@tab This will be in third column.
--% @end multitable
--
--% Default dimensions may be reset by user.
--% @multitableparskip is vertical space between paragraphs in table.
--% @multitableparindent is paragraph indent in table.
--% @multitablecolmargin is horizontal space to be left between columns.
--% @multitablelinespace is space to leave between table items, baseline
--% to baseline.
--% 0pt means it depends on current normal line spacing.
--%
--\newskip\multitableparskip
--\newskip\multitableparindent
--\newdimen\multitablecolspace
--\newskip\multitablelinespace
--\multitableparskip=0pt
--\multitableparindent=6pt
--\multitablecolspace=12pt
--\multitablelinespace=0pt
--
--% Macros used to set up halign preamble:
--%
--\let\endsetuptable\relax
--\def\xendsetuptable{\endsetuptable}
--\let\columnfractions\relax
--\def\xcolumnfractions{\columnfractions}
--\newif\ifsetpercent
--
--% #1 is the @columnfraction, usually a decimal number like .5, but might
--% be just 1. We just use it, whatever it is.
--%
--\def\pickupwholefraction#1 {%
-- \global\advance\colcount by 1
-- \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}%
-- \setuptable
--}
--
--\newcount\colcount
--\def\setuptable#1{%
-- \def\firstarg{#1}%
-- \ifx\firstarg\xendsetuptable
-- \let\go = \relax
-- \else
-- \ifx\firstarg\xcolumnfractions
-- \global\setpercenttrue
-- \else
-- \ifsetpercent
-- \let\go\pickupwholefraction
-- \else
-- \global\advance\colcount by 1
-- \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a
-- % separator; typically that is always in the input, anyway.
-- \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
-- \fi
-- \fi
-- \ifx\go\pickupwholefraction
-- % Put the argument back for the \pickupwholefraction call, so
-- % we'll always have a period there to be parsed.
-- \def\go{\pickupwholefraction#1}%
-- \else
-- \let\go = \setuptable
-- \fi%
-- \fi
-- \go
--}
--
--% multitable-only commands.
--%
--% @headitem starts a heading row, which we typeset in bold.
--% Assignments have to be global since we are inside the implicit group
--% of an alignment entry. \everycr resets \everytab so we don't have to
--% undo it ourselves.
--\def\headitemfont{\b}% for people to use in the template row; not changeable
--\def\headitem{%
-- \checkenv\multitable
-- \crcr
-- \global\everytab={\bf}% can't use \headitemfont since the parsing differs
-- \the\everytab % for the first item
--}%
--%
--% A \tab used to include \hskip1sp. But then the space in a template
--% line is not enough. That is bad. So let's go back to just `&' until
--% we again encounter the problem the 1sp was intended to solve.
--% --karl, nathan at acm.org, 20apr99.
--\def\tab{\checkenv\multitable &\the\everytab}%
--
--% @multitable ... @end multitable definitions:
--%
--\newtoks\everytab % insert after every tab.
--%
--\envdef\multitable{%
-- \vskip\parskip
-- \startsavinginserts
-- %
-- % @item within a multitable starts a normal row.
-- % We use \def instead of \let so that if one of the multitable entries
-- % contains an @itemize, we don't choke on the \item (seen as \crcr aka
-- % \endtemplate) expanding \doitemize.
-- \def\item{\crcr}%
-- %
-- \tolerance=9500
-- \hbadness=9500
-- \setmultitablespacing
-- \parskip=\multitableparskip
-- \parindent=\multitableparindent
-- \overfullrule=0pt
-- \global\colcount=0
-- %
-- \everycr = {%
-- \noalign{%
-- \global\everytab={}%
-- \global\colcount=0 % Reset the column counter.
-- % Check for saved footnotes, etc.
-- \checkinserts
-- % Keeps underfull box messages off when table breaks over pages.
-- %\filbreak
-- % Maybe so, but it also creates really weird page breaks when the
-- % table breaks over pages. Wouldn't \vfil be better? Wait until the
-- % problem manifests itself, so it can be fixed for real --karl.
-- }%
-- }%
-- %
-- \parsearg\domultitable
--}
--\def\domultitable#1{%
-- % To parse everything between @multitable and @item:
-- \setuptable#1 \endsetuptable
-- %
-- % This preamble sets up a generic column definition, which will
-- % be used as many times as user calls for columns.
-- % \vtop will set a single line and will also let text wrap and
-- % continue for many paragraphs if desired.
-- \halign\bgroup &%
-- \global\advance\colcount by 1
-- \multistrut
-- \vtop{%
-- % Use the current \colcount to find the correct column width:
-- \hsize=\expandafter\csname col\the\colcount\endcsname
-- %
-- % In order to keep entries from bumping into each other
-- % we will add a \leftskip of \multitablecolspace to all columns after
-- % the first one.
-- %
-- % If a template has been used, we will add \multitablecolspace
-- % to the width of each template entry.
-- %
-- % If the user has set preamble in terms of percent of \hsize we will
-- % use that dimension as the width of the column, and the \leftskip
-- % will keep entries from bumping into each other. Table will start at
-- % left margin and final column will justify at right margin.
-- %
-- % Make sure we don't inherit \rightskip from the outer environment.
-- \rightskip=0pt
-- \ifnum\colcount=1
-- % The first column will be indented with the surrounding text.
-- \advance\hsize by\leftskip
-- \else
-- \ifsetpercent \else
-- % If user has not set preamble in terms of percent of \hsize
-- % we will advance \hsize by \multitablecolspace.
-- \advance\hsize by \multitablecolspace
-- \fi
-- % In either case we will make \leftskip=\multitablecolspace:
-- \leftskip=\multitablecolspace
-- \fi
-- % Ignoring space at the beginning and end avoids an occasional spurious
-- % blank line, when TeX decides to break the line at the space before the
-- % box from the multistrut, so the strut ends up on a line by itself.
-- % For example:
-- % @multitable @columnfractions .11 .89
-- % @item @code{#}
-- % @tab Legal holiday which is valid in major parts of the whole country.
-- % Is automatically provided with highlighting sequences respectively
-- % marking characters.
-- \noindent\ignorespaces##\unskip\multistrut
-- }\cr
--}
--\def\Emultitable{%
-- \crcr
-- \egroup % end the \halign
-- \global\setpercentfalse
--}
--
--\def\setmultitablespacing{%
-- \def\multistrut{\strut}% just use the standard line spacing
-- %
-- % Compute \multitablelinespace (if not defined by user) for use in
-- % \multitableparskip calculation. We used define \multistrut based on
-- % this, but (ironically) that caused the spacing to be off.
-- % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
--\ifdim\multitablelinespace=0pt
--\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
--\global\advance\multitablelinespace by-\ht0
--\fi
--% Test to see if parskip is larger than space between lines of
--% table. If not, do nothing.
--% If so, set to same dimension as multitablelinespace.
--\ifdim\multitableparskip>\multitablelinespace
--\global\multitableparskip=\multitablelinespace
--\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
-- % than skip between lines in the table.
--\fi%
--\ifdim\multitableparskip=0pt
--\global\multitableparskip=\multitablelinespace
--\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
-- % than skip between lines in the table.
--\fi}
--
--
--\message{conditionals,}
--
--% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext,
--% @ifnotxml always succeed. They currently do nothing; we don't
--% attempt to check whether the conditionals are properly nested. But we
--% have to remember that they are conditionals, so that @end doesn't
--% attempt to close an environment group.
--%
--\def\makecond#1{%
-- \expandafter\let\csname #1\endcsname = \relax
-- \expandafter\let\csname iscond.#1\endcsname = 1
--}
--\makecond{iftex}
--\makecond{ifnotdocbook}
--\makecond{ifnothtml}
--\makecond{ifnotinfo}
--\makecond{ifnotplaintext}
--\makecond{ifnotxml}
--
--% Ignore @ignore, @ifhtml, @ifinfo, and the like.
--%
--\def\direntry{\doignore{direntry}}
--\def\documentdescription{\doignore{documentdescription}}
--\def\docbook{\doignore{docbook}}
--\def\html{\doignore{html}}
--\def\ifdocbook{\doignore{ifdocbook}}
--\def\ifhtml{\doignore{ifhtml}}
--\def\ifinfo{\doignore{ifinfo}}
--\def\ifnottex{\doignore{ifnottex}}
--\def\ifplaintext{\doignore{ifplaintext}}
--\def\ifxml{\doignore{ifxml}}
--\def\ignore{\doignore{ignore}}
--\def\menu{\doignore{menu}}
--\def\xml{\doignore{xml}}
--
--% Ignore text until a line `@end #1', keeping track of nested conditionals.
--%
--% A count to remember the depth of nesting.
--\newcount\doignorecount
--
--\def\doignore#1{\begingroup
-- % Scan in ``verbatim'' mode:
-- \obeylines
-- \catcode`\@ = \other
-- \catcode`\{ = \other
-- \catcode`\} = \other
-- %
-- % Make sure that spaces turn into tokens that match what \doignoretext wants.
-- \spaceisspace
-- %
-- % Count number of #1's that we've seen.
-- \doignorecount = 0
-- %
-- % Swallow text until we reach the matching `@end #1'.
-- \dodoignore{#1}%
--}
--
--{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source.
-- \obeylines %
-- %
-- \gdef\dodoignore#1{%
-- % #1 contains the command name as a string, e.g., `ifinfo'.
-- %
-- % Define a command to find the next `@end #1'.
-- \long\def\doignoretext##1^^M at end #1{%
-- \doignoretextyyy##1^^M@#1\_STOP_}%
-- %
-- % And this command to find another #1 command, at the beginning of a
-- % line. (Otherwise, we would consider a line `@c @ifset', for
-- % example, to count as an @ifset for nesting.)
-- \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
-- %
-- % And now expand that command.
-- \doignoretext ^^M%
-- }%
--}
--
--\def\doignoreyyy#1{%
-- \def\temp{#1}%
-- \ifx\temp\empty % Nothing found.
-- \let\next\doignoretextzzz
-- \else % Found a nested condition, ...
-- \advance\doignorecount by 1
-- \let\next\doignoretextyyy % ..., look for another.
-- % If we're here, #1 ends with ^^M\ifinfo (for example).
-- \fi
-- \next #1% the token \_STOP_ is present just after this macro.
--}
--
--% We have to swallow the remaining "\_STOP_".
--%
--\def\doignoretextzzz#1{%
-- \ifnum\doignorecount = 0 % We have just found the outermost @end.
-- \let\next\enddoignore
-- \else % Still inside a nested condition.
-- \advance\doignorecount by -1
-- \let\next\doignoretext % Look for the next @end.
-- \fi
-- \next
--}
--
--% Finish off ignored text.
--{ \obeylines%
-- % Ignore anything after the last `@end #1'; this matters in verbatim
-- % environments, where otherwise the newline after an ignored conditional
-- % would result in a blank line in the output.
-- \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
--}
--
--
--% @set VAR sets the variable VAR to an empty value.
--% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
--%
--% Since we want to separate VAR from REST-OF-LINE (which might be
--% empty), we can't just use \parsearg; we have to insert a space of our
--% own to delimit the rest of the line, and then take it out again if we
--% didn't need it.
--% We rely on the fact that \parsearg sets \catcode`\ =10.
--%
--\parseargdef\set{\setyyy#1 \endsetyyy}
--\def\setyyy#1 #2\endsetyyy{%
-- {%
-- \makevalueexpandable
-- \def\temp{#2}%
-- \edef\next{\gdef\makecsname{SET#1}}%
-- \ifx\temp\empty
-- \next{}%
-- \else
-- \setzzz#2\endsetzzz
-- \fi
-- }%
--}
--% Remove the trailing space \setxxx inserted.
--\def\setzzz#1 \endsetzzz{\next{#1}}
--
--% @clear VAR clears (i.e., unsets) the variable VAR.
--%
--\parseargdef\clear{%
-- {%
-- \makevalueexpandable
-- \global\expandafter\let\csname SET#1\endcsname=\relax
-- }%
--}
--
--% @value{foo} gets the text saved in variable foo.
--\def\value{\begingroup\makevalueexpandable\valuexxx}
--\def\valuexxx#1{\expandablevalue{#1}\endgroup}
--{
-- \catcode`\- = \active \catcode`\_ = \active
-- %
-- \gdef\makevalueexpandable{%
-- \let\value = \expandablevalue
-- % We don't want these characters active, ...
-- \catcode`\-=\other \catcode`\_=\other
-- % ..., but we might end up with active ones in the argument if
-- % we're called from @code, as @code{@value{foo-bar_}}, though.
-- % So \let them to their normal equivalents.
-- \let-\normaldash \let_\normalunderscore
-- }
--}
--
--% We have this subroutine so that we can handle at least some @value's
--% properly in indexes (we call \makevalueexpandable in \indexdummies).
--% The command has to be fully expandable (if the variable is set), since
--% the result winds up in the index file. This means that if the
--% variable's value contains other Texinfo commands, it's almost certain
--% it will fail (although perhaps we could fix that with sufficient work
--% to do a one-level expansion on the result, instead of complete).
--%
--\def\expandablevalue#1{%
-- \expandafter\ifx\csname SET#1\endcsname\relax
-- {[No value for ``#1'']}%
-- \message{Variable `#1', used in @value, is not set.}%
-- \else
-- \csname SET#1\endcsname
-- \fi
--}
--
--% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
--% with @set.
--%
--% To get special treatment of `@end ifset,' call \makeond and the redefine.
--%
--\makecond{ifset}
--\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}}
--\def\doifset#1#2{%
-- {%
-- \makevalueexpandable
-- \let\next=\empty
-- \expandafter\ifx\csname SET#2\endcsname\relax
-- #1% If not set, redefine \next.
-- \fi
-- \expandafter
-- }\next
--}
--\def\ifsetfail{\doignore{ifset}}
--
--% @ifclear VAR ... @end executes the `...' iff VAR has never been
--% defined with @set, or has been undefined with @clear.
--%
--% The `\else' inside the `\doifset' parameter is a trick to reuse the
--% above code: if the variable is not set, do nothing, if it is set,
--% then redefine \next to \ifclearfail.
--%
--\makecond{ifclear}
--\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
--\def\ifclearfail{\doignore{ifclear}}
--
--% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written
--% without the @) is in fact defined. We can only feasibly check at the
--% TeX level, so something like `mathcode' is going to considered
--% defined even though it is not a Texinfo command.
--%
--\makecond{ifcommanddefined}
--\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}}
--%
--\def\doifcmddefined#1#2{{%
-- \makevalueexpandable
-- \let\next=\empty
-- \expandafter\ifx\csname #2\endcsname\relax
-- #1% If not defined, \let\next as above.
-- \fi
-- \expandafter
-- }\next
--}
--\def\ifcmddefinedfail{\doignore{ifcommanddefined}}
--
--% @ifcommandnotdefined CMD ... handled similar to @ifclear above.
--\makecond{ifcommandnotdefined}
--\def\ifcommandnotdefined{%
-- \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}}
--\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}}
--
--% Set the `txicommandconditionals' variable, so documents have a way to
--% test if the @ifcommand...defined conditionals are available.
--\set txicommandconditionals
--
--% @dircategory CATEGORY -- specify a category of the dir file
--% which this file should belong to. Ignore this in TeX.
--\let\dircategory=\comment
--
--% @defininfoenclose.
--\let\definfoenclose=\comment
--
--
--\message{indexing,}
--% Index generation facilities
--
--% Define \newwrite to be identical to plain tex's \newwrite
--% except not \outer, so it can be used within macros and \if's.
--\edef\newwrite{\makecsname{ptexnewwrite}}
--
--% \newindex {foo} defines an index named foo.
--% It automatically defines \fooindex such that
--% \fooindex ...rest of line... puts an entry in the index foo.
--% It also defines \fooindfile to be the number of the output channel for
--% the file that accumulates this index. The file's extension is foo.
--% The name of an index should be no more than 2 characters long
--% for the sake of vms.
--%
--\def\newindex#1{%
-- \iflinks
-- \expandafter\newwrite \csname#1indfile\endcsname
-- \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
-- \fi
-- \expandafter\xdef\csname#1index\endcsname{% % Define @#1index
-- \noexpand\doindex{#1}}
--}
--
--% @defindex foo == \newindex{foo}
--%
--\def\defindex{\parsearg\newindex}
--
--% Define @defcodeindex, like @defindex except put all entries in @code.
--%
--\def\defcodeindex{\parsearg\newcodeindex}
--%
--\def\newcodeindex#1{%
-- \iflinks
-- \expandafter\newwrite \csname#1indfile\endcsname
-- \openout \csname#1indfile\endcsname \jobname.#1
-- \fi
-- \expandafter\xdef\csname#1index\endcsname{%
-- \noexpand\docodeindex{#1}}%
--}
--
--
--% @synindex foo bar makes index foo feed into index bar.
--% Do this instead of @defindex foo if you don't want it as a separate index.
--%
--% @syncodeindex foo bar similar, but put all entries made for index foo
--% inside @code.
--%
--\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}}
--\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}}
--
--% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo),
--% #3 the target index (bar).
--\def\dosynindex#1#2#3{%
-- % Only do \closeout if we haven't already done it, else we'll end up
-- % closing the target index.
-- \expandafter \ifx\csname donesynindex#2\endcsname \relax
-- % The \closeout helps reduce unnecessary open files; the limit on the
-- % Acorn RISC OS is a mere 16 files.
-- \expandafter\closeout\csname#2indfile\endcsname
-- \expandafter\let\csname donesynindex#2\endcsname = 1
-- \fi
-- % redefine \fooindfile:
-- \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname
-- \expandafter\let\csname#2indfile\endcsname=\temp
-- % redefine \fooindex:
-- \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}%
--}
--
--% Define \doindex, the driver for all \fooindex macros.
--% Argument #1 is generated by the calling \fooindex macro,
--% and it is "foo", the name of the index.
--
--% \doindex just uses \parsearg; it calls \doind for the actual work.
--% This is because \doind is more useful to call from other macros.
--
--% There is also \dosubind {index}{topic}{subtopic}
--% which makes an entry in a two-level index such as the operation index.
--
--\def\doindex#1{\edef\indexname{#1}\parsearg\singleindexer}
--\def\singleindexer #1{\doind{\indexname}{#1}}
--
--% like the previous two, but they put @code around the argument.
--\def\docodeindex#1{\edef\indexname{#1}\parsearg\singlecodeindexer}
--\def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}}
--
--% Take care of Texinfo commands that can appear in an index entry.
--% Since there are some commands we want to expand, and others we don't,
--% we have to laboriously prevent expansion for those that we don't.
--%
--\def\indexdummies{%
-- \escapechar = `\\ % use backslash in output files.
-- \def\@{@}% change to @@ when we switch to @ as escape char in index files.
-- \def\ {\realbackslash\space }%
-- %
-- % Need these unexpandable (because we define \tt as a dummy)
-- % definitions when @{ or @} appear in index entry text. Also, more
-- % complicated, when \tex is in effect and \{ is a \delimiter again.
-- % We can't use \lbracecmd and \rbracecmd because texindex assumes
-- % braces and backslashes are used only as delimiters. Perhaps we
-- % should define @lbrace and @rbrace commands a la @comma.
-- \def\{{{\tt\char123}}%
-- \def\}{{\tt\char125}}%
-- %
-- % I don't entirely understand this, but when an index entry is
-- % generated from a macro call, the \endinput which \scanmacro inserts
-- % causes processing to be prematurely terminated. This is,
-- % apparently, because \indexsorttmp is fully expanded, and \endinput
-- % is an expandable command. The redefinition below makes \endinput
-- % disappear altogether for that purpose -- although logging shows that
-- % processing continues to some further point. On the other hand, it
-- % seems \endinput does not hurt in the printed index arg, since that
-- % is still getting written without apparent harm.
-- %
-- % Sample source (mac-idx3.tex, reported by Graham Percival to
-- % help-texinfo, 22may06):
-- % @macro funindex {WORD}
-- % @findex xyz
-- % @end macro
-- % ...
-- % @funindex commtest
-- %
-- % The above is not enough to reproduce the bug, but it gives the flavor.
-- %
-- % Sample whatsit resulting:
-- % . at write3{\entry{xyz}{@folio }{@code {xyz at endinput }}}
-- %
-- % So:
-- \let\endinput = \empty
-- %
-- % Do the redefinitions.
-- \commondummies
--}
--
--% For the aux and toc files, @ is the escape character. So we want to
--% redefine everything using @ as the escape character (instead of
--% \realbackslash, still used for index files). When everything uses @,
--% this will be simpler.
--%
--\def\atdummies{%
-- \def\@{@@}%
-- \def\ {@ }%
-- \let\{ = \lbraceatcmd
-- \let\} = \rbraceatcmd
-- %
-- % Do the redefinitions.
-- \commondummies
-- \otherbackslash
--}
--
--% Called from \indexdummies and \atdummies.
--%
--\def\commondummies{%
-- %
-- % \definedummyword defines \#1 as \string\#1\space, thus effectively
-- % preventing its expansion. This is used only for control words,
-- % not control letters, because the \space would be incorrect for
-- % control characters, but is needed to separate the control word
-- % from whatever follows.
-- %
-- % For control letters, we have \definedummyletter, which omits the
-- % space.
-- %
-- % These can be used both for control words that take an argument and
-- % those that do not. If it is followed by {arg} in the input, then
-- % that will dutifully get written to the index (or wherever).
-- %
-- \def\definedummyword ##1{\def##1{\string##1\space}}%
-- \def\definedummyletter##1{\def##1{\string##1}}%
-- \let\definedummyaccent\definedummyletter
-- %
-- \commondummiesnofonts
-- %
-- \definedummyletter\_%
-- \definedummyletter\-%
-- %
-- % Non-English letters.
-- \definedummyword\AA
-- \definedummyword\AE
-- \definedummyword\DH
-- \definedummyword\L
-- \definedummyword\O
-- \definedummyword\OE
-- \definedummyword\TH
-- \definedummyword\aa
-- \definedummyword\ae
-- \definedummyword\dh
-- \definedummyword\exclamdown
-- \definedummyword\l
-- \definedummyword\o
-- \definedummyword\oe
-- \definedummyword\ordf
-- \definedummyword\ordm
-- \definedummyword\questiondown
-- \definedummyword\ss
-- \definedummyword\th
-- %
-- % Although these internal commands shouldn't show up, sometimes they do.
-- \definedummyword\bf
-- \definedummyword\gtr
-- \definedummyword\hat
-- \definedummyword\less
-- \definedummyword\sf
-- \definedummyword\sl
-- \definedummyword\tclose
-- \definedummyword\tt
-- %
-- \definedummyword\LaTeX
-- \definedummyword\TeX
-- %
-- % Assorted special characters.
-- \definedummyword\arrow
-- \definedummyword\bullet
-- \definedummyword\comma
-- \definedummyword\copyright
-- \definedummyword\registeredsymbol
-- \definedummyword\dots
-- \definedummyword\enddots
-- \definedummyword\entrybreak
-- \definedummyword\equiv
-- \definedummyword\error
-- \definedummyword\euro
-- \definedummyword\expansion
-- \definedummyword\geq
-- \definedummyword\guillemetleft
-- \definedummyword\guillemetright
-- \definedummyword\guilsinglleft
-- \definedummyword\guilsinglright
-- \definedummyword\lbracechar
-- \definedummyword\leq
-- \definedummyword\minus
-- \definedummyword\ogonek
-- \definedummyword\pounds
-- \definedummyword\point
-- \definedummyword\print
-- \definedummyword\quotedblbase
-- \definedummyword\quotedblleft
-- \definedummyword\quotedblright
-- \definedummyword\quoteleft
-- \definedummyword\quoteright
-- \definedummyword\quotesinglbase
-- \definedummyword\rbracechar
-- \definedummyword\result
-- \definedummyword\textdegree
-- %
-- % We want to disable all macros so that they are not expanded by \write.
-- \macrolist
-- %
-- \normalturnoffactive
-- %
-- % Handle some cases of @value -- where it does not contain any
-- % (non-fully-expandable) commands.
-- \makevalueexpandable
--}
--
--% \commondummiesnofonts: common to \commondummies and \indexnofonts.
--%
--\def\commondummiesnofonts{%
-- % Control letters and accents.
-- \definedummyletter\!%
-- \definedummyaccent\"%
-- \definedummyaccent\'%
-- \definedummyletter\*%
-- \definedummyaccent\,%
-- \definedummyletter\.%
-- \definedummyletter\/%
-- \definedummyletter\:%
-- \definedummyaccent\=%
-- \definedummyletter\?%
-- \definedummyaccent\^%
-- \definedummyaccent\`%
-- \definedummyaccent\~%
-- \definedummyword\u
-- \definedummyword\v
-- \definedummyword\H
-- \definedummyword\dotaccent
-- \definedummyword\ogonek
-- \definedummyword\ringaccent
-- \definedummyword\tieaccent
-- \definedummyword\ubaraccent
-- \definedummyword\udotaccent
-- \definedummyword\dotless
-- %
-- % Texinfo font commands.
-- \definedummyword\b
-- \definedummyword\i
-- \definedummyword\r
-- \definedummyword\sansserif
-- \definedummyword\sc
-- \definedummyword\slanted
-- \definedummyword\t
-- %
-- % Commands that take arguments.
-- \definedummyword\abbr
-- \definedummyword\acronym
-- \definedummyword\anchor
-- \definedummyword\cite
-- \definedummyword\code
-- \definedummyword\command
-- \definedummyword\dfn
-- \definedummyword\dmn
-- \definedummyword\email
-- \definedummyword\emph
-- \definedummyword\env
-- \definedummyword\file
-- \definedummyword\image
-- \definedummyword\indicateurl
-- \definedummyword\inforef
-- \definedummyword\kbd
-- \definedummyword\key
-- \definedummyword\math
-- \definedummyword\option
-- \definedummyword\pxref
-- \definedummyword\ref
-- \definedummyword\samp
-- \definedummyword\strong
-- \definedummyword\tie
-- \definedummyword\uref
-- \definedummyword\url
-- \definedummyword\var
-- \definedummyword\verb
-- \definedummyword\w
-- \definedummyword\xref
--}
--
--% \indexnofonts is used when outputting the strings to sort the index
--% by, and when constructing control sequence names. It eliminates all
--% control sequences and just writes whatever the best ASCII sort string
--% would be for a given command (usually its argument).
--%
--\def\indexnofonts{%
-- % Accent commands should become @asis.
-- \def\definedummyaccent##1{\let##1\asis}%
-- % We can just ignore other control letters.
-- \def\definedummyletter##1{\let##1\empty}%
-- % All control words become @asis by default; overrides below.
-- \let\definedummyword\definedummyaccent
-- %
-- \commondummiesnofonts
-- %
-- % Don't no-op \tt, since it isn't a user-level command
-- % and is used in the definitions of the active chars like <, >, |, etc.
-- % Likewise with the other plain tex font commands.
-- %\let\tt=\asis
-- %
-- \def\ { }%
-- \def\@{@}%
-- \def\_{\normalunderscore}%
-- \def\-{}% @- shouldn't affect sorting
-- %
-- % Unfortunately, texindex is not prepared to handle braces in the
-- % content at all. So for index sorting, we map @{ and @} to strings
-- % starting with |, since that ASCII character is between ASCII { and }.
-- \def\{{|a}%
-- \def\lbracechar{|a}%
-- %
-- \def\}{|b}%
-- \def\rbracechar{|b}%
-- %
-- % Non-English letters.
-- \def\AA{AA}%
-- \def\AE{AE}%
-- \def\DH{DZZ}%
-- \def\L{L}%
-- \def\OE{OE}%
-- \def\O{O}%
-- \def\TH{ZZZ}%
-- \def\aa{aa}%
-- \def\ae{ae}%
-- \def\dh{dzz}%
-- \def\exclamdown{!}%
-- \def\l{l}%
-- \def\oe{oe}%
-- \def\ordf{a}%
-- \def\ordm{o}%
-- \def\o{o}%
-- \def\questiondown{?}%
-- \def\ss{ss}%
-- \def\th{zzz}%
-- %
-- \def\LaTeX{LaTeX}%
-- \def\TeX{TeX}%
-- %
-- % Assorted special characters.
-- % (The following {} will end up in the sort string, but that's ok.)
-- \def\arrow{->}%
-- \def\bullet{bullet}%
-- \def\comma{,}%
-- \def\copyright{copyright}%
-- \def\dots{...}%
-- \def\enddots{...}%
-- \def\equiv{==}%
-- \def\error{error}%
-- \def\euro{euro}%
-- \def\expansion{==>}%
-- \def\geq{>=}%
-- \def\guillemetleft{<<}%
-- \def\guillemetright{>>}%
-- \def\guilsinglleft{<}%
-- \def\guilsinglright{>}%
-- \def\leq{<=}%
-- \def\minus{-}%
-- \def\point{.}%
-- \def\pounds{pounds}%
-- \def\print{-|}%
-- \def\quotedblbase{"}%
-- \def\quotedblleft{"}%
-- \def\quotedblright{"}%
-- \def\quoteleft{`}%
-- \def\quoteright{'}%
-- \def\quotesinglbase{,}%
-- \def\registeredsymbol{R}%
-- \def\result{=>}%
-- \def\textdegree{o}%
-- %
-- \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax
-- \else \indexlquoteignore \fi
-- %
-- % We need to get rid of all macros, leaving only the arguments (if present).
-- % Of course this is not nearly correct, but it is the best we can do for now.
-- % makeinfo does not expand macros in the argument to @deffn, which ends up
-- % writing an index entry, and texindex isn't prepared for an index sort entry
-- % that starts with \.
-- %
-- % Since macro invocations are followed by braces, we can just redefine them
-- % to take a single TeX argument. The case of a macro invocation that
-- % goes to end-of-line is not handled.
-- %
-- \macrolist
--}
--
--% Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us
--% ignore left quotes in the sort term.
--{\catcode`\`=\active
-- \gdef\indexlquoteignore{\let`=\empty}}
--
--\let\indexbackslash=0 %overridden during \printindex.
--\let\SETmarginindex=\relax % put index entries in margin (undocumented)?
--
--% Most index entries go through here, but \dosubind is the general case.
--% #1 is the index name, #2 is the entry text.
--\def\doind#1#2{\dosubind{#1}{#2}{}}
--
--% Workhorse for all \fooindexes.
--% #1 is name of index, #2 is stuff to put there, #3 is subentry --
--% empty if called from \doind, as we usually are (the main exception
--% is with most defuns, which call us directly).
--%
--\def\dosubind#1#2#3{%
-- \iflinks
-- {%
-- % Store the main index entry text (including the third arg).
-- \toks0 = {#2}%
-- % If third arg is present, precede it with a space.
-- \def\thirdarg{#3}%
-- \ifx\thirdarg\empty \else
-- \toks0 = \expandafter{\the\toks0 \space #3}%
-- \fi
-- %
-- \edef\writeto{\csname#1indfile\endcsname}%
-- %
-- \safewhatsit\dosubindwrite
-- }%
-- \fi
--}
--
--% Write the entry in \toks0 to the index file:
--%
--\def\dosubindwrite{%
-- % Put the index entry in the margin if desired.
-- \ifx\SETmarginindex\relax\else
-- \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}%
-- \fi
-- %
-- % Remember, we are within a group.
-- \indexdummies % Must do this here, since \bf, etc expand at this stage
-- \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
-- % so it will be output as is; and it will print as backslash.
-- %
-- % Process the index entry with all font commands turned off, to
-- % get the string to sort by.
-- {\indexnofonts
-- \edef\temp{\the\toks0}% need full expansion
-- \xdef\indexsorttmp{\temp}%
-- }%
-- %
-- % Set up the complete index entry, with both the sort key and
-- % the original text, including any font commands. We write
-- % three arguments to \entry to the .?? file (four in the
-- % subentry case), texindex reduces to two when writing the .??s
-- % sorted result.
-- \edef\temp{%
-- \write\writeto{%
-- \string\entry{\indexsorttmp}{\noexpand\folio}{\the\toks0}}%
-- }%
-- \temp
--}
--
--% Take care of unwanted page breaks/skips around a whatsit:
--%
--% If a skip is the last thing on the list now, preserve it
--% by backing up by \lastskip, doing the \write, then inserting
--% the skip again. Otherwise, the whatsit generated by the
--% \write or \pdfdest will make \lastskip zero. The result is that
--% sequences like this:
--% @end defun
--% @tindex whatever
--% @defun ...
--% will have extra space inserted, because the \medbreak in the
--% start of the @defun won't see the skip inserted by the @end of
--% the previous defun.
--%
--% But don't do any of this if we're not in vertical mode. We
--% don't want to do a \vskip and prematurely end a paragraph.
--%
--% Avoid page breaks due to these extra skips, too.
--%
--% But wait, there is a catch there:
--% We'll have to check whether \lastskip is zero skip. \ifdim is not
--% sufficient for this purpose, as it ignores stretch and shrink parts
--% of the skip. The only way seems to be to check the textual
--% representation of the skip.
--%
--% The following is almost like \def\zeroskipmacro{0.0pt} except that
--% the ``p'' and ``t'' characters have catcode \other, not 11 (letter).
--%
--\edef\zeroskipmacro{\expandafter\the\csname z at skip\endcsname}
--%
--\newskip\whatsitskip
--\newcount\whatsitpenalty
--%
--% ..., ready, GO:
--%
--\def\safewhatsit#1{\ifhmode
-- #1%
-- \else
-- % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
-- \whatsitskip = \lastskip
-- \edef\lastskipmacro{\the\lastskip}%
-- \whatsitpenalty = \lastpenalty
-- %
-- % If \lastskip is nonzero, that means the last item was a
-- % skip. And since a skip is discardable, that means this
-- % -\whatsitskip glue we're inserting is preceded by a
-- % non-discardable item, therefore it is not a potential
-- % breakpoint, therefore no \nobreak needed.
-- \ifx\lastskipmacro\zeroskipmacro
-- \else
-- \vskip-\whatsitskip
-- \fi
-- %
-- #1%
-- %
-- \ifx\lastskipmacro\zeroskipmacro
-- % If \lastskip was zero, perhaps the last item was a penalty, and
-- % perhaps it was >=10000, e.g., a \nobreak. In that case, we want
-- % to re-insert the same penalty (values >10000 are used for various
-- % signals); since we just inserted a non-discardable item, any
-- % following glue (such as a \parskip) would be a breakpoint. For example:
-- % @deffn deffn-whatever
-- % @vindex index-whatever
-- % Description.
-- % would allow a break between the index-whatever whatsit
-- % and the "Description." paragraph.
-- \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
-- \else
-- % On the other hand, if we had a nonzero \lastskip,
-- % this make-up glue would be preceded by a non-discardable item
-- % (the whatsit from the \write), so we must insert a \nobreak.
-- \nobreak\vskip\whatsitskip
-- \fi
--\fi}
--
--% The index entry written in the file actually looks like
--% \entry {sortstring}{page}{topic}
--% or
--% \entry {sortstring}{page}{topic}{subtopic}
--% The texindex program reads in these files and writes files
--% containing these kinds of lines:
--% \initial {c}
--% before the first topic whose initial is c
--% \entry {topic}{pagelist}
--% for a topic that is used without subtopics
--% \primary {topic}
--% for the beginning of a topic that is used with subtopics
--% \secondary {subtopic}{pagelist}
--% for each subtopic.
--
--% Define the user-accessible indexing commands
--% @findex, @vindex, @kindex, @cindex.
--
--\def\findex {\fnindex}
--\def\kindex {\kyindex}
--\def\cindex {\cpindex}
--\def\vindex {\vrindex}
--\def\tindex {\tpindex}
--\def\pindex {\pgindex}
--
--\def\cindexsub {\begingroup\obeylines\cindexsub}
--{\obeylines %
--\gdef\cindexsub "#1" #2^^M{\endgroup %
--\dosubind{cp}{#2}{#1}}}
--
--% Define the macros used in formatting output of the sorted index material.
--
--% @printindex causes a particular index (the ??s file) to get printed.
--% It does not print any chapter heading (usually an @unnumbered).
--%
--\parseargdef\printindex{\begingroup
-- \dobreak \chapheadingskip{10000}%
-- %
-- \smallfonts \rm
-- \tolerance = 9500
-- \plainfrenchspacing
-- \everypar = {}% don't want the \kern\-parindent from indentation suppression.
-- %
-- % See if the index file exists and is nonempty.
-- % Change catcode of @ here so that if the index file contains
-- % \initial {@}
-- % as its first line, TeX doesn't complain about mismatched braces
-- % (because it thinks @} is a control sequence).
-- \catcode`\@ = 11
-- \openin 1 \jobname.#1s
-- \ifeof 1
-- % \enddoublecolumns gets confused if there is no text in the index,
-- % and it loses the chapter title and the aux file entries for the
-- % index. The easiest way to prevent this problem is to make sure
-- % there is some text.
-- \putwordIndexNonexistent
-- \else
-- %
-- % If the index file exists but is empty, then \openin leaves \ifeof
-- % false. We have to make TeX try to read something from the file, so
-- % it can discover if there is anything in it.
-- \read 1 to \temp
-- \ifeof 1
-- \putwordIndexIsEmpty
-- \else
-- % Index files are almost Texinfo source, but we use \ as the escape
-- % character. It would be better to use @, but that's too big a change
-- % to make right now.
-- \def\indexbackslash{\backslashcurfont}%
-- \catcode`\\ = 0
-- \escapechar = `\\
-- \begindoublecolumns
-- \input \jobname.#1s
-- \enddoublecolumns
-- \fi
-- \fi
-- \closein 1
--\endgroup}
--
--% These macros are used by the sorted index file itself.
--% Change them to control the appearance of the index.
--
--\def\initial#1{{%
-- % Some minor font changes for the special characters.
-- \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt
-- %
-- % Remove any glue we may have, we'll be inserting our own.
-- \removelastskip
-- %
-- % We like breaks before the index initials, so insert a bonus.
-- \nobreak
-- \vskip 0pt plus 3\baselineskip
-- \penalty 0
-- \vskip 0pt plus -3\baselineskip
-- %
-- % Typeset the initial. Making this add up to a whole number of
-- % baselineskips increases the chance of the dots lining up from column
-- % to column. It still won't often be perfect, because of the stretch
-- % we need before each entry, but it's better.
-- %
-- % No shrink because it confuses \balancecolumns.
-- \vskip 1.67\baselineskip plus .5\baselineskip
-- \leftline{\secbf #1}%
-- % Do our best not to break after the initial.
-- \nobreak
-- \vskip .33\baselineskip plus .1\baselineskip
--}}
--
--% \entry typesets a paragraph consisting of the text (#1), dot leaders, and
--% then page number (#2) flushed to the right margin. It is used for index
--% and table of contents entries. The paragraph is indented by \leftskip.
--%
--% A straightforward implementation would start like this:
--% \def\entry#1#2{...
--% But this freezes the catcodes in the argument, and can cause problems to
--% @code, which sets - active. This problem was fixed by a kludge---
--% ``-'' was active throughout whole index, but this isn't really right.
--% The right solution is to prevent \entry from swallowing the whole text.
--% --kasal, 21nov03
--\def\entry{%
-- \begingroup
-- %
-- % Start a new paragraph if necessary, so our assignments below can't
-- % affect previous text.
-- \par
-- %
-- % Do not fill out the last line with white space.
-- \parfillskip = 0in
-- %
-- % No extra space above this paragraph.
-- \parskip = 0in
-- %
-- % Do not prefer a separate line ending with a hyphen to fewer lines.
-- \finalhyphendemerits = 0
-- %
-- % \hangindent is only relevant when the entry text and page number
-- % don't both fit on one line. In that case, bob suggests starting the
-- % dots pretty far over on the line. Unfortunately, a large
-- % indentation looks wrong when the entry text itself is broken across
-- % lines. So we use a small indentation and put up with long leaders.
-- %
-- % \hangafter is reset to 1 (which is the value we want) at the start
-- % of each paragraph, so we need not do anything with that.
-- \hangindent = 2em
-- %
-- % When the entry text needs to be broken, just fill out the first line
-- % with blank space.
-- \rightskip = 0pt plus1fil
-- %
-- % A bit of stretch before each entry for the benefit of balancing
-- % columns.
-- \vskip 0pt plus1pt
-- %
-- % When reading the text of entry, convert explicit line breaks
-- % from @* into spaces. The user might give these in long section
-- % titles, for instance.
-- \def\*{\unskip\space\ignorespaces}%
-- \def\entrybreak{\hfil\break}%
-- %
-- % Swallow the left brace of the text (first parameter):
-- \afterassignment\doentry
-- \let\temp =
--}
--\def\entrybreak{\unskip\space\ignorespaces}%
--\def\doentry{%
-- \bgroup % Instead of the swallowed brace.
-- \noindent
-- \aftergroup\finishentry
-- % And now comes the text of the entry.
--}
--\def\finishentry#1{%
-- % #1 is the page number.
-- %
-- % The following is kludged to not output a line of dots in the index if
-- % there are no page numbers. The next person who breaks this will be
-- % cursed by a Unix daemon.
-- \setbox\boxA = \hbox{#1}%
-- \ifdim\wd\boxA = 0pt
-- \ %
-- \else
-- %
-- % If we must, put the page number on a line of its own, and fill out
-- % this line with blank space. (The \hfil is overwhelmed with the
-- % fill leaders glue in \indexdotfill if the page number does fit.)
-- \hfil\penalty50
-- \null\nobreak\indexdotfill % Have leaders before the page number.
-- %
-- % The `\ ' here is removed by the implicit \unskip that TeX does as
-- % part of (the primitive) \par. Without it, a spurious underfull
-- % \hbox ensues.
-- \ifpdf
-- \pdfgettoks#1.%
-- \ \the\toksA
-- \else
-- \ #1%
-- \fi
-- \fi
-- \par
-- \endgroup
--}
--
--% Like plain.tex's \dotfill, except uses up at least 1 em.
--\def\indexdotfill{\cleaders
-- \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
--
--\def\primary #1{\line{#1\hfil}}
--
--\newskip\secondaryindent \secondaryindent=0.5cm
--\def\secondary#1#2{{%
-- \parfillskip=0in
-- \parskip=0in
-- \hangindent=1in
-- \hangafter=1
-- \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill
-- \ifpdf
-- \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
-- \else
-- #2
-- \fi
-- \par
--}}
--
--% Define two-column mode, which we use to typeset indexes.
--% Adapted from the TeXbook, page 416, which is to say,
--% the manmac.tex format used to print the TeXbook itself.
--\catcode`\@=11
--
--\newbox\partialpage
--\newdimen\doublecolumnhsize
--
--\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
-- % Grab any single-column material above us.
-- \output = {%
-- %
-- % Here is a possibility not foreseen in manmac: if we accumulate a
-- % whole lot of material, we might end up calling this \output
-- % routine twice in a row (see the doublecol-lose test, which is
-- % essentially a couple of indexes with @setchapternewpage off). In
-- % that case we just ship out what is in \partialpage with the normal
-- % output routine. Generally, \partialpage will be empty when this
-- % runs and this will be a no-op. See the indexspread.tex test case.
-- \ifvoid\partialpage \else
-- \onepageout{\pagecontents\partialpage}%
-- \fi
-- %
-- \global\setbox\partialpage = \vbox{%
-- % Unvbox the main output page.
-- \unvbox\PAGE
-- \kern-\topskip \kern\baselineskip
-- }%
-- }%
-- \eject % run that output routine to set \partialpage
-- %
-- % Use the double-column output routine for subsequent pages.
-- \output = {\doublecolumnout}%
-- %
-- % Change the page size parameters. We could do this once outside this
-- % routine, in each of @smallbook, @afourpaper, and the default 8.5x11
-- % format, but then we repeat the same computation. Repeating a couple
-- % of assignments once per index is clearly meaningless for the
-- % execution time, so we may as well do it in one place.
-- %
-- % First we halve the line length, less a little for the gutter between
-- % the columns. We compute the gutter based on the line length, so it
-- % changes automatically with the paper format. The magic constant
-- % below is chosen so that the gutter has the same value (well, +-<1pt)
-- % as it did when we hard-coded it.
-- %
-- % We put the result in a separate register, \doublecolumhsize, so we
-- % can restore it in \pagesofar, after \hsize itself has (potentially)
-- % been clobbered.
-- %
-- \doublecolumnhsize = \hsize
-- \advance\doublecolumnhsize by -.04154\hsize
-- \divide\doublecolumnhsize by 2
-- \hsize = \doublecolumnhsize
-- %
-- % Double the \vsize as well. (We don't need a separate register here,
-- % since nobody clobbers \vsize.)
-- \vsize = 2\vsize
--}
--
--% The double-column output routine for all double-column pages except
--% the last.
--%
--\def\doublecolumnout{%
-- \splittopskip=\topskip \splitmaxdepth=\maxdepth
-- % Get the available space for the double columns -- the normal
-- % (undoubled) page height minus any material left over from the
-- % previous page.
-- \dimen@ = \vsize
-- \divide\dimen@ by 2
-- \advance\dimen@ by -\ht\partialpage
-- %
-- % box0 will be the left-hand column, box2 the right.
-- \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
-- \onepageout\pagesofar
-- \unvbox255
-- \penalty\outputpenalty
--}
--%
--% Re-output the contents of the output page -- any previous material,
--% followed by the two boxes we just split, in box0 and box2.
--\def\pagesofar{%
-- \unvbox\partialpage
-- %
-- \hsize = \doublecolumnhsize
-- \wd0=\hsize \wd2=\hsize
-- \hbox to\pagewidth{\box0\hfil\box2}%
--}
--%
--% All done with double columns.
--\def\enddoublecolumns{%
-- % The following penalty ensures that the page builder is exercised
-- % _before_ we change the output routine. This is necessary in the
-- % following situation:
-- %
-- % The last section of the index consists only of a single entry.
-- % Before this section, \pagetotal is less than \pagegoal, so no
-- % break occurs before the last section starts. However, the last
-- % section, consisting of \initial and the single \entry, does not
-- % fit on the page and has to be broken off. Without the following
-- % penalty the page builder will not be exercised until \eject
-- % below, and by that time we'll already have changed the output
-- % routine to the \balancecolumns version, so the next-to-last
-- % double-column page will be processed with \balancecolumns, which
-- % is wrong: The two columns will go to the main vertical list, with
-- % the broken-off section in the recent contributions. As soon as
-- % the output routine finishes, TeX starts reconsidering the page
-- % break. The two columns and the broken-off section both fit on the
-- % page, because the two columns now take up only half of the page
-- % goal. When TeX sees \eject from below which follows the final
-- % section, it invokes the new output routine that we've set after
-- % \balancecolumns below; \onepageout will try to fit the two columns
-- % and the final section into the vbox of \pageheight (see
-- % \pagebody), causing an overfull box.
-- %
-- % Note that glue won't work here, because glue does not exercise the
-- % page builder, unlike penalties (see The TeXbook, pp. 280-281).
-- \penalty0
-- %
-- \output = {%
-- % Split the last of the double-column material. Leave it on the
-- % current page, no automatic page break.
-- \balancecolumns
-- %
-- % If we end up splitting too much material for the current page,
-- % though, there will be another page break right after this \output
-- % invocation ends. Having called \balancecolumns once, we do not
-- % want to call it again. Therefore, reset \output to its normal
-- % definition right away. (We hope \balancecolumns will never be
-- % called on to balance too much material, but if it is, this makes
-- % the output somewhat more palatable.)
-- \global\output = {\onepageout{\pagecontents\PAGE}}%
-- }%
-- \eject
-- \endgroup % started in \begindoublecolumns
-- %
-- % \pagegoal was set to the doubled \vsize above, since we restarted
-- % the current page. We're now back to normal single-column
-- % typesetting, so reset \pagegoal to the normal \vsize (after the
-- % \endgroup where \vsize got restored).
-- \pagegoal = \vsize
--}
--%
--% Called at the end of the double column material.
--\def\balancecolumns{%
-- \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
-- \dimen@ = \ht0
-- \advance\dimen@ by \topskip
-- \advance\dimen@ by-\baselineskip
-- \divide\dimen@ by 2 % target to split to
-- %debug\message{final 2-column material height=\the\ht0, target=\the\dimen at .}%
-- \splittopskip = \topskip
-- % Loop until we get a decent breakpoint.
-- {%
-- \vbadness = 10000
-- \loop
-- \global\setbox3 = \copy0
-- \global\setbox1 = \vsplit3 to \dimen@
-- \ifdim\ht3>\dimen@
-- \global\advance\dimen@ by 1pt
-- \repeat
-- }%
-- %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}%
-- \setbox0=\vbox to\dimen@{\unvbox1}%
-- \setbox2=\vbox to\dimen@{\unvbox3}%
-- %
-- \pagesofar
--}
--\catcode`\@ = \other
--
--
--\message{sectioning,}
--% Chapters, sections, etc.
--
--% Let's start with @part.
--\outer\parseargdef\part{\partzzz{#1}}
--\def\partzzz#1{%
-- \chapoddpage
-- \null
-- \vskip.3\vsize % move it down on the page a bit
-- \begingroup
-- \noindent \titlefonts\rmisbold #1\par % the text
-- \let\lastnode=\empty % no node to associate with
-- \writetocentry{part}{#1}{}% but put it in the toc
-- \headingsoff % no headline or footline on the part page
-- \chapoddpage
-- \endgroup
--}
--
--% \unnumberedno is an oxymoron. But we count the unnumbered
--% sections so that we can refer to them unambiguously in the pdf
--% outlines by their "section number". We avoid collisions with chapter
--% numbers by starting them at 10000. (If a document ever has 10000
--% chapters, we're in trouble anyway, I'm sure.)
--\newcount\unnumberedno \unnumberedno = 10000
--\newcount\chapno
--\newcount\secno \secno=0
--\newcount\subsecno \subsecno=0
--\newcount\subsubsecno \subsubsecno=0
--
--% This counter is funny since it counts through charcodes of letters A, B, ...
--\newcount\appendixno \appendixno = `\@
--%
--% \def\appendixletter{\char\the\appendixno}
--% We do the following ugly conditional instead of the above simple
--% construct for the sake of pdftex, which needs the actual
--% letter in the expansion, not just typeset.
--%
--\def\appendixletter{%
-- \ifnum\appendixno=`A A%
-- \else\ifnum\appendixno=`B B%
-- \else\ifnum\appendixno=`C C%
-- \else\ifnum\appendixno=`D D%
-- \else\ifnum\appendixno=`E E%
-- \else\ifnum\appendixno=`F F%
-- \else\ifnum\appendixno=`G G%
-- \else\ifnum\appendixno=`H H%
-- \else\ifnum\appendixno=`I I%
-- \else\ifnum\appendixno=`J J%
-- \else\ifnum\appendixno=`K K%
-- \else\ifnum\appendixno=`L L%
-- \else\ifnum\appendixno=`M M%
-- \else\ifnum\appendixno=`N N%
-- \else\ifnum\appendixno=`O O%
-- \else\ifnum\appendixno=`P P%
-- \else\ifnum\appendixno=`Q Q%
-- \else\ifnum\appendixno=`R R%
-- \else\ifnum\appendixno=`S S%
-- \else\ifnum\appendixno=`T T%
-- \else\ifnum\appendixno=`U U%
-- \else\ifnum\appendixno=`V V%
-- \else\ifnum\appendixno=`W W%
-- \else\ifnum\appendixno=`X X%
-- \else\ifnum\appendixno=`Y Y%
-- \else\ifnum\appendixno=`Z Z%
-- % The \the is necessary, despite appearances, because \appendixletter is
-- % expanded while writing the .toc file. \char\appendixno is not
-- % expandable, thus it is written literally, thus all appendixes come out
-- % with the same letter (or @) in the toc without it.
-- \else\char\the\appendixno
-- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
-- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
--
--% Each @chapter defines these (using marks) as the number+name, number
--% and name of the chapter. Page headings and footings can use
--% these. @section does likewise.
--\def\thischapter{}
--\def\thischapternum{}
--\def\thischaptername{}
--\def\thissection{}
--\def\thissectionnum{}
--\def\thissectionname{}
--
--\newcount\absseclevel % used to calculate proper heading level
--\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
--
--% @raisesections: treat @section as chapter, @subsection as section, etc.
--\def\raisesections{\global\advance\secbase by -1}
--\let\up=\raisesections % original BFox name
--
--% @lowersections: treat @chapter as section, @section as subsection, etc.
--\def\lowersections{\global\advance\secbase by 1}
--\let\down=\lowersections % original BFox name
--
--% we only have subsub.
--\chardef\maxseclevel = 3
--%
--% A numbered section within an unnumbered changes to unnumbered too.
--% To achieve this, remember the "biggest" unnum. sec. we are currently in:
--\chardef\unnlevel = \maxseclevel
--%
--% Trace whether the current chapter is an appendix or not:
--% \chapheadtype is "N" or "A", unnumbered chapters are ignored.
--\def\chapheadtype{N}
--
--% Choose a heading macro
--% #1 is heading type
--% #2 is heading level
--% #3 is text for heading
--\def\genhead#1#2#3{%
-- % Compute the abs. sec. level:
-- \absseclevel=#2
-- \advance\absseclevel by \secbase
-- % Make sure \absseclevel doesn't fall outside the range:
-- \ifnum \absseclevel < 0
-- \absseclevel = 0
-- \else
-- \ifnum \absseclevel > 3
-- \absseclevel = 3
-- \fi
-- \fi
-- % The heading type:
-- \def\headtype{#1}%
-- \if \headtype U%
-- \ifnum \absseclevel < \unnlevel
-- \chardef\unnlevel = \absseclevel
-- \fi
-- \else
-- % Check for appendix sections:
-- \ifnum \absseclevel = 0
-- \edef\chapheadtype{\headtype}%
-- \else
-- \if \headtype A\if \chapheadtype N%
-- \errmessage{@appendix... within a non-appendix chapter}%
-- \fi\fi
-- \fi
-- % Check for numbered within unnumbered:
-- \ifnum \absseclevel > \unnlevel
-- \def\headtype{U}%
-- \else
-- \chardef\unnlevel = 3
-- \fi
-- \fi
-- % Now print the heading:
-- \if \headtype U%
-- \ifcase\absseclevel
-- \unnumberedzzz{#3}%
-- \or \unnumberedseczzz{#3}%
-- \or \unnumberedsubseczzz{#3}%
-- \or \unnumberedsubsubseczzz{#3}%
-- \fi
-- \else
-- \if \headtype A%
-- \ifcase\absseclevel
-- \appendixzzz{#3}%
-- \or \appendixsectionzzz{#3}%
-- \or \appendixsubseczzz{#3}%
-- \or \appendixsubsubseczzz{#3}%
-- \fi
-- \else
-- \ifcase\absseclevel
-- \chapterzzz{#3}%
-- \or \seczzz{#3}%
-- \or \numberedsubseczzz{#3}%
-- \or \numberedsubsubseczzz{#3}%
-- \fi
-- \fi
-- \fi
-- \suppressfirstparagraphindent
--}
--
--% an interface:
--\def\numhead{\genhead N}
--\def\apphead{\genhead A}
--\def\unnmhead{\genhead U}
--
--% @chapter, @appendix, @unnumbered. Increment top-level counter, reset
--% all lower-level sectioning counters to zero.
--%
--% Also set \chaplevelprefix, which we prepend to @float sequence numbers
--% (e.g., figures), q.v. By default (before any chapter), that is empty.
--\let\chaplevelprefix = \empty
--%
--\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz
--\def\chapterzzz#1{%
-- % section resetting is \global in case the chapter is in a group, such
-- % as an @include file.
-- \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-- \global\advance\chapno by 1
-- %
-- % Used for \float.
-- \gdef\chaplevelprefix{\the\chapno.}%
-- \resetallfloatnos
-- %
-- % \putwordChapter can contain complex things in translations.
-- \toks0=\expandafter{\putwordChapter}%
-- \message{\the\toks0 \space \the\chapno}%
-- %
-- % Write the actual heading.
-- \chapmacro{#1}{Ynumbered}{\the\chapno}%
-- %
-- % So @section and the like are numbered underneath this chapter.
-- \global\let\section = \numberedsec
-- \global\let\subsection = \numberedsubsec
-- \global\let\subsubsection = \numberedsubsubsec
--}
--
--\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz
--%
--\def\appendixzzz#1{%
-- \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-- \global\advance\appendixno by 1
-- \gdef\chaplevelprefix{\appendixletter.}%
-- \resetallfloatnos
-- %
-- % \putwordAppendix can contain complex things in translations.
-- \toks0=\expandafter{\putwordAppendix}%
-- \message{\the\toks0 \space \appendixletter}%
-- %
-- \chapmacro{#1}{Yappendix}{\appendixletter}%
-- %
-- \global\let\section = \appendixsec
-- \global\let\subsection = \appendixsubsec
-- \global\let\subsubsection = \appendixsubsubsec
--}
--
--% normally unnmhead0 calls unnumberedzzz:
--\outer\parseargdef\unnumbered{\unnmhead0{#1}}
--\def\unnumberedzzz#1{%
-- \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
-- \global\advance\unnumberedno by 1
-- %
-- % Since an unnumbered has no number, no prefix for figures.
-- \global\let\chaplevelprefix = \empty
-- \resetallfloatnos
-- %
-- % This used to be simply \message{#1}, but TeX fully expands the
-- % argument to \message. Therefore, if #1 contained @-commands, TeX
-- % expanded them. For example, in `@unnumbered The @cite{Book}', TeX
-- % expanded @cite (which turns out to cause errors because \cite is meant
-- % to be executed, not expanded).
-- %
-- % Anyway, we don't want the fully-expanded definition of @cite to appear
-- % as a result of the \message, we just want `@cite' itself. We use
-- % \the<toks register> to achieve this: TeX expands \the<toks> only once,
-- % simply yielding the contents of <toks register>. (We also do this for
-- % the toc entries.)
-- \toks0 = {#1}%
-- \message{(\the\toks0)}%
-- %
-- \chapmacro{#1}{Ynothing}{\the\unnumberedno}%
-- %
-- \global\let\section = \unnumberedsec
-- \global\let\subsection = \unnumberedsubsec
-- \global\let\subsubsection = \unnumberedsubsubsec
--}
--
--% @centerchap is like @unnumbered, but the heading is centered.
--\outer\parseargdef\centerchap{%
-- % Well, we could do the following in a group, but that would break
-- % an assumption that \chapmacro is called at the outermost level.
-- % Thus we are safer this way: --kasal, 24feb04
-- \let\centerparametersmaybe = \centerparameters
-- \unnmhead0{#1}%
-- \let\centerparametersmaybe = \relax
--}
--
--% @top is like @unnumbered.
--\let\top\unnumbered
--
--% Sections.
--%
--\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
--\def\seczzz#1{%
-- \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
-- \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
--}
--
--% normally calls appendixsectionzzz:
--\outer\parseargdef\appendixsection{\apphead1{#1}}
--\def\appendixsectionzzz#1{%
-- \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
-- \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
--}
--\let\appendixsec\appendixsection
--
--% normally calls unnumberedseczzz:
--\outer\parseargdef\unnumberedsec{\unnmhead1{#1}}
--\def\unnumberedseczzz#1{%
-- \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1
-- \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
--}
--
--% Subsections.
--%
--% normally calls numberedsubseczzz:
--\outer\parseargdef\numberedsubsec{\numhead2{#1}}
--\def\numberedsubseczzz#1{%
-- \global\subsubsecno=0 \global\advance\subsecno by 1
-- \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
--}
--
--% normally calls appendixsubseczzz:
--\outer\parseargdef\appendixsubsec{\apphead2{#1}}
--\def\appendixsubseczzz#1{%
-- \global\subsubsecno=0 \global\advance\subsecno by 1
-- \sectionheading{#1}{subsec}{Yappendix}%
-- {\appendixletter.\the\secno.\the\subsecno}%
--}
--
--% normally calls unnumberedsubseczzz:
--\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}}
--\def\unnumberedsubseczzz#1{%
-- \global\subsubsecno=0 \global\advance\subsecno by 1
-- \sectionheading{#1}{subsec}{Ynothing}%
-- {\the\unnumberedno.\the\secno.\the\subsecno}%
--}
--
--% Subsubsections.
--%
--% normally numberedsubsubseczzz:
--\outer\parseargdef\numberedsubsubsec{\numhead3{#1}}
--\def\numberedsubsubseczzz#1{%
-- \global\advance\subsubsecno by 1
-- \sectionheading{#1}{subsubsec}{Ynumbered}%
-- {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
--}
--
--% normally appendixsubsubseczzz:
--\outer\parseargdef\appendixsubsubsec{\apphead3{#1}}
--\def\appendixsubsubseczzz#1{%
-- \global\advance\subsubsecno by 1
-- \sectionheading{#1}{subsubsec}{Yappendix}%
-- {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
--}
--
--% normally unnumberedsubsubseczzz:
--\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}}
--\def\unnumberedsubsubseczzz#1{%
-- \global\advance\subsubsecno by 1
-- \sectionheading{#1}{subsubsec}{Ynothing}%
-- {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}%
--}
--
--% These macros control what the section commands do, according
--% to what kind of chapter we are in (ordinary, appendix, or unnumbered).
--% Define them by default for a numbered chapter.
--\let\section = \numberedsec
--\let\subsection = \numberedsubsec
--\let\subsubsection = \numberedsubsubsec
--
--% Define @majorheading, @heading and @subheading
--
--\def\majorheading{%
-- {\advance\chapheadingskip by 10pt \chapbreak }%
-- \parsearg\chapheadingzzz
--}
--
--\def\chapheading{\chapbreak \parsearg\chapheadingzzz}
--\def\chapheadingzzz#1{%
-- \vbox{\chapfonts \raggedtitlesettings #1\par}%
-- \nobreak\bigskip \nobreak
-- \suppressfirstparagraphindent
--}
--
--% @heading, @subheading, @subsubheading.
--\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{}
-- \suppressfirstparagraphindent}
--\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{}
-- \suppressfirstparagraphindent}
--\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{}
-- \suppressfirstparagraphindent}
--
--% These macros generate a chapter, section, etc. heading only
--% (including whitespace, linebreaking, etc. around it),
--% given all the information in convenient, parsed form.
--
--% Args are the skip and penalty (usually negative)
--\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
--
--% Parameter controlling skip before chapter headings (if needed)
--\newskip\chapheadingskip
--
--% Define plain chapter starts, and page on/off switching for it.
--\def\chapbreak{\dobreak \chapheadingskip {-4000}}
--\def\chappager{\par\vfill\supereject}
--% Because \domark is called before \chapoddpage, the filler page will
--% get the headings for the next chapter, which is wrong. But we don't
--% care -- we just disable all headings on the filler page.
--\def\chapoddpage{%
-- \chappager
-- \ifodd\pageno \else
-- \begingroup
-- \headingsoff
-- \null
-- \chappager
-- \endgroup
-- \fi
--}
--
--\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
--
--\def\CHAPPAGoff{%
--\global\let\contentsalignmacro = \chappager
--\global\let\pchapsepmacro=\chapbreak
--\global\let\pagealignmacro=\chappager}
--
--\def\CHAPPAGon{%
--\global\let\contentsalignmacro = \chappager
--\global\let\pchapsepmacro=\chappager
--\global\let\pagealignmacro=\chappager
--\global\def\HEADINGSon{\HEADINGSsingle}}
--
--\def\CHAPPAGodd{%
--\global\let\contentsalignmacro = \chapoddpage
--\global\let\pchapsepmacro=\chapoddpage
--\global\let\pagealignmacro=\chapoddpage
--\global\def\HEADINGSon{\HEADINGSdouble}}
--
--\CHAPPAGon
--
--% Chapter opening.
--%
--% #1 is the text, #2 is the section type (Ynumbered, Ynothing,
--% Yappendix, Yomitfromtoc), #3 the chapter number.
--%
--% To test against our argument.
--\def\Ynothingkeyword{Ynothing}
--\def\Yomitfromtockeyword{Yomitfromtoc}
--\def\Yappendixkeyword{Yappendix}
--%
--\def\chapmacro#1#2#3{%
-- % Insert the first mark before the heading break (see notes for \domark).
-- \let\prevchapterdefs=\lastchapterdefs
-- \let\prevsectiondefs=\lastsectiondefs
-- \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
-- \gdef\thissection{}}%
-- %
-- \def\temptype{#2}%
-- \ifx\temptype\Ynothingkeyword
-- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
-- \gdef\thischapter{\thischaptername}}%
-- \else\ifx\temptype\Yomitfromtockeyword
-- \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
-- \gdef\thischapter{}}%
-- \else\ifx\temptype\Yappendixkeyword
-- \toks0={#1}%
-- \xdef\lastchapterdefs{%
-- \gdef\noexpand\thischaptername{\the\toks0}%
-- \gdef\noexpand\thischapternum{\appendixletter}%
-- % \noexpand\putwordAppendix avoids expanding indigestible
-- % commands in some of the translations.
-- \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
-- \noexpand\thischapternum:
-- \noexpand\thischaptername}%
-- }%
-- \else
-- \toks0={#1}%
-- \xdef\lastchapterdefs{%
-- \gdef\noexpand\thischaptername{\the\toks0}%
-- \gdef\noexpand\thischapternum{\the\chapno}%
-- % \noexpand\putwordChapter avoids expanding indigestible
-- % commands in some of the translations.
-- \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
-- \noexpand\thischapternum:
-- \noexpand\thischaptername}%
-- }%
-- \fi\fi\fi
-- %
-- % Output the mark. Pass it through \safewhatsit, to take care of
-- % the preceding space.
-- \safewhatsit\domark
-- %
-- % Insert the chapter heading break.
-- \pchapsepmacro
-- %
-- % Now the second mark, after the heading break. No break points
-- % between here and the heading.
-- \let\prevchapterdefs=\lastchapterdefs
-- \let\prevsectiondefs=\lastsectiondefs
-- \domark
-- %
-- {%
-- \chapfonts \rmisbold
-- %
-- % Have to define \lastsection before calling \donoderef, because the
-- % xref code eventually uses it. On the other hand, it has to be called
-- % after \pchapsepmacro, or the headline will change too soon.
-- \gdef\lastsection{#1}%
-- %
-- % Only insert the separating space if we have a chapter/appendix
-- % number, and don't print the unnumbered ``number''.
-- \ifx\temptype\Ynothingkeyword
-- \setbox0 = \hbox{}%
-- \def\toctype{unnchap}%
-- \else\ifx\temptype\Yomitfromtockeyword
-- \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
-- \def\toctype{omit}%
-- \else\ifx\temptype\Yappendixkeyword
-- \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
-- \def\toctype{app}%
-- \else
-- \setbox0 = \hbox{#3\enspace}%
-- \def\toctype{numchap}%
-- \fi\fi\fi
-- %
-- % Write the toc entry for this chapter. Must come before the
-- % \donoderef, because we include the current node name in the toc
-- % entry, and \donoderef resets it to empty.
-- \writetocentry{\toctype}{#1}{#3}%
-- %
-- % For pdftex, we have to write out the node definition (aka, make
-- % the pdfdest) after any page break, but before the actual text has
-- % been typeset. If the destination for the pdf outline is after the
-- % text, then jumping from the outline may wind up with the text not
-- % being visible, for instance under high magnification.
-- \donoderef{#2}%
-- %
-- % Typeset the actual heading.
-- \nobreak % Avoid page breaks at the interline glue.
-- \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe
-- \unhbox0 #1\par}%
-- }%
-- \nobreak\bigskip % no page break after a chapter title
-- \nobreak
--}
--
--% @centerchap -- centered and unnumbered.
--\let\centerparametersmaybe = \relax
--\def\centerparameters{%
-- \advance\rightskip by 3\rightskip
-- \leftskip = \rightskip
-- \parfillskip = 0pt
--}
--
--
--% I don't think this chapter style is supported any more, so I'm not
--% updating it with the new noderef stuff. We'll see. --karl, 11aug03.
--%
--\def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
--%
--\def\unnchfopen #1{%
-- \chapoddpage
-- \vbox{\chapfonts \raggedtitlesettings #1\par}%
-- \nobreak\bigskip\nobreak
--}
--\def\chfopen #1#2{\chapoddpage {\chapfonts
--\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
--\par\penalty 5000 %
--}
--\def\centerchfopen #1{%
-- \chapoddpage
-- \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
-- \nobreak\bigskip \nobreak
--}
--\def\CHAPFopen{%
-- \global\let\chapmacro=\chfopen
-- \global\let\centerchapmacro=\centerchfopen}
--
--
--% Section titles. These macros combine the section number parts and
--% call the generic \sectionheading to do the printing.
--%
--\newskip\secheadingskip
--\def\secheadingbreak{\dobreak \secheadingskip{-1000}}
--
--% Subsection titles.
--\newskip\subsecheadingskip
--\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}}
--
--% Subsubsection titles.
--\def\subsubsecheadingskip{\subsecheadingskip}
--\def\subsubsecheadingbreak{\subsecheadingbreak}
--
--
--% Print any size, any type, section title.
--%
--% #1 is the text, #2 is the section level (sec/subsec/subsubsec), #3 is
--% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
--% section number.
--%
--\def\seckeyword{sec}
--%
--\def\sectionheading#1#2#3#4{%
-- {%
-- \checkenv{}% should not be in an environment.
-- %
-- % Switch to the right set of fonts.
-- \csname #2fonts\endcsname \rmisbold
-- %
-- \def\sectionlevel{#2}%
-- \def\temptype{#3}%
-- %
-- % Insert first mark before the heading break (see notes for \domark).
-- \let\prevsectiondefs=\lastsectiondefs
-- \ifx\temptype\Ynothingkeyword
-- \ifx\sectionlevel\seckeyword
-- \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
-- \gdef\thissection{\thissectionname}}%
-- \fi
-- \else\ifx\temptype\Yomitfromtockeyword
-- % Don't redefine \thissection.
-- \else\ifx\temptype\Yappendixkeyword
-- \ifx\sectionlevel\seckeyword
-- \toks0={#1}%
-- \xdef\lastsectiondefs{%
-- \gdef\noexpand\thissectionname{\the\toks0}%
-- \gdef\noexpand\thissectionnum{#4}%
-- % \noexpand\putwordSection avoids expanding indigestible
-- % commands in some of the translations.
-- \gdef\noexpand\thissection{\noexpand\putwordSection{}
-- \noexpand\thissectionnum:
-- \noexpand\thissectionname}%
-- }%
-- \fi
-- \else
-- \ifx\sectionlevel\seckeyword
-- \toks0={#1}%
-- \xdef\lastsectiondefs{%
-- \gdef\noexpand\thissectionname{\the\toks0}%
-- \gdef\noexpand\thissectionnum{#4}%
-- % \noexpand\putwordSection avoids expanding indigestible
-- % commands in some of the translations.
-- \gdef\noexpand\thissection{\noexpand\putwordSection{}
-- \noexpand\thissectionnum:
-- \noexpand\thissectionname}%
-- }%
-- \fi
-- \fi\fi\fi
-- %
-- % Go into vertical mode. Usually we'll already be there, but we
-- % don't want the following whatsit to end up in a preceding paragraph
-- % if the document didn't happen to have a blank line.
-- \par
-- %
-- % Output the mark. Pass it through \safewhatsit, to take care of
-- % the preceding space.
-- \safewhatsit\domark
-- %
-- % Insert space above the heading.
-- \csname #2headingbreak\endcsname
-- %
-- % Now the second mark, after the heading break. No break points
-- % between here and the heading.
-- \let\prevsectiondefs=\lastsectiondefs
-- \domark
-- %
-- % Only insert the space after the number if we have a section number.
-- \ifx\temptype\Ynothingkeyword
-- \setbox0 = \hbox{}%
-- \def\toctype{unn}%
-- \gdef\lastsection{#1}%
-- \else\ifx\temptype\Yomitfromtockeyword
-- % for @headings -- no section number, don't include in toc,
-- % and don't redefine \lastsection.
-- \setbox0 = \hbox{}%
-- \def\toctype{omit}%
-- \let\sectionlevel=\empty
-- \else\ifx\temptype\Yappendixkeyword
-- \setbox0 = \hbox{#4\enspace}%
-- \def\toctype{app}%
-- \gdef\lastsection{#1}%
-- \else
-- \setbox0 = \hbox{#4\enspace}%
-- \def\toctype{num}%
-- \gdef\lastsection{#1}%
-- \fi\fi\fi
-- %
-- % Write the toc entry (before \donoderef). See comments in \chapmacro.
-- \writetocentry{\toctype\sectionlevel}{#1}{#4}%
-- %
-- % Write the node reference (= pdf destination for pdftex).
-- % Again, see comments in \chapmacro.
-- \donoderef{#3}%
-- %
-- % Interline glue will be inserted when the vbox is completed.
-- % That glue will be a valid breakpoint for the page, since it'll be
-- % preceded by a whatsit (usually from the \donoderef, or from the
-- % \writetocentry if there was no node). We don't want to allow that
-- % break, since then the whatsits could end up on page n while the
-- % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000.
-- \nobreak
-- %
-- % Output the actual section heading.
-- \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
-- \hangindent=\wd0 % zero if no section number
-- \unhbox0 #1}%
-- }%
-- % Add extra space after the heading -- half of whatever came above it.
-- % Don't allow stretch, though.
-- \kern .5 \csname #2headingskip\endcsname
-- %
-- % Do not let the kern be a potential breakpoint, as it would be if it
-- % was followed by glue.
-- \nobreak
-- %
-- % We'll almost certainly start a paragraph next, so don't let that
-- % glue accumulate. (Not a breakpoint because it's preceded by a
-- % discardable item.) However, when a paragraph is not started next
-- % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out
-- % or the negative glue will cause weirdly wrong output, typically
-- % obscuring the section heading with something else.
-- \vskip-\parskip
-- %
-- % This is so the last item on the main vertical list is a known
-- % \penalty > 10000, so \startdefun, etc., can recognize the situation
-- % and do the needful.
-- \penalty 10001
--}
--
--
--\message{toc,}
--% Table of contents.
--\newwrite\tocfile
--
--% Write an entry to the toc file, opening it if necessary.
--% Called from @chapter, etc.
--%
--% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno}
--% We append the current node name (if any) and page number as additional
--% arguments for the \{chap,sec,...}entry macros which will eventually
--% read this. The node name is used in the pdf outlines as the
--% destination to jump to.
--%
--% We open the .toc file for writing here instead of at @setfilename (or
--% any other fixed time) so that @contents can be anywhere in the document.
--% But if #1 is `omit', then we don't do anything. This is used for the
--% table of contents chapter openings themselves.
--%
--\newif\iftocfileopened
--\def\omitkeyword{omit}%
--%
--\def\writetocentry#1#2#3{%
-- \edef\writetoctype{#1}%
-- \ifx\writetoctype\omitkeyword \else
-- \iftocfileopened\else
-- \immediate\openout\tocfile = \jobname.toc
-- \global\tocfileopenedtrue
-- \fi
-- %
-- \iflinks
-- {\atdummies
-- \edef\temp{%
-- \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
-- \temp
-- }%
-- \fi
-- \fi
-- %
-- % Tell \shipout to create a pdf destination on each page, if we're
-- % writing pdf. These are used in the table of contents. We can't
-- % just write one on every page because the title pages are numbered
-- % 1 and 2 (the page numbers aren't printed), and so are the first
-- % two pages of the document. Thus, we'd have two destinations named
-- % `1', and two named `2'.
-- \ifpdf \global\pdfmakepagedesttrue \fi
--}
--
--
--% These characters do not print properly in the Computer Modern roman
--% fonts, so we must take special care. This is more or less redundant
--% with the Texinfo input format setup at the end of this file.
--%
--\def\activecatcodes{%
-- \catcode`\"=\active
-- \catcode`\$=\active
-- \catcode`\<=\active
-- \catcode`\>=\active
-- \catcode`\\=\active
-- \catcode`\^=\active
-- \catcode`\_=\active
-- \catcode`\|=\active
-- \catcode`\~=\active
--}
--
--
--% Read the toc file, which is essentially Texinfo input.
--\def\readtocfile{%
-- \setupdatafile
-- \activecatcodes
-- \input \tocreadfilename
--}
--
--\newskip\contentsrightmargin \contentsrightmargin=1in
--\newcount\savepageno
--\newcount\lastnegativepageno \lastnegativepageno = -1
--
--% Prepare to read what we've written to \tocfile.
--%
--\def\startcontents#1{%
-- % If @setchapternewpage on, and @headings double, the contents should
-- % start on an odd page, unlike chapters. Thus, we maintain
-- % \contentsalignmacro in parallel with \pagealignmacro.
-- % From: Torbjorn Granlund <tege at matematik.su.se>
-- \contentsalignmacro
-- \immediate\closeout\tocfile
-- %
-- % Don't need to put `Contents' or `Short Contents' in the headline.
-- % It is abundantly clear what they are.
-- \chapmacro{#1}{Yomitfromtoc}{}%
-- %
-- \savepageno = \pageno
-- \begingroup % Set up to handle contents files properly.
-- \raggedbottom % Worry more about breakpoints than the bottom.
-- \advance\hsize by -\contentsrightmargin % Don't use the full line length.
-- %
-- % Roman numerals for page numbers.
-- \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
--}
--
--% redefined for the two-volume lispref. We always output on
--% \jobname.toc even if this is redefined.
--%
--\def\tocreadfilename{\jobname.toc}
--
--% Normal (long) toc.
--%
--\def\contents{%
-- \startcontents{\putwordTOC}%
-- \openin 1 \tocreadfilename\space
-- \ifeof 1 \else
-- \readtocfile
-- \fi
-- \vfill \eject
-- \contentsalignmacro % in case @setchapternewpage odd is in effect
-- \ifeof 1 \else
-- \pdfmakeoutlines
-- \fi
-- \closein 1
-- \endgroup
-- \lastnegativepageno = \pageno
-- \global\pageno = \savepageno
--}
--
--% And just the chapters.
--\def\summarycontents{%
-- \startcontents{\putwordShortTOC}%
-- %
-- \let\partentry = \shortpartentry
-- \let\numchapentry = \shortchapentry
-- \let\appentry = \shortchapentry
-- \let\unnchapentry = \shortunnchapentry
-- % We want a true roman here for the page numbers.
-- \secfonts
-- \let\rm=\shortcontrm \let\bf=\shortcontbf
-- \let\sl=\shortcontsl \let\tt=\shortconttt
-- \rm
-- \hyphenpenalty = 10000
-- \advance\baselineskip by 1pt % Open it up a little.
-- \def\numsecentry##1##2##3##4{}
-- \let\appsecentry = \numsecentry
-- \let\unnsecentry = \numsecentry
-- \let\numsubsecentry = \numsecentry
-- \let\appsubsecentry = \numsecentry
-- \let\unnsubsecentry = \numsecentry
-- \let\numsubsubsecentry = \numsecentry
-- \let\appsubsubsecentry = \numsecentry
-- \let\unnsubsubsecentry = \numsecentry
-- \openin 1 \tocreadfilename\space
-- \ifeof 1 \else
-- \readtocfile
-- \fi
-- \closein 1
-- \vfill \eject
-- \contentsalignmacro % in case @setchapternewpage odd is in effect
-- \endgroup
-- \lastnegativepageno = \pageno
-- \global\pageno = \savepageno
--}
--\let\shortcontents = \summarycontents
--
--% Typeset the label for a chapter or appendix for the short contents.
--% The arg is, e.g., `A' for an appendix, or `3' for a chapter.
--%
--\def\shortchaplabel#1{%
-- % This space should be enough, since a single number is .5em, and the
-- % widest letter (M) is 1em, at least in the Computer Modern fonts.
-- % But use \hss just in case.
-- % (This space doesn't include the extra space that gets added after
-- % the label; that gets put in by \shortchapentry above.)
-- %
-- % We'd like to right-justify chapter numbers, but that looks strange
-- % with appendix letters. And right-justifying numbers and
-- % left-justifying letters looks strange when there is less than 10
-- % chapters. Have to read the whole toc once to know how many chapters
-- % there are before deciding ...
-- \hbox to 1em{#1\hss}%
--}
--
--% These macros generate individual entries in the table of contents.
--% The first argument is the chapter or section name.
--% The last argument is the page number.
--% The arguments in between are the chapter number, section number, ...
--
--% Parts, in the main contents. Replace the part number, which doesn't
--% exist, with an empty box. Let's hope all the numbers have the same width.
--% Also ignore the page number, which is conventionally not printed.
--\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}}
--\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}}
--%
--% Parts, in the short toc.
--\def\shortpartentry#1#2#3#4{%
-- \penalty-300
-- \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip
-- \shortchapentry{{\bf #1}}{\numeralbox}{}{}%
--}
--
--% Chapters, in the main contents.
--\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
--%
--% Chapters, in the short toc.
--% See comments in \dochapentry re vbox and related settings.
--\def\shortchapentry#1#2#3#4{%
-- \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
--}
--
--% Appendices, in the main contents.
--% Need the word Appendix, and a fixed-size box.
--%
--\def\appendixbox#1{%
-- % We use M since it's probably the widest letter.
-- \setbox0 = \hbox{\putwordAppendix{} M}%
-- \hbox to \wd0{\putwordAppendix{} #1\hss}}
--%
--\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\labelspace#1}{#4}}
--
--% Unnumbered chapters.
--\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
--\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
--
--% Sections.
--\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
--\let\appsecentry=\numsecentry
--\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}}
--
--% Subsections.
--\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}}
--\let\appsubsecentry=\numsubsecentry
--\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
--
--% And subsubsections.
--\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}}
--\let\appsubsubsecentry=\numsubsubsecentry
--\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
--
--% This parameter controls the indentation of the various levels.
--% Same as \defaultparindent.
--\newdimen\tocindent \tocindent = 15pt
--
--% Now for the actual typesetting. In all these, #1 is the text and #2 is the
--% page number.
--%
--% If the toc has to be broken over pages, we want it to be at chapters
--% if at all possible; hence the \penalty.
--\def\dochapentry#1#2{%
-- \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip
-- \begingroup
-- \chapentryfonts
-- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
-- \endgroup
-- \nobreak\vskip .25\baselineskip plus.1\baselineskip
--}
--
--\def\dosecentry#1#2{\begingroup
-- \secentryfonts \leftskip=\tocindent
-- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
--\endgroup}
--
--\def\dosubsecentry#1#2{\begingroup
-- \subsecentryfonts \leftskip=2\tocindent
-- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
--\endgroup}
--
--\def\dosubsubsecentry#1#2{\begingroup
-- \subsubsecentryfonts \leftskip=3\tocindent
-- \tocentry{#1}{\dopageno\bgroup#2\egroup}%
--\endgroup}
--
--% We use the same \entry macro as for the index entries.
--\let\tocentry = \entry
--
--% Space between chapter (or whatever) number and the title.
--\def\labelspace{\hskip1em \relax}
--
--\def\dopageno#1{{\rm #1}}
--\def\doshortpageno#1{{\rm #1}}
--
--\def\chapentryfonts{\secfonts \rm}
--\def\secentryfonts{\textfonts}
--\def\subsecentryfonts{\textfonts}
--\def\subsubsecentryfonts{\textfonts}
--
--
--\message{environments,}
--% @foo ... @end foo.
--
--% @tex ... @end tex escapes into raw TeX temporarily.
--% One exception: @ is still an escape character, so that @end tex works.
--% But \@ or @@ will get a plain @ character.
--
--\envdef\tex{%
-- \setupmarkupstyle{tex}%
-- \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
-- \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
-- \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie
-- \catcode `\%=14
-- \catcode `\+=\other
-- \catcode `\"=\other
-- \catcode `\|=\other
-- \catcode `\<=\other
-- \catcode `\>=\other
-- \catcode`\`=\other
-- \catcode`\'=\other
-- \escapechar=`\\
-- %
-- % ' is active in math mode (mathcode"8000). So reset it, and all our
-- % other math active characters (just in case), to plain's definitions.
-- \mathactive
-- %
-- \let\b=\ptexb
-- \let\bullet=\ptexbullet
-- \let\c=\ptexc
-- \let\,=\ptexcomma
-- \let\.=\ptexdot
-- \let\dots=\ptexdots
-- \let\equiv=\ptexequiv
-- \let\!=\ptexexclam
-- \let\i=\ptexi
-- \let\indent=\ptexindent
-- \let\noindent=\ptexnoindent
-- \let\{=\ptexlbrace
-- \let\+=\tabalign
-- \let\}=\ptexrbrace
-- \let\/=\ptexslash
-- \let\*=\ptexstar
-- \let\t=\ptext
-- \expandafter \let\csname top\endcsname=\ptextop % outer
-- \let\frenchspacing=\plainfrenchspacing
-- %
-- \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
-- \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
-- \def\@{@}%
--}
--% There is no need to define \Etex.
--
--% Define @lisp ... @end lisp.
--% @lisp environment forms a group so it can rebind things,
--% including the definition of @end lisp (which normally is erroneous).
--
--% Amount to narrow the margins by for @lisp.
--\newskip\lispnarrowing \lispnarrowing=0.4in
--
--% This is the definition that ^^M gets inside @lisp, @example, and other
--% such environments. \null is better than a space, since it doesn't
--% have any width.
--\def\lisppar{\null\endgraf}
--
--% This space is always present above and below environments.
--\newskip\envskipamount \envskipamount = 0pt
--
--% Make spacing and below environment symmetrical. We use \parskip here
--% to help in doing that, since in @example-like environments \parskip
--% is reset to zero; thus the \afterenvbreak inserts no space -- but the
--% start of the next paragraph will insert \parskip.
--%
--\def\aboveenvbreak{{%
-- % =10000 instead of <10000 because of a special case in \itemzzz and
-- % \sectionheading, q.v.
-- \ifnum \lastpenalty=10000 \else
-- \advance\envskipamount by \parskip
-- \endgraf
-- \ifdim\lastskip<\envskipamount
-- \removelastskip
-- % it's not a good place to break if the last penalty was \nobreak
-- % or better ...
-- \ifnum\lastpenalty<10000 \penalty-50 \fi
-- \vskip\envskipamount
-- \fi
-- \fi
--}}
--
--\let\afterenvbreak = \aboveenvbreak
--
--% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will
--% also clear it, so that its embedded environments do the narrowing again.
--\let\nonarrowing=\relax
--
--% @cartouche ... @end cartouche: draw rectangle w/rounded corners around
--% environment contents.
--\font\circle=lcircle10
--\newdimen\circthick
--\newdimen\cartouter\newdimen\cartinner
--\newskip\normbskip\newskip\normpskip\newskip\normlskip
--\circthick=\fontdimen8\circle
--%
--\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth
--\def\ctr{{\hskip 6pt\circle\char'010}}
--\def\cbl{{\circle\char'012\hskip -6pt}}
--\def\cbr{{\hskip 6pt\circle\char'011}}
--\def\carttop{\hbox to \cartouter{\hskip\lskip
-- \ctl\leaders\hrule height\circthick\hfil\ctr
-- \hskip\rskip}}
--\def\cartbot{\hbox to \cartouter{\hskip\lskip
-- \cbl\leaders\hrule height\circthick\hfil\cbr
-- \hskip\rskip}}
--%
--\newskip\lskip\newskip\rskip
--
--\envdef\cartouche{%
-- \ifhmode\par\fi % can't be in the midst of a paragraph.
-- \startsavinginserts
-- \lskip=\leftskip \rskip=\rightskip
-- \leftskip=0pt\rightskip=0pt % we want these *outside*.
-- \cartinner=\hsize \advance\cartinner by-\lskip
-- \advance\cartinner by-\rskip
-- \cartouter=\hsize
-- \advance\cartouter by 18.4pt % allow for 3pt kerns on either
-- % side, and for 6pt waste from
-- % each corner char, and rule thickness
-- \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-- % Flag to tell @lisp, etc., not to narrow margin.
-- \let\nonarrowing = t%
-- %
-- % If this cartouche directly follows a sectioning command, we need the
-- % \parskip glue (backspaced over by default) or the cartouche can
-- % collide with the section heading.
-- \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
-- %
-- \vbox\bgroup
-- \baselineskip=0pt\parskip=0pt\lineskip=0pt
-- \carttop
-- \hbox\bgroup
-- \hskip\lskip
-- \vrule\kern3pt
-- \vbox\bgroup
-- \kern3pt
-- \hsize=\cartinner
-- \baselineskip=\normbskip
-- \lineskip=\normlskip
-- \parskip=\normpskip
-- \vskip -\parskip
-- \comment % For explanation, see the end of def\group.
--}
--\def\Ecartouche{%
-- \ifhmode\par\fi
-- \kern3pt
-- \egroup
-- \kern3pt\vrule
-- \hskip\rskip
-- \egroup
-- \cartbot
-- \egroup
-- \checkinserts
--}
--
--
--% This macro is called at the beginning of all the @example variants,
--% inside a group.
--\newdimen\nonfillparindent
--\def\nonfillstart{%
-- \aboveenvbreak
-- \hfuzz = 12pt % Don't be fussy
-- \sepspaces % Make spaces be word-separators rather than space tokens.
-- \let\par = \lisppar % don't ignore blank lines
-- \obeylines % each line of input is a line of output
-- \parskip = 0pt
-- % Turn off paragraph indentation but redefine \indent to emulate
-- % the normal \indent.
-- \nonfillparindent=\parindent
-- \parindent = 0pt
-- \let\indent\nonfillindent
-- %
-- \emergencystretch = 0pt % don't try to avoid overfull boxes
-- \ifx\nonarrowing\relax
-- \advance \leftskip by \lispnarrowing
-- \exdentamount=\lispnarrowing
-- \else
-- \let\nonarrowing = \relax
-- \fi
-- \let\exdent=\nofillexdent
--}
--
--\begingroup
--\obeyspaces
--% We want to swallow spaces (but not other tokens) after the fake
--% @indent in our nonfill-environments, where spaces are normally
--% active and set to @tie, resulting in them not being ignored after
--% @indent.
--\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}%
--\gdef\nonfillindentcheck{%
--\ifx\temp %
--\expandafter\nonfillindentgobble%
--\else%
--\leavevmode\nonfillindentbox%
--\fi%
--}%
--\endgroup
--\def\nonfillindentgobble#1{\nonfillindent}
--\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}}
--
--% If you want all examples etc. small: @set dispenvsize small.
--% If you want even small examples the full size: @set dispenvsize nosmall.
--% This affects the following displayed environments:
--% @example, @display, @format, @lisp
--%
--\def\smallword{small}
--\def\nosmallword{nosmall}
--\let\SETdispenvsize\relax
--\def\setnormaldispenv{%
-- \ifx\SETdispenvsize\smallword
-- % end paragraph for sake of leading, in case document has no blank
-- % line. This is redundant with what happens in \aboveenvbreak, but
-- % we need to do it before changing the fonts, and it's inconvenient
-- % to change the fonts afterward.
-- \ifnum \lastpenalty=10000 \else \endgraf \fi
-- \smallexamplefonts \rm
-- \fi
--}
--\def\setsmalldispenv{%
-- \ifx\SETdispenvsize\nosmallword
-- \else
-- \ifnum \lastpenalty=10000 \else \endgraf \fi
-- \smallexamplefonts \rm
-- \fi
--}
--
--% We often define two environments, @foo and @smallfoo.
--% Let's do it in one command. #1 is the env name, #2 the definition.
--\def\makedispenvdef#1#2{%
-- \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}%
-- \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}%
-- \expandafter\let\csname E#1\endcsname \afterenvbreak
-- \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
--}
--
--% Define two environment synonyms (#1 and #2) for an environment.
--\def\maketwodispenvdef#1#2#3{%
-- \makedispenvdef{#1}{#3}%
-- \makedispenvdef{#2}{#3}%
--}
--%
--% @lisp: indented, narrowed, typewriter font;
--% @example: same as @lisp.
--%
--% @smallexample and @smalllisp: use smaller fonts.
--% Originally contributed by Pavel at xerox.
--%
--\maketwodispenvdef{lisp}{example}{%
-- \nonfillstart
-- \tt\setupmarkupstyle{example}%
-- \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-- \gobble % eat return
--}
--% @display/@smalldisplay: same as @lisp except keep current font.
--%
--\makedispenvdef{display}{%
-- \nonfillstart
-- \gobble
--}
--
--% @format/@smallformat: same as @display except don't narrow margins.
--%
--\makedispenvdef{format}{%
-- \let\nonarrowing = t%
-- \nonfillstart
-- \gobble
--}
--
--% @flushleft: same as @format, but doesn't obey \SETdispenvsize.
--\envdef\flushleft{%
-- \let\nonarrowing = t%
-- \nonfillstart
-- \gobble
--}
--\let\Eflushleft = \afterenvbreak
--
--% @flushright.
--%
--\envdef\flushright{%
-- \let\nonarrowing = t%
-- \nonfillstart
-- \advance\leftskip by 0pt plus 1fill\relax
-- \gobble
--}
--\let\Eflushright = \afterenvbreak
--
--
--% @raggedright does more-or-less normal line breaking but no right
--% justification. From plain.tex.
--\envdef\raggedright{%
-- \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
--}
--\let\Eraggedright\par
--
--\envdef\raggedleft{%
-- \parindent=0pt \leftskip0pt plus2em
-- \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
-- \hbadness=10000 % Last line will usually be underfull, so turn off
-- % badness reporting.
--}
--\let\Eraggedleft\par
--
--\envdef\raggedcenter{%
-- \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em
-- \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt
-- \hbadness=10000 % Last line will usually be underfull, so turn off
-- % badness reporting.
--}
--\let\Eraggedcenter\par
--
--
--% @quotation does normal linebreaking (hence we can't use \nonfillstart)
--% and narrows the margins. We keep \parskip nonzero in general, since
--% we're doing normal filling. So, when using \aboveenvbreak and
--% \afterenvbreak, temporarily make \parskip 0.
--%
--\makedispenvdef{quotation}{\quotationstart}
--%
--\def\quotationstart{%
-- \indentedblockstart % same as \indentedblock, but increase right margin too.
-- \ifx\nonarrowing\relax
-- \advance\rightskip by \lispnarrowing
-- \fi
-- \parsearg\quotationlabel
--}
--
--% We have retained a nonzero parskip for the environment, since we're
--% doing normal filling.
--%
--\def\Equotation{%
-- \par
-- \ifx\quotationauthor\thisisundefined\else
-- % indent a bit.
-- \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
-- \fi
-- {\parskip=0pt \afterenvbreak}%
--}
--\def\Esmallquotation{\Equotation}
--
--% If we're given an argument, typeset it in bold with a colon after.
--\def\quotationlabel#1{%
-- \def\temp{#1}%
-- \ifx\temp\empty \else
-- {\bf #1: }%
-- \fi
--}
--
--% @indentedblock is like @quotation, but indents only on the left and
--% has no optional argument.
--%
--\makedispenvdef{indentedblock}{\indentedblockstart}
--%
--\def\indentedblockstart{%
-- {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-- \parindent=0pt
-- %
-- % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
-- \ifx\nonarrowing\relax
-- \advance\leftskip by \lispnarrowing
-- \exdentamount = \lispnarrowing
-- \else
-- \let\nonarrowing = \relax
-- \fi
--}
--
--% Keep a nonzero parskip for the environment, since we're doing normal filling.
--%
--\def\Eindentedblock{%
-- \par
-- {\parskip=0pt \afterenvbreak}%
--}
--\def\Esmallindentedblock{\Eindentedblock}
--
--
--% LaTeX-like @verbatim... at end verbatim and @verb{<char>...<char>}
--% If we want to allow any <char> as delimiter,
--% we need the curly braces so that makeinfo sees the @verb command, eg:
--% `@verbx...x' would look like the '@verbx' command. --janneke at gnu.org
--%
--% [Knuth]: Donald Ervin Knuth, 1996. The TeXbook.
--%
--% [Knuth] p.344; only we need to do the other characters Texinfo sets
--% active too. Otherwise, they get lost as the first character on a
--% verbatim line.
--\def\dospecials{%
-- \do\ \do\\\do\{\do\}\do\$\do\&%
-- \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~%
-- \do\<\do\>\do\|\do\@\do+\do\"%
-- % Don't do the quotes -- if we do, @set txicodequoteundirected and
-- % @set txicodequotebacktick will not have effect on @verb and
-- % @verbatim, and ?` and !` ligatures won't get disabled.
-- %\do\`\do\'%
--}
--%
--% [Knuth] p. 380
--\def\uncatcodespecials{%
-- \def\do##1{\catcode`##1=\other}\dospecials}
--%
--% Setup for the @verb command.
--%
--% Eight spaces for a tab
--\begingroup
-- \catcode`\^^I=\active
-- \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }}
--\endgroup
--%
--\def\setupverb{%
-- \tt % easiest (and conventionally used) font for verbatim
-- \def\par{\leavevmode\endgraf}%
-- \setupmarkupstyle{verb}%
-- \tabeightspaces
-- % Respect line breaks,
-- % print special symbols as themselves, and
-- % make each space count
-- % must do in this order:
-- \obeylines \uncatcodespecials \sepspaces
--}
--
--% Setup for the @verbatim environment
--%
--% Real tab expansion.
--\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
--%
--% We typeset each line of the verbatim in an \hbox, so we can handle
--% tabs. The \global is in case the verbatim line starts with an accent,
--% or some other command that starts with a begin-group. Otherwise, the
--% entire \verbbox would disappear at the corresponding end-group, before
--% it is typeset. Meanwhile, we can't have nested verbatim commands
--% (can we?), so the \global won't be overwriting itself.
--\newbox\verbbox
--\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup}
--%
--\begingroup
-- \catcode`\^^I=\active
-- \gdef\tabexpand{%
-- \catcode`\^^I=\active
-- \def^^I{\leavevmode\egroup
-- \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab
-- \divide\dimen\verbbox by\tabw
-- \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw
-- \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw
-- \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox
-- }%
-- }
--\endgroup
--
--% start the verbatim environment.
--\def\setupverbatim{%
-- \let\nonarrowing = t%
-- \nonfillstart
-- \tt % easiest (and conventionally used) font for verbatim
-- % The \leavevmode here is for blank lines. Otherwise, we would
-- % never \starttabox and the \egroup would end verbatim mode.
-- \def\par{\leavevmode\egroup\box\verbbox\endgraf}%
-- \tabexpand
-- \setupmarkupstyle{verbatim}%
-- % Respect line breaks,
-- % print special symbols as themselves, and
-- % make each space count.
-- % Must do in this order:
-- \obeylines \uncatcodespecials \sepspaces
-- \everypar{\starttabbox}%
--}
--
--% Do the @verb magic: verbatim text is quoted by unique
--% delimiter characters. Before first delimiter expect a
--% right brace, after last delimiter expect closing brace:
--%
--% \def\doverb'{'<char>#1<char>'}'{#1}
--%
--% [Knuth] p. 382; only eat outer {}
--\begingroup
-- \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other
-- \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next]
--\endgroup
--%
--\def\verb{\begingroup\setupverb\doverb}
--%
--%
--% Do the @verbatim magic: define the macro \doverbatim so that
--% the (first) argument ends when '@end verbatim' is reached, ie:
--%
--% \def\doverbatim#1 at end verbatim{#1}
--%
--% For Texinfo it's a lot easier than for LaTeX,
--% because texinfo's \verbatim doesn't stop at '\end{verbatim}':
--% we need not redefine '\', '{' and '}'.
--%
--% Inspired by LaTeX's verbatim command set [latex.ltx]
--%
--\begingroup
-- \catcode`\ =\active
-- \obeylines %
-- % ignore everything up to the first ^^M, that's the newline at the end
-- % of the @verbatim input line itself. Otherwise we get an extra blank
-- % line in the output.
-- \xdef\doverbatim#1^^M#2 at end verbatim{#2\noexpand\end\gobble verbatim}%
-- % We really want {...\end verbatim} in the body of the macro, but
-- % without the active space; thus we have to use \xdef and \gobble.
--\endgroup
--%
--\envdef\verbatim{%
-- \setupverbatim\doverbatim
--}
--\let\Everbatim = \afterenvbreak
--
--
--% @verbatiminclude FILE - insert text of file in verbatim environment.
--%
--\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude}
--%
--\def\doverbatiminclude#1{%
-- {%
-- \makevalueexpandable
-- \setupverbatim
-- \indexnofonts % Allow `@@' and other weird things in file names.
-- \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}%
-- \input #1
-- \afterenvbreak
-- }%
--}
--
--% @copying ... @end copying.
--% Save the text away for @insertcopying later.
--%
--% We save the uninterpreted tokens, rather than creating a box.
--% Saving the text in a box would be much easier, but then all the
--% typesetting commands (@smallbook, font changes, etc.) have to be done
--% beforehand -- and a) we want @copying to be done first in the source
--% file; b) letting users define the frontmatter in as flexible order as
--% possible is very desirable.
--%
--\def\copying{\checkenv{}\begingroup\scanargctxt\docopying}
--\def\docopying#1 at end copying{\endgroup\def\copyingtext{#1}}
--%
--\def\insertcopying{%
-- \begingroup
-- \parindent = 0pt % paragraph indentation looks wrong on title page
-- \scanexp\copyingtext
-- \endgroup
--}
--
--
--\message{defuns,}
--% @defun etc.
--
--\newskip\defbodyindent \defbodyindent=.4in
--\newskip\defargsindent \defargsindent=50pt
--\newskip\deflastargmargin \deflastargmargin=18pt
--\newcount\defunpenalty
--
--% Start the processing of @deffn:
--\def\startdefun{%
-- \ifnum\lastpenalty<10000
-- \medbreak
-- \defunpenalty=10003 % Will keep this @deffn together with the
-- % following @def command, see below.
-- \else
-- % If there are two @def commands in a row, we'll have a \nobreak,
-- % which is there to keep the function description together with its
-- % header. But if there's nothing but headers, we need to allow a
-- % break somewhere. Check specifically for penalty 10002, inserted
-- % by \printdefunline, instead of 10000, since the sectioning
-- % commands also insert a nobreak penalty, and we don't want to allow
-- % a break between a section heading and a defun.
-- %
-- % As a further refinement, we avoid "club" headers by signalling
-- % with penalty of 10003 after the very first @deffn in the
-- % sequence (see above), and penalty of 10002 after any following
-- % @def command.
-- \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
-- %
-- % Similarly, after a section heading, do not allow a break.
-- % But do insert the glue.
-- \medskip % preceded by discardable penalty, so not a breakpoint
-- \fi
-- %
-- \parindent=0in
-- \advance\leftskip by \defbodyindent
-- \exdentamount=\defbodyindent
--}
--
--\def\dodefunx#1{%
-- % First, check whether we are in the right environment:
-- \checkenv#1%
-- %
-- % As above, allow line break if we have multiple x headers in a row.
-- % It's not a great place, though.
-- \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
-- %
-- % And now, it's time to reuse the body of the original defun:
-- \expandafter\gobbledefun#1%
--}
--\def\gobbledefun#1\startdefun{}
--
--% \printdefunline \deffnheader{text}
--%
--\def\printdefunline#1#2{%
-- \begingroup
-- % call \deffnheader:
-- #1#2 \endheader
-- % common ending:
-- \interlinepenalty = 10000
-- \advance\rightskip by 0pt plus 1fil\relax
-- \endgraf
-- \nobreak\vskip -\parskip
-- \penalty\defunpenalty % signal to \startdefun and \dodefunx
-- % Some of the @defun-type tags do not enable magic parentheses,
-- % rendering the following check redundant. But we don't optimize.
-- \checkparencounts
-- \endgroup
--}
--
--\def\Edefun{\endgraf\medbreak}
--
--% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn;
--% the only thing remaining is to define \deffnheader.
--%
--\def\makedefun#1{%
-- \expandafter\let\csname E#1\endcsname = \Edefun
-- \edef\temp{\noexpand\domakedefun
-- \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}%
-- \temp
--}
--
--% \domakedefun \deffn \deffnx \deffnheader
--%
--% Define \deffn and \deffnx, without parameters.
--% \deffnheader has to be defined explicitly.
--%
--\def\domakedefun#1#2#3{%
-- \envdef#1{%
-- \startdefun
-- \doingtypefnfalse % distinguish typed functions from all else
-- \parseargusing\activeparens{\printdefunline#3}%
-- }%
-- \def#2{\dodefunx#1}%
-- \def#3%
--}
--
--\newif\ifdoingtypefn % doing typed function?
--\newif\ifrettypeownline % typeset return type on its own line?
--
--% @deftypefnnewline on|off says whether the return type of typed functions
--% are printed on their own line. This affects @deftypefn, @deftypefun,
--% @deftypeop, and @deftypemethod.
--%
--\parseargdef\deftypefnnewline{%
-- \def\temp{#1}%
-- \ifx\temp\onword
-- \expandafter\let\csname SETtxideftypefnnl\endcsname
-- = \empty
-- \else\ifx\temp\offword
-- \expandafter\let\csname SETtxideftypefnnl\endcsname
-- = \relax
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @txideftypefnnl value `\temp',
-- must be on|off}%
-- \fi\fi
--}
--
--% Untyped functions:
--
--% @deffn category name args
--\makedefun{deffn}{\deffngeneral{}}
--
--% @deffn category class name args
--\makedefun{defop}#1 {\defopon{#1\ \putwordon}}
--
--% \defopon {category on}class name args
--\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
--
--% \deffngeneral {subind}category name args
--%
--\def\deffngeneral#1#2 #3 #4\endheader{%
-- % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}.
-- \dosubind{fn}{\code{#3}}{#1}%
-- \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
--}
--
--% Typed functions:
--
--% @deftypefn category type name args
--\makedefun{deftypefn}{\deftypefngeneral{}}
--
--% @deftypeop category class type name args
--\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}}
--
--% \deftypeopon {category on}class type name args
--\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} }
--
--% \deftypefngeneral {subind}category type name args
--%
--\def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
-- \dosubind{fn}{\code{#4}}{#1}%
-- \doingtypefntrue
-- \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
--}
--
--% Typed variables:
--
--% @deftypevr category type var args
--\makedefun{deftypevr}{\deftypecvgeneral{}}
--
--% @deftypecv category class type var args
--\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}}
--
--% \deftypecvof {category of}class type var args
--\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} }
--
--% \deftypecvgeneral {subind}category type var args
--%
--\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{%
-- \dosubind{vr}{\code{#4}}{#1}%
-- \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
--}
--
--% Untyped variables:
--
--% @defvr category var args
--\makedefun{defvr}#1 {\deftypevrheader{#1} {} }
--
--% @defcv category class var args
--\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}}
--
--% \defcvof {category of}class var args
--\def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
--
--% Types:
--
--% @deftp category name args
--\makedefun{deftp}#1 #2 #3\endheader{%
-- \doind{tp}{\code{#2}}%
-- \defname{#1}{}{#2}\defunargs{#3\unskip}%
--}
--
--% Remaining @defun-like shortcuts:
--\makedefun{defun}{\deffnheader{\putwordDeffunc} }
--\makedefun{defmac}{\deffnheader{\putwordDefmac} }
--\makedefun{defspec}{\deffnheader{\putwordDefspec} }
--\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} }
--\makedefun{defvar}{\defvrheader{\putwordDefvar} }
--\makedefun{defopt}{\defvrheader{\putwordDefopt} }
--\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} }
--\makedefun{defmethod}{\defopon\putwordMethodon}
--\makedefun{deftypemethod}{\deftypeopon\putwordMethodon}
--\makedefun{defivar}{\defcvof\putwordInstanceVariableof}
--\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof}
--
--% \defname, which formats the name of the @def (not the args).
--% #1 is the category, such as "Function".
--% #2 is the return type, if any.
--% #3 is the function name.
--%
--% We are followed by (but not passed) the arguments, if any.
--%
--\def\defname#1#2#3{%
-- \par
-- % Get the values of \leftskip and \rightskip as they were outside the @def...
-- \advance\leftskip by -\defbodyindent
-- %
-- % Determine if we are typesetting the return type of a typed function
-- % on a line by itself.
-- \rettypeownlinefalse
-- \ifdoingtypefn % doing a typed function specifically?
-- % then check user option for putting return type on its own line:
-- \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else
-- \rettypeownlinetrue
-- \fi
-- \fi
-- %
-- % How we'll format the category name. Putting it in brackets helps
-- % distinguish it from the body text that may end up on the next line
-- % just below it.
-- \def\temp{#1}%
-- \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
-- %
-- % Figure out line sizes for the paragraph shape. We'll always have at
-- % least two.
-- \tempnum = 2
-- %
-- % The first line needs space for \box0; but if \rightskip is nonzero,
-- % we need only space for the part of \box0 which exceeds it:
-- \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip
-- %
-- % If doing a return type on its own line, we'll have another line.
-- \ifrettypeownline
-- \advance\tempnum by 1
-- \def\maybeshapeline{0in \hsize}%
-- \else
-- \def\maybeshapeline{}%
-- \fi
-- %
-- % The continuations:
-- \dimen2=\hsize \advance\dimen2 by -\defargsindent
-- %
-- % The final paragraph shape:
-- \parshape \tempnum 0in \dimen0 \maybeshapeline \defargsindent \dimen2
-- %
-- % Put the category name at the right margin.
-- \noindent
-- \hbox to 0pt{%
-- \hfil\box0 \kern-\hsize
-- % \hsize has to be shortened this way:
-- \kern\leftskip
-- % Intentionally do not respect \rightskip, since we need the space.
-- }%
-- %
-- % Allow all lines to be underfull without complaint:
-- \tolerance=10000 \hbadness=10000
-- \exdentamount=\defbodyindent
-- {%
-- % defun fonts. We use typewriter by default (used to be bold) because:
-- % . we're printing identifiers, they should be in tt in principle.
-- % . in languages with many accents, such as Czech or French, it's
-- % common to leave accents off identifiers. The result looks ok in
-- % tt, but exceedingly strange in rm.
-- % . we don't want -- and --- to be treated as ligatures.
-- % . this still does not fix the ?` and !` ligatures, but so far no
-- % one has made identifiers using them :).
-- \df \tt
-- \def\temp{#2}% text of the return type
-- \ifx\temp\empty\else
-- \tclose{\temp}% typeset the return type
-- \ifrettypeownline
-- % put return type on its own line; prohibit line break following:
-- \hfil\vadjust{\nobreak}\break
-- \else
-- \space % type on same line, so just followed by a space
-- \fi
-- \fi % no return type
-- #3% output function name
-- }%
-- {\rm\enskip}% hskip 0.5 em of \tenrm
-- %
-- \boldbrax
-- % arguments will be output next, if any.
--}
--
--% Print arguments in slanted roman (not ttsl), inconsistently with using
--% tt for the name. This is because literal text is sometimes needed in
--% the argument list (groff manual), and ttsl and tt are not very
--% distinguishable. Prevent hyphenation at `-' chars.
--%
--\def\defunargs#1{%
-- % use sl by default (not ttsl),
-- % tt for the names.
-- \df \sl \hyphenchar\font=0
-- %
-- % On the other hand, if an argument has two dashes (for instance), we
-- % want a way to get ttsl. We used to recommend @var for that, so
-- % leave the code in, but it's strange for @var to lead to typewriter.
-- % Nowadays we recommend @code, since the difference between a ttsl hyphen
-- % and a tt hyphen is pretty tiny. @code also disables ?` !`.
-- \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
-- #1%
-- \sl\hyphenchar\font=45
--}
--
--% We want ()&[] to print specially on the defun line.
--%
--\def\activeparens{%
-- \catcode`\(=\active \catcode`\)=\active
-- \catcode`\[=\active \catcode`\]=\active
-- \catcode`\&=\active
--}
--
--% Make control sequences which act like normal parenthesis chars.
--\let\lparen = ( \let\rparen = )
--
--% Be sure that we always have a definition for `(', etc. For example,
--% if the fn name has parens in it, \boldbrax will not be in effect yet,
--% so TeX would otherwise complain about undefined control sequence.
--{
-- \activeparens
-- \global\let(=\lparen \global\let)=\rparen
-- \global\let[=\lbrack \global\let]=\rbrack
-- \global\let& = \&
--
-- \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb}
-- \gdef\magicamp{\let&=\amprm}
--}
--
--\newcount\parencount
--
--% If we encounter &foo, then turn on ()-hacking afterwards
--\newif\ifampseen
--\def\amprm#1 {\ampseentrue{\bf\ }}
--
--\def\parenfont{%
-- \ifampseen
-- % At the first level, print parens in roman,
-- % otherwise use the default font.
-- \ifnum \parencount=1 \rm \fi
-- \else
-- % The \sf parens (in \boldbrax) actually are a little bolder than
-- % the contained text. This is especially needed for [ and ] .
-- \sf
-- \fi
--}
--\def\infirstlevel#1{%
-- \ifampseen
-- \ifnum\parencount=1
-- #1%
-- \fi
-- \fi
--}
--\def\bfafterword#1 {#1 \bf}
--
--\def\opnr{%
-- \global\advance\parencount by 1
-- {\parenfont(}%
-- \infirstlevel \bfafterword
--}
--\def\clnr{%
-- {\parenfont)}%
-- \infirstlevel \sl
-- \global\advance\parencount by -1
--}
--
--\newcount\brackcount
--\def\lbrb{%
-- \global\advance\brackcount by 1
-- {\bf[}%
--}
--\def\rbrb{%
-- {\bf]}%
-- \global\advance\brackcount by -1
--}
--
--\def\checkparencounts{%
-- \ifnum\parencount=0 \else \badparencount \fi
-- \ifnum\brackcount=0 \else \badbrackcount \fi
--}
--% these should not use \errmessage; the glibc manual, at least, actually
--% has such constructs (when documenting function pointers).
--\def\badparencount{%
-- \message{Warning: unbalanced parentheses in @def...}%
-- \global\parencount=0
--}
--\def\badbrackcount{%
-- \message{Warning: unbalanced square brackets in @def...}%
-- \global\brackcount=0
--}
--
--
--\message{macros,}
--% @macro.
--
--% To do this right we need a feature of e-TeX, \scantokens,
--% which we arrange to emulate with a temporary file in ordinary TeX.
--\ifx\eTeXversion\thisisundefined
-- \newwrite\macscribble
-- \def\scantokens#1{%
-- \toks0={#1}%
-- \immediate\openout\macscribble=\jobname.tmp
-- \immediate\write\macscribble{\the\toks0}%
-- \immediate\closeout\macscribble
-- \input \jobname.tmp
-- }
--\fi
--
--\def\scanmacro#1{\begingroup
-- \newlinechar`\^^M
-- \let\xeatspaces\eatspaces
-- %
-- % Undo catcode changes of \startcontents and \doprintindex
-- % When called from @insertcopying or (short)caption, we need active
-- % backslash to get it printed correctly. Previously, we had
-- % \catcode`\\=\other instead. We'll see whether a problem appears
-- % with macro expansion. --kasal, 19aug04
-- \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
-- %
-- % ... and for \example:
-- \spaceisspace
-- %
-- % The \empty here causes a following catcode 5 newline to be eaten as
-- % part of reading whitespace after a control sequence. It does not
-- % eat a catcode 13 newline. There's no good way to handle the two
-- % cases (untried: maybe e-TeX's \everyeof could help, though plain TeX
-- % would then have different behavior). See the Macro Details node in
-- % the manual for the workaround we recommend for macros and
-- % line-oriented commands.
-- %
-- \scantokens{#1\empty}%
--\endgroup}
--
--\def\scanexp#1{%
-- \edef\temp{\noexpand\scanmacro{#1}}%
-- \temp
--}
--
--\newcount\paramno % Count of parameters
--\newtoks\macname % Macro name
--\newif\ifrecursive % Is it recursive?
--
--% List of all defined macros in the form
--% \definedummyword\macro1\definedummyword\macro2...
--% Currently is also contains all @aliases; the list can be split
--% if there is a need.
--\def\macrolist{}
--
--% Add the macro to \macrolist
--\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
--\def\addtomacrolistxxx#1{%
-- \toks0 = \expandafter{\macrolist\definedummyword#1}%
-- \xdef\macrolist{\the\toks0}%
--}
--
--% Utility routines.
--% This does \let #1 = #2, with \csnames; that is,
--% \let \csname#1\endcsname = \csname#2\endcsname
--% (except of course we have to play expansion games).
--%
--\def\cslet#1#2{%
-- \expandafter\let
-- \csname#1\expandafter\endcsname
-- \csname#2\endcsname
--}
--
--% Trim leading and trailing spaces off a string.
--% Concepts from aro-bend problem 15 (see CTAN).
--{\catcode`\@=11
--\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }}
--\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@}
--\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @}
--\def\unbrace#1{#1}
--\unbrace{\gdef\trim@@@ #1 } #2@{#1}
--}
--
--% Trim a single trailing ^^M off a string.
--{\catcode`\^^M=\other \catcode`\Q=3%
--\gdef\eatcr #1{\eatcra #1Q^^MQ}%
--\gdef\eatcra#1^^MQ{\eatcrb#1Q}%
--\gdef\eatcrb#1Q#2Q{#1}%
--}
--
--% Macro bodies are absorbed as an argument in a context where
--% all characters are catcode 10, 11 or 12, except \ which is active
--% (as in normal texinfo). It is necessary to change the definition of \
--% to recognize macro arguments; this is the job of \mbodybackslash.
--%
--% Non-ASCII encodings make 8-bit characters active, so un-activate
--% them to avoid their expansion. Must do this non-globally, to
--% confine the change to the current group.
--%
--% It's necessary to have hard CRs when the macro is executed. This is
--% done by making ^^M (\endlinechar) catcode 12 when reading the macro
--% body, and then making it the \newlinechar in \scanmacro.
--%
--\def\scanctxt{% used as subroutine
-- \catcode`\"=\other
-- \catcode`\+=\other
-- \catcode`\<=\other
-- \catcode`\>=\other
-- \catcode`\@=\other
-- \catcode`\^=\other
-- \catcode`\_=\other
-- \catcode`\|=\other
-- \catcode`\~=\other
-- \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
--}
--
--\def\scanargctxt{% used for copying and captions, not macros.
-- \scanctxt
-- \catcode`\\=\other
-- \catcode`\^^M=\other
--}
--
--\def\macrobodyctxt{% used for @macro definitions
-- \scanctxt
-- \catcode`\{=\other
-- \catcode`\}=\other
-- \catcode`\^^M=\other
-- \usembodybackslash
--}
--
--\def\macroargctxt{% used when scanning invocations
-- \scanctxt
-- \catcode`\\=0
--}
--% why catcode 0 for \ in the above? To recognize \\ \{ \} as "escapes"
--% for the single characters \ { }. Thus, we end up with the "commands"
--% that would be written @\ @{ @} in a Texinfo document.
--%
--% We already have @{ and @}. For @\, we define it here, and only for
--% this purpose, to produce a typewriter backslash (so, the @\ that we
--% define for @math can't be used with @macro calls):
--%
--\def\\{\normalbackslash}%
--%
--% We would like to do this for \, too, since that is what makeinfo does.
--% But it is not possible, because Texinfo already has a command @, for a
--% cedilla accent. Documents must use @comma{} instead.
--%
--% \anythingelse will almost certainly be an error of some kind.
--
--
--% \mbodybackslash is the definition of \ in @macro bodies.
--% It maps \foo\ => \csname macarg.foo\endcsname => #N
--% where N is the macro parameter number.
--% We define \csname macarg.\endcsname to be \realbackslash, so
--% \\ in macro replacement text gets you a backslash.
--%
--{\catcode`@=0 @catcode`@\=@active
-- @gdef at usembodybackslash{@let\=@mbodybackslash}
-- @gdef at mbodybackslash#1\{@csname macarg.#1 at endcsname}
--}
--\expandafter\def\csname macarg.\endcsname{\realbackslash}
--
--\def\margbackslash#1{\char`\#1 }
--
--\def\macro{\recursivefalse\parsearg\macroxxx}
--\def\rmacro{\recursivetrue\parsearg\macroxxx}
--
--\def\macroxxx#1{%
-- \getargs{#1}% now \macname is the macname and \argl the arglist
-- \ifx\argl\empty % no arguments
-- \paramno=0\relax
-- \else
-- \expandafter\parsemargdef \argl;%
-- \if\paramno>256\relax
-- \ifx\eTeXversion\thisisundefined
-- \errhelp = \EMsimple
-- \errmessage{You need eTeX to compile a file with macros with more than 256 arguments}
-- \fi
-- \fi
-- \fi
-- \if1\csname ismacro.\the\macname\endcsname
-- \message{Warning: redefining \the\macname}%
-- \else
-- \expandafter\ifx\csname \the\macname\endcsname \relax
-- \else \errmessage{Macro name \the\macname\space already defined}\fi
-- \global\cslet{macsave.\the\macname}{\the\macname}%
-- \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
-- \addtomacrolist{\the\macname}%
-- \fi
-- \begingroup \macrobodyctxt
-- \ifrecursive \expandafter\parsermacbody
-- \else \expandafter\parsemacbody
-- \fi}
--
--\parseargdef\unmacro{%
-- \if1\csname ismacro.#1\endcsname
-- \global\cslet{#1}{macsave.#1}%
-- \global\expandafter\let \csname ismacro.#1\endcsname=0%
-- % Remove the macro name from \macrolist:
-- \begingroup
-- \expandafter\let\csname#1\endcsname \relax
-- \let\definedummyword\unmacrodo
-- \xdef\macrolist{\macrolist}%
-- \endgroup
-- \else
-- \errmessage{Macro #1 not defined}%
-- \fi
--}
--
--% Called by \do from \dounmacro on each macro. The idea is to omit any
--% macro definitions that have been changed to \relax.
--%
--\def\unmacrodo#1{%
-- \ifx #1\relax
-- % remove this
-- \else
-- \noexpand\definedummyword \noexpand#1%
-- \fi
--}
--
--% This makes use of the obscure feature that if the last token of a
--% <parameter list> is #, then the preceding argument is delimited by
--% an opening brace, and that opening brace is not consumed.
--\def\getargs#1{\getargsxxx#1{}}
--\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
--\def\getmacname#1 #2\relax{\macname={#1}}
--\def\getmacargs#1{\def\argl{#1}}
--
--% For macro processing make @ a letter so that we can make Texinfo private macro names.
--\edef\texiatcatcode{\the\catcode`\@}
--\catcode `@=11\relax
--
--% Parse the optional {params} list. Set up \paramno and \paramlist
--% so \defmacro knows what to do. Define \macarg.BLAH for each BLAH
--% in the params list to some hook where the argument si to be expanded. If
--% there are less than 10 arguments that hook is to be replaced by ##N where N
--% is the position in that list, that is to say the macro arguments are to be
--% defined `a la TeX in the macro body.
--%
--% That gets used by \mbodybackslash (above).
--%
--% We need to get `macro parameter char #' into several definitions.
--% The technique used is stolen from LaTeX: let \hash be something
--% unexpandable, insert that wherever you need a #, and then redefine
--% it to # just before using the token list produced.
--%
--% The same technique is used to protect \eatspaces till just before
--% the macro is used.
--%
--% If there are 10 or more arguments, a different technique is used, where the
--% hook remains in the body, and when macro is to be expanded the body is
--% processed again to replace the arguments.
--%
--% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the
--% argument N value and then \edef the body (nothing else will expand because of
--% the catcode regime underwhich the body was input).
--%
--% If you compile with TeX (not eTeX), and you have macros with 10 or more
--% arguments, you need that no macro has more than 256 arguments, otherwise an
--% error is produced.
--\def\parsemargdef#1;{%
-- \paramno=0\def\paramlist{}%
-- \let\hash\relax
-- \let\xeatspaces\relax
-- \parsemargdefxxx#1,;,%
-- % In case that there are 10 or more arguments we parse again the arguments
-- % list to set new definitions for the \macarg.BLAH macros corresponding to
-- % each BLAH argument. It was anyhow needed to parse already once this list
-- % in order to count the arguments, and as macros with at most 9 arguments
-- % are by far more frequent than macro with 10 or more arguments, defining
-- % twice the \macarg.BLAH macros does not cost too much processing power.
-- \ifnum\paramno<10\relax\else
-- \paramno0\relax
-- \parsemmanyargdef@@#1,;,% 10 or more arguments
-- \fi
--}
--\def\parsemargdefxxx#1,{%
-- \if#1;\let\next=\relax
-- \else \let\next=\parsemargdefxxx
-- \advance\paramno by 1
-- \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
-- {\xeatspaces{\hash\the\paramno}}%
-- \edef\paramlist{\paramlist\hash\the\paramno,}%
-- \fi\next}
--
--\def\parsemmanyargdef@@#1,{%
-- \if#1;\let\next=\relax
-- \else
-- \let\next=\parsemmanyargdef@@
-- \edef\tempb{\eatspaces{#1}}%
-- \expandafter\def\expandafter\tempa
-- \expandafter{\csname macarg.\tempb\endcsname}%
-- % Note that we need some extra \noexpand\noexpand, this is because we
-- % don't want \the to be expanded in the \parsermacbody as it uses an
-- % \xdef .
-- \expandafter\edef\tempa
-- {\noexpand\noexpand\noexpand\the\toks\the\paramno}%
-- \advance\paramno by 1\relax
-- \fi\next}
--
--% These two commands read recursive and nonrecursive macro bodies.
--% (They're different since rec and nonrec macros end differently.)
--%
--
--\catcode `\@\texiatcatcode
--\long\def\parsemacbody#1 at end macro%
--{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
--\long\def\parsermacbody#1 at end rmacro%
--{\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
--\catcode `\@=11\relax
--
--\let\endargs@\relax
--\let\nil@\relax
--\def\nilm@{\nil@}%
--\long\def\nillm@{\nil@}%
--
--% This macro is expanded during the Texinfo macro expansion, not during its
--% definition. It gets all the arguments values and assigns them to macros
--% macarg.ARGNAME
--%
--% #1 is the macro name
--% #2 is the list of argument names
--% #3 is the list of argument values
--\def\getargvals@#1#2#3{%
-- \def\macargdeflist@{}%
-- \def\saveparamlist@{#2}% Need to keep a copy for parameter expansion.
-- \def\paramlist{#2,\nil@}%
-- \def\macroname{#1}%
-- \begingroup
-- \macroargctxt
-- \def\argvaluelist{#3,\nil@}%
-- \def\@tempa{#3}%
-- \ifx\@tempa\empty
-- \setemptyargvalues@
-- \else
-- \getargvals@@
-- \fi
--}
--
--%
--\def\getargvals@@{%
-- \ifx\paramlist\nilm@
-- % Some sanity check needed here that \argvaluelist is also empty.
-- \ifx\argvaluelist\nillm@
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Too many arguments in macro `\macroname'!}%
-- \fi
-- \let\next\macargexpandinbody@
-- \else
-- \ifx\argvaluelist\nillm@
-- % No more arguments values passed to macro. Set remaining named-arg
-- % macros to empty.
-- \let\next\setemptyargvalues@
-- \else
-- % pop current arg name into \@tempb
-- \def\@tempa##1{\pop@{\@tempb}{\paramlist}##1\endargs@}%
-- \expandafter\@tempa\expandafter{\paramlist}%
-- % pop current argument value into \@tempc
-- \def\@tempa##1{\longpop@{\@tempc}{\argvaluelist}##1\endargs@}%
-- \expandafter\@tempa\expandafter{\argvaluelist}%
-- % Here \@tempb is the current arg name and \@tempc is the current arg value.
-- % First place the new argument macro definition into \@tempd
-- \expandafter\macname\expandafter{\@tempc}%
-- \expandafter\let\csname macarg.\@tempb\endcsname\relax
-- \expandafter\def\expandafter\@tempe\expandafter{%
-- \csname macarg.\@tempb\endcsname}%
-- \edef\@tempd{\long\def\@tempe{\the\macname}}%
-- \push@\@tempd\macargdeflist@
-- \let\next\getargvals@@
-- \fi
-- \fi
-- \next
--}
--
--\def\push@#1#2{%
-- \expandafter\expandafter\expandafter\def
-- \expandafter\expandafter\expandafter#2%
-- \expandafter\expandafter\expandafter{%
-- \expandafter#1#2}%
--}
--
--% Replace arguments by their values in the macro body, and place the result
--% in macro \@tempa
--\def\macvalstoargs@{%
-- % To do this we use the property that token registers that are \the'ed
-- % within an \edef expand only once. So we are going to place all argument
-- % values into respective token registers.
-- %
-- % First we save the token context, and initialize argument numbering.
-- \begingroup
-- \paramno0\relax
-- % Then, for each argument number #N, we place the corresponding argument
-- % value into a new token list register \toks#N
-- \expandafter\putargsintokens@\saveparamlist@,;,%
-- % Then, we expand the body so that argument are replaced by their
-- % values. The trick for values not to be expanded themselves is that they
-- % are within tokens and that tokens expand only once in an \edef .
-- \edef\@tempc{\csname mac.\macroname .body\endcsname}%
-- % Now we restore the token stack pointer to free the token list registers
-- % which we have used, but we make sure that expanded body is saved after
-- % group.
-- \expandafter
-- \endgroup
-- \expandafter\def\expandafter\@tempa\expandafter{\@tempc}%
-- }
--
--\def\macargexpandinbody@{%
-- %% Define the named-macro outside of this group and then close this group.
-- \expandafter
-- \endgroup
-- \macargdeflist@
-- % First the replace in body the macro arguments by their values, the result
-- % is in \@tempa .
-- \macvalstoargs@
-- % Then we point at the \norecurse or \gobble (for recursive) macro value
-- % with \@tempb .
-- \expandafter\let\expandafter\@tempb\csname mac.\macroname .recurse\endcsname
-- % Depending on whether it is recursive or not, we need some tailing
-- % \egroup .
-- \ifx\@tempb\gobble
-- \let\@tempc\relax
-- \else
-- \let\@tempc\egroup
-- \fi
-- % And now we do the real job:
-- \edef\@tempd{\noexpand\@tempb{\macroname}\noexpand\scanmacro{\@tempa}\@tempc}%
-- \@tempd
--}
--
--\def\putargsintokens@#1,{%
-- \if#1;\let\next\relax
-- \else
-- \let\next\putargsintokens@
-- % First we allocate the new token list register, and give it a temporary
-- % alias \@tempb .
-- \toksdef\@tempb\the\paramno
-- % Then we place the argument value into that token list register.
-- \expandafter\let\expandafter\@tempa\csname macarg.#1\endcsname
-- \expandafter\@tempb\expandafter{\@tempa}%
-- \advance\paramno by 1\relax
-- \fi
-- \next
--}
--
--% Save the token stack pointer into macro #1
--\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}}
--% Restore the token stack pointer from number in macro #1
--\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax}
--% newtoks that can be used non \outer .
--\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi}
--
--% Tailing missing arguments are set to empty
--\def\setemptyargvalues@{%
-- \ifx\paramlist\nilm@
-- \let\next\macargexpandinbody@
-- \else
-- \expandafter\setemptyargvaluesparser@\paramlist\endargs@
-- \let\next\setemptyargvalues@
-- \fi
-- \next
--}
--
--\def\setemptyargvaluesparser@#1,#2\endargs@{%
-- \expandafter\def\expandafter\@tempa\expandafter{%
-- \expandafter\def\csname macarg.#1\endcsname{}}%
-- \push@\@tempa\macargdeflist@
-- \def\paramlist{#2}%
--}
--
--% #1 is the element target macro
--% #2 is the list macro
--% #3,#4\endargs@ is the list value
--\def\pop@#1#2#3,#4\endargs@{%
-- \def#1{#3}%
-- \def#2{#4}%
--}
--\long\def\longpop@#1#2#3,#4\endargs@{%
-- \long\def#1{#3}%
-- \long\def#2{#4}%
--}
--
--% This defines a Texinfo @macro. There are eight cases: recursive and
--% nonrecursive macros of zero, one, up to nine, and many arguments.
--% Much magic with \expandafter here.
--% \xdef is used so that macro definitions will survive the file
--% they're defined in; @include reads the file inside a group.
--%
--\def\defmacro{%
-- \let\hash=##% convert placeholders to macro parameter chars
-- \ifrecursive
-- \ifcase\paramno
-- % 0
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \noexpand\scanmacro{\temp}}%
-- \or % 1
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \noexpand\braceorline
-- \expandafter\noexpand\csname\the\macname xxx\endcsname}%
-- \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
-- \egroup\noexpand\scanmacro{\temp}}%
-- \else
-- \ifnum\paramno<10\relax % at most 9
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \noexpand\csname\the\macname xx\endcsname}%
-- \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-- \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-- \expandafter\expandafter
-- \expandafter\xdef
-- \expandafter\expandafter
-- \csname\the\macname xxx\endcsname
-- \paramlist{\egroup\noexpand\scanmacro{\temp}}%
-- \else % 10 or more
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \noexpand\getargvals@{\the\macname}{\argl}%
-- }%
-- \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
-- \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
-- \fi
-- \fi
-- \else
-- \ifcase\paramno
-- % 0
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \noexpand\norecurse{\the\macname}%
-- \noexpand\scanmacro{\temp}\egroup}%
-- \or % 1
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \noexpand\braceorline
-- \expandafter\noexpand\csname\the\macname xxx\endcsname}%
-- \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
-- \egroup
-- \noexpand\norecurse{\the\macname}%
-- \noexpand\scanmacro{\temp}\egroup}%
-- \else % at most 9
-- \ifnum\paramno<10\relax
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \bgroup\noexpand\macroargctxt
-- \expandafter\noexpand\csname\the\macname xx\endcsname}%
-- \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-- \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-- \expandafter\expandafter
-- \expandafter\xdef
-- \expandafter\expandafter
-- \csname\the\macname xxx\endcsname
-- \paramlist{%
-- \egroup
-- \noexpand\norecurse{\the\macname}%
-- \noexpand\scanmacro{\temp}\egroup}%
-- \else % 10 or more:
-- \expandafter\xdef\csname\the\macname\endcsname{%
-- \noexpand\getargvals@{\the\macname}{\argl}%
-- }%
-- \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
-- \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse
-- \fi
-- \fi
-- \fi}
--
--\catcode `\@\texiatcatcode\relax
--
--\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
--
--% \braceorline decides whether the next nonwhitespace character is a
--% {. If so it reads up to the closing }, if not, it reads the whole
--% line. Whatever was read is then fed to the next control sequence
--% as an argument (by \parsebrace or \parsearg).
--%
--\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
--\def\braceorlinexxx{%
-- \ifx\nchar\bgroup\else
-- \expandafter\parsearg
-- \fi \macnamexxx}
--
--
--% @alias.
--% We need some trickery to remove the optional spaces around the equal
--% sign. Make them active and then expand them all to nothing.
--%
--\def\alias{\parseargusing\obeyspaces\aliasxxx}
--\def\aliasxxx #1{\aliasyyy#1\relax}
--\def\aliasyyy #1=#2\relax{%
-- {%
-- \expandafter\let\obeyedspace=\empty
-- \addtomacrolist{#1}%
-- \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
-- }%
-- \next
--}
--
--
--\message{cross references,}
--
--\newwrite\auxfile
--\newif\ifhavexrefs % True if xref values are known.
--\newif\ifwarnedxrefs % True if we warned once that they aren't known.
--
--% @inforef is relatively simple.
--\def\inforef #1{\inforefzzz #1,,,,**}
--\def\inforefzzz #1,#2,#3,#4**{%
-- \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
-- node \samp{\ignorespaces#1{}}}
--
--% @node's only job in TeX is to define \lastnode, which is used in
--% cross-references. The @node line might or might not have commas, and
--% might or might not have spaces before the first comma, like:
--% @node foo , bar , ...
--% We don't want such trailing spaces in the node name.
--%
--\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse}
--%
--% also remove a trailing comma, in case of something like this:
--% @node Help-Cross, , , Cross-refs
--\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse}
--\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}}
--
--\let\nwnode=\node
--\let\lastnode=\empty
--
--% Write a cross-reference definition for the current node. #1 is the
--% type (Ynumbered, Yappendix, Ynothing).
--%
--\def\donoderef#1{%
-- \ifx\lastnode\empty\else
-- \setref{\lastnode}{#1}%
-- \global\let\lastnode=\empty
-- \fi
--}
--
--% @anchor{NAME} -- define xref target at arbitrary point.
--%
--\newcount\savesfregister
--%
--\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi}
--\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi}
--\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces}
--
--% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
--% anchor), which consists of three parts:
--% 1) NAME-title - the current sectioning name taken from \lastsection,
--% or the anchor name.
--% 2) NAME-snt - section number and type, passed as the SNT arg, or
--% empty for anchors.
--% 3) NAME-pg - the page number.
--%
--% This is called from \donoderef, \anchor, and \dofloat. In the case of
--% floats, there is an additional part, which is not written here:
--% 4) NAME-lof - the text as it should appear in a @listoffloats.
--%
--\def\setref#1#2{%
-- \pdfmkdest{#1}%
-- \iflinks
-- {%
-- \atdummies % preserve commands, but don't expand them
-- \edef\writexrdef##1##2{%
-- \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
-- ##1}{##2}}% these are parameters of \writexrdef
-- }%
-- \toks0 = \expandafter{\lastsection}%
-- \immediate \writexrdef{title}{\the\toks0 }%
-- \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-- \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout
-- }%
-- \fi
--}
--
--% @xrefautosectiontitle on|off says whether @section(ing) names are used
--% automatically in xrefs, if the third arg is not explicitly specified.
--% This was provided as a "secret" @set xref-automatic-section-title
--% variable, now it's official.
--%
--\parseargdef\xrefautomaticsectiontitle{%
-- \def\temp{#1}%
-- \ifx\temp\onword
-- \expandafter\let\csname SETxref-automatic-section-title\endcsname
-- = \empty
-- \else\ifx\temp\offword
-- \expandafter\let\csname SETxref-automatic-section-title\endcsname
-- = \relax
-- \else
-- \errhelp = \EMsimple
-- \errmessage{Unknown @xrefautomaticsectiontitle value `\temp',
-- must be on|off}%
-- \fi\fi
--}
--
--%
--% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is
--% the node name, #2 the name of the Info cross-reference, #3 the printed
--% node name, #4 the name of the Info file, #5 the name of the printed
--% manual. All but the node name can be omitted.
--%
--\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
--\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
--\def\ref#1{\xrefX[#1,,,,,,,]}
--%
--\newbox\toprefbox
--\newbox\printedrefnamebox
--\newbox\infofilenamebox
--\newbox\printedmanualbox
--%
--\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
-- \unsepspaces
-- %
-- % Get args without leading/trailing spaces.
-- \def\printedrefname{\ignorespaces #3}%
-- \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
-- %
-- \def\infofilename{\ignorespaces #4}%
-- \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
-- %
-- \def\printedmanual{\ignorespaces #5}%
-- \setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
-- %
-- % If the printed reference name (arg #3) was not explicitly given in
-- % the @xref, figure out what we want to use.
-- \ifdim \wd\printedrefnamebox = 0pt
-- % No printed node name was explicitly given.
-- \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
-- % Not auto section-title: use node name inside the square brackets.
-- \def\printedrefname{\ignorespaces #1}%
-- \else
-- % Auto section-title: use chapter/section title inside
-- % the square brackets if we have it.
-- \ifdim \wd\printedmanualbox > 0pt
-- % It is in another manual, so we don't have it; use node name.
-- \def\printedrefname{\ignorespaces #1}%
-- \else
-- \ifhavexrefs
-- % We (should) know the real title if we have the xref values.
-- \def\printedrefname{\refx{#1-title}{}}%
-- \else
-- % Otherwise just copy the Info node name.
-- \def\printedrefname{\ignorespaces #1}%
-- \fi%
-- \fi
-- \fi
-- \fi
-- %
-- % Make link in pdf output.
-- \ifpdf
-- {\indexnofonts
-- \turnoffactive
-- \makevalueexpandable
-- % This expands tokens, so do it after making catcode changes, so _
-- % etc. don't get their TeX definitions. This ignores all spaces in
-- % #4, including (wrongly) those in the middle of the filename.
-- \getfilename{#4}%
-- %
-- % This (wrongly) does not take account of leading or trailing
-- % spaces in #1, which should be ignored.
-- \edef\pdfxrefdest{#1}%
-- \ifx\pdfxrefdest\empty
-- \def\pdfxrefdest{Top}% no empty targets
-- \else
-- \txiescapepdf\pdfxrefdest % escape PDF special chars
-- \fi
-- %
-- \leavevmode
-- \startlink attr{/Border [0 0 0]}%
-- \ifnum\filenamelength>0
-- goto file{\the\filename.pdf} name{\pdfxrefdest}%
-- \else
-- goto name{\pdfmkpgn{\pdfxrefdest}}%
-- \fi
-- }%
-- \setcolor{\linkcolor}%
-- \fi
-- %
-- % Float references are printed completely differently: "Figure 1.2"
-- % instead of "[somenode], p.3". We distinguish them by the
-- % LABEL-title being set to a magic string.
-- {%
-- % Have to otherify everything special to allow the \csname to
-- % include an _ in the xref name, etc.
-- \indexnofonts
-- \turnoffactive
-- \expandafter\global\expandafter\let\expandafter\Xthisreftitle
-- \csname XR#1-title\endcsname
-- }%
-- \iffloat\Xthisreftitle
-- % If the user specified the print name (third arg) to the ref,
-- % print it instead of our usual "Figure 1.2".
-- \ifdim\wd\printedrefnamebox = 0pt
-- \refx{#1-snt}{}%
-- \else
-- \printedrefname
-- \fi
-- %
-- % If the user also gave the printed manual name (fifth arg), append
-- % "in MANUALNAME".
-- \ifdim \wd\printedmanualbox > 0pt
-- \space \putwordin{} \cite{\printedmanual}%
-- \fi
-- \else
-- % node/anchor (non-float) references.
-- %
-- % If we use \unhbox to print the node names, TeX does not insert
-- % empty discretionaries after hyphens, which means that it will not
-- % find a line break at a hyphen in a node names. Since some manuals
-- % are best written with fairly long node names, containing hyphens,
-- % this is a loss. Therefore, we give the text of the node name
-- % again, so it is as if TeX is seeing it for the first time.
-- %
-- \ifdim \wd\printedmanualbox > 0pt
-- % Cross-manual reference with a printed manual name.
-- %
-- \crossmanualxref{\cite{\printedmanual\unskip}}%
-- %
-- \else\ifdim \wd\infofilenamebox > 0pt
-- % Cross-manual reference with only an info filename (arg 4), no
-- % printed manual name (arg 5). This is essentially the same as
-- % the case above; we output the filename, since we have nothing else.
-- %
-- \crossmanualxref{\code{\infofilename\unskip}}%
-- %
-- \else
-- % Reference within this manual.
-- %
-- % _ (for example) has to be the character _ for the purposes of the
-- % control sequence corresponding to the node, but it has to expand
-- % into the usual \leavevmode...\vrule stuff for purposes of
-- % printing. So we \turnoffactive for the \refx-snt, back on for the
-- % printing, back off for the \refx-pg.
-- {\turnoffactive
-- % Only output a following space if the -snt ref is nonempty; for
-- % @unnumbered and @anchor, it won't be.
-- \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
-- \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
-- }%
-- % output the `[mynode]' via the macro below so it can be overridden.
-- \xrefprintnodename\printedrefname
-- %
-- % But we always want a comma and a space:
-- ,\space
-- %
-- % output the `page 3'.
-- \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-- \fi\fi
-- \fi
-- \endlink
--\endgroup}
--
--% Output a cross-manual xref to #1. Used just above (twice).
--%
--% Only include the text "Section ``foo'' in" if the foo is neither
--% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply
--% "see The Foo Manual", the idea being to refer to the whole manual.
--%
--% But, this being TeX, we can't easily compare our node name against the
--% string "Top" while ignoring the possible spaces before and after in
--% the input. By adding the arbitrary 7sp below, we make it much less
--% likely that a real node name would have the same width as "Top" (e.g.,
--% in a monospaced font). Hopefully it will never happen in practice.
--%
--% For the same basic reason, we retypeset the "Top" at every
--% reference, since the current font is indeterminate.
--%
--\def\crossmanualxref#1{%
-- \setbox\toprefbox = \hbox{Top\kern7sp}%
-- \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
-- \ifdim \wd2 > 7sp % nonempty?
-- \ifdim \wd2 = \wd\toprefbox \else % same as Top?
-- \putwordSection{} ``\printedrefname'' \putwordin{}\space
-- \fi
-- \fi
-- #1%
--}
--
--% This macro is called from \xrefX for the `[nodename]' part of xref
--% output. It's a separate macro only so it can be changed more easily,
--% since square brackets don't work well in some documents. Particularly
--% one that Bob is working on :).
--%
--\def\xrefprintnodename#1{[#1]}
--
--% Things referred to by \setref.
--%
--\def\Ynothing{}
--\def\Yomitfromtoc{}
--\def\Ynumbered{%
-- \ifnum\secno=0
-- \putwordChapter at tie \the\chapno
-- \else \ifnum\subsecno=0
-- \putwordSection at tie \the\chapno.\the\secno
-- \else \ifnum\subsubsecno=0
-- \putwordSection at tie \the\chapno.\the\secno.\the\subsecno
-- \else
-- \putwordSection at tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno
-- \fi\fi\fi
--}
--\def\Yappendix{%
-- \ifnum\secno=0
-- \putwordAppendix at tie @char\the\appendixno{}%
-- \else \ifnum\subsecno=0
-- \putwordSection at tie @char\the\appendixno.\the\secno
-- \else \ifnum\subsubsecno=0
-- \putwordSection at tie @char\the\appendixno.\the\secno.\the\subsecno
-- \else
-- \putwordSection at tie
-- @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno
-- \fi\fi\fi
--}
--
--% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME.
--% If its value is nonempty, SUFFIX is output afterward.
--%
--\def\refx#1#2{%
-- {%
-- \indexnofonts
-- \otherbackslash
-- \expandafter\global\expandafter\let\expandafter\thisrefX
-- \csname XR#1\endcsname
-- }%
-- \ifx\thisrefX\relax
-- % If not defined, say something at least.
-- \angleleft un\-de\-fined\angleright
-- \iflinks
-- \ifhavexrefs
-- {\toks0 = {#1}% avoid expansion of possibly-complex value
-- \message{\linenumber Undefined cross reference `\the\toks0'.}}%
-- \else
-- \ifwarnedxrefs\else
-- \global\warnedxrefstrue
-- \message{Cross reference values unknown; you must run TeX again.}%
-- \fi
-- \fi
-- \fi
-- \else
-- % It's defined, so just use it.
-- \thisrefX
-- \fi
-- #2% Output the suffix in any case.
--}
--
--% This is the macro invoked by entries in the aux file. Usually it's
--% just a \def (we prepend XR to the control sequence name to avoid
--% collisions). But if this is a float type, we have more work to do.
--%
--\def\xrdef#1#2{%
-- {% The node name might contain 8-bit characters, which in our current
-- % implementation are changed to commands like @'e. Don't let these
-- % mess up the control sequence name.
-- \indexnofonts
-- \turnoffactive
-- \xdef\safexrefname{#1}%
-- }%
-- %
-- \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
-- %
-- % Was that xref control sequence that we just defined for a float?
-- \expandafter\iffloat\csname XR\safexrefname\endcsname
-- % it was a float, and we have the (safe) float type in \iffloattype.
-- \expandafter\let\expandafter\floatlist
-- \csname floatlist\iffloattype\endcsname
-- %
-- % Is this the first time we've seen this float type?
-- \expandafter\ifx\floatlist\relax
-- \toks0 = {\do}% yes, so just \do
-- \else
-- % had it before, so preserve previous elements in list.
-- \toks0 = \expandafter{\floatlist\do}%
-- \fi
-- %
-- % Remember this xref in the control sequence \floatlistFLOATTYPE,
-- % for later use in \listoffloats.
-- \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
-- {\safexrefname}}%
-- \fi
--}
--
--% Read the last existing aux file, if any. No error if none exists.
--%
--\def\tryauxfile{%
-- \openin 1 \jobname.aux
-- \ifeof 1 \else
-- \readdatafile{aux}%
-- \global\havexrefstrue
-- \fi
-- \closein 1
--}
--
--\def\setupdatafile{%
-- \catcode`\^^@=\other
-- \catcode`\^^A=\other
-- \catcode`\^^B=\other
-- \catcode`\^^C=\other
-- \catcode`\^^D=\other
-- \catcode`\^^E=\other
-- \catcode`\^^F=\other
-- \catcode`\^^G=\other
-- \catcode`\^^H=\other
-- \catcode`\^^K=\other
-- \catcode`\^^L=\other
-- \catcode`\^^N=\other
-- \catcode`\^^P=\other
-- \catcode`\^^Q=\other
-- \catcode`\^^R=\other
-- \catcode`\^^S=\other
-- \catcode`\^^T=\other
-- \catcode`\^^U=\other
-- \catcode`\^^V=\other
-- \catcode`\^^W=\other
-- \catcode`\^^X=\other
-- \catcode`\^^Z=\other
-- \catcode`\^^[=\other
-- \catcode`\^^\=\other
-- \catcode`\^^]=\other
-- \catcode`\^^^=\other
-- \catcode`\^^_=\other
-- % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc.
-- % in xref tags, i.e., node names. But since ^^e4 notation isn't
-- % supported in the main text, it doesn't seem desirable. Furthermore,
-- % that is not enough: for node names that actually contain a ^
-- % character, we would end up writing a line like this: 'xrdef {'hat
-- % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first
-- % argument, and \hat is not an expandable control sequence. It could
-- % all be worked out, but why? Either we support ^^ or we don't.
-- %
-- % The other change necessary for this was to define \auxhat:
-- % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter
-- % and then to call \auxhat in \setq.
-- %
-- \catcode`\^=\other
-- %
-- % Special characters. Should be turned off anyway, but...
-- \catcode`\~=\other
-- \catcode`\[=\other
-- \catcode`\]=\other
-- \catcode`\"=\other
-- \catcode`\_=\other
-- \catcode`\|=\other
-- \catcode`\<=\other
-- \catcode`\>=\other
-- \catcode`\$=\other
-- \catcode`\#=\other
-- \catcode`\&=\other
-- \catcode`\%=\other
-- \catcode`+=\other % avoid \+ for paranoia even though we've turned it off
-- %
-- % This is to support \ in node names and titles, since the \
-- % characters end up in a \csname. It's easier than
-- % leaving it active and making its active definition an actual \
-- % character. What I don't understand is why it works in the *value*
-- % of the xrdef. Seems like it should be a catcode12 \, and that
-- % should not typeset properly. But it works, so I'm moving on for
-- % now. --karl, 15jan04.
-- \catcode`\\=\other
-- %
-- % Make the characters 128-255 be printing characters.
-- {%
-- \count1=128
-- \def\loop{%
-- \catcode\count1=\other
-- \advance\count1 by 1
-- \ifnum \count1<256 \loop \fi
-- }%
-- }%
-- %
-- % @ is our escape character in .aux files, and we need braces.
-- \catcode`\{=1
-- \catcode`\}=2
-- \catcode`\@=0
--}
--
--\def\readdatafile#1{%
--\begingroup
-- \setupdatafile
-- \input\jobname.#1
--\endgroup}
--
--
--\message{insertions,}
--% including footnotes.
--
--\newcount \footnoteno
--
--% The trailing space in the following definition for supereject is
--% vital for proper filling; pages come out unaligned when you do a
--% pagealignmacro call if that space before the closing brace is
--% removed. (Generally, numeric constants should always be followed by a
--% space to prevent strange expansion errors.)
--\def\supereject{\par\penalty -20000\footnoteno =0 }
--
--% @footnotestyle is meaningful for Info output only.
--\let\footnotestyle=\comment
--
--{\catcode `\@=11
--%
--% Auto-number footnotes. Otherwise like plain.
--\gdef\footnote{%
-- \let\indent=\ptexindent
-- \let\noindent=\ptexnoindent
-- \global\advance\footnoteno by \@ne
-- \edef\thisfootno{$^{\the\footnoteno}$}%
-- %
-- % In case the footnote comes at the end of a sentence, preserve the
-- % extra spacing after we do the footnote number.
-- \let\@sf\empty
-- \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi
-- %
-- % Remove inadvertent blank space before typesetting the footnote number.
-- \unskip
-- \thisfootno\@sf
-- \dofootnote
--}%
--
--% Don't bother with the trickery in plain.tex to not require the
--% footnote text as a parameter. Our footnotes don't need to be so general.
--%
--% Oh yes, they do; otherwise, @ifset (and anything else that uses
--% \parseargline) fails inside footnotes because the tokens are fixed when
--% the footnote is read. --karl, 16nov96.
--%
--\gdef\dofootnote{%
-- \insert\footins\bgroup
-- % We want to typeset this text as a normal paragraph, even if the
-- % footnote reference occurs in (for example) a display environment.
-- % So reset some parameters.
-- \hsize=\pagewidth
-- \interlinepenalty\interfootnotelinepenalty
-- \splittopskip\ht\strutbox % top baseline for broken footnotes
-- \splitmaxdepth\dp\strutbox
-- \floatingpenalty\@MM
-- \leftskip\z at skip
-- \rightskip\z at skip
-- \spaceskip\z at skip
-- \xspaceskip\z at skip
-- \parindent\defaultparindent
-- %
-- \smallfonts \rm
-- %
-- % Because we use hanging indentation in footnotes, a @noindent appears
-- % to exdent this text, so make it be a no-op. makeinfo does not use
-- % hanging indentation so @noindent can still be needed within footnote
-- % text after an @example or the like (not that this is good style).
-- \let\noindent = \relax
-- %
-- % Hang the footnote text off the number. Use \everypar in case the
-- % footnote extends for more than one paragraph.
-- \everypar = {\hang}%
-- \textindent{\thisfootno}%
-- %
-- % Don't crash into the line above the footnote text. Since this
-- % expands into a box, it must come within the paragraph, lest it
-- % provide a place where TeX can split the footnote.
-- \footstrut
-- %
-- % Invoke rest of plain TeX footnote routine.
-- \futurelet\next\fo at t
--}
--}%end \catcode `\@=11
--
--% In case a @footnote appears in a vbox, save the footnote text and create
--% the real \insert just after the vbox finished. Otherwise, the insertion
--% would be lost.
--% Similarly, if a @footnote appears inside an alignment, save the footnote
--% text to a box and make the \insert when a row of the table is finished.
--% And the same can be done for other insert classes. --kasal, 16nov03.
--
--% Replace the \insert primitive by a cheating macro.
--% Deeper inside, just make sure that the saved insertions are not spilled
--% out prematurely.
--%
--\def\startsavinginserts{%
-- \ifx \insert\ptexinsert
-- \let\insert\saveinsert
-- \else
-- \let\checkinserts\relax
-- \fi
--}
--
--% This \insert replacement works for both \insert\footins{foo} and
--% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}.
--%
--\def\saveinsert#1{%
-- \edef\next{\noexpand\savetobox \makeSAVEname#1}%
-- \afterassignment\next
-- % swallow the left brace
-- \let\temp =
--}
--\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}}
--\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1}
--
--\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi}
--
--\def\placesaveins#1{%
-- \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname
-- {\box#1}%
--}
--
--% eat @SAVE -- beware, all of them have catcode \other:
--{
-- \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials % ;-)
-- \gdef\gobblesave @SAVE{}
--}
--
--% initialization:
--\def\newsaveins #1{%
-- \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}%
-- \next
--}
--\def\newsaveinsX #1{%
-- \csname newbox\endcsname #1%
-- \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts
-- \checksaveins #1}%
--}
--
--% initialize:
--\let\checkinserts\empty
--\newsaveins\footins
--\newsaveins\margin
--
--
--% @image. We use the macros from epsf.tex to support this.
--% If epsf.tex is not installed and @image is used, we complain.
--%
--% Check for and read epsf.tex up front. If we read it only at @image
--% time, we might be inside a group, and then its definitions would get
--% undone and the next image would fail.
--\openin 1 = epsf.tex
--\ifeof 1 \else
-- % Do not bother showing banner with epsf.tex v2.7k (available in
-- % doc/epsf.tex and on ctan).
-- \def\epsfannounce{\toks0 = }%
-- \input epsf.tex
--\fi
--\closein 1
--%
--% We will only complain once about lack of epsf.tex.
--\newif\ifwarnednoepsf
--\newhelp\noepsfhelp{epsf.tex must be installed for images to
-- work. It is also included in the Texinfo distribution, or you can get
-- it from ftp://tug.org/tex/epsf.tex.}
--%
--\def\image#1{%
-- \ifx\epsfbox\thisisundefined
-- \ifwarnednoepsf \else
-- \errhelp = \noepsfhelp
-- \errmessage{epsf.tex not found, images will be ignored}%
-- \global\warnednoepsftrue
-- \fi
-- \else
-- \imagexxx #1,,,,,\finish
-- \fi
--}
--%
--% Arguments to @image:
--% #1 is (mandatory) image filename; we tack on .eps extension.
--% #2 is (optional) width, #3 is (optional) height.
--% #4 is (ignored optional) html alt text.
--% #5 is (ignored optional) extension.
--% #6 is just the usual extra ignored arg for parsing stuff.
--\newif\ifimagevmode
--\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
-- \catcode`\^^M = 5 % in case we're inside an example
-- \normalturnoffactive % allow _ et al. in names
-- % If the image is by itself, center it.
-- \ifvmode
-- \imagevmodetrue
-- \else \ifx\centersub\centerV
-- % for @center @image, we need a vbox so we can have our vertical space
-- \imagevmodetrue
-- \vbox\bgroup % vbox has better behavior than vtop herev
-- \fi\fi
-- %
-- \ifimagevmode
-- \nobreak\medskip
-- % Usually we'll have text after the image which will insert
-- % \parskip glue, so insert it here too to equalize the space
-- % above and below.
-- \nobreak\vskip\parskip
-- \nobreak
-- \fi
-- %
-- % Leave vertical mode so that indentation from an enclosing
-- % environment such as @quotation is respected.
-- % However, if we're at the top level, we don't want the
-- % normal paragraph indentation.
-- % On the other hand, if we are in the case of @center @image, we don't
-- % want to start a paragraph, which will create a hsize-width box and
-- % eradicate the centering.
-- \ifx\centersub\centerV\else \noindent \fi
-- %
-- % Output the image.
-- \ifpdf
-- \dopdfimage{#1}{#2}{#3}%
-- \else
-- % \epsfbox itself resets \epsf?size at each figure.
-- \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi
-- \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi
-- \epsfbox{#1.eps}%
-- \fi
-- %
-- \ifimagevmode
-- \medskip % space after a standalone image
-- \fi
-- \ifx\centersub\centerV \egroup \fi
--\endgroup}
--
--
--% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables,
--% etc. We don't actually implement floating yet, we always include the
--% float "here". But it seemed the best name for the future.
--%
--\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish}
--
--% There may be a space before second and/or third parameter; delete it.
--\def\eatcommaspace#1, {#1,}
--
--% #1 is the optional FLOATTYPE, the text label for this float, typically
--% "Figure", "Table", "Example", etc. Can't contain commas. If omitted,
--% this float will not be numbered and cannot be referred to.
--%
--% #2 is the optional xref label. Also must be present for the float to
--% be referable.
--%
--% #3 is the optional positioning argument; for now, it is ignored. It
--% will somehow specify the positions allowed to float to (here, top, bottom).
--%
--% We keep a separate counter for each FLOATTYPE, which we reset at each
--% chapter-level command.
--\let\resetallfloatnos=\empty
--%
--\def\dofloat#1,#2,#3,#4\finish{%
-- \let\thiscaption=\empty
-- \let\thisshortcaption=\empty
-- %
-- % don't lose footnotes inside @float.
-- %
-- % BEWARE: when the floats start float, we have to issue warning whenever an
-- % insert appears inside a float which could possibly float. --kasal, 26may04
-- %
-- \startsavinginserts
-- %
-- % We can't be used inside a paragraph.
-- \par
-- %
-- \vtop\bgroup
-- \def\floattype{#1}%
-- \def\floatlabel{#2}%
-- \def\floatloc{#3}% we do nothing with this yet.
-- %
-- \ifx\floattype\empty
-- \let\safefloattype=\empty
-- \else
-- {%
-- % the floattype might have accents or other special characters,
-- % but we need to use it in a control sequence name.
-- \indexnofonts
-- \turnoffactive
-- \xdef\safefloattype{\floattype}%
-- }%
-- \fi
-- %
-- % If label is given but no type, we handle that as the empty type.
-- \ifx\floatlabel\empty \else
-- % We want each FLOATTYPE to be numbered separately (Figure 1,
-- % Table 1, Figure 2, ...). (And if no label, no number.)
-- %
-- \expandafter\getfloatno\csname\safefloattype floatno\endcsname
-- \global\advance\floatno by 1
-- %
-- {%
-- % This magic value for \lastsection is output by \setref as the
-- % XREFLABEL-title value. \xrefX uses it to distinguish float
-- % labels (which have a completely different output format) from
-- % node and anchor labels. And \xrdef uses it to construct the
-- % lists of floats.
-- %
-- \edef\lastsection{\floatmagic=\safefloattype}%
-- \setref{\floatlabel}{Yfloat}%
-- }%
-- \fi
-- %
-- % start with \parskip glue, I guess.
-- \vskip\parskip
-- %
-- % Don't suppress indentation if a float happens to start a section.
-- \restorefirstparagraphindent
--}
--
--% we have these possibilities:
--% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap
--% @float Foo,lbl & no caption: Foo 1.1
--% @float Foo & @caption{Cap}: Foo: Cap
--% @float Foo & no caption: Foo
--% @float ,lbl & Caption{Cap}: 1.1: Cap
--% @float ,lbl & no caption: 1.1
--% @float & @caption{Cap}: Cap
--% @float & no caption:
--%
--\def\Efloat{%
-- \let\floatident = \empty
-- %
-- % In all cases, if we have a float type, it comes first.
-- \ifx\floattype\empty \else \def\floatident{\floattype}\fi
-- %
-- % If we have an xref label, the number comes next.
-- \ifx\floatlabel\empty \else
-- \ifx\floattype\empty \else % if also had float type, need tie first.
-- \appendtomacro\floatident{\tie}%
-- \fi
-- % the number.
-- \appendtomacro\floatident{\chaplevelprefix\the\floatno}%
-- \fi
-- %
-- % Start the printed caption with what we've constructed in
-- % \floatident, but keep it separate; we need \floatident again.
-- \let\captionline = \floatident
-- %
-- \ifx\thiscaption\empty \else
-- \ifx\floatident\empty \else
-- \appendtomacro\captionline{: }% had ident, so need a colon between
-- \fi
-- %
-- % caption text.
-- \appendtomacro\captionline{\scanexp\thiscaption}%
-- \fi
-- %
-- % If we have anything to print, print it, with space before.
-- % Eventually this needs to become an \insert.
-- \ifx\captionline\empty \else
-- \vskip.5\parskip
-- \captionline
-- %
-- % Space below caption.
-- \vskip\parskip
-- \fi
-- %
-- % If have an xref label, write the list of floats info. Do this
-- % after the caption, to avoid chance of it being a breakpoint.
-- \ifx\floatlabel\empty \else
-- % Write the text that goes in the lof to the aux file as
-- % \floatlabel-lof. Besides \floatident, we include the short
-- % caption if specified, else the full caption if specified, else nothing.
-- {%
-- \atdummies
-- %
-- % since we read the caption text in the macro world, where ^^M
-- % is turned into a normal character, we have to scan it back, so
-- % we don't write the literal three characters "^^M" into the aux file.
-- \scanexp{%
-- \xdef\noexpand\gtemp{%
-- \ifx\thisshortcaption\empty
-- \thiscaption
-- \else
-- \thisshortcaption
-- \fi
-- }%
-- }%
-- \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident
-- \ifx\gtemp\empty \else : \gtemp \fi}}%
-- }%
-- \fi
-- \egroup % end of \vtop
-- %
-- % place the captured inserts
-- %
-- % BEWARE: when the floats start floating, we have to issue warning
-- % whenever an insert appears inside a float which could possibly
-- % float. --kasal, 26may04
-- %
-- \checkinserts
--}
--
--% Append the tokens #2 to the definition of macro #1, not expanding either.
--%
--\def\appendtomacro#1#2{%
-- \expandafter\def\expandafter#1\expandafter{#1#2}%
--}
--
--% @caption, @shortcaption
--%
--\def\caption{\docaption\thiscaption}
--\def\shortcaption{\docaption\thisshortcaption}
--\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption}
--\def\defcaption#1#2{\egroup \def#1{#2}}
--
--% The parameter is the control sequence identifying the counter we are
--% going to use. Create it if it doesn't exist and assign it to \floatno.
--\def\getfloatno#1{%
-- \ifx#1\relax
-- % Haven't seen this figure type before.
-- \csname newcount\endcsname #1%
-- %
-- % Remember to reset this floatno at the next chap.
-- \expandafter\gdef\expandafter\resetallfloatnos
-- \expandafter{\resetallfloatnos #1=0 }%
-- \fi
-- \let\floatno#1%
--}
--
--% \setref calls this to get the XREFLABEL-snt value. We want an @xref
--% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we
--% first read the @float command.
--%
--\def\Yfloat{\floattype at tie \chaplevelprefix\the\floatno}%
--
--% Magic string used for the XREFLABEL-title value, so \xrefX can
--% distinguish floats from other xref types.
--\def\floatmagic{!!float!!}
--
--% #1 is the control sequence we are passed; we expand into a conditional
--% which is true if #1 represents a float ref. That is, the magic
--% \lastsection value which we \setref above.
--%
--\def\iffloat#1{\expandafter\doiffloat#1==\finish}
--%
--% #1 is (maybe) the \floatmagic string. If so, #2 will be the
--% (safe) float type for this float. We set \iffloattype to #2.
--%
--\def\doiffloat#1=#2=#3\finish{%
-- \def\temp{#1}%
-- \def\iffloattype{#2}%
-- \ifx\temp\floatmagic
--}
--
--% @listoffloats FLOATTYPE - print a list of floats like a table of contents.
--%
--\parseargdef\listoffloats{%
-- \def\floattype{#1}% floattype
-- {%
-- % the floattype might have accents or other special characters,
-- % but we need to use it in a control sequence name.
-- \indexnofonts
-- \turnoffactive
-- \xdef\safefloattype{\floattype}%
-- }%
-- %
-- % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE.
-- \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax
-- \ifhavexrefs
-- % if the user said @listoffloats foo but never @float foo.
-- \message{\linenumber No `\safefloattype' floats to list.}%
-- \fi
-- \else
-- \begingroup
-- \leftskip=\tocindent % indent these entries like a toc
-- \let\do=\listoffloatsdo
-- \csname floatlist\safefloattype\endcsname
-- \endgroup
-- \fi
--}
--
--% This is called on each entry in a list of floats. We're passed the
--% xref label, in the form LABEL-title, which is how we save it in the
--% aux file. We strip off the -title and look up \XRLABEL-lof, which
--% has the text we're supposed to typeset here.
--%
--% Figures without xref labels will not be included in the list (since
--% they won't appear in the aux file).
--%
--\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish}
--\def\listoffloatsdoentry#1-title\finish{{%
-- % Can't fully expand XR#1-lof because it can contain anything. Just
-- % pass the control sequence. On the other hand, XR#1-pg is just the
-- % page number, and we want to fully expand that so we can get a link
-- % in pdf output.
-- \toksA = \expandafter{\csname XR#1-lof\endcsname}%
-- %
-- % use the same \entry macro we use to generate the TOC and index.
-- \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}%
-- \writeentry
--}}
--
--
--\message{localization,}
--
--% For single-language documents, @documentlanguage is usually given very
--% early, just after @documentencoding. Single argument is the language
--% (de) or locale (de_DE) abbreviation.
--%
--{
-- \catcode`\_ = \active
-- \globaldefs=1
--\parseargdef\documentlanguage{\begingroup
-- \let_=\normalunderscore % normal _ character for filenames
-- \tex % read txi-??.tex file in plain TeX.
-- % Read the file by the name they passed if it exists.
-- \openin 1 txi-#1.tex
-- \ifeof 1
-- \documentlanguagetrywithoutunderscore{#1_\finish}%
-- \else
-- \globaldefs = 1 % everything in the txi-LL files needs to persist
-- \input txi-#1.tex
-- \fi
-- \closein 1
-- \endgroup % end raw TeX
--\endgroup}
--%
--% If they passed de_DE, and txi-de_DE.tex doesn't exist,
--% try txi-de.tex.
--%
--\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{%
-- \openin 1 txi-#1.tex
-- \ifeof 1
-- \errhelp = \nolanghelp
-- \errmessage{Cannot read language file txi-#1.tex}%
-- \else
-- \globaldefs = 1 % everything in the txi-LL files needs to persist
-- \input txi-#1.tex
-- \fi
-- \closein 1
--}
--}% end of special _ catcode
--%
--\newhelp\nolanghelp{The given language definition file cannot be found or
--is empty. Maybe you need to install it? Putting it in the current
--directory should work if nowhere else does.}
--
--% This macro is called from txi-??.tex files; the first argument is the
--% \language name to set (without the "\lang@" prefix), the second and
--% third args are \{left,right}hyphenmin.
--%
--% The language names to pass are determined when the format is built.
--% See the etex.log file created at that time, e.g.,
--% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log.
--%
--% With TeX Live 2008, etex now includes hyphenation patterns for all
--% available languages. This means we can support hyphenation in
--% Texinfo, at least to some extent. (This still doesn't solve the
--% accented characters problem.)
--%
--\catcode`@=11
--\def\txisetlanguage#1#2#3{%
-- % do not set the language if the name is undefined in the current TeX.
-- \expandafter\ifx\csname lang@#1\endcsname \relax
-- \message{no patterns for #1}%
-- \else
-- \global\language = \csname lang@#1\endcsname
-- \fi
-- % but there is no harm in adjusting the hyphenmin values regardless.
-- \global\lefthyphenmin = #2\relax
-- \global\righthyphenmin = #3\relax
--}
--
--% Helpers for encodings.
--% Set the catcode of characters 128 through 255 to the specified number.
--%
--\def\setnonasciicharscatcode#1{%
-- \count255=128
-- \loop\ifnum\count255<256
-- \global\catcode\count255=#1\relax
-- \advance\count255 by 1
-- \repeat
--}
--
--\def\setnonasciicharscatcodenonglobal#1{%
-- \count255=128
-- \loop\ifnum\count255<256
-- \catcode\count255=#1\relax
-- \advance\count255 by 1
-- \repeat
--}
--
--% @documentencoding sets the definition of non-ASCII characters
--% according to the specified encoding.
--%
--\parseargdef\documentencoding{%
-- % Encoding being declared for the document.
-- \def\declaredencoding{\csname #1.enc\endcsname}%
-- %
-- % Supported encodings: names converted to tokens in order to be able
-- % to compare them with \ifx.
-- \def\ascii{\csname US-ASCII.enc\endcsname}%
-- \def\latnine{\csname ISO-8859-15.enc\endcsname}%
-- \def\latone{\csname ISO-8859-1.enc\endcsname}%
-- \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
-- \def\utfeight{\csname UTF-8.enc\endcsname}%
-- %
-- \ifx \declaredencoding \ascii
-- \asciichardefs
-- %
-- \else \ifx \declaredencoding \lattwo
-- \setnonasciicharscatcode\active
-- \lattwochardefs
-- %
-- \else \ifx \declaredencoding \latone
-- \setnonasciicharscatcode\active
-- \latonechardefs
-- %
-- \else \ifx \declaredencoding \latnine
-- \setnonasciicharscatcode\active
-- \latninechardefs
-- %
-- \else \ifx \declaredencoding \utfeight
-- \setnonasciicharscatcode\active
-- \utfeightchardefs
-- %
-- \else
-- \message{Unknown document encoding #1, ignoring.}%
-- %
-- \fi % utfeight
-- \fi % latnine
-- \fi % latone
-- \fi % lattwo
-- \fi % ascii
--}
--
--% A message to be logged when using a character that isn't available
--% the default font encoding (OT1).
--%
--\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
--
--% Take account of \c (plain) vs. \, (Texinfo) difference.
--\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
--
--% First, make active non-ASCII characters in order for them to be
--% correctly categorized when TeX reads the replacement text of
--% macros containing the character definitions.
--\setnonasciicharscatcode\active
--%
--% Latin1 (ISO-8859-1) character definitions.
--\def\latonechardefs{%
-- \gdef^^a0{\tie}
-- \gdef^^a1{\exclamdown}
-- \gdef^^a2{\missingcharmsg{CENT SIGN}}
-- \gdef^^a3{{\pounds}}
-- \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
-- \gdef^^a5{\missingcharmsg{YEN SIGN}}
-- \gdef^^a6{\missingcharmsg{BROKEN BAR}}
-- \gdef^^a7{\S}
-- \gdef^^a8{\"{}}
-- \gdef^^a9{\copyright}
-- \gdef^^aa{\ordf}
-- \gdef^^ab{\guillemetleft}
-- \gdef^^ac{$\lnot$}
-- \gdef^^ad{\-}
-- \gdef^^ae{\registeredsymbol}
-- \gdef^^af{\={}}
-- %
-- \gdef^^b0{\textdegree}
-- \gdef^^b1{$\pm$}
-- \gdef^^b2{$^2$}
-- \gdef^^b3{$^3$}
-- \gdef^^b4{\'{}}
-- \gdef^^b5{$\mu$}
-- \gdef^^b6{\P}
-- %
-- \gdef^^b7{$^.$}
-- \gdef^^b8{\cedilla\ }
-- \gdef^^b9{$^1$}
-- \gdef^^ba{\ordm}
-- %
-- \gdef^^bb{\guillemetright}
-- \gdef^^bc{$1\over4$}
-- \gdef^^bd{$1\over2$}
-- \gdef^^be{$3\over4$}
-- \gdef^^bf{\questiondown}
-- %
-- \gdef^^c0{\`A}
-- \gdef^^c1{\'A}
-- \gdef^^c2{\^A}
-- \gdef^^c3{\~A}
-- \gdef^^c4{\"A}
-- \gdef^^c5{\ringaccent A}
-- \gdef^^c6{\AE}
-- \gdef^^c7{\cedilla C}
-- \gdef^^c8{\`E}
-- \gdef^^c9{\'E}
-- \gdef^^ca{\^E}
-- \gdef^^cb{\"E}
-- \gdef^^cc{\`I}
-- \gdef^^cd{\'I}
-- \gdef^^ce{\^I}
-- \gdef^^cf{\"I}
-- %
-- \gdef^^d0{\DH}
-- \gdef^^d1{\~N}
-- \gdef^^d2{\`O}
-- \gdef^^d3{\'O}
-- \gdef^^d4{\^O}
-- \gdef^^d5{\~O}
-- \gdef^^d6{\"O}
-- \gdef^^d7{$\times$}
-- \gdef^^d8{\O}
-- \gdef^^d9{\`U}
-- \gdef^^da{\'U}
-- \gdef^^db{\^U}
-- \gdef^^dc{\"U}
-- \gdef^^dd{\'Y}
-- \gdef^^de{\TH}
-- \gdef^^df{\ss}
-- %
-- \gdef^^e0{\`a}
-- \gdef^^e1{\'a}
-- \gdef^^e2{\^a}
-- \gdef^^e3{\~a}
-- \gdef^^e4{\"a}
-- \gdef^^e5{\ringaccent a}
-- \gdef^^e6{\ae}
-- \gdef^^e7{\cedilla c}
-- \gdef^^e8{\`e}
-- \gdef^^e9{\'e}
-- \gdef^^ea{\^e}
-- \gdef^^eb{\"e}
-- \gdef^^ec{\`{\dotless i}}
-- \gdef^^ed{\'{\dotless i}}
-- \gdef^^ee{\^{\dotless i}}
-- \gdef^^ef{\"{\dotless i}}
-- %
-- \gdef^^f0{\dh}
-- \gdef^^f1{\~n}
-- \gdef^^f2{\`o}
-- \gdef^^f3{\'o}
-- \gdef^^f4{\^o}
-- \gdef^^f5{\~o}
-- \gdef^^f6{\"o}
-- \gdef^^f7{$\div$}
-- \gdef^^f8{\o}
-- \gdef^^f9{\`u}
-- \gdef^^fa{\'u}
-- \gdef^^fb{\^u}
-- \gdef^^fc{\"u}
-- \gdef^^fd{\'y}
-- \gdef^^fe{\th}
-- \gdef^^ff{\"y}
--}
--
--% Latin9 (ISO-8859-15) encoding character definitions.
--\def\latninechardefs{%
-- % Encoding is almost identical to Latin1.
-- \latonechardefs
-- %
-- \gdef^^a4{\euro}
-- \gdef^^a6{\v S}
-- \gdef^^a8{\v s}
-- \gdef^^b4{\v Z}
-- \gdef^^b8{\v z}
-- \gdef^^bc{\OE}
-- \gdef^^bd{\oe}
-- \gdef^^be{\"Y}
--}
--
--% Latin2 (ISO-8859-2) character definitions.
--\def\lattwochardefs{%
-- \gdef^^a0{\tie}
-- \gdef^^a1{\ogonek{A}}
-- \gdef^^a2{\u{}}
-- \gdef^^a3{\L}
-- \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
-- \gdef^^a5{\v L}
-- \gdef^^a6{\'S}
-- \gdef^^a7{\S}
-- \gdef^^a8{\"{}}
-- \gdef^^a9{\v S}
-- \gdef^^aa{\cedilla S}
-- \gdef^^ab{\v T}
-- \gdef^^ac{\'Z}
-- \gdef^^ad{\-}
-- \gdef^^ae{\v Z}
-- \gdef^^af{\dotaccent Z}
-- %
-- \gdef^^b0{\textdegree}
-- \gdef^^b1{\ogonek{a}}
-- \gdef^^b2{\ogonek{ }}
-- \gdef^^b3{\l}
-- \gdef^^b4{\'{}}
-- \gdef^^b5{\v l}
-- \gdef^^b6{\'s}
-- \gdef^^b7{\v{}}
-- \gdef^^b8{\cedilla\ }
-- \gdef^^b9{\v s}
-- \gdef^^ba{\cedilla s}
-- \gdef^^bb{\v t}
-- \gdef^^bc{\'z}
-- \gdef^^bd{\H{}}
-- \gdef^^be{\v z}
-- \gdef^^bf{\dotaccent z}
-- %
-- \gdef^^c0{\'R}
-- \gdef^^c1{\'A}
-- \gdef^^c2{\^A}
-- \gdef^^c3{\u A}
-- \gdef^^c4{\"A}
-- \gdef^^c5{\'L}
-- \gdef^^c6{\'C}
-- \gdef^^c7{\cedilla C}
-- \gdef^^c8{\v C}
-- \gdef^^c9{\'E}
-- \gdef^^ca{\ogonek{E}}
-- \gdef^^cb{\"E}
-- \gdef^^cc{\v E}
-- \gdef^^cd{\'I}
-- \gdef^^ce{\^I}
-- \gdef^^cf{\v D}
-- %
-- \gdef^^d0{\DH}
-- \gdef^^d1{\'N}
-- \gdef^^d2{\v N}
-- \gdef^^d3{\'O}
-- \gdef^^d4{\^O}
-- \gdef^^d5{\H O}
-- \gdef^^d6{\"O}
-- \gdef^^d7{$\times$}
-- \gdef^^d8{\v R}
-- \gdef^^d9{\ringaccent U}
-- \gdef^^da{\'U}
-- \gdef^^db{\H U}
-- \gdef^^dc{\"U}
-- \gdef^^dd{\'Y}
-- \gdef^^de{\cedilla T}
-- \gdef^^df{\ss}
-- %
-- \gdef^^e0{\'r}
-- \gdef^^e1{\'a}
-- \gdef^^e2{\^a}
-- \gdef^^e3{\u a}
-- \gdef^^e4{\"a}
-- \gdef^^e5{\'l}
-- \gdef^^e6{\'c}
-- \gdef^^e7{\cedilla c}
-- \gdef^^e8{\v c}
-- \gdef^^e9{\'e}
-- \gdef^^ea{\ogonek{e}}
-- \gdef^^eb{\"e}
-- \gdef^^ec{\v e}
-- \gdef^^ed{\'{\dotless{i}}}
-- \gdef^^ee{\^{\dotless{i}}}
-- \gdef^^ef{\v d}
-- %
-- \gdef^^f0{\dh}
-- \gdef^^f1{\'n}
-- \gdef^^f2{\v n}
-- \gdef^^f3{\'o}
-- \gdef^^f4{\^o}
-- \gdef^^f5{\H o}
-- \gdef^^f6{\"o}
-- \gdef^^f7{$\div$}
-- \gdef^^f8{\v r}
-- \gdef^^f9{\ringaccent u}
-- \gdef^^fa{\'u}
-- \gdef^^fb{\H u}
-- \gdef^^fc{\"u}
-- \gdef^^fd{\'y}
-- \gdef^^fe{\cedilla t}
-- \gdef^^ff{\dotaccent{}}
--}
--
--% UTF-8 character definitions.
--%
--% This code to support UTF-8 is based on LaTeX's utf8.def, with some
--% changes for Texinfo conventions. It is included here under the GPL by
--% permission from Frank Mittelbach and the LaTeX team.
--%
--\newcount\countUTFx
--\newcount\countUTFy
--\newcount\countUTFz
--
--\gdef\UTFviiiTwoOctets#1#2{\expandafter
-- \UTFviiiDefined\csname u8:#1\string #2\endcsname}
--%
--\gdef\UTFviiiThreeOctets#1#2#3{\expandafter
-- \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
--%
--\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
-- \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
--
--\gdef\UTFviiiDefined#1{%
-- \ifx #1\relax
-- \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
-- \else
-- \expandafter #1%
-- \fi
--}
--
--\begingroup
-- \catcode`\~13
-- \catcode`\"12
--
-- \def\UTFviiiLoop{%
-- \global\catcode\countUTFx\active
-- \uccode`\~\countUTFx
-- \uppercase\expandafter{\UTFviiiTmp}%
-- \advance\countUTFx by 1
-- \ifnum\countUTFx < \countUTFy
-- \expandafter\UTFviiiLoop
-- \fi}
--
-- \countUTFx = "C2
-- \countUTFy = "E0
-- \def\UTFviiiTmp{%
-- \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
-- \UTFviiiLoop
--
-- \countUTFx = "E0
-- \countUTFy = "F0
-- \def\UTFviiiTmp{%
-- \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
-- \UTFviiiLoop
--
-- \countUTFx = "F0
-- \countUTFy = "F4
-- \def\UTFviiiTmp{%
-- \xdef~{\noexpand\UTFviiiFourOctets\string~}}
-- \UTFviiiLoop
--\endgroup
--
--\begingroup
-- \catcode`\"=12
-- \catcode`\<=12
-- \catcode`\.=12
-- \catcode`\,=12
-- \catcode`\;=12
-- \catcode`\!=12
-- \catcode`\~=13
--
-- \gdef\DeclareUnicodeCharacter#1#2{%
-- \countUTFz = "#1\relax
-- %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
-- \begingroup
-- \parseXMLCharref
-- \def\UTFviiiTwoOctets##1##2{%
-- \csname u8:##1\string ##2\endcsname}%
-- \def\UTFviiiThreeOctets##1##2##3{%
-- \csname u8:##1\string ##2\string ##3\endcsname}%
-- \def\UTFviiiFourOctets##1##2##3##4{%
-- \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
-- \expandafter\expandafter\expandafter\expandafter
-- \expandafter\expandafter\expandafter
-- \gdef\UTFviiiTmp{#2}%
-- \endgroup}
--
-- \gdef\parseXMLCharref{%
-- \ifnum\countUTFz < "A0\relax
-- \errhelp = \EMsimple
-- \errmessage{Cannot define Unicode char value < 00A0}%
-- \else\ifnum\countUTFz < "800\relax
-- \parseUTFviiiA,%
-- \parseUTFviiiB C\UTFviiiTwoOctets.,%
-- \else\ifnum\countUTFz < "10000\relax
-- \parseUTFviiiA;%
-- \parseUTFviiiA,%
-- \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
-- \else
-- \parseUTFviiiA;%
-- \parseUTFviiiA,%
-- \parseUTFviiiA!%
-- \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
-- \fi\fi\fi
-- }
--
-- \gdef\parseUTFviiiA#1{%
-- \countUTFx = \countUTFz
-- \divide\countUTFz by 64
-- \countUTFy = \countUTFz
-- \multiply\countUTFz by 64
-- \advance\countUTFx by -\countUTFz
-- \advance\countUTFx by 128
-- \uccode `#1\countUTFx
-- \countUTFz = \countUTFy}
--
-- \gdef\parseUTFviiiB#1#2#3#4{%
-- \advance\countUTFz by "#10\relax
-- \uccode `#3\countUTFz
-- \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
--\endgroup
--
--\def\utfeightchardefs{%
-- \DeclareUnicodeCharacter{00A0}{\tie}
-- \DeclareUnicodeCharacter{00A1}{\exclamdown}
-- \DeclareUnicodeCharacter{00A3}{\pounds}
-- \DeclareUnicodeCharacter{00A8}{\"{ }}
-- \DeclareUnicodeCharacter{00A9}{\copyright}
-- \DeclareUnicodeCharacter{00AA}{\ordf}
-- \DeclareUnicodeCharacter{00AB}{\guillemetleft}
-- \DeclareUnicodeCharacter{00AD}{\-}
-- \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
-- \DeclareUnicodeCharacter{00AF}{\={ }}
--
-- \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
-- \DeclareUnicodeCharacter{00B4}{\'{ }}
-- \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
-- \DeclareUnicodeCharacter{00BA}{\ordm}
-- \DeclareUnicodeCharacter{00BB}{\guillemetright}
-- \DeclareUnicodeCharacter{00BF}{\questiondown}
--
-- \DeclareUnicodeCharacter{00C0}{\`A}
-- \DeclareUnicodeCharacter{00C1}{\'A}
-- \DeclareUnicodeCharacter{00C2}{\^A}
-- \DeclareUnicodeCharacter{00C3}{\~A}
-- \DeclareUnicodeCharacter{00C4}{\"A}
-- \DeclareUnicodeCharacter{00C5}{\AA}
-- \DeclareUnicodeCharacter{00C6}{\AE}
-- \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
-- \DeclareUnicodeCharacter{00C8}{\`E}
-- \DeclareUnicodeCharacter{00C9}{\'E}
-- \DeclareUnicodeCharacter{00CA}{\^E}
-- \DeclareUnicodeCharacter{00CB}{\"E}
-- \DeclareUnicodeCharacter{00CC}{\`I}
-- \DeclareUnicodeCharacter{00CD}{\'I}
-- \DeclareUnicodeCharacter{00CE}{\^I}
-- \DeclareUnicodeCharacter{00CF}{\"I}
--
-- \DeclareUnicodeCharacter{00D0}{\DH}
-- \DeclareUnicodeCharacter{00D1}{\~N}
-- \DeclareUnicodeCharacter{00D2}{\`O}
-- \DeclareUnicodeCharacter{00D3}{\'O}
-- \DeclareUnicodeCharacter{00D4}{\^O}
-- \DeclareUnicodeCharacter{00D5}{\~O}
-- \DeclareUnicodeCharacter{00D6}{\"O}
-- \DeclareUnicodeCharacter{00D8}{\O}
-- \DeclareUnicodeCharacter{00D9}{\`U}
-- \DeclareUnicodeCharacter{00DA}{\'U}
-- \DeclareUnicodeCharacter{00DB}{\^U}
-- \DeclareUnicodeCharacter{00DC}{\"U}
-- \DeclareUnicodeCharacter{00DD}{\'Y}
-- \DeclareUnicodeCharacter{00DE}{\TH}
-- \DeclareUnicodeCharacter{00DF}{\ss}
--
-- \DeclareUnicodeCharacter{00E0}{\`a}
-- \DeclareUnicodeCharacter{00E1}{\'a}
-- \DeclareUnicodeCharacter{00E2}{\^a}
-- \DeclareUnicodeCharacter{00E3}{\~a}
-- \DeclareUnicodeCharacter{00E4}{\"a}
-- \DeclareUnicodeCharacter{00E5}{\aa}
-- \DeclareUnicodeCharacter{00E6}{\ae}
-- \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
-- \DeclareUnicodeCharacter{00E8}{\`e}
-- \DeclareUnicodeCharacter{00E9}{\'e}
-- \DeclareUnicodeCharacter{00EA}{\^e}
-- \DeclareUnicodeCharacter{00EB}{\"e}
-- \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
-- \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
-- \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
-- \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
--
-- \DeclareUnicodeCharacter{00F0}{\dh}
-- \DeclareUnicodeCharacter{00F1}{\~n}
-- \DeclareUnicodeCharacter{00F2}{\`o}
-- \DeclareUnicodeCharacter{00F3}{\'o}
-- \DeclareUnicodeCharacter{00F4}{\^o}
-- \DeclareUnicodeCharacter{00F5}{\~o}
-- \DeclareUnicodeCharacter{00F6}{\"o}
-- \DeclareUnicodeCharacter{00F8}{\o}
-- \DeclareUnicodeCharacter{00F9}{\`u}
-- \DeclareUnicodeCharacter{00FA}{\'u}
-- \DeclareUnicodeCharacter{00FB}{\^u}
-- \DeclareUnicodeCharacter{00FC}{\"u}
-- \DeclareUnicodeCharacter{00FD}{\'y}
-- \DeclareUnicodeCharacter{00FE}{\th}
-- \DeclareUnicodeCharacter{00FF}{\"y}
--
-- \DeclareUnicodeCharacter{0100}{\=A}
-- \DeclareUnicodeCharacter{0101}{\=a}
-- \DeclareUnicodeCharacter{0102}{\u{A}}
-- \DeclareUnicodeCharacter{0103}{\u{a}}
-- \DeclareUnicodeCharacter{0104}{\ogonek{A}}
-- \DeclareUnicodeCharacter{0105}{\ogonek{a}}
-- \DeclareUnicodeCharacter{0106}{\'C}
-- \DeclareUnicodeCharacter{0107}{\'c}
-- \DeclareUnicodeCharacter{0108}{\^C}
-- \DeclareUnicodeCharacter{0109}{\^c}
-- \DeclareUnicodeCharacter{0118}{\ogonek{E}}
-- \DeclareUnicodeCharacter{0119}{\ogonek{e}}
-- \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
-- \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
-- \DeclareUnicodeCharacter{010C}{\v{C}}
-- \DeclareUnicodeCharacter{010D}{\v{c}}
-- \DeclareUnicodeCharacter{010E}{\v{D}}
--
-- \DeclareUnicodeCharacter{0112}{\=E}
-- \DeclareUnicodeCharacter{0113}{\=e}
-- \DeclareUnicodeCharacter{0114}{\u{E}}
-- \DeclareUnicodeCharacter{0115}{\u{e}}
-- \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
-- \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
-- \DeclareUnicodeCharacter{011A}{\v{E}}
-- \DeclareUnicodeCharacter{011B}{\v{e}}
-- \DeclareUnicodeCharacter{011C}{\^G}
-- \DeclareUnicodeCharacter{011D}{\^g}
-- \DeclareUnicodeCharacter{011E}{\u{G}}
-- \DeclareUnicodeCharacter{011F}{\u{g}}
--
-- \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
-- \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
-- \DeclareUnicodeCharacter{0124}{\^H}
-- \DeclareUnicodeCharacter{0125}{\^h}
-- \DeclareUnicodeCharacter{0128}{\~I}
-- \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
-- \DeclareUnicodeCharacter{012A}{\=I}
-- \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
-- \DeclareUnicodeCharacter{012C}{\u{I}}
-- \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
--
-- \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
-- \DeclareUnicodeCharacter{0131}{\dotless{i}}
-- \DeclareUnicodeCharacter{0132}{IJ}
-- \DeclareUnicodeCharacter{0133}{ij}
-- \DeclareUnicodeCharacter{0134}{\^J}
-- \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
-- \DeclareUnicodeCharacter{0139}{\'L}
-- \DeclareUnicodeCharacter{013A}{\'l}
--
-- \DeclareUnicodeCharacter{0141}{\L}
-- \DeclareUnicodeCharacter{0142}{\l}
-- \DeclareUnicodeCharacter{0143}{\'N}
-- \DeclareUnicodeCharacter{0144}{\'n}
-- \DeclareUnicodeCharacter{0147}{\v{N}}
-- \DeclareUnicodeCharacter{0148}{\v{n}}
-- \DeclareUnicodeCharacter{014C}{\=O}
-- \DeclareUnicodeCharacter{014D}{\=o}
-- \DeclareUnicodeCharacter{014E}{\u{O}}
-- \DeclareUnicodeCharacter{014F}{\u{o}}
--
-- \DeclareUnicodeCharacter{0150}{\H{O}}
-- \DeclareUnicodeCharacter{0151}{\H{o}}
-- \DeclareUnicodeCharacter{0152}{\OE}
-- \DeclareUnicodeCharacter{0153}{\oe}
-- \DeclareUnicodeCharacter{0154}{\'R}
-- \DeclareUnicodeCharacter{0155}{\'r}
-- \DeclareUnicodeCharacter{0158}{\v{R}}
-- \DeclareUnicodeCharacter{0159}{\v{r}}
-- \DeclareUnicodeCharacter{015A}{\'S}
-- \DeclareUnicodeCharacter{015B}{\'s}
-- \DeclareUnicodeCharacter{015C}{\^S}
-- \DeclareUnicodeCharacter{015D}{\^s}
-- \DeclareUnicodeCharacter{015E}{\cedilla{S}}
-- \DeclareUnicodeCharacter{015F}{\cedilla{s}}
--
-- \DeclareUnicodeCharacter{0160}{\v{S}}
-- \DeclareUnicodeCharacter{0161}{\v{s}}
-- \DeclareUnicodeCharacter{0162}{\cedilla{t}}
-- \DeclareUnicodeCharacter{0163}{\cedilla{T}}
-- \DeclareUnicodeCharacter{0164}{\v{T}}
--
-- \DeclareUnicodeCharacter{0168}{\~U}
-- \DeclareUnicodeCharacter{0169}{\~u}
-- \DeclareUnicodeCharacter{016A}{\=U}
-- \DeclareUnicodeCharacter{016B}{\=u}
-- \DeclareUnicodeCharacter{016C}{\u{U}}
-- \DeclareUnicodeCharacter{016D}{\u{u}}
-- \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
-- \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
--
-- \DeclareUnicodeCharacter{0170}{\H{U}}
-- \DeclareUnicodeCharacter{0171}{\H{u}}
-- \DeclareUnicodeCharacter{0174}{\^W}
-- \DeclareUnicodeCharacter{0175}{\^w}
-- \DeclareUnicodeCharacter{0176}{\^Y}
-- \DeclareUnicodeCharacter{0177}{\^y}
-- \DeclareUnicodeCharacter{0178}{\"Y}
-- \DeclareUnicodeCharacter{0179}{\'Z}
-- \DeclareUnicodeCharacter{017A}{\'z}
-- \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
-- \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
-- \DeclareUnicodeCharacter{017D}{\v{Z}}
-- \DeclareUnicodeCharacter{017E}{\v{z}}
--
-- \DeclareUnicodeCharacter{01C4}{D\v{Z}}
-- \DeclareUnicodeCharacter{01C5}{D\v{z}}
-- \DeclareUnicodeCharacter{01C6}{d\v{z}}
-- \DeclareUnicodeCharacter{01C7}{LJ}
-- \DeclareUnicodeCharacter{01C8}{Lj}
-- \DeclareUnicodeCharacter{01C9}{lj}
-- \DeclareUnicodeCharacter{01CA}{NJ}
-- \DeclareUnicodeCharacter{01CB}{Nj}
-- \DeclareUnicodeCharacter{01CC}{nj}
-- \DeclareUnicodeCharacter{01CD}{\v{A}}
-- \DeclareUnicodeCharacter{01CE}{\v{a}}
-- \DeclareUnicodeCharacter{01CF}{\v{I}}
--
-- \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
-- \DeclareUnicodeCharacter{01D1}{\v{O}}
-- \DeclareUnicodeCharacter{01D2}{\v{o}}
-- \DeclareUnicodeCharacter{01D3}{\v{U}}
-- \DeclareUnicodeCharacter{01D4}{\v{u}}
--
-- \DeclareUnicodeCharacter{01E2}{\={\AE}}
-- \DeclareUnicodeCharacter{01E3}{\={\ae}}
-- \DeclareUnicodeCharacter{01E6}{\v{G}}
-- \DeclareUnicodeCharacter{01E7}{\v{g}}
-- \DeclareUnicodeCharacter{01E8}{\v{K}}
-- \DeclareUnicodeCharacter{01E9}{\v{k}}
--
-- \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
-- \DeclareUnicodeCharacter{01F1}{DZ}
-- \DeclareUnicodeCharacter{01F2}{Dz}
-- \DeclareUnicodeCharacter{01F3}{dz}
-- \DeclareUnicodeCharacter{01F4}{\'G}
-- \DeclareUnicodeCharacter{01F5}{\'g}
-- \DeclareUnicodeCharacter{01F8}{\`N}
-- \DeclareUnicodeCharacter{01F9}{\`n}
-- \DeclareUnicodeCharacter{01FC}{\'{\AE}}
-- \DeclareUnicodeCharacter{01FD}{\'{\ae}}
-- \DeclareUnicodeCharacter{01FE}{\'{\O}}
-- \DeclareUnicodeCharacter{01FF}{\'{\o}}
--
-- \DeclareUnicodeCharacter{021E}{\v{H}}
-- \DeclareUnicodeCharacter{021F}{\v{h}}
--
-- \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
-- \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
-- \DeclareUnicodeCharacter{0228}{\cedilla{E}}
-- \DeclareUnicodeCharacter{0229}{\cedilla{e}}
-- \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
-- \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
--
-- \DeclareUnicodeCharacter{0232}{\=Y}
-- \DeclareUnicodeCharacter{0233}{\=y}
-- \DeclareUnicodeCharacter{0237}{\dotless{j}}
--
-- \DeclareUnicodeCharacter{02DB}{\ogonek{ }}
--
-- \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
-- \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
-- \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
-- \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
-- \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
-- \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
-- \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
-- \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
-- \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
-- \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
-- \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
-- \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
--
-- \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
-- \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
--
-- \DeclareUnicodeCharacter{1E20}{\=G}
-- \DeclareUnicodeCharacter{1E21}{\=g}
-- \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
-- \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
-- \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
-- \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
-- \DeclareUnicodeCharacter{1E26}{\"H}
-- \DeclareUnicodeCharacter{1E27}{\"h}
--
-- \DeclareUnicodeCharacter{1E30}{\'K}
-- \DeclareUnicodeCharacter{1E31}{\'k}
-- \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
-- \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
-- \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
-- \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
-- \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
-- \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
-- \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
-- \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
-- \DeclareUnicodeCharacter{1E3E}{\'M}
-- \DeclareUnicodeCharacter{1E3F}{\'m}
--
-- \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
-- \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
-- \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
-- \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
-- \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
-- \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
-- \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
-- \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
-- \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
-- \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
--
-- \DeclareUnicodeCharacter{1E54}{\'P}
-- \DeclareUnicodeCharacter{1E55}{\'p}
-- \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
-- \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
-- \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
-- \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
-- \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
-- \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
-- \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
-- \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
--
-- \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
-- \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
-- \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
-- \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
-- \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
-- \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
-- \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
-- \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
-- \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
-- \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
--
-- \DeclareUnicodeCharacter{1E7C}{\~V}
-- \DeclareUnicodeCharacter{1E7D}{\~v}
-- \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
-- \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
--
-- \DeclareUnicodeCharacter{1E80}{\`W}
-- \DeclareUnicodeCharacter{1E81}{\`w}
-- \DeclareUnicodeCharacter{1E82}{\'W}
-- \DeclareUnicodeCharacter{1E83}{\'w}
-- \DeclareUnicodeCharacter{1E84}{\"W}
-- \DeclareUnicodeCharacter{1E85}{\"w}
-- \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
-- \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
-- \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
-- \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
-- \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
-- \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
-- \DeclareUnicodeCharacter{1E8C}{\"X}
-- \DeclareUnicodeCharacter{1E8D}{\"x}
-- \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
-- \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
--
-- \DeclareUnicodeCharacter{1E90}{\^Z}
-- \DeclareUnicodeCharacter{1E91}{\^z}
-- \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
-- \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
-- \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
-- \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
-- \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
-- \DeclareUnicodeCharacter{1E97}{\"t}
-- \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
-- \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
--
-- \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
-- \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
--
-- \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
-- \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
-- \DeclareUnicodeCharacter{1EBC}{\~E}
-- \DeclareUnicodeCharacter{1EBD}{\~e}
--
-- \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
-- \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
-- \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
-- \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
--
-- \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
-- \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
--
-- \DeclareUnicodeCharacter{1EF2}{\`Y}
-- \DeclareUnicodeCharacter{1EF3}{\`y}
-- \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
--
-- \DeclareUnicodeCharacter{1EF8}{\~Y}
-- \DeclareUnicodeCharacter{1EF9}{\~y}
--
-- \DeclareUnicodeCharacter{2013}{--}
-- \DeclareUnicodeCharacter{2014}{---}
-- \DeclareUnicodeCharacter{2018}{\quoteleft}
-- \DeclareUnicodeCharacter{2019}{\quoteright}
-- \DeclareUnicodeCharacter{201A}{\quotesinglbase}
-- \DeclareUnicodeCharacter{201C}{\quotedblleft}
-- \DeclareUnicodeCharacter{201D}{\quotedblright}
-- \DeclareUnicodeCharacter{201E}{\quotedblbase}
-- \DeclareUnicodeCharacter{2022}{\bullet}
-- \DeclareUnicodeCharacter{2026}{\dots}
-- \DeclareUnicodeCharacter{2039}{\guilsinglleft}
-- \DeclareUnicodeCharacter{203A}{\guilsinglright}
-- \DeclareUnicodeCharacter{20AC}{\euro}
--
-- \DeclareUnicodeCharacter{2192}{\expansion}
-- \DeclareUnicodeCharacter{21D2}{\result}
--
-- \DeclareUnicodeCharacter{2212}{\minus}
-- \DeclareUnicodeCharacter{2217}{\point}
-- \DeclareUnicodeCharacter{2261}{\equiv}
--}% end of \utfeightchardefs
--
--
--% US-ASCII character definitions.
--\def\asciichardefs{% nothing need be done
-- \relax
--}
--
--% Make non-ASCII characters printable again for compatibility with
--% existing Texinfo documents that may use them, even without declaring a
--% document encoding.
--%
--\setnonasciicharscatcode \other
--
--
--\message{formatting,}
--
--\newdimen\defaultparindent \defaultparindent = 15pt
--
--\chapheadingskip = 15pt plus 4pt minus 2pt
--\secheadingskip = 12pt plus 3pt minus 2pt
--\subsecheadingskip = 9pt plus 2pt minus 2pt
--
--% Prevent underfull vbox error messages.
--\vbadness = 10000
--
--% Don't be very finicky about underfull hboxes, either.
--\hbadness = 6666
--
--% Following George Bush, get rid of widows and orphans.
--\widowpenalty=10000
--\clubpenalty=10000
--
--% Use TeX 3.0's \emergencystretch to help line breaking, but if we're
--% using an old version of TeX, don't do anything. We want the amount of
--% stretch added to depend on the line length, hence the dependence on
--% \hsize. We call this whenever the paper size is set.
--%
--\def\setemergencystretch{%
-- \ifx\emergencystretch\thisisundefined
-- % Allow us to assign to \emergencystretch anyway.
-- \def\emergencystretch{\dimen0}%
-- \else
-- \emergencystretch = .15\hsize
-- \fi
--}
--
--% Parameters in order: 1) textheight; 2) textwidth;
--% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
--% 7) physical page height; 8) physical page width.
--%
--% We also call \setleading{\textleading}, so the caller should define
--% \textleading. The caller should also set \parskip.
--%
--\def\internalpagesizes#1#2#3#4#5#6#7#8{%
-- \voffset = #3\relax
-- \topskip = #6\relax
-- \splittopskip = \topskip
-- %
-- \vsize = #1\relax
-- \advance\vsize by \topskip
-- \outervsize = \vsize
-- \advance\outervsize by 2\topandbottommargin
-- \pageheight = \vsize
-- %
-- \hsize = #2\relax
-- \outerhsize = \hsize
-- \advance\outerhsize by 0.5in
-- \pagewidth = \hsize
-- %
-- \normaloffset = #4\relax
-- \bindingoffset = #5\relax
-- %
-- \ifpdf
-- \pdfpageheight #7\relax
-- \pdfpagewidth #8\relax
-- % if we don't reset these, they will remain at "1 true in" of
-- % whatever layout pdftex was dumped with.
-- \pdfhorigin = 1 true in
-- \pdfvorigin = 1 true in
-- \fi
-- %
-- \setleading{\textleading}
-- %
-- \parindent = \defaultparindent
-- \setemergencystretch
--}
--
--% @letterpaper (the default).
--\def\letterpaper{{\globaldefs = 1
-- \parskip = 3pt plus 2pt minus 1pt
-- \textleading = 13.2pt
-- %
-- % If page is nothing but text, make it come out even.
-- \internalpagesizes{607.2pt}{6in}% that's 46 lines
-- {\voffset}{.25in}%
-- {\bindingoffset}{36pt}%
-- {11in}{8.5in}%
--}}
--
--% Use @smallbook to reset parameters for 7x9.25 trim size.
--\def\smallbook{{\globaldefs = 1
-- \parskip = 2pt plus 1pt
-- \textleading = 12pt
-- %
-- \internalpagesizes{7.5in}{5in}%
-- {-.2in}{0in}%
-- {\bindingoffset}{16pt}%
-- {9.25in}{7in}%
-- %
-- \lispnarrowing = 0.3in
-- \tolerance = 700
-- \hfuzz = 1pt
-- \contentsrightmargin = 0pt
-- \defbodyindent = .5cm
--}}
--
--% Use @smallerbook to reset parameters for 6x9 trim size.
--% (Just testing, parameters still in flux.)
--\def\smallerbook{{\globaldefs = 1
-- \parskip = 1.5pt plus 1pt
-- \textleading = 12pt
-- %
-- \internalpagesizes{7.4in}{4.8in}%
-- {-.2in}{-.4in}%
-- {0pt}{14pt}%
-- {9in}{6in}%
-- %
-- \lispnarrowing = 0.25in
-- \tolerance = 700
-- \hfuzz = 1pt
-- \contentsrightmargin = 0pt
-- \defbodyindent = .4cm
--}}
--
--% Use @afourpaper to print on European A4 paper.
--\def\afourpaper{{\globaldefs = 1
-- \parskip = 3pt plus 2pt minus 1pt
-- \textleading = 13.2pt
-- %
-- % Double-side printing via postscript on Laserjet 4050
-- % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm.
-- % To change the settings for a different printer or situation, adjust
-- % \normaloffset until the front-side and back-side texts align. Then
-- % do the same for \bindingoffset. You can set these for testing in
-- % your texinfo source file like this:
-- % @tex
-- % \global\normaloffset = -6mm
-- % \global\bindingoffset = 10mm
-- % @end tex
-- \internalpagesizes{673.2pt}{160mm}% that's 51 lines
-- {\voffset}{\hoffset}%
-- {\bindingoffset}{44pt}%
-- {297mm}{210mm}%
-- %
-- \tolerance = 700
-- \hfuzz = 1pt
-- \contentsrightmargin = 0pt
-- \defbodyindent = 5mm
--}}
--
--% Use @afivepaper to print on European A5 paper.
--% From romildo at urano.iceb.ufop.br, 2 July 2000.
--% He also recommends making @example and @lisp be small.
--\def\afivepaper{{\globaldefs = 1
-- \parskip = 2pt plus 1pt minus 0.1pt
-- \textleading = 12.5pt
-- %
-- \internalpagesizes{160mm}{120mm}%
-- {\voffset}{\hoffset}%
-- {\bindingoffset}{8pt}%
-- {210mm}{148mm}%
-- %
-- \lispnarrowing = 0.2in
-- \tolerance = 800
-- \hfuzz = 1.2pt
-- \contentsrightmargin = 0pt
-- \defbodyindent = 2mm
-- \tableindent = 12mm
--}}
--
--% A specific text layout, 24x15cm overall, intended for A4 paper.
--\def\afourlatex{{\globaldefs = 1
-- \afourpaper
-- \internalpagesizes{237mm}{150mm}%
-- {\voffset}{4.6mm}%
-- {\bindingoffset}{7mm}%
-- {297mm}{210mm}%
-- %
-- % Must explicitly reset to 0 because we call \afourpaper.
-- \globaldefs = 0
--}}
--
--% Use @afourwide to print on A4 paper in landscape format.
--\def\afourwide{{\globaldefs = 1
-- \afourpaper
-- \internalpagesizes{241mm}{165mm}%
-- {\voffset}{-2.95mm}%
-- {\bindingoffset}{7mm}%
-- {297mm}{210mm}%
-- \globaldefs = 0
--}}
--
--% @pagesizes TEXTHEIGHT[,TEXTWIDTH]
--% Perhaps we should allow setting the margins, \topskip, \parskip,
--% and/or leading, also. Or perhaps we should compute them somehow.
--%
--\parseargdef\pagesizes{\pagesizesyyy #1,,\finish}
--\def\pagesizesyyy#1,#2,#3\finish{{%
-- \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi
-- \globaldefs = 1
-- %
-- \parskip = 3pt plus 2pt minus 1pt
-- \setleading{\textleading}%
-- %
-- \dimen0 = #1\relax
-- \advance\dimen0 by \voffset
-- %
-- \dimen2 = \hsize
-- \advance\dimen2 by \normaloffset
-- %
-- \internalpagesizes{#1}{\hsize}%
-- {\voffset}{\normaloffset}%
-- {\bindingoffset}{44pt}%
-- {\dimen0}{\dimen2}%
--}}
--
--% Set default to letter.
--%
--\letterpaper
--
--
--\message{and turning on texinfo input format.}
--
--\def^^L{\par} % remove \outer, so ^L can appear in an @comment
--
--% DEL is a comment character, in case @c does not suffice.
--\catcode`\^^? = 14
--
--% Define macros to output various characters with catcode for normal text.
--\catcode`\"=\other \def\normaldoublequote{"}
--\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix
--\catcode`\+=\other \def\normalplus{+}
--\catcode`\<=\other \def\normalless{<}
--\catcode`\>=\other \def\normalgreater{>}
--\catcode`\^=\other \def\normalcaret{^}
--\catcode`\_=\other \def\normalunderscore{_}
--\catcode`\|=\other \def\normalverticalbar{|}
--\catcode`\~=\other \def\normaltilde{~}
--
--% This macro is used to make a character print one way in \tt
--% (where it can probably be output as-is), and another way in other fonts,
--% where something hairier probably needs to be done.
--%
--% #1 is what to print if we are indeed using \tt; #2 is what to print
--% otherwise. Since all the Computer Modern typewriter fonts have zero
--% interword stretch (and shrink), and it is reasonable to expect all
--% typewriter fonts to have this, we can check that font parameter.
--%
--\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi}
--
--% Same as above, but check for italic font. Actually this also catches
--% non-italic slanted fonts since it is impossible to distinguish them from
--% italic fonts. But since this is only used by $ and it uses \sl anyway
--% this is not a problem.
--\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi}
--
--% Turn off all special characters except @
--% (and those which the user can use as if they were ordinary).
--% Most of these we simply print from the \tt font, but for some, we can
--% use math or other variants that look better in normal text.
--
--\catcode`\"=\active
--\def\activedoublequote{{\tt\char34}}
--\let"=\activedoublequote
--\catcode`\~=\active
--\def~{{\tt\char126}}
--\chardef\hat=`\^
--\catcode`\^=\active
--\def^{{\tt \hat}}
--
--\catcode`\_=\active
--\def_{\ifusingtt\normalunderscore\_}
--\let\realunder=_
--% Subroutine for the previous macro.
--\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
--
--\catcode`\|=\active
--\def|{{\tt\char124}}
--\chardef \less=`\<
--\catcode`\<=\active
--\def<{{\tt \less}}
--\chardef \gtr=`\>
--\catcode`\>=\active
--\def>{{\tt \gtr}}
--\catcode`\+=\active
--\def+{{\tt \char 43}}
--\catcode`\$=\active
--\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
--
--% If a .fmt file is being used, characters that might appear in a file
--% name cannot be active until we have parsed the command line.
--% So turn them off again, and have \everyjob (or @setfilename) turn them on.
--% \otherifyactive is called near the end of this file.
--\def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
--
--% Used sometimes to turn off (effectively) the active characters even after
--% parsing them.
--\def\turnoffactive{%
-- \normalturnoffactive
-- \otherbackslash
--}
--
--\catcode`\@=0
--
--% \backslashcurfont outputs one backslash character in current font,
--% as in \char`\\.
--\global\chardef\backslashcurfont=`\\
--\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work
--
--% \realbackslash is an actual character `\' with catcode other, and
--% \doublebackslash is two of them (for the pdf outlines).
--{\catcode`\\=\other @gdef at realbackslash{\} @gdef at doublebackslash{\\}}
--
--% In texinfo, backslash is an active character; it prints the backslash
--% in fixed width font.
--\catcode`\\=\active % @ for escape char from now on.
--
--% The story here is that in math mode, the \char of \backslashcurfont
--% ends up printing the roman \ from the math symbol font (because \char
--% in math mode uses the \mathcode, and plain.tex sets
--% \mathcode`\\="026E). It seems better for @backslashchar{} to always
--% print a typewriter backslash, hence we use an explicit \mathchar,
--% which is the decimal equivalent of "715c (class 7, e.g., use \fam;
--% ignored family value; char position "5C). We can't use " for the
--% usual hex value because it has already been made active.
-- at def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
-- at let@backslashchar = @normalbackslash % @backslashchar{} is for user documents.
--
--% On startup, @fixbackslash assigns:
--% @let \ = @normalbackslash
--% \rawbackslash defines an active \ to do \backslashcurfont.
--% \otherbackslash defines an active \ to be a literal `\' character with
--% catcode other. We switch back and forth between these.
-- at gdef@rawbackslash{@let\=@backslashcurfont}
-- at gdef@otherbackslash{@let\=@realbackslash}
--
--% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
--% the literal character `\'. Also revert - to its normal character, in
--% case the active - from code has slipped in.
--%
--{@catcode`- = @active
-- @gdef at normalturnoffactive{%
-- @let-=@normaldash
-- @let"=@normaldoublequote
-- @let$=@normaldollar %$ font-lock fix
-- @let+=@normalplus
-- @let<=@normalless
-- @let>=@normalgreater
-- @let\=@normalbackslash
-- @let^=@normalcaret
-- @let_=@normalunderscore
-- @let|=@normalverticalbar
-- @let~=@normaltilde
-- @markupsetuplqdefault
-- @markupsetuprqdefault
-- @unsepspaces
-- }
--}
--
--% Make _ and + \other characters, temporarily.
--% This is canceled by @fixbackslash.
-- at otherifyactive
--
--% If a .fmt file is being used, we don't want the `\input texinfo' to show up.
--% That is what \eatinput is for; after that, the `\' should revert to printing
--% a backslash.
--%
-- at gdef@eatinput input texinfo{@fixbackslash}
-- at global@let\ = @eatinput
--
--% On the other hand, perhaps the file did not have a `\input texinfo'. Then
--% the first `\' in the file would cause an error. This macro tries to fix
--% that, assuming it is called before the first `\' could plausibly occur.
--% Also turn back on active characters that might appear in the input
--% file name, in case not using a pre-dumped format.
--%
-- at gdef@fixbackslash{%
-- @ifx\@eatinput @let\ = @normalbackslash @fi
-- @catcode`+=@active
-- @catcode`@_=@active
--}
--
--% Say @foo, not \foo, in error messages.
-- at escapechar = `@@
--
--% These (along with & and #) are made active for url-breaking, so need
--% active definitions as the normal characters.
-- at def@normaldot{.}
-- at def@normalquest{?}
-- at def@normalslash{/}
--
--% These look ok in all fonts, so just make them not special.
--% @hashchar{} gets its own user-level command, because of #line.
-- at catcode`@& = @other @def at normalamp{&}
-- at catcode`@# = @other @def at normalhash{#}
-- at catcode`@% = @other @def at normalpercent{%}
--
-- at let @hashchar = @normalhash
--
-- at c Finally, make ` and ' active, so that txicodequoteundirected and
-- at c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we
-- at c don't make ` and ' active, @code will not get them as active chars.
-- at c Do this last of all since we use ` in the previous @catcode assignments.
-- at catcode`@'=@active
-- at catcode`@`=@active
-- at markupsetuplqdefault
-- at markupsetuprqdefault
--
-- at c Local variables:
-- at c eval: (add-hook 'write-file-hooks 'time-stamp)
-- at c page-delimiter: "^\\\\message"
-- at c time-stamp-start: "def\\\\texinfoversion{"
-- at c time-stamp-format: "%:y-%02m-%02d.%02H"
-- at c time-stamp-end: "}"
-- at c End:
--
-- at c vim:sw=2:
--
-- at ignore
-- arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
-- at end ignore
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg1.git
More information about the Pkg-gnupg-commit
mailing list