diff options
Diffstat (limited to 'po/[email protected]')
| -rw-r--r-- | po/[email protected] | 1684 |
1 files changed, 846 insertions, 838 deletions
diff --git a/po/[email protected] b/po/[email protected] index cc1686be7..a86703e02 100644 --- a/po/[email protected] +++ b/po/[email protected] @@ -30,10 +30,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.3.5\n" +"Project-Id-Version: gnupg 1.3.6\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2004-02-26 18:37+0100\n" -"PO-Revision-Date: 2004-02-26 18:37+0100\n" +"POT-Creation-Date: 2004-05-22 13:30+0200\n" +"PO-Revision-Date: 2004-05-22 13:30+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -327,7 +327,7 @@ msgstr "you found a bug ... (%s:%d)\n" msgid "no entropy gathering module detected\n" msgstr "no entropy gathering module detected\n" -#: cipher/random.c:387 g10/keygen.c:1917 g10/import.c:169 +#: cipher/random.c:387 g10/keygen.c:2028 g10/import.c:169 #, c-format msgid "can't open `%s': %s\n" msgstr "can't open ‘[1m%s[0m’: %s\n" @@ -428,7 +428,7 @@ msgstr "can't gen prime with pbits=%u qbits=%u\n" msgid "can't generate a prime with less than %d bits\n" msgstr "can't generate a prime with less than %d bits\n" -#: g10/g10.c:350 +#: g10/g10.c:354 msgid "" "@Commands:\n" " " @@ -436,127 +436,127 @@ msgstr "" "@Commands:\n" " " -#: g10/g10.c:352 +#: g10/g10.c:356 msgid "|[file]|make a signature" msgstr "|[file]|make a signature" -#: g10/g10.c:353 +#: g10/g10.c:357 msgid "|[file]|make a clear text signature" msgstr "|[file]|make a clear text signature" -#: g10/g10.c:354 +#: g10/g10.c:358 msgid "make a detached signature" msgstr "make a detached signature" -#: g10/g10.c:355 +#: g10/g10.c:359 msgid "encrypt data" msgstr "encrypt data" -#: g10/g10.c:357 +#: g10/g10.c:361 msgid "encryption only with symmetric cipher" msgstr "encryption only with symmetric cipher" -#: g10/g10.c:359 +#: g10/g10.c:363 msgid "decrypt data (default)" msgstr "decrypt data (default)" -#: g10/g10.c:361 +#: g10/g10.c:365 msgid "verify a signature" msgstr "verify a signature" -#: g10/g10.c:363 +#: g10/g10.c:367 msgid "list keys" msgstr "list keys" -#: g10/g10.c:365 +#: g10/g10.c:369 msgid "list keys and signatures" msgstr "list keys and signatures" -#: g10/g10.c:366 +#: g10/g10.c:370 msgid "list and check key signatures" msgstr "list and check key signatures" -#: g10/g10.c:367 +#: g10/g10.c:371 msgid "list keys and fingerprints" msgstr "list keys and fingerprints" -#: g10/g10.c:368 +#: g10/g10.c:372 msgid "list secret keys" msgstr "list secret keys" -#: g10/g10.c:369 +#: g10/g10.c:373 msgid "generate a new key pair" msgstr "generate a new key pair" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "remove keys from the public keyring" msgstr "remove keys from the public keyring" -#: g10/g10.c:372 +#: g10/g10.c:376 msgid "remove keys from the secret keyring" msgstr "remove keys from the secret keyring" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "sign a key" msgstr "sign a key" -#: g10/g10.c:374 +#: g10/g10.c:378 msgid "sign a key locally" msgstr "sign a key locally" -#: g10/g10.c:377 +#: g10/g10.c:381 msgid "sign or edit a key" msgstr "sign or edit a key" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "generate a revocation certificate" msgstr "generate a revocation certificate" -#: g10/g10.c:380 +#: g10/g10.c:384 msgid "export keys" msgstr "export keys" -#: g10/g10.c:381 +#: g10/g10.c:385 msgid "export keys to a key server" msgstr "export keys to a key server" -#: g10/g10.c:382 +#: g10/g10.c:386 msgid "import keys from a key server" msgstr "import keys from a key server" -#: g10/g10.c:384 +#: g10/g10.c:388 msgid "search for keys on a key server" msgstr "search for keys on a key server" -#: g10/g10.c:386 +#: g10/g10.c:390 msgid "update all keys from a keyserver" msgstr "update all keys from a keyserver" -#: g10/g10.c:390 +#: g10/g10.c:393 msgid "import/merge keys" msgstr "import/merge keys" -#: g10/g10.c:393 +#: g10/g10.c:396 msgid "print the card status" msgstr "print the card status" -#: g10/g10.c:394 +#: g10/g10.c:397 msgid "change data on a card" msgstr "change data on a card" -#: g10/g10.c:395 +#: g10/g10.c:398 msgid "change a card's PIN" msgstr "change a card's PIN" -#: g10/g10.c:402 +#: g10/g10.c:406 msgid "update the trust database" msgstr "update the trust database" -#: g10/g10.c:409 +#: g10/g10.c:413 msgid "|algo [files]|print message digests" msgstr "|algo [files]|print message digests" -#: g10/g10.c:413 g10/gpgv.c:64 +#: g10/g10.c:417 g10/gpgv.c:64 msgid "" "@\n" "Options:\n" @@ -566,51 +566,55 @@ msgstr "" "Options:\n" " " -#: g10/g10.c:415 +#: g10/g10.c:419 msgid "create ascii armored output" msgstr "create ascii armored output" -#: g10/g10.c:417 +#: g10/g10.c:421 msgid "|NAME|encrypt for NAME" msgstr "|NAME|encrypt for NAME" -#: g10/g10.c:428 +#: g10/g10.c:432 msgid "use this user-id to sign or decrypt" msgstr "use this user-id to sign or decrypt" -#: g10/g10.c:429 +#: g10/g10.c:433 msgid "|N|set compress level N (0 disables)" msgstr "|N|set compress level N (0 disables)" -#: g10/g10.c:434 +#: g10/g10.c:438 msgid "use canonical text mode" msgstr "use canonical text mode" -#: g10/g10.c:444 +#: g10/g10.c:448 msgid "use as output file" msgstr "use as output file" -#: g10/g10.c:446 g10/gpgv.c:66 +#: g10/g10.c:450 g10/gpgv.c:66 msgid "verbose" msgstr "verbose" -#: g10/g10.c:457 +#: g10/g10.c:461 msgid "do not make any changes" msgstr "do not make any changes" -#: g10/g10.c:458 +#: g10/g10.c:462 msgid "prompt before overwriting" msgstr "prompt before overwriting" -#: g10/g10.c:502 +#: g10/g10.c:506 msgid "use strict OpenPGP behavior" msgstr "use strict OpenPGP behavior" -#: g10/g10.c:503 +#: g10/g10.c:507 msgid "generate PGP 2.x compatible messages" msgstr "generate PGP 2.x compatible messages" -#: g10/g10.c:526 +#: g10/g10.c:529 +msgid "allow the use of admin card commands" +msgstr "allow the use of admin card commands" + +#: g10/g10.c:534 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -618,7 +622,7 @@ msgstr "" "@\n" "(See the man page for a complete listing of all commands and options)\n" -#: g10/g10.c:529 +#: g10/g10.c:537 msgid "" "@\n" "Examples:\n" @@ -638,15 +642,15 @@ msgstr "" " --list-keys [names] show keys\n" " --fingerprint [names] show fingerprints\n" -#: g10/g10.c:702 g10/gpgv.c:91 +#: g10/g10.c:712 g10/gpgv.c:91 msgid "Please report bugs to <[email protected]>.\n" msgstr "Please report bugs to <[email protected]>.\n" -#: g10/g10.c:719 +#: g10/g10.c:729 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Usage: gpg [options] [files] (-h for help)" -#: g10/g10.c:722 +#: g10/g10.c:732 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -656,7 +660,7 @@ msgstr "" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" -#: g10/g10.c:733 +#: g10/g10.c:743 msgid "" "\n" "Supported algorithms:\n" @@ -664,71 +668,71 @@ msgstr "" "\n" "Supported algorithms:\n" -#: g10/g10.c:736 +#: g10/g10.c:746 msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:742 g10/keyedit.c:1718 +#: g10/g10.c:752 g10/keyedit.c:1721 msgid "Cipher: " msgstr "Cipher: " -#: g10/g10.c:748 +#: g10/g10.c:758 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:754 g10/keyedit.c:1764 +#: g10/g10.c:764 g10/keyedit.c:1767 msgid "Compression: " msgstr "Compression: " -#: g10/g10.c:837 +#: g10/g10.c:847 msgid "usage: gpg [options] " msgstr "usage: gpg [options] " -#: g10/g10.c:940 +#: g10/g10.c:950 msgid "conflicting commands\n" msgstr "conflicting commands\n" -#: g10/g10.c:958 +#: g10/g10.c:968 #, c-format msgid "no = sign found in group definition \"%s\"\n" msgstr "no = sign found in group definition “[1m%s[0m”\n" -#: g10/g10.c:1155 +#: g10/g10.c:1165 #, c-format msgid "WARNING: unsafe ownership on homedir \"%s\"\n" msgstr "WARNING: unsafe ownership on homedir “[1m%s[0m”\n" -#: g10/g10.c:1158 +#: g10/g10.c:1168 #, c-format msgid "WARNING: unsafe ownership on configuration file \"%s\"\n" msgstr "WARNING: unsafe ownership on configuration file “[1m%s[0m”\n" -#: g10/g10.c:1161 +#: g10/g10.c:1171 #, c-format msgid "WARNING: unsafe ownership on extension \"%s\"\n" msgstr "WARNING: unsafe ownership on extension “[1m%s[0m”\n" -#: g10/g10.c:1167 +#: g10/g10.c:1177 #, c-format msgid "WARNING: unsafe permissions on homedir \"%s\"\n" msgstr "WARNING: unsafe permissions on homedir “[1m%s[0m”\n" -#: g10/g10.c:1170 +#: g10/g10.c:1180 #, c-format msgid "WARNING: unsafe permissions on configuration file \"%s\"\n" msgstr "WARNING: unsafe permissions on configuration file “[1m%s[0m”\n" -#: g10/g10.c:1173 +#: g10/g10.c:1183 #, c-format msgid "WARNING: unsafe permissions on extension \"%s\"\n" msgstr "WARNING: unsafe permissions on extension “[1m%s[0m”\n" -#: g10/g10.c:1179 +#: g10/g10.c:1189 #, 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/g10.c:1182 +#: g10/g10.c:1192 #, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n" @@ -736,19 +740,19 @@ msgstr "" "WARNING: unsafe enclosing directory ownership on configuration file “[1m%s" "[0m”\n" -#: g10/g10.c:1185 +#: g10/g10.c:1195 #, c-format msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n" msgstr "" "WARNING: unsafe enclosing directory ownership on extension “[1m%s[0m”\n" -#: g10/g10.c:1191 +#: g10/g10.c:1201 #, 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/g10.c:1194 +#: g10/g10.c:1204 #, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file \"%s" @@ -757,364 +761,373 @@ msgstr "" "WARNING: unsafe enclosing directory permissions on configuration file “[1m%s" "[0m”\n" -#: g10/g10.c:1197 +#: g10/g10.c:1207 #, c-format msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n" msgstr "" "WARNING: unsafe enclosing directory permissions on extension “[1m%s[0m”\n" -#: g10/g10.c:1323 +#: g10/g10.c:1333 #, c-format msgid "unknown configuration item \"%s\"\n" msgstr "unknown configuration item “[1m%s[0m”\n" -#: g10/g10.c:1570 +#: g10/g10.c:1600 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "NOTE: old default options file ‘[1m%s[0m’ ignored\n" -#: g10/g10.c:1606 +#: g10/g10.c:1636 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE: no default option file ‘[1m%s[0m’\n" -#: g10/g10.c:1610 +#: g10/g10.c:1640 #, c-format msgid "option file `%s': %s\n" msgstr "option file ‘[1m%s[0m’: %s\n" -#: g10/g10.c:1617 +#: g10/g10.c:1647 #, c-format msgid "reading options from `%s'\n" msgstr "reading options from ‘[1m%s[0m’\n" -#: g10/g10.c:1842 g10/g10.c:2333 g10/g10.c:2344 +#: g10/g10.c:1873 g10/g10.c:2408 g10/g10.c:2419 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s is not for normal use!\n" -#: g10/g10.c:1855 +#: g10/g10.c:1886 #, c-format msgid "cipher extension \"%s\" not loaded due to unsafe permissions\n" msgstr "cipher extension “[1m%s[0m” not loaded due to unsafe permissions\n" -#: g10/g10.c:2066 +#: g10/g10.c:2098 #, c-format msgid "%s is not a valid character set\n" msgstr "%s is not a valid character set\n" -#: g10/g10.c:2084 -msgid "could not parse keyserver URI\n" -msgstr "could not parse keyserver URI\n" +#: g10/g10.c:2117 g10/keyedit.c:3212 +msgid "could not parse keyserver URL\n" +msgstr "could not parse keyserver URL\n" + +#: g10/g10.c:2123 +#, c-format +msgid "%s:%d: invalid keyserver options\n" +msgstr "%s:%d: invalid keyserver options\n" + +#: g10/g10.c:2126 +msgid "invalid keyserver options\n" +msgstr "invalid keyserver options\n" -#: g10/g10.c:2093 +#: g10/g10.c:2133 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: invalid import options\n" -#: g10/g10.c:2096 +#: g10/g10.c:2136 msgid "invalid import options\n" msgstr "invalid import options\n" -#: g10/g10.c:2103 +#: g10/g10.c:2143 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: invalid export options\n" -#: g10/g10.c:2106 +#: g10/g10.c:2146 msgid "invalid export options\n" msgstr "invalid export options\n" -#: g10/g10.c:2129 +#: g10/g10.c:2171 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: invalid list options\n" -#: g10/g10.c:2132 +#: g10/g10.c:2174 msgid "invalid list options\n" msgstr "invalid list options\n" -#: g10/g10.c:2153 +#: g10/g10.c:2197 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: invalid verify options\n" -#: g10/g10.c:2156 +#: g10/g10.c:2200 msgid "invalid verify options\n" msgstr "invalid verify options\n" -#: g10/g10.c:2163 +#: g10/g10.c:2207 #, c-format msgid "unable to set exec-path to %s\n" msgstr "unable to set exec-path to %s\n" -#: g10/g10.c:2322 +#: g10/g10.c:2397 msgid "WARNING: program may create a core file!\n" msgstr "WARNING: program may create a core file!\n" -#: g10/g10.c:2326 +#: g10/g10.c:2401 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNING: %s overrides %s\n" -#: g10/g10.c:2335 +#: g10/g10.c:2410 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s not allowed with %s!\n" -#: g10/g10.c:2338 +#: g10/g10.c:2413 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s makes no sense with %s!\n" -#: g10/g10.c:2359 +#: g10/g10.c:2434 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/g10.c:2365 +#: g10/g10.c:2440 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/g10.c:2371 +#: g10/g10.c:2446 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/g10.c:2384 +#: g10/g10.c:2459 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/g10.c:2452 g10/g10.c:2476 +#: g10/g10.c:2527 g10/g10.c:2551 msgid "selected cipher algorithm is invalid\n" msgstr "selected cipher algorithm is invalid\n" -#: g10/g10.c:2458 g10/g10.c:2482 +#: g10/g10.c:2533 g10/g10.c:2557 msgid "selected digest algorithm is invalid\n" msgstr "selected digest algorithm is invalid\n" -#: g10/g10.c:2464 +#: g10/g10.c:2539 msgid "selected compression algorithm is invalid\n" msgstr "selected compression algorithm is invalid\n" -#: g10/g10.c:2470 +#: g10/g10.c:2545 msgid "selected certification digest algorithm is invalid\n" msgstr "selected certification digest algorithm is invalid\n" -#: g10/g10.c:2485 +#: g10/g10.c:2560 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed must be greater than 0\n" -#: g10/g10.c:2487 +#: g10/g10.c:2562 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed must be greater than 1\n" -#: g10/g10.c:2489 +#: g10/g10.c:2564 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/g10.c:2491 +#: g10/g10.c:2566 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/g10.c:2493 +#: g10/g10.c:2568 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/g10.c:2496 +#: g10/g10.c:2571 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n" -#: g10/g10.c:2500 +#: g10/g10.c:2575 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "invalid S2K mode; must be 0, 1 or 3\n" -#: g10/g10.c:2507 +#: g10/g10.c:2582 msgid "invalid default preferences\n" msgstr "invalid default preferences\n" -#: g10/g10.c:2516 +#: g10/g10.c:2591 msgid "invalid personal cipher preferences\n" msgstr "invalid personal cipher preferences\n" -#: g10/g10.c:2520 +#: g10/g10.c:2595 msgid "invalid personal digest preferences\n" msgstr "invalid personal digest preferences\n" -#: g10/g10.c:2524 +#: g10/g10.c:2599 msgid "invalid personal compress preferences\n" msgstr "invalid personal compress preferences\n" -#: g10/g10.c:2557 +#: g10/g10.c:2632 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s does not yet work with %s\n" -#: g10/g10.c:2604 +#: g10/g10.c:2679 #, 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/g10.c:2609 +#: g10/g10.c:2684 #, 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/g10.c:2614 +#: g10/g10.c:2689 #, 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/g10.c:2702 +#: g10/g10.c:2777 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "failed to initialize the TrustDB: %s\n" -#: g10/g10.c:2713 +#: g10/g10.c:2788 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "WARNING: recipients (-r) given without using public key encryption\n" -#: g10/g10.c:2724 +#: g10/g10.c:2799 msgid "--store [filename]" msgstr "--store [filename]" -#: g10/g10.c:2731 +#: g10/g10.c:2806 msgid "--symmetric [filename]" msgstr "--symmetric [filename]" -#: g10/g10.c:2743 +#: g10/g10.c:2818 msgid "--encrypt [filename]" msgstr "--encrypt [filename]" -#: g10/g10.c:2756 +#: g10/g10.c:2831 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [filename]" -#: g10/g10.c:2758 +#: g10/g10.c:2833 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n" -#: g10/g10.c:2761 +#: g10/g10.c:2836 #, 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/g10.c:2779 +#: g10/g10.c:2854 msgid "--sign [filename]" msgstr "--sign [filename]" -#: g10/g10.c:2792 +#: g10/g10.c:2867 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:2807 +#: g10/g10.c:2882 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [filename]" -#: g10/g10.c:2809 +#: g10/g10.c:2884 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/g10.c:2812 +#: g10/g10.c:2887 #, 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/g10.c:2832 +#: g10/g10.c:2907 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filename]" -#: g10/g10.c:2841 +#: g10/g10.c:2916 msgid "--clearsign [filename]" msgstr "--clearsign [filename]" -#: g10/g10.c:2866 +#: g10/g10.c:2941 msgid "--decrypt [filename]" msgstr "--decrypt [filename]" -#: g10/g10.c:2874 +#: g10/g10.c:2949 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2878 +#: g10/g10.c:2953 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2882 +#: g10/g10.c:2957 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2886 +#: g10/g10.c:2961 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2910 +#: g10/g10.c:2985 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [commands]" -#: g10/g10.c:2966 g10/encode.c:474 g10/sign.c:886 +#: g10/g10.c:3041 g10/encode.c:474 g10/sign.c:891 #, c-format msgid "can't open %s: %s\n" msgstr "can't open %s: %s\n" -#: g10/g10.c:2981 +#: g10/g10.c:3056 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [keyring]" -#: g10/g10.c:3018 +#: g10/g10.c:3093 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver send failed: %s\n" -#: g10/g10.c:3020 +#: g10/g10.c:3095 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver receive failed: %s\n" -#: g10/g10.c:3022 +#: g10/g10.c:3097 #, c-format msgid "key export failed: %s\n" msgstr "key export failed: %s\n" -#: g10/g10.c:3033 +#: g10/g10.c:3108 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver search failed: %s\n" -#: g10/g10.c:3043 +#: g10/g10.c:3118 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver refresh failed: %s\n" -#: g10/g10.c:3084 +#: g10/g10.c:3159 #, c-format msgid "dearmoring failed: %s\n" msgstr "dearmoring failed: %s\n" -#: g10/g10.c:3092 +#: g10/g10.c:3167 #, c-format msgid "enarmoring failed: %s\n" msgstr "enarmoring failed: %s\n" -#: g10/g10.c:3179 +#: g10/g10.c:3254 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "invalid hash algorithm ‘[1m%s[0m’\n" -#: g10/g10.c:3302 +#: g10/g10.c:3377 msgid "[filename]" msgstr "[filename]" -#: g10/g10.c:3306 +#: g10/g10.c:3381 msgid "Go ahead and type your message ...\n" msgstr "Go ahead and type your message ...\n" -#: g10/g10.c:3309 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:3384 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 #: g10/verify.c:142 #, c-format msgid "can't open `%s'\n" msgstr "can't open ‘[1m%s[0m’\n" -#: g10/g10.c:3583 +#: g10/g10.c:3658 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1122,23 +1135,23 @@ msgstr "" "a notation name must have only printable characters or spaces, and end with " "an ‘[1m=[0m’\n" -#: g10/g10.c:3592 +#: g10/g10.c:3667 msgid "a user notation name must contain the '@' character\n" msgstr "a user notation name must contain the ‘[1m@[0m’ character\n" -#: g10/g10.c:3602 +#: g10/g10.c:3677 msgid "a notation value must not use any control characters\n" msgstr "a notation value must not use any control characters\n" -#: g10/g10.c:3636 +#: g10/g10.c:3711 msgid "the given certification policy URL is invalid\n" msgstr "the given certification policy URL is invalid\n" -#: g10/g10.c:3638 +#: g10/g10.c:3713 msgid "the given signature policy URL is invalid\n" msgstr "the given signature policy URL is invalid\n" -#: g10/g10.c:3671 +#: g10/g10.c:3746 msgid "the given signature preferred keyserver URL is invalid\n" msgstr "the given signature preferred keyserver URL is invalid\n" @@ -1191,76 +1204,76 @@ msgstr "invalid clearsig header\n" msgid "nested clear text signatures\n" msgstr "nested clear text signatures\n" -#: g10/armor.c:540 +#: g10/armor.c:553 msgid "invalid dash escaped line: " msgstr "invalid dash escaped line: " -#: g10/armor.c:552 +#: g10/armor.c:565 msgid "unexpected armor:" msgstr "unexpected armor:" -#: g10/armor.c:678 g10/armor.c:1254 +#: g10/armor.c:695 g10/armor.c:1277 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "invalid radix64 character %02x skipped\n" -#: g10/armor.c:721 +#: g10/armor.c:738 msgid "premature eof (no CRC)\n" msgstr "premature eof (no CRC)\n" -#: g10/armor.c:755 +#: g10/armor.c:772 msgid "premature eof (in CRC)\n" msgstr "premature eof (in CRC)\n" -#: g10/armor.c:759 +#: g10/armor.c:776 msgid "malformed CRC\n" msgstr "malformed CRC\n" -#: g10/armor.c:763 g10/armor.c:1291 +#: g10/armor.c:780 g10/armor.c:1314 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "CRC error; %06lx - %06lx\n" -#: g10/armor.c:783 +#: g10/armor.c:800 msgid "premature eof (in Trailer)\n" msgstr "premature eof (in Trailer)\n" -#: g10/armor.c:787 +#: g10/armor.c:804 msgid "error in trailer line\n" msgstr "error in trailer line\n" -#: g10/armor.c:1069 +#: g10/armor.c:1092 msgid "no valid OpenPGP data found.\n" msgstr "no valid OpenPGP data found.\n" -#: g10/armor.c:1074 +#: g10/armor.c:1097 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "invalid armor: line longer than %d characters\n" -#: g10/armor.c:1078 +#: g10/armor.c:1101 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/pkclist.c:63 g10/revoke.c:575 +#: g10/pkclist.c:63 g10/revoke.c:576 msgid "No reason specified" msgstr "No reason specified" -#: g10/pkclist.c:65 g10/revoke.c:577 +#: g10/pkclist.c:65 g10/revoke.c:578 msgid "Key is superseded" msgstr "Key is superseded" -#: g10/pkclist.c:67 g10/revoke.c:576 +#: g10/pkclist.c:67 g10/revoke.c:577 msgid "Key has been compromised" msgstr "Key has been compromised" -#: g10/pkclist.c:69 g10/revoke.c:578 +#: g10/pkclist.c:69 g10/revoke.c:579 msgid "Key is no longer used" msgstr "Key is no longer used" -#: g10/pkclist.c:71 g10/revoke.c:579 +#: g10/pkclist.c:71 g10/revoke.c:580 msgid "User ID is no longer valid" msgstr "User ID is no longer valid" @@ -1272,11 +1285,11 @@ msgstr "reason for revocation: " msgid "revocation comment: " msgstr "revocation comment: " -#: g10/pkclist.c:265 +#: g10/pkclist.c:197 msgid "iImMqQsS" msgstr "iImMqQsS" -#: g10/pkclist.c:273 +#: g10/pkclist.c:205 #, c-format msgid "" "No trust value assigned to:\n" @@ -1285,11 +1298,11 @@ msgstr "" "No trust value assigned to:\n" "%4u%c/%08lX %s \"" -#: g10/pkclist.c:302 g10/mainproc.c:1508 +#: g10/pkclist.c:234 g10/mainproc.c:1536 msgid " aka \"" msgstr " aka \"" -#: g10/pkclist.c:313 g10/keyedit.c:310 +#: g10/pkclist.c:245 g10/keyedit.c:311 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -1301,48 +1314,48 @@ msgstr "" "checking fingerprints from different sources...)?\n" "\n" -#: g10/pkclist.c:317 +#: g10/pkclist.c:249 #, 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:319 +#: g10/pkclist.c:251 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = I do NOT trust\n" -#: g10/pkclist.c:321 +#: g10/pkclist.c:253 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = I trust marginally\n" -#: g10/pkclist.c:323 +#: g10/pkclist.c:255 #, c-format msgid " %d = I trust fully\n" msgstr " %d = I trust fully\n" -#: g10/pkclist.c:325 +#: g10/pkclist.c:257 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = I trust ultimately\n" -#: g10/pkclist.c:328 +#: g10/pkclist.c:260 msgid " i = please show me more information\n" msgstr " i = please show me more information\n" -#: g10/pkclist.c:331 +#: g10/pkclist.c:263 msgid " m = back to the main menu\n" msgstr " m = back to the main menu\n" -#: g10/pkclist.c:334 +#: g10/pkclist.c:266 msgid " s = skip this key\n" msgstr " s = skip this key\n" -#: g10/pkclist.c:335 +#: g10/pkclist.c:267 msgid " q = quit\n" msgstr " q = quit\n" -#: g10/pkclist.c:339 +#: g10/pkclist.c:271 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -1351,61 +1364,61 @@ msgstr "" "The minimum trust level for this key is: %s\n" "\n" -#: g10/pkclist.c:345 g10/revoke.c:604 +#: g10/pkclist.c:277 g10/revoke.c:605 msgid "Your decision? " msgstr "Your decision? " -#: g10/pkclist.c:366 +#: g10/pkclist.c:298 msgid "Do you really want to set this key to ultimate trust? " msgstr "Do you really want to set this key to ultimate trust? " -#: g10/pkclist.c:380 +#: g10/pkclist.c:312 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "Certificates leading to an ultimately trusted key:\n" -#: g10/pkclist.c:455 +#: g10/pkclist.c:386 #, c-format msgid "key %08lX: key has been revoked!\n" msgstr "key %08lX: key has been revoked!\n" -#: g10/pkclist.c:462 g10/pkclist.c:474 g10/pkclist.c:573 +#: g10/pkclist.c:393 g10/pkclist.c:405 g10/pkclist.c:504 msgid "Use this key anyway? " msgstr "Use this key anyway? " -#: g10/pkclist.c:467 +#: g10/pkclist.c:398 #, c-format msgid "key %08lX: subkey has been revoked!\n" msgstr "key %08lX: subkey has been revoked!\n" -#: g10/pkclist.c:488 +#: g10/pkclist.c:419 #, c-format msgid "%08lX: key has expired\n" msgstr "%08lX: key has expired\n" -#: g10/pkclist.c:498 +#: g10/pkclist.c:429 #, c-format msgid "%08lX: There is no assurance this key belongs to the named user\n" msgstr "%08lX: There is no assurance this key belongs to the named user\n" -#: g10/pkclist.c:504 +#: g10/pkclist.c:435 #, c-format msgid "%08lX: We do NOT trust this key\n" msgstr "%08lX: We do NOT trust this key\n" -#: g10/pkclist.c:509 +#: g10/pkclist.c:440 #, c-format msgid "%08lX: There is limited assurance this key belongs to the named user\n" msgstr "%08lX: There is limited assurance this key belongs to the named user\n" -#: g10/pkclist.c:515 +#: g10/pkclist.c:446 msgid "This key probably belongs to the named user\n" msgstr "This key probably belongs to the named user\n" -#: g10/pkclist.c:520 +#: g10/pkclist.c:451 msgid "This key belongs to us\n" msgstr "This key belongs to us\n" -#: g10/pkclist.c:568 +#: g10/pkclist.c:499 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" @@ -1417,90 +1430,90 @@ msgstr "" "you may answer the next question with yes\n" "\n" -#: g10/pkclist.c:582 g10/pkclist.c:612 +#: g10/pkclist.c:513 g10/pkclist.c:543 msgid "WARNING: Using untrusted key!\n" msgstr "WARNING: Using untrusted key!\n" -#: g10/pkclist.c:619 +#: g10/pkclist.c:550 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:628 +#: g10/pkclist.c:559 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:631 +#: g10/pkclist.c:562 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:632 +#: g10/pkclist.c:563 msgid " This could mean that the signature is forgery.\n" msgstr " This could mean that the signature is forgery.\n" -#: g10/pkclist.c:638 +#: g10/pkclist.c:569 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:643 +#: g10/pkclist.c:574 msgid "Note: This key has been disabled.\n" msgstr "Note: This key has been disabled.\n" -#: g10/pkclist.c:648 +#: g10/pkclist.c:579 msgid "Note: This key has expired!\n" msgstr "Note: This key has expired!\n" -#: g10/pkclist.c:659 +#: g10/pkclist.c:590 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:661 +#: g10/pkclist.c:592 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:669 +#: g10/pkclist.c:600 msgid "WARNING: We do NOT trust this key!\n" msgstr "WARNING: We do NOT trust this key!\n" -#: g10/pkclist.c:670 +#: g10/pkclist.c:601 msgid " The signature is probably a FORGERY.\n" msgstr " The signature is probably a FORGERY.\n" -#: g10/pkclist.c:678 +#: g10/pkclist.c:609 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:680 +#: g10/pkclist.c:611 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:832 g10/pkclist.c:868 g10/encode.c:791 +#: g10/pkclist.c:763 g10/pkclist.c:799 g10/encode.c:791 #, 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/pkclist.c:845 g10/pkclist.c:878 g10/pkclist.c:1047 g10/pkclist.c:1107 +#: g10/pkclist.c:776 g10/pkclist.c:809 g10/pkclist.c:978 g10/pkclist.c:1038 #, c-format msgid "%s: skipped: %s\n" msgstr "%s: skipped: %s\n" -#: g10/pkclist.c:855 g10/pkclist.c:1079 +#: g10/pkclist.c:786 g10/pkclist.c:1010 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: skipped: public key already present\n" -#: g10/pkclist.c:897 +#: g10/pkclist.c:828 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:913 +#: g10/pkclist.c:844 msgid "Current recipients:\n" msgstr "Current recipients:\n" -#: g10/pkclist.c:939 +#: g10/pkclist.c:870 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -1508,123 +1521,123 @@ msgstr "" "\n" "Enter the user ID. End with an empty line: " -#: g10/pkclist.c:955 +#: g10/pkclist.c:886 msgid "No such user ID.\n" msgstr "No such user ID.\n" -#: g10/pkclist.c:960 g10/pkclist.c:1022 +#: g10/pkclist.c:891 g10/pkclist.c:953 msgid "skipped: public key already set as default recipient\n" msgstr "skipped: public key already set as default recipient\n" -#: g10/pkclist.c:978 +#: g10/pkclist.c:909 msgid "Public key is disabled.\n" msgstr "Public key is disabled.\n" -#: g10/pkclist.c:985 +#: g10/pkclist.c:916 msgid "skipped: public key already set\n" msgstr "skipped: public key already set\n" -#: g10/pkclist.c:1014 +#: g10/pkclist.c:945 #, c-format msgid "unknown default recipient `%s'\n" msgstr "unknown default recipient ‘[1m%s[0m’\n" -#: g10/pkclist.c:1059 +#: g10/pkclist.c:990 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s: skipped: public key is disabled\n" -#: g10/pkclist.c:1114 +#: g10/pkclist.c:1045 msgid "no valid addressees\n" msgstr "no valid addressees\n" -#: g10/keygen.c:204 +#: g10/keygen.c:207 #, c-format msgid "preference `%s' duplicated\n" msgstr "preference ‘[1m%s[0m’ duplicated\n" -#: g10/keygen.c:211 +#: g10/keygen.c:214 msgid "too many cipher preferences\n" msgstr "too many cipher preferences\n" -#: g10/keygen.c:213 +#: g10/keygen.c:216 msgid "too many digest preferences\n" msgstr "too many digest preferences\n" -#: g10/keygen.c:215 +#: g10/keygen.c:218 msgid "too many compression preferences\n" msgstr "too many compression preferences\n" -#: g10/keygen.c:312 +#: g10/keygen.c:315 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "invalid item ‘[1m%s[0m’ in preference string\n" -#: g10/keygen.c:637 +#: g10/keygen.c:734 msgid "writing direct signature\n" msgstr "writing direct signature\n" -#: g10/keygen.c:676 +#: g10/keygen.c:773 msgid "writing self signature\n" msgstr "writing self signature\n" -#: g10/keygen.c:720 +#: g10/keygen.c:819 msgid "writing key binding signature\n" msgstr "writing key binding signature\n" -#: g10/keygen.c:774 g10/keygen.c:858 g10/keygen.c:949 +#: g10/keygen.c:881 g10/keygen.c:965 g10/keygen.c:1056 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "keysize invalid; using %u bits\n" -#: g10/keygen.c:779 g10/keygen.c:863 g10/keygen.c:954 +#: g10/keygen.c:886 g10/keygen.c:970 g10/keygen.c:1061 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "keysize rounded up to %u bits\n" -#: g10/keygen.c:1054 +#: g10/keygen.c:1161 msgid "Please select what kind of key you want:\n" msgstr "Please select what kind of key you want:\n" -#: g10/keygen.c:1056 +#: g10/keygen.c:1163 #, c-format msgid " (%d) DSA and Elgamal (default)\n" msgstr " (%d) DSA and Elgamal (default)\n" -#: g10/keygen.c:1057 +#: g10/keygen.c:1164 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (sign only)\n" -#: g10/keygen.c:1059 +#: g10/keygen.c:1166 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (encrypt only)\n" -#: g10/keygen.c:1060 +#: g10/keygen.c:1167 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (sign only)\n" -#: g10/keygen.c:1062 +#: g10/keygen.c:1169 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (encrypt only)\n" -#: g10/keygen.c:1064 +#: g10/keygen.c:1171 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (sign and encrypt)\n" -#: g10/keygen.c:1067 g10/keyedit.c:319 g10/keyedit.c:340 g10/keyedit.c:356 +#: g10/keygen.c:1174 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355 msgid "Your selection? " msgstr "Your selection? " -#: g10/keygen.c:1101 g10/keyedit.c:800 g10/revoke.c:637 +#: g10/keygen.c:1208 g10/keyedit.c:800 g10/revoke.c:638 msgid "Invalid selection.\n" msgstr "Invalid selection.\n" -#: g10/keygen.c:1114 +#: g10/keygen.c:1221 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1637,28 +1650,28 @@ msgstr "" " default keysize is 1024 bits\n" " highest suggested keysize is 2048 bits\n" -#: g10/keygen.c:1123 +#: g10/keygen.c:1230 msgid "What keysize do you want? (1024) " msgstr "What keysize do you want? (1024) " -#: g10/keygen.c:1128 +#: g10/keygen.c:1235 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA only allows keysizes from 512 to 1024\n" -#: g10/keygen.c:1130 +#: g10/keygen.c:1237 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n" msgstr "keysize too small; 1024 is smallest value allowed for RSA.\n" -#: g10/keygen.c:1133 +#: g10/keygen.c:1240 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "keysize too small; 768 is smallest value allowed.\n" -#: g10/keygen.c:1144 +#: g10/keygen.c:1251 #, c-format msgid "keysize too large; %d is largest value allowed.\n" msgstr "keysize too large; %d is largest value allowed.\n" -#: g10/keygen.c:1149 +#: g10/keygen.c:1256 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1666,11 +1679,11 @@ msgstr "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" -#: g10/keygen.c:1152 +#: g10/keygen.c:1259 msgid "Are you sure that you want this keysize? " msgstr "Are you sure that you want this keysize? " -#: g10/keygen.c:1153 +#: g10/keygen.c:1260 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1678,17 +1691,17 @@ msgstr "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" -#: g10/keygen.c:1162 +#: g10/keygen.c:1269 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Requested keysize is %u bits\n" -#: g10/keygen.c:1165 g10/keygen.c:1169 +#: g10/keygen.c:1272 g10/keygen.c:1276 #, c-format msgid "rounded up to %u bits\n" msgstr "rounded up to %u bits\n" -#: g10/keygen.c:1220 +#: g10/keygen.c:1327 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1704,7 +1717,7 @@ msgstr "" " <n>m = key expires in n months\n" " <n>y = key expires in n years\n" -#: g10/keygen.c:1229 +#: g10/keygen.c:1336 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1720,29 +1733,29 @@ msgstr "" " <n>m = signature expires in n months\n" " <n>y = signature expires in n years\n" -#: g10/keygen.c:1251 +#: g10/keygen.c:1358 msgid "Key is valid for? (0) " msgstr "Key is valid for? (0) " -#: g10/keygen.c:1253 +#: g10/keygen.c:1360 msgid "Signature is valid for? (0) " msgstr "Signature is valid for? (0) " -#: g10/keygen.c:1258 +#: g10/keygen.c:1365 msgid "invalid value\n" msgstr "invalid value\n" -#: g10/keygen.c:1263 +#: g10/keygen.c:1370 #, c-format msgid "%s does not expire at all\n" msgstr "%s does not expire at all\n" -#: g10/keygen.c:1270 +#: g10/keygen.c:1377 #, c-format msgid "%s expires at %s\n" msgstr "%s expires at %s\n" -#: g10/keygen.c:1276 +#: g10/keygen.c:1383 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1750,11 +1763,11 @@ msgstr "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" -#: g10/keygen.c:1281 +#: g10/keygen.c:1388 msgid "Is this correct (y/n)? " msgstr "Is this correct (y/n)? " -#: g10/keygen.c:1324 +#: g10/keygen.c:1431 msgid "" "\n" "You need a User-ID to identify your key; the software constructs the user " @@ -1770,44 +1783,44 @@ msgstr "" " “[1mHeinrich Heine (Der Dichter) <[email protected]>[0m”\n" "\n" -#: g10/keygen.c:1336 +#: g10/keygen.c:1443 msgid "Real name: " msgstr "Real name: " -#: g10/keygen.c:1344 +#: g10/keygen.c:1451 msgid "Invalid character in name\n" msgstr "Invalid character in name\n" -#: g10/keygen.c:1346 +#: g10/keygen.c:1453 msgid "Name may not start with a digit\n" msgstr "Name may not start with a digit\n" -#: g10/keygen.c:1348 +#: g10/keygen.c:1455 msgid "Name must be at least 5 characters long\n" msgstr "Name must be at least 5 characters long\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1463 msgid "Email address: " msgstr "Email address: " -#: g10/keygen.c:1367 +#: g10/keygen.c:1474 msgid "Not a valid email address\n" msgstr "Not a valid email address\n" -#: g10/keygen.c:1375 +#: g10/keygen.c:1482 msgid "Comment: " msgstr "Comment: " -#: g10/keygen.c:1381 +#: g10/keygen.c:1488 msgid "Invalid character in comment\n" msgstr "Invalid character in comment\n" -#: g10/keygen.c:1404 +#: g10/keygen.c:1511 #, 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:1410 +#: g10/keygen.c:1517 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1818,27 +1831,27 @@ msgstr "" " “[1m%s[0m”\n" "\n" -#: g10/keygen.c:1415 +#: g10/keygen.c:1522 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" -#: g10/keygen.c:1420 +#: g10/keygen.c:1527 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1430 +#: g10/keygen.c:1537 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:1431 +#: g10/keygen.c:1538 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:1450 +#: g10/keygen.c:1557 msgid "Please correct the error first\n" msgstr "Please correct the error first\n" -#: g10/keygen.c:1489 +#: g10/keygen.c:1596 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1846,16 +1859,16 @@ msgstr "" "You need a Passphrase to protect your secret key.\n" "\n" -#: g10/keygen.c:1498 g10/keyedit.c:1005 +#: g10/keygen.c:1605 g10/keyedit.c:1005 msgid "passphrase not correctly repeated; try again" msgstr "passphrase not correctly repeated; try again" -#: g10/keygen.c:1499 +#: g10/keygen.c:1606 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1505 +#: g10/keygen.c:1612 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" @@ -1867,7 +1880,7 @@ msgstr "" "using this program with the option “[1m--edit-key[0m”.\n" "\n" -#: g10/keygen.c:1526 +#: g10/keygen.c:1634 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" @@ -1879,58 +1892,58 @@ msgstr "" "disks) during the prime generation; this gives the random number\n" "generator a better chance to gain enough entropy.\n" -#: g10/keygen.c:2084 g10/revoke.c:214 g10/revoke.c:414 +#: g10/keygen.c:2202 g10/revoke.c:215 g10/revoke.c:415 msgid "sorry, can't do this in batch mode\n" msgstr "sorry, can't do this in batch mode\n" -#: g10/keygen.c:2145 +#: g10/keygen.c:2263 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA keypair will have 1024 bits.\n" -#: g10/keygen.c:2213 +#: g10/keygen.c:2331 msgid "Key generation canceled.\n" msgstr "Key generation canceled.\n" -#: g10/keygen.c:2321 g10/keygen.c:2446 +#: g10/keygen.c:2447 g10/keygen.c:2572 #, c-format msgid "writing public key to `%s'\n" msgstr "writing public key to ‘[1m%s[0m’\n" -#: g10/keygen.c:2323 g10/keygen.c:2449 +#: g10/keygen.c:2449 g10/keygen.c:2575 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "writing secret key stub to ‘[1m%s[0m’\n" -#: g10/keygen.c:2326 g10/keygen.c:2452 +#: g10/keygen.c:2452 g10/keygen.c:2578 #, c-format msgid "writing secret key to `%s'\n" msgstr "writing secret key to ‘[1m%s[0m’\n" -#: g10/keygen.c:2435 +#: g10/keygen.c:2561 #, c-format msgid "no writable public keyring found: %s\n" msgstr "no writable public keyring found: %s\n" -#: g10/keygen.c:2441 +#: g10/keygen.c:2567 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "no writable secret keyring found: %s\n" -#: g10/keygen.c:2459 +#: g10/keygen.c:2585 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "error writing public keyring ‘[1m%s[0m’: %s\n" -#: g10/keygen.c:2466 +#: g10/keygen.c:2592 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "error writing secret keyring ‘[1m%s[0m’: %s\n" -#: g10/keygen.c:2489 +#: g10/keygen.c:2615 msgid "public and secret key created and signed.\n" msgstr "public and secret key created and signed.\n" -#: g10/keygen.c:2500 +#: g10/keygen.c:2626 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a secondary key for this purpose.\n" @@ -1939,30 +1952,30 @@ msgstr "" "the command “[1m--edit-key[0m” to generate a secondary key for this " "purpose.\n" -#: g10/keygen.c:2512 g10/keygen.c:2623 +#: g10/keygen.c:2638 g10/keygen.c:2751 #, c-format msgid "Key generation failed: %s\n" msgstr "Key generation failed: %s\n" -#: g10/keygen.c:2558 g10/sign.c:290 +#: g10/keygen.c:2687 g10/sign.c:290 #, 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:2560 g10/sign.c:292 +#: g10/keygen.c:2689 g10/sign.c:292 #, 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:2569 +#: g10/keygen.c:2698 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:2598 +#: g10/keygen.c:2726 msgid "Really create? " msgstr "Really create? " @@ -1976,7 +1989,7 @@ msgstr "--output doesn't work for this command\n" msgid "%s: can't open: %s\n" msgstr "%s: can't open: %s\n" -#: g10/encode.c:203 g10/sign.c:1139 +#: g10/encode.c:203 g10/sign.c:1144 #, c-format msgid "error creating passphrase: %s\n" msgstr "error creating passphrase: %s\n" @@ -2020,7 +2033,7 @@ msgstr "" msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n" -#: g10/encode.c:634 g10/sign.c:858 +#: g10/encode.c:634 g10/sign.c:863 #, c-format msgid "forcing compression algorithm %s (%d) violates recipient preferences\n" msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n" @@ -2030,37 +2043,32 @@ msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n" msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s encrypted for: “[1m%s[0m”\n" -#: g10/export.c:163 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:224 +#: g10/export.c:162 g10/keyedit.c:2700 g10/delkey.c:74 g10/revoke.c:225 #, c-format msgid "key `%s' not found: %s\n" msgstr "key ‘[1m%s[0m’ not found: %s\n" -#: g10/export.c:185 g10/delkey.c:82 g10/revoke.c:230 g10/revoke.c:435 +#: g10/export.c:184 g10/delkey.c:82 g10/revoke.c:231 g10/revoke.c:436 #, c-format msgid "error reading keyblock: %s\n" msgstr "error reading keyblock: %s\n" -#: g10/export.c:194 -#, c-format -msgid "key %08lX: not a rfc2440 key - skipped\n" -msgstr "key %08lX: not a rfc2440 key - skipped\n" - -#: g10/export.c:210 +#: g10/export.c:198 #, c-format -msgid "key %08lX: not protected - skipped\n" -msgstr "key %08lX: not protected - skipped\n" +msgid "key %s: not protected - skipped\n" +msgstr "key %s: not protected - skipped\n" -#: g10/export.c:218 +#: g10/export.c:206 #, c-format -msgid "key %08lX: PGP 2.x style key - skipped\n" -msgstr "key %08lX: PGP 2.x style key - skipped\n" +msgid "key %s: PGP 2.x style key - skipped\n" +msgstr "key %s: PGP 2.x style key - skipped\n" -#: g10/export.c:363 +#: g10/export.c:353 #, c-format -msgid "WARNING: secret key %08lX does not have a simple SK checksum\n" -msgstr "WARNING: secret key %08lX does not have a simple SK checksum\n" +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:395 +#: g10/export.c:385 msgid "WARNING: nothing exported\n" msgstr "WARNING: nothing exported\n" @@ -2068,29 +2076,29 @@ msgstr "WARNING: nothing exported\n" msgid "too many entries in pk cache - disabled\n" msgstr "too many entries in pk cache - disabled\n" -#: g10/getkey.c:186 g10/getkey.c:2646 +#: g10/getkey.c:186 g10/getkey.c:2693 msgid "[User id not found]" msgstr "[User id not found]" -#: g10/getkey.c:1620 +#: g10/getkey.c:1614 #, c-format -msgid "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" -msgstr "Invalid key %08lX made valid by --allow-non-selfsigned-uid\n" +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:2128 +#: g10/getkey.c:2169 #, c-format -msgid "no secret subkey for public subkey %08lX - ignoring\n" -msgstr "no secret subkey for public subkey %08lX - ignoring\n" +msgid "no secret subkey for public subkey %s - ignoring\n" +msgstr "no secret subkey for public subkey %s - ignoring\n" -#: g10/getkey.c:2356 +#: g10/getkey.c:2400 #, c-format -msgid "using secondary key %08lX instead of primary key %08lX\n" -msgstr "using secondary key %08lX instead of primary key %08lX\n" +msgid "using secondary key %s instead of primary key %s\n" +msgstr "using secondary key %s instead of primary key %s\n" -#: g10/getkey.c:2403 +#: g10/getkey.c:2447 #, c-format -msgid "key %08lX: secret key without public key - skipped\n" -msgstr "key %08lX: secret key without public key - skipped\n" +msgid "key %s: secret key without public key - skipped\n" +msgstr "key %s: secret key without public key - skipped\n" #: g10/import.c:241 #, c-format @@ -2172,351 +2180,353 @@ msgstr " secret keys unchanged: %lu\n" msgid " not imported: %lu\n" msgstr " not imported: %lu\n" -#: g10/import.c:567 g10/import.c:581 g10/import.c:595 +#: g10/import.c:537 #, c-format -msgid "WARNING: key %08lX contains preferences for unavailable algorithms:\n" -msgstr "WARNING: key %08lX contains preferences for unavailable algorithms:\n" +msgid "WARNING: key %s contains preferences for unavailable\n" +msgstr "WARNING: key %s contains preferences for unavailable\n" + +#: g10/import.c:539 +msgid "algorithms on these user IDs:\n" +msgstr "algorithms on these user IDs:\n" -#: g10/import.c:570 +#: g10/import.c:576 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr " “[1m%s[0m”: preference for cipher algorithm %s\n" -#: g10/import.c:584 +#: g10/import.c:588 #, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr " “[1m%s[0m”: preference for digest algorithm %s\n" -#: g10/import.c:598 +#: g10/import.c:600 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr " “[1m%s[0m”: preference for compression algorithm %s\n" -#: g10/import.c:611 +#: g10/import.c:613 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:613 +#: g10/import.c:615 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:637 +#: g10/import.c:639 #, c-format -msgid "" -"you can update your preferences with: gpg --edit-key %08lX updpref save\n" -msgstr "" -"you can update your preferences with: gpg --edit-key %08lX updpref save\n" +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:682 g10/import.c:1026 +#: g10/import.c:687 g10/import.c:1041 #, c-format -msgid "key %08lX: no user ID\n" -msgstr "key %08lX: no user ID\n" +msgid "key %s: no user ID\n" +msgstr "key %s: no user ID\n" -#: g10/import.c:702 +#: g10/import.c:707 #, c-format -msgid "key %08lX: PKS subkey corruption repaired\n" -msgstr "key %08lX: PKS subkey corruption repaired\n" +msgid "key %s: PKS subkey corruption repaired\n" +msgstr "key %s: PKS subkey corruption repaired\n" -#: g10/import.c:717 +#: g10/import.c:722 #, c-format -msgid "key %08lX: accepted non self-signed user ID '%s'\n" -msgstr "key %08lX: accepted non self-signed user ID ‘[1m%s[0m’\n" +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:723 +#: g10/import.c:728 #, c-format -msgid "key %08lX: no valid user IDs\n" -msgstr "key %08lX: no valid user IDs\n" +msgid "key %s: no valid user IDs\n" +msgstr "key %s: no valid user IDs\n" -#: g10/import.c:725 +#: g10/import.c:730 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:734 g10/import.c:1133 +#: g10/import.c:740 g10/import.c:1151 #, c-format -msgid "key %08lX: public key not found: %s\n" -msgstr "key %08lX: public key not found: %s\n" +msgid "key %s: public key not found: %s\n" +msgstr "key %s: public key not found: %s\n" -#: g10/import.c:740 +#: g10/import.c:746 #, c-format -msgid "key %08lX: new key - skipped\n" -msgstr "key %08lX: new key - skipped\n" +msgid "key %s: new key - skipped\n" +msgstr "key %s: new key - skipped\n" -#: g10/import.c:749 +#: g10/import.c:755 #, c-format msgid "no writable keyring found: %s\n" msgstr "no writable keyring found: %s\n" -#: g10/import.c:754 g10/sign.c:765 g10/sign.c:1001 g10/openfile.c:253 +#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253 #, c-format msgid "writing to `%s'\n" msgstr "writing to ‘[1m%s[0m’\n" -#: g10/import.c:757 g10/import.c:843 g10/import.c:1055 g10/import.c:1193 +#: g10/import.c:766 g10/import.c:856 g10/import.c:1070 g10/import.c:1212 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "error writing keyring ‘[1m%s[0m’: %s\n" -#: g10/import.c:775 +#: g10/import.c:785 #, c-format -msgid "key %08lX: public key \"%s\" imported\n" -msgstr "key %08lX: public key “[1m%s[0m” imported\n" +msgid "key %s: public key \"%s\" imported\n" +msgstr "key %s: public key “[1m%s[0m” imported\n" -#: g10/import.c:797 +#: g10/import.c:809 #, c-format -msgid "key %08lX: doesn't match our copy\n" -msgstr "key %08lX: doesn't match our copy\n" +msgid "key %s: doesn't match our copy\n" +msgstr "key %s: doesn't match our copy\n" -#: g10/import.c:814 g10/import.c:1150 +#: g10/import.c:826 g10/import.c:1169 #, c-format -msgid "key %08lX: can't locate original keyblock: %s\n" -msgstr "key %08lX: can't locate original keyblock: %s\n" +msgid "key %s: can't locate original keyblock: %s\n" +msgstr "key %s: can't locate original keyblock: %s\n" -#: g10/import.c:821 g10/import.c:1156 +#: g10/import.c:834 g10/import.c:1176 #, c-format -msgid "key %08lX: can't read original keyblock: %s\n" -msgstr "key %08lX: can't read original keyblock: %s\n" +msgid "key %s: can't read original keyblock: %s\n" +msgstr "key %s: can't read original keyblock: %s\n" -#: g10/import.c:852 +#: g10/import.c:866 #, c-format -msgid "key %08lX: \"%s\" 1 new user ID\n" -msgstr "key %08lX: “[1m%s[0m” 1 new user ID\n" +msgid "key %s: \"%s\" 1 new user ID\n" +msgstr "key %s: “[1m%s[0m” 1 new user ID\n" -#: g10/import.c:855 +#: g10/import.c:869 #, c-format -msgid "key %08lX: \"%s\" %d new user IDs\n" -msgstr "key %08lX: “[1m%s[0m” %d new user IDs\n" +msgid "key %s: \"%s\" %d new user IDs\n" +msgstr "key %s: “[1m%s[0m” %d new user IDs\n" -#: g10/import.c:858 +#: g10/import.c:872 #, c-format -msgid "key %08lX: \"%s\" 1 new signature\n" -msgstr "key %08lX: “[1m%s[0m” 1 new signature\n" +msgid "key %s: \"%s\" 1 new signature\n" +msgstr "key %s: “[1m%s[0m” 1 new signature\n" -#: g10/import.c:861 +#: g10/import.c:875 #, c-format -msgid "key %08lX: \"%s\" %d new signatures\n" -msgstr "key %08lX: “[1m%s[0m” %d new signatures\n" +msgid "key %s: \"%s\" %d new signatures\n" +msgstr "key %s: “[1m%s[0m” %d new signatures\n" -#: g10/import.c:864 +#: g10/import.c:878 #, c-format -msgid "key %08lX: \"%s\" 1 new subkey\n" -msgstr "key %08lX: “[1m%s[0m” 1 new subkey\n" +msgid "key %s: \"%s\" 1 new subkey\n" +msgstr "key %s: “[1m%s[0m” 1 new subkey\n" -#: g10/import.c:867 +#: g10/import.c:881 #, c-format -msgid "key %08lX: \"%s\" %d new subkeys\n" -msgstr "key %08lX: “[1m%s[0m” %d new subkeys\n" +msgid "key %s: \"%s\" %d new subkeys\n" +msgstr "key %s: “[1m%s[0m” %d new subkeys\n" -#: g10/import.c:888 +#: g10/import.c:902 #, c-format -msgid "key %08lX: \"%s\" not changed\n" -msgstr "key %08lX: “[1m%s[0m” not changed\n" +msgid "key %s: \"%s\" not changed\n" +msgstr "key %s: “[1m%s[0m” not changed\n" -#: g10/import.c:1032 +#: g10/import.c:1047 #, c-format -msgid "key %08lX: secret key with invalid cipher %d - skipped\n" -msgstr "key %08lX: secret key with invalid cipher %d - skipped\n" +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:1049 +#: g10/import.c:1064 #, c-format msgid "no default secret keyring: %s\n" msgstr "no default secret keyring: %s\n" -#: g10/import.c:1060 +#: g10/import.c:1075 #, c-format -msgid "key %08lX: secret key imported\n" -msgstr "key %08lX: secret key imported\n" +msgid "key %s: secret key imported\n" +msgstr "key %s: secret key imported\n" -#: g10/import.c:1088 +#: g10/import.c:1104 #, c-format -msgid "key %08lX: already in secret keyring\n" -msgstr "key %08lX: already in secret keyring\n" +msgid "key %s: already in secret keyring\n" +msgstr "key %s: already in secret keyring\n" -#: g10/import.c:1098 +#: g10/import.c:1114 #, c-format -msgid "key %08lX: secret key not found: %s\n" -msgstr "key %08lX: secret key not found: %s\n" +msgid "key %s: secret key not found: %s\n" +msgstr "key %s: secret key not found: %s\n" -#: g10/import.c:1127 +#: g10/import.c:1144 #, c-format -msgid "key %08lX: no public key - can't apply revocation certificate\n" -msgstr "key %08lX: no public key - can't apply revocation certificate\n" +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:1167 +#: g10/import.c:1187 #, c-format -msgid "key %08lX: invalid revocation certificate: %s - rejected\n" -msgstr "key %08lX: invalid revocation certificate: %s - rejected\n" +msgid "key %s: invalid revocation certificate: %s - rejected\n" +msgstr "key %s: invalid revocation certificate: %s - rejected\n" -#: g10/import.c:1199 +#: g10/import.c:1219 #, c-format -msgid "key %08lX: \"%s\" revocation certificate imported\n" -msgstr "key %08lX: “[1m%s[0m” revocation certificate imported\n" +msgid "key %s: \"%s\" revocation certificate imported\n" +msgstr "key %s: “[1m%s[0m” revocation certificate imported\n" -#: g10/import.c:1263 +#: g10/import.c:1284 #, c-format -msgid "key %08lX: no user ID for signature\n" -msgstr "key %08lX: no user ID for signature\n" +msgid "key %s: no user ID for signature\n" +msgstr "key %s: no user ID for signature\n" -#: g10/import.c:1278 +#: g10/import.c:1299 #, c-format -msgid "key %08lX: unsupported public key algorithm on user id \"%s\"\n" -msgstr "key %08lX: unsupported public key algorithm on user id “[1m%s[0m”\n" +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:1280 +#: g10/import.c:1301 #, c-format -msgid "key %08lX: invalid self-signature on user id \"%s\"\n" -msgstr "key %08lX: invalid self-signature on user id “[1m%s[0m”\n" +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:1297 +#: g10/import.c:1319 #, c-format -msgid "key %08lX: no subkey for key binding\n" -msgstr "key %08lX: no subkey for key binding\n" +msgid "key %s: no subkey for key binding\n" +msgstr "key %s: no subkey for key binding\n" -#: g10/import.c:1306 g10/import.c:1350 +#: g10/import.c:1330 g10/import.c:1380 #, c-format -msgid "key %08lX: unsupported public key algorithm\n" -msgstr "key %08lX: unsupported public key algorithm\n" +msgid "key %s: unsupported public key algorithm\n" +msgstr "key %s: unsupported public key algorithm\n" -#: g10/import.c:1307 +#: g10/import.c:1332 #, c-format -msgid "key %08lX: invalid subkey binding\n" -msgstr "key %08lX: invalid subkey binding\n" +msgid "key %s: invalid subkey binding\n" +msgstr "key %s: invalid subkey binding\n" -#: g10/import.c:1320 +#: g10/import.c:1347 #, c-format -msgid "key %08lX: removed multiple subkey binding\n" -msgstr "key %08lX: removed multiple subkey binding\n" +msgid "key %s: removed multiple subkey binding\n" +msgstr "key %s: removed multiple subkey binding\n" -#: g10/import.c:1341 +#: g10/import.c:1369 #, c-format -msgid "key %08lX: no subkey for key revocation\n" -msgstr "key %08lX: no subkey for key revocation\n" +msgid "key %s: no subkey for key revocation\n" +msgstr "key %s: no subkey for key revocation\n" -#: g10/import.c:1351 +#: g10/import.c:1382 #, c-format -msgid "key %08lX: invalid subkey revocation\n" -msgstr "key %08lX: invalid subkey revocation\n" +msgid "key %s: invalid subkey revocation\n" +msgstr "key %s: invalid subkey revocation\n" -#: g10/import.c:1364 +#: g10/import.c:1397 #, c-format -msgid "key %08lX: removed multiple subkey revocation\n" -msgstr "key %08lX: removed multiple subkey revocation\n" +msgid "key %s: removed multiple subkey revocation\n" +msgstr "key %s: removed multiple subkey revocation\n" -#: g10/import.c:1403 +#: g10/import.c:1439 #, c-format -msgid "key %08lX: skipped user ID '" -msgstr "key %08lX: skipped user ID '" +msgid "key %s: skipped user ID '%s'\n" +msgstr "key %s: skipped user ID ‘[1m%s[0m’\n" -#: g10/import.c:1426 +#: g10/import.c:1460 #, c-format -msgid "key %08lX: skipped subkey\n" -msgstr "key %08lX: skipped subkey\n" +msgid "key %s: skipped subkey\n" +msgstr "key %s: skipped subkey\n" -#: g10/import.c:1453 +#: g10/import.c:1487 #, c-format -msgid "key %08lX: non exportable signature (class %02x) - skipped\n" -msgstr "key %08lX: non exportable signature (class %02x) - skipped\n" +msgid "key %s: non exportable signature (class %02x) - skipped\n" +msgstr "key %s: non exportable signature (class %02x) - skipped\n" -#: g10/import.c:1462 +#: g10/import.c:1497 #, c-format -msgid "key %08lX: revocation certificate at wrong place - skipped\n" -msgstr "key %08lX: revocation certificate at wrong place - skipped\n" +msgid "key %s: revocation certificate at wrong place - skipped\n" +msgstr "key %s: revocation certificate at wrong place - skipped\n" -#: g10/import.c:1479 +#: g10/import.c:1514 #, c-format -msgid "key %08lX: invalid revocation certificate: %s - skipped\n" -msgstr "key %08lX: invalid revocation certificate: %s - skipped\n" +msgid "key %s: invalid revocation certificate: %s - skipped\n" +msgstr "key %s: invalid revocation certificate: %s - skipped\n" -#: g10/import.c:1492 +#: g10/import.c:1528 #, c-format -msgid "key %08lX: subkey signature in wrong place - skipped\n" -msgstr "key %08lX: subkey signature in wrong place - skipped\n" +msgid "key %s: subkey signature in wrong place - skipped\n" +msgstr "key %s: subkey signature in wrong place - skipped\n" -#: g10/import.c:1500 +#: g10/import.c:1536 #, c-format -msgid "key %08lX: unexpected signature class (0x%02X) - skipped\n" -msgstr "key %08lX: unexpected signature class (0x%02X) - skipped\n" +msgid "key %s: unexpected signature class (0x%02X) - skipped\n" +msgstr "key %s: unexpected signature class (0x%02X) - skipped\n" -#: g10/import.c:1599 +#: g10/import.c:1636 #, c-format -msgid "key %08lX: duplicated user ID detected - merged\n" -msgstr "key %08lX: duplicated user ID detected - merged\n" +msgid "key %s: duplicated user ID detected - merged\n" +msgstr "key %s: duplicated user ID detected - merged\n" -#: g10/import.c:1658 +#: g10/import.c:1698 #, c-format -msgid "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" -msgstr "WARNING: key %08lX may be revoked: fetching revocation key %08lX\n" +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:1672 +#: g10/import.c:1711 #, c-format -msgid "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" -msgstr "WARNING: key %08lX may be revoked: revocation key %08lX not present.\n" +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:1730 +#: g10/import.c:1770 #, c-format -msgid "key %08lX: \"%s\" revocation certificate added\n" -msgstr "key %08lX: “[1m%s[0m” revocation certificate added\n" +msgid "key %s: \"%s\" revocation certificate added\n" +msgstr "key %s: “[1m%s[0m” revocation certificate added\n" -#: g10/import.c:1763 +#: g10/import.c:1804 #, c-format -msgid "key %08lX: direct key signature added\n" -msgstr "key %08lX: direct key signature added\n" +msgid "key %s: direct key signature added\n" +msgstr "key %s: direct key signature added\n" -#: g10/keyedit.c:161 +#: g10/keyedit.c:159 msgid "[revocation]" msgstr "[revocation]" -#: g10/keyedit.c:162 +#: g10/keyedit.c:160 msgid "[self-signature]" msgstr "[self-signature]" -#: g10/keyedit.c:236 g10/keylist.c:320 +#: g10/keyedit.c:237 g10/keylist.c:319 msgid "1 bad signature\n" msgstr "1 bad signature\n" -#: g10/keyedit.c:238 g10/keylist.c:322 +#: g10/keyedit.c:239 g10/keylist.c:321 #, c-format msgid "%d bad signatures\n" msgstr "%d bad signatures\n" -#: g10/keyedit.c:240 g10/keylist.c:324 +#: g10/keyedit.c:241 g10/keylist.c:323 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:242 g10/keylist.c:326 +#: g10/keyedit.c:243 g10/keylist.c:325 #, 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:244 g10/keylist.c:328 +#: g10/keyedit.c:245 g10/keylist.c:327 msgid "1 signature not checked due to an error\n" msgstr "1 signature not checked due to an error\n" -#: g10/keyedit.c:246 g10/keylist.c:330 +#: g10/keyedit.c:247 g10/keylist.c:329 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d signatures not checked due to errors\n" -#: g10/keyedit.c:248 +#: g10/keyedit.c:249 msgid "1 user ID without valid self-signature detected\n" msgstr "1 user ID without valid self-signature detected\n" -#: g10/keyedit.c:250 +#: g10/keyedit.c:251 #, 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:313 +#: g10/keyedit.c:314 #, c-format msgid " (%d) I trust marginally\n" msgstr " (%d) I trust marginally\n" -#: g10/keyedit.c:314 +#: g10/keyedit.c:315 #, c-format msgid " (%d) I trust fully\n" msgstr " (%d) I trust fully\n" -#: g10/keyedit.c:333 +#: g10/keyedit.c:334 msgid "" "Please enter the depth of this trust signature.\n" "A depth greater than 1 allows the key you are signing to make\n" @@ -2526,36 +2536,36 @@ msgstr "" "A depth greater than 1 allows the key you are signing to make\n" "trust signatures on your behalf.\n" -#: g10/keyedit.c:351 +#: g10/keyedit.c:350 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:494 +#: g10/keyedit.c:493 #, c-format msgid "User ID \"%s\" is revoked." msgstr "User ID “[1m%s[0m” is revoked." -#: g10/keyedit.c:501 g10/keyedit.c:521 g10/keyedit.c:542 g10/keyedit.c:692 -#: g10/keyedit.c:750 g10/keyedit.c:1355 +#: g10/keyedit.c:500 g10/keyedit.c:520 g10/keyedit.c:541 g10/keyedit.c:692 +#: g10/keyedit.c:750 g10/keyedit.c:1354 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:509 g10/keyedit.c:529 g10/keyedit.c:550 g10/keyedit.c:698 -#: g10/keyedit.c:1361 +#: g10/keyedit.c:508 g10/keyedit.c:528 g10/keyedit.c:549 g10/keyedit.c:698 +#: g10/keyedit.c:1360 msgid " Unable to sign.\n" msgstr " Unable to sign.\n" -#: g10/keyedit.c:514 +#: g10/keyedit.c:513 #, c-format msgid "User ID \"%s\" is expired." msgstr "User ID “[1m%s[0m” is expired." -#: g10/keyedit.c:534 +#: g10/keyedit.c:533 #, c-format msgid "User ID \"%s\" is not self-signed." msgstr "User ID “[1m%s[0m” is not self-signed." -#: g10/keyedit.c:569 +#: g10/keyedit.c:568 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2564,11 +2574,11 @@ msgstr "" "The self-signature on “[1m%s[0m”\n" "is a PGP 2.x-style signature.\n" -#: g10/keyedit.c:578 +#: g10/keyedit.c:577 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:592 +#: g10/keyedit.c:591 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2577,12 +2587,12 @@ msgstr "" "Your current signature on “[1m%s[0m”\n" "has expired.\n" -#: g10/keyedit.c:596 +#: g10/keyedit.c:595 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:617 +#: g10/keyedit.c:616 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2591,28 +2601,28 @@ msgstr "" "Your current signature on “[1m%s[0m”\n" "is a local signature.\n" -#: g10/keyedit.c:621 +#: g10/keyedit.c:620 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:642 +#: g10/keyedit.c:641 #, c-format -msgid "\"%s\" was already locally signed by key %08lX\n" -msgstr "“[1m%s[0m” was already locally signed by key %08lX\n" +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:646 +#: g10/keyedit.c:644 #, c-format -msgid "\"%s\" was already signed by key %08lX\n" -msgstr "“[1m%s[0m” was already signed by key %08lX\n" +msgid "\"%s\" was already signed by key %s\n" +msgstr "“[1m%s[0m” was already signed by key %s\n" -#: g10/keyedit.c:651 +#: g10/keyedit.c:649 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:671 #, c-format -msgid "Nothing to sign with key %08lX\n" -msgstr "Nothing to sign with key %08lX\n" +msgid "Nothing to sign with key %s\n" +msgstr "Nothing to sign with key %s\n" #: g10/keyedit.c:686 msgid "This key has expired!" @@ -2750,7 +2760,7 @@ msgstr "" msgid "Really sign? " msgstr "Really sign? " -#: g10/keyedit.c:906 g10/keyedit.c:3610 g10/keyedit.c:3701 g10/keyedit.c:3774 +#: g10/keyedit.c:906 g10/keyedit.c:3632 g10/keyedit.c:3723 g10/keyedit.c:3796 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" @@ -3109,158 +3119,158 @@ msgstr "showphoto" msgid "show photo ID" msgstr "show photo ID" -#: g10/keyedit.c:1187 g10/delkey.c:120 +#: g10/keyedit.c:1186 g10/delkey.c:120 msgid "can't do that in batchmode\n" msgstr "can't do that in batchmode\n" -#: g10/keyedit.c:1218 +#: g10/keyedit.c:1217 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "error reading secret keyblock ‘[1m%s[0m’: %s\n" -#: g10/keyedit.c:1235 +#: g10/keyedit.c:1234 msgid "Secret key is available.\n" msgstr "Secret key is available.\n" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1266 msgid "Command> " msgstr "Command> " -#: g10/keyedit.c:1297 +#: g10/keyedit.c:1296 msgid "Need the secret key to do this.\n" msgstr "Need the secret key to do this.\n" -#: g10/keyedit.c:1301 +#: g10/keyedit.c:1300 msgid "Please use the command \"toggle\" first.\n" msgstr "Please use the command “[1mtoggle[0m” first.\n" -#: g10/keyedit.c:1349 +#: g10/keyedit.c:1348 msgid "Key is revoked." msgstr "Key is revoked." -#: g10/keyedit.c:1368 +#: g10/keyedit.c:1367 msgid "Really sign all user IDs? " msgstr "Really sign all user IDs? " -#: g10/keyedit.c:1369 +#: g10/keyedit.c:1368 msgid "Hint: Select the user IDs to sign\n" msgstr "Hint: Select the user IDs to sign\n" -#: g10/keyedit.c:1394 +#: g10/keyedit.c:1393 #, 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:1414 g10/keyedit.c:1435 g10/keyedit.c:1494 +#: g10/keyedit.c:1415 g10/keyedit.c:1436 g10/keyedit.c:1495 msgid "You must select at least one user ID.\n" msgstr "You must select at least one user ID.\n" -#: g10/keyedit.c:1416 +#: g10/keyedit.c:1417 msgid "You can't delete the last user ID!\n" msgstr "You can't delete the last user ID!\n" -#: g10/keyedit.c:1419 +#: g10/keyedit.c:1420 msgid "Really remove all selected user IDs? " msgstr "Really remove all selected user IDs? " -#: g10/keyedit.c:1420 +#: g10/keyedit.c:1421 msgid "Really remove this user ID? " msgstr "Really remove this user ID? " -#: g10/keyedit.c:1458 g10/keyedit.c:1513 +#: g10/keyedit.c:1459 g10/keyedit.c:1514 msgid "You must select at least one key.\n" msgstr "You must select at least one key.\n" -#: g10/keyedit.c:1461 +#: g10/keyedit.c:1462 msgid "Do you really want to delete the selected keys? " msgstr "Do you really want to delete the selected keys? " -#: g10/keyedit.c:1462 +#: g10/keyedit.c:1463 msgid "Do you really want to delete this key? " msgstr "Do you really want to delete this key? " -#: g10/keyedit.c:1497 +#: g10/keyedit.c:1498 msgid "Really revoke all selected user IDs? " msgstr "Really revoke all selected user IDs? " -#: g10/keyedit.c:1498 +#: g10/keyedit.c:1499 msgid "Really revoke this user ID? " msgstr "Really revoke this user ID? " -#: g10/keyedit.c:1517 +#: g10/keyedit.c:1518 msgid "Do you really want to revoke the selected keys? " msgstr "Do you really want to revoke the selected keys? " -#: g10/keyedit.c:1518 +#: g10/keyedit.c:1519 msgid "Do you really want to revoke this key? " msgstr "Do you really want to revoke this key? " -#: g10/keyedit.c:1557 +#: g10/keyedit.c:1558 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "" "Owner trust may not be set while using an user provided trust database\n" -#: g10/keyedit.c:1589 +#: g10/keyedit.c:1590 msgid "Set preference list to:\n" msgstr "Set preference list to:\n" -#: g10/keyedit.c:1595 +#: g10/keyedit.c:1596 msgid "Really update the preferences for the selected user IDs? " msgstr "Really update the preferences for the selected user IDs? " -#: g10/keyedit.c:1597 +#: g10/keyedit.c:1598 msgid "Really update the preferences? " msgstr "Really update the preferences? " -#: g10/keyedit.c:1643 +#: g10/keyedit.c:1646 msgid "Save changes? " msgstr "Save changes? " -#: g10/keyedit.c:1646 +#: g10/keyedit.c:1649 msgid "Quit without saving? " msgstr "Quit without saving? " -#: g10/keyedit.c:1656 +#: g10/keyedit.c:1659 #, c-format msgid "update failed: %s\n" msgstr "update failed: %s\n" -#: g10/keyedit.c:1663 +#: g10/keyedit.c:1666 #, c-format msgid "update secret failed: %s\n" msgstr "update secret failed: %s\n" -#: g10/keyedit.c:1670 +#: g10/keyedit.c:1673 msgid "Key not changed so no update needed.\n" msgstr "Key not changed so no update needed.\n" -#: g10/keyedit.c:1682 +#: g10/keyedit.c:1685 msgid "Invalid command (try \"help\")\n" msgstr "Invalid command (try “[1mhelp[0m”)\n" -#: g10/keyedit.c:1741 +#: g10/keyedit.c:1744 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1793 +#: g10/keyedit.c:1796 msgid "Features: " msgstr "Features: " -#: g10/keyedit.c:1804 +#: g10/keyedit.c:1807 msgid "Keyserver no-modify" msgstr "Keyserver no-modify" -#: g10/keyedit.c:2044 +#: g10/keyedit.c:2047 #, c-format msgid "This key may be revoked by %s key " msgstr "This key may be revoked by %s key " -#: g10/keyedit.c:2048 +#: g10/keyedit.c:2051 msgid " (sensitive)" msgstr " (sensitive)" -#: g10/keyedit.c:2065 +#: g10/keyedit.c:2065 g10/keyedit.c:2119 g10/keyedit.c:2222 g10/keyedit.c:2237 #, c-format msgid "created: %s" msgstr "created: %s" @@ -3275,30 +3285,25 @@ msgstr "revoked: %s" msgid "expired: %s" msgstr "expired: %s" -#: g10/keyedit.c:2072 +#: g10/keyedit.c:2072 g10/keyedit.c:2121 g10/keyedit.c:2224 g10/keyedit.c:2239 #, c-format msgid "expires: %s" msgstr "expires: %s" -#: g10/keyedit.c:2089 +#: g10/keyedit.c:2087 #, c-format msgid "trust: %s" msgstr "trust: %s" -#: g10/keyedit.c:2093 +#: g10/keyedit.c:2091 #, c-format msgid "validity: %s" msgstr "validity: %s" -#: g10/keyedit.c:2100 +#: g10/keyedit.c:2098 msgid "This key has been disabled" msgstr "This key has been disabled" -#: g10/keyedit.c:2114 g10/keyedit.c:2217 g10/keyedit.c:2232 -#, c-format -msgid "%s%c %4u%c/%08lX created: %s expires: %s" -msgstr "%s%c %4u%c/%08lX created: %s expires: %s" - #: g10/keyedit.c:2130 #, c-format msgid "rev! subkey has been revoked: %s\n" @@ -3313,11 +3318,11 @@ msgstr "rev- faked revocation found\n" msgid "rev? problem checking revocation: %s\n" msgstr "rev? problem checking revocation: %s\n" -#: g10/keyedit.c:2160 g10/keylist.c:709 g10/mainproc.c:1516 g10/trustdb.c:1123 +#: g10/keyedit.c:2160 g10/keylist.c:696 g10/mainproc.c:1544 g10/trustdb.c:1124 msgid "revoked" msgstr "revoked" -#: g10/keyedit.c:2162 g10/keylist.c:709 g10/mainproc.c:1518 g10/trustdb.c:500 +#: g10/keyedit.c:2162 g10/keylist.c:698 g10/mainproc.c:1546 g10/trustdb.c:499 msgid "expired" msgstr "expired" @@ -3333,7 +3338,7 @@ msgstr "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" -#: g10/keyedit.c:2256 g10/mainproc.c:924 +#: g10/keyedit.c:2256 g10/mainproc.c:923 msgid "[revoked] " msgstr "[revoked] " @@ -3349,7 +3354,7 @@ 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:2382 +#: g10/keyedit.c:2383 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3359,45 +3364,45 @@ msgstr "" "versions\n" " of PGP to reject this key.\n" -#: g10/keyedit.c:2387 g10/keyedit.c:2660 +#: g10/keyedit.c:2388 g10/keyedit.c:2661 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:2393 +#: g10/keyedit.c:2394 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:2528 +#: g10/keyedit.c:2529 msgid "Delete this good signature? (y/N/q)" msgstr "Delete this good signature? (y/N/q)" -#: g10/keyedit.c:2538 +#: g10/keyedit.c:2539 msgid "Delete this invalid signature? (y/N/q)" msgstr "Delete this invalid signature? (y/N/q)" -#: g10/keyedit.c:2542 +#: g10/keyedit.c:2543 msgid "Delete this unknown signature? (y/N/q)" msgstr "Delete this unknown signature? (y/N/q)" -#: g10/keyedit.c:2548 +#: g10/keyedit.c:2549 msgid "Really delete this self-signature? (y/N)" msgstr "Really delete this self-signature? (y/N)" -#: g10/keyedit.c:2562 +#: g10/keyedit.c:2563 #, c-format msgid "Deleted %d signature.\n" msgstr "Deleted %d signature.\n" -#: g10/keyedit.c:2563 +#: g10/keyedit.c:2564 #, c-format msgid "Deleted %d signatures.\n" msgstr "Deleted %d signatures.\n" -#: g10/keyedit.c:2566 +#: g10/keyedit.c:2567 msgid "Nothing deleted.\n" msgstr "Nothing deleted.\n" -#: g10/keyedit.c:2655 +#: g10/keyedit.c:2656 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3407,11 +3412,11 @@ msgstr "" "cause\n" " some versions of PGP to reject this key.\n" -#: g10/keyedit.c:2666 +#: g10/keyedit.c:2667 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:2689 +#: g10/keyedit.c:2687 msgid "Enter the user ID of the designated revoker: " msgstr "Enter the user ID of the designated revoker: " @@ -3427,217 +3432,217 @@ msgstr "you cannot appoint a key as its own designated revoker\n" 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:2776 +#: g10/keyedit.c:2766 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:2782 +#: g10/keyedit.c:2772 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:2843 +#: g10/keyedit.c:2833 msgid "Please remove selections from the secret keys.\n" msgstr "Please remove selections from the secret keys.\n" -#: g10/keyedit.c:2849 +#: g10/keyedit.c:2839 msgid "Please select at most one secondary key.\n" msgstr "Please select at most one secondary key.\n" -#: g10/keyedit.c:2853 +#: g10/keyedit.c:2843 msgid "Changing expiration time for a secondary key.\n" msgstr "Changing expiration time for a secondary key.\n" -#: g10/keyedit.c:2855 +#: g10/keyedit.c:2846 msgid "Changing expiration time for the primary key.\n" msgstr "Changing expiration time for the primary key.\n" -#: g10/keyedit.c:2900 +#: g10/keyedit.c:2892 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:2916 +#: g10/keyedit.c:2908 msgid "No corresponding signature in secret ring\n" msgstr "No corresponding signature in secret ring\n" -#: g10/keyedit.c:2996 +#: g10/keyedit.c:2988 msgid "Please select exactly one user ID.\n" msgstr "Please select exactly one user ID.\n" -#: g10/keyedit.c:3033 g10/keyedit.c:3142 g10/keyedit.c:3234 +#: g10/keyedit.c:3027 g10/keyedit.c:3137 g10/keyedit.c:3251 #, 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:3198 +#: g10/keyedit.c:3199 msgid "Enter your preferred keyserver URL: " msgstr "Enter your preferred keyserver URL: " -#: g10/keyedit.c:3296 +#: g10/keyedit.c:3315 #, c-format msgid "No user ID with index %d\n" msgstr "No user ID with index %d\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3361 #, c-format msgid "No secondary key with index %d\n" msgstr "No secondary key with index %d\n" -#: g10/keyedit.c:3456 +#: g10/keyedit.c:3475 msgid "user ID: \"" msgstr "user ID: \"" -#: g10/keyedit.c:3461 +#: g10/keyedit.c:3480 #, c-format msgid "" "\"\n" -"signed with your key %08lX at %s\n" +"signed with your key %s at %s\n" msgstr "" "\"\n" -"signed with your key %08lX at %s\n" +"signed with your key %s at %s\n" -#: g10/keyedit.c:3464 +#: g10/keyedit.c:3483 #, c-format msgid "" "\"\n" -"locally signed with your key %08lX at %s\n" +"locally signed with your key %s at %s\n" msgstr "" "\"\n" -"locally signed with your key %08lX at %s\n" +"locally signed with your key %s at %s\n" -#: g10/keyedit.c:3469 +#: g10/keyedit.c:3488 #, c-format msgid "This signature expired on %s.\n" msgstr "This signature expired on %s.\n" -#: g10/keyedit.c:3473 +#: g10/keyedit.c:3492 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:3477 +#: g10/keyedit.c:3496 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Create a revocation certificate for this signature? (y/N) " -#: g10/keyedit.c:3502 +#: g10/keyedit.c:3521 msgid "You have signed these user IDs:\n" msgstr "You have signed these user IDs:\n" -#: g10/keyedit.c:3521 +#: g10/keyedit.c:3542 #, c-format -msgid " signed by %08lX at %s%s%s\n" -msgstr " signed by %08lX at %s%s%s\n" +msgid " signed by %s on %s%s%s\n" +msgstr " signed by %s on %s%s%s\n" -#: g10/keyedit.c:3529 +#: g10/keyedit.c:3551 #, c-format -msgid " revoked by %08lX at %s\n" -msgstr " revoked by %08lX at %s\n" +msgid " revoked by %s on %s\n" +msgstr " revoked by %s on %s\n" -#: g10/keyedit.c:3549 +#: g10/keyedit.c:3571 msgid "You are about to revoke these signatures:\n" msgstr "You are about to revoke these signatures:\n" -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3581 #, c-format -msgid " signed by %08lX at %s%s\n" -msgstr " signed by %08lX at %s%s\n" +msgid " signed by %s on %s%s\n" +msgstr " signed by %s on %s%s\n" -#: g10/keyedit.c:3561 +#: g10/keyedit.c:3583 msgid " (non-exportable)" msgstr " (non-exportable)" -#: g10/keyedit.c:3568 +#: g10/keyedit.c:3590 msgid "Really create the revocation certificates? (y/N) " msgstr "Really create the revocation certificates? (y/N) " -#: g10/keyedit.c:3598 +#: g10/keyedit.c:3620 msgid "no secret key\n" msgstr "no secret key\n" -#: g10/keyedit.c:3668 +#: g10/keyedit.c:3690 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "user ID “[1m%s[0m” is already revoked\n" -#: g10/keyedit.c:3685 +#: g10/keyedit.c:3707 #, 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:3858 +#: g10/keyedit.c:3876 #, c-format -msgid "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" -msgstr "Displaying %s photo ID of size %ld for key 0x%08lX (uid %d)\n" +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/keylist.c:192 +#: g10/keylist.c:179 msgid "Critical signature policy: " msgstr "Critical signature policy: " -#: g10/keylist.c:194 +#: g10/keylist.c:181 msgid "Signature policy: " msgstr "Signature policy: " -#: g10/keylist.c:233 +#: g10/keylist.c:220 msgid "Critical preferred keyserver: " msgstr "Critical preferred keyserver: " -#: g10/keylist.c:235 +#: g10/keylist.c:222 msgid "Preferred keyserver: " msgstr "Preferred keyserver: " -#: g10/keylist.c:274 g10/keylist.c:313 +#: g10/keylist.c:268 g10/keylist.c:312 msgid "WARNING: invalid notation data found\n" msgstr "WARNING: invalid notation data found\n" -#: g10/keylist.c:288 +#: g10/keylist.c:286 msgid "Critical signature notation: " msgstr "Critical signature notation: " -#: g10/keylist.c:290 +#: g10/keylist.c:288 msgid "Signature notation: " msgstr "Signature notation: " -#: g10/keylist.c:301 +#: g10/keylist.c:299 msgid "not human readable" msgstr "not human readable" -#: g10/keylist.c:401 +#: g10/keylist.c:400 msgid "Keyring" msgstr "Keyring" -#: g10/keylist.c:638 g10/keylist.c:674 g10/keylist.c:776 g10/keylist.c:805 -#: g10/mainproc.c:926 +#: g10/keylist.c:629 g10/keylist.c:658 g10/keylist.c:756 g10/keylist.c:781 +#: g10/mainproc.c:925 #, c-format msgid " [expires: %s]" msgstr " [expires: %s]" -#: g10/keylist.c:670 g10/keylist.c:772 +#: g10/keylist.c:654 g10/keylist.c:752 #, c-format msgid " [revoked: %s]" msgstr " [revoked: %s]" -#: g10/keylist.c:672 g10/keylist.c:774 +#: g10/keylist.c:656 g10/keylist.c:754 #, c-format msgid " [expired: %s]" msgstr " [expired: %s]" -#: g10/keylist.c:1393 +#: g10/keylist.c:1366 msgid "Primary key fingerprint:" msgstr "Primary key fingerprint:" -#: g10/keylist.c:1395 +#: g10/keylist.c:1368 msgid " Subkey fingerprint:" msgstr " Subkey fingerprint:" -#: g10/keylist.c:1402 +#: g10/keylist.c:1375 msgid " Primary key fingerprint:" msgstr " Primary key fingerprint:" -#: g10/keylist.c:1404 +#: g10/keylist.c:1377 msgid " Subkey fingerprint:" msgstr " Subkey fingerprint:" -#: g10/keylist.c:1408 g10/keylist.c:1412 +#: g10/keylist.c:1381 g10/keylist.c:1385 msgid " Key fingerprint =" msgstr " Key fingerprint =" @@ -3668,172 +3673,172 @@ msgstr "encrypted with unknown algorithm %d\n" #: g10/mainproc.c:366 #, c-format -msgid "public key is %08lX\n" -msgstr "public key is %08lX\n" +msgid "public key is %s\n" +msgstr "public key is %s\n" #: g10/mainproc.c:421 msgid "public key encrypted data: good DEK\n" msgstr "public key encrypted data: good DEK\n" -#: g10/mainproc.c:454 +#: g10/mainproc.c:455 #, c-format -msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n" -msgstr "encrypted with %u-bit %s key, ID %08lX, created %s\n" +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:464 +#: g10/mainproc.c:465 #, c-format -msgid "encrypted with %s key, ID %08lX\n" -msgstr "encrypted with %s key, ID %08lX\n" +msgid "encrypted with %s key, ID %s\n" +msgstr "encrypted with %s key, ID %s\n" -#: g10/mainproc.c:478 +#: g10/mainproc.c:479 #, c-format msgid "public key decryption failed: %s\n" msgstr "public key decryption failed: %s\n" -#: g10/mainproc.c:492 +#: g10/mainproc.c:493 #, c-format msgid "encrypted with %lu passphrases\n" msgstr "encrypted with %lu passphrases\n" -#: g10/mainproc.c:494 +#: g10/mainproc.c:495 msgid "encrypted with 1 passphrase\n" msgstr "encrypted with 1 passphrase\n" -#: g10/mainproc.c:522 g10/mainproc.c:544 +#: g10/mainproc.c:523 g10/mainproc.c:545 #, c-format msgid "assuming %s encrypted data\n" msgstr "assuming %s encrypted data\n" -#: g10/mainproc.c:530 +#: g10/mainproc.c:531 #, 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:562 +#: g10/mainproc.c:563 msgid "decryption okay\n" msgstr "decryption okay\n" -#: g10/mainproc.c:566 +#: g10/mainproc.c:567 msgid "WARNING: message was not integrity protected\n" msgstr "WARNING: message was not integrity protected\n" -#: g10/mainproc.c:579 +#: g10/mainproc.c:580 msgid "WARNING: encrypted message has been manipulated!\n" msgstr "WARNING: encrypted message has been manipulated!\n" -#: g10/mainproc.c:585 +#: g10/mainproc.c:586 #, c-format msgid "decryption failed: %s\n" msgstr "decryption failed: %s\n" -#: g10/mainproc.c:605 +#: g10/mainproc.c:606 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "NOTE: sender requested “[1mfor-your-eyes-only[0m”\n" -#: g10/mainproc.c:607 +#: g10/mainproc.c:608 #, c-format msgid "original file name='%.*s'\n" msgstr "original file name='%.*s'\n" -#: g10/mainproc.c:779 +#: g10/mainproc.c:780 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "standalone revocation - use “[1mgpg --import[0m” to apply\n" -#: g10/mainproc.c:1279 +#: g10/mainproc.c:1276 msgid "signature verification suppressed\n" msgstr "signature verification suppressed\n" -#: g10/mainproc.c:1321 g10/mainproc.c:1331 +#: g10/mainproc.c:1318 g10/mainproc.c:1328 msgid "can't handle these multiple signatures\n" msgstr "can't handle these multiple signatures\n" -#: g10/mainproc.c:1342 +#: g10/mainproc.c:1338 #, c-format -msgid "Signature made %.*s\n" -msgstr "Signature made %.*s\n" +msgid "Signature made %s\n" +msgstr "Signature made %s\n" -#: g10/mainproc.c:1343 +#: g10/mainproc.c:1339 #, c-format -msgid " using %s key %08lX%08lX\n" -msgstr " using %s key %08lX%08lX\n" +msgid " using %s key %s\n" +msgstr " using %s key %s\n" -#: g10/mainproc.c:1347 +#: g10/mainproc.c:1343 #, c-format -msgid "Signature made %.*s using %s key ID %08lX\n" -msgstr "Signature made %.*s using %s key ID %08lX\n" +msgid "Signature made %s using %s key ID %s\n" +msgstr "Signature made %s using %s key ID %s\n" -#: g10/mainproc.c:1372 +#: g10/mainproc.c:1363 msgid "Key available at: " msgstr "Key available at: " -#: g10/mainproc.c:1435 g10/mainproc.c:1471 +#: g10/mainproc.c:1463 g10/mainproc.c:1499 msgid "BAD signature from \"" msgstr "BAD signature from \"" -#: g10/mainproc.c:1436 g10/mainproc.c:1472 +#: g10/mainproc.c:1464 g10/mainproc.c:1500 msgid "Expired signature from \"" msgstr "Expired signature from \"" -#: g10/mainproc.c:1437 g10/mainproc.c:1473 +#: g10/mainproc.c:1465 g10/mainproc.c:1501 msgid "Good signature from \"" msgstr "Good signature from \"" -#: g10/mainproc.c:1475 +#: g10/mainproc.c:1503 msgid "[uncertain]" msgstr "[uncertain]" -#: g10/mainproc.c:1601 +#: g10/mainproc.c:1631 #, c-format msgid "Signature expired %s\n" msgstr "Signature expired %s\n" -#: g10/mainproc.c:1606 +#: g10/mainproc.c:1636 #, c-format msgid "Signature expires %s\n" msgstr "Signature expires %s\n" -#: g10/mainproc.c:1609 +#: g10/mainproc.c:1639 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signature, digest algorithm %s\n" -#: g10/mainproc.c:1610 +#: g10/mainproc.c:1640 msgid "binary" msgstr "binary" -#: g10/mainproc.c:1611 +#: g10/mainproc.c:1641 msgid "textmode" msgstr "textmode" -#: g10/mainproc.c:1611 g10/trustdb.c:499 +#: g10/mainproc.c:1641 g10/trustdb.c:498 msgid "unknown" msgstr "unknown" -#: g10/mainproc.c:1631 +#: g10/mainproc.c:1661 #, c-format msgid "Can't check signature: %s\n" msgstr "Can't check signature: %s\n" -#: g10/mainproc.c:1699 g10/mainproc.c:1715 g10/mainproc.c:1801 +#: g10/mainproc.c:1729 g10/mainproc.c:1745 g10/mainproc.c:1831 msgid "not a detached signature\n" msgstr "not a detached signature\n" -#: g10/mainproc.c:1742 +#: g10/mainproc.c:1772 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:1750 +#: g10/mainproc.c:1780 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "standalone signature of class 0x%02x\n" -#: g10/mainproc.c:1807 +#: g10/mainproc.c:1837 msgid "old style (PGP 2.x) signature\n" msgstr "old style (PGP 2.x) signature\n" -#: g10/mainproc.c:1817 +#: g10/mainproc.c:1847 msgid "invalid root packet detected in proc_tree()\n" msgstr "invalid root packet detected in proc_tree()\n" @@ -3888,74 +3893,74 @@ msgstr "uncompressed|none" msgid "this message may not be usable by %s\n" msgstr "this message may not be usable by %s\n" -#: g10/misc.c:742 +#: g10/misc.c:777 #, c-format msgid "ambiguous option `%s'\n" msgstr "ambiguous option ‘[1m%s[0m’\n" -#: g10/misc.c:767 +#: g10/misc.c:802 #, c-format msgid "unknown option `%s'\n" msgstr "unknown option ‘[1m%s[0m’\n" -#: g10/parse-packet.c:121 +#: g10/parse-packet.c:120 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "can't handle public key algorithm %d\n" -#: g10/parse-packet.c:690 +#: g10/parse-packet.c:703 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "WARNING: potentially insecure symmetrically encrypted session key\n" -#: g10/parse-packet.c:1103 +#: g10/parse-packet.c:1128 #, 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:460 g10/passphrase.c:507 +#: g10/passphrase.c:461 g10/passphrase.c:508 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent is not available in this session\n" -#: g10/passphrase.c:468 +#: g10/passphrase.c:469 msgid "can't set client pid for the agent\n" msgstr "can't set client pid for the agent\n" -#: g10/passphrase.c:476 +#: g10/passphrase.c:477 msgid "can't get server read FD for the agent\n" msgstr "can't get server read FD for the agent\n" -#: g10/passphrase.c:483 +#: g10/passphrase.c:484 msgid "can't get server write FD for the agent\n" msgstr "can't get server write FD for the agent\n" -#: g10/passphrase.c:516 +#: g10/passphrase.c:517 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "malformed GPG_AGENT_INFO environment variable\n" -#: g10/passphrase.c:529 +#: g10/passphrase.c:530 #, 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:550 +#: g10/passphrase.c:551 #, c-format msgid "can't connect to `%s': %s\n" msgstr "can't connect to ‘[1m%s[0m’: %s\n" -#: g10/passphrase.c:572 +#: g10/passphrase.c:573 msgid "communication problem with gpg-agent\n" msgstr "communication problem with gpg-agent\n" -#: g10/passphrase.c:579 g10/passphrase.c:879 g10/passphrase.c:991 +#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992 msgid "problem with the agent - disabling agent use\n" msgstr "problem with the agent - disabling agent use\n" -#: g10/passphrase.c:680 g10/passphrase.c:1132 +#: g10/passphrase.c:681 #, c-format msgid " (main key ID %08lX)" msgstr " (main key ID %08lX)" -#: g10/passphrase.c:690 +#: g10/passphrase.c:691 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -3966,40 +3971,40 @@ msgstr "" "“[1m%.*s[0m”\n" "%u-bit %s key, ID %08lX, created %s%s\n" -#: g10/passphrase.c:712 +#: g10/passphrase.c:713 msgid "Repeat passphrase\n" msgstr "Repeat passphrase\n" -#: g10/passphrase.c:714 +#: g10/passphrase.c:715 msgid "Enter passphrase\n" msgstr "Enter passphrase\n" -#: g10/passphrase.c:752 +#: g10/passphrase.c:753 msgid "passphrase too long\n" msgstr "passphrase too long\n" -#: g10/passphrase.c:765 +#: g10/passphrase.c:766 msgid "invalid response from agent\n" msgstr "invalid response from agent\n" -#: g10/passphrase.c:780 g10/passphrase.c:873 +#: g10/passphrase.c:781 g10/passphrase.c:874 msgid "cancelled by user\n" msgstr "cancelled by user\n" -#: g10/passphrase.c:785 g10/passphrase.c:962 +#: g10/passphrase.c:786 g10/passphrase.c:963 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "problem with the agent: agent returns 0x%lx\n" -#: g10/passphrase.c:1043 g10/passphrase.c:1179 +#: g10/passphrase.c:1044 g10/passphrase.c:1189 msgid "can't query password in batchmode\n" msgstr "can't query password in batchmode\n" -#: g10/passphrase.c:1048 g10/passphrase.c:1183 +#: g10/passphrase.c:1049 g10/passphrase.c:1193 msgid "Enter passphrase: " msgstr "Enter passphrase: " -#: g10/passphrase.c:1118 +#: g10/passphrase.c:1119 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -4009,12 +4014,22 @@ msgstr "" "You need a passphrase to unlock the secret key for\n" "user: \"" -#: g10/passphrase.c:1127 +#: g10/passphrase.c:1128 +#, c-format +msgid "%u-bit %s key, ID %s, created %s" +msgstr "%u-bit %s key, ID %s, created %s" + +#: g10/passphrase.c:1137 +#, c-format +msgid " (subkey on main key ID %s)" +msgstr " (subkey on main key ID %s)" + +#: g10/passphrase.c:1141 #, c-format -msgid "%u-bit %s key, ID %08lX, created %s" -msgstr "%u-bit %s key, ID %08lX, created %s" +msgid " (main key ID %s)" +msgstr " (main key ID %s)" -#: g10/passphrase.c:1187 +#: g10/passphrase.c:1197 msgid "Repeat passphrase: " msgstr "Repeat passphrase: " @@ -4050,8 +4065,8 @@ msgstr "can't open signed data ‘[1m%s[0m’\n" #: g10/pubkey-enc.c:103 #, c-format -msgid "anonymous recipient; trying secret key %08lX ...\n" -msgstr "anonymous recipient; trying secret key %08lX ...\n" +msgid "anonymous recipient; trying secret key %s ...\n" +msgstr "anonymous recipient; trying secret key %s ...\n" #: g10/pubkey-enc.c:119 msgid "okay, we are the anonymous recipient.\n" @@ -4073,8 +4088,8 @@ msgstr "WARNING: cipher algorithm %s not found in recipient preferences\n" #: g10/pubkey-enc.c:286 #, c-format -msgid "NOTE: secret key %08lX expired at %s\n" -msgstr "NOTE: secret key %08lX expired at %s\n" +msgid "NOTE: secret key %s expired at %s\n" +msgstr "NOTE: secret key %s expired at %s\n" #: g10/pubkey-enc.c:292 msgid "NOTE: key has been revoked" @@ -4110,62 +4125,59 @@ msgstr "generating the deprecated 16-bit checksum for secret key protection\n" msgid "WARNING: signature digest conflict in message\n" msgstr "WARNING: signature digest conflict in message\n" -#: g10/sig-check.c:146 +#: g10/sig-check.c:99 #, c-format -msgid "" -"key %08lX: this is a PGP generated Elgamal key which is NOT secure for " -"signatures!\n" -msgstr "" -"key %08lX: this is a PGP generated Elgamal key which is NOT secure for " -"signatures!\n" +msgid "WARNING: signing subkey %s is not cross-certified\n" +msgstr "WARNING: signing subkey %s is not cross-certified\n" -#: g10/sig-check.c:155 +#: g10/sig-check.c:102 #, c-format -msgid "public key %08lX is %lu second newer than the signature\n" -msgstr "public key %08lX is %lu second newer than the signature\n" +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:156 +#: g10/sig-check.c:168 #, c-format -msgid "public key %08lX is %lu seconds newer than the signature\n" -msgstr "public key %08lX is %lu seconds newer than the signature\n" +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:165 +#: g10/sig-check.c:169 +#, 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:180 #, c-format msgid "" -"key %08lX has been created %lu second in future (time warp or clock " -"problem)\n" +"key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "" -"key %08lX has been created %lu second in future (time warp or clock " -"problem)\n" +"key %s was created %lu second in the future (time warp or clock problem)\n" -#: g10/sig-check.c:167 +#: g10/sig-check.c:182 #, c-format msgid "" -"key %08lX has been created %lu seconds in future (time warp or clock " -"problem)\n" +"key %s was created %lu seconds in the future (time warp or clock problem)\n" msgstr "" -"key %08lX has been created %lu seconds in future (time warp or clock " -"problem)\n" +"key %s was created %lu seconds in the future (time warp or clock problem)\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:192 #, c-format -msgid "NOTE: signature key %08lX expired %s\n" -msgstr "NOTE: signature key %08lX expired %s\n" +msgid "NOTE: signature key %s expired %s\n" +msgstr "NOTE: signature key %s expired %s\n" -#: g10/sig-check.c:263 +#: g10/sig-check.c:275 #, c-format -msgid "assuming bad signature from key %08lX due to an unknown critical bit\n" -msgstr "assuming bad signature from key %08lX due to an unknown critical bit\n" +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:486 +#: g10/sig-check.c:532 #, c-format -msgid "key %08lX: no subkey for subkey revocation signature\n" -msgstr "key %08lX: no subkey for subkey revocation signature\n" +msgid "key %s: no subkey for subkey revocation signature\n" +msgstr "key %s: no subkey for subkey revocation signature\n" -#: g10/sig-check.c:512 +#: g10/sig-check.c:558 #, c-format -msgid "key %08lX: no subkey for subkey binding signature\n" -msgstr "key %08lX: no subkey for subkey binding signature\n" +msgid "key %s: no subkey for subkey binding signature\n" +msgstr "key %s: no subkey for subkey binding signature\n" #: g10/sign.c:85 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" @@ -4215,35 +4227,35 @@ msgstr "checking created signature failed: %s\n" msgid "%s/%s signature from: \"%s\"\n" msgstr "%s/%s signature from: “[1m%s[0m”\n" -#: g10/sign.c:548 +#: g10/sign.c:550 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "WARNING: ‘[1m%s[0m’ is an empty file\n" -#: g10/sign.c:736 +#: g10/sign.c:741 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:760 g10/sign.c:996 +#: g10/sign.c:765 g10/sign.c:1001 #, c-format msgid "can't create %s: %s\n" msgstr "can't create %s: %s\n" -#: g10/sign.c:789 +#: g10/sign.c:794 #, c-format msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "forcing digest algorithm %s (%d) violates recipient preferences\n" -#: g10/sign.c:881 +#: g10/sign.c:886 msgid "signing:" msgstr "signing:" -#: g10/sign.c:980 +#: g10/sign.c:985 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:1133 +#: g10/sign.c:1138 #, c-format msgid "%s encryption will be used\n" msgstr "%s encryption will be used\n" @@ -4398,103 +4410,103 @@ msgstr "‘[1m%s[0m’ is not a valid long keyID\n" #: g10/trustdb.c:257 #, c-format -msgid "key %08lX: accepted as trusted key\n" -msgstr "key %08lX: accepted as trusted key\n" +msgid "key %s: accepted as trusted key\n" +msgstr "key %s: accepted as trusted key\n" #: g10/trustdb.c:295 #, c-format -msgid "key %08lX occurs more than once in the trustdb\n" -msgstr "key %08lX occurs more than once in the trustdb\n" +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 %08lX: no public key for trusted key - skipped\n" -msgstr "key %08lX: no public key for trusted key - skipped\n" +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:319 +#: g10/trustdb.c:320 #, c-format -msgid "key %08lX marked as ultimately trusted\n" -msgstr "key %08lX marked as ultimately trusted\n" +msgid "key %s marked as ultimately trusted\n" +msgstr "key %s marked as ultimately trusted\n" -#: g10/trustdb.c:345 +#: 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:351 +#: 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:366 g10/tdbdump.c:59 +#: g10/trustdb.c:365 g10/tdbdump.c:59 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "trust record %lu, type %d: write failed: %s\n" -#: g10/trustdb.c:381 g10/tdbdump.c:217 +#: g10/trustdb.c:380 g10/tdbdump.c:217 #, c-format msgid "trustdb: sync failed: %s\n" msgstr "trustdb: sync failed: %s\n" -#: g10/trustdb.c:446 +#: g10/trustdb.c:445 #, 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:452 +#: g10/trustdb.c:451 #, c-format msgid "using %s trust model\n" msgstr "using %s trust model\n" -#: g10/trustdb.c:501 +#: g10/trustdb.c:500 msgid "undefined" msgstr "undefined" -#: g10/trustdb.c:502 +#: g10/trustdb.c:501 msgid "never" msgstr "never" -#: g10/trustdb.c:503 +#: g10/trustdb.c:502 msgid "marginal" msgstr "marginal" -#: g10/trustdb.c:504 +#: g10/trustdb.c:503 msgid "full" msgstr "full" -#: g10/trustdb.c:505 +#: g10/trustdb.c:504 msgid "ultimate" msgstr "ultimate" -#: g10/trustdb.c:545 +#: g10/trustdb.c:544 msgid "no need for a trustdb check\n" msgstr "no need for a trustdb check\n" -#: g10/trustdb.c:551 g10/trustdb.c:2103 +#: g10/trustdb.c:550 g10/trustdb.c:2103 #, c-format msgid "next trustdb check due at %s\n" msgstr "next trustdb check due at %s\n" -#: g10/trustdb.c:560 +#: g10/trustdb.c:559 #, 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:575 +#: g10/trustdb.c:574 #, 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:793 g10/trustdb.c:1221 +#: g10/trustdb.c:792 g10/trustdb.c:1222 #, c-format -msgid "public key %08lX not found: %s\n" -msgstr "public key %08lX not found: %s\n" +msgid "public key %s not found: %s\n" +msgstr "public key %s not found: %s\n" -#: g10/trustdb.c:988 +#: g10/trustdb.c:987 msgid "please do a --check-trustdb\n" msgstr "please do a --check-trustdb\n" -#: g10/trustdb.c:992 +#: g10/trustdb.c:991 msgid "checking the trustdb\n" msgstr "checking the trustdb\n" @@ -4509,8 +4521,8 @@ msgstr "no ultimately trusted keys found\n" #: g10/trustdb.c:1925 #, c-format -msgid "public key of ultimately trusted key %08lX not found\n" -msgstr "public key of ultimately trusted key %08lX not found\n" +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:1948 #, c-format @@ -5163,78 +5175,74 @@ msgstr "WARNING: unable to remove tempfile (%s) ‘[1m%s[0m’: %s\n" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "WARNING: unable to remove temp directory ‘[1m%s[0m’: %s\n" -#: g10/keyid.c:370 g10/keyid.c:382 g10/keyid.c:394 g10/keyid.c:406 +#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518 msgid "never " msgstr "never " -#: g10/revoke.c:92 -msgid "key incomplete\n" -msgstr "key incomplete\n" - -#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:540 +#: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175 +#: g10/revoke.c:187 g10/revoke.c:541 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet failed: %s\n" -#: g10/revoke.c:145 +#: g10/revoke.c:146 #, c-format -msgid "key %08lX incomplete\n" -msgstr "key %08lX incomplete\n" +msgid "key %s has no user IDs\n" +msgstr "key %s has no user IDs\n" -#: g10/revoke.c:270 +#: g10/revoke.c:271 msgid "To be revoked by:\n" msgstr "To be revoked by:\n" -#: g10/revoke.c:274 +#: g10/revoke.c:275 msgid "(This is a sensitive revocation key)\n" msgstr "(This is a sensitive revocation key)\n" -#: g10/revoke.c:278 g10/revoke.c:475 +#: g10/revoke.c:279 g10/revoke.c:476 msgid "Create a revocation certificate for this key? " msgstr "Create a revocation certificate for this key? " -#: g10/revoke.c:291 g10/revoke.c:506 +#: g10/revoke.c:292 g10/revoke.c:507 msgid "ASCII armored output forced.\n" msgstr "ASCII armored output forced.\n" -#: g10/revoke.c:305 g10/revoke.c:520 +#: g10/revoke.c:306 g10/revoke.c:521 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet failed: %s\n" -#: g10/revoke.c:368 +#: g10/revoke.c:369 msgid "Revocation certificate created.\n" msgstr "Revocation certificate created.\n" -#: g10/revoke.c:374 +#: g10/revoke.c:375 #, c-format msgid "no revocation keys found for `%s'\n" msgstr "no revocation keys found for ‘[1m%s[0m’\n" -#: g10/revoke.c:428 +#: g10/revoke.c:429 #, c-format msgid "secret key `%s' not found: %s\n" msgstr "secret key ‘[1m%s[0m’ not found: %s\n" -#: g10/revoke.c:457 +#: g10/revoke.c:458 #, c-format msgid "no corresponding public key: %s\n" msgstr "no corresponding public key: %s\n" -#: g10/revoke.c:468 +#: g10/revoke.c:469 msgid "public key does not match secret key!\n" msgstr "public key does not match secret key!\n" -#: g10/revoke.c:491 +#: g10/revoke.c:492 msgid "unknown protection algorithm\n" msgstr "unknown protection algorithm\n" -#: g10/revoke.c:495 +#: g10/revoke.c:496 msgid "NOTE: This key is not protected!\n" msgstr "NOTE: This key is not protected!\n" -#: g10/revoke.c:546 +#: g10/revoke.c:547 msgid "" "Revocation certificate created.\n" "\n" @@ -5252,33 +5260,33 @@ msgstr "" "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:587 +#: g10/revoke.c:588 msgid "Please select the reason for the revocation:\n" msgstr "Please select the reason for the revocation:\n" -#: g10/revoke.c:597 +#: g10/revoke.c:598 msgid "Cancel" msgstr "Cancel" -#: g10/revoke.c:599 +#: g10/revoke.c:600 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(Probably you want to select %d here)\n" -#: g10/revoke.c:640 +#: g10/revoke.c:641 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:668 +#: g10/revoke.c:669 #, c-format msgid "Reason for revocation: %s\n" msgstr "Reason for revocation: %s\n" -#: g10/revoke.c:670 +#: g10/revoke.c:671 msgid "(No description given)\n" msgstr "(No description given)\n" -#: g10/revoke.c:675 +#: g10/revoke.c:676 msgid "Is this okay? " msgstr "Is this okay? " |