From 81685cc799cc5d007ad9f844f455812b6a6333a5 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 12 Dec 2007 18:26:25 +0000 Subject: [PATCH] Updated ZH po file. Allow de/encryption using legacy type 20 keys. Updated config.{sub,guess} --- NEWS | 9 +- cipher/ChangeLog | 5 + cipher/pubkey.c | 9 + g10/ChangeLog | 7 + g10/getkey.c | 7 +- g10/mainproc.c | 2 +- g10/misc.c | 13 + po/ChangeLog | 4 + po/zh_CN.po | 3162 +++++++++++++++++++++++------------------- scripts/ChangeLog | 4 + scripts/config.guess | 49 +- scripts/config.sub | 80 +- 12 files changed, 1839 insertions(+), 1512 deletions(-) diff --git a/NEWS b/NEWS index ae32b722e..88d8530a8 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ Noteworthy changes in version 1.4.8 (unreleased) ------------------------------------------------ - + * Changed the license to GPLv3. * Improved detection of keyrings specified multiple times. @@ -20,6 +20,13 @@ Noteworthy changes in version 1.4.8 (unreleased) * By default (i.e. --gnupg mode), --require-cross-certification is now on. --rfc2440-text and --force-v3-sigs are now off. + * Allow encryption using legacy Elgamal sign+encrypt keys if + option --rfc2440 is used. + + * Fixed the auto creation of the key stub for smartcards. + + * Fixed a rare bug in decryption using the OpenPGP card. + Noteworthy changes in version 1.4.7 (2007-03-05) ------------------------------------------------ diff --git a/cipher/ChangeLog b/cipher/ChangeLog index f3ff35b04..b01d0a6ef 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,8 @@ +2007-12-12 Werner Koch + + * pubkey.c (pubkey_encrypt, pubkey_decrypt): Allow type 20 keys. + (pubkey_algo_to_string): Ditto. + 2007-12-11 Werner Koch * pubkey.c (check_pubkey_algo2): Hack to allow decryption using an diff --git a/cipher/pubkey.c b/cipher/pubkey.c index 4313cd62d..02c096ea6 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -234,6 +234,9 @@ pubkey_algo_to_string( int algo ) { int i; + if (algo == PUBKEY_ALGO_ELGAMAL) + return "ELG"; + do { for(i=0; pubkey_table[i].name; i++ ) if( pubkey_table[i].algo == algo ) @@ -470,6 +473,9 @@ pubkey_encrypt( int algo, MPI *resarr, MPI data, MPI *pkey ) log_mpidump(" data:", data ); } + if (algo == PUBKEY_ALGO_ELGAMAL) + algo = PUBKEY_ALGO_ELGAMAL_E; + do { for(i=0; pubkey_table[i].name; i++ ) if( pubkey_table[i].algo == algo ) { @@ -509,6 +515,9 @@ pubkey_decrypt( int algo, MPI *result, MPI *data, MPI *skey ) log_mpidump(" data:", data[i] ); } + if (algo == PUBKEY_ALGO_ELGAMAL) + algo = PUBKEY_ALGO_ELGAMAL_E; + do { for(i=0; pubkey_table[i].name; i++ ) if( pubkey_table[i].algo == algo ) { diff --git a/g10/ChangeLog b/g10/ChangeLog index ff4281df0..688d69829 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2007-12-12 Werner Koch + + * misc.c (print_pubkey_algo_note): Print a warning for type 20 keys. + (openpgp_pk_test_algo, openpgp_pk_algo_usage): Allow type 20 fro + encryption only with option --rfc2440. + * mainproc.c (proc_pubkey_enc): Ditto. + 2007-12-12 David Shaw * trustdb.c (sanitize_regexp): New. Protect against dangerous diff --git a/g10/getkey.c b/g10/getkey.c index 776bed2e1..934691c42 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2137,8 +2137,11 @@ merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode ) subpk->has_expired = key_expire >= curtime? 0 : key_expire; subpk->expiredate = key_expire; - /* algo doesn't exist */ - if(check_pubkey_algo(subpk->pubkey_algo)) + /* Check that algo exists. Elgamal sign+encrypt are only allowed + with option --rfc2440. */ + if (RFC2440 && subpk->pubkey_algo == PUBKEY_ALGO_ELGAMAL) + ; + else if(check_pubkey_algo(subpk->pubkey_algo)) return; subpk->is_valid = 1; diff --git a/g10/mainproc.c b/g10/mainproc.c index 56494cbfb..2a91f0f62 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -404,7 +404,7 @@ proc_pubkey_enc( CTX c, PACKET *pkt ) else if( is_ELGAMAL(enc->pubkey_algo) || enc->pubkey_algo == PUBKEY_ALGO_DSA || is_RSA(enc->pubkey_algo) - || enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL) { + || (RFC2440 && enc->pubkey_algo == PUBKEY_ALGO_ELGAMAL)) { /* Note that we also allow type 20 Elgamal keys for decryption. There are still a couple of those keys in active use as a subkey. */ diff --git a/g10/misc.c b/g10/misc.c index 54de3abfc..004dd901e 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -315,6 +315,10 @@ print_pubkey_algo_note( int algo ) pubkey_algo_to_string(algo)); } } + else if (algo == 20) + { + log_info (_("WARNING: Elgamal sign+encrypt keys are deprecated\n")); + } } void @@ -392,6 +396,9 @@ openpgp_cipher_test_algo( int algo ) int openpgp_pk_test_algo( int algo, unsigned int usage_flags ) { + /* Dont't allow type 20 keys unless in rfc2440 mode. */ + if (!RFC2440 && algo == 20) + return G10ERR_PUBKEY_ALGO; if( algo < 0 || algo > 110 ) return G10ERR_PUBKEY_ALGO; return check_pubkey_algo2( algo, usage_flags ); @@ -414,6 +421,12 @@ openpgp_pk_algo_usage ( int algo ) use = PUBKEY_USAGE_CERT | PUBKEY_USAGE_SIG; break; case PUBKEY_ALGO_ELGAMAL: + /* Allow encryption with type 20 keys if RFC-2440 compliance + has been selected. Signing is broken thus we won't allow + this. */ + if (RFC2440) + use = PUBKEY_USAGE_ENC; + break; case PUBKEY_ALGO_ELGAMAL_E: use = PUBKEY_USAGE_ENC; break; diff --git a/po/ChangeLog b/po/ChangeLog index b3a9e29b2..45bbe7a0b 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2007-12-12 Meng Jie (wk) + + * zh_CN.po: Updated. + 2007-10-23 gettextize * Makefile.in.in: Upgrade to gettext-0.16.1. diff --git a/po/zh_CN.po b/po/zh_CN.po index 2a9725346..5d46c30aa 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,108 +1,134 @@ # Simplified Chinese(zh-CN) messages for GnuPG -# Copyright (C) 2006 Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# Meng Jie , 2004. +# Copyright (C) 2006, 2007 Free Software Foundation, Inc. +# This file is distributed under the same license as the GnuPG package. +# Meng Jie , 2004-2007. # msgid "" msgstr "" -"Project-Id-Version: gnupg 1.4.4\n" +"Project-Id-Version: gnupg 1.4.7\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2007-11-19 10:56+0100\n" -"PO-Revision-Date: 2006-07-02 10:58+0800\n" -"Last-Translator: Meng Jie \n" -"Language-Team: Chinese (simplified) \n" +"POT-Creation-Date: 2007-03-05 10:25+0100\n" +"PO-Revision-Date: 2007-11-26 13:41+0800\n" +"Last-Translator: Meng Jie \n" +"Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Chinese\n" "X-Poedit-Country: CHINA\n" "X-Poedit-SourceCharset: iso-8859-1\n" -"X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n" +"X-Poedit-Basepath: c:\\msys\\source\\gnupg-1.4.7\n" -#: cipher/primegen.c:119 +#: cipher/primegen.c:121 #, c-format msgid "can't gen prime with pbits=%u qbits=%u\n" msgstr "当 pbits=%u 而 qbits=%u 时不能生成质数\n" -#: cipher/primegen.c:310 +#: cipher/primegen.c:312 #, c-format msgid "can't generate a prime with less than %d bits\n" msgstr "少于 %d 位时不能生成质数\n" -#: cipher/random.c:171 +#: cipher/random.c:173 msgid "no entropy gathering module detected\n" msgstr "检测不到熵搜集模块\n" -#: cipher/random.c:401 +#: cipher/random.c:403 #, c-format msgid "can't lock `%s': %s\n" msgstr "无法锁定‘%s’：%s\n" -#: cipher/random.c:406 +#: cipher/random.c:408 #, c-format msgid "waiting for lock on `%s'...\n" msgstr "等待‘%s’上的锁\n" -#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3546 g10/import.c:193 g10/keygen.c:2390 -#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356 -#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083 -#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538 -#: g10/tdbio.c:603 +#: cipher/random.c:448 +#: g10/card-util.c:678 +#: g10/card-util.c:747 +#: g10/dearmor.c:61 +#: g10/dearmor.c:110 +#: g10/encode.c:184 +#: g10/encode.c:474 +#: g10/gpg.c:1012 +#: g10/gpg.c:3513 +#: g10/import.c:195 +#: g10/keygen.c:2392 +#: g10/keyring.c:1525 +#: g10/openfile.c:186 +#: g10/openfile.c:348 +#: g10/plaintext.c:481 +#: g10/sign.c:808 +#: g10/sign.c:1001 +#: g10/sign.c:1115 +#: g10/sign.c:1266 +#: g10/tdbdump.c:141 +#: g10/tdbdump.c:149 +#: g10/tdbio.c:540 +#: g10/tdbio.c:605 #, c-format msgid "can't open `%s': %s\n" msgstr "无法打开‘%s’： %s\n" -#: cipher/random.c:456 +#: cipher/random.c:458 #, c-format msgid "can't stat `%s': %s\n" msgstr "无法获得文件‘%s’的信息： %s\n" -#: cipher/random.c:461 +#: cipher/random.c:463 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "‘%s’不是一个普通文件――已忽略\n" -#: cipher/random.c:466 +#: cipher/random.c:468 msgid "note: random_seed file is empty\n" msgstr "注意：随机数种子文件为空\n" -#: cipher/random.c:472 +#: cipher/random.c:474 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "警告：随机数种子文件大小无效――未使用\n" -#: cipher/random.c:480 +#: cipher/random.c:482 #, c-format msgid "can't read `%s': %s\n" msgstr "无法读取‘%s’：%s\n" -#: cipher/random.c:518 +#: cipher/random.c:520 msgid "note: random_seed file not updated\n" msgstr "注意：随机数种子文件未被更新\n" -#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2876 -#: g10/keygen.c:2906 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277 -#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534 +#: cipher/random.c:544 +#: g10/exec.c:481 +#: g10/gpg.c:1011 +#: g10/keygen.c:2878 +#: g10/keygen.c:2908 +#: g10/keyring.c:1201 +#: g10/keyring.c:1501 +#: g10/openfile.c:269 +#: g10/openfile.c:363 +#: g10/sign.c:826 +#: g10/sign.c:1131 +#: g10/tdbio.c:536 #, c-format msgid "can't create `%s': %s\n" msgstr "无法建立‘%s’：%s\n" -#: cipher/random.c:554 cipher/random.c:564 +#: cipher/random.c:556 +#: cipher/random.c:566 #, c-format msgid "can't write `%s': %s\n" msgstr "无法写入‘%s’：%s\n" -#: cipher/random.c:567 +#: cipher/random.c:569 #, c-format msgid "can't close `%s': %s\n" msgstr "无法关闭‘%s’：%s\n" -#: cipher/random.c:812 +#: cipher/random.c:814 msgid "WARNING: using insecure random number generator!!\n" msgstr "警告：正在使用不安全的随机数发生器！！\n" -#: cipher/random.c:813 +#: cipher/random.c:815 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -116,7 +142,7 @@ msgstr "" "绝对不要在现实世界中使用这个程序产生的任何数据！！\n" "\n" -#: cipher/rndegd.c:200 +#: cipher/rndegd.c:202 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" "keep you from getting bored, because it will improve the quality\n" @@ -125,7 +151,7 @@ msgstr "" "请稍待片刻，系统此时正在搜集熵。如果您觉得无聊的话，不妨做些\n" "别的事——事实上这甚至能够让熵数的品质更好。\n" -#: cipher/rndlinux.c:130 +#: cipher/rndlinux.c:132 #, c-format msgid "" "\n" @@ -136,410 +162,436 @@ msgstr "" "随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵！\n" "(还需要%d字节)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:596 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "无法存储指纹：%s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:609 #, c-format msgid "failed to store the creation date: %s\n" msgstr "无法存储创建日期：%s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:977 #, c-format msgid "reading public key failed: %s\n" msgstr "无法读出公钥：%s\n" -#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908 +#: g10/app-openpgp.c:985 +#: g10/app-openpgp.c:1910 msgid "response does not contain the public key data\n" msgstr "响应未包含公钥数据\n" -#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916 +#: g10/app-openpgp.c:993 +#: g10/app-openpgp.c:1918 msgid "response does not contain the RSA modulus\n" msgstr "响应未包含 RSA 余数\n" -#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926 +#: g10/app-openpgp.c:1002 +#: g10/app-openpgp.c:1928 msgid "response does not contain the RSA public exponent\n" msgstr "响应未包含 RSA 公钥指数\n" -#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152 +#: g10/app-openpgp.c:1258 +#: g10/app-openpgp.c:1346 +#: g10/app-openpgp.c:2154 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN 回调返回错误：%s\n" -#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158 +#: g10/app-openpgp.c:1264 +#: g10/app-openpgp.c:1352 +#: g10/app-openpgp.c:2160 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n" -#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360 -#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181 +#: g10/app-openpgp.c:1273 +#: g10/app-openpgp.c:1287 +#: g10/app-openpgp.c:1362 +#: g10/app-openpgp.c:2169 +#: g10/app-openpgp.c:2183 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "验证 CHV%d 失败：%s\n" -#: g10/app-openpgp.c:1308 +#: g10/app-openpgp.c:1310 msgid "access to admin commands is not configured\n" msgstr "尚未配置管理员命令的权限\n" -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2387 +#: g10/app-openpgp.c:1325 +#: g10/app-openpgp.c:2389 msgid "error retrieving CHV status from card\n" -msgstr "从卡中获取 CHV 状态时出错\n" +msgstr "从智能卡中获取 CHV 状态时出错\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2396 +#: g10/app-openpgp.c:1331 +#: g10/app-openpgp.c:2398 msgid "card is permanently locked!\n" -msgstr "卡被永久锁定！\n" +msgstr "智能卡被永久锁定！\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1336 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" -msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n" +msgstr "尝试管理员 PIN %d 次后，智能卡将被永久锁定！\n" #. TRANSLATORS: Do not translate the "|A|" prefix but #. keep it at the start of the string. We need this elsewhere #. to get some infos on the string. -#: g10/app-openpgp.c:1341 +#: g10/app-openpgp.c:1343 msgid "|A|Admin PIN" msgstr "|A|管理员 PIN" #. TRANSLATORS: Do not translate the "|*|" prefixes but #. keep it at the start of the string. We need this elsewhere #. to get some infos on the string. -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1492 msgid "|AN|New Admin PIN" msgstr "|AN|新的管理员 PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:1492 msgid "|N|New PIN" msgstr "新的 PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:1496 #, c-format msgid "error getting new PIN: %s\n" msgstr "获取新 PIN 时出错：%s\n" -#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994 +#: g10/app-openpgp.c:1546 +#: g10/app-openpgp.c:1996 msgid "error reading application data\n" msgstr "读取应用程序数据时出错\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:1552 +#: g10/app-openpgp.c:2003 msgid "error reading fingerprint DO\n" msgstr "读取指纹 D0 出错\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:1562 msgid "key already exists\n" msgstr "密钥已存在\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:1566 msgid "existing key will be replaced\n" msgstr "现有的密钥将被替换\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:1568 msgid "generating new key\n" msgstr "生成新密钥\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:1735 msgid "creation timestamp missing\n" msgstr "缺少创建时间戳\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:1742 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "RSA 余数缺失或者不是 %d 位长\n" -#: g10/app-openpgp.c:1747 +#: g10/app-openpgp.c:1749 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "RSA 公钥指数缺失或长于 %d 位\n" -#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762 +#: g10/app-openpgp.c:1757 +#: g10/app-openpgp.c:1764 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n" -#: g10/app-openpgp.c:1825 +#: g10/app-openpgp.c:1827 #, c-format msgid "failed to store the key: %s\n" msgstr "无法存储密钥：%s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:1886 msgid "please wait while key is being generated ...\n" msgstr "请稍候，正在生成密钥……\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:1901 msgid "generating key failed\n" msgstr "生成密钥失败\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:1904 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "密钥已生成(耗时 %d 秒)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:1961 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2087 #, c-format msgid "card does not support digest algorithm %s\n" -msgstr "卡不支持散列算法 %s\n" +msgstr "智能卡不支持散列算法 %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:2134 #, c-format msgid "signatures created so far: %lu\n" msgstr "目前已创建的签名：%lu\n" -#: g10/app-openpgp.c:2140 +#: g10/app-openpgp.c:2142 #, c-format msgid "||Please enter the PIN%%0A[sigs done: %lu]" msgstr "||请输入 PIN%%0A[完成的签字：%lu]" -#: g10/app-openpgp.c:2401 -msgid "" -"verification of Admin PIN is currently prohibited through this command\n" +#: g10/app-openpgp.c:2403 +msgid "verification of Admin PIN is currently prohibited through this command\n" msgstr "目前禁止通过此命令验证管理员 PIN\n" -#: g10/app-openpgp.c:2472 g10/app-openpgp.c:2482 +#: g10/app-openpgp.c:2474 +#: g10/app-openpgp.c:2484 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "不能存取 %s――无效的 OpenPGP 卡？\n" -#: g10/armor.c:383 +#: g10/armor.c:372 #, c-format msgid "armor: %s\n" msgstr "ASCII 封装：%s\n" -#: g10/armor.c:422 +#: g10/armor.c:411 msgid "invalid armor header: " msgstr "无效的 ASCII 封装头：" -#: g10/armor.c:433 +#: g10/armor.c:422 msgid "armor header: " msgstr "ASCII 封装头：" -#: g10/armor.c:446 +#: g10/armor.c:433 msgid "invalid clearsig header\n" msgstr "无效的明文签名头\n" -#: g10/armor.c:459 -#, fuzzy -msgid "unknown armor header: " -msgstr "ASCII 封装头：" - -#: g10/armor.c:512 +#: g10/armor.c:485 msgid "nested clear text signatures\n" msgstr "多层明文签名\n" -#: g10/armor.c:647 +#: g10/armor.c:620 msgid "unexpected armor: " msgstr "与预期不符的 ASCII 封装：" -#: g10/armor.c:659 +#: g10/armor.c:632 msgid "invalid dash escaped line: " msgstr "以连字符开头的行格式错误：" -#: g10/armor.c:813 g10/armor.c:1423 +#: g10/armor.c:786 +#: g10/armor.c:1396 #, c-format msgid "invalid radix64 character %02X skipped\n" msgstr "跳过无效的 64 进制字符 %02x\n" -#: g10/armor.c:856 +#: g10/armor.c:829 msgid "premature eof (no CRC)\n" msgstr "文件先于预期结束(没有 CRC 部分)\n" -#: g10/armor.c:890 +#: g10/armor.c:863 msgid "premature eof (in CRC)\n" msgstr "文件先于预期结束(CRC 部分未结束)\n" -#: g10/armor.c:898 +#: g10/armor.c:871 msgid "malformed CRC\n" msgstr "异常的 CRC\n" -#: g10/armor.c:902 g10/armor.c:1460 +#: g10/armor.c:875 +#: g10/armor.c:1433 #, c-format msgid "CRC error; %06lX - %06lX\n" msgstr "CRC 错误：%06lx - %06lx\n" -#: g10/armor.c:922 +#: g10/armor.c:895 msgid "premature eof (in trailer)\n" msgstr "文件先于预期结束(于结尾处)\n" -#: g10/armor.c:926 +#: g10/armor.c:899 msgid "error in trailer line\n" msgstr "结尾行有问题\n" -#: g10/armor.c:1237 +#: g10/armor.c:1210 msgid "no valid OpenPGP data found.\n" msgstr "找不到有效的 OpenPGP 数据。\n" -#: g10/armor.c:1242 +#: g10/armor.c:1215 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "无效的 ASCII 封装：一行超过 %d 字符\n" -#: g10/armor.c:1246 -msgid "" -"quoted printable character in armor - probably a buggy MTA has been used\n" +#: g10/armor.c:1219 +msgid "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n" -#: g10/card-util.c:61 g10/card-util.c:304 +#: g10/card-util.c:63 +#: g10/card-util.c:306 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP 卡不可用：%s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:68 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "检测到 OpenPGP 卡号 %s\n" -#: g10/card-util.c:74 g10/card-util.c:1404 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2574 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:76 +#: g10/card-util.c:1406 +#: g10/delkey.c:128 +#: g10/keyedit.c:1518 +#: g10/keygen.c:2576 +#: g10/revoke.c:218 +#: g10/revoke.c:456 msgid "can't do this in batch mode\n" msgstr "在批处理模式中无法完成此操作\n" -#: g10/card-util.c:101 g10/card-util.c:1130 g10/card-util.c:1213 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1387 -#: g10/keygen.c:1454 +#: g10/card-util.c:103 +#: g10/card-util.c:1132 +#: g10/card-util.c:1215 +#: g10/keyedit.c:425 +#: g10/keyedit.c:446 +#: g10/keyedit.c:460 +#: g10/keygen.c:1389 +#: g10/keygen.c:1456 msgid "Your selection? " msgstr "您的选择？ " -#: g10/card-util.c:214 g10/card-util.c:264 +#: g10/card-util.c:216 +#: g10/card-util.c:266 msgid "[not set]" msgstr "[未设定]" -#: g10/card-util.c:411 +#: g10/card-util.c:413 msgid "male" msgstr "男性" -#: g10/card-util.c:412 +#: g10/card-util.c:414 msgid "female" msgstr "女性" -#: g10/card-util.c:412 +#: g10/card-util.c:414 msgid "unspecified" msgstr "未定义" -#: g10/card-util.c:439 +#: g10/card-util.c:441 msgid "not forced" msgstr "可选" -#: g10/card-util.c:439 +#: g10/card-util.c:441 msgid "forced" msgstr "必须" -#: g10/card-util.c:517 +#: g10/card-util.c:519 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "错误：目前只允许使用 ASCII 字符。\n" -#: g10/card-util.c:519 +#: g10/card-util.c:521 msgid "Error: The \"<\" character may not be used.\n" msgstr "错误：不能使用字符“<”。\n" -#: g10/card-util.c:521 +#: g10/card-util.c:523 msgid "Error: Double spaces are not allowed.\n" msgstr "错误：不允许出现两个空格。\n" -#: g10/card-util.c:538 -msgid "Cardholder's surname: " -msgstr "卡持有人的姓：" - #: g10/card-util.c:540 -msgid "Cardholder's given name: " -msgstr "卡持有人的名：" +msgid "Cardholder's surname: " +msgstr "智能卡持有人的姓：" -#: g10/card-util.c:558 +#: g10/card-util.c:542 +msgid "Cardholder's given name: " +msgstr "智能卡持有人的名：" + +#: g10/card-util.c:560 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n" -#: g10/card-util.c:579 +#: g10/card-util.c:581 msgid "URL to retrieve public key: " msgstr "获取公钥的 URL：" -#: g10/card-util.c:587 +#: g10/card-util.c:589 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "错误：URL 太长(至多 %d 个字符)\n" -#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279 +#: g10/card-util.c:687 +#: g10/card-util.c:756 +#: g10/import.c:281 #, c-format msgid "error reading `%s': %s\n" msgstr "读取‘%s’时出错：%s\n" -#: g10/card-util.c:693 +#: g10/card-util.c:695 msgid "Login data (account name): " msgstr "登录数据(帐号名)：" -#: g10/card-util.c:703 +#: g10/card-util.c:705 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "错误：登录数据太长(至多 %d 个字符)。\n" -#: g10/card-util.c:762 +#: g10/card-util.c:764 msgid "Private DO data: " msgstr "个人 DO 数据：" -#: g10/card-util.c:772 +#: g10/card-util.c:774 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n" -#: g10/card-util.c:792 +#: g10/card-util.c:794 msgid "Language preferences: " msgstr "首选语言：" -#: g10/card-util.c:800 +#: g10/card-util.c:802 msgid "Error: invalid length of preference string.\n" msgstr "错误：首选项字符串长度无效。\n" -#: g10/card-util.c:809 +#: g10/card-util.c:811 msgid "Error: invalid characters in preference string.\n" msgstr "错误：首选项字符串里有无效字符。\n" -#: g10/card-util.c:830 +#: g10/card-util.c:832 msgid "Sex ((M)ale, (F)emale or space): " msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)：" -#: g10/card-util.c:844 +#: g10/card-util.c:846 msgid "Error: invalid response.\n" msgstr "错误：无效的响应。\n" -#: g10/card-util.c:865 +#: g10/card-util.c:867 msgid "CA fingerprint: " msgstr "CA 指纹：" -#: g10/card-util.c:888 +#: g10/card-util.c:890 msgid "Error: invalid formatted fingerprint.\n" msgstr "错误：指纹格式无效。\n" -#: g10/card-util.c:936 +#: g10/card-util.c:938 #, c-format msgid "key operation not possible: %s\n" msgstr "针对密钥的操作无法实现：%s\n" -#: g10/card-util.c:937 +#: g10/card-util.c:939 msgid "not an OpenPGP card" msgstr "不是一个 OpenPGP 卡" -#: g10/card-util.c:946 +#: g10/card-util.c:948 #, c-format msgid "error getting current key info: %s\n" msgstr "取得当前密钥信息时出错：%s\n" -#: g10/card-util.c:1031 +#: g10/card-util.c:1033 msgid "Replace existing key? (y/N) " msgstr "替换已有的密钥？(y/N)" -#: g10/card-util.c:1052 g10/card-util.c:1061 +#: g10/card-util.c:1054 +#: g10/card-util.c:1063 msgid "Make off-card backup of encryption key? (Y/n) " -msgstr "是否为加密密钥创建卡外的备份？(Y/n)" +msgstr "是否为加密密钥创建智能卡外的备份？(Y/n)" -#: g10/card-util.c:1073 +#: g10/card-util.c:1075 msgid "Replace existing keys? (y/N) " msgstr "替换已有的密钥？(y/N)" -#: g10/card-util.c:1082 +#: g10/card-util.c:1084 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -550,434 +602,465 @@ msgstr "" " PIN = ‘%s’ 管理员 PIN = ‘%s’\n" "您应当使用 --change-pin 命令来更改它们\n" -#: g10/card-util.c:1121 +#: g10/card-util.c:1123 msgid "Please select the type of key to generate:\n" msgstr "请选择您要使用的密钥种类：\n" -#: g10/card-util.c:1123 g10/card-util.c:1204 +#: g10/card-util.c:1125 +#: g10/card-util.c:1206 msgid " (1) Signature key\n" msgstr " (1) 签名密钥\n" -#: g10/card-util.c:1124 g10/card-util.c:1206 +#: g10/card-util.c:1126 +#: g10/card-util.c:1208 msgid " (2) Encryption key\n" msgstr " (2) 加密密钥\n" -#: g10/card-util.c:1125 g10/card-util.c:1208 +#: g10/card-util.c:1127 +#: g10/card-util.c:1210 msgid " (3) Authentication key\n" msgstr " (3) 认证密钥\n" -#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938 -#: g10/keygen.c:1391 g10/keygen.c:1419 g10/keygen.c:1493 g10/revoke.c:683 +#: g10/card-util.c:1143 +#: g10/card-util.c:1226 +#: g10/keyedit.c:940 +#: g10/keygen.c:1393 +#: g10/keygen.c:1421 +#: g10/keygen.c:1495 +#: g10/revoke.c:685 msgid "Invalid selection.\n" msgstr "无效的选择。\n" -#: g10/card-util.c:1201 +#: g10/card-util.c:1203 msgid "Please select where to store the key:\n" msgstr "请选择在哪里存储密钥：\n" -#: g10/card-util.c:1236 +#: g10/card-util.c:1238 msgid "unknown key protection algorithm\n" msgstr "不支持的密钥保护算法\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1243 msgid "secret parts of key are not available\n" msgstr "私钥部分不可用\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1248 msgid "secret key already stored on a card\n" -msgstr "私钥已存储在卡上\n" +msgstr "私钥已存储在智能卡上\n" -#: g10/card-util.c:1317 g10/keyedit.c:1349 +#: g10/card-util.c:1319 +#: g10/keyedit.c:1351 msgid "quit this menu" msgstr "离开这个菜单" -#: g10/card-util.c:1319 +#: g10/card-util.c:1321 msgid "show admin commands" msgstr "显示管理员命令" -#: g10/card-util.c:1320 g10/keyedit.c:1352 +#: g10/card-util.c:1322 +#: g10/keyedit.c:1354 msgid "show this help" msgstr "显示这份在线说明" -#: g10/card-util.c:1322 +#: g10/card-util.c:1324 msgid "list all available data" msgstr "列出所有可用数据" -#: g10/card-util.c:1325 +#: g10/card-util.c:1327 msgid "change card holder's name" -msgstr "更改卡持有人的姓名" +msgstr "更改智能卡持有人的姓名" -#: g10/card-util.c:1326 +#: g10/card-util.c:1328 msgid "change URL to retrieve key" msgstr "更改获取密钥的 URL" -#: g10/card-util.c:1327 +#: g10/card-util.c:1329 msgid "fetch the key specified in the card URL" -msgstr "根据卡中指定的 URL 获取密钥" +msgstr "根据智能卡中指定的 URL 获取密钥" -#: g10/card-util.c:1328 +#: g10/card-util.c:1330 msgid "change the login name" msgstr "更改登录名" -#: g10/card-util.c:1329 +#: g10/card-util.c:1331 msgid "change the language preferences" msgstr "更改首选语言首选" -#: g10/card-util.c:1330 +#: g10/card-util.c:1332 msgid "change card holder's sex" -msgstr "更改卡持有人的性别" +msgstr "更改智能卡持有人的性别" -#: g10/card-util.c:1331 +#: g10/card-util.c:1333 msgid "change a CA fingerprint" msgstr "更改一个 CA 指纹" -#: g10/card-util.c:1332 +#: g10/card-util.c:1334 msgid "toggle the signature force PIN flag" msgstr "设定 PIN 签名是否必须" -#: g10/card-util.c:1333 +#: g10/card-util.c:1335 msgid "generate new keys" msgstr "生成新的密钥" -#: g10/card-util.c:1334 +#: g10/card-util.c:1336 msgid "menu to change or unblock the PIN" msgstr "更改或解锁 PIN 的菜单" -#: g10/card-util.c:1335 +#: g10/card-util.c:1337 msgid "verify the PIN and list all data" msgstr "验证 PIN 并列出所有数据" -#: g10/card-util.c:1455 g10/keyedit.c:1619 +#: g10/card-util.c:1457 +#: g10/keyedit.c:1617 msgid "Command> " msgstr "命令> " -#: g10/card-util.c:1493 +#: g10/card-util.c:1495 msgid "Admin-only command\n" msgstr "仅供管理员使用的命令\n" -#: g10/card-util.c:1524 +#: g10/card-util.c:1526 msgid "Admin commands are allowed\n" msgstr "允许使用管理员命令\n" -#: g10/card-util.c:1526 +#: g10/card-util.c:1528 msgid "Admin commands are not allowed\n" msgstr "不允许使用管理员命令\n" -#: g10/card-util.c:1600 g10/keyedit.c:2240 +#: g10/card-util.c:1602 +#: g10/keyedit.c:2238 msgid "Invalid command (try \"help\")\n" msgstr "无效的指令(尝试“help”)\n" -#: g10/cardglue.c:414 -#, fuzzy +#: g10/cardglue.c:416 msgid "card reader not available\n" -msgstr "私钥不可用" +msgstr "读卡器不可用\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " -msgstr "请插入卡并回车，或输入‘c’来取消：" +msgstr "请插入智能卡并回车，或输入‘c’来取消：" -#: g10/cardglue.c:444 -#, fuzzy, c-format +#: g10/cardglue.c:446 +#, c-format msgid "selecting openpgp failed: %s\n" -msgstr "删除密钥区块时失败：%s\n" +msgstr "选择 OpenPGP 时失败：%s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:573 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" " %.*s\n" msgstr "" -"请取出当前的卡，并插入有下列序列号的卡：\n" +"请取出当前的智能卡，并插入有下列序列号的智能卡：\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:582 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "就绪后请回车，或输入‘c’取消" -#: g10/cardglue.c:915 +#: g10/cardglue.c:917 msgid "Enter New Admin PIN: " msgstr "输入新的管理员 PIN：" -#: g10/cardglue.c:916 +#: g10/cardglue.c:918 msgid "Enter New PIN: " msgstr "输入新的 PIN：" -#: g10/cardglue.c:917 +#: g10/cardglue.c:919 msgid "Enter Admin PIN: " msgstr "输入管理员 PIN：" -#: g10/cardglue.c:918 +#: g10/cardglue.c:920 msgid "Enter PIN: " msgstr "输入 PIN：" -#: g10/cardglue.c:935 +#: g10/cardglue.c:937 msgid "Repeat this PIN: " msgstr "再次输入此 PIN：" -#: g10/cardglue.c:950 +#: g10/cardglue.c:952 msgid "PIN not correctly repeated; try again" msgstr "PIN 再次输入时与首次输入不符；请再试一次" -#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3911 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/decrypt.c:69 +#: g10/decrypt.c:160 +#: g10/gpg.c:3878 +#: g10/keyring.c:377 +#: g10/keyring.c:663 +#: g10/verify.c:102 +#: g10/verify.c:157 #, c-format msgid "can't open `%s'\n" msgstr "无法打开‘%s’\n" -#: g10/decrypt.c:103 g10/encode.c:823 +#: g10/decrypt.c:105 +#: g10/encode.c:839 msgid "--output doesn't work for this command\n" msgstr "--output 在这个命令中不起作用\n" -#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711 -#: g10/revoke.c:226 +#: g10/delkey.c:75 +#: g10/export.c:311 +#: g10/keyedit.c:3386 +#: g10/keyserver.c:1705 +#: g10/revoke.c:228 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "密钥‘%s’找不到：%s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2360 g10/keyserver.c:1725 -#: g10/revoke.c:232 g10/revoke.c:476 +#: g10/delkey.c:83 +#: g10/export.c:341 +#: g10/import.c:2350 +#: g10/keyserver.c:1719 +#: g10/revoke.c:234 +#: g10/revoke.c:478 #, c-format msgid "error reading keyblock: %s\n" msgstr "读取密钥区块时发生错误：%s\n" -#: g10/delkey.c:127 g10/delkey.c:134 +#: g10/delkey.c:129 +#: g10/delkey.c:136 msgid "(unless you specify the key by fingerprint)\n" msgstr "(除非您用指纹指定密钥)\n" -#: g10/delkey.c:133 +#: g10/delkey.c:135 msgid "can't do this in batch mode without \"--yes\"\n" msgstr "在批处理模式中，没有“--yes”就无法这么做\n" -#: g10/delkey.c:145 +#: g10/delkey.c:147 msgid "Delete this key from the keyring? (y/N) " msgstr "要从钥匙环里删除这把密钥吗？(y/N)" -#: g10/delkey.c:153 +#: g10/delkey.c:155 msgid "This is a secret key! - really delete? (y/N) " msgstr "这是一把私钥！――真的要删除吗？(y/N)" -#: g10/delkey.c:163 +#: g10/delkey.c:165 #, c-format msgid "deleting keyblock failed: %s\n" msgstr "删除密钥区块时失败：%s\n" -#: g10/delkey.c:173 +#: g10/delkey.c:175 msgid "ownertrust information cleared\n" msgstr "信任度信息已被清除\n" -#: g10/delkey.c:204 +#: g10/delkey.c:206 #, c-format msgid "there is a secret key for public key \"%s\"!\n" msgstr "公钥“%s”有对应的私钥！\n" -#: g10/delkey.c:206 +#: g10/delkey.c:208 msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "请先使用“--delete-secret-keys”选项来删除它。\n" -#: g10/encode.c:211 g10/sign.c:1254 +#: g10/encode.c:213 +#: g10/sign.c:1286 #, c-format msgid "error creating passphrase: %s\n" msgstr "生成密码的时候发生错误：%s\n" -#: g10/encode.c:216 +#: g10/encode.c:218 msgid "can't use a symmetric ESK packet due to the S2K mode\n" msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n" -#: g10/encode.c:229 +#: g10/encode.c:231 #, c-format msgid "using cipher %s\n" msgstr "使用对称加密算法 %s\n" -#: g10/encode.c:239 g10/encode.c:534 +#: g10/encode.c:241 +#: g10/encode.c:536 #, c-format msgid "`%s' already compressed\n" msgstr "‘%s’已被压缩\n" -#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559 +#: g10/encode.c:292 +#: g10/encode.c:584 +#: g10/sign.c:593 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "警告：‘%s’是一个空文件\n" -#: g10/encode.c:454 +#: g10/encode.c:456 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "在 --pgp2 模式中，您只能使用 2048 位及以下的 RSA 密钥加密\n" -#: g10/encode.c:478 +#: g10/encode.c:480 #, c-format msgid "reading from `%s'\n" msgstr "正在从‘%s’读取\n" -#: g10/encode.c:506 -msgid "" -"unable to use the IDEA cipher for all of the keys you are encrypting to.\n" +#: g10/encode.c:508 +msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n" -#: g10/encode.c:516 +#: g10/encode.c:518 #, c-format -msgid "" -"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" +msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n" -#: g10/encode.c:612 g10/sign.c:931 +#: g10/encode.c:628 +#: g10/sign.c:963 #, c-format -msgid "" -"WARNING: forcing compression algorithm %s (%d) violates recipient " -"preferences\n" +msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n" msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n" -#: g10/encode.c:699 +#: g10/encode.c:715 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n" -#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852 +#: g10/encode.c:785 +#: g10/pkclist.c:803 +#: g10/pkclist.c:851 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "您不该将 %s 用于 %s 模式中\n" -#: g10/encode.c:796 +#: g10/encode.c:812 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s 已经加密给：“%s”\n" -#: g10/encr-data.c:89 g10/mainproc.c:296 +#: g10/encr-data.c:91 +#: g10/mainproc.c:292 #, c-format msgid "%s encrypted data\n" msgstr "%s 加密过的数据\n" -#: g10/encr-data.c:91 g10/mainproc.c:300 +#: g10/encr-data.c:93 +#: g10/mainproc.c:296 #, c-format msgid "encrypted with unknown algorithm %d\n" msgstr "以未知的算法 %d 加密\n" -#: g10/encr-data.c:115 -msgid "" -"WARNING: message was encrypted with a weak key in the symmetric cipher.\n" +#: g10/encr-data.c:117 +msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n" -#: g10/encr-data.c:126 +#: g10/encr-data.c:128 msgid "problem handling encrypted packet\n" msgstr "处理加密包有问题\n" -#: g10/exec.c:47 +#: g10/exec.c:49 msgid "no remote program execution supported\n" msgstr "不支持远程调用\n" -#: g10/exec.c:174 g10/openfile.c:429 +#: g10/exec.c:176 +#: g10/openfile.c:421 #, c-format msgid "can't create directory `%s': %s\n" msgstr "无法建立目录‘%s’：%s\n" -#: g10/exec.c:315 -msgid "" -"external program calls are disabled due to unsafe options file permissions\n" +#: g10/exec.c:317 +msgid "external program calls are disabled due to unsafe options file permissions\n" msgstr "由于配置文件权限不安全，外部程序调用被禁用\n" -#: g10/exec.c:345 +#: g10/exec.c:347 msgid "this platform requires temporary files when calling external programs\n" msgstr "在这个操作平台上调用外部程序时需要临时文件\n" -#: g10/exec.c:423 +#: g10/exec.c:425 #, c-format msgid "unable to execute program `%s': %s\n" msgstr "无法执行程序‘%s’：%s\n" -#: g10/exec.c:426 +#: g10/exec.c:428 #, c-format msgid "unable to execute shell `%s': %s\n" msgstr "无法在命令解释环境中执行‘%s’：%s\n" -#: g10/exec.c:511 +#: g10/exec.c:513 #, c-format msgid "system error while calling external program: %s\n" msgstr "调用外部程序时发生系统错误：%s\n" -#: g10/exec.c:522 g10/exec.c:588 +#: g10/exec.c:524 +#: g10/exec.c:590 msgid "unnatural exit of external program\n" msgstr "外部程序异常退出\n" -#: g10/exec.c:537 +#: g10/exec.c:539 msgid "unable to execute external program\n" msgstr "无法执行外部程序\n" -#: g10/exec.c:553 +#: g10/exec.c:555 #, c-format msgid "unable to read external program response: %s\n" msgstr "无法读取外部程序响应：%s\n" -#: g10/exec.c:599 g10/exec.c:606 +#: g10/exec.c:601 +#: g10/exec.c:608 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n" -#: g10/exec.c:611 +#: g10/exec.c:613 #, c-format msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "警告：无法删除临时目录‘%s’：%s\n" -#: g10/export.c:59 +#: g10/export.c:61 msgid "export signatures that are marked as local-only" msgstr "导出被标记为局部的密名" -#: g10/export.c:61 +#: g10/export.c:63 msgid "export attribute user IDs (generally photo IDs)" msgstr "导出属性用户标识(一般为照片标识)" -#: g10/export.c:63 +#: g10/export.c:65 msgid "export revocation keys marked as \"sensitive\"" msgstr "导出被标记为“敏感”的吊销密钥" -#: g10/export.c:65 +#: g10/export.c:67 msgid "remove the passphrase from exported subkeys" msgstr "从导出的子钥中删除所有密码" -#: g10/export.c:67 +#: g10/export.c:69 msgid "remove unusable parts from key during export" msgstr "导出时清除密钥中的不可用部分" -#: g10/export.c:69 +#: g10/export.c:71 msgid "remove as much as possible from key during export" msgstr "导出时尽可能清除密钥中的可选部分" -#: g10/export.c:323 +#: g10/export.c:325 msgid "exporting secret keys not allowed\n" msgstr "不允许导出私钥\n" -#: g10/export.c:352 +#: g10/export.c:354 #, c-format msgid "key %s: not protected - skipped\n" msgstr "密钥 %s：未被保护――已跳过\n" -#: g10/export.c:360 +#: g10/export.c:362 #, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n" -#: g10/export.c:371 +#: g10/export.c:373 #, c-format msgid "key %s: key material on-card - skipped\n" -msgstr "密钥 %s：密钥在卡上——已跳过\n" +msgstr "密钥 %s：密钥在智能卡上——已跳过\n" -#: g10/export.c:519 +#: g10/export.c:521 msgid "about to export an unprotected subkey\n" msgstr "准备导出一把不受保护的子钥\n" -#: g10/export.c:542 +#: g10/export.c:544 #, c-format msgid "failed to unprotect the subkey: %s\n" msgstr "无法取消保护子钥：%s\n" # I hope this warning doesn't confuse people. -#: g10/export.c:563 +#: g10/export.c:565 #, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "警告：私钥 %s 不存在简单 SK 检验和\n" -#: g10/export.c:596 +#: g10/export.c:598 msgid "WARNING: nothing exported\n" msgstr "警告：没有导出任何东西\n" -#: g10/gpg.c:381 +#: g10/gpg.c:379 msgid "" "@Commands:\n" " " @@ -985,127 +1068,128 @@ msgstr "" "@指令：\n" " " -#: g10/gpg.c:383 +#: g10/gpg.c:381 msgid "|[file]|make a signature" msgstr "|[文件名]|生成一份签名" -#: g10/gpg.c:384 +#: g10/gpg.c:382 msgid "|[file]|make a clear text signature" msgstr "|[文件名]|生成一份明文签名" -#: g10/gpg.c:385 +#: g10/gpg.c:383 msgid "make a detached signature" msgstr "生成一份分离的签名" -#: g10/gpg.c:386 +#: g10/gpg.c:384 msgid "encrypt data" msgstr "加密数据" -#: g10/gpg.c:388 +#: g10/gpg.c:386 msgid "encryption only with symmetric cipher" msgstr "仅使用对称加密" -#: g10/gpg.c:390 +#: g10/gpg.c:388 msgid "decrypt data (default)" msgstr "解密数据(默认)" -#: g10/gpg.c:392 +#: g10/gpg.c:390 msgid "verify a signature" msgstr "验证签名" -#: g10/gpg.c:394 +#: g10/gpg.c:392 msgid "list keys" msgstr "列出密钥" -#: g10/gpg.c:396 +#: g10/gpg.c:394 msgid "list keys and signatures" msgstr "列出密钥和签名" -#: g10/gpg.c:397 +#: g10/gpg.c:395 msgid "list and check key signatures" msgstr "列出并检查密钥签名" -#: g10/gpg.c:398 +#: g10/gpg.c:396 msgid "list keys and fingerprints" msgstr "列出密钥和指纹" -#: g10/gpg.c:399 +#: g10/gpg.c:397 msgid "list secret keys" msgstr "列出私钥" -#: g10/gpg.c:400 +#: g10/gpg.c:398 msgid "generate a new key pair" msgstr "生成一副新的密钥对" -#: g10/gpg.c:401 +#: g10/gpg.c:399 msgid "remove keys from the public keyring" msgstr "从公钥钥匙环里删除密钥" -#: g10/gpg.c:403 +#: g10/gpg.c:401 msgid "remove keys from the secret keyring" msgstr "从私钥钥匙环里删除密钥" -#: g10/gpg.c:404 +#: g10/gpg.c:402 msgid "sign a key" msgstr "为某把密钥添加签名" -#: g10/gpg.c:405 +#: g10/gpg.c:403 msgid "sign a key locally" msgstr "为某把密钥添加本地签名" -#: g10/gpg.c:406 +#: g10/gpg.c:404 msgid "sign or edit a key" msgstr "编辑某把密钥或为其添加签名" -#: g10/gpg.c:407 +#: g10/gpg.c:405 msgid "generate a revocation certificate" msgstr "生成一份吊销证书" -#: g10/gpg.c:409 +#: g10/gpg.c:407 msgid "export keys" msgstr "导出密钥" -#: g10/gpg.c:410 +#: g10/gpg.c:408 msgid "export keys to a key server" msgstr "把密钥导出到某个公钥服务器上" -#: g10/gpg.c:411 +#: g10/gpg.c:409 msgid "import keys from a key server" msgstr "从公钥服务器上导入密钥" -#: g10/gpg.c:413 +#: g10/gpg.c:411 msgid "search for keys on a key server" msgstr "在公钥服务器上搜寻密钥" -#: g10/gpg.c:415 +#: g10/gpg.c:413 msgid "update all keys from a keyserver" msgstr "从公钥服务器更新所有的本地密钥" -#: g10/gpg.c:419 +#: g10/gpg.c:417 msgid "import/merge keys" msgstr "导入/合并密钥" -#: g10/gpg.c:422 +#: g10/gpg.c:420 msgid "print the card status" -msgstr "打印卡状态" +msgstr "打印智能卡状态" -#: g10/gpg.c:423 +#: g10/gpg.c:421 msgid "change data on a card" -msgstr "更改卡上的数据" +msgstr "更改智能卡上的数据" -#: g10/gpg.c:424 +#: g10/gpg.c:422 msgid "change a card's PIN" -msgstr "更改卡的 PIN" +msgstr "更改智能卡的 PIN" -#: g10/gpg.c:433 +#: g10/gpg.c:431 msgid "update the trust database" msgstr "更新信任度数据库" -#: g10/gpg.c:440 +#: g10/gpg.c:438 msgid "|algo [files]|print message digests" msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值" -#: g10/gpg.c:444 g10/gpgv.c:68 +#: g10/gpg.c:442 +#: g10/gpgv.c:70 msgid "" "@\n" "Options:\n" @@ -1115,51 +1199,52 @@ msgstr "" "选项：\n" " " -#: g10/gpg.c:446 +#: g10/gpg.c:444 msgid "create ascii armored output" msgstr "输出经 ASCII 封装" -#: g10/gpg.c:448 +#: g10/gpg.c:446 msgid "|NAME|encrypt for NAME" msgstr "|某甲|为收件者“某甲”加密" -#: g10/gpg.c:459 +#: g10/gpg.c:457 msgid "use this user-id to sign or decrypt" msgstr "使用这个用户标识来签名或解密" -#: g10/gpg.c:460 +#: g10/gpg.c:458 msgid "|N|set compress level N (0 disables)" msgstr "|N|设定压缩等级为 N (0 表示不压缩)" -#: g10/gpg.c:465 +#: g10/gpg.c:463 msgid "use canonical text mode" msgstr "使用标准的文本模式" -#: g10/gpg.c:479 +#: g10/gpg.c:477 msgid "use as output file" msgstr "指定输出文件" -#: g10/gpg.c:481 g10/gpgv.c:70 +#: g10/gpg.c:479 +#: g10/gpgv.c:72 msgid "verbose" msgstr "详细模式" -#: g10/gpg.c:492 +#: g10/gpg.c:490 msgid "do not make any changes" msgstr "不做任何改变" -#: g10/gpg.c:493 +#: g10/gpg.c:491 msgid "prompt before overwriting" msgstr "覆盖前先询问" -#: g10/gpg.c:535 +#: g10/gpg.c:532 msgid "use strict OpenPGP behavior" msgstr "行为严格遵循 OpenPGP 定义" -#: g10/gpg.c:536 +#: g10/gpg.c:533 msgid "generate PGP 2.x compatible messages" msgstr "生成与 PGP 2.x 兼容的报文" -#: g10/gpg.c:565 +#: g10/gpg.c:562 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1167,7 +1252,7 @@ msgstr "" "@\n" "(请参考在线说明以获得所有命令和选项的完整清单)\n" -#: g10/gpg.c:568 +#: g10/gpg.c:565 msgid "" "@\n" "Examples:\n" @@ -1187,17 +1272,18 @@ msgstr "" " --list-keys [某甲] 显示密钥\n" " --fingerprint [某甲] 显示指纹\n" -#: g10/gpg.c:769 g10/gpgv.c:95 +#: g10/gpg.c:766 +#: g10/gpgv.c:97 msgid "Please report bugs to .\n" msgstr "" "请向 报告程序缺陷。\n" -"请向 反映简体中文翻译的问题。\n" +"请向 反映简体中文翻译的问题。\n" -#: g10/gpg.c:786 +#: g10/gpg.c:783 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "用法： gpg [选项] [文件] (用 -h 求助)" -#: g10/gpg.c:789 +#: g10/gpg.c:786 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1207,7 +1293,7 @@ msgstr "" "签名、检查、加密或解密\n" "默认的操作依输入数据而定\n" -#: g10/gpg.c:800 +#: g10/gpg.c:797 msgid "" "\n" "Supported algorithms:\n" @@ -1215,622 +1301,632 @@ msgstr "" "\n" "支持的算法：\n" -#: g10/gpg.c:803 +#: g10/gpg.c:800 msgid "Pubkey: " msgstr "公钥：" -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:806 +#: g10/keyedit.c:2304 msgid "Cipher: " msgstr "对称加密：" -#: g10/gpg.c:815 +#: g10/gpg.c:812 msgid "Hash: " msgstr "散列：" -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:818 +#: g10/keyedit.c:2350 msgid "Compression: " msgstr "压缩：" -#: g10/gpg.c:904 +#: g10/gpg.c:901 msgid "usage: gpg [options] " msgstr "用法：gpg [选项] " -#: g10/gpg.c:1052 +#: g10/gpg.c:1049 msgid "conflicting commands\n" msgstr "冲突的指令\n" -#: g10/gpg.c:1070 +#: g10/gpg.c:1067 #, c-format msgid "no = sign found in group definition `%s'\n" msgstr "在‘%s’组定义里找不到等号(=)\n" -#: g10/gpg.c:1267 +#: g10/gpg.c:1264 #, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "警告：用户目录‘%s’所有权不安全\n" -#: g10/gpg.c:1270 +#: g10/gpg.c:1267 #, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "警告：配置文件‘%s’所有权不安全\n" -#: g10/gpg.c:1273 +#: g10/gpg.c:1270 #, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "警告：扩展模块‘%s’所有权不安全\n" -#: g10/gpg.c:1279 +#: g10/gpg.c:1276 #, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "警告：用户目录‘%s’权限不安全\n" -#: g10/gpg.c:1282 +#: g10/gpg.c:1279 #, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "警告：配置文件‘%s’权限不安全\n" -#: g10/gpg.c:1285 +#: g10/gpg.c:1282 #, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "警告：扩展模块‘%s’权限不安全\n" -#: g10/gpg.c:1291 +#: g10/gpg.c:1288 #, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n" -#: g10/gpg.c:1294 +#: g10/gpg.c:1291 #, c-format -msgid "" -"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" +msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n" -#: g10/gpg.c:1297 +#: g10/gpg.c:1294 #, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n" -#: g10/gpg.c:1303 +#: g10/gpg.c:1300 #, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n" -#: g10/gpg.c:1306 +#: g10/gpg.c:1303 #, c-format -msgid "" -"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" +msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n" -#: g10/gpg.c:1309 +#: g10/gpg.c:1306 #, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n" -#: g10/gpg.c:1450 +#: g10/gpg.c:1447 #, c-format msgid "unknown configuration item `%s'\n" msgstr "未知的配置项‘%s’\n" -#: g10/gpg.c:1543 +#: g10/gpg.c:1540 msgid "display photo IDs during key listings" msgstr "列出密钥时显示用户标识" -#: g10/gpg.c:1545 +#: g10/gpg.c:1542 msgid "show policy URLs during signature listings" msgstr "列出签名时显示策略 URL" -#: g10/gpg.c:1547 +#: g10/gpg.c:1544 msgid "show all notations during signature listings" msgstr "列出签名时显示 IETF 标准注记" -#: g10/gpg.c:1549 +#: g10/gpg.c:1546 msgid "show IETF standard notations during signature listings" msgstr "列出签名时显示 IETF 标准注记" -#: g10/gpg.c:1553 +#: g10/gpg.c:1550 msgid "show user-supplied notations during signature listings" msgstr "列出签名时显示用户提供的注记" -#: g10/gpg.c:1555 +#: g10/gpg.c:1552 msgid "show preferred keyserver URLs during signature listings" msgstr "列出密钥时显示首选公钥服务器 URL" -#: g10/gpg.c:1557 +#: g10/gpg.c:1554 msgid "show user ID validity during key listings" msgstr "列出密钥时显示用户标识的有效性" -#: g10/gpg.c:1559 +#: g10/gpg.c:1556 msgid "show revoked and expired user IDs in key listings" msgstr "列出密钥时显示已吊销或已过期的用户标识" -#: g10/gpg.c:1561 +#: g10/gpg.c:1558 msgid "show revoked and expired subkeys in key listings" msgstr "列出密钥时显示已吊销或已过期的子钥" -#: g10/gpg.c:1563 +#: g10/gpg.c:1560 msgid "show the keyring name in key listings" msgstr "列出密钥时显示钥匙环的名称" -#: g10/gpg.c:1565 +#: g10/gpg.c:1562 msgid "show expiration dates during signature listings" msgstr "列出签名时显示过期日期" -#: g10/gpg.c:1959 +#: g10/gpg.c:1957 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n" -#: g10/gpg.c:2001 +#: g10/gpg.c:1999 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "注意：没有默认配置文件‘%s’\n" -#: g10/gpg.c:2005 +#: g10/gpg.c:2003 #, c-format msgid "option file `%s': %s\n" msgstr "配置文件‘%s’：%s\n" -#: g10/gpg.c:2012 +#: g10/gpg.c:2010 #, c-format msgid "reading options from `%s'\n" msgstr "从‘%s’读取选项\n" -#: g10/gpg.c:2228 g10/gpg.c:2896 g10/gpg.c:2915 +#: g10/gpg.c:2226 +#: g10/gpg.c:2863 +#: g10/gpg.c:2882 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "注意：一般情况下不会用到 %s！\n" -#: g10/gpg.c:2241 +#: g10/gpg.c:2239 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n" -#: g10/gpg.c:2430 g10/gpg.c:2442 +#: g10/gpg.c:2405 +#: g10/gpg.c:2417 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "‘%s’不是一个有效的签名过期日期\n" -#: g10/gpg.c:2519 +#: g10/gpg.c:2494 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’不是一个有效的字符集\n" -#: g10/gpg.c:2543 g10/gpg.c:2732 g10/keyedit.c:4076 +#: g10/gpg.c:2518 +#: g10/gpg.c:2707 +#: g10/keyedit.c:4074 msgid "could not parse keyserver URL\n" msgstr "无法解析公钥服务器 URL\n" -#: g10/gpg.c:2555 +#: g10/gpg.c:2530 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s：%d：无效的公钥服务器选项\n" -#: g10/gpg.c:2558 +#: g10/gpg.c:2533 msgid "invalid keyserver options\n" msgstr "无效的公钥服务器选项\n" -#: g10/gpg.c:2565 +#: g10/gpg.c:2540 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s：%d：无效的导入选项\n" -#: g10/gpg.c:2568 +#: g10/gpg.c:2543 msgid "invalid import options\n" msgstr "无效的导入选项\n" -#: g10/gpg.c:2575 +#: g10/gpg.c:2550 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s：%d：无效的导出选项\n" -#: g10/gpg.c:2578 +#: g10/gpg.c:2553 msgid "invalid export options\n" msgstr "无效的导出选项\n" -#: g10/gpg.c:2585 +#: g10/gpg.c:2560 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s：%d：无效的列表选项\n" -#: g10/gpg.c:2588 +#: g10/gpg.c:2563 msgid "invalid list options\n" msgstr "无效的列表选项\n" -#: g10/gpg.c:2596 +#: g10/gpg.c:2571 msgid "display photo IDs during signature verification" msgstr "验证签名时显示照片标识" -#: g10/gpg.c:2598 +#: g10/gpg.c:2573 msgid "show policy URLs during signature verification" msgstr "验证签名时显示策略 URL" -#: g10/gpg.c:2600 +#: g10/gpg.c:2575 msgid "show all notations during signature verification" msgstr "验证签名时显示所有注记" -#: g10/gpg.c:2602 +#: g10/gpg.c:2577 msgid "show IETF standard notations during signature verification" msgstr "验证签名时显示 IETF 标准注记" -#: g10/gpg.c:2606 +#: g10/gpg.c:2581 msgid "show user-supplied notations during signature verification" msgstr "验证签名时显示用户提供的注记" -#: g10/gpg.c:2608 +#: g10/gpg.c:2583 msgid "show preferred keyserver URLs during signature verification" msgstr "验证签名时显示首选公钥服务器 URL" -#: g10/gpg.c:2610 +#: g10/gpg.c:2585 msgid "show user ID validity during signature verification" msgstr "验证签名时显示用户标识的有效性" -#: g10/gpg.c:2612 +#: g10/gpg.c:2587 msgid "show revoked and expired user IDs in signature verification" msgstr "验证密钥时显示已吊销或已过期的子钥" -#: g10/gpg.c:2614 -#, fuzzy +#: g10/gpg.c:2589 msgid "show only the primary user ID in signature verification" -msgstr "验证密钥时显示已吊销或已过期的子钥" +msgstr "在签名验证中只显示主用户标识" -#: g10/gpg.c:2616 +#: g10/gpg.c:2591 msgid "validate signatures with PKA data" msgstr "使用 PKA 数据验证签名的有效性" -#: g10/gpg.c:2618 +#: g10/gpg.c:2593 msgid "elevate the trust of signatures with valid PKA data" msgstr "提升带有有效 PKA 数据的签名的信任度" -#: g10/gpg.c:2625 +#: g10/gpg.c:2600 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s：%d：无效的校验选项\n" -#: g10/gpg.c:2628 +#: g10/gpg.c:2603 msgid "invalid verify options\n" msgstr "无效的校验选项\n" -#: g10/gpg.c:2635 +#: g10/gpg.c:2610 #, c-format msgid "unable to set exec-path to %s\n" msgstr "无法把运行路径设成 %s\n" -#: g10/gpg.c:2798 +#: g10/gpg.c:2773 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s：%d：无效的 auto-key-locate 清单\n" -#: g10/gpg.c:2801 +#: g10/gpg.c:2776 msgid "invalid auto-key-locate list\n" msgstr "无效的 auto-key-locate 清单\n" -#: g10/gpg.c:2885 +#: g10/gpg.c:2852 msgid "WARNING: program may create a core file!\n" msgstr "警告：程序可能会创建核心内存转储！\n" -#: g10/gpg.c:2889 +#: g10/gpg.c:2856 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告：%s 会使得 %s 失效\n" -#: g10/gpg.c:2898 +#: g10/gpg.c:2865 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 不可与 %s 并用\n" -#: g10/gpg.c:2901 +#: g10/gpg.c:2868 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 与 %s 并用无意义！\n" -#: g10/gpg.c:2908 +#: g10/gpg.c:2875 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "注意：%s 本版本中不可用\n" -#: g10/gpg.c:2923 +#: g10/gpg.c:2890 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "不会在内存不安全的情况下运行，原因是 %s\n" -#: g10/gpg.c:2937 +#: g10/gpg.c:2904 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n" -#: g10/gpg.c:2943 +#: g10/gpg.c:2910 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n" -#: g10/gpg.c:2949 +#: g10/gpg.c:2916 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n" -#: g10/gpg.c:2962 +#: g10/gpg.c:2929 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n" -#: g10/gpg.c:3029 g10/gpg.c:3053 +#: g10/gpg.c:2996 +#: g10/gpg.c:3020 msgid "selected cipher algorithm is invalid\n" msgstr "所选的对称加密算法无效\n" -#: g10/gpg.c:3035 g10/gpg.c:3059 +#: g10/gpg.c:3002 +#: g10/gpg.c:3026 msgid "selected digest algorithm is invalid\n" msgstr "所选的散列算法无效\n" -#: g10/gpg.c:3041 +#: g10/gpg.c:3008 msgid "selected compression algorithm is invalid\n" msgstr "所选的压缩算法无效\n" -#: g10/gpg.c:3047 +#: g10/gpg.c:3014 msgid "selected certification digest algorithm is invalid\n" msgstr "所选的证书散列算法无效\n" -#: g10/gpg.c:3062 +#: g10/gpg.c:3029 msgid "completes-needed must be greater than 0\n" msgstr "需要的完全可信签名数一定要大于 0\n" -#: g10/gpg.c:3064 +#: g10/gpg.c:3031 msgid "marginals-needed must be greater than 1\n" msgstr "需要的勉强可信签名数一定要大于 1\n" -#: g10/gpg.c:3066 +#: g10/gpg.c:3033 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "最大验证深度一定要介于 1 和 255 之间\n" -#: g10/gpg.c:3068 +#: g10/gpg.c:3035 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n" -#: g10/gpg.c:3070 +#: g10/gpg.c:3037 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "无效的最小验证级别；一定要是 1，2 或 3\n" -#: g10/gpg.c:3073 +#: g10/gpg.c:3040 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n" -#: g10/gpg.c:3077 +#: g10/gpg.c:3044 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "无效的 S2K 模式；必须是 0，1 或 3\n" -#: g10/gpg.c:3084 +#: g10/gpg.c:3051 msgid "invalid default preferences\n" msgstr "无效的默认首选项\n" -#: g10/gpg.c:3093 +#: g10/gpg.c:3060 msgid "invalid personal cipher preferences\n" msgstr "无效的个人对称加密算法首选项\n" -#: g10/gpg.c:3097 +#: g10/gpg.c:3064 msgid "invalid personal digest preferences\n" msgstr "无效的个人散列算法首选项\n" -#: g10/gpg.c:3101 +#: g10/gpg.c:3068 msgid "invalid personal compress preferences\n" msgstr "无效的个人压缩算法首选项\n" -#: g10/gpg.c:3134 +#: g10/gpg.c:3101 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s 尚不能和 %s 并用\n" -#: g10/gpg.c:3181 +#: g10/gpg.c:3148 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n" -#: g10/gpg.c:3186 +#: g10/gpg.c:3153 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’散列算法\n" -#: g10/gpg.c:3191 +#: g10/gpg.c:3158 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n" -#: g10/gpg.c:3293 +#: g10/gpg.c:3260 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "初始化信任度数据库失败：%s\n" -#: g10/gpg.c:3304 +#: g10/gpg.c:3271 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n" -#: g10/gpg.c:3315 +#: g10/gpg.c:3282 msgid "--store [filename]" msgstr "--store [文件名]" -#: g10/gpg.c:3322 +#: g10/gpg.c:3289 msgid "--symmetric [filename]" msgstr "--symmetric [文件名]" -#: g10/gpg.c:3324 +#: g10/gpg.c:3291 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "对称加密‘%s’失败：%s\n" -#: g10/gpg.c:3334 +#: g10/gpg.c:3301 msgid "--encrypt [filename]" msgstr "--encrypt [文件名]" -#: g10/gpg.c:3347 +#: g10/gpg.c:3314 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [文件名]" -#: g10/gpg.c:3349 +#: g10/gpg.c:3316 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3319 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n" -#: g10/gpg.c:3370 +#: g10/gpg.c:3337 msgid "--sign [filename]" msgstr "--sign [文件名]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3350 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [文件名]" -#: g10/gpg.c:3398 +#: g10/gpg.c:3365 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [文件名]" -#: g10/gpg.c:3400 +#: g10/gpg.c:3367 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n" -#: g10/gpg.c:3403 +#: g10/gpg.c:3370 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n" -#: g10/gpg.c:3423 +#: g10/gpg.c:3390 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [文件名]" -#: g10/gpg.c:3432 +#: g10/gpg.c:3399 msgid "--clearsign [filename]" msgstr "--clearsign [文件名]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3424 msgid "--decrypt [filename]" msgstr "--decrypt [文件名]" -#: g10/gpg.c:3465 +#: g10/gpg.c:3432 msgid "--sign-key user-id" msgstr "--sign-key 用户标识" -#: g10/gpg.c:3469 +#: g10/gpg.c:3436 msgid "--lsign-key user-id" msgstr "--lsign-key 用户标识" -#: g10/gpg.c:3490 +#: g10/gpg.c:3457 msgid "--edit-key user-id [commands]" msgstr "--edit-key 用户标识 [指令]" -#: g10/gpg.c:3561 +#: g10/gpg.c:3528 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [用户标识] [钥匙环]" -#: g10/gpg.c:3603 +#: g10/gpg.c:3570 #, c-format msgid "keyserver send failed: %s\n" msgstr "上传至公钥服务器失败：%s\n" -#: g10/gpg.c:3605 +#: g10/gpg.c:3572 #, c-format msgid "keyserver receive failed: %s\n" msgstr "从公钥服务器接收失败：%s\n" -#: g10/gpg.c:3607 +#: g10/gpg.c:3574 #, c-format msgid "key export failed: %s\n" msgstr "导出密钥失败：%s\n" -#: g10/gpg.c:3618 +#: g10/gpg.c:3585 #, c-format msgid "keyserver search failed: %s\n" msgstr "搜寻公钥服务器失败：%s\n" -#: g10/gpg.c:3628 +#: g10/gpg.c:3595 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "从公钥服务器更新失败：%s\n" -#: g10/gpg.c:3679 +#: g10/gpg.c:3646 #, c-format msgid "dearmoring failed: %s\n" msgstr "解开 ASCII 封装失败：%s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3654 #, c-format msgid "enarmoring failed: %s\n" msgstr "进行 ASCII 封装失败：%s\n" -#: g10/gpg.c:3774 +#: g10/gpg.c:3741 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "无效的‘%s’散列算法\n" -#: g10/gpg.c:3897 +#: g10/gpg.c:3864 msgid "[filename]" msgstr "[文件名]" -#: g10/gpg.c:3901 +#: g10/gpg.c:3868 msgid "Go ahead and type your message ...\n" msgstr "请开始键入您的报文……\n" -#: g10/gpg.c:4205 +#: g10/gpg.c:4172 msgid "the given certification policy URL is invalid\n" msgstr "给定的的验证策略 URL 无效\n" -#: g10/gpg.c:4207 +#: g10/gpg.c:4174 msgid "the given signature policy URL is invalid\n" msgstr "给定的签名策略 URL 无效\n" -#: g10/gpg.c:4240 +#: g10/gpg.c:4207 msgid "the given preferred keyserver URL is invalid\n" msgstr "给定的首选公钥服务器 URL 无效\n" -#: g10/getkey.c:150 +#: g10/getkey.c:152 msgid "too many entries in pk cache - disabled\n" msgstr "pk 缓存里项目太多――已禁用\n" -#: g10/getkey.c:173 +#: g10/getkey.c:175 msgid "[User ID not found]" msgstr "[找不到用户标识]" -#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982 -#: g10/getkey.c:997 +#: g10/getkey.c:948 +#: g10/getkey.c:958 +#: g10/getkey.c:968 +#: g10/getkey.c:984 +#: g10/getkey.c:999 #, c-format msgid "automatically retrieved `%s' via %s\n" msgstr "自动获取‘%s’，通过 %s\n" -#: g10/getkey.c:1829 +#: g10/getkey.c:1826 #, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n" -#: g10/getkey.c:2386 g10/keyedit.c:3719 +#: g10/getkey.c:2383 +#: g10/keyedit.c:3717 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "公钥 %s 没有相对应的私钥――忽略\n" -#: g10/getkey.c:2617 +#: g10/getkey.c:2614 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "使用子钥 %s 而非主钥 %s\n" -#: g10/getkey.c:2664 +#: g10/getkey.c:2661 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "密钥 %s：无相应公钥的私钥――已跳过\n" -#: g10/gpgv.c:71 +#: g10/gpgv.c:73 msgid "be somewhat more quiet" msgstr "尽量减少提示信息" -#: g10/gpgv.c:72 +#: g10/gpgv.c:74 msgid "take the keys from this keyring" msgstr "从这个钥匙环里取用密钥" -#: g10/gpgv.c:74 +#: g10/gpgv.c:76 msgid "make timestamp conflicts only a warning" msgstr "把时间戳矛盾仅视为警告" -#: g10/gpgv.c:75 +#: g10/gpgv.c:77 msgid "|FD|write status info to this FD" msgstr "|FD|把状态信息写入文件描述符 FD" -#: g10/gpgv.c:99 +#: g10/gpgv.c:101 msgid "Usage: gpgv [options] [files] (-h for help)" msgstr "用法：gpgv [选项] [文件] (用 -h 求助)" -#: g10/gpgv.c:102 +#: g10/gpgv.c:104 msgid "" "Syntax: gpg [options] [files]\n" "Check signatures against known trusted keys\n" @@ -1838,7 +1934,7 @@ msgstr "" "语法：gpg [选项] [文件]\n" "用已知的受信任密钥来检查签名\n" -#: g10/helptext.c:47 +#: g10/helptext.c:49 msgid "" "It's up to you to assign a value here; this value will never be exported\n" "to any 3rd party. We need it to implement the web-of-trust; it has nothing\n" @@ -1847,7 +1943,7 @@ msgstr "" "在这里指定的数值完全由您自己决定；这些数值永远不会被输出给任何第三方。\n" "我们需要它来实现“信任网络”；这跟隐含建立起来的“验证网络”无关。" -#: g10/helptext.c:53 +#: g10/helptext.c:55 msgid "" "To build the Web-of-Trust, GnuPG needs to know which keys are\n" "ultimately trusted - those are usually the keys for which you have\n" @@ -1857,16 +1953,15 @@ msgstr "" "要建立起信任网络，GnuPG 需要知道哪些密钥是可绝对信任的――通常\n" "就是您拥有私钥的那些密钥。回答“yes”将此密钥设成可绝对信任的\n" -#: g10/helptext.c:60 +#: g10/helptext.c:62 msgid "If you want to use this untrusted key anyway, answer \"yes\"." msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。" -#: g10/helptext.c:64 -msgid "" -"Enter the user ID of the addressee to whom you want to send the message." +#: g10/helptext.c:66 +msgid "Enter the user ID of the addressee to whom you want to send the message." msgstr "输入您要递送的报文的接收者的用户标识。" -#: g10/helptext.c:68 +#: g10/helptext.c:70 msgid "" "Select the algorithm to use.\n" "\n" @@ -1889,7 +1984,7 @@ msgstr "" "\n" "第一把密钥(主钥)必须具有签名的能力。" -#: g10/helptext.c:82 +#: g10/helptext.c:84 msgid "" "In general it is not a good idea to use the same key for signing and\n" "encryption. This algorithm should only be used in certain domains.\n" @@ -1898,16 +1993,21 @@ msgstr "" "通常来说用同一把密钥签名及加密并不是个好主意。这个算法只在特定的情况\n" "下使用。请先咨询安全方面的专家。" -#: g10/helptext.c:89 +#: g10/helptext.c:91 msgid "Enter the size of the key" msgstr "请输入密钥的尺寸" -#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142 -#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180 +#: g10/helptext.c:95 +#: g10/helptext.c:100 +#: g10/helptext.c:112 +#: g10/helptext.c:144 +#: g10/helptext.c:172 +#: g10/helptext.c:177 +#: g10/helptext.c:182 msgid "Answer \"yes\" or \"no\"" msgstr "请回答“yes”或“no”" -#: g10/helptext.c:103 +#: g10/helptext.c:105 msgid "" "Enter the required value as shown in the prompt.\n" "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n" @@ -1918,19 +2018,19 @@ msgstr "" "您可以输入 ISO 日期格式(YYYY-MM-DD)，但是出错时您不会得到友好的响应\n" "――系统会尝试将给定值解释为时间间隔。" -#: g10/helptext.c:115 +#: g10/helptext.c:117 msgid "Enter the name of the key holder" msgstr "请输入密钥持有人的名字" -#: g10/helptext.c:120 +#: g10/helptext.c:122 msgid "please enter an optional but highly suggested email address" msgstr "请输入电子邮件地址(可选项，但强烈推荐使用)" -#: g10/helptext.c:124 +#: g10/helptext.c:126 msgid "Please enter an optional comment" msgstr "请输入注释(可选项)" -#: g10/helptext.c:129 +#: g10/helptext.c:131 msgid "" "N to change the name.\n" "C to change the comment.\n" @@ -1944,46 +2044,36 @@ msgstr "" "O 继续产生密钥。\n" "Q 中止产生密钥。" -#: g10/helptext.c:138 +#: g10/helptext.c:140 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key." msgstr "如果您允许生成子钥，请回答“yes”(或者“y”)。" -#: g10/helptext.c:146 +#: g10/helptext.c:148 msgid "" "When you sign a user ID on a key, you should first verify that the key\n" "belongs to the person named in the user ID. It is useful for others to\n" "know how carefully you verified this.\n" "\n" -"\"0\" means you make no particular claim as to how carefully you verified " -"the\n" +"\"0\" means you make no particular claim as to how carefully you verified the\n" " key.\n" "\n" "\"1\" means you believe the key is owned by the person who claims to own it\n" -" but you could not, or did not verify the key at all. This is useful " -"for\n" -" a \"persona\" verification, where you sign the key of a pseudonymous " -"user.\n" +" but you could not, or did not verify the key at all. This is useful for\n" +" a \"persona\" verification, where you sign the key of a pseudonymous user.\n" "\n" -"\"2\" means you did casual verification of the key. For example, this " -"could\n" -" mean that you verified the key fingerprint and checked the user ID on " -"the\n" +"\"2\" means you did casual verification of the key. For example, this could\n" +" mean that you verified the key fingerprint and checked the user ID on the\n" " key against a photo ID.\n" "\n" -"\"3\" means you did extensive verification of the key. For example, this " -"could\n" +"\"3\" means you did extensive verification of the key. For example, this could\n" " mean that you verified the key fingerprint with the owner of the key in\n" -" person, and that you checked, by means of a hard to forge document with " -"a\n" -" photo ID (such as a passport) that the name of the key owner matches " -"the\n" -" name in the user ID on the key, and finally that you verified (by " -"exchange\n" +" person, and that you checked, by means of a hard to forge document with a\n" +" photo ID (such as a passport) that the name of the key owner matches the\n" +" name in the user ID on the key, and finally that you verified (by exchange\n" " of email) that the email address on the key belongs to the key owner.\n" "\n" "Note that the examples given above for levels 2 and 3 are *only* examples.\n" -"In the end, it is up to you to decide just what \"casual\" and \"extensive" -"\"\n" +"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n" "mean to you when you sign other keys.\n" "\n" "If you don't know what the right answer is, answer \"0\"." @@ -2010,11 +2100,11 @@ msgstr "" "\n" "如果您不知道应该选什么答案的话，就选“0”。" -#: g10/helptext.c:184 +#: g10/helptext.c:186 msgid "Answer \"yes\" if you want to sign ALL the user IDs" msgstr "如果您想要为所有用户标识签名的话就选“yes”" -#: g10/helptext.c:188 +#: g10/helptext.c:190 msgid "" "Answer \"yes\" if you really want to delete this user ID.\n" "All certificates are then also lost!" @@ -2022,11 +2112,11 @@ msgstr "" "如果您真的想要删除这个用户标识的话就回答“yes”。\n" "所有相关认证在此之后也会丢失！" -#: g10/helptext.c:193 +#: g10/helptext.c:195 msgid "Answer \"yes\" if it is okay to delete the subkey" msgstr "如果可以删除这把子钥，请回答“yes”" -#: g10/helptext.c:198 +#: g10/helptext.c:200 msgid "" "This is a valid signature on the key; you normally don't want\n" "to delete this signature because it may be important to establish a\n" @@ -2036,7 +2126,7 @@ msgstr "" "因为要与这把密钥或拥有这把密钥的签名的密钥建立认证关系可能\n" "相当重要。" -#: g10/helptext.c:203 +#: g10/helptext.c:205 msgid "" "This signature can't be checked because you don't have the\n" "corresponding key. You should postpone its deletion until you\n" @@ -2047,13 +2137,13 @@ msgstr "" "直到您知道此签名使用了哪一把密钥；因为用来签名的密钥可能与\n" "其他已经验证的密钥存在信任关系。" -#: g10/helptext.c:209 +#: g10/helptext.c:211 msgid "" "The signature is not valid. It does make sense to remove it from\n" "your keyring." msgstr "这份签名无效。应当把它从您的钥匙环里删除。" -#: g10/helptext.c:213 +#: g10/helptext.c:215 msgid "" "This is a signature which binds the user ID to the key. It is\n" "usually not a good idea to remove such a signature. Actually\n" @@ -2066,7 +2156,7 @@ msgstr "" "只有在这把密钥的第一个自身签名因某些原因失效，而有第二个自身签\n" "字可用的情况下才这么做。" -#: g10/helptext.c:221 +#: g10/helptext.c:223 msgid "" "Change the preferences of all user IDs (or just of the selected ones)\n" "to the current list of preferences. The timestamp of all affected\n" @@ -2075,23 +2165,23 @@ msgstr "" "用现有的首选项更新所有(或选定的)用户标识的首选项。所有受影响的自身签\n" "字的时间戳都会增加一秒钟。\n" -#: g10/helptext.c:228 +#: g10/helptext.c:230 msgid "Please enter the passhrase; this is a secret sentence \n" msgstr "请输入密码：这是一个秘密的句子 \n" -#: g10/helptext.c:234 +#: g10/helptext.c:236 msgid "Please repeat the last passphrase, so you are sure what you typed in." msgstr "请再次输入上次的密码，以确定您到底键入了些什么。" -#: g10/helptext.c:238 +#: g10/helptext.c:240 msgid "Give the name of the file to which the signature applies" msgstr "请给定要添加签名的文件名" -#: g10/helptext.c:243 +#: g10/helptext.c:245 msgid "Answer \"yes\" if it is okay to overwrite the file" msgstr "如果可以覆盖这个文件，请回答“yes”" -#: g10/helptext.c:248 +#: g10/helptext.c:250 msgid "" "Please enter a new filename. If you just hit RETURN the default\n" "file (which is shown in brackets) will be used." @@ -2099,7 +2189,7 @@ msgstr "" "请输入一个新的文件名。如果您直接按下了回车，那么就会使用显示在括\n" "号中的默认的文件名。" -#: g10/helptext.c:254 +#: g10/helptext.c:256 msgid "" "You should specify a reason for the certification. Depending on the\n" "context you have the ability to choose from this list:\n" @@ -2126,7 +2216,7 @@ msgstr "" " 如果这个用户标识不再被使用了，请选此项；这通常用表明某个电子邮\n" " 件地址已不再有效。\n" -#: g10/helptext.c:270 +#: g10/helptext.c:272 msgid "" "If you like, you can enter a text describing why you issue this\n" "revocation certificate. Please keep this text concise.\n" @@ -2136,393 +2226,405 @@ msgstr "" "字简明扼要。\n" "键入一空行以结束输入。\n" -#: g10/helptext.c:285 +#: g10/helptext.c:287 msgid "No help available" msgstr "没有可用的帮助" -#: g10/helptext.c:293 +#: g10/helptext.c:295 #, c-format msgid "No help available for `%s'" msgstr "‘%s’没有可用的帮助" -#: g10/import.c:94 +#: g10/import.c:96 msgid "import signatures that are marked as local-only" msgstr "导入被标记为局部的签名" -#: g10/import.c:96 +#: g10/import.c:98 msgid "repair damage from the pks keyserver during import" msgstr "导入时修复 PKS 公钥服务器导致的损坏" -#: g10/import.c:98 +#: g10/import.c:100 msgid "do not update the trustdb after import" msgstr "导入后不更新信任度数据库" -#: g10/import.c:100 +#: g10/import.c:102 msgid "create a public key when importing a secret key" msgstr "导入私钥时创建对应的公钥" -#: g10/import.c:102 +#: g10/import.c:104 msgid "only accept updates to existing keys" msgstr "只接受对已有密钥的更新" -#: g10/import.c:104 +#: g10/import.c:106 msgid "remove unusable parts from key after import" msgstr "导入后清除密钥中无用的部分" -#: g10/import.c:106 +#: g10/import.c:108 msgid "remove as much as possible from key after import" msgstr "导入后尽可能清除密钥中的可选部分" -#: g10/import.c:265 +#: g10/import.c:267 #, c-format msgid "skipping block of type %d\n" msgstr "跳过 %d 样式的区块\n" -#: g10/import.c:274 +#: g10/import.c:276 #, c-format msgid "%lu keys processed so far\n" msgstr "目前已处理 %lu 把密钥\n" -#: g10/import.c:291 +#: g10/import.c:293 #, c-format msgid "Total number processed: %lu\n" msgstr "合计被处理的数量：%lu\n" -#: g10/import.c:293 +#: g10/import.c:295 #, c-format msgid " skipped new keys: %lu\n" msgstr " 已跳过的新密钥：%lu\n" -#: g10/import.c:296 +#: g10/import.c:298 #, c-format msgid " w/o user IDs: %lu\n" msgstr " 遗失用户标识：%lu\n" -#: g10/import.c:298 +#: g10/import.c:300 #, c-format msgid " imported: %lu" msgstr " 已导入：%lu" -#: g10/import.c:304 +#: g10/import.c:306 #, c-format msgid " unchanged: %lu\n" msgstr " 未改变：%lu\n" -#: g10/import.c:306 +#: g10/import.c:308 #, c-format msgid " new user IDs: %lu\n" msgstr " 新用户标识：%lu\n" -#: g10/import.c:308 +#: g10/import.c:310 #, c-format msgid " new subkeys: %lu\n" msgstr " 新的子钥：%lu\n" -#: g10/import.c:310 +#: g10/import.c:312 #, c-format msgid " new signatures: %lu\n" msgstr " 新的签名：%lu\n" -#: g10/import.c:312 +#: g10/import.c:314 #, c-format msgid " new key revocations: %lu\n" msgstr " 新的密钥吊销：%lu\n" -#: g10/import.c:314 +#: g10/import.c:316 #, c-format msgid " secret keys read: %lu\n" msgstr " 读取的私钥：%lu\n" -#: g10/import.c:316 +#: g10/import.c:318 #, c-format msgid " secret keys imported: %lu\n" msgstr " 导入的私钥：%lu\n" -#: g10/import.c:318 +#: g10/import.c:320 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " 未改变的私钥：%lu\n" -#: g10/import.c:320 +#: g10/import.c:322 #, c-format msgid " not imported: %lu\n" msgstr " 未被导入：%lu\n" -#: g10/import.c:322 +#: g10/import.c:324 #, c-format msgid " signatures cleaned: %lu\n" msgstr " 清除的签名：%lu\n" -#: g10/import.c:324 +#: g10/import.c:326 #, c-format msgid " user IDs cleaned: %lu\n" msgstr " 清除的用户标识：%lu\n" -#: g10/import.c:565 -#, fuzzy, c-format +#: g10/import.c:567 +#, c-format msgid "WARNING: key %s contains preferences for unavailable\n" -msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n" +msgstr "警告：密钥 %s 在下列用户标识的首选项中包含\n" #. TRANSLATORS: This string is belongs to the previous one. They are #. only split up to allow printing of a common prefix. -#: g10/import.c:569 -#, fuzzy +#: g10/import.c:571 msgid " algorithms on these user IDs:\n" -msgstr " 新用户标识：%lu\n" +msgstr " 不可用的算法：\n" -#: g10/import.c:606 +#: g10/import.c:608 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr " “%s”：对称加密算法 %s 对应首选项\n" -#: g10/import.c:618 +#: g10/import.c:620 #, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr " “%s”：散列算法 %s 对应首选项\n" -#: g10/import.c:630 +#: g10/import.c:632 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr " “%s”：压缩算法 %s 对应首选项\n" -#: g10/import.c:643 +#: g10/import.c:645 msgid "it is strongly suggested that you update your preferences and\n" msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n" -#: g10/import.c:645 +#: g10/import.c:647 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "以避免可能的算法不匹配问题\n" -#: g10/import.c:669 +#: g10/import.c:671 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n" -#: g10/import.c:719 g10/import.c:1117 +#: g10/import.c:721 +#: g10/import.c:1119 #, c-format msgid "key %s: no user ID\n" msgstr "密钥 %s：没有用户标识\n" -#: g10/import.c:748 +#: g10/import.c:750 #, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "密钥 %s：PKS 子钥破损已修复\n" -#: g10/import.c:763 +#: g10/import.c:765 #, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n" -#: g10/import.c:769 +#: g10/import.c:771 #, c-format msgid "key %s: no valid user IDs\n" msgstr "密钥 %s：没有有效的用户标识\n" -#: g10/import.c:771 +#: g10/import.c:773 msgid "this may be caused by a missing self-signature\n" msgstr "这可能由于遗失自身签名所致\n" -#: g10/import.c:781 g10/import.c:1239 +#: g10/import.c:783 +#: g10/import.c:1241 #, c-format msgid "key %s: public key not found: %s\n" msgstr "密钥 %s：找不到公钥：%s\n" -#: g10/import.c:787 +#: g10/import.c:789 #, c-format msgid "key %s: new key - skipped\n" msgstr "密钥 %s：新密钥――已跳过\n" -#: g10/import.c:796 +#: g10/import.c:798 #, c-format msgid "no writable keyring found: %s\n" msgstr "找不到可写的钥匙环：%s\n" -#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104 +#: g10/import.c:803 +#: g10/openfile.c:273 +#: g10/sign.c:831 +#: g10/sign.c:1136 #, c-format msgid "writing to `%s'\n" msgstr "正在写入‘%s’\n" -#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300 -#: g10/import.c:2374 g10/import.c:2396 +#: g10/import.c:807 +#: g10/import.c:902 +#: g10/import.c:1159 +#: g10/import.c:1302 +#: g10/import.c:2364 +#: g10/import.c:2386 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "写入钥匙环‘%s’时出错： %s\n" -#: g10/import.c:824 +#: g10/import.c:826 #, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "密钥 %s：公钥“%s”已导入\n" -#: g10/import.c:848 +#: g10/import.c:850 #, c-format msgid "key %s: doesn't match our copy\n" msgstr "密钥 %s：与我们的副本不吻合\n" -#: g10/import.c:865 g10/import.c:1257 +#: g10/import.c:867 +#: g10/import.c:1259 #, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "密钥 %s：无法定位原始的密钥区块：%s\n" -#: g10/import.c:873 g10/import.c:1264 +#: g10/import.c:875 +#: g10/import.c:1266 #, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "密钥 %s：无法读取原始的密钥区块： %s\n" -#: g10/import.c:910 +#: g10/import.c:912 #, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "密钥 %s：“%s”一个新的用户标识\n" -#: g10/import.c:913 +#: g10/import.c:915 #, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "密钥 %s：“%s”%d 个新的用户标识\n" -#: g10/import.c:916 +#: g10/import.c:918 #, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "密钥 %s：“%s”1 个新的签名\n" -#: g10/import.c:919 +#: g10/import.c:921 #, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "密钥 %s：“%s”%d 个新的签名\n" -#: g10/import.c:922 +#: g10/import.c:924 #, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "密钥 %s：“%s”1 个新的子钥\n" -#: g10/import.c:925 +#: g10/import.c:927 #, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "密钥 %s：“%s”%d 个新的子钥\n" -#: g10/import.c:928 +#: g10/import.c:930 #, c-format msgid "key %s: \"%s\" %d signature cleaned\n" msgstr "密钥 %s：“%s”%d 个签名被清除\n" -#: g10/import.c:931 +#: g10/import.c:933 #, c-format msgid "key %s: \"%s\" %d signatures cleaned\n" msgstr "密钥 %s：“%s”%d 个签名被清除\n" -#: g10/import.c:934 +#: g10/import.c:936 #, c-format msgid "key %s: \"%s\" %d user ID cleaned\n" msgstr "密钥 %s：“%s”%d 个用户标识被清除\n" -#: g10/import.c:937 +#: g10/import.c:939 #, c-format msgid "key %s: \"%s\" %d user IDs cleaned\n" msgstr "密钥 %s：“%s”%d 个用户标识被清除\n" -#: g10/import.c:960 +#: g10/import.c:962 #, c-format msgid "key %s: \"%s\" not changed\n" msgstr "密钥 %s：“%s”未改变\n" -#: g10/import.c:1123 +#: g10/import.c:1125 #, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n" -#: g10/import.c:1134 +#: g10/import.c:1136 msgid "importing secret keys not allowed\n" msgstr "不允许导入私钥\n" -#: g10/import.c:1151 g10/import.c:2389 +#: g10/import.c:1153 +#: g10/import.c:2379 #, c-format msgid "no default secret keyring: %s\n" msgstr "没有默认的私钥钥匙环： %s\n" -#: g10/import.c:1162 +#: g10/import.c:1164 #, c-format msgid "key %s: secret key imported\n" msgstr "密钥 %s：私钥已导入\n" -#: g10/import.c:1192 +#: g10/import.c:1194 #, c-format msgid "key %s: already in secret keyring\n" msgstr "密钥 %s：已在私钥钥匙环中\n" -#: g10/import.c:1202 +#: g10/import.c:1204 #, c-format msgid "key %s: secret key not found: %s\n" msgstr "密钥 %s：找不到私钥：%s\n" -#: g10/import.c:1232 +#: g10/import.c:1234 #, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "密钥 %s：没有公钥――无法应用吊销证书\n" -#: g10/import.c:1275 +#: g10/import.c:1277 #, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n" -#: g10/import.c:1307 +#: g10/import.c:1309 #, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "密钥 %s：“%s”吊销证书已被导入\n" -#: g10/import.c:1373 +#: g10/import.c:1375 #, c-format msgid "key %s: no user ID for signature\n" msgstr "密钥 %s：签名没有用户标识\n" -#: g10/import.c:1388 +#: g10/import.c:1390 #, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n" -#: g10/import.c:1390 +#: g10/import.c:1392 #, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "密钥 %s：用户标识“%s”自身签名无效\n" -#: g10/import.c:1408 +#: g10/import.c:1410 #, c-format msgid "key %s: no subkey for key binding\n" msgstr "密钥 %s：没有可供绑定的子钥\n" -#: g10/import.c:1419 g10/import.c:1469 +#: g10/import.c:1421 +#: g10/import.c:1471 #, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "密钥 %s：不支持的公钥算法\n" -#: g10/import.c:1421 +#: g10/import.c:1423 #, c-format msgid "key %s: invalid subkey binding\n" msgstr "密钥 %s：无效的子钥绑定\n" -#: g10/import.c:1436 +#: g10/import.c:1438 #, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "密钥 %s：已删除多重子钥绑定\n" -#: g10/import.c:1458 +#: g10/import.c:1460 #, c-format msgid "key %s: no subkey for key revocation\n" msgstr "密钥 %s：没有用于密钥吊销的子钥\n" -#: g10/import.c:1471 +#: g10/import.c:1473 #, c-format msgid "key %s: invalid subkey revocation\n" msgstr "密钥 %s：无效的子钥吊销\n" -#: g10/import.c:1486 +#: g10/import.c:1488 #, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "密钥 %s：已删除多重子钥吊销\n" -#: g10/import.c:1528 +#: g10/import.c:1530 #, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "密钥 %s：已跳过用户标识“%s”\n" -#: g10/import.c:1549 +#: g10/import.c:1551 #, c-format msgid "key %s: skipped subkey\n" msgstr "密钥 %s：已跳过子钥\n" @@ -2531,154 +2633,161 @@ msgstr "密钥 %s：已跳过子钥\n" # * to import non-exportable signature when we have the # * the secret key used to create this signature - it # * seems that this makes sense -#: g10/import.c:1576 +#: g10/import.c:1578 #, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n" -#: g10/import.c:1586 +#: g10/import.c:1588 #, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "密钥 %s：吊销证书位置错误――已跳过\n" -#: g10/import.c:1603 +#: g10/import.c:1605 #, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n" -#: g10/import.c:1617 +#: g10/import.c:1619 #, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "密钥 %s：子钥签名位置错误――已跳过\n" -#: g10/import.c:1625 +#: g10/import.c:1627 #, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n" -#: g10/import.c:1737 +#: g10/import.c:1727 #, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "密钥 %s：检测到重复的用户标识――已合并\n" -#: g10/import.c:1799 +#: g10/import.c:1789 #, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n" -#: g10/import.c:1813 +#: g10/import.c:1803 #, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n" -#: g10/import.c:1872 +#: g10/import.c:1862 #, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "密钥 %s：已新增吊销证书“%s”\n" -#: g10/import.c:1906 +#: g10/import.c:1896 #, c-format msgid "key %s: direct key signature added\n" msgstr "密钥 %s：已新增直接密钥签名\n" -#: g10/import.c:2295 +#: g10/import.c:2285 msgid "NOTE: a key's S/N does not match the card's one\n" -msgstr "注意：密钥的序列号与卡的不符\n" +msgstr "注意：密钥的序列号与智能卡的不符\n" -#: g10/import.c:2303 +#: g10/import.c:2293 msgid "NOTE: primary key is online and stored on card\n" -msgstr "注意：主钥在线，存储在卡上\n" +msgstr "注意：主钥在线，存储在智能卡上\n" -#: g10/import.c:2305 +#: g10/import.c:2295 msgid "NOTE: secondary key is online and stored on card\n" -msgstr "注意：子钥在线，存储在卡上\n" +msgstr "注意：子钥在线，存储在智能卡上\n" -#: g10/keydb.c:166 +#: g10/keydb.c:168 #, c-format msgid "error creating keyring `%s': %s\n" msgstr "建立钥匙环‘%s’时发生错误：%s\n" -#: g10/keydb.c:173 +#: g10/keydb.c:175 #, c-format msgid "keyring `%s' created\n" msgstr "钥匙环‘%s’已建立\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:316 +#: g10/keydb.c:319 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "密钥块资源‘%s’：%s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:698 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "重新建立钥匙环缓存失败： %s\n" -#: g10/keyedit.c:264 +#: g10/keyedit.c:266 msgid "[revocation]" msgstr "[吊销]" -#: g10/keyedit.c:265 +#: g10/keyedit.c:267 msgid "[self-signature]" msgstr "[自身签名]" -#: g10/keyedit.c:343 g10/keylist.c:388 +#: g10/keyedit.c:345 +#: g10/keylist.c:390 msgid "1 bad signature\n" msgstr "1 个损坏的签名\n" -#: g10/keyedit.c:345 g10/keylist.c:390 +#: g10/keyedit.c:347 +#: g10/keylist.c:392 #, c-format msgid "%d bad signatures\n" msgstr "%d 个损坏的签名\n" -#: g10/keyedit.c:347 g10/keylist.c:392 +#: g10/keyedit.c:349 +#: g10/keylist.c:394 msgid "1 signature not checked due to a missing key\n" msgstr "有 1 份签名因为遗失密钥而未被检查\n" -#: g10/keyedit.c:349 g10/keylist.c:394 +#: g10/keyedit.c:351 +#: g10/keylist.c:396 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "有 %d 份签名因为遗失密钥而未被检查\n" -#: g10/keyedit.c:351 g10/keylist.c:396 +#: g10/keyedit.c:353 +#: g10/keylist.c:398 msgid "1 signature not checked due to an error\n" msgstr "有 1 份签名因为某个错误而未被检查\n" -#: g10/keyedit.c:353 g10/keylist.c:398 +#: g10/keyedit.c:355 +#: g10/keylist.c:400 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "有 %d 份签名因为某些错误而未被检查\n" -#: g10/keyedit.c:355 +#: g10/keyedit.c:357 msgid "1 user ID without valid self-signature detected\n" msgstr "检测到 1 个没有有效自身签名的用户标识\n" -#: g10/keyedit.c:357 +#: g10/keyedit.c:359 #, c-format msgid "%d user IDs without valid self-signatures detected\n" msgstr "检测到 %d 个没有有效自身签名的用户标识\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:415 +#: g10/pkclist.c:263 msgid "" -"Please decide how far you trust this user to correctly verify other users' " -"keys\n" -"(by looking at passports, checking fingerprints from different sources, " -"etc.)\n" +"Please decide how far you trust this user to correctly verify other users' keys\n" +"(by looking at passports, checking fingerprints from different sources, etc.)\n" msgstr "" -"您是否相信这位用户有能力验证其他用户密钥的有效性(查对身份证、通过不同的渠道检" -"查\n" +"您是否相信这位用户有能力验证其他用户密钥的有效性(查对身份证、通过不同的渠道检查\n" "指纹等)？\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:419 +#: g10/pkclist.c:275 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = 我勉强相信\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:420 +#: g10/pkclist.c:277 #, c-format msgid " %d = I trust fully\n" msgstr " %d = 我完全相信\n" -#: g10/keyedit.c:437 +#: g10/keyedit.c:439 msgid "" "Please enter the depth of this trust signature.\n" "A depth greater than 1 allows the key you are signing to make\n" @@ -2687,45 +2796,52 @@ msgstr "" "请输入这份信任签名的深度。\n" "深度若大于 1 则您将签名的这把密钥将可以以您的名义做出信任签名。\n" -#: g10/keyedit.c:453 +#: g10/keyedit.c:455 msgid "Please enter a domain to restrict this signature, or enter for none.\n" msgstr "请输入这份签名的限制域，如果没有请按回车。\n" -#: g10/keyedit.c:598 +#: g10/keyedit.c:600 #, c-format msgid "User ID \"%s\" is revoked." msgstr "用户标识“%s”已被吊销。" -#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828 -#: g10/keyedit.c:888 g10/keyedit.c:1738 +#: g10/keyedit.c:609 +#: g10/keyedit.c:637 +#: g10/keyedit.c:664 +#: g10/keyedit.c:830 +#: g10/keyedit.c:890 +#: g10/keyedit.c:1736 msgid "Are you sure you still want to sign it? (y/N) " msgstr "您仍然想要为它签名吗？(y/N)" -#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834 -#: g10/keyedit.c:1744 +#: g10/keyedit.c:623 +#: g10/keyedit.c:651 +#: g10/keyedit.c:678 +#: g10/keyedit.c:836 +#: g10/keyedit.c:1742 msgid " Unable to sign.\n" msgstr " 无法添加签名。\n" -#: g10/keyedit.c:626 +#: g10/keyedit.c:628 #, c-format msgid "User ID \"%s\" is expired." msgstr "用户标识“%s”已过期。" -#: g10/keyedit.c:654 +#: g10/keyedit.c:656 #, c-format msgid "User ID \"%s\" is not self-signed." msgstr "警告：用户标识“%s”不含自身签名。" -#: g10/keyedit.c:682 +#: g10/keyedit.c:684 #, c-format msgid "User ID \"%s\" is signable. " msgstr "可以为用户标识“%s”添加签名。" -#: g10/keyedit.c:684 +#: g10/keyedit.c:686 msgid "Sign it? (y/N) " msgstr "为其添加签名吗？(y/N)" -#: g10/keyedit.c:706 +#: g10/keyedit.c:708 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2734,108 +2850,105 @@ msgstr "" "“%s”的自身签名是 PGP 2.x 样\n" "式的签名。\n" -#: g10/keyedit.c:715 +#: g10/keyedit.c:717 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "您是否想要将它升级成 OpenPGP 的自身签名？(y/N)" -#: g10/keyedit.c:729 +#: g10/keyedit.c:731 #, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "您目前为“%s”的签名已经过期了。\n" -#: g10/keyedit.c:733 +#: g10/keyedit.c:735 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "您想要发布一份新的签名来取代已过期的那一个吗？(y/N)" -#: g10/keyedit.c:754 +#: g10/keyedit.c:756 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "您目前为“%s”的签名是一份本地签名。\n" -#: g10/keyedit.c:758 +#: g10/keyedit.c:760 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "您是否想要把它升级成可以完全导出的签名？(y/N)" -#: g10/keyedit.c:779 +#: g10/keyedit.c:781 #, c-format msgid "\"%s\" was already locally signed by key %s\n" msgstr "“%s”已由密钥 %s 在本地签名\n" -#: g10/keyedit.c:782 +#: g10/keyedit.c:784 #, c-format msgid "\"%s\" was already signed by key %s\n" msgstr "“%s”已由密钥 %s 签名\n" -#: g10/keyedit.c:787 +#: g10/keyedit.c:789 msgid "Do you want to sign it again anyway? (y/N) " msgstr "您仍然想要为它再次签名吗？(y/N)" -#: g10/keyedit.c:809 +#: g10/keyedit.c:811 #, c-format msgid "Nothing to sign with key %s\n" msgstr "没有东西可以让密钥 %s 签名\n" -#: g10/keyedit.c:822 +#: g10/keyedit.c:824 msgid "This key has expired!" msgstr "这把密钥已经过期！" -#: g10/keyedit.c:840 +#: g10/keyedit.c:842 #, c-format msgid "This key is due to expire on %s.\n" msgstr "这把密钥将在 %s 过期。\n" -#: g10/keyedit.c:846 +#: g10/keyedit.c:848 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "您想要让您的签名也同时过期吗？ (Y/n) " -#: g10/keyedit.c:881 -msgid "" -"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " -"mode.\n" +#: g10/keyedit.c:883 +msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n" msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签名。\n" -#: g10/keyedit.c:883 +#: g10/keyedit.c:885 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n" -#: g10/keyedit.c:908 +#: g10/keyedit.c:910 msgid "" -"How carefully have you verified the key you are about to sign actually " -"belongs\n" +"How carefully have you verified the key you are about to sign actually belongs\n" "to the person named above? If you don't know what to answer, enter \"0\".\n" msgstr "" "您是否谨慎地检查过，确认正要签名的密钥的确属于以上它所声称的所有者呢？\n" "如果您不知道这个问题的答案，请输入“0”。\n" -#: g10/keyedit.c:913 +#: g10/keyedit.c:915 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) 我不作答。 %s\n" -#: g10/keyedit.c:915 +#: g10/keyedit.c:917 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) 我根本没有检查过。 %s\n" -#: g10/keyedit.c:917 +#: g10/keyedit.c:919 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) 我随意检查过。 %s\n" -#: g10/keyedit.c:919 +#: g10/keyedit.c:921 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) 我非常小心地检查过。 %s\n" -#: g10/keyedit.c:925 +#: g10/keyedit.c:927 msgid "Your selection? (enter `?' for more information): " msgstr "您的选择？(输入‘?’以获得更多的信息)：" -#: g10/keyedit.c:949 +#: g10/keyedit.c:951 #, c-format msgid "" "Are you sure that you want to sign this key with your\n" @@ -2844,74 +2957,83 @@ msgstr "" "您真的确定要签名这把密钥，使用您的密钥\n" "“%s”(%s)\n" -#: g10/keyedit.c:956 +#: g10/keyedit.c:958 msgid "This will be a self-signature.\n" msgstr "这将是一个自身签名。\n" -#: g10/keyedit.c:962 +#: g10/keyedit.c:964 msgid "WARNING: the signature will not be marked as non-exportable.\n" msgstr "警告：这份签名不会被标记为不可导出。\n" -#: g10/keyedit.c:970 +#: g10/keyedit.c:972 msgid "WARNING: the signature will not be marked as non-revocable.\n" msgstr "警告：这份签名不会被标记成不可吊销。\n" -#: g10/keyedit.c:980 +#: g10/keyedit.c:982 msgid "The signature will be marked as non-exportable.\n" msgstr "这份签名会被标记成不可导出。\n" -#: g10/keyedit.c:987 +#: g10/keyedit.c:989 msgid "The signature will be marked as non-revocable.\n" msgstr "这份签名会被标记成不可吊销。\n" -#: g10/keyedit.c:994 +#: g10/keyedit.c:996 msgid "I have not checked this key at all.\n" msgstr "我根本没有检查过这把密钥。\n" -#: g10/keyedit.c:999 +#: g10/keyedit.c:1001 msgid "I have checked this key casually.\n" msgstr "我随意检查过这把密钥。\n" -#: g10/keyedit.c:1004 +#: g10/keyedit.c:1006 msgid "I have checked this key very carefully.\n" msgstr "我非常小心地检查过这把密钥。\n" -#: g10/keyedit.c:1014 +#: g10/keyedit.c:1016 msgid "Really sign? (y/N) " msgstr "真的要签名吗？(y/N)" -#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950 -#: g10/keyedit.c:5011 g10/sign.c:317 +#: g10/keyedit.c:1061 +#: g10/keyedit.c:4793 +#: g10/keyedit.c:4884 +#: g10/keyedit.c:4948 +#: g10/keyedit.c:5009 +#: g10/sign.c:351 #, c-format msgid "signing failed: %s\n" msgstr "签名时失败： %s\n" -#: g10/keyedit.c:1124 +#: g10/keyedit.c:1126 msgid "Key has only stub or on-card key items - no passphrase to change.\n" -msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n" +msgstr "只有占位密钥，或者密钥存储在智能卡上——没有密码可以更改。\n" -#: g10/keyedit.c:1135 g10/keygen.c:3213 +#: g10/keyedit.c:1137 +#: g10/keygen.c:3215 msgid "This key is not protected.\n" msgstr "这把密钥没有被保护。\n" -#: g10/keyedit.c:1139 g10/keygen.c:3201 g10/revoke.c:537 +#: g10/keyedit.c:1141 +#: g10/keygen.c:3203 +#: g10/revoke.c:539 msgid "Secret parts of primary key are not available.\n" msgstr "主钥的私钥部分无法取用。\n" -#: g10/keyedit.c:1143 g10/keygen.c:3216 +#: g10/keyedit.c:1145 +#: g10/keygen.c:3218 msgid "Secret parts of primary key are stored on-card.\n" -msgstr "主钥的私钥部分存储在卡上。\n" +msgstr "主钥的私钥部分存储在智能卡上。\n" -#: g10/keyedit.c:1147 g10/keygen.c:3220 +#: g10/keyedit.c:1149 +#: g10/keygen.c:3222 msgid "Key is protected.\n" msgstr "密钥受保护。\n" -#: g10/keyedit.c:1171 +#: g10/keyedit.c:1173 #, c-format msgid "Can't edit this key: %s\n" msgstr "无法编辑这把密钥： %s\n" -#: g10/keyedit.c:1177 +#: g10/keyedit.c:1179 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2919,11 +3041,12 @@ msgstr "" "输入要给这把私钥用的新密码。\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1893 +#: g10/keyedit.c:1188 +#: g10/keygen.c:1895 msgid "passphrase not correctly repeated; try again" msgstr "密码再次输入时与首次输入不符；请再试一次" -#: g10/keyedit.c:1191 +#: g10/keyedit.c:1193 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2931,187 +3054,186 @@ msgstr "" "您不想要用密码――这大概是个坏主意！\n" "\n" -#: g10/keyedit.c:1194 +#: g10/keyedit.c:1196 msgid "Do you really want to do this? (y/N) " msgstr "您真的想要这么做吗？(y/N)" -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1267 msgid "moving a key signature to the correct place\n" msgstr "正在把密钥的签名移动到正确的位置去\n" -#: g10/keyedit.c:1351 +#: g10/keyedit.c:1353 msgid "save and quit" msgstr "保存并离开" -#: g10/keyedit.c:1354 +#: g10/keyedit.c:1356 msgid "show key fingerprint" msgstr "显示密钥指纹" -#: g10/keyedit.c:1355 +#: g10/keyedit.c:1357 msgid "list key and user IDs" msgstr "列出密钥和用户标识" -#: g10/keyedit.c:1357 +#: g10/keyedit.c:1359 msgid "select user ID N" msgstr "选择用户标识 N" -#: g10/keyedit.c:1358 +#: g10/keyedit.c:1360 msgid "select subkey N" msgstr "选择子钥 N" -#: g10/keyedit.c:1359 +#: g10/keyedit.c:1361 msgid "check signatures" msgstr "检查签名" -#: g10/keyedit.c:1364 +#: g10/keyedit.c:1366 msgid "sign selected user IDs [* see below for related commands]" msgstr "为所选用户标识添加签名[* 参见下面的相关命令]" -#: g10/keyedit.c:1369 +#: g10/keyedit.c:1371 msgid "sign selected user IDs locally" msgstr "为所选用户标识添加本地签名" -#: g10/keyedit.c:1371 +#: g10/keyedit.c:1373 msgid "sign selected user IDs with a trust signature" msgstr "为所选用户标识添加信任签名" -#: g10/keyedit.c:1373 +#: g10/keyedit.c:1375 msgid "sign selected user IDs with a non-revocable signature" msgstr "为所选用户标识添加不可吊销签名" -#: g10/keyedit.c:1377 +#: g10/keyedit.c:1379 msgid "add a user ID" msgstr "增加一个用户标识" -#: g10/keyedit.c:1379 +#: g10/keyedit.c:1381 msgid "add a photo ID" msgstr "增加一个照片标识" -#: g10/keyedit.c:1381 +#: g10/keyedit.c:1383 msgid "delete selected user IDs" msgstr "删除选定的用户标识" -#: g10/keyedit.c:1386 +#: g10/keyedit.c:1388 msgid "add a subkey" msgstr "添加一个子钥" -#: g10/keyedit.c:1390 +#: g10/keyedit.c:1392 msgid "add a key to a smartcard" msgstr "在智能卡上添加一把密钥" -#: g10/keyedit.c:1392 +#: g10/keyedit.c:1394 msgid "move a key to a smartcard" msgstr "将一把密钥移动到智能卡上" -#: g10/keyedit.c:1394 +#: g10/keyedit.c:1396 msgid "move a backup key to a smartcard" -msgstr "将备份密钥转移到卡上" +msgstr "将备份密钥转移到智能卡上" -#: g10/keyedit.c:1398 +#: g10/keyedit.c:1400 msgid "delete selected subkeys" msgstr "删除选定的子钥" -#: g10/keyedit.c:1400 +#: g10/keyedit.c:1402 msgid "add a revocation key" msgstr "增加一把吊销密钥" -#: g10/keyedit.c:1402 +#: g10/keyedit.c:1404 msgid "delete signatures from the selected user IDs" msgstr "删除所选用户标识上的签名" -#: g10/keyedit.c:1404 +#: g10/keyedit.c:1406 msgid "change the expiration date for the key or selected subkeys" msgstr "变更密钥或所选子钥的使用期限" -#: g10/keyedit.c:1406 +#: g10/keyedit.c:1408 msgid "flag the selected user ID as primary" msgstr "将所选的用户标识设为首选用户标识" -#: g10/keyedit.c:1408 +#: g10/keyedit.c:1410 msgid "toggle between the secret and public key listings" msgstr "在私钥和公钥清单间切换" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1413 msgid "list preferences (expert)" msgstr "列出首选项(专家模式)" -#: g10/keyedit.c:1413 +#: g10/keyedit.c:1415 msgid "list preferences (verbose)" msgstr "列出首选项(详细模式)" -#: g10/keyedit.c:1415 +#: g10/keyedit.c:1417 msgid "set preference list for the selected user IDs" msgstr "设定所选用户标识的首选项" -#: g10/keyedit.c:1420 +#: g10/keyedit.c:1422 msgid "set the preferred keyserver URL for the selected user IDs" msgstr "设定所选用户标识的首选公钥服务器的 URL" -#: g10/keyedit.c:1422 +#: g10/keyedit.c:1424 msgid "set a notation for the selected user IDs" msgstr "为所选用户标识的设定注记" -#: g10/keyedit.c:1424 +#: g10/keyedit.c:1426 msgid "change the passphrase" msgstr "更改密码" -#: g10/keyedit.c:1428 +#: g10/keyedit.c:1430 msgid "change the ownertrust" msgstr "更改信任度" -#: g10/keyedit.c:1430 +#: g10/keyedit.c:1432 msgid "revoke signatures on the selected user IDs" msgstr "吊销所选用户标识上的签名" -#: g10/keyedit.c:1432 +#: g10/keyedit.c:1434 msgid "revoke selected user IDs" msgstr "吊销选定的用户标识" -#: g10/keyedit.c:1437 +#: g10/keyedit.c:1439 msgid "revoke key or selected subkeys" msgstr "吊销密钥或选定的子钥" -#: g10/keyedit.c:1438 +#: g10/keyedit.c:1440 msgid "enable key" msgstr "启用密钥" -#: g10/keyedit.c:1439 +#: g10/keyedit.c:1441 msgid "disable key" msgstr "禁用密钥" -#: g10/keyedit.c:1440 +#: g10/keyedit.c:1442 msgid "show selected photo IDs" msgstr "显示选定的照片标识" -#: g10/keyedit.c:1442 +#: g10/keyedit.c:1444 msgid "compact unusable user IDs and remove unusable signatures from key" msgstr "压缩不可用的用户标识并删除不可用的签名" -#: g10/keyedit.c:1444 +#: g10/keyedit.c:1446 msgid "compact unusable user IDs and remove all signatures from key" msgstr "压缩不可用的用户标识并删除所有签名" -#: g10/keyedit.c:1566 +#: g10/keyedit.c:1564 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "读取私钥区块“%s”时出错：%s\n" -#: g10/keyedit.c:1584 +#: g10/keyedit.c:1582 msgid "Secret key is available.\n" msgstr "私钥可用。\n" -#: g10/keyedit.c:1665 +#: g10/keyedit.c:1663 msgid "Need the secret key to do this.\n" msgstr "要有私钥才能这么做。\n" -#: g10/keyedit.c:1673 +#: g10/keyedit.c:1671 msgid "Please use the command \"toggle\" first.\n" msgstr "请先使用“toggle”指令。\n" -#: g10/keyedit.c:1692 +#: g10/keyedit.c:1690 msgid "" -"* The `sign' command may be prefixed with an `l' for local signatures " -"(lsign),\n" +"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n" " a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n" " (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n" msgstr "" @@ -3119,683 +3241,726 @@ msgstr "" " 信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n" " 合(ltsign、tnrsign 等)。\n" -#: g10/keyedit.c:1732 +#: g10/keyedit.c:1730 msgid "Key is revoked." msgstr "密钥已被吊销。" -#: g10/keyedit.c:1751 +#: g10/keyedit.c:1749 msgid "Really sign all user IDs? (y/N) " msgstr "真的为所有的用户标识签名吗？(y/N)" -#: g10/keyedit.c:1758 +#: g10/keyedit.c:1756 msgid "Hint: Select the user IDs to sign\n" msgstr "提示：选择要添加签名的用户标识\n" -#: g10/keyedit.c:1767 +#: g10/keyedit.c:1765 #, c-format msgid "Unknown signature type `%s'\n" msgstr "未知的签名类型‘%s’\n" -#: g10/keyedit.c:1790 +#: g10/keyedit.c:1788 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "在 %s 模式中不允许使用这个指令。\n" -#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998 +#: g10/keyedit.c:1810 +#: g10/keyedit.c:1830 +#: g10/keyedit.c:1996 msgid "You must select at least one user ID.\n" msgstr "您至少得选择一个用户标识。\n" -#: g10/keyedit.c:1814 +#: g10/keyedit.c:1812 msgid "You can't delete the last user ID!\n" msgstr "您不能删除最后一个用户标识！\n" -#: g10/keyedit.c:1816 +#: g10/keyedit.c:1814 msgid "Really remove all selected user IDs? (y/N) " msgstr "真的要删除所有选定的用户标识吗？(y/N)" -#: g10/keyedit.c:1817 +#: g10/keyedit.c:1815 msgid "Really remove this user ID? (y/N) " msgstr "真的要删除这个用户标识吗？(y/N)" -#: g10/keyedit.c:1867 +#: g10/keyedit.c:1865 msgid "Really move the primary key? (y/N) " msgstr "真的要删除主钥吗？(y/N)" -#: g10/keyedit.c:1879 +#: g10/keyedit.c:1877 msgid "You must select exactly one key.\n" msgstr "您必须指定一把密钥。\n" -#: g10/keyedit.c:1907 +#: g10/keyedit.c:1905 msgid "Command expects a filename argument\n" msgstr "命令需要一个文件名作为参数\n" -#: g10/keyedit.c:1921 +#: g10/keyedit.c:1919 #, c-format msgid "Can't open `%s': %s\n" msgstr "无法打开‘%s’：%s\n" -#: g10/keyedit.c:1938 +#: g10/keyedit.c:1936 #, c-format msgid "Error reading backup key from `%s': %s\n" msgstr "从‘%s’读取备份密钥时出错：%s\n" -#: g10/keyedit.c:1962 +#: g10/keyedit.c:1960 msgid "You must select at least one key.\n" msgstr "您必须选择至少一把密钥。\n" -#: g10/keyedit.c:1965 +#: g10/keyedit.c:1963 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "您真的想要删除选定的密钥吗？(y/N)" -#: g10/keyedit.c:1966 +#: g10/keyedit.c:1964 msgid "Do you really want to delete this key? (y/N) " msgstr "您真的要删除这把密钥吗？(y/N)" -#: g10/keyedit.c:2001 +#: g10/keyedit.c:1999 msgid "Really revoke all selected user IDs? (y/N) " msgstr "真的要吊销所有选定的用户标识吗？(y/N)" -#: g10/keyedit.c:2002 +#: g10/keyedit.c:2000 msgid "Really revoke this user ID? (y/N) " msgstr "真的要吊销这个用户标识吗？(y/N)" -#: g10/keyedit.c:2020 +#: g10/keyedit.c:2018 msgid "Do you really want to revoke the entire key? (y/N) " msgstr "您真的要吊销整把密钥吗？(y/N)" -#: g10/keyedit.c:2031 +#: g10/keyedit.c:2029 msgid "Do you really want to revoke the selected subkeys? (y/N) " msgstr "您真的要吊销选定的子钥吗？(y/N)" -#: g10/keyedit.c:2033 +#: g10/keyedit.c:2031 msgid "Do you really want to revoke this subkey? (y/N) " msgstr "您真的要吊销这把子钥吗？(y/N)" -#: g10/keyedit.c:2083 -msgid "Owner trust may not be set while using a user provided trust database\n" +#: g10/keyedit.c:2081 +msgid "Owner trust may not be set while using an user provided trust database\n" msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n" -#: g10/keyedit.c:2125 +#: g10/keyedit.c:2123 msgid "Set preference list to:\n" msgstr "设为首选项列表为：\n" -#: g10/keyedit.c:2131 +#: g10/keyedit.c:2129 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "真的要更新所选用户标识的首选项吗？(y/N)" -#: g10/keyedit.c:2133 +#: g10/keyedit.c:2131 msgid "Really update the preferences? (y/N) " msgstr "真的要更新首选项吗？(y/N)" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2199 msgid "Save changes? (y/N) " msgstr "要保存变动吗？(y/N)" -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2202 msgid "Quit without saving? (y/N) " msgstr "要不保存而离开吗？(y/N)" -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2212 #, c-format msgid "update failed: %s\n" msgstr "更新失败：%s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2219 #, c-format msgid "update secret failed: %s\n" msgstr "更新私钥失败：%s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2226 msgid "Key not changed so no update needed.\n" msgstr "密钥没有变动所以不需要更新。\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2327 msgid "Digest: " msgstr "散列：" -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2379 msgid "Features: " msgstr "特点：" -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2390 msgid "Keyserver no-modify" msgstr "公钥服务器不可变造" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2405 +#: g10/keylist.c:308 msgid "Preferred keyserver: " msgstr "首选公钥服务器：" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2413 +#: g10/keyedit.c:2414 msgid "Notations: " msgstr "注记：" -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2624 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x 样式的用户标识没有首选项。\n" -#: g10/keyedit.c:2685 +#: g10/keyedit.c:2683 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n" -#: g10/keyedit.c:2706 +#: g10/keyedit.c:2704 #, c-format msgid "This key may be revoked by %s key %s" msgstr "这把密钥可被 %s 密钥 %s 吊销" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2710 msgid "(sensitive)" msgstr " (敏感的)" -#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860 -#: g10/keylist.c:192 g10/keyserver.c:517 +#: g10/keyedit.c:2726 +#: g10/keyedit.c:2782 +#: g10/keyedit.c:2843 +#: g10/keyedit.c:2858 +#: g10/keylist.c:194 +#: g10/keyserver.c:511 #, c-format msgid "created: %s" msgstr "创建于：%s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:990 +#: g10/keyedit.c:2729 +#: g10/keylist.c:771 +#: g10/keylist.c:865 +#: g10/mainproc.c:986 #, c-format msgid "revoked: %s" msgstr "已吊销：%s" -#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869 +#: g10/keyedit.c:2731 +#: g10/keylist.c:742 +#: g10/keylist.c:777 +#: g10/keylist.c:871 #, c-format msgid "expired: %s" msgstr "已过期：%s" -#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 -#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875 -#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:996 +#: g10/keyedit.c:2733 +#: g10/keyedit.c:2784 +#: g10/keyedit.c:2845 +#: g10/keyedit.c:2860 +#: g10/keylist.c:196 +#: g10/keylist.c:748 +#: g10/keylist.c:783 +#: g10/keylist.c:877 +#: g10/keylist.c:898 +#: g10/keyserver.c:517 +#: g10/mainproc.c:992 #, c-format msgid "expires: %s" msgstr "有效至：%s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2735 #, c-format msgid "usage: %s" msgstr "可用于：%s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2750 #, c-format msgid "trust: %s" msgstr "信任度：%s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2754 #, c-format msgid "validity: %s" msgstr "有效性：%s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2761 msgid "This key has been disabled" msgstr "这把密钥已经被禁用" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2789 +#: g10/keylist.c:200 msgid "card-no: " msgstr "卡号：" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2813 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n" -#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527 -#: g10/mainproc.c:1808 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2877 +#: g10/keyedit.c:3223 +#: g10/keyserver.c:521 +#: g10/mainproc.c:1804 +#: g10/trustdb.c:1179 +#: g10/trustdb.c:1699 msgid "revoked" msgstr "已吊销" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1810 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2879 +#: g10/keyedit.c:3225 +#: g10/keyserver.c:525 +#: g10/mainproc.c:1806 +#: g10/trustdb.c:532 +#: g10/trustdb.c:1701 msgid "expired" msgstr "已过期" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2944 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" -msgstr "" -"警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n" +msgstr "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3005 msgid "" -"WARNING: This is a PGP2-style key. Adding a photo ID may cause some " -"versions\n" +"WARNING: This is a PGP2-style key. Adding a photo ID may cause some versions\n" " of PGP to reject this key.\n" msgstr "" "警告：这是一把 PGP2 样式的密钥。\n" " 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3010 +#: g10/keyedit.c:3345 msgid "Are you sure you still want to add it? (y/N) " msgstr "您确定仍然想要增加吗？(y/N)" -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3016 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3156 msgid "Delete this good signature? (y/N/q)" msgstr "删除这个完好的签名吗？(y/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3166 msgid "Delete this invalid signature? (y/N/q)" msgstr "删除这个无效的签名吗？(y/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3170 msgid "Delete this unknown signature? (y/N/q)" msgstr "删除这个未知的签名吗？(y/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3176 msgid "Really delete this self-signature? (y/N)" msgstr "真的要删除这个自身签名吗？(y/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3190 #, c-format msgid "Deleted %d signature.\n" msgstr "已经删除了 %d 个签名。\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3191 #, c-format msgid "Deleted %d signatures.\n" msgstr "已经删除了 %d 个签名。\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3194 msgid "Nothing deleted.\n" msgstr "没有东西被删除。\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3227 +#: g10/trustdb.c:1703 msgid "invalid" msgstr "无效" -#: g10/keyedit.c:3231 -#, fuzzy, c-format +#: g10/keyedit.c:3229 +#, c-format msgid "User ID \"%s\" compacted: %s\n" -msgstr "用户标识“%s”：无用部分已清除\n" +msgstr "用户标识“%s”无用部分被清除：%s\n" -#: g10/keyedit.c:3238 -#, fuzzy, c-format +#: g10/keyedit.c:3236 +#, c-format msgid "User ID \"%s\": %d signature removed\n" -msgstr "密钥 %s：“%s”%d 个签名被清除\n" +msgstr "用户标识“%s”：%d 个签名被清除\n" -#: g10/keyedit.c:3239 -#, fuzzy, c-format +#: g10/keyedit.c:3237 +#, c-format msgid "User ID \"%s\": %d signatures removed\n" -msgstr "密钥 %s：“%s”%d 个签名被清除\n" +msgstr "用户标识“%s”：%d 个签名被清除\n" -#: g10/keyedit.c:3247 -#, fuzzy, c-format +#: g10/keyedit.c:3245 +#, c-format msgid "User ID \"%s\": already minimized\n" -msgstr "用户标识“%s”：无用部分已清除\n" +msgstr "用户标识“%s”：已经最小化\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3246 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "用户标识“%s”：无用部分已清除\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3340 msgid "" -"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " -"cause\n" +"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may cause\n" " some versions of PGP to reject this key.\n" msgstr "" "警告：这是一把 PGP2 样式的密钥。\n" " 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3351 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n" -#: g10/keyedit.c:3373 +#: g10/keyedit.c:3371 msgid "Enter the user ID of the designated revoker: " msgstr "输入指定吊销者的用户标识：" -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3396 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n" # This actually causes no harm (after all, a key that # designates itself as a revoker is the same as a # regular key), but it's easy enough to check. -#: g10/keyedit.c:3413 +#: g10/keyedit.c:3411 msgid "you cannot appoint a key as its own designated revoker\n" msgstr "您不能将某把密钥设为它自己的指定吊销者\n" # This actually causes no harm (after all, a key that # designates itself as a revoker is the same as a # regular key), but it's easy enough to check. -#: g10/keyedit.c:3435 +#: g10/keyedit.c:3433 msgid "this key has already been designated as a revoker\n" msgstr "这把密钥已被指定为一个吊销者\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3452 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n" -#: g10/keyedit.c:3460 -msgid "" -"Are you sure you want to appoint this key as a designated revoker? (y/N) " +#: g10/keyedit.c:3458 +msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)：" -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3520 msgid "Please remove selections from the secret keys.\n" msgstr "请从私钥中删除选择。\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3526 msgid "Please select at most one subkey.\n" msgstr "请至多选择一个子钥。\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3530 msgid "Changing expiration time for a subkey.\n" msgstr "将要变更子钥的使用期限。\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3533 msgid "Changing expiration time for the primary key.\n" msgstr "将要变更主钥的使用期限。\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3582 msgid "You can't change the expiration date of a v3 key\n" msgstr "您不能变更 v3 密钥的使用期限\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3598 msgid "No corresponding signature in secret ring\n" msgstr "在私钥环里没有相应的签名\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3678 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "签名的子钥 %s 已经交叉验证\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3684 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "子钥 %s 不签名，因此不需要交叉验证\n" -#: g10/keyedit.c:3848 +#: g10/keyedit.c:3846 msgid "Please select exactly one user ID.\n" msgstr "请精确地选择一个用户标识。\n" -#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258 +#: g10/keyedit.c:3885 +#: g10/keyedit.c:3995 +#: g10/keyedit.c:4115 +#: g10/keyedit.c:4256 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "跳过用户标识“%s”的 v3 自身签名\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4056 msgid "Enter your preferred keyserver URL: " msgstr "输入您首选的公钥服务器的 URL：" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4136 msgid "Are you sure you want to replace it? (y/N) " msgstr "您确定要替换它吗？(y/N)" -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4137 msgid "Are you sure you want to delete it? (y/N) " msgstr "您确定要删除它吗？(y/N)" -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4199 msgid "Enter the notation: " msgstr "输入注记：" -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4348 msgid "Proceed? (y/N) " msgstr "继续？(y/N)" -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4412 #, c-format msgid "No user ID with index %d\n" msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4470 #, c-format msgid "No user ID with hash %s\n" msgstr "没有散列值为 %s 的用户标识\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4497 #, c-format msgid "No subkey with index %d\n" msgstr "没有索引为 %d 的子钥\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4632 #, c-format msgid "user ID: \"%s\"\n" msgstr "用户标识：“%s”\n" -#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744 +#: g10/keyedit.c:4635 +#: g10/keyedit.c:4699 +#: g10/keyedit.c:4742 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "由您的密钥 %s 于 %s%s%s 签名\n" -#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746 +#: g10/keyedit.c:4637 +#: g10/keyedit.c:4701 +#: g10/keyedit.c:4744 msgid " (non-exportable)" msgstr " (不可导出)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4641 #, c-format msgid "This signature expired on %s.\n" msgstr "这份签名已在 %s 过期。\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4645 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "您确定您仍然想要吊销它吗？(y/N)" -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4649 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "要为这份签名生成一份吊销证书吗？(y/N)" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4676 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4702 msgid " (non-revocable)" msgstr " (不可吊销)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4709 #, c-format msgid "revoked by your key %s on %s\n" msgstr "由您的密钥 %s 于 %s 吊销\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4731 msgid "You are about to revoke these signatures:\n" msgstr "您正在吊销这些签名：\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4751 msgid "Really create the revocation certificates? (y/N) " msgstr "真的要生成吊销证书吗？(y/N)" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4781 msgid "no secret key\n" msgstr "没有私钥\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4851 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "用户标识“%s”已经被吊销。\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4868 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n" -#: g10/keyedit.c:4934 +#: g10/keyedit.c:4932 #, c-format msgid "Key %s is already revoked.\n" msgstr "密钥 %s 已被吊销。\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:4994 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "子钥 %s 已被吊销。\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5089 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n" -#: g10/keygen.c:263 +#: g10/keygen.c:265 #, c-format msgid "preference `%s' duplicated\n" msgstr "首选项‘%s’重复\n" -#: g10/keygen.c:270 +#: g10/keygen.c:272 msgid "too many cipher preferences\n" msgstr "太多对称加密算法首选项\n" -#: g10/keygen.c:272 +#: g10/keygen.c:274 msgid "too many digest preferences\n" msgstr "太多散列算法首选项\n" -#: g10/keygen.c:274 +#: g10/keygen.c:276 msgid "too many compression preferences\n" msgstr "太多首选压缩算法\n" -#: g10/keygen.c:399 +#: g10/keygen.c:401 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "首选项字符串里有无效项‘%s’\n" -#: g10/keygen.c:874 +#: g10/keygen.c:876 msgid "writing direct signature\n" msgstr "正在写入直接签名\n" -#: g10/keygen.c:913 +#: g10/keygen.c:915 msgid "writing self signature\n" msgstr "正在写入自身签名\n" -#: g10/keygen.c:963 +#: g10/keygen.c:965 msgid "writing key binding signature\n" msgstr "正在写入密钥绑定签名\n" -#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231 -#: g10/keygen.c:2774 +#: g10/keygen.c:1028 +#: g10/keygen.c:1111 +#: g10/keygen.c:1116 +#: g10/keygen.c:1233 +#: g10/keygen.c:2776 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "密钥尺寸无效：改用 %u 位\n" -#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2780 +#: g10/keygen.c:1033 +#: g10/keygen.c:1122 +#: g10/keygen.c:1238 +#: g10/keygen.c:2782 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "密钥尺寸舍入到 %u 位\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1331 msgid "Sign" msgstr "签名" -#: g10/keygen.c:1332 +#: g10/keygen.c:1334 msgid "Certify" msgstr "验证" -#: g10/keygen.c:1335 +#: g10/keygen.c:1337 msgid "Encrypt" msgstr "加密" -#: g10/keygen.c:1338 +#: g10/keygen.c:1340 msgid "Authenticate" msgstr "认证" -#: g10/keygen.c:1346 +#: g10/keygen.c:1348 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1365 +#: g10/keygen.c:1367 #, c-format msgid "Possible actions for a %s key: " msgstr "%s 密钥可能的操作：" -#: g10/keygen.c:1369 +#: g10/keygen.c:1371 msgid "Current allowed actions: " msgstr "目前允许的操作：" -#: g10/keygen.c:1374 +#: g10/keygen.c:1376 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) 选择是否用于签名\n" -#: g10/keygen.c:1377 +#: g10/keygen.c:1379 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) 选择是否用于加密\n" -#: g10/keygen.c:1380 +#: g10/keygen.c:1382 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) 选择是否用于认证\n" -#: g10/keygen.c:1383 +#: g10/keygen.c:1385 #, c-format msgid " (%c) Finished\n" msgstr " (%c) 已完成\n" -#: g10/keygen.c:1439 +#: g10/keygen.c:1441 msgid "Please select what kind of key you want:\n" msgstr "请选择您要使用的密钥种类：\n" -#: g10/keygen.c:1441 +#: g10/keygen.c:1443 #, c-format msgid " (%d) DSA and Elgamal (default)\n" msgstr " (%d) DSA 和 ElGamal (默认)\n" -#: g10/keygen.c:1442 +#: g10/keygen.c:1444 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (仅用于签名)\n" -#: g10/keygen.c:1444 +#: g10/keygen.c:1446 #, c-format msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) DSA (自定义用途)\n" -#: g10/keygen.c:1446 +#: g10/keygen.c:1448 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (仅用于加密)\n" -#: g10/keygen.c:1447 +#: g10/keygen.c:1449 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (仅用于签名)\n" -#: g10/keygen.c:1449 +#: g10/keygen.c:1451 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (仅用于加密)\n" -#: g10/keygen.c:1451 +#: g10/keygen.c:1453 #, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (自定义用途)\n" -#: g10/keygen.c:1520 +#: g10/keygen.c:1522 #, c-format msgid "DSA keypair will have %u bits.\n" msgstr "DSA 密钥对会有 %u 位。\n" -#: g10/keygen.c:1530 +#: g10/keygen.c:1532 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n" -#: g10/keygen.c:1537 +#: g10/keygen.c:1539 #, c-format msgid "What keysize do you want? (%u) " msgstr "您想要用多大的密钥尺寸？(%u)" -#: g10/keygen.c:1551 +#: g10/keygen.c:1553 #, c-format msgid "%s keysizes must be in the range %u-%u\n" msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n" -#: g10/keygen.c:1557 +#: g10/keygen.c:1559 #, c-format msgid "Requested keysize is %u bits\n" msgstr "您所要求的密钥尺寸是 %u 位\n" -#: g10/keygen.c:1562 g10/keygen.c:1567 +#: g10/keygen.c:1564 +#: g10/keygen.c:1569 #, c-format msgid "rounded up to %u bits\n" msgstr "舍入到 %u 位\n" -#: g10/keygen.c:1616 +#: g10/keygen.c:1618 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3811,7 +3976,7 @@ msgstr "" " m = 密钥在 n 月后过期\n" " y = 密钥在 n 年后过期\n" -#: g10/keygen.c:1627 +#: g10/keygen.c:1629 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3827,38 +3992,38 @@ msgstr "" " m = 签名在 n 月后过期\n" " y = 签名在 n 年后过期\n" -#: g10/keygen.c:1648 +#: g10/keygen.c:1650 msgid "Key is valid for? (0) " msgstr "密钥的有效期限是？(0) " -#: g10/keygen.c:1653 +#: g10/keygen.c:1655 #, c-format msgid "Signature is valid for? (%s) " msgstr "签名的有效期限是多久？(%s) " -#: g10/keygen.c:1671 +#: g10/keygen.c:1673 msgid "invalid value\n" msgstr "无效的数值\n" -#: g10/keygen.c:1678 +#: g10/keygen.c:1680 msgid "Key does not expire at all\n" msgstr "密钥永远不会过期\n" -#: g10/keygen.c:1679 +#: g10/keygen.c:1681 msgid "Signature does not expire at all\n" msgstr "签名永远不会过期\n" -#: g10/keygen.c:1684 +#: g10/keygen.c:1686 #, c-format msgid "Key expires at %s\n" msgstr "密钥于 %s 过期\n" -#: g10/keygen.c:1685 +#: g10/keygen.c:1687 #, c-format msgid "Signature expires at %s\n" msgstr "签名于 %s 过期\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1693 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3866,64 +4031,62 @@ msgstr "" "您的系统无法显示 2038 年以后的日期。\n" "不过，它可以正确处理 2106 年之前的年份。\n" -#: g10/keygen.c:1696 +#: g10/keygen.c:1698 msgid "Is this correct? (y/N) " msgstr "以上正确吗？(y/n)" -#: g10/keygen.c:1711 +#: g10/keygen.c:1713 msgid "" "\n" -"You need a user ID to identify your key; the software constructs the user " -"ID\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) \"\n" "\n" msgstr "" "\n" -"您需要一个用户标识来辨识您的密钥；本软件会用真实姓名、注释和电子邮件地址组" -"合\n" +"您需要一个用户标识来辨识您的密钥；本软件会用真实姓名、注释和电子邮件地址组合\n" "成用户标识，如下所示：\n" " “Heinrich Heine (Der Dichter) ”\n" "\n" -#: g10/keygen.c:1724 +#: g10/keygen.c:1726 msgid "Real name: " msgstr "真实姓名：" -#: g10/keygen.c:1732 +#: g10/keygen.c:1734 msgid "Invalid character in name\n" msgstr "姓名含有无效的字符\n" -#: g10/keygen.c:1734 +#: g10/keygen.c:1736 msgid "Name may not start with a digit\n" msgstr "姓名不可以用数字开头\n" -#: g10/keygen.c:1736 +#: g10/keygen.c:1738 msgid "Name must be at least 5 characters long\n" msgstr "姓名至少要有五个字符长\n" -#: g10/keygen.c:1744 +#: g10/keygen.c:1746 msgid "Email address: " msgstr "电子邮件地址：" -#: g10/keygen.c:1750 +#: g10/keygen.c:1752 msgid "Not a valid email address\n" msgstr "电子邮件地址无效\n" -#: g10/keygen.c:1758 +#: g10/keygen.c:1760 msgid "Comment: " msgstr "注释：" -#: g10/keygen.c:1764 +#: g10/keygen.c:1766 msgid "Invalid character in comment\n" msgstr "注释含有无效的字符\n" -#: g10/keygen.c:1787 +#: g10/keygen.c:1789 #, c-format msgid "You are using the `%s' character set.\n" msgstr "您正在使用‘%s’字符集。\n" -#: g10/keygen.c:1793 +#: g10/keygen.c:1795 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3934,7 +4097,7 @@ msgstr "" " “%s”\n" "\n" -#: g10/keygen.c:1798 +#: g10/keygen.c:1800 msgid "Please don't put the email address into the real name or the comment\n" msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n" @@ -3949,23 +4112,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n" #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1814 +#: g10/keygen.c:1816 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1824 +#: g10/keygen.c:1826 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？" -#: g10/keygen.c:1825 +#: g10/keygen.c:1827 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？" -#: g10/keygen.c:1844 +#: g10/keygen.c:1846 msgid "Please correct the error first\n" msgstr "请先改正错误\n" -#: g10/keygen.c:1884 +#: g10/keygen.c:1886 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3973,12 +4136,13 @@ msgstr "" "您需要一个密码来保护您的私钥。\n" "\n" -#: g10/keygen.c:1894 g10/passphrase.c:808 +#: g10/keygen.c:1896 +#: g10/passphrase.c:810 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1900 +#: g10/keygen.c:1902 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" @@ -3990,7 +4154,7 @@ msgstr "" "再次执行这个程序，并且使用“--edit-key”选项即可。\n" "\n" -#: g10/keygen.c:1922 +#: g10/keygen.c:1924 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" @@ -4000,50 +4164,53 @@ msgstr "" "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n" "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n" -#: g10/keygen.c:2720 +#: g10/keygen.c:2722 msgid "Key generation canceled.\n" msgstr "密钥生成已取消。\n" -#: g10/keygen.c:2919 g10/keygen.c:3066 +#: g10/keygen.c:2921 +#: g10/keygen.c:3068 #, c-format msgid "writing public key to `%s'\n" msgstr "正在将公钥写至`%s'\n" -#: g10/keygen.c:2921 g10/keygen.c:3069 +#: g10/keygen.c:2923 +#: g10/keygen.c:3071 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "向‘%s’写入私钥占位符\n" -#: g10/keygen.c:2924 g10/keygen.c:3072 +#: g10/keygen.c:2926 +#: g10/keygen.c:3074 #, c-format msgid "writing secret key to `%s'\n" msgstr "正在将私钥写至`%s'\n" -#: g10/keygen.c:3055 +#: g10/keygen.c:3057 #, c-format msgid "no writable public keyring found: %s\n" msgstr "找不到可写的公钥钥匙环：%s\n" -#: g10/keygen.c:3061 +#: g10/keygen.c:3063 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "找不到可写的私钥钥匙环：%s\n" -#: g10/keygen.c:3079 +#: g10/keygen.c:3081 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n" -#: g10/keygen.c:3086 +#: g10/keygen.c:3088 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n" -#: g10/keygen.c:3109 +#: g10/keygen.c:3111 msgid "public and secret key created and signed.\n" msgstr "公钥和私钥已经生成并经签名。\n" -#: g10/keygen.c:3120 +#: g10/keygen.c:3122 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -4051,695 +4218,722 @@ msgstr "" "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n" "生成用于加密的子钥。\n" -#: g10/keygen.c:3132 g10/keygen.c:3261 g10/keygen.c:3376 +#: g10/keygen.c:3134 +#: g10/keygen.c:3263 +#: g10/keygen.c:3378 #, c-format msgid "Key generation failed: %s\n" msgstr "生成密钥失败：%s\n" -#: g10/keygen.c:3184 g10/keygen.c:3311 g10/sign.c:242 +#: g10/keygen.c:3186 +#: g10/keygen.c:3313 +#: g10/sign.c:276 #, c-format -msgid "" -"key has been created %lu second in future (time warp or clock problem)\n" +msgid "key has been created %lu second in future (time warp or clock problem)\n" msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n" -#: g10/keygen.c:3186 g10/keygen.c:3313 g10/sign.c:244 +#: g10/keygen.c:3188 +#: g10/keygen.c:3315 +#: g10/sign.c:278 #, c-format -msgid "" -"key has been created %lu seconds in future (time warp or clock problem)\n" +msgid "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n" -#: g10/keygen.c:3195 g10/keygen.c:3324 +#: g10/keygen.c:3197 +#: g10/keygen.c:3326 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n" -#: g10/keygen.c:3234 g10/keygen.c:3357 +#: g10/keygen.c:3236 +#: g10/keygen.c:3359 msgid "Really create? (y/N) " msgstr "真的要建立吗？(y/N)" -#: g10/keygen.c:3522 +#: g10/keygen.c:3524 #, c-format msgid "storing key onto card failed: %s\n" -msgstr "向卡上存储密钥时失败：%s\n" +msgstr "向智能卡上存储密钥时失败：%s\n" -#: g10/keygen.c:3569 +#: g10/keygen.c:3571 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "不能创建备份文件‘%s’：%s\n" -#: g10/keygen.c:3595 +#: g10/keygen.c:3597 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" -msgstr "注意：卡密钥的备份已保存到‘%s’\n" +msgstr "注意：智能卡密钥的备份已保存到‘%s’\n" -#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532 +#: g10/keyid.c:498 +#: g10/keyid.c:510 +#: g10/keyid.c:522 +#: g10/keyid.c:534 msgid "never " msgstr "永不过期" -#: g10/keylist.c:263 +#: g10/keylist.c:265 msgid "Critical signature policy: " msgstr "关键签名策略：" -#: g10/keylist.c:265 +#: g10/keylist.c:267 msgid "Signature policy: " msgstr "签名策略：" -#: g10/keylist.c:304 +#: g10/keylist.c:306 msgid "Critical preferred keyserver: " msgstr "关键首选公钥服务器：" -#: g10/keylist.c:357 +#: g10/keylist.c:359 msgid "Critical signature notation: " msgstr "关键签名注记：" -#: g10/keylist.c:359 +#: g10/keylist.c:361 msgid "Signature notation: " msgstr "签名注记：" -#: g10/keylist.c:469 +#: g10/keylist.c:471 msgid "Keyring" msgstr "钥匙环" -#: g10/keylist.c:1503 +#: g10/keylist.c:1505 msgid "Primary key fingerprint:" msgstr "主钥指纹：" -#: g10/keylist.c:1505 +#: g10/keylist.c:1507 msgid " Subkey fingerprint:" msgstr "子钥指纹：" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1512 +#: g10/keylist.c:1514 msgid " Primary key fingerprint:" msgstr " 主钥指纹：" -#: g10/keylist.c:1514 +#: g10/keylist.c:1516 msgid " Subkey fingerprint:" msgstr " 子钥指纹：" # use tty -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1520 +#: g10/keylist.c:1524 msgid " Key fingerprint =" msgstr "密钥指纹 =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1591 msgid " Card serial no. =" msgstr "卡序列号 =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1246 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "将‘%s’重命名为‘%s’时失败：%s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1252 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "警告：两个文件存在有互相矛盾的信息。\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1254 #, c-format msgid "%s is the unchanged one\n" msgstr "%s 是没有改变的那一个\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1255 #, c-format msgid "%s is the new one\n" msgstr "%s 是新的那一个\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1256 msgid "Please fix this possible security flaw\n" msgstr "请修补这个可能的安全性漏洞\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1376 #, c-format msgid "caching keyring `%s'\n" msgstr "缓存钥匙环‘%s’\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1422 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1434 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "缓存了 %lu 把密钥(%lu 份签名)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1505 #, c-format msgid "%s: keyring created\n" msgstr "%s：钥匙环已建立\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:61 msgid "include revoked keys in search results" msgstr "在搜索结果中包含已吊销的密钥" -#: g10/keyserver.c:68 +#: g10/keyserver.c:62 msgid "include subkeys when searching by key ID" msgstr "按钥匙号搜索时包含子钥" -#: g10/keyserver.c:70 +#: g10/keyserver.c:64 msgid "use temporary files to pass data to keyserver helpers" msgstr "向公钥服务器辅助程序传递数据时使用临时文件" -#: g10/keyserver.c:72 +#: g10/keyserver.c:66 msgid "do not delete temporary files after using them" msgstr "不删除使用过的临时文件" -#: g10/keyserver.c:76 +#: g10/keyserver.c:70 msgid "automatically retrieve keys when verifying signatures" msgstr "验证签名时自动下载密钥" -#: g10/keyserver.c:78 +#: g10/keyserver.c:72 msgid "honor the preferred keyserver URL set on the key" msgstr "使用密钥中指定的首选公钥服务器 URL" -#: g10/keyserver.c:80 +#: g10/keyserver.c:74 msgid "honor the PKA record set on a key when retrieving keys" msgstr "获取密钥时使用密钥上的 PKA 记录" -#: g10/keyserver.c:146 +#: g10/keyserver.c:140 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:523 msgid "disabled" msgstr "已禁用" -#: g10/keyserver.c:730 +#: g10/keyserver.c:724 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:808 +#: g10/keyserver.c:1426 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "无效的公钥服务器协议(us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:906 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "在公钥服务器上找不到密钥“%s”\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:908 msgid "key not found on keyserver\n" msgstr "在公钥服务器上找不到密钥\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1145 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "下载密钥‘%s’，从 %s 服务器 %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1149 #, c-format msgid "requesting key %s from %s\n" msgstr "下载密钥 %s，从 %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1173 #, c-format msgid "searching for names from %s server %s\n" msgstr "在 %s 服务器 %s 上搜索名字\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1176 #, c-format msgid "searching for names from %s\n" msgstr "在 %s 上搜索名字\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1329 #, c-format msgid "sending key %s to %s server %s\n" msgstr "将密钥‘%s’上传到 %s 服务器 %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1333 #, c-format msgid "sending key %s to %s\n" msgstr "将密钥‘%s’上传到 %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1376 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "搜索“%s”，在 %s 服务器 %s 上\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1379 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "搜索“%s”，在 %s 上\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1386 +#: g10/keyserver.c:1482 msgid "no keyserver action!\n" msgstr "公钥服务器无动作！\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1434 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n" -#: g10/keyserver.c:1449 +#: g10/keyserver.c:1443 msgid "keyserver did not send VERSION\n" msgstr "公钥服务器未发送 VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1505 +#: g10/keyserver.c:2033 msgid "no keyserver known (use option --keyserver)\n" msgstr "未给出公钥服务器(使用 --keyserver 选项)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1511 msgid "external keyserver calls are not supported in this build\n" msgstr "这一编译版本不支持外部调用公钥服务器\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1523 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "没有处理‘%s’公钥服务器的程序\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1528 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1536 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s 不支持对版本 %d 的处理\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1543 msgid "keyserver timed out\n" msgstr "公钥服务器超时\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1548 msgid "keyserver internal error\n" msgstr "公钥服务器内部错误\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1557 #, c-format msgid "keyserver communications error: %s\n" msgstr "公钥服务器通讯错误：%s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1582 +#: g10/keyserver.c:1616 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "“%s”不是一个用户标识：跳过\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1875 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "警告：无法更新密钥 %s，通过 %s：%s\n" -#: g10/keyserver.c:1903 +#: g10/keyserver.c:1897 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1 个密钥正从 %s 得到更新\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1899 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%d 个密钥正从 %s 得到更新\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1955 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "警告：无法获取 URI %s：%s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1961 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "不能解析 URI %s\n" -#: g10/mainproc.c:243 +#: g10/mainproc.c:239 #, c-format msgid "weird size for an encrypted session key (%d)\n" msgstr "加密过的会话密钥尺寸(%d)诡异\n" -#: g10/mainproc.c:294 +#: g10/mainproc.c:290 #, c-format msgid "%s encrypted session key\n" msgstr "%s 加密过的会话密钥\n" -#: g10/mainproc.c:304 +#: g10/mainproc.c:300 #, c-format msgid "passphrase generated with unknown digest algorithm %d\n" msgstr "密码由未知的散列算法 %d 生成\n" -#: g10/mainproc.c:385 +#: g10/mainproc.c:381 #, c-format msgid "public key is %s\n" msgstr "公钥是 %s\n" -#: g10/mainproc.c:442 +#: g10/mainproc.c:438 msgid "public key encrypted data: good DEK\n" msgstr "公钥加密过的数据：完好的数据加密密钥\n" -#: g10/mainproc.c:475 +#: g10/mainproc.c:471 #, c-format msgid "encrypted with %u-bit %s key, ID %s, created %s\n" msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n" -#: g10/mainproc.c:479 g10/pkclist.c:220 +#: g10/mainproc.c:475 +#: g10/pkclist.c:219 #, c-format msgid " \"%s\"\n" msgstr " “%s”\n" -#: g10/mainproc.c:483 +#: g10/mainproc.c:479 #, c-format msgid "encrypted with %s key, ID %s\n" msgstr "由 %s 密钥加密、钥匙号为 %s\n" -#: g10/mainproc.c:497 +#: g10/mainproc.c:493 #, c-format msgid "public key decryption failed: %s\n" msgstr "公钥解密失败：%s\n" -#: g10/mainproc.c:511 +#: g10/mainproc.c:507 #, c-format msgid "encrypted with %lu passphrases\n" msgstr "以 %lu 个密码加密\n" -#: g10/mainproc.c:513 +#: g10/mainproc.c:509 msgid "encrypted with 1 passphrase\n" msgstr "以 1 个密码加密\n" -#: g10/mainproc.c:544 g10/mainproc.c:566 +#: g10/mainproc.c:540 +#: g10/mainproc.c:562 #, c-format msgid "assuming %s encrypted data\n" msgstr "假定 %s 为加密过的数据\n" -#: g10/mainproc.c:552 +#: g10/mainproc.c:548 #, c-format msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" msgstr "IDEA 算法不可用，试以 %s 代替\n" -#: g10/mainproc.c:584 +#: g10/mainproc.c:580 msgid "decryption okay\n" msgstr "解密成功\n" -#: g10/mainproc.c:588 +#: g10/mainproc.c:584 msgid "WARNING: message was not integrity protected\n" msgstr "警告：报文未受到完整的保护\n" -#: g10/mainproc.c:601 +#: g10/mainproc.c:597 msgid "WARNING: encrypted message has been manipulated!\n" msgstr "警告：加密过的报文已经变造！\n" -#: g10/mainproc.c:607 +#: g10/mainproc.c:603 #, c-format msgid "decryption failed: %s\n" msgstr "解密失败：%s\n" -#: g10/mainproc.c:628 +#: g10/mainproc.c:624 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "注意：发件者要求您“只阅读不存盘”\n" -#: g10/mainproc.c:630 +#: g10/mainproc.c:626 #, c-format msgid "original file name='%.*s'\n" msgstr "原始文件名 =‘%.*s’\n" -#: g10/mainproc.c:715 +#: g10/mainproc.c:711 msgid "WARNING: multiple plaintexts seen\n" -msgstr "" +msgstr "警告：存在多个明文段\n" -#: g10/mainproc.c:843 +#: g10/mainproc.c:839 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "独立的吊销证书――请用“gpg --import”来应用\n" -#: g10/mainproc.c:1191 +#: g10/mainproc.c:1187 msgid "no signature found\n" msgstr "未找到签名\n" -#: g10/mainproc.c:1434 +#: g10/mainproc.c:1430 msgid "signature verification suppressed\n" msgstr "签名验证已被抑制\n" -#: g10/mainproc.c:1543 +#: g10/mainproc.c:1539 msgid "can't handle this ambiguous signature data\n" msgstr "无法处理这些有歧义的签名\n" -#: g10/mainproc.c:1554 +#: g10/mainproc.c:1550 #, c-format msgid "Signature made %s\n" msgstr "签名建立于 %s\n" -#: g10/mainproc.c:1555 +#: g10/mainproc.c:1551 #, c-format msgid " using %s key %s\n" msgstr " 使用 %s 密钥 %s\n" -#: g10/mainproc.c:1559 +#: g10/mainproc.c:1555 #, c-format msgid "Signature made %s using %s key ID %s\n" msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n" -#: g10/mainproc.c:1579 +#: g10/mainproc.c:1575 msgid "Key available at: " msgstr "可用的密钥在：" -#: g10/mainproc.c:1712 g10/mainproc.c:1760 +#: g10/mainproc.c:1708 +#: g10/mainproc.c:1756 #, c-format msgid "BAD signature from \"%s\"" msgstr "已损坏的签名，来自于“%s”" -#: g10/mainproc.c:1714 g10/mainproc.c:1762 +#: g10/mainproc.c:1710 +#: g10/mainproc.c:1758 #, c-format msgid "Expired signature from \"%s\"" msgstr "过期的签名，来自于“%s”" -#: g10/mainproc.c:1716 g10/mainproc.c:1764 +#: g10/mainproc.c:1712 +#: g10/mainproc.c:1760 #, c-format msgid "Good signature from \"%s\"" msgstr "完好的签名，来自于“%s”" -#: g10/mainproc.c:1768 +#: g10/mainproc.c:1764 msgid "[uncertain]" msgstr "[不确定]" -#: g10/mainproc.c:1801 +#: g10/mainproc.c:1797 #, c-format msgid " aka \"%s\"" msgstr " 亦即“%s”" -#: g10/mainproc.c:1899 +#: g10/mainproc.c:1895 #, c-format msgid "Signature expired %s\n" msgstr "这份签名已于 %s 过期。\n" -#: g10/mainproc.c:1904 +#: g10/mainproc.c:1900 #, c-format msgid "Signature expires %s\n" msgstr "这份签名在 %s 过期。\n" -#: g10/mainproc.c:1907 +#: g10/mainproc.c:1903 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s 签名，散列算法 %s\n" -#: g10/mainproc.c:1908 +#: g10/mainproc.c:1904 msgid "binary" msgstr "二进制" -#: g10/mainproc.c:1909 +#: g10/mainproc.c:1905 msgid "textmode" msgstr "文本模式" -#: g10/mainproc.c:1909 g10/trustdb.c:529 +#: g10/mainproc.c:1905 +#: g10/trustdb.c:531 msgid "unknown" msgstr "未知" -#: g10/mainproc.c:1929 +#: g10/mainproc.c:1925 #, c-format msgid "Can't check signature: %s\n" msgstr "无法检查签名：%s\n" -#: g10/mainproc.c:1998 g10/mainproc.c:2014 g10/mainproc.c:2100 +#: g10/mainproc.c:1994 +#: g10/mainproc.c:2010 +#: g10/mainproc.c:2096 msgid "not a detached signature\n" msgstr "不是一份分离的签名\n" -#: g10/mainproc.c:2041 -msgid "" -"WARNING: multiple signatures detected. Only the first will be checked.\n" +#: g10/mainproc.c:2037 +msgid "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "警告：检测到多重签名。只检查第一个签名。\n" -#: g10/mainproc.c:2049 +#: g10/mainproc.c:2045 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "等级 0x%02x 的独立签名\n" -#: g10/mainproc.c:2106 +#: g10/mainproc.c:2102 msgid "old style (PGP 2.x) signature\n" msgstr "旧式(PGP 2.x)签名\n" -#: g10/mainproc.c:2116 +#: g10/mainproc.c:2112 msgid "invalid root packet detected in proc_tree()\n" msgstr "在 proc_tree() 中检测到无效的根包\n" -#: g10/misc.c:120 +#: g10/misc.c:122 #, c-format msgid "can't disable core dumps: %s\n" msgstr "无法禁用核心内存转储：%s\n" -#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240 +#: g10/misc.c:142 +#: g10/misc.c:170 +#: g10/misc.c:242 #, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "‘%s’的 fstat 在 %s 中出错：%s\n" -#: g10/misc.c:205 +#: g10/misc.c:207 #, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "fstat(%d) 在 %s 中出错：%s\n" -#: g10/misc.c:314 +#: g10/misc.c:316 #, c-format msgid "WARNING: using experimental public key algorithm %s\n" msgstr "警告: 使用试验性质的公钥算法 %s\n" -#: g10/misc.c:329 +#: g10/misc.c:331 #, c-format msgid "WARNING: using experimental cipher algorithm %s\n" msgstr "警告：使用试验性质的对称加密算法 %s\n" -#: g10/misc.c:344 +#: g10/misc.c:346 #, c-format msgid "WARNING: using experimental digest algorithm %s\n" msgstr "警告：使用试验性质的散列算法 %s\n" -#: g10/misc.c:349 +#: g10/misc.c:351 #, c-format msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "警告：不建议使用散列算法 %s\n" -#: g10/misc.c:445 +#: g10/misc.c:447 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA 算法插件不存在\n" -#: g10/misc.c:446 g10/sig-check.c:101 +#: g10/misc.c:448 +#: g10/sig-check.c:103 #, c-format msgid "please see %s for more information\n" msgstr "请参见 %s 以得到更多信息。\n" -#: g10/misc.c:679 +#: g10/misc.c:681 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d：不建议使用该选项“%s”\n" -#: g10/misc.c:683 +#: g10/misc.c:685 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "警告：“%s”选项已不建议使用\n" -#: g10/misc.c:685 +#: g10/misc.c:687 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "请以“%s%s”代替\n" -#: g10/misc.c:692 +#: g10/misc.c:694 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "警告：“%s”命令已不建议使用——不要使用它\n" -#: g10/misc.c:705 +#: g10/misc.c:707 msgid "Uncompressed" msgstr "不压缩" -#: g10/misc.c:730 +#: g10/misc.c:732 msgid "uncompressed|none" msgstr "未压缩|无" -#: g10/misc.c:857 +#: g10/misc.c:842 #, c-format msgid "this message may not be usable by %s\n" msgstr "%s 也许不能使用这个报文\n" -#: g10/misc.c:1032 +#: g10/misc.c:1017 #, c-format msgid "ambiguous option `%s'\n" msgstr "有歧义的选项‘%s’\n" -#: g10/misc.c:1057 +#: g10/misc.c:1042 #, c-format msgid "unknown option `%s'\n" msgstr "未知的选项 '%s'\n" -#: g10/openfile.c:88 +#: g10/openfile.c:86 #, c-format msgid "File `%s' exists. " msgstr "文件‘%s’已存在。 " -#: g10/openfile.c:92 +#: g10/openfile.c:90 msgid "Overwrite? (y/N) " msgstr "是否覆盖？(y/N)" -#: g10/openfile.c:125 +#: g10/openfile.c:123 #, c-format msgid "%s: unknown suffix\n" msgstr "%s：未知的后缀名\n" -#: g10/openfile.c:147 +#: g10/openfile.c:145 msgid "Enter new filename" msgstr "请输入新的文件名" -#: g10/openfile.c:192 +#: g10/openfile.c:190 msgid "writing to stdout\n" msgstr "正在写入到标准输出\n" -#: g10/openfile.c:319 +#: g10/openfile.c:311 #, c-format msgid "assuming signed data in `%s'\n" msgstr "假定被签名的数据是‘%s’\n" -#: g10/openfile.c:398 +#: g10/openfile.c:390 #, c-format msgid "new configuration file `%s' created\n" msgstr "新的配置文件‘%s’已建立\n" -#: g10/openfile.c:400 +#: g10/openfile.c:392 #, c-format msgid "WARNING: options in `%s' are not yet active during this run\n" msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n" -#: g10/openfile.c:432 +#: g10/openfile.c:424 #, c-format msgid "directory `%s' created\n" msgstr "已创建目录‘%s’\n" -#: g10/parse-packet.c:142 +#: g10/parse-packet.c:143 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "无法操作公钥算法 %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:713 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "警告：潜在不安全的对称加密会话密钥\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1164 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "%d 类别的子包设定了关键位\n" -#: g10/passphrase.c:308 +#: g10/passphrase.c:310 msgid "gpg-agent is not available in this session\n" -msgstr "gpg-agent 在此次舍话中无法使用\n" +msgstr "gpg-agent 在此次会话中无法使用\n" -#: g10/passphrase.c:324 +#: g10/passphrase.c:326 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO 环境变量格式错误\n" -#: g10/passphrase.c:343 +#: g10/passphrase.c:345 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "不支持 gpg-agent 协议版本 %d\n" -#: g10/passphrase.c:360 +#: g10/passphrase.c:362 #, c-format msgid "can't connect to `%s': %s\n" msgstr "无法连接至‘%s’：%s\n" -#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743 +#: g10/passphrase.c:379 +#: g10/passphrase.c:655 +#: g10/passphrase.c:745 msgid "problem with the agent - disabling agent use\n" msgstr "代理程序有问题――正在停用代理程序\n" -#: g10/passphrase.c:530 g10/passphrase.c:912 +#: g10/passphrase.c:532 +#: g10/passphrase.c:914 #, c-format msgid " (main key ID %s)" msgstr " (主钥匙号 %s)" -#: g10/passphrase.c:544 +#: g10/passphrase.c:546 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4750,48 +4944,50 @@ msgstr "" "“%.*s”\n" "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n" -#: g10/passphrase.c:569 +#: g10/passphrase.c:571 msgid "Repeat passphrase\n" msgstr "请再输入一次密码\n" -#: g10/passphrase.c:571 +#: g10/passphrase.c:573 msgid "Enter passphrase\n" msgstr "请输入密码\n" -#: g10/passphrase.c:647 +#: g10/passphrase.c:649 msgid "cancelled by user\n" msgstr "用户取消\n" -#: g10/passphrase.c:803 g10/passphrase.c:972 +#: g10/passphrase.c:805 +#: g10/passphrase.c:974 msgid "can't query passphrase in batch mode\n" msgstr "在批处理模式中无法查询密码\n" -#: g10/passphrase.c:810 g10/passphrase.c:977 +#: g10/passphrase.c:812 +#: g10/passphrase.c:979 msgid "Enter passphrase: " msgstr "请输入密码：" -#: g10/passphrase.c:893 +#: g10/passphrase.c:895 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" "user: \"%s\"\n" msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n" -#: g10/passphrase.c:899 +#: g10/passphrase.c:901 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s" -#: g10/passphrase.c:908 +#: g10/passphrase.c:910 #, c-format msgid " (subkey on main key ID %s)" msgstr " (主钥 %s 的子钥)" -#: g10/passphrase.c:985 +#: g10/passphrase.c:987 msgid "Repeat passphrase: " msgstr "请再输入一次密码：" -#: g10/photoid.c:71 +#: g10/photoid.c:73 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4804,116 +5000,120 @@ msgstr "" "片会被存放在您的公钥里。如果您挑了非常大的图片的话，您的密钥也会变得非\n" "常大！请尽量把图片尺寸控制在240x288左右，这是个理想的尺寸。\n" -#: g10/photoid.c:93 +#: g10/photoid.c:95 msgid "Enter JPEG filename for photo ID: " msgstr "输入要当作相片标识的JPEG文件名： " -#: g10/photoid.c:114 +#: g10/photoid.c:116 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "无法打开 JPEG 文件‘%s’：%s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:127 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "这个 JPEG 文件太大了(%d 字节)！\n" -#: g10/photoid.c:127 +#: g10/photoid.c:129 msgid "Are you sure you want to use it? (y/N) " msgstr "您确定要用它吗？(y/N)" -#: g10/photoid.c:144 +#: g10/photoid.c:146 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "“%s”不是一个 JPEG 文件\n" -#: g10/photoid.c:163 +#: g10/photoid.c:165 msgid "Is this photo correct (y/N/q)? " msgstr "这张照片正确吗？(y/N/q)" -#: g10/photoid.c:327 +#: g10/photoid.c:329 msgid "no photo viewer set\n" msgstr "没有设置照片查看程序\n" -#: g10/photoid.c:381 +#: g10/photoid.c:383 msgid "unable to display photo ID!\n" msgstr "无法显示照片标识！\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:62 +#: g10/revoke.c:623 msgid "No reason specified" msgstr "未指定原因" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:64 +#: g10/revoke.c:625 msgid "Key is superseded" msgstr "密钥被替换" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:66 +#: g10/revoke.c:624 msgid "Key has been compromised" msgstr "密钥已泄漏" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:68 +#: g10/revoke.c:626 msgid "Key is no longer used" msgstr "密钥不再使用" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:70 +#: g10/revoke.c:627 msgid "User ID is no longer valid" msgstr "用户标识不再有效" -#: g10/pkclist.c:75 +#: g10/pkclist.c:74 msgid "reason for revocation: " msgstr "吊销原因：" -#: g10/pkclist.c:92 +#: g10/pkclist.c:91 msgid "revocation comment: " msgstr "吊销注释：" # a string with valid answers -#: g10/pkclist.c:207 +#: g10/pkclist.c:206 msgid "iImMqQsS" msgstr "iImMqQsS" -#: g10/pkclist.c:215 +#: g10/pkclist.c:214 msgid "No trust value assigned to:\n" msgstr "下列项目没有指定信任度：\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:246 #, c-format msgid " aka \"%s\"\n" msgstr " 亦即“%s”\n" -#: g10/pkclist.c:257 -msgid "" -"How much do you trust that this key actually belongs to the named user?\n" +#: g10/pkclist.c:256 +msgid "How much do you trust that this key actually belongs to the named user?\n" msgstr "您是否相信这把密钥属于它所声称的持有者？\n" -#: g10/pkclist.c:272 +#: g10/pkclist.c:271 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = 我不知道或我不作答\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:273 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = 我不相信\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:279 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = 我绝对相信\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:285 msgid " m = back to the main menu\n" msgstr " m = 回到主菜单\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:288 msgid " s = skip this key\n" msgstr " s = 跳过这把密钥\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:289 msgid " q = quit\n" msgstr " q = 退出\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:293 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -4922,37 +5122,38 @@ msgstr "" "这把密钥的最小信任等级为：%s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:299 +#: g10/revoke.c:652 msgid "Your decision? " msgstr "您的决定是什么？" -#: g10/pkclist.c:321 +#: g10/pkclist.c:320 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "您真的要把这把密钥设成绝对信任？(y/N)" -#: g10/pkclist.c:335 +#: g10/pkclist.c:334 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "被绝对信任的密钥的证书：\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:419 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" msgstr "%s：没有证据表明这把密钥真的属于它所声称的持有者\n" -#: g10/pkclist.c:425 +#: g10/pkclist.c:424 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" msgstr "%s：只有有限的证据表明这把密钥属于它所声称的持有者\n" -#: g10/pkclist.c:431 +#: g10/pkclist.c:430 msgid "This key probably belongs to the named user\n" msgstr "这把密钥有可能属于它所声称的持有者\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:435 msgid "This key belongs to us\n" msgstr "这把密钥是属于我们的\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:461 msgid "" "It is NOT certain that the key belongs to the person named\n" "in the user ID. If you *really* know what you are doing,\n" @@ -4961,105 +5162,107 @@ msgstr "" "这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n" "己在做什么，您可以在下一个问题回答 yes。\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:468 msgid "Use this key anyway? (y/N) " msgstr "无论如何还是使用这把密钥吗？(y/N)" -#: g10/pkclist.c:503 +#: g10/pkclist.c:502 msgid "WARNING: Using untrusted key!\n" msgstr "警告：正在使用不被信任的密钥！\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:509 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:518 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:521 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "警告：这把密钥已经被它的持有者吊销了！\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:522 msgid " This could mean that the signature is forged.\n" msgstr " 这表明这个签名有可能是伪造的。\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:528 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "警告：这把子钥已经被它的持有者吊销了！\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:533 msgid "Note: This key has been disabled.\n" msgstr "注意：这把密钥已经被禁用了。\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:553 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "注意：验证过的签名者的地址是‘%s’\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:560 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "注意：签名者的地址‘%s’不匹配任何 DNS 记录\n" -#: g10/pkclist.c:573 +#: g10/pkclist.c:572 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "PKA 信息有效，信任级别调整到“完全”\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:580 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "PKA 信息无效，信任级别调整到“从不”\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:591 msgid "Note: This key has expired!\n" msgstr "注意：这把密钥已经过期了！\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:602 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "警告：这把密钥未经受信任的签名认证！\n" -#: g10/pkclist.c:605 -msgid "" -" There is no indication that the signature belongs to the owner.\n" +#: g10/pkclist.c:604 +msgid " There is no indication that the signature belongs to the owner.\n" msgstr " 没有证据表明这个签名属于它所声称的持有者。\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:612 msgid "WARNING: We do NOT trust this key!\n" msgstr "警告：我们不信任这把密钥！\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:613 msgid " The signature is probably a FORGERY.\n" msgstr " 这个签名很有可能是伪造的。\n" -#: g10/pkclist.c:622 -msgid "" -"WARNING: This key is not certified with sufficiently trusted signatures!\n" +#: g10/pkclist.c:621 +msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:623 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " 这份签名并不一定属于它所声称的持有者\n" -#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147 +#: g10/pkclist.c:822 +#: g10/pkclist.c:864 +#: g10/pkclist.c:1076 +#: g10/pkclist.c:1146 #, c-format msgid "%s: skipped: %s\n" msgstr "%s：已跳过：%s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:834 +#: g10/pkclist.c:1114 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: 已跳过：公钥已存在\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:885 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:909 msgid "Current recipients:\n" msgstr "当前收件人：\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:935 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5067,166 +5270,175 @@ msgstr "" "\n" "输入用户标识。以空白行结束：" -#: g10/pkclist.c:961 +#: g10/pkclist.c:960 msgid "No such user ID.\n" msgstr "没有这个用户标识。\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:969 +#: g10/pkclist.c:1043 msgid "skipped: public key already set as default recipient\n" msgstr "已跳过：公钥已被设为默认收件者\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:990 msgid "Public key is disabled.\n" msgstr "公钥被禁用。\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:999 msgid "skipped: public key already set\n" msgstr "已跳过：公钥已被设定\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1034 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "未知的默认收件者“%s”\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1092 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s：已跳过：公钥已被禁用\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1154 msgid "no valid addressees\n" msgstr "没有有效的地址\n" -#: g10/plaintext.c:95 +#: g10/plaintext.c:91 msgid "data not saved; use option \"--output\" to save it\n" msgstr "数据未被保存；请用“--output”选项来保存它们\n" -#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162 +#: g10/plaintext.c:135 +#: g10/plaintext.c:140 +#: g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "建立‘%s’时发生错误：%s\n" -#: g10/plaintext.c:461 +#: g10/plaintext.c:452 msgid "Detached signature.\n" msgstr "分离的签名。\n" -#: g10/plaintext.c:467 +#: g10/plaintext.c:458 msgid "Please enter name of data file: " msgstr "请输入数据文件的名称： " -#: g10/plaintext.c:499 +#: g10/plaintext.c:490 msgid "reading stdin ...\n" msgstr "正在从标准输入读取 ...\n" -#: g10/plaintext.c:533 +#: g10/plaintext.c:524 msgid "no signed data\n" msgstr "不含签名的数据\n" -#: g10/plaintext.c:547 +#: g10/plaintext.c:538 #, c-format msgid "can't open signed data `%s'\n" msgstr "无法打开有签名的数据‘%s’\n" -#: g10/pubkey-enc.c:102 +#: g10/pubkey-enc.c:104 #, c-format msgid "anonymous recipient; trying secret key %s ...\n" msgstr "匿名收件者；正在尝试使用私钥 %s ……\n" -#: g10/pubkey-enc.c:133 +#: g10/pubkey-enc.c:135 msgid "okay, we are the anonymous recipient.\n" msgstr "很好，我们就是匿名收件者。\n" -#: g10/pubkey-enc.c:221 +#: g10/pubkey-enc.c:223 msgid "old encoding of the DEK is not supported\n" msgstr "不支持旧式的 DEK 编码\n" -#: g10/pubkey-enc.c:242 +#: g10/pubkey-enc.c:244 #, c-format msgid "cipher algorithm %d%s is unknown or disabled\n" msgstr "对称加密算法 %d%s 未知或已停用\n" -#: g10/pubkey-enc.c:280 +#: g10/pubkey-enc.c:282 #, c-format msgid "WARNING: cipher algorithm %s not found in recipient preferences\n" msgstr "注意：收件人的首选项中找不到加密算法 %s\n" -#: g10/pubkey-enc.c:300 +#: g10/pubkey-enc.c:302 #, c-format msgid "NOTE: secret key %s expired at %s\n" msgstr "注意：私钥 %s 已于 %s 过期\n" -#: g10/pubkey-enc.c:306 +#: g10/pubkey-enc.c:308 msgid "NOTE: key has been revoked" msgstr "注意：密钥已被吊销" -#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174 -#: g10/revoke.c:186 g10/revoke.c:586 +#: g10/revoke.c:104 +#: g10/revoke.c:118 +#: g10/revoke.c:130 +#: g10/revoke.c:176 +#: g10/revoke.c:188 +#: g10/revoke.c:588 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet 失败：%s\n" -#: g10/revoke.c:145 +#: g10/revoke.c:147 #, c-format msgid "key %s has no user IDs\n" msgstr "密钥 %s：没有有效的用户标识\n" -#: g10/revoke.c:306 +#: g10/revoke.c:308 msgid "To be revoked by:\n" msgstr "将被吊销，吊销者：\n" -#: g10/revoke.c:310 +#: g10/revoke.c:312 msgid "(This is a sensitive revocation key)\n" msgstr "(这是一把敏感的吊销密钥)\n" -#: g10/revoke.c:314 +#: g10/revoke.c:316 msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)" -#: g10/revoke.c:327 g10/revoke.c:552 +#: g10/revoke.c:329 +#: g10/revoke.c:554 msgid "ASCII armored output forced.\n" msgstr "已强行使用 ASCII 封装过的输出。\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:344 +#: g10/revoke.c:568 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 失败： %s\n" -#: g10/revoke.c:405 +#: g10/revoke.c:407 msgid "Revocation certificate created.\n" msgstr "已建立吊销证书。\n" -#: g10/revoke.c:411 +#: g10/revoke.c:413 #, c-format msgid "no revocation keys found for \"%s\"\n" msgstr "没有找到“%s”的吊销密钥\n" -#: g10/revoke.c:469 +#: g10/revoke.c:471 #, c-format msgid "secret key \"%s\" not found: %s\n" msgstr "找不到私钥“%s”：%s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:500 #, c-format msgid "no corresponding public key: %s\n" msgstr "没有相对应的公钥：%s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:511 msgid "public key does not match secret key!\n" msgstr "公钥与私钥不吻合！\n" -#: g10/revoke.c:516 +#: g10/revoke.c:518 msgid "Create a revocation certificate for this key? (y/N) " msgstr "要为这把密钥建立一份吊销证书吗？(y/N)" -#: g10/revoke.c:533 +#: g10/revoke.c:535 msgid "unknown protection algorithm\n" msgstr "未知的保护算法\n" -#: g10/revoke.c:541 +#: g10/revoke.c:543 msgid "NOTE: This key is not protected!\n" msgstr "注意：这把密钥没有被保护！\n" -#: g10/revoke.c:592 +#: g10/revoke.c:594 msgid "" "Revocation certificate created.\n" "\n" @@ -5244,225 +5456,239 @@ msgstr "" "小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n" "人也能够看得到的地方！\n" -#: g10/revoke.c:633 +#: g10/revoke.c:635 msgid "Please select the reason for the revocation:\n" msgstr "请选择吊销的原因：\n" -#: g10/revoke.c:643 +#: g10/revoke.c:645 msgid "Cancel" msgstr "取消" -#: g10/revoke.c:645 +#: g10/revoke.c:647 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(也许您会想要在这里选择 %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:688 msgid "Enter an optional description; end it with an empty line:\n" msgstr "请输入描述(可选)；以空白行结束：\n" -#: g10/revoke.c:714 +#: g10/revoke.c:716 #, c-format msgid "Reason for revocation: %s\n" msgstr "吊销原因：%s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:718 msgid "(No description given)\n" msgstr "(不给定描述)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:723 msgid "Is this okay? (y/N) " msgstr "这样可以吗？ (y/N)" -#: g10/seckey-cert.c:53 +#: g10/seckey-cert.c:55 msgid "secret key parts are not available\n" msgstr "私钥部分不可用\n" -#: g10/seckey-cert.c:59 +#: g10/seckey-cert.c:61 #, c-format msgid "protection algorithm %d%s is not supported\n" msgstr "保护算法 %d%s 未被支持\n" -#: g10/seckey-cert.c:70 +#: g10/seckey-cert.c:72 #, c-format msgid "protection digest %d is not supported\n" msgstr "不支持保护散列 %d\n" -#: g10/seckey-cert.c:264 +#: g10/seckey-cert.c:266 msgid "Invalid passphrase; please try again" msgstr "无效的密码；请再试一次" -#: g10/seckey-cert.c:265 +#: g10/seckey-cert.c:267 #, c-format msgid "%s ...\n" msgstr "%s……\n" -#: g10/seckey-cert.c:326 +#: g10/seckey-cert.c:328 msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "警告：检测到弱密钥――请更换密码。\n" -#: g10/seckey-cert.c:364 +#: g10/seckey-cert.c:366 msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "正在产生私钥保护使用的旧式 16 位校验和\n" -#: g10/seskey.c:52 +#: g10/seskey.c:54 msgid "weak key created - retrying\n" msgstr "建立了弱密钥――正在重试\n" -#: g10/seskey.c:57 +#: g10/seskey.c:59 #, c-format msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n" msgstr "对称加密无法避免生成弱密钥；已经尝试 %d 次！\n" -#: g10/seskey.c:220 +#: g10/seskey.c:222 msgid "DSA requires the hash length to be a multiple of 8 bits\n" msgstr "DSA 需要散列值长度为 8 位的倍数\n" -#: g10/seskey.c:234 +#: g10/seskey.c:236 #, c-format msgid "DSA key %s uses an unsafe (%u bit) hash\n" msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n" -#: g10/seskey.c:246 +#: g10/seskey.c:248 #, c-format msgid "DSA key %s requires a %u bit or larger hash\n" msgstr "DSA 密钥 %s 需要 %u 位或更长的散列\n" -#: g10/sig-check.c:74 +#: g10/sig-check.c:76 msgid "WARNING: signature digest conflict in message\n" msgstr "警告：签名散列值与报文不一致\n" -#: g10/sig-check.c:99 +#: g10/sig-check.c:101 #, c-format msgid "WARNING: signing subkey %s is not cross-certified\n" msgstr "警告：签名的子钥 %s 未经交叉验证\n" -#: g10/sig-check.c:111 +#: g10/sig-check.c:113 #, c-format msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "警告：签名的子钥 %s 交叉验证无效\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:181 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgstr "公钥 %s 在其签名后 %lu 秒生成\n" -#: g10/sig-check.c:180 +#: g10/sig-check.c:182 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "公钥 %s 在其签名后 %lu 秒生成\n" -#: g10/sig-check.c:191 -#, c-format -msgid "" -"key %s was created %lu second in the future (time warp or clock problem)\n" -msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n" - #: g10/sig-check.c:193 #, c-format -msgid "" -"key %s was created %lu seconds in the future (time warp or clock problem)\n" +msgid "key %s was created %lu second in the future (time warp or clock problem)\n" msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n" -#: g10/sig-check.c:203 +#: g10/sig-check.c:195 +#, c-format +msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n" +msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n" + +#: g10/sig-check.c:205 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "注意：签名密钥 %s 已于 %s 过期\n" -#: g10/sig-check.c:285 +#: g10/sig-check.c:287 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n" -#: g10/sig-check.c:542 +#: g10/sig-check.c:544 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:570 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n" -#: g10/sign.c:90 +#: g10/sign.c:85 +msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" +msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n" + +#: g10/sign.c:93 +msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" +msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入注记数据\n" + +#: g10/sign.c:107 #, c-format msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n" msgstr "警告：注记 %% 无法扩展(太大了)。现在使用未扩展的。\n" -#: g10/sign.c:116 +#: g10/sign.c:124 +msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" +msgstr "无法在 v3 (PGP 2.x样式)的签名内放入策略 URL\n" + +#: g10/sign.c:132 +msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" +msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入策略 URL\n" + +#: g10/sign.c:145 #, c-format -msgid "" -"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n" +msgid "WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n" msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n" -#: g10/sign.c:139 +#: g10/sign.c:173 #, c-format -msgid "" -"WARNING: unable to %%-expand preferred keyserver URL (too large). Using " -"unexpanded.\n" +msgid "WARNING: unable to %%-expand preferred keyserver URL (too large). Using unexpanded.\n" msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n" -#: g10/sign.c:312 +#: g10/sign.c:346 #, c-format msgid "checking created signature failed: %s\n" msgstr "检查已建立的签名时发生错误： %s\n" -#: g10/sign.c:321 +#: g10/sign.c:355 #, c-format msgid "%s/%s signature from: \"%s\"\n" msgstr "%s/%s 签名来自：“%s”\n" -#: g10/sign.c:756 +#: g10/sign.c:788 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签名\n" -#: g10/sign.c:830 +#: g10/sign.c:862 #, c-format -msgid "" -"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" +msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n" -#: g10/sign.c:956 +#: g10/sign.c:988 msgid "signing:" msgstr "正在签名：" -#: g10/sign.c:1069 +#: g10/sign.c:1101 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签名\n" -#: g10/sign.c:1248 +#: g10/sign.c:1280 #, c-format msgid "%s encryption will be used\n" msgstr "%s 加密将被采用\n" -#: g10/skclist.c:126 g10/skclist.c:190 +#: g10/skclist.c:128 +#: g10/skclist.c:192 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n" -#: g10/skclist.c:157 +#: g10/skclist.c:159 #, c-format msgid "skipped \"%s\": duplicated\n" msgstr "“%s”已跳过：重复\n" -#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184 +#: g10/skclist.c:167 +#: g10/skclist.c:177 +#: g10/skclist.c:186 #, c-format msgid "skipped \"%s\": %s\n" msgstr "“%s”已跳过：%s\n" -#: g10/skclist.c:170 +#: g10/skclist.c:172 msgid "skipped: secret key already present\n" msgstr "已跳过：私钥已存在\n" -#: g10/skclist.c:185 +#: g10/skclist.c:187 msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！" -#: g10/tdbdump.c:58 g10/trustdb.c:364 +#: g10/tdbdump.c:60 +#: g10/trustdb.c:366 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "信任记录 %lu，类别 %d：写入失败：%s\n" -#: g10/tdbdump.c:103 +#: g10/tdbdump.c:105 #, c-format msgid "" "# List of assigned trustvalues, created %s\n" @@ -5471,341 +5697,356 @@ msgstr "" "# 已指定的信任度的清单，建立于 %s \n" "# (请用“gpg --import-ownertrust”导入这些信任度)\n" -#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176 +#: g10/tdbdump.c:160 +#: g10/tdbdump.c:168 +#: g10/tdbdump.c:173 +#: g10/tdbdump.c:178 #, c-format msgid "error in `%s': %s\n" msgstr "‘%s’中出错：%s\n" -#: g10/tdbdump.c:158 +#: g10/tdbdump.c:160 msgid "line too long" msgstr "列太长" -#: g10/tdbdump.c:166 +#: g10/tdbdump.c:168 msgid "colon missing" msgstr "冒号缺失" -#: g10/tdbdump.c:172 +#: g10/tdbdump.c:174 msgid "invalid fingerprint" msgstr "指纹无效" -#: g10/tdbdump.c:177 +#: g10/tdbdump.c:179 msgid "ownertrust value missing" msgstr "没有信任度" -#: g10/tdbdump.c:213 +#: g10/tdbdump.c:215 #, c-format msgid "error finding trust record in `%s': %s\n" msgstr "在‘%s’中寻找信任度记录时出错：%s\n" -#: g10/tdbdump.c:217 +#: g10/tdbdump.c:219 #, c-format msgid "read error in `%s': %s\n" msgstr "读取‘%s’错误：%s\n" -#: g10/tdbdump.c:226 g10/trustdb.c:379 +#: g10/tdbdump.c:228 +#: g10/trustdb.c:381 #, c-format msgid "trustdb: sync failed: %s\n" msgstr "信任度数据库：同步失败：%s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:129 +#: g10/tdbio.c:1445 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" msgstr "信任度数据库记录 %lu：lseek 失败：%s\n" -#: g10/tdbio.c:133 g10/tdbio.c:1450 +#: g10/tdbio.c:135 +#: g10/tdbio.c:1452 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n" -#: g10/tdbio.c:243 +#: g10/tdbio.c:245 msgid "trustdb transaction too large\n" msgstr "信任度数据库处理量过大\n" -#: g10/tdbio.c:496 +#: g10/tdbio.c:498 #, c-format msgid "can't access `%s': %s\n" msgstr "无法存取‘%s’：%s\n" -#: g10/tdbio.c:511 +#: g10/tdbio.c:513 #, c-format msgid "%s: directory does not exist!\n" msgstr "%s：目录不存在！\n" -#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587 +#: g10/tdbio.c:523 +#: g10/tdbio.c:546 +#: g10/tdbio.c:589 #, c-format msgid "can't create lock for `%s'\n" msgstr "不能为‘%s’创建锁定\n" -#: g10/tdbio.c:523 g10/tdbio.c:590 +#: g10/tdbio.c:525 +#: g10/tdbio.c:592 #, c-format msgid "can't lock `%s'\n" msgstr "无法锁定‘%s’\n" -#: g10/tdbio.c:549 +#: g10/tdbio.c:551 #, c-format msgid "%s: failed to create version record: %s" msgstr "%s：建立版本记录失败：%s" -#: g10/tdbio.c:553 +#: g10/tdbio.c:555 #, c-format msgid "%s: invalid trustdb created\n" msgstr "%s：建立了无效的信任度数据库\n" -#: g10/tdbio.c:556 +#: g10/tdbio.c:558 #, c-format msgid "%s: trustdb created\n" msgstr "%s：建立了信任度数据库\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:602 msgid "NOTE: trustdb not writable\n" msgstr "注意：信任度数据库不可写入\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:619 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s：无效的信任度数据库\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:651 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s：建立散列表失败：%s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:659 #, c-format msgid "%s: error updating version record: %s\n" msgstr "%s：更新版本记录时出错： %s\n" -#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724 -#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403 +#: g10/tdbio.c:676 +#: g10/tdbio.c:696 +#: g10/tdbio.c:712 +#: g10/tdbio.c:726 +#: g10/tdbio.c:756 +#: g10/tdbio.c:1378 +#: g10/tdbio.c:1405 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s：读取版本记录时出错： %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:735 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s：写入版本记录时出错：%s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1174 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "信任度数据库：lseek 失败：%s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1182 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "信任度数据库：read 失败(n=%d)：%s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1203 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s：不是一个信任度数据库文件\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1221 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s：记录编号为%lu的版本记录\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1226 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s：无效的文件版本%d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1411 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s：读取自由记录时出错：%s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1419 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s：写入目录记录时出错：%s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1429 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s：记录归零时失败：%s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1459 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s：附加记录时失败：%s\n" -#: g10/tdbio.c:1502 +#: g10/tdbio.c:1504 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n" -#: g10/textfilter.c:147 +#: g10/textfilter.c:149 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "无法处理长于 %d 字符的文本行\n" -#: g10/textfilter.c:246 +#: g10/textfilter.c:248 #, c-format msgid "input line longer than %d characters\n" msgstr "输入行长度超过 %d 字符\n" -#: g10/trustdb.c:225 +#: g10/trustdb.c:227 #, c-format msgid "`%s' is not a valid long keyID\n" msgstr "‘%s’不是一个有效的长式钥匙号\n" -#: g10/trustdb.c:256 +#: g10/trustdb.c:258 #, c-format msgid "key %s: accepted as trusted key\n" msgstr "密钥 %s：受信任，已接受\n" -#: g10/trustdb.c:294 +#: g10/trustdb.c:296 #, c-format msgid "key %s occurs more than once in the trustdb\n" msgstr "密钥 %s 在信任度数据库中重复出现\n" -#: g10/trustdb.c:309 +#: g10/trustdb.c:311 #, c-format msgid "key %s: no public key for trusted key - skipped\n" msgstr "密钥 %s：受信任的密钥没有公钥――已跳过\n" -#: g10/trustdb.c:319 +#: g10/trustdb.c:321 #, c-format msgid "key %s marked as ultimately trusted\n" msgstr "密钥 %s 被标记为绝对信任\n" -#: g10/trustdb.c:343 +#: g10/trustdb.c:345 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n" -#: g10/trustdb.c:349 +#: g10/trustdb.c:351 #, c-format msgid "trust record %lu is not of requested type %d\n" msgstr "信任记录 %lu 不属于所请求的类别 %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:447 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n" -#: g10/trustdb.c:451 +#: g10/trustdb.c:453 #, c-format msgid "using %s trust model\n" msgstr "使用 %s 信任模型\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:505 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "10 translator see trustdb.c:uid_trust_string_fixed" -#: g10/trustdb.c:505 +#: g10/trustdb.c:507 msgid "[ revoked]" msgstr "[已吊销]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:509 +#: g10/trustdb.c:514 msgid "[ expired]" msgstr "[已过期]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:513 msgid "[ unknown]" msgstr "[ 未知 ]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:515 msgid "[ undef ]" msgstr "[未定义]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:516 msgid "[marginal]" msgstr "[ 勉强 ]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:517 msgid "[ full ]" msgstr "[ 完全 ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:518 msgid "[ultimate]" msgstr "[ 绝对 ]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:533 msgid "undefined" msgstr "未定义" -#: g10/trustdb.c:532 +#: g10/trustdb.c:534 msgid "never" msgstr "从不" -#: g10/trustdb.c:533 +#: g10/trustdb.c:535 msgid "marginal" msgstr "勉强" -#: g10/trustdb.c:534 +#: g10/trustdb.c:536 msgid "full" msgstr "完全" -#: g10/trustdb.c:535 +#: g10/trustdb.c:537 msgid "ultimate" msgstr "绝对" -#: g10/trustdb.c:575 +#: g10/trustdb.c:577 msgid "no need for a trustdb check\n" msgstr "不需要检查信任度数据库\n" -#: g10/trustdb.c:581 g10/trustdb.c:2350 +#: g10/trustdb.c:583 +#: g10/trustdb.c:2352 #, c-format msgid "next trustdb check due at %s\n" msgstr "下次信任度数据库检查将于 %s 进行\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:592 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:607 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n" -#: g10/trustdb.c:837 g10/trustdb.c:1275 +#: g10/trustdb.c:839 +#: g10/trustdb.c:1277 #, c-format msgid "public key %s not found: %s\n" msgstr "找不到公钥 %s：%s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1034 msgid "please do a --check-trustdb\n" msgstr "请执行一次 --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1038 msgid "checking the trustdb\n" msgstr "正在检查信任度数据库\n" -#: g10/trustdb.c:2093 +#: g10/trustdb.c:2095 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n" -#: g10/trustdb.c:2158 +#: g10/trustdb.c:2160 msgid "no ultimately trusted keys found\n" msgstr "没有找到任何绝对信任的密钥\n" -#: g10/trustdb.c:2172 +#: g10/trustdb.c:2174 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "绝对信任的密钥 %s 的公钥未被找到\n" -#: g10/trustdb.c:2195 +#: g10/trustdb.c:2197 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n" -#: g10/trustdb.c:2281 +#: g10/trustdb.c:2283 #, c-format -msgid "" -"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" -msgstr "" -"深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n" +msgid "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" +msgstr "深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2358 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "无法更新信任度数据库版本记录：写入失败：%s\n" -#: g10/verify.c:116 +#: g10/verify.c:117 msgid "" "the signature could not be verified.\n" "Please remember that the signature file (.sig or .asc)\n" @@ -5820,316 +6061,309 @@ msgstr "" msgid "input line %u too long or missing LF\n" msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n" -#: util/errors.c:53 +#: util/errors.c:55 msgid "general error" msgstr "常规错误" -#: util/errors.c:54 +#: util/errors.c:56 msgid "unknown packet type" msgstr "未知的包类型" -#: util/errors.c:55 +#: util/errors.c:57 msgid "unknown version" msgstr "未知的版本" -#: util/errors.c:56 +#: util/errors.c:58 msgid "unknown pubkey algorithm" msgstr "未知的公钥算法" -#: util/errors.c:57 +#: util/errors.c:59 msgid "unknown digest algorithm" msgstr "未知的散列算法" -#: util/errors.c:58 +#: util/errors.c:60 msgid "bad public key" msgstr "公钥已经损坏" -#: util/errors.c:59 +#: util/errors.c:61 msgid "bad secret key" msgstr "私钥已经损坏" -#: util/errors.c:60 +#: util/errors.c:62 msgid "bad signature" msgstr "签名已经损坏" -#: util/errors.c:61 +#: util/errors.c:63 msgid "checksum error" msgstr "校验和错误" -#: util/errors.c:62 +#: util/errors.c:64 msgid "bad passphrase" msgstr "错误的密码" -#: util/errors.c:63 +#: util/errors.c:65 msgid "public key not found" msgstr "找不到公钥" -#: util/errors.c:64 +#: util/errors.c:66 msgid "unknown cipher algorithm" msgstr "未知的对称加密算法" -#: util/errors.c:65 +#: util/errors.c:67 msgid "can't open the keyring" msgstr "无法打开钥匙环" -#: util/errors.c:66 +#: util/errors.c:68 msgid "invalid packet" msgstr "无效包" -#: util/errors.c:67 +#: util/errors.c:69 msgid "invalid armor" msgstr "无效的 ASCII 封装格式" -#: util/errors.c:68 +#: util/errors.c:70 msgid "no such user id" msgstr "没有这个用户标识" -#: util/errors.c:69 +#: util/errors.c:71 msgid "secret key not available" msgstr "私钥不可用" -#: util/errors.c:70 +#: util/errors.c:72 msgid "wrong secret key used" msgstr "使用了错误的私钥" -#: util/errors.c:71 +#: util/errors.c:73 msgid "not supported" msgstr "未被支持" -#: util/errors.c:72 +#: util/errors.c:74 msgid "bad key" msgstr "密钥已损坏" -#: util/errors.c:73 +#: util/errors.c:75 msgid "file read error" msgstr "文件读取错误" -#: util/errors.c:74 +#: util/errors.c:76 msgid "file write error" msgstr "文件写入错误" -#: util/errors.c:75 +#: util/errors.c:77 msgid "unknown compress algorithm" msgstr "未知的压缩算法" -#: util/errors.c:76 +#: util/errors.c:78 msgid "file open error" msgstr "文件打开错误" -#: util/errors.c:77 +#: util/errors.c:79 msgid "file create error" msgstr "文件建立错误" -#: util/errors.c:78 +#: util/errors.c:80 msgid "invalid passphrase" msgstr "无效的密码" -#: util/errors.c:79 +#: util/errors.c:81 msgid "unimplemented pubkey algorithm" msgstr "未实现的公钥算法" -#: util/errors.c:80 +#: util/errors.c:82 msgid "unimplemented cipher algorithm" msgstr "未实现的对称加密算法" -#: util/errors.c:81 +#: util/errors.c:83 msgid "unknown signature class" msgstr "未知的签名等级" -#: util/errors.c:82 +#: util/errors.c:84 msgid "trust database error" msgstr "信任度数据库错误" -#: util/errors.c:83 +#: util/errors.c:85 msgid "bad MPI" msgstr "损坏的多精度整数(MPI)" -#: util/errors.c:84 +#: util/errors.c:86 msgid "resource limit" msgstr "资源限制" -#: util/errors.c:85 +#: util/errors.c:87 msgid "invalid keyring" msgstr "无效的钥匙环" -#: util/errors.c:86 +#: util/errors.c:88 msgid "bad certificate" msgstr "证书已损坏" -#: util/errors.c:87 +#: util/errors.c:89 msgid "malformed user id" msgstr "被变造过的用户标识" -#: util/errors.c:88 +#: util/errors.c:90 msgid "file close error" msgstr "文件关闭错误" -#: util/errors.c:89 +#: util/errors.c:91 msgid "file rename error" msgstr "文件重命名错误" -#: util/errors.c:90 +#: util/errors.c:92 msgid "file delete error" msgstr "文件删除错误" -#: util/errors.c:91 +#: util/errors.c:93 msgid "unexpected data" msgstr "非预期的数据" -#: util/errors.c:92 +#: util/errors.c:94 msgid "timestamp conflict" msgstr "时间戳冲突" -#: util/errors.c:93 +#: util/errors.c:95 msgid "unusable pubkey algorithm" msgstr "无法使用的公钥算法" -#: util/errors.c:94 +#: util/errors.c:96 msgid "file exists" msgstr "文件已存在" -#: util/errors.c:95 +#: util/errors.c:97 msgid "weak key" msgstr "弱密钥" -#: util/errors.c:96 +#: util/errors.c:98 msgid "invalid argument" msgstr "无效的参数" -#: util/errors.c:97 +#: util/errors.c:99 msgid "bad URI" msgstr "URI 已损坏" -#: util/errors.c:98 +#: util/errors.c:100 msgid "unsupported URI" msgstr "未被支持的 URI" -#: util/errors.c:99 +#: util/errors.c:101 msgid "network error" msgstr "网络错误" -#: util/errors.c:101 +#: util/errors.c:103 msgid "not encrypted" msgstr "未被加密" -#: util/errors.c:102 +#: util/errors.c:104 msgid "not processed" msgstr "未被处理" -#: util/errors.c:104 +#: util/errors.c:106 msgid "unusable public key" msgstr "不可用的公钥" -#: util/errors.c:105 +#: util/errors.c:107 msgid "unusable secret key" msgstr "不可用的私钥" -#: util/errors.c:106 +#: util/errors.c:108 msgid "keyserver error" msgstr "公钥服务器错误" -#: util/errors.c:107 +#: util/errors.c:109 msgid "canceled" msgstr "已取消" -#: util/errors.c:108 +#: util/errors.c:110 msgid "no card" -msgstr "没有卡" +msgstr "没有智能卡" -#: util/errors.c:109 +#: util/errors.c:111 msgid "no data" msgstr "无数据" -#: util/logger.c:156 +#: util/logger.c:158 msgid "ERROR: " msgstr "错误：" -#: util/logger.c:159 +#: util/logger.c:161 msgid "WARNING: " msgstr "警告：" -#: util/logger.c:222 +#: util/logger.c:224 #, c-format msgid "... this is a bug (%s:%d:%s)\n" msgstr "……这是个程序缺陷(%s:%d:%s)\n" -#: util/logger.c:228 +#: util/logger.c:230 #, c-format msgid "you found a bug ... (%s:%d)\n" msgstr "您找到一个程序缺陷了……(%s:%d)\n" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:328 util/miscutil.c:365 +#: util/miscutil.c:330 +#: util/miscutil.c:367 msgid "yes" msgstr "yes" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:331 +#: util/miscutil.c:372 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:333 +#: util/miscutil.c:369 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:334 +#: util/miscutil.c:373 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:371 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:374 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:407 msgid "okay|okay" msgstr "okay|ok" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:409 msgid "cancel|cancel" msgstr "cancel|cancel" -#: util/miscutil.c:408 +#: util/miscutil.c:410 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:411 msgid "cC" msgstr "cC" -#: util/secmem.c:96 +#: util/secmem.c:97 msgid "WARNING: using insecure memory!\n" msgstr "警告：正在使用不安全的内存！\n" -#: util/secmem.c:97 +#: util/secmem.c:98 msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n" -#: util/secmem.c:355 +#: util/secmem.c:351 msgid "operation is not possible without initialized secure memory\n" msgstr "安全内存未初始化，不能进行操作\n" -#: util/secmem.c:356 +#: util/secmem.c:352 msgid "(you may have used the wrong program for this task)\n" msgstr "(您可能使用了错误的程序来完成此项任务)\n" -#~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" -#~ msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n" - -#~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n" -#~ msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入注记数据\n" - -#~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n" -#~ msgstr "无法在 v3 (PGP 2.x样式)的签名内放入策略 URL\n" - -#~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n" -#~ msgstr "无法在 v3 (PGP 2.x样式)的密钥签名内放入策略 URL\n" - #~ msgid "DSA requires the use of a 160 bit hash algorithm\n" #~ msgstr "DSA 要求使用 160 位的散列算法\n" + diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 44b01aa00..92d5999ec 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2007-12-12 Werner Koch + + * config.sub, config.guess: Update to version 2007-11-19. + 2007-11-15 Werner Koch * gnupg.spec.in: Converted to utf-8. Changed polish description. diff --git a/scripts/config.guess b/scripts/config.guess index c38553dc7..7fef1a3e3 100755 --- a/scripts/config.guess +++ b/scripts/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2006-02-23' +timestamp='2007-11-19' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -210,7 +212,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -328,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -770,6 +772,8 @@ EOF case ${UNAME_MACHINE} in pc98) echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac @@ -777,10 +781,7 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:MSYS_NT-*:*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,15 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[345]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -831,6 +835,9 @@ EOF arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -947,6 +954,9 @@ EOF x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -989,7 +999,7 @@ EOF LIBC=gnulibc1 # endif #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -1205,6 +1215,15 @@ EOF SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff --git a/scripts/config.sub b/scripts/config.sub index ad9f39571..519046156 100755 --- a/scripts/config.sub +++ b/scripts/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2006-02-23' +timestamp='2007-11-19' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -240,15 +241,16 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -274,21 +276,19 @@ case $basic_machine in | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -318,18 +318,18 @@ case $basic_machine in | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -358,22 +358,24 @@ case $basic_machine in | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; - m32c-*) + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -477,8 +479,8 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -685,6 +687,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -912,6 +918,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -923,6 +933,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1128,7 +1141,7 @@ case $basic_machine in sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1217,7 +1230,7 @@ case $os in | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1369,6 +1382,12 @@ else # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1378,9 +1397,9 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1406,6 +1425,9 @@ case $basic_machine in m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;;