diff options
Diffstat (limited to 'po/[email protected]')
| -rw-r--r-- | po/[email protected] | 1493 |
1 files changed, 790 insertions, 703 deletions
diff --git a/po/[email protected] b/po/[email protected] index dc569d482..d6086aef5 100644 --- a/po/[email protected] +++ b/po/[email protected] @@ -30,10 +30,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.3.90-cvs\n" +"Project-Id-Version: gnupg 1.3.90\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2004-07-27 17:15+0200\n" -"PO-Revision-Date: 2004-07-27 17:15+0200\n" +"POT-Creation-Date: 2004-10-01 10:36+0200\n" +"PO-Revision-Date: 2004-10-01 10:36+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "no" msgid "nN" msgstr "nN" -#: util/miscutil.c:348 g10/keyedit.c:1138 +#: util/miscutil.c:348 g10/keyedit.c:1232 msgid "quit" msgstr "quit" @@ -305,6 +305,14 @@ msgstr "unusable secret key" msgid "keyserver error" msgstr "keyserver error" +#: util/errors.c:108 +msgid "canceled" +msgstr "canceled" + +#: util/errors.c:109 +msgid "no card" +msgstr "no card" + #: util/logger.c:183 msgid "ERROR: " msgstr "ERROR: " @@ -327,7 +335,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:2032 g10/import.c:169 +#: cipher/random.c:387 g10/g10.c:3159 g10/keygen.c:2106 g10/import.c:169 #, c-format msgid "can't open `%s': %s\n" msgstr "can't open ‘[1m%s[0m’: %s\n" @@ -359,7 +367,7 @@ msgstr "can't read ‘[1m%s[0m’: %s\n" msgid "note: random_seed file not updated\n" msgstr "note: random_seed file not updated\n" -#: cipher/random.c:473 g10/exec.c:481 +#: cipher/random.c:473 #, c-format msgid "can't create `%s': %s\n" msgstr "can't create ‘[1m%s[0m’: %s\n" @@ -428,7 +436,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:354 +#: g10/g10.c:358 msgid "" "@Commands:\n" " " @@ -436,127 +444,127 @@ msgstr "" "@Commands:\n" " " -#: g10/g10.c:356 +#: g10/g10.c:360 msgid "|[file]|make a signature" msgstr "|[file]|make a signature" -#: g10/g10.c:357 +#: g10/g10.c:361 msgid "|[file]|make a clear text signature" msgstr "|[file]|make a clear text signature" -#: g10/g10.c:358 +#: g10/g10.c:362 msgid "make a detached signature" msgstr "make a detached signature" -#: g10/g10.c:359 +#: g10/g10.c:363 msgid "encrypt data" msgstr "encrypt data" -#: g10/g10.c:361 +#: g10/g10.c:365 msgid "encryption only with symmetric cipher" msgstr "encryption only with symmetric cipher" -#: g10/g10.c:363 +#: g10/g10.c:367 msgid "decrypt data (default)" msgstr "decrypt data (default)" -#: g10/g10.c:365 +#: g10/g10.c:369 msgid "verify a signature" msgstr "verify a signature" -#: g10/g10.c:367 +#: g10/g10.c:371 msgid "list keys" msgstr "list keys" -#: g10/g10.c:369 +#: g10/g10.c:373 msgid "list keys and signatures" msgstr "list keys and signatures" -#: g10/g10.c:370 +#: g10/g10.c:374 msgid "list and check key signatures" msgstr "list and check key signatures" -#: g10/g10.c:371 +#: g10/g10.c:375 msgid "list keys and fingerprints" msgstr "list keys and fingerprints" -#: g10/g10.c:372 +#: g10/g10.c:376 msgid "list secret keys" msgstr "list secret keys" -#: g10/g10.c:373 +#: g10/g10.c:377 msgid "generate a new key pair" msgstr "generate a new key pair" -#: g10/g10.c:374 +#: g10/g10.c:378 msgid "remove keys from the public keyring" msgstr "remove keys from the public keyring" -#: g10/g10.c:376 +#: g10/g10.c:380 msgid "remove keys from the secret keyring" msgstr "remove keys from the secret keyring" -#: g10/g10.c:377 +#: g10/g10.c:381 msgid "sign a key" msgstr "sign a key" -#: g10/g10.c:378 +#: g10/g10.c:382 msgid "sign a key locally" msgstr "sign a key locally" -#: g10/g10.c:381 +#: g10/g10.c:385 msgid "sign or edit a key" msgstr "sign or edit a key" -#: g10/g10.c:382 +#: g10/g10.c:386 msgid "generate a revocation certificate" msgstr "generate a revocation certificate" -#: g10/g10.c:384 +#: g10/g10.c:388 msgid "export keys" msgstr "export keys" -#: g10/g10.c:385 +#: g10/g10.c:389 msgid "export keys to a key server" msgstr "export keys to a key server" -#: g10/g10.c:386 +#: g10/g10.c:390 msgid "import keys from a key server" msgstr "import keys from a key server" -#: g10/g10.c:388 +#: g10/g10.c:392 msgid "search for keys on a key server" msgstr "search for keys on a key server" -#: g10/g10.c:390 +#: g10/g10.c:394 msgid "update all keys from a keyserver" msgstr "update all keys from a keyserver" -#: g10/g10.c:393 +#: g10/g10.c:397 msgid "import/merge keys" msgstr "import/merge keys" -#: g10/g10.c:396 +#: g10/g10.c:400 msgid "print the card status" msgstr "print the card status" -#: g10/g10.c:397 +#: g10/g10.c:401 msgid "change data on a card" msgstr "change data on a card" -#: g10/g10.c:398 +#: g10/g10.c:402 msgid "change a card's PIN" msgstr "change a card's PIN" -#: g10/g10.c:406 +#: g10/g10.c:410 msgid "update the trust database" msgstr "update the trust database" -#: g10/g10.c:413 +#: g10/g10.c:417 msgid "|algo [files]|print message digests" msgstr "|algo [files]|print message digests" -#: g10/g10.c:417 g10/gpgv.c:64 +#: g10/g10.c:421 g10/gpgv.c:65 msgid "" "@\n" "Options:\n" @@ -566,55 +574,51 @@ msgstr "" "Options:\n" " " -#: g10/g10.c:419 +#: g10/g10.c:423 msgid "create ascii armored output" msgstr "create ascii armored output" -#: g10/g10.c:421 +#: g10/g10.c:425 msgid "|NAME|encrypt for NAME" msgstr "|NAME|encrypt for NAME" -#: g10/g10.c:432 +#: g10/g10.c:436 msgid "use this user-id to sign or decrypt" msgstr "use this user-id to sign or decrypt" -#: g10/g10.c:433 +#: g10/g10.c:437 msgid "|N|set compress level N (0 disables)" msgstr "|N|set compress level N (0 disables)" -#: g10/g10.c:438 +#: g10/g10.c:442 msgid "use canonical text mode" msgstr "use canonical text mode" -#: g10/g10.c:448 +#: g10/g10.c:452 msgid "use as output file" msgstr "use as output file" -#: g10/g10.c:450 g10/gpgv.c:66 +#: g10/g10.c:454 g10/gpgv.c:67 msgid "verbose" msgstr "verbose" -#: g10/g10.c:461 +#: g10/g10.c:465 msgid "do not make any changes" msgstr "do not make any changes" -#: g10/g10.c:462 +#: g10/g10.c:466 msgid "prompt before overwriting" msgstr "prompt before overwriting" -#: g10/g10.c:507 +#: g10/g10.c:511 msgid "use strict OpenPGP behavior" msgstr "use strict OpenPGP behavior" -#: g10/g10.c:508 +#: g10/g10.c:512 msgid "generate PGP 2.x compatible messages" msgstr "generate PGP 2.x compatible messages" -#: g10/g10.c:530 -msgid "allow the use of admin card commands" -msgstr "allow the use of admin card commands" - -#: g10/g10.c:535 +#: g10/g10.c:537 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -622,7 +626,7 @@ msgstr "" "@\n" "(See the man page for a complete listing of all commands and options)\n" -#: g10/g10.c:538 +#: g10/g10.c:540 msgid "" "@\n" "Examples:\n" @@ -642,15 +646,15 @@ msgstr "" " --list-keys [names] show keys\n" " --fingerprint [names] show fingerprints\n" -#: g10/g10.c:713 g10/gpgv.c:91 +#: g10/g10.c:718 g10/gpgv.c:92 msgid "Please report bugs to <[email protected]>.\n" msgstr "Please report bugs to <[email protected]>.\n" -#: g10/g10.c:730 +#: g10/g10.c:735 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Usage: gpg [options] [files] (-h for help)" -#: g10/g10.c:733 +#: g10/g10.c:738 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -660,7 +664,7 @@ msgstr "" "sign, check, encrypt or decrypt\n" "default operation depends on the input data\n" -#: g10/g10.c:744 +#: g10/g10.c:749 msgid "" "\n" "Supported algorithms:\n" @@ -668,466 +672,460 @@ msgstr "" "\n" "Supported algorithms:\n" -#: g10/g10.c:747 +#: g10/g10.c:752 msgid "Pubkey: " msgstr "Pubkey: " -#: g10/g10.c:753 g10/keyedit.c:1737 +#: g10/g10.c:758 g10/keyedit.c:1883 msgid "Cipher: " msgstr "Cipher: " -#: g10/g10.c:759 +#: g10/g10.c:764 msgid "Hash: " msgstr "Hash: " -#: g10/g10.c:765 g10/keyedit.c:1783 +#: g10/g10.c:770 g10/keyedit.c:1929 msgid "Compression: " msgstr "Compression: " -#: g10/g10.c:848 +#: g10/g10.c:853 msgid "usage: gpg [options] " msgstr "usage: gpg [options] " -#: g10/g10.c:951 +#: g10/g10.c:956 msgid "conflicting commands\n" msgstr "conflicting commands\n" -#: g10/g10.c:969 +#: g10/g10.c:974 #, 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:1166 +#: g10/g10.c:1171 #, c-format -msgid "WARNING: unsafe ownership on homedir \"%s\"\n" -msgstr "WARNING: unsafe ownership on homedir “[1m%s[0m”\n" +msgid "WARNING: unsafe ownership on homedir `%s'\n" +msgstr "WARNING: unsafe ownership on homedir ‘[1m%s[0m’\n" -#: g10/g10.c:1169 +#: g10/g10.c:1174 #, c-format -msgid "WARNING: unsafe ownership on configuration file \"%s\"\n" -msgstr "WARNING: unsafe ownership on configuration file “[1m%s[0m”\n" +msgid "WARNING: unsafe ownership on configuration file `%s'\n" +msgstr "WARNING: unsafe ownership on configuration file ‘[1m%s[0m’\n" -#: g10/g10.c:1172 +#: g10/g10.c:1177 #, c-format -msgid "WARNING: unsafe ownership on extension \"%s\"\n" -msgstr "WARNING: unsafe ownership on extension “[1m%s[0m”\n" +msgid "WARNING: unsafe ownership on extension `%s'\n" +msgstr "WARNING: unsafe ownership on extension ‘[1m%s[0m’\n" -#: g10/g10.c:1178 +#: g10/g10.c:1183 #, c-format -msgid "WARNING: unsafe permissions on homedir \"%s\"\n" -msgstr "WARNING: unsafe permissions on homedir “[1m%s[0m”\n" +msgid "WARNING: unsafe permissions on homedir `%s'\n" +msgstr "WARNING: unsafe permissions on homedir ‘[1m%s[0m’\n" -#: g10/g10.c:1181 +#: g10/g10.c:1186 #, c-format -msgid "WARNING: unsafe permissions on configuration file \"%s\"\n" -msgstr "WARNING: unsafe permissions on configuration file “[1m%s[0m”\n" +msgid "WARNING: unsafe permissions on configuration file `%s'\n" +msgstr "WARNING: unsafe permissions on configuration file ‘[1m%s[0m’\n" -#: g10/g10.c:1184 +#: g10/g10.c:1189 #, c-format -msgid "WARNING: unsafe permissions on extension \"%s\"\n" -msgstr "WARNING: unsafe permissions on extension “[1m%s[0m”\n" +msgid "WARNING: unsafe permissions on extension `%s'\n" +msgstr "WARNING: unsafe permissions on extension ‘[1m%s[0m’\n" -#: g10/g10.c:1190 +#: g10/g10.c:1195 #, c-format -msgid "WARNING: unsafe enclosing directory ownership on homedir \"%s\"\n" -msgstr "WARNING: unsafe enclosing directory ownership on homedir “[1m%s[0m”\n" +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:1193 +#: g10/g10.c:1198 #, c-format msgid "" -"WARNING: unsafe enclosing directory ownership on configuration file \"%s\"\n" +"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "" -"WARNING: unsafe enclosing directory ownership on configuration file “[1m%s" -"[0m”\n" +"WARNING: unsafe enclosing directory ownership on configuration file ‘[1m%s" +"[0m’\n" -#: g10/g10.c:1196 +#: g10/g10.c:1201 #, c-format -msgid "WARNING: unsafe enclosing directory ownership on extension \"%s\"\n" +msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "" -"WARNING: unsafe enclosing directory ownership on extension “[1m%s[0m”\n" +"WARNING: unsafe enclosing directory ownership on extension ‘[1m%s[0m’\n" -#: g10/g10.c:1202 +#: g10/g10.c:1207 #, c-format -msgid "WARNING: unsafe enclosing directory permissions on homedir \"%s\"\n" +msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "" -"WARNING: unsafe enclosing directory permissions on homedir “[1m%s[0m”\n" +"WARNING: unsafe enclosing directory permissions on homedir ‘[1m%s[0m’\n" -#: g10/g10.c:1205 +#: g10/g10.c:1210 #, c-format msgid "" -"WARNING: unsafe enclosing directory permissions on configuration file \"%s" -"\"\n" +"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "" -"WARNING: unsafe enclosing directory permissions on configuration file “[1m%s" -"[0m”\n" +"WARNING: unsafe enclosing directory permissions on configuration file ‘[1m%s" +"[0m’\n" -#: g10/g10.c:1208 +#: g10/g10.c:1213 #, c-format -msgid "WARNING: unsafe enclosing directory permissions on extension \"%s\"\n" +msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "" -"WARNING: unsafe enclosing directory permissions on extension “[1m%s[0m”\n" +"WARNING: unsafe enclosing directory permissions on extension ‘[1m%s[0m’\n" -#: g10/g10.c:1334 +#: g10/g10.c:1354 #, c-format -msgid "unknown configuration item \"%s\"\n" -msgstr "unknown configuration item “[1m%s[0m”\n" +msgid "unknown configuration item `%s'\n" +msgstr "unknown configuration item ‘[1m%s[0m’\n" -#: g10/g10.c:1601 +#: g10/g10.c:1732 #, 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:1637 +#: g10/g10.c:1768 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE: no default option file ‘[1m%s[0m’\n" -#: g10/g10.c:1641 +#: g10/g10.c:1772 #, c-format msgid "option file `%s': %s\n" msgstr "option file ‘[1m%s[0m’: %s\n" -#: g10/g10.c:1648 +#: g10/g10.c:1779 #, c-format msgid "reading options from `%s'\n" msgstr "reading options from ‘[1m%s[0m’\n" -#: g10/g10.c:1874 g10/g10.c:2409 g10/g10.c:2420 +#: g10/g10.c:2008 g10/g10.c:2524 g10/g10.c:2535 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "NOTE: %s is not for normal use!\n" -#: g10/g10.c:1887 +#: g10/g10.c:2021 #, 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" +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:2099 +#: g10/g10.c:2233 #, c-format -msgid "%s is not a valid character set\n" -msgstr "%s is not a valid character set\n" +msgid "`%s' is not a valid character set\n" +msgstr "‘[1m%s[0m’ is not a valid character set\n" -#: g10/g10.c:2118 g10/keyedit.c:3228 +#: g10/g10.c:2252 g10/keyedit.c:3418 msgid "could not parse keyserver URL\n" msgstr "could not parse keyserver URL\n" -#: g10/g10.c:2124 +#: g10/g10.c:2258 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: invalid keyserver options\n" -#: g10/g10.c:2127 +#: g10/g10.c:2261 msgid "invalid keyserver options\n" msgstr "invalid keyserver options\n" -#: g10/g10.c:2134 +#: g10/g10.c:2268 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: invalid import options\n" -#: g10/g10.c:2137 +#: g10/g10.c:2271 msgid "invalid import options\n" msgstr "invalid import options\n" -#: g10/g10.c:2144 +#: g10/g10.c:2278 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: invalid export options\n" -#: g10/g10.c:2147 +#: g10/g10.c:2281 msgid "invalid export options\n" msgstr "invalid export options\n" -#: g10/g10.c:2172 +#: g10/g10.c:2288 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: invalid list options\n" -#: g10/g10.c:2175 +#: g10/g10.c:2291 msgid "invalid list options\n" msgstr "invalid list options\n" -#: g10/g10.c:2198 +#: g10/g10.c:2313 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: invalid verify options\n" -#: g10/g10.c:2201 +#: g10/g10.c:2316 msgid "invalid verify options\n" msgstr "invalid verify options\n" -#: g10/g10.c:2208 +#: g10/g10.c:2323 #, c-format msgid "unable to set exec-path to %s\n" msgstr "unable to set exec-path to %s\n" -#: g10/g10.c:2398 +#: g10/g10.c:2513 msgid "WARNING: program may create a core file!\n" msgstr "WARNING: program may create a core file!\n" -#: g10/g10.c:2402 +#: g10/g10.c:2517 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "WARNING: %s overrides %s\n" -#: g10/g10.c:2411 +#: g10/g10.c:2526 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s not allowed with %s!\n" -#: g10/g10.c:2414 +#: g10/g10.c:2529 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s makes no sense with %s!\n" -#: g10/g10.c:2435 +#: g10/g10.c:2550 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:2441 +#: g10/g10.c:2556 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:2447 +#: g10/g10.c:2562 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:2460 +#: g10/g10.c:2575 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:2528 g10/g10.c:2552 +#: g10/g10.c:2645 g10/g10.c:2669 msgid "selected cipher algorithm is invalid\n" msgstr "selected cipher algorithm is invalid\n" -#: g10/g10.c:2534 g10/g10.c:2558 +#: g10/g10.c:2651 g10/g10.c:2675 msgid "selected digest algorithm is invalid\n" msgstr "selected digest algorithm is invalid\n" -#: g10/g10.c:2540 +#: g10/g10.c:2657 msgid "selected compression algorithm is invalid\n" msgstr "selected compression algorithm is invalid\n" -#: g10/g10.c:2546 +#: g10/g10.c:2663 msgid "selected certification digest algorithm is invalid\n" msgstr "selected certification digest algorithm is invalid\n" -#: g10/g10.c:2561 +#: g10/g10.c:2678 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed must be greater than 0\n" -#: g10/g10.c:2563 +#: g10/g10.c:2680 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed must be greater than 1\n" -#: g10/g10.c:2565 +#: g10/g10.c:2682 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:2567 +#: g10/g10.c:2684 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:2569 +#: g10/g10.c:2686 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:2572 +#: g10/g10.c:2689 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE: simple S2K mode (0) is strongly discouraged\n" -#: g10/g10.c:2576 +#: g10/g10.c:2693 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:2583 +#: g10/g10.c:2700 msgid "invalid default preferences\n" msgstr "invalid default preferences\n" -#: g10/g10.c:2592 +#: g10/g10.c:2709 msgid "invalid personal cipher preferences\n" msgstr "invalid personal cipher preferences\n" -#: g10/g10.c:2596 +#: g10/g10.c:2713 msgid "invalid personal digest preferences\n" msgstr "invalid personal digest preferences\n" -#: g10/g10.c:2600 +#: g10/g10.c:2717 msgid "invalid personal compress preferences\n" msgstr "invalid personal compress preferences\n" -#: g10/g10.c:2633 +#: g10/g10.c:2750 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s does not yet work with %s\n" -#: g10/g10.c:2680 +#: g10/g10.c:2797 #, 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" +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:2685 +#: g10/g10.c:2802 #, 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" +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:2690 +#: g10/g10.c:2807 #, 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" +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:2778 +#: g10/g10.c:2895 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "failed to initialize the TrustDB: %s\n" -#: g10/g10.c:2789 +#: g10/g10.c:2906 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:2800 +#: g10/g10.c:2917 msgid "--store [filename]" msgstr "--store [filename]" -#: g10/g10.c:2807 +#: g10/g10.c:2924 msgid "--symmetric [filename]" msgstr "--symmetric [filename]" -#: g10/g10.c:2819 +#: g10/g10.c:2936 msgid "--encrypt [filename]" msgstr "--encrypt [filename]" -#: g10/g10.c:2832 +#: g10/g10.c:2949 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [filename]" -#: g10/g10.c:2834 +#: g10/g10.c:2951 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:2837 +#: g10/g10.c:2954 #, 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:2855 +#: g10/g10.c:2972 msgid "--sign [filename]" msgstr "--sign [filename]" -#: g10/g10.c:2868 +#: g10/g10.c:2985 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filename]" -#: g10/g10.c:2883 +#: g10/g10.c:3000 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [filename]" -#: g10/g10.c:2885 +#: g10/g10.c:3002 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:2888 +#: g10/g10.c:3005 #, 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:2908 +#: g10/g10.c:3025 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filename]" -#: g10/g10.c:2917 +#: g10/g10.c:3034 msgid "--clearsign [filename]" msgstr "--clearsign [filename]" -#: g10/g10.c:2942 +#: g10/g10.c:3059 msgid "--decrypt [filename]" msgstr "--decrypt [filename]" -#: g10/g10.c:2950 +#: g10/g10.c:3067 msgid "--sign-key user-id" msgstr "--sign-key user-id" -#: g10/g10.c:2954 +#: g10/g10.c:3071 msgid "--lsign-key user-id" msgstr "--lsign-key user-id" -#: g10/g10.c:2958 +#: g10/g10.c:3075 msgid "--nrsign-key user-id" msgstr "--nrsign-key user-id" -#: g10/g10.c:2962 +#: g10/g10.c:3079 msgid "--nrlsign-key user-id" msgstr "--nrlsign-key user-id" -#: g10/g10.c:2986 +#: g10/g10.c:3103 msgid "--edit-key user-id [commands]" msgstr "--edit-key user-id [commands]" -#: g10/g10.c:3042 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:3057 +#: g10/g10.c:3174 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [user-id] [keyring]" -#: g10/g10.c:3094 +#: g10/g10.c:3211 #, c-format msgid "keyserver send failed: %s\n" msgstr "keyserver send failed: %s\n" -#: g10/g10.c:3096 +#: g10/g10.c:3213 #, c-format msgid "keyserver receive failed: %s\n" msgstr "keyserver receive failed: %s\n" -#: g10/g10.c:3098 +#: g10/g10.c:3215 #, c-format msgid "key export failed: %s\n" msgstr "key export failed: %s\n" -#: g10/g10.c:3109 +#: g10/g10.c:3226 #, c-format msgid "keyserver search failed: %s\n" msgstr "keyserver search failed: %s\n" -#: g10/g10.c:3119 +#: g10/g10.c:3236 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "keyserver refresh failed: %s\n" -#: g10/g10.c:3160 +#: g10/g10.c:3277 #, c-format msgid "dearmoring failed: %s\n" msgstr "dearmoring failed: %s\n" -#: g10/g10.c:3168 +#: g10/g10.c:3285 #, c-format msgid "enarmoring failed: %s\n" msgstr "enarmoring failed: %s\n" -#: g10/g10.c:3255 +#: g10/g10.c:3372 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "invalid hash algorithm ‘[1m%s[0m’\n" -#: g10/g10.c:3378 +#: g10/g10.c:3495 msgid "[filename]" msgstr "[filename]" -#: g10/g10.c:3382 +#: g10/g10.c:3499 msgid "Go ahead and type your message ...\n" msgstr "Go ahead and type your message ...\n" -#: g10/g10.c:3385 g10/decrypt.c:62 g10/decrypt.c:145 g10/verify.c:95 +#: g10/g10.c:3502 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:3659 +#: g10/g10.c:3776 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" @@ -1135,47 +1133,47 @@ msgstr "" "a notation name must have only printable characters or spaces, and end with " "an ‘[1m=[0m’\n" -#: g10/g10.c:3668 +#: g10/g10.c:3784 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:3678 +#: g10/g10.c:3794 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:3712 +#: g10/g10.c:3828 msgid "the given certification policy URL is invalid\n" msgstr "the given certification policy URL is invalid\n" -#: g10/g10.c:3714 +#: g10/g10.c:3830 msgid "the given signature policy URL is invalid\n" msgstr "the given signature policy URL is invalid\n" -#: g10/g10.c:3747 -msgid "the given signature preferred keyserver URL is invalid\n" -msgstr "the given signature preferred keyserver URL is invalid\n" +#: g10/g10.c:3863 +msgid "the given preferred keyserver URL is invalid\n" +msgstr "the given preferred keyserver URL is invalid\n" -#: g10/gpgv.c:67 +#: g10/gpgv.c:68 msgid "be somewhat more quiet" msgstr "be somewhat more quiet" -#: g10/gpgv.c:68 +#: g10/gpgv.c:69 msgid "take the keys from this keyring" msgstr "take the keys from this keyring" -#: g10/gpgv.c:70 +#: g10/gpgv.c:71 msgid "make timestamp conflicts only a warning" msgstr "make timestamp conflicts only a warning" -#: g10/gpgv.c:71 +#: g10/gpgv.c:72 msgid "|FD|write status info to this FD" msgstr "|FD|write status info to this FD" -#: g10/gpgv.c:95 +#: g10/gpgv.c:96 msgid "Usage: gpgv [options] [files] (-h for help)" msgstr "Usage: gpgv [options] [files] (-h for help)" -#: g10/gpgv.c:98 +#: g10/gpgv.c:99 msgid "" "Syntax: gpg [options] [files]\n" "Check signatures against known trusted keys\n" @@ -1209,13 +1207,13 @@ msgid "invalid dash escaped line: " msgstr "invalid dash escaped line: " #: g10/armor.c:565 -msgid "unexpected armor:" -msgstr "unexpected armor:" +msgid "unexpected armor: " +msgstr "unexpected armor: " -#: g10/armor.c:695 g10/armor.c:1276 +#: g10/armor.c:695 g10/armor.c:1280 #, c-format -msgid "invalid radix64 character %02x skipped\n" -msgstr "invalid radix64 character %02x skipped\n" +msgid "invalid radix64 character %02X skipped\n" +msgstr "invalid radix64 character %02X skipped\n" #: g10/armor.c:738 msgid "premature eof (no CRC)\n" @@ -1225,33 +1223,33 @@ msgstr "premature eof (no CRC)\n" msgid "premature eof (in CRC)\n" msgstr "premature eof (in CRC)\n" -#: g10/armor.c:776 +#: g10/armor.c:780 msgid "malformed CRC\n" msgstr "malformed CRC\n" -#: g10/armor.c:780 g10/armor.c:1313 +#: g10/armor.c:784 g10/armor.c:1317 #, c-format -msgid "CRC error; %06lx - %06lx\n" -msgstr "CRC error; %06lx - %06lx\n" - -#: g10/armor.c:800 -msgid "premature eof (in Trailer)\n" -msgstr "premature eof (in Trailer)\n" +msgid "CRC error; %06lX - %06lX\n" +msgstr "CRC error; %06lX - %06lX\n" #: g10/armor.c:804 +msgid "premature eof (in trailer)\n" +msgstr "premature eof (in trailer)\n" + +#: g10/armor.c:808 msgid "error in trailer line\n" msgstr "error in trailer line\n" -#: g10/armor.c:1091 +#: g10/armor.c:1095 msgid "no valid OpenPGP data found.\n" msgstr "no valid OpenPGP data found.\n" -#: g10/armor.c:1096 +#: g10/armor.c:1100 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "invalid armor: line longer than %d characters\n" -#: g10/armor.c:1100 +#: g10/armor.c:1104 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" @@ -1301,7 +1299,7 @@ msgstr " \"" msgid " aka \"" msgstr " aka \"" -#: g10/pkclist.c:246 g10/keyedit.c:311 +#: g10/pkclist.c:246 g10/keyedit.c:404 msgid "" "Please decide how far you trust this user to correctly\n" "verify other users' keys (by looking at passports,\n" @@ -1550,93 +1548,113 @@ msgstr "%s: skipped: public key is disabled\n" msgid "no valid addressees\n" msgstr "no valid addressees\n" -#: g10/keygen.c:207 +#: g10/keygen.c:249 #, c-format msgid "preference `%s' duplicated\n" msgstr "preference ‘[1m%s[0m’ duplicated\n" -#: g10/keygen.c:214 +#: g10/keygen.c:256 msgid "too many cipher preferences\n" msgstr "too many cipher preferences\n" -#: g10/keygen.c:216 +#: g10/keygen.c:258 msgid "too many digest preferences\n" msgstr "too many digest preferences\n" -#: g10/keygen.c:218 +#: g10/keygen.c:260 msgid "too many compression preferences\n" msgstr "too many compression preferences\n" -#: g10/keygen.c:315 +#: g10/keygen.c:357 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "invalid item ‘[1m%s[0m’ in preference string\n" -#: g10/keygen.c:738 +#: g10/keygen.c:783 msgid "writing direct signature\n" msgstr "writing direct signature\n" -#: g10/keygen.c:777 +#: g10/keygen.c:822 msgid "writing self signature\n" msgstr "writing self signature\n" -#: g10/keygen.c:823 +#: g10/keygen.c:868 msgid "writing key binding signature\n" msgstr "writing key binding signature\n" -#: g10/keygen.c:885 g10/keygen.c:969 g10/keygen.c:1060 +#: g10/keygen.c:930 g10/keygen.c:1014 g10/keygen.c:1105 g10/keygen.c:2476 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "keysize invalid; using %u bits\n" -#: g10/keygen.c:890 g10/keygen.c:974 g10/keygen.c:1065 +#: g10/keygen.c:935 g10/keygen.c:1019 g10/keygen.c:1110 g10/keygen.c:2482 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "keysize rounded up to %u bits\n" -#: g10/keygen.c:1165 +#: g10/keygen.c:1210 msgid "Please select what kind of key you want:\n" msgstr "Please select what kind of key you want:\n" -#: g10/keygen.c:1167 +#: g10/keygen.c:1212 #, c-format msgid " (%d) DSA and Elgamal (default)\n" msgstr " (%d) DSA and Elgamal (default)\n" -#: g10/keygen.c:1168 +#: g10/keygen.c:1213 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (sign only)\n" -#: g10/keygen.c:1170 +#: g10/keygen.c:1215 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) Elgamal (encrypt only)\n" -#: g10/keygen.c:1171 +#: g10/keygen.c:1216 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (sign only)\n" -#: g10/keygen.c:1173 +#: g10/keygen.c:1218 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (encrypt only)\n" -#: g10/keygen.c:1175 +#: g10/keygen.c:1220 #, c-format msgid " (%d) RSA (sign and encrypt)\n" msgstr " (%d) RSA (sign and encrypt)\n" -#: g10/keygen.c:1178 g10/keyedit.c:320 g10/keyedit.c:341 g10/keyedit.c:355 +#: g10/keygen.c:1222 +#, c-format +msgid " (%d) RSA (auth only)\n" +msgstr " (%d) RSA (auth only)\n" + +#: g10/keygen.c:1224 +#, c-format +msgid " (%d) RSA (sign and auth)\n" +msgstr " (%d) RSA (sign and auth)\n" + +#: g10/keygen.c:1226 +#, c-format +msgid " (%d) RSA (encrypt and auth)\n" +msgstr " (%d) RSA (encrypt and auth)\n" + +#: g10/keygen.c:1228 +#, c-format +msgid " (%d) RSA (sign, encrypt and auth)\n" +msgstr " (%d) RSA (sign, encrypt and auth)\n" + +#: g10/keygen.c:1231 g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 msgid "Your selection? " msgstr "Your selection? " -#: g10/keygen.c:1212 g10/keyedit.c:816 g10/revoke.c:638 +#: g10/keygen.c:1285 g10/keyedit.c:909 g10/revoke.c:638 msgid "Invalid selection.\n" msgstr "Invalid selection.\n" -#: g10/keygen.c:1225 +#: g10/keygen.c:1298 #, c-format msgid "" "About to generate a new %s keypair.\n" @@ -1649,28 +1667,28 @@ msgstr "" " default keysize is 1024 bits\n" " highest suggested keysize is 2048 bits\n" -#: g10/keygen.c:1234 +#: g10/keygen.c:1307 msgid "What keysize do you want? (1024) " msgstr "What keysize do you want? (1024) " -#: g10/keygen.c:1239 +#: g10/keygen.c:1312 msgid "DSA only allows keysizes from 512 to 1024\n" msgstr "DSA only allows keysizes from 512 to 1024\n" -#: g10/keygen.c:1241 +#: g10/keygen.c:1314 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:1244 +#: g10/keygen.c:1317 msgid "keysize too small; 768 is smallest value allowed.\n" msgstr "keysize too small; 768 is smallest value allowed.\n" -#: g10/keygen.c:1255 +#: g10/keygen.c:1328 #, 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:1260 +#: g10/keygen.c:1333 msgid "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" @@ -1678,11 +1696,11 @@ msgstr "" "Keysizes larger than 2048 are not suggested because\n" "computations take REALLY long!\n" -#: g10/keygen.c:1263 +#: g10/keygen.c:1336 msgid "Are you sure that you want this keysize? " msgstr "Are you sure that you want this keysize? " -#: g10/keygen.c:1264 +#: g10/keygen.c:1337 msgid "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" @@ -1690,17 +1708,17 @@ msgstr "" "Okay, but keep in mind that your monitor and keyboard radiation is also very " "vulnerable to attacks!\n" -#: g10/keygen.c:1273 +#: g10/keygen.c:1346 #, c-format msgid "Requested keysize is %u bits\n" msgstr "Requested keysize is %u bits\n" -#: g10/keygen.c:1276 g10/keygen.c:1280 +#: g10/keygen.c:1349 g10/keygen.c:1353 #, c-format msgid "rounded up to %u bits\n" msgstr "rounded up to %u bits\n" -#: g10/keygen.c:1331 +#: g10/keygen.c:1404 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -1716,7 +1734,7 @@ msgstr "" " <n>m = key expires in n months\n" " <n>y = key expires in n years\n" -#: g10/keygen.c:1340 +#: g10/keygen.c:1413 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -1732,29 +1750,29 @@ msgstr "" " <n>m = signature expires in n months\n" " <n>y = signature expires in n years\n" -#: g10/keygen.c:1362 +#: g10/keygen.c:1435 msgid "Key is valid for? (0) " msgstr "Key is valid for? (0) " -#: g10/keygen.c:1364 +#: g10/keygen.c:1437 msgid "Signature is valid for? (0) " msgstr "Signature is valid for? (0) " -#: g10/keygen.c:1369 +#: g10/keygen.c:1442 msgid "invalid value\n" msgstr "invalid value\n" -#: g10/keygen.c:1374 +#: g10/keygen.c:1447 #, c-format msgid "%s does not expire at all\n" msgstr "%s does not expire at all\n" -#: g10/keygen.c:1381 +#: g10/keygen.c:1454 #, c-format msgid "%s expires at %s\n" msgstr "%s expires at %s\n" -#: g10/keygen.c:1387 +#: g10/keygen.c:1460 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -1762,64 +1780,64 @@ msgstr "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" -#: g10/keygen.c:1392 +#: g10/keygen.c:1465 msgid "Is this correct (y/n)? " msgstr "Is this correct (y/n)? " -#: g10/keygen.c:1435 +#: g10/keygen.c:1508 msgid "" "\n" -"You need a User-ID to identify your key; the software constructs the user " -"id\n" -"from Real Name, Comment and Email Address in this form:\n" +"You need a user ID to identify your key; the software constructs the user " +"ID\n" +"from the Real Name, Comment and Email Address in this form:\n" " \"Heinrich Heine (Der Dichter) <[email protected]>\"\n" "\n" msgstr "" "\n" -"You need a User-ID to identify your key; the software constructs the user " -"id\n" -"from Real Name, Comment and Email Address in this form:\n" +"You need a user ID to identify your key; the software constructs the user " +"ID\n" +"from the Real Name, Comment and Email Address in this form:\n" " “[1mHeinrich Heine (Der Dichter) <[email protected]>[0m”\n" "\n" -#: g10/keygen.c:1447 +#: g10/keygen.c:1520 msgid "Real name: " msgstr "Real name: " -#: g10/keygen.c:1455 +#: g10/keygen.c:1528 msgid "Invalid character in name\n" msgstr "Invalid character in name\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1530 msgid "Name may not start with a digit\n" msgstr "Name may not start with a digit\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1532 msgid "Name must be at least 5 characters long\n" msgstr "Name must be at least 5 characters long\n" -#: g10/keygen.c:1467 +#: g10/keygen.c:1540 msgid "Email address: " msgstr "Email address: " -#: g10/keygen.c:1478 +#: g10/keygen.c:1551 msgid "Not a valid email address\n" msgstr "Not a valid email address\n" -#: g10/keygen.c:1486 +#: g10/keygen.c:1559 msgid "Comment: " msgstr "Comment: " -#: g10/keygen.c:1492 +#: g10/keygen.c:1565 msgid "Invalid character in comment\n" msgstr "Invalid character in comment\n" -#: g10/keygen.c:1515 +#: g10/keygen.c:1588 #, 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:1521 +#: g10/keygen.c:1594 #, c-format msgid "" "You selected this USER-ID:\n" @@ -1830,27 +1848,27 @@ msgstr "" " “[1m%s[0m”\n" "\n" -#: g10/keygen.c:1526 +#: g10/keygen.c:1599 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:1531 +#: g10/keygen.c:1604 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1541 +#: g10/keygen.c:1614 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:1542 +#: g10/keygen.c:1615 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:1561 +#: g10/keygen.c:1634 msgid "Please correct the error first\n" msgstr "Please correct the error first\n" -#: g10/keygen.c:1600 +#: g10/keygen.c:1674 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -1858,16 +1876,16 @@ msgstr "" "You need a Passphrase to protect your secret key.\n" "\n" -#: g10/keygen.c:1609 g10/keyedit.c:1021 +#: g10/keygen.c:1683 g10/keyedit.c:1114 msgid "passphrase not correctly repeated; try again" msgstr "passphrase not correctly repeated; try again" -#: g10/keygen.c:1610 +#: g10/keygen.c:1684 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1616 +#: g10/keygen.c:1690 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" @@ -1879,7 +1897,7 @@ msgstr "" "using this program with the option “[1m--edit-key[0m”.\n" "\n" -#: g10/keygen.c:1638 +#: g10/keygen.c:1712 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" @@ -1891,58 +1909,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:2206 g10/revoke.c:215 g10/revoke.c:415 +#: g10/keygen.c:2284 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:2267 +#: g10/keygen.c:2354 msgid "DSA keypair will have 1024 bits.\n" msgstr "DSA keypair will have 1024 bits.\n" -#: g10/keygen.c:2335 +#: g10/keygen.c:2422 msgid "Key generation canceled.\n" msgstr "Key generation canceled.\n" -#: g10/keygen.c:2451 g10/keygen.c:2576 +#: g10/keygen.c:2618 g10/keygen.c:2755 #, c-format msgid "writing public key to `%s'\n" msgstr "writing public key to ‘[1m%s[0m’\n" -#: g10/keygen.c:2453 g10/keygen.c:2579 +#: g10/keygen.c:2620 g10/keygen.c:2758 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "writing secret key stub to ‘[1m%s[0m’\n" -#: g10/keygen.c:2456 g10/keygen.c:2582 +#: g10/keygen.c:2623 g10/keygen.c:2761 #, c-format msgid "writing secret key to `%s'\n" msgstr "writing secret key to ‘[1m%s[0m’\n" -#: g10/keygen.c:2565 +#: g10/keygen.c:2744 #, c-format msgid "no writable public keyring found: %s\n" msgstr "no writable public keyring found: %s\n" -#: g10/keygen.c:2571 +#: g10/keygen.c:2750 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "no writable secret keyring found: %s\n" -#: g10/keygen.c:2589 +#: g10/keygen.c:2768 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "error writing public keyring ‘[1m%s[0m’: %s\n" -#: g10/keygen.c:2596 +#: g10/keygen.c:2775 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "error writing secret keyring ‘[1m%s[0m’: %s\n" -#: g10/keygen.c:2619 +#: g10/keygen.c:2798 msgid "public and secret key created and signed.\n" msgstr "public and secret key created and signed.\n" -#: g10/keygen.c:2630 +#: g10/keygen.c:2809 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" @@ -1951,33 +1969,62 @@ msgstr "" "the command “[1m--edit-key[0m” to generate a secondary key for this " "purpose.\n" -#: g10/keygen.c:2642 g10/keygen.c:2755 +#: g10/keygen.c:2821 g10/keygen.c:2934 g10/keygen.c:3049 #, c-format msgid "Key generation failed: %s\n" msgstr "Key generation failed: %s\n" -#: g10/keygen.c:2691 g10/sign.c:290 +#: g10/keygen.c:2870 g10/keygen.c:2985 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:2693 g10/sign.c:292 +#: g10/keygen.c:2872 g10/keygen.c:2987 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:2702 +#: g10/keygen.c:2881 g10/keygen.c:2998 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:2730 +#: g10/keygen.c:2909 g10/keygen.c:3031 msgid "Really create? " msgstr "Really create? " +#: g10/keygen.c:3184 +#, c-format +msgid "storing key onto card failed: %s\n" +msgstr "storing key onto card failed: %s\n" + +#: g10/keygen.c:3225 +#, c-format +msgid "can't create backup file `%s': %s\n" +msgstr "can't create backup file ‘[1m%s[0m’: %s\n" + +#: g10/keygen.c:3248 +#, c-format +msgid "NOTE: backup of card key saved to `%s'\n" +msgstr "NOTE: backup of card key saved to ‘[1m%s[0m’\n" + +#: g10/keygen.c:3315 +#, c-format +msgid "length of RSA modulus is not %d\n" +msgstr "length of RSA modulus is not %d\n" + +#: g10/keygen.c:3321 +msgid "public exponent too large (more than 32 bits)\n" +msgstr "public exponent too large (more than 32 bits)\n" + +#: g10/keygen.c:3327 g10/keygen.c:3333 +#, c-format +msgid "length of an RSA prime is not %d\n" +msgstr "length of an RSA prime is not %d\n" + #: g10/decrypt.c:98 g10/encode.c:845 msgid "--output doesn't work for this command\n" msgstr "--output doesn't work for this command\n" @@ -1988,7 +2035,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:1144 +#: g10/encode.c:203 g10/sign.c:1146 #, c-format msgid "error creating passphrase: %s\n" msgstr "error creating passphrase: %s\n" @@ -2016,6 +2063,11 @@ msgstr "%s: WARNING: empty file\n" msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" +#: g10/encode.c:474 +#, c-format +msgid "can't open %s: %s\n" +msgstr "can't open %s: %s\n" + #: g10/encode.c:480 #, c-format msgid "reading from `%s'\n" @@ -2027,22 +2079,33 @@ msgid "" msgstr "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" -#: g10/encode.c:526 g10/encode.c:721 +#: g10/encode.c:526 #, c-format -msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" -msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n" +msgid "" +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" +msgstr "" +"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" -#: g10/encode.c:634 g10/sign.c:863 +#: g10/encode.c:634 g10/sign.c:864 #, c-format -msgid "forcing compression algorithm %s (%d) violates recipient preferences\n" -msgstr "forcing compression algorithm %s (%d) violates recipient preferences\n" +msgid "" +"WARNING: forcing compression algorithm %s (%d) violates recipient " +"preferences\n" +msgstr "" +"WARNING: forcing compression algorithm %s (%d) violates recipient " +"preferences\n" + +#: g10/encode.c:721 +#, c-format +msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" +msgstr "forcing symmetric cipher %s (%d) violates recipient preferences\n" #: g10/encode.c:818 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s encrypted for: “[1m%s[0m”\n" -#: g10/export.c:162 g10/keyedit.c:2716 g10/delkey.c:74 g10/revoke.c:225 +#: g10/export.c:162 g10/keyedit.c:2902 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" @@ -2075,9 +2138,9 @@ 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:2693 -msgid "[User id not found]" -msgstr "[User id not found]" +#: g10/getkey.c:186 g10/getkey.c:2691 +msgid "[User ID not found]" +msgstr "[User ID not found]" #: g10/getkey.c:1614 #, c-format @@ -2229,8 +2292,8 @@ msgstr "key %s: PKS subkey corruption repaired\n" #: g10/import.c:722 #, c-format -msgid "key %s: accepted non self-signed user ID '%s'\n" -msgstr "key %s: accepted non self-signed user ID ‘[1m%s[0m’\n" +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:728 #, c-format @@ -2256,7 +2319,7 @@ msgstr "key %s: new key - skipped\n" msgid "no writable keyring found: %s\n" msgstr "no writable keyring found: %s\n" -#: g10/import.c:760 g10/sign.c:770 g10/sign.c:1006 g10/openfile.c:253 +#: g10/import.c:760 g10/openfile.c:253 #, c-format msgid "writing to `%s'\n" msgstr "writing to ‘[1m%s[0m’\n" @@ -2368,13 +2431,13 @@ msgstr "key %s: no user ID for signature\n" #: g10/import.c:1299 #, c-format -msgid "key %s: unsupported public key algorithm on user id \"%s\"\n" -msgstr "key %s: unsupported public key algorithm on user id “[1m%s[0m”\n" +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:1301 #, c-format -msgid "key %s: invalid self-signature on user id \"%s\"\n" -msgstr "key %s: invalid self-signature on user id “[1m%s[0m”\n" +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:1319 #, c-format @@ -2413,8 +2476,8 @@ msgstr "key %s: removed multiple subkey revocation\n" #: g10/import.c:1439 #, c-format -msgid "key %s: skipped user ID '%s'\n" -msgstr "key %s: skipped user ID ‘[1m%s[0m’\n" +msgid "key %s: skipped user ID \"%s\"\n" +msgstr "key %s: skipped user ID “[1m%s[0m”\n" #: g10/import.c:1460 #, c-format @@ -2423,8 +2486,8 @@ msgstr "key %s: skipped subkey\n" #: g10/import.c:1487 #, c-format -msgid "key %s: non exportable signature (class %02x) - skipped\n" -msgstr "key %s: non exportable signature (class %02x) - skipped\n" +msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" +msgstr "key %s: non exportable signature (class 0x%02X) - skipped\n" #: g10/import.c:1497 #, c-format @@ -2456,76 +2519,76 @@ msgstr "key %s: duplicated user ID detected - merged\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:1711 +#: g10/import.c:1712 #, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "WARNING: key %s may be revoked: revocation key %s not present.\n" -#: g10/import.c:1770 +#: g10/import.c:1771 #, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "key %s: “[1m%s[0m” revocation certificate added\n" -#: g10/import.c:1804 +#: g10/import.c:1805 #, c-format msgid "key %s: direct key signature added\n" msgstr "key %s: direct key signature added\n" -#: g10/keyedit.c:159 +#: g10/keyedit.c:253 msgid "[revocation]" msgstr "[revocation]" -#: g10/keyedit.c:160 +#: g10/keyedit.c:254 msgid "[self-signature]" msgstr "[self-signature]" -#: g10/keyedit.c:237 g10/keylist.c:319 +#: g10/keyedit.c:332 g10/keylist.c:320 msgid "1 bad signature\n" msgstr "1 bad signature\n" -#: g10/keyedit.c:239 g10/keylist.c:321 +#: g10/keyedit.c:334 g10/keylist.c:322 #, c-format msgid "%d bad signatures\n" msgstr "%d bad signatures\n" -#: g10/keyedit.c:241 g10/keylist.c:323 +#: g10/keyedit.c:336 g10/keylist.c:324 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:243 g10/keylist.c:325 +#: g10/keyedit.c:338 g10/keylist.c:326 #, 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:245 g10/keylist.c:327 +#: g10/keyedit.c:340 g10/keylist.c:328 msgid "1 signature not checked due to an error\n" msgstr "1 signature not checked due to an error\n" -#: g10/keyedit.c:247 g10/keylist.c:329 +#: g10/keyedit.c:342 g10/keylist.c:330 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "%d signatures not checked due to errors\n" -#: g10/keyedit.c:249 +#: g10/keyedit.c:344 msgid "1 user ID without valid self-signature detected\n" msgstr "1 user ID without valid self-signature detected\n" -#: g10/keyedit.c:251 +#: g10/keyedit.c:346 #, 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:314 +#: g10/keyedit.c:407 #, c-format msgid " (%d) I trust marginally\n" msgstr " (%d) I trust marginally\n" -#: g10/keyedit.c:315 +#: g10/keyedit.c:408 #, c-format msgid " (%d) I trust fully\n" msgstr " (%d) I trust fully\n" -#: g10/keyedit.c:334 +#: g10/keyedit.c:427 msgid "" "Please enter the depth of this trust signature.\n" "A depth greater than 1 allows the key you are signing to make\n" @@ -2535,36 +2598,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:350 +#: g10/keyedit.c:443 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:493 +#: g10/keyedit.c:586 #, c-format msgid "User ID \"%s\" is revoked." msgstr "User ID “[1m%s[0m” is revoked." -#: g10/keyedit.c:502 g10/keyedit.c:528 g10/keyedit.c:553 g10/keyedit.c:708 -#: g10/keyedit.c:766 g10/keyedit.c:1370 +#: g10/keyedit.c:595 g10/keyedit.c:621 g10/keyedit.c:646 g10/keyedit.c:801 +#: g10/keyedit.c:859 g10/keyedit.c:1469 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:514 g10/keyedit.c:540 g10/keyedit.c:565 g10/keyedit.c:714 -#: g10/keyedit.c:1376 +#: g10/keyedit.c:607 g10/keyedit.c:633 g10/keyedit.c:658 g10/keyedit.c:807 +#: g10/keyedit.c:1475 msgid " Unable to sign.\n" msgstr " Unable to sign.\n" -#: g10/keyedit.c:519 +#: g10/keyedit.c:612 #, c-format msgid "User ID \"%s\" is expired." msgstr "User ID “[1m%s[0m” is expired." -#: g10/keyedit.c:545 +#: g10/keyedit.c:638 #, c-format msgid "User ID \"%s\" is not self-signed." msgstr "User ID “[1m%s[0m” is not self-signed." -#: g10/keyedit.c:584 +#: g10/keyedit.c:677 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2573,11 +2636,11 @@ msgstr "" "The self-signature on “[1m%s[0m”\n" "is a PGP 2.x-style signature.\n" -#: g10/keyedit.c:593 +#: g10/keyedit.c:686 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:607 +#: g10/keyedit.c:700 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2586,12 +2649,12 @@ msgstr "" "Your current signature on “[1m%s[0m”\n" "has expired.\n" -#: g10/keyedit.c:611 +#: g10/keyedit.c:704 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:632 +#: g10/keyedit.c:725 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2600,43 +2663,43 @@ msgstr "" "Your current signature on “[1m%s[0m”\n" "is a local signature.\n" -#: g10/keyedit.c:636 +#: g10/keyedit.c:729 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:657 +#: g10/keyedit.c:750 #, c-format msgid "\"%s\" was already locally signed by key %s\n" msgstr "“[1m%s[0m” was already locally signed by key %s\n" -#: g10/keyedit.c:660 +#: g10/keyedit.c:753 #, c-format msgid "\"%s\" was already signed by key %s\n" msgstr "“[1m%s[0m” was already signed by key %s\n" -#: g10/keyedit.c:665 +#: g10/keyedit.c:758 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:687 +#: g10/keyedit.c:780 #, c-format msgid "Nothing to sign with key %s\n" msgstr "Nothing to sign with key %s\n" -#: g10/keyedit.c:702 +#: g10/keyedit.c:795 msgid "This key has expired!" msgstr "This key has expired!" -#: g10/keyedit.c:722 +#: g10/keyedit.c:815 #, c-format msgid "This key is due to expire on %s.\n" msgstr "This key is due to expire on %s.\n" -#: g10/keyedit.c:726 +#: g10/keyedit.c:819 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "Do you want your signature to expire at the same time? (Y/n) " -#: g10/keyedit.c:759 +#: g10/keyedit.c:852 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" @@ -2644,11 +2707,11 @@ msgstr "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" -#: g10/keyedit.c:761 +#: g10/keyedit.c:854 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "This would make the key unusable in PGP 2.x.\n" -#: g10/keyedit.c:786 +#: g10/keyedit.c:879 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2659,31 +2722,31 @@ msgstr "" "to the person named above? If you don't know what to answer, enter “[1m0" "[0m”.\n" -#: g10/keyedit.c:791 +#: g10/keyedit.c:884 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) I will not answer.%s\n" -#: g10/keyedit.c:793 +#: g10/keyedit.c:886 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) I have not checked at all.%s\n" -#: g10/keyedit.c:795 +#: g10/keyedit.c:888 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) I have done casual checking.%s\n" -#: g10/keyedit.c:797 +#: g10/keyedit.c:890 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) I have done very careful checking.%s\n" -#: g10/keyedit.c:803 +#: g10/keyedit.c:896 msgid "Your selection? (enter '?' for more information): " msgstr "Your selection? (enter ‘[1m?[0m’ for more information): " -#: g10/keyedit.c:826 +#: g10/keyedit.c:919 msgid "" "Are you really sure that you want to sign this key\n" "with your key: \"" @@ -2691,7 +2754,7 @@ msgstr "" "Are you really sure that you want to sign this key\n" "with your key: \"" -#: g10/keyedit.c:835 +#: g10/keyedit.c:928 msgid "" "\n" "This will be a self-signature.\n" @@ -2699,7 +2762,7 @@ msgstr "" "\n" "This will be a self-signature.\n" -#: g10/keyedit.c:839 +#: g10/keyedit.c:932 msgid "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" @@ -2707,7 +2770,7 @@ msgstr "" "\n" "WARNING: the signature will not be marked as non-exportable.\n" -#: g10/keyedit.c:844 +#: g10/keyedit.c:937 msgid "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" @@ -2715,7 +2778,7 @@ msgstr "" "\n" "WARNING: the signature will not be marked as non-revocable.\n" -#: g10/keyedit.c:851 +#: g10/keyedit.c:944 msgid "" "\n" "The signature will be marked as non-exportable.\n" @@ -2723,7 +2786,7 @@ msgstr "" "\n" "The signature will be marked as non-exportable.\n" -#: g10/keyedit.c:855 +#: g10/keyedit.c:948 msgid "" "\n" "The signature will be marked as non-revocable.\n" @@ -2731,7 +2794,7 @@ msgstr "" "\n" "The signature will be marked as non-revocable.\n" -#: g10/keyedit.c:860 +#: g10/keyedit.c:953 msgid "" "\n" "I have not checked this key at all.\n" @@ -2739,7 +2802,7 @@ msgstr "" "\n" "I have not checked this key at all.\n" -#: g10/keyedit.c:864 +#: g10/keyedit.c:957 msgid "" "\n" "I have checked this key casually.\n" @@ -2747,7 +2810,7 @@ msgstr "" "\n" "I have checked this key casually.\n" -#: g10/keyedit.c:868 +#: g10/keyedit.c:961 msgid "" "\n" "I have checked this key very carefully.\n" @@ -2755,34 +2818,34 @@ msgstr "" "\n" "I have checked this key very carefully.\n" -#: g10/keyedit.c:877 +#: g10/keyedit.c:970 msgid "Really sign? " msgstr "Really sign? " -#: g10/keyedit.c:922 g10/keyedit.c:3648 g10/keyedit.c:3739 g10/keyedit.c:3812 +#: g10/keyedit.c:1015 g10/keyedit.c:3859 g10/keyedit.c:3950 g10/keyedit.c:4023 #: g10/sign.c:369 #, c-format msgid "signing failed: %s\n" msgstr "signing failed: %s\n" -#: g10/keyedit.c:978 +#: g10/keyedit.c:1071 msgid "This key is not protected.\n" msgstr "This key is not protected.\n" -#: g10/keyedit.c:982 +#: g10/keyedit.c:1075 msgid "Secret parts of primary key are not available.\n" msgstr "Secret parts of primary key are not available.\n" -#: g10/keyedit.c:986 +#: g10/keyedit.c:1079 msgid "Key is protected.\n" msgstr "Key is protected.\n" -#: g10/keyedit.c:1006 +#: g10/keyedit.c:1099 #, c-format msgid "Can't edit this key: %s\n" msgstr "Can't edit this key: %s\n" -#: g10/keyedit.c:1012 +#: g10/keyedit.c:1105 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2790,7 +2853,7 @@ msgstr "" "Enter the new passphrase for this secret key.\n" "\n" -#: g10/keyedit.c:1026 +#: g10/keyedit.c:1119 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2798,538 +2861,556 @@ msgstr "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" -#: g10/keyedit.c:1029 +#: g10/keyedit.c:1122 msgid "Do you really want to do this? " msgstr "Do you really want to do this? " -#: g10/keyedit.c:1095 +#: g10/keyedit.c:1188 msgid "moving a key signature to the correct place\n" msgstr "moving a key signature to the correct place\n" -#: g10/keyedit.c:1138 +#: g10/keyedit.c:1232 msgid "quit this menu" msgstr "quit this menu" -#: g10/keyedit.c:1139 +#: g10/keyedit.c:1233 msgid "q" msgstr "q" -#: g10/keyedit.c:1140 +#: g10/keyedit.c:1234 msgid "save" msgstr "save" -#: g10/keyedit.c:1140 +#: g10/keyedit.c:1234 msgid "save and quit" msgstr "save and quit" -#: g10/keyedit.c:1141 +#: g10/keyedit.c:1235 msgid "help" msgstr "help" -#: g10/keyedit.c:1141 +#: g10/keyedit.c:1235 msgid "show this help" msgstr "show this help" -#: g10/keyedit.c:1143 +#: g10/keyedit.c:1237 msgid "fpr" msgstr "fpr" -#: g10/keyedit.c:1143 +#: g10/keyedit.c:1237 msgid "show fingerprint" msgstr "show fingerprint" -#: g10/keyedit.c:1144 +#: g10/keyedit.c:1238 msgid "list" msgstr "list" -#: g10/keyedit.c:1144 +#: g10/keyedit.c:1238 msgid "list key and user IDs" msgstr "list key and user IDs" -#: g10/keyedit.c:1145 +#: g10/keyedit.c:1239 msgid "l" msgstr "l" -#: g10/keyedit.c:1146 +#: g10/keyedit.c:1240 msgid "uid" msgstr "uid" -#: g10/keyedit.c:1146 +#: g10/keyedit.c:1240 msgid "select user ID N" msgstr "select user ID N" -#: g10/keyedit.c:1147 +#: g10/keyedit.c:1241 msgid "key" msgstr "key" -#: g10/keyedit.c:1147 +#: g10/keyedit.c:1241 msgid "select secondary key N" msgstr "select secondary key N" -#: g10/keyedit.c:1148 +#: g10/keyedit.c:1242 msgid "check" msgstr "check" -#: g10/keyedit.c:1148 +#: g10/keyedit.c:1242 msgid "list signatures" msgstr "list signatures" -#: g10/keyedit.c:1149 +#: g10/keyedit.c:1243 msgid "c" msgstr "c" -#: g10/keyedit.c:1150 +#: g10/keyedit.c:1244 msgid "sign" msgstr "sign" -#: g10/keyedit.c:1150 +#: g10/keyedit.c:1244 msgid "sign the key" msgstr "sign the key" -#: g10/keyedit.c:1151 +#: g10/keyedit.c:1245 msgid "s" msgstr "s" -#: g10/keyedit.c:1152 +#: g10/keyedit.c:1246 msgid "tsign" msgstr "tsign" -#: g10/keyedit.c:1152 +#: g10/keyedit.c:1246 msgid "make a trust signature" msgstr "make a trust signature" -#: g10/keyedit.c:1153 +#: g10/keyedit.c:1247 msgid "lsign" msgstr "lsign" -#: g10/keyedit.c:1153 +#: g10/keyedit.c:1247 msgid "sign the key locally" msgstr "sign the key locally" -#: g10/keyedit.c:1154 +#: g10/keyedit.c:1248 msgid "nrsign" msgstr "nrsign" -#: g10/keyedit.c:1154 +#: g10/keyedit.c:1248 msgid "sign the key non-revocably" msgstr "sign the key non-revocably" -#: g10/keyedit.c:1155 +#: g10/keyedit.c:1249 msgid "nrlsign" msgstr "nrlsign" -#: g10/keyedit.c:1155 +#: g10/keyedit.c:1249 msgid "sign the key locally and non-revocably" msgstr "sign the key locally and non-revocably" -#: g10/keyedit.c:1156 +#: g10/keyedit.c:1250 msgid "debug" msgstr "debug" -#: g10/keyedit.c:1157 +#: g10/keyedit.c:1251 msgid "adduid" msgstr "adduid" -#: g10/keyedit.c:1157 +#: g10/keyedit.c:1251 msgid "add a user ID" msgstr "add a user ID" -#: g10/keyedit.c:1158 +#: g10/keyedit.c:1252 msgid "addphoto" msgstr "addphoto" -#: g10/keyedit.c:1158 +#: g10/keyedit.c:1252 msgid "add a photo ID" msgstr "add a photo ID" -#: g10/keyedit.c:1159 +#: g10/keyedit.c:1253 msgid "deluid" msgstr "deluid" -#: g10/keyedit.c:1159 +#: g10/keyedit.c:1253 msgid "delete user ID" msgstr "delete user ID" -#: g10/keyedit.c:1161 +#: g10/keyedit.c:1255 msgid "delphoto" msgstr "delphoto" -#: g10/keyedit.c:1162 +#: g10/keyedit.c:1256 msgid "addkey" msgstr "addkey" -#: g10/keyedit.c:1162 +#: g10/keyedit.c:1256 msgid "add a secondary key" msgstr "add a secondary key" -#: g10/keyedit.c:1163 +#: g10/keyedit.c:1258 +msgid "addcardkey" +msgstr "addcardkey" + +#: g10/keyedit.c:1258 +msgid "add a key to a smartcard" +msgstr "add a key to a smartcard" + +#: g10/keyedit.c:1259 +msgid "keytocard" +msgstr "keytocard" + +#: g10/keyedit.c:1259 +msgid "move a key to a smartcard" +msgstr "move a key to a smartcard" + +#: g10/keyedit.c:1261 msgid "delkey" msgstr "delkey" -#: g10/keyedit.c:1163 +#: g10/keyedit.c:1261 msgid "delete a secondary key" msgstr "delete a secondary key" -#: g10/keyedit.c:1164 +#: g10/keyedit.c:1262 msgid "addrevoker" msgstr "addrevoker" -#: g10/keyedit.c:1164 +#: g10/keyedit.c:1262 msgid "add a revocation key" msgstr "add a revocation key" -#: g10/keyedit.c:1165 +#: g10/keyedit.c:1263 msgid "delsig" msgstr "delsig" -#: g10/keyedit.c:1165 +#: g10/keyedit.c:1263 msgid "delete signatures" msgstr "delete signatures" -#: g10/keyedit.c:1166 +#: g10/keyedit.c:1264 msgid "expire" msgstr "expire" -#: g10/keyedit.c:1166 +#: g10/keyedit.c:1264 msgid "change the expire date" msgstr "change the expire date" -#: g10/keyedit.c:1167 +#: g10/keyedit.c:1265 msgid "primary" msgstr "primary" -#: g10/keyedit.c:1167 +#: g10/keyedit.c:1265 msgid "flag user ID as primary" msgstr "flag user ID as primary" -#: g10/keyedit.c:1168 +#: g10/keyedit.c:1266 msgid "toggle" msgstr "toggle" -#: g10/keyedit.c:1168 +#: g10/keyedit.c:1266 msgid "toggle between secret and public key listing" msgstr "toggle between secret and public key listing" -#: g10/keyedit.c:1170 +#: g10/keyedit.c:1268 msgid "t" msgstr "t" -#: g10/keyedit.c:1171 +#: g10/keyedit.c:1269 msgid "pref" msgstr "pref" -#: g10/keyedit.c:1171 +#: g10/keyedit.c:1269 msgid "list preferences (expert)" msgstr "list preferences (expert)" -#: g10/keyedit.c:1172 +#: g10/keyedit.c:1270 msgid "showpref" msgstr "showpref" -#: g10/keyedit.c:1172 +#: g10/keyedit.c:1270 msgid "list preferences (verbose)" msgstr "list preferences (verbose)" -#: g10/keyedit.c:1173 +#: g10/keyedit.c:1271 msgid "setpref" msgstr "setpref" -#: g10/keyedit.c:1173 +#: g10/keyedit.c:1271 msgid "set preference list" msgstr "set preference list" -#: g10/keyedit.c:1174 +#: g10/keyedit.c:1272 msgid "updpref" msgstr "updpref" -#: g10/keyedit.c:1174 +#: g10/keyedit.c:1272 msgid "updated preferences" msgstr "updated preferences" -#: g10/keyedit.c:1175 +#: g10/keyedit.c:1273 msgid "keyserver" msgstr "keyserver" -#: g10/keyedit.c:1175 +#: g10/keyedit.c:1273 msgid "set preferred keyserver URL" msgstr "set preferred keyserver URL" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1274 msgid "passwd" msgstr "passwd" -#: g10/keyedit.c:1176 +#: g10/keyedit.c:1274 msgid "change the passphrase" msgstr "change the passphrase" -#: g10/keyedit.c:1177 +#: g10/keyedit.c:1275 msgid "trust" msgstr "trust" -#: g10/keyedit.c:1177 +#: g10/keyedit.c:1275 msgid "change the ownertrust" msgstr "change the ownertrust" -#: g10/keyedit.c:1178 +#: g10/keyedit.c:1276 msgid "revsig" msgstr "revsig" -#: g10/keyedit.c:1178 +#: g10/keyedit.c:1276 msgid "revoke signatures" msgstr "revoke signatures" -#: g10/keyedit.c:1179 +#: g10/keyedit.c:1277 msgid "revuid" msgstr "revuid" -#: g10/keyedit.c:1179 +#: g10/keyedit.c:1277 msgid "revoke a user ID" msgstr "revoke a user ID" -#: g10/keyedit.c:1180 +#: g10/keyedit.c:1278 msgid "revkey" msgstr "revkey" -#: g10/keyedit.c:1180 +#: g10/keyedit.c:1278 msgid "revoke a secondary key" msgstr "revoke a secondary key" -#: g10/keyedit.c:1181 +#: g10/keyedit.c:1279 msgid "disable" msgstr "disable" -#: g10/keyedit.c:1181 +#: g10/keyedit.c:1279 msgid "disable a key" msgstr "disable a key" -#: g10/keyedit.c:1182 +#: g10/keyedit.c:1280 msgid "enable" msgstr "enable" -#: g10/keyedit.c:1182 +#: g10/keyedit.c:1280 msgid "enable a key" msgstr "enable a key" -#: g10/keyedit.c:1183 +#: g10/keyedit.c:1281 msgid "showphoto" msgstr "showphoto" -#: g10/keyedit.c:1183 +#: g10/keyedit.c:1281 msgid "show photo ID" msgstr "show photo ID" -#: g10/keyedit.c:1202 g10/delkey.c:120 +#: g10/keyedit.c:1300 g10/delkey.c:120 msgid "can't do that in batchmode\n" msgstr "can't do that in batchmode\n" -#: g10/keyedit.c:1233 +#: g10/keyedit.c:1331 #, c-format msgid "error reading secret keyblock `%s': %s\n" msgstr "error reading secret keyblock ‘[1m%s[0m’: %s\n" -#: g10/keyedit.c:1250 +#: g10/keyedit.c:1348 msgid "Secret key is available.\n" msgstr "Secret key is available.\n" -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1380 msgid "Command> " msgstr "Command> " -#: g10/keyedit.c:1312 +#: g10/keyedit.c:1410 msgid "Need the secret key to do this.\n" msgstr "Need the secret key to do this.\n" -#: g10/keyedit.c:1316 +#: g10/keyedit.c:1415 msgid "Please use the command \"toggle\" first.\n" msgstr "Please use the command “[1mtoggle[0m” first.\n" -#: g10/keyedit.c:1364 +#: g10/keyedit.c:1463 msgid "Key is revoked." msgstr "Key is revoked." -#: g10/keyedit.c:1383 +#: g10/keyedit.c:1482 msgid "Really sign all user IDs? " msgstr "Really sign all user IDs? " -#: g10/keyedit.c:1384 +#: g10/keyedit.c:1483 msgid "Hint: Select the user IDs to sign\n" msgstr "Hint: Select the user IDs to sign\n" -#: g10/keyedit.c:1409 +#: g10/keyedit.c:1508 #, 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:1431 g10/keyedit.c:1452 g10/keyedit.c:1511 +#: g10/keyedit.c:1530 g10/keyedit.c:1551 g10/keyedit.c:1654 msgid "You must select at least one user ID.\n" msgstr "You must select at least one user ID.\n" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1532 msgid "You can't delete the last user ID!\n" msgstr "You can't delete the last user ID!\n" -#: g10/keyedit.c:1436 +#: g10/keyedit.c:1535 msgid "Really remove all selected user IDs? " msgstr "Really remove all selected user IDs? " -#: g10/keyedit.c:1437 +#: g10/keyedit.c:1536 msgid "Really remove this user ID? " msgstr "Really remove this user ID? " -#: g10/keyedit.c:1475 g10/keyedit.c:1530 +#: g10/keyedit.c:1586 +msgid "Really move the primary key? " +msgstr "Really move the primary key? " + +#: g10/keyedit.c:1598 +msgid "You must select exactly one key.\n" +msgstr "You must select exactly one key.\n" + +#: g10/keyedit.c:1618 g10/keyedit.c:1673 msgid "You must select at least one key.\n" msgstr "You must select at least one key.\n" -#: g10/keyedit.c:1478 +#: g10/keyedit.c:1621 msgid "Do you really want to delete the selected keys? " msgstr "Do you really want to delete the selected keys? " -#: g10/keyedit.c:1479 +#: g10/keyedit.c:1622 msgid "Do you really want to delete this key? " msgstr "Do you really want to delete this key? " -#: g10/keyedit.c:1514 +#: g10/keyedit.c:1657 msgid "Really revoke all selected user IDs? " msgstr "Really revoke all selected user IDs? " -#: g10/keyedit.c:1515 +#: g10/keyedit.c:1658 msgid "Really revoke this user ID? " msgstr "Really revoke this user ID? " -#: g10/keyedit.c:1534 +#: g10/keyedit.c:1677 msgid "Do you really want to revoke the selected keys? " msgstr "Do you really want to revoke the selected keys? " -#: g10/keyedit.c:1535 +#: g10/keyedit.c:1678 msgid "Do you really want to revoke this key? " msgstr "Do you really want to revoke this key? " -#: g10/keyedit.c:1574 +#: g10/keyedit.c:1717 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:1606 +#: g10/keyedit.c:1749 msgid "Set preference list to:\n" msgstr "Set preference list to:\n" -#: g10/keyedit.c:1612 +#: g10/keyedit.c:1755 msgid "Really update the preferences for the selected user IDs? " msgstr "Really update the preferences for the selected user IDs? " -#: g10/keyedit.c:1614 +#: g10/keyedit.c:1757 msgid "Really update the preferences? " msgstr "Really update the preferences? " -#: g10/keyedit.c:1662 +#: g10/keyedit.c:1805 msgid "Save changes? " msgstr "Save changes? " -#: g10/keyedit.c:1665 +#: g10/keyedit.c:1808 msgid "Quit without saving? " msgstr "Quit without saving? " -#: g10/keyedit.c:1675 +#: g10/keyedit.c:1818 #, c-format msgid "update failed: %s\n" msgstr "update failed: %s\n" -#: g10/keyedit.c:1682 +#: g10/keyedit.c:1825 #, c-format msgid "update secret failed: %s\n" msgstr "update secret failed: %s\n" -#: g10/keyedit.c:1689 +#: g10/keyedit.c:1832 msgid "Key not changed so no update needed.\n" msgstr "Key not changed so no update needed.\n" -#: g10/keyedit.c:1701 +#: g10/keyedit.c:1844 msgid "Invalid command (try \"help\")\n" msgstr "Invalid command (try “[1mhelp[0m”)\n" -#: g10/keyedit.c:1760 +#: g10/keyedit.c:1906 msgid "Digest: " msgstr "Digest: " -#: g10/keyedit.c:1812 +#: g10/keyedit.c:1958 msgid "Features: " msgstr "Features: " -#: g10/keyedit.c:1823 +#: g10/keyedit.c:1969 msgid "Keyserver no-modify" msgstr "Keyserver no-modify" -#: g10/keyedit.c:2063 +#: g10/keyedit.c:1979 g10/keylist.c:223 +msgid "Preferred keyserver: " +msgstr "Preferred keyserver: " + +#: g10/keyedit.c:2219 #, c-format msgid "This key may be revoked by %s key " msgstr "This key may be revoked by %s key " -#: g10/keyedit.c:2067 +#: g10/keyedit.c:2223 msgid " (sensitive)" msgstr " (sensitive)" -#: g10/keyedit.c:2081 g10/keyedit.c:2135 g10/keyedit.c:2238 g10/keyedit.c:2253 +#: g10/keyedit.c:2237 g10/keyedit.c:2293 g10/keyedit.c:2419 g10/keyedit.c:2434 #, c-format msgid "created: %s" msgstr "created: %s" -#: g10/keyedit.c:2084 -#, c-format -msgid "revoked: %s" -msgstr "revoked: %s" +#: g10/keyedit.c:2240 g10/keyedit.c:2341 g10/keyedit.c:2453 g10/keylist.c:692 +#: g10/keylist.c:735 g10/keylist.c:790 g10/mainproc.c:930 g10/mainproc.c:1551 +#: g10/trustdb.c:1124 +msgid "revoked" +msgstr "revoked" -#: g10/keyedit.c:2086 -#, c-format -msgid "expired: %s" -msgstr "expired: %s" +#: g10/keyedit.c:2242 g10/keyedit.c:2343 g10/keyedit.c:2455 g10/keylist.c:671 +#: g10/keylist.c:694 g10/keylist.c:737 g10/keylist.c:792 g10/mainproc.c:1553 +#: g10/trustdb.c:499 +msgid "expired" +msgstr "expired" -#: g10/keyedit.c:2088 g10/keyedit.c:2137 g10/keyedit.c:2240 g10/keyedit.c:2255 +#: g10/keyedit.c:2244 g10/keyedit.c:2295 g10/keyedit.c:2421 g10/keyedit.c:2436 +#: g10/keylist.c:673 g10/keylist.c:696 g10/keylist.c:794 g10/keylist.c:820 +#: g10/mainproc.c:932 +msgid "expires" +msgstr "expires" + +#: g10/keyedit.c:2246 #, c-format -msgid "expires: %s" -msgstr "expires: %s" +msgid "usage: %s" +msgstr "usage: %s" -#: g10/keyedit.c:2103 +#: g10/keyedit.c:2261 #, c-format msgid "trust: %s" msgstr "trust: %s" -#: g10/keyedit.c:2107 +#: g10/keyedit.c:2265 #, c-format msgid "validity: %s" msgstr "validity: %s" -#: g10/keyedit.c:2114 +#: g10/keyedit.c:2272 msgid "This key has been disabled" msgstr "This key has been disabled" -#: g10/keyedit.c:2146 -#, c-format -msgid "rev! subkey has been revoked: %s\n" -msgstr "rev! subkey has been revoked: %s\n" - -#: g10/keyedit.c:2149 -msgid "rev- faked revocation found\n" -msgstr "rev- faked revocation found\n" - -#: g10/keyedit.c:2151 -#, c-format -msgid "rev? problem checking revocation: %s\n" -msgstr "rev? problem checking revocation: %s\n" - -#: g10/keyedit.c:2176 g10/keylist.c:689 g10/mainproc.c:1551 g10/trustdb.c:1124 -msgid "revoked" -msgstr "revoked" +#: g10/keyedit.c:2300 +msgid "card-no: " +msgstr "card-no: " -#: g10/keyedit.c:2178 g10/keylist.c:691 g10/mainproc.c:1553 g10/trustdb.c:499 -msgid "expired" -msgstr "expired" - -#: g10/keyedit.c:2199 +#: g10/keyedit.c:2381 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "There are no preferences on a PGP 2.x-style user ID.\n" -#: g10/keyedit.c:2207 +#: g10/keyedit.c:2389 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" @@ -3337,15 +3418,7 @@ msgstr "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" -#: g10/keyedit.c:2272 g10/mainproc.c:930 -msgid "[revoked] " -msgstr "[revoked] " - -#: g10/keyedit.c:2274 -msgid "[expired] " -msgstr "[expired] " - -#: g10/keyedit.c:2339 +#: g10/keyedit.c:2520 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" @@ -3353,7 +3426,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:2399 +#: g10/keyedit.c:2580 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3363,45 +3436,45 @@ msgstr "" "versions\n" " of PGP to reject this key.\n" -#: g10/keyedit.c:2404 g10/keyedit.c:2677 +#: g10/keyedit.c:2585 g10/keyedit.c:2863 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:2410 +#: g10/keyedit.c:2591 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:2545 +#: g10/keyedit.c:2731 msgid "Delete this good signature? (y/N/q)" msgstr "Delete this good signature? (y/N/q)" -#: g10/keyedit.c:2555 +#: g10/keyedit.c:2741 msgid "Delete this invalid signature? (y/N/q)" msgstr "Delete this invalid signature? (y/N/q)" -#: g10/keyedit.c:2559 +#: g10/keyedit.c:2745 msgid "Delete this unknown signature? (y/N/q)" msgstr "Delete this unknown signature? (y/N/q)" -#: g10/keyedit.c:2565 +#: g10/keyedit.c:2751 msgid "Really delete this self-signature? (y/N)" msgstr "Really delete this self-signature? (y/N)" -#: g10/keyedit.c:2579 +#: g10/keyedit.c:2765 #, c-format msgid "Deleted %d signature.\n" msgstr "Deleted %d signature.\n" -#: g10/keyedit.c:2580 +#: g10/keyedit.c:2766 #, c-format msgid "Deleted %d signatures.\n" msgstr "Deleted %d signatures.\n" -#: g10/keyedit.c:2583 +#: g10/keyedit.c:2769 msgid "Nothing deleted.\n" msgstr "Nothing deleted.\n" -#: g10/keyedit.c:2672 +#: g10/keyedit.c:2858 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3411,88 +3484,96 @@ msgstr "" "cause\n" " some versions of PGP to reject this key.\n" -#: g10/keyedit.c:2683 +#: g10/keyedit.c:2869 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:2703 +#: g10/keyedit.c:2889 msgid "Enter the user ID of the designated revoker: " msgstr "Enter the user ID of the designated revoker: " -#: g10/keyedit.c:2726 +#: g10/keyedit.c:2912 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n" -#: g10/keyedit.c:2741 +#: g10/keyedit.c:2927 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "you cannot appoint a key as its own designated revoker\n" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2949 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:2782 +#: g10/keyedit.c:2968 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:2788 +#: g10/keyedit.c:2974 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:2849 +#: g10/keyedit.c:3035 msgid "Please remove selections from the secret keys.\n" msgstr "Please remove selections from the secret keys.\n" -#: g10/keyedit.c:2855 +#: g10/keyedit.c:3041 msgid "Please select at most one secondary key.\n" msgstr "Please select at most one secondary key.\n" -#: g10/keyedit.c:2859 +#: g10/keyedit.c:3045 msgid "Changing expiration time for a secondary key.\n" msgstr "Changing expiration time for a secondary key.\n" -#: g10/keyedit.c:2862 +#: g10/keyedit.c:3048 msgid "Changing expiration time for the primary key.\n" msgstr "Changing expiration time for the primary key.\n" -#: g10/keyedit.c:2908 +#: g10/keyedit.c:3094 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:2924 +#: g10/keyedit.c:3110 msgid "No corresponding signature in secret ring\n" msgstr "No corresponding signature in secret ring\n" -#: g10/keyedit.c:3004 +#: g10/keyedit.c:3190 msgid "Please select exactly one user ID.\n" msgstr "Please select exactly one user ID.\n" -#: g10/keyedit.c:3043 g10/keyedit.c:3153 g10/keyedit.c:3267 +#: g10/keyedit.c:3229 g10/keyedit.c:3339 g10/keyedit.c:3458 #, c-format -msgid "skipping v3 self-signature on user id \"%s\"\n" -msgstr "skipping v3 self-signature on user id “[1m%s[0m”\n" +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:3215 +#: g10/keyedit.c:3400 msgid "Enter your preferred keyserver URL: " msgstr "Enter your preferred keyserver URL: " -#: g10/keyedit.c:3331 +#: g10/keyedit.c:3479 +msgid "Are you sure you want to replace it? (y/N) " +msgstr "Are you sure you want to replace it? (y/N) " + +#: g10/keyedit.c:3480 +msgid "Are you sure you want to delete it? (y/N) " +msgstr "Are you sure you want to delete it? (y/N) " + +#: g10/keyedit.c:3542 #, c-format msgid "No user ID with index %d\n" msgstr "No user ID with index %d\n" -#: g10/keyedit.c:3377 +#: g10/keyedit.c:3588 #, c-format msgid "No secondary key with index %d\n" msgstr "No secondary key with index %d\n" -#: g10/keyedit.c:3491 +#: g10/keyedit.c:3702 msgid "user ID: \"" msgstr "user ID: \"" -#: g10/keyedit.c:3496 +#: g10/keyedit.c:3707 #, c-format msgid "" "\"\n" @@ -3501,7 +3582,7 @@ msgstr "" "\"\n" "signed with your key %s at %s\n" -#: g10/keyedit.c:3499 +#: g10/keyedit.c:3710 #, c-format msgid "" "\"\n" @@ -3510,141 +3591,125 @@ msgstr "" "\"\n" "locally signed with your key %s at %s\n" -#: g10/keyedit.c:3504 +#: g10/keyedit.c:3715 #, c-format msgid "This signature expired on %s.\n" msgstr "This signature expired on %s.\n" -#: g10/keyedit.c:3508 +#: g10/keyedit.c:3719 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:3512 +#: g10/keyedit.c:3723 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "Create a revocation certificate for this signature? (y/N) " -#: g10/keyedit.c:3537 +#: g10/keyedit.c:3748 msgid "You have signed these user IDs:\n" msgstr "You have signed these user IDs:\n" -#: g10/keyedit.c:3558 +#: g10/keyedit.c:3769 #, c-format msgid " signed by %s on %s%s%s\n" msgstr " signed by %s on %s%s%s\n" -#: g10/keyedit.c:3567 +#: g10/keyedit.c:3778 #, c-format msgid " revoked by %s on %s\n" msgstr " revoked by %s on %s\n" -#: g10/keyedit.c:3587 +#: g10/keyedit.c:3798 msgid "You are about to revoke these signatures:\n" msgstr "You are about to revoke these signatures:\n" -#: g10/keyedit.c:3597 +#: g10/keyedit.c:3808 #, c-format msgid " signed by %s on %s%s\n" msgstr " signed by %s on %s%s\n" -#: g10/keyedit.c:3599 +#: g10/keyedit.c:3810 msgid " (non-exportable)" msgstr " (non-exportable)" -#: g10/keyedit.c:3606 +#: g10/keyedit.c:3817 msgid "Really create the revocation certificates? (y/N) " msgstr "Really create the revocation certificates? (y/N) " -#: g10/keyedit.c:3636 +#: g10/keyedit.c:3847 msgid "no secret key\n" msgstr "no secret key\n" -#: g10/keyedit.c:3706 +#: g10/keyedit.c:3917 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "user ID “[1m%s[0m” is already revoked\n" -#: g10/keyedit.c:3723 +#: g10/keyedit.c:3934 #, 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:3892 +#: g10/keyedit.c:4103 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "Displaying %s photo ID of size %ld for key %s (uid %d)\n" -#: g10/keylist.c:179 +#: g10/keylist.c:180 msgid "Critical signature policy: " msgstr "Critical signature policy: " -#: g10/keylist.c:181 +#: g10/keylist.c:182 msgid "Signature policy: " msgstr "Signature policy: " -#: g10/keylist.c:220 +#: g10/keylist.c:221 msgid "Critical preferred keyserver: " msgstr "Critical preferred keyserver: " -#: g10/keylist.c:222 -msgid "Preferred keyserver: " -msgstr "Preferred keyserver: " - -#: g10/keylist.c:268 g10/keylist.c:312 +#: g10/keylist.c:269 g10/keylist.c:313 msgid "WARNING: invalid notation data found\n" msgstr "WARNING: invalid notation data found\n" -#: g10/keylist.c:286 +#: g10/keylist.c:287 msgid "Critical signature notation: " msgstr "Critical signature notation: " -#: g10/keylist.c:288 +#: g10/keylist.c:289 msgid "Signature notation: " msgstr "Signature notation: " -#: g10/keylist.c:299 +#: g10/keylist.c:300 msgid "not human readable" msgstr "not human readable" -#: g10/keylist.c:400 +#: g10/keylist.c:401 msgid "Keyring" msgstr "Keyring" -#: g10/keylist.c:625 g10/keylist.c:648 g10/keylist.c:745 -#, c-format -msgid " [expired: %s]" -msgstr " [expired: %s]" - -#: g10/keylist.c:627 g10/keylist.c:650 g10/keylist.c:747 g10/keylist.c:772 -#: g10/mainproc.c:932 -#, c-format -msgid " [expires: %s]" -msgstr " [expires: %s]" - -#: g10/keylist.c:646 g10/keylist.c:743 -#, c-format -msgid " [revoked: %s]" -msgstr " [revoked: %s]" - -#: g10/keylist.c:1357 +#: g10/keylist.c:1412 msgid "Primary key fingerprint:" msgstr "Primary key fingerprint:" -#: g10/keylist.c:1359 +#: g10/keylist.c:1414 msgid " Subkey fingerprint:" msgstr " Subkey fingerprint:" -#: g10/keylist.c:1366 +#: g10/keylist.c:1421 msgid " Primary key fingerprint:" msgstr " Primary key fingerprint:" -#: g10/keylist.c:1368 +#: g10/keylist.c:1423 msgid " Subkey fingerprint:" msgstr " Subkey fingerprint:" -#: g10/keylist.c:1372 g10/keylist.c:1376 +#: g10/keylist.c:1427 g10/keylist.c:1431 msgid " Key fingerprint =" msgstr " Key fingerprint =" +#: g10/keylist.c:1498 +msgid " Card serial no. =" +msgstr " Card serial no. =" + #: g10/mainproc.c:248 #, c-format msgid "weird size for an encrypted session key (%d)\n" @@ -3850,77 +3915,77 @@ msgstr "old style (PGP 2.x) signature\n" msgid "invalid root packet detected in proc_tree()\n" msgstr "invalid root packet detected in proc_tree()\n" -#: g10/misc.c:82 +#: g10/misc.c:83 #, c-format msgid "can't disable core dumps: %s\n" msgstr "can't disable core dumps: %s\n" -#: g10/misc.c:146 +#: g10/misc.c:147 msgid "Experimental algorithms should not be used!\n" msgstr "Experimental algorithms should not be used!\n" -#: g10/misc.c:176 +#: g10/misc.c:177 msgid "this cipher algorithm is deprecated; please use a more standard one!\n" msgstr "this cipher algorithm is deprecated; please use a more standard one!\n" -#: g10/misc.c:282 +#: g10/misc.c:283 msgid "the IDEA cipher plugin is not present\n" msgstr "the IDEA cipher plugin is not present\n" -#: g10/misc.c:283 +#: g10/misc.c:284 msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" -#: g10/misc.c:491 +#: g10/misc.c:517 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d: deprecated option “[1m%s[0m”\n" -#: g10/misc.c:495 +#: g10/misc.c:521 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "WARNING: “[1m%s[0m” is a deprecated option\n" -#: g10/misc.c:497 +#: g10/misc.c:523 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "please use “[1m%s%s[0m” instead\n" -#: g10/misc.c:508 +#: g10/misc.c:534 msgid "Uncompressed" msgstr "Uncompressed" -#: g10/misc.c:533 +#: g10/misc.c:559 msgid "uncompressed|none" msgstr "uncompressed|none" -#: g10/misc.c:643 +#: g10/misc.c:669 #, c-format msgid "this message may not be usable by %s\n" msgstr "this message may not be usable by %s\n" -#: g10/misc.c:777 +#: g10/misc.c:826 #, c-format msgid "ambiguous option `%s'\n" msgstr "ambiguous option ‘[1m%s[0m’\n" -#: g10/misc.c:802 +#: g10/misc.c:851 #, c-format msgid "unknown option `%s'\n" msgstr "unknown option ‘[1m%s[0m’\n" -#: g10/parse-packet.c:120 +#: g10/parse-packet.c:119 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "can't handle public key algorithm %d\n" -#: g10/parse-packet.c:703 +#: g10/parse-packet.c:688 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "WARNING: potentially insecure symmetrically encrypted session key\n" -#: g10/parse-packet.c:1128 +#: g10/parse-packet.c:1113 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "subpacket of type %d has critical bit set\n" @@ -3959,7 +4024,7 @@ msgstr "can't connect to ‘[1m%s[0m’: %s\n" msgid "communication problem with gpg-agent\n" msgstr "communication problem with gpg-agent\n" -#: g10/passphrase.c:580 g10/passphrase.c:880 g10/passphrase.c:992 +#: g10/passphrase.c:580 g10/passphrase.c:882 g10/passphrase.c:994 msgid "problem with the agent - disabling agent use\n" msgstr "problem with the agent - disabling agent use\n" @@ -3995,24 +4060,24 @@ msgstr "passphrase too long\n" msgid "invalid response from agent\n" msgstr "invalid response from agent\n" -#: g10/passphrase.c:781 g10/passphrase.c:874 +#: g10/passphrase.c:781 g10/passphrase.c:876 msgid "cancelled by user\n" msgstr "cancelled by user\n" -#: g10/passphrase.c:786 g10/passphrase.c:963 +#: g10/passphrase.c:786 g10/passphrase.c:965 #, 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:1044 g10/passphrase.c:1204 +#: g10/passphrase.c:1046 g10/passphrase.c:1206 msgid "can't query password in batchmode\n" msgstr "can't query password in batchmode\n" -#: g10/passphrase.c:1049 g10/passphrase.c:1209 +#: g10/passphrase.c:1051 g10/passphrase.c:1211 msgid "Enter passphrase: " msgstr "Enter passphrase: " -#: g10/passphrase.c:1131 +#: g10/passphrase.c:1133 msgid "" "\n" "You need a passphrase to unlock the secret key for\n" @@ -4022,22 +4087,22 @@ msgstr "" "You need a passphrase to unlock the secret key for\n" "user: \"" -#: g10/passphrase.c:1140 +#: g10/passphrase.c:1142 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u-bit %s key, ID %s, created %s" -#: g10/passphrase.c:1149 +#: g10/passphrase.c:1151 #, c-format msgid " (subkey on main key ID %s)" msgstr " (subkey on main key ID %s)" -#: g10/passphrase.c:1153 +#: g10/passphrase.c:1155 #, c-format msgid " (main key ID %s)" msgstr " (main key ID %s)" -#: g10/passphrase.c:1213 +#: g10/passphrase.c:1215 msgid "Repeat passphrase: " msgstr "Repeat passphrase: " @@ -4250,25 +4315,37 @@ 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:765 g10/sign.c:1001 +#: g10/sign.c:765 g10/sign.c:1002 g10/exec.c:483 #, c-format -msgid "can't create %s: %s\n" -msgstr "can't create %s: %s\n" +msgid "can't create file `%s': %s\n" +msgstr "can't create file ‘[1m%s[0m’: %s\n" -#: g10/sign.c:794 +#: g10/sign.c:771 g10/sign.c:1008 #, c-format -msgid "forcing digest algorithm %s (%d) violates recipient preferences\n" -msgstr "forcing digest algorithm %s (%d) violates recipient preferences\n" +msgid "writing to file `%s'\n" +msgstr "writing to file ‘[1m%s[0m’\n" -#: g10/sign.c:886 +#: g10/sign.c:795 +#, c-format +msgid "" +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" +msgstr "" +"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" + +#: g10/sign.c:887 msgid "signing:" msgstr "signing:" -#: g10/sign.c:985 +#: g10/sign.c:892 +#, c-format +msgid "can't open file `%s': %s\n" +msgstr "can't open file ‘[1m%s[0m’: %s\n" + +#: g10/sign.c:986 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:1138 +#: g10/sign.c:1140 #, c-format msgid "%s encryption will be used\n" msgstr "%s encryption will be used\n" @@ -4662,7 +4739,7 @@ msgstr "weak key created - retrying\n" msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "cannot avoid weak key for symmetric cipher; tried %d times!\n" -#: g10/seskey.c:210 +#: g10/seskey.c:213 msgid "DSA requires the use of a 160 bit hash algorithm\n" msgstr "DSA requires the use of a 160 bit hash algorithm\n" @@ -5042,17 +5119,17 @@ msgstr "No help available" msgid "No help available for `%s'" msgstr "No help available for ‘[1m%s[0m’" -#: g10/keydb.c:189 +#: g10/keydb.c:161 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "error creating keyring ‘[1m%s[0m’: %s\n" -#: g10/keydb.c:196 +#: g10/keydb.c:168 #, c-format msgid "keyring `%s' created\n" msgstr "keyring ‘[1m%s[0m’ created\n" -#: g10/keydb.c:615 +#: g10/keydb.c:679 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "failed to rebuild keyring cache: %s\n" @@ -5095,8 +5172,7 @@ msgstr "%lu keys cached (%lu signatures)\n" msgid "%s: keyring created\n" msgstr "%s: keyring created\n" -#: g10/photoid.c:65 -#, c-format +#: g10/photoid.c:66 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -5110,29 +5186,34 @@ msgstr "" "very large picture, your key will become very large as well!\n" "Keeping the image close to 240x288 is a good size to use.\n" -#: g10/photoid.c:79 +#: g10/photoid.c:80 msgid "Enter JPEG filename for photo ID: " msgstr "Enter JPEG filename for photo ID: " -#: g10/photoid.c:87 +#: g10/photoid.c:88 #, c-format msgid "Unable to open photo \"%s\": %s\n" msgstr "Unable to open photo “[1m%s[0m”: %s\n" -#: g10/photoid.c:97 +#: g10/photoid.c:96 +#, c-format +msgid "This JPEG is really large (%d bytes) !\n" +msgstr "This JPEG is really large (%d bytes) !\n" + +#: g10/photoid.c:98 msgid "Are you sure you want to use it (y/N)? " msgstr "Are you sure you want to use it (y/N)? " -#: g10/photoid.c:112 +#: g10/photoid.c:113 #, c-format msgid "\"%s\" is not a JPEG file\n" msgstr "“[1m%s[0m” is not a JPEG file\n" -#: g10/photoid.c:129 +#: g10/photoid.c:130 msgid "Is this photo correct (y/N/q)? " msgstr "Is this photo correct (y/N/q)? " -#: g10/photoid.c:331 +#: g10/photoid.c:332 msgid "unable to display photo ID!\n" msgstr "unable to display photo ID!\n" @@ -5152,43 +5233,49 @@ msgstr "" "external program calls are disabled due to unsafe options file permissions\n" #: g10/exec.c:355 -msgid "this platform requires temp files when calling external programs\n" -msgstr "this platform requires temp files when calling external programs\n" +msgid "this platform requires temporary files when calling external programs\n" +msgstr "" +"this platform requires temporary files when calling external programs\n" + +#: g10/exec.c:433 +#, c-format +msgid "unable to execute program `%s': %s\n" +msgstr "unable to execute program ‘[1m%s[0m’: %s\n" -#: g10/exec.c:432 +#: g10/exec.c:436 #, c-format -msgid "unable to execute %s \"%s\": %s\n" -msgstr "unable to execute %s “[1m%s[0m”: %s\n" +msgid "unable to execute shell `%s': %s\n" +msgstr "unable to execute shell ‘[1m%s[0m’: %s\n" -#: g10/exec.c:513 +#: g10/exec.c:515 #, c-format msgid "system error while calling external program: %s\n" msgstr "system error while calling external program: %s\n" -#: g10/exec.c:524 g10/exec.c:583 +#: g10/exec.c:526 g10/exec.c:585 msgid "unnatural exit of external program\n" msgstr "unnatural exit of external program\n" -#: g10/exec.c:539 +#: g10/exec.c:541 msgid "unable to execute external program\n" msgstr "unable to execute external program\n" -#: g10/exec.c:548 +#: g10/exec.c:550 #, c-format msgid "unable to read external program response: %s\n" msgstr "unable to read external program response: %s\n" -#: g10/exec.c:594 g10/exec.c:601 +#: g10/exec.c:596 g10/exec.c:603 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" msgstr "WARNING: unable to remove tempfile (%s) ‘[1m%s[0m’: %s\n" -#: g10/exec.c:606 +#: g10/exec.c:608 #, c-format msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "WARNING: unable to remove temp directory ‘[1m%s[0m’: %s\n" -#: g10/keyid.c:482 g10/keyid.c:494 g10/keyid.c:506 g10/keyid.c:518 +#: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533 msgid "never " msgstr "never " |