diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 1499 |
1 files changed, 818 insertions, 681 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 0c214625c..5d930e030 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.7\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2008-03-25 09:52+0100\n" +"POT-Creation-Date: 2009-08-13 09:26+0200\n" "PO-Revision-Date: 2007-11-26 13:41+0800\n" "Last-Translator: Meng Jie <[email protected]>\n" "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists." @@ -44,13 +44,12 @@ msgstr "无法锁定‘%s’：%s\n" msgid "waiting for lock on `%s'...\n" msgstr "等待‘%s’上的锁\n" -#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750 -#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472 -#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403 -#: 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:446 g10/card-util.c:784 g10/dearmor.c:59 g10/dearmor.c:108 +#: g10/encode.c:182 g10/encode.c:472 g10/gpg.c:1015 g10/gpg.c:3607 +#: g10/import.c:193 g10/keygen.c:2572 g10/keyring.c:1551 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:604 #, c-format msgid "can't open `%s': %s\n" msgstr "无法打开‘%s’： %s\n" @@ -82,9 +81,10 @@ msgstr "无法读取‘%s’：%s\n" 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:2889 -#: g10/keygen.c:2919 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:542 g10/card-util.c:830 g10/exec.c:479 g10/gpg.c:1014 +#: g10/keygen.c:3055 g10/keygen.c:3085 g10/keyring.c:1204 g10/keyring.c:1527 +#: g10/openfile.c:277 g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 +#: g10/tdbio.c:534 #, c-format msgid "can't create `%s': %s\n" msgstr "无法建立‘%s’：%s\n" @@ -137,171 +137,217 @@ msgstr "" "随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵！\n" "(还需要%d字节)\n" -#: g10/app-openpgp.c:594 +#: g10/app-openpgp.c:697 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "无法存储指纹：%s\n" -#: g10/app-openpgp.c:607 +#: g10/app-openpgp.c:710 #, c-format msgid "failed to store the creation date: %s\n" msgstr "无法存储创建日期：%s\n" -#: g10/app-openpgp.c:975 +#: g10/app-openpgp.c:1149 #, 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:1157 g10/app-openpgp.c:2875 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:1165 g10/app-openpgp.c:2883 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:1174 g10/app-openpgp.c:2893 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:1494 +#, c-format +msgid "using default PIN as %s\n" +msgstr "" + +#: g10/app-openpgp.c:1501 +#, c-format +msgid "failed to use default PIN as %s: %s - disabling further default use\n" +msgstr "" + +#: g10/app-openpgp.c:1516 +#, c-format +msgid "||Please enter the PIN%%0A[sigs done: %lu]" +msgstr "||请输入 PIN%%0A[完成的签字：%lu]" + +#: g10/app-openpgp.c:1527 g10/app-openpgp.c:1981 +#, fuzzy +msgid "||Please enter the PIN" +msgstr "||请输入 PIN%%0A[完成的签字：%lu]" + +#: g10/app-openpgp.c:1542 g10/app-openpgp.c:1561 g10/app-openpgp.c:1722 +#: g10/app-openpgp.c:1739 g10/app-openpgp.c:1987 g10/app-openpgp.c:2032 #, 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:1568 g10/app-openpgp.c:1746 g10/app-openpgp.c:1994 #, 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:1581 g10/app-openpgp.c:1620 g10/app-openpgp.c:1758 +#: g10/app-openpgp.c:3193 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "验证 CHV%d 失败：%s\n" -#: g10/app-openpgp.c:1308 -msgid "access to admin commands is not configured\n" -msgstr "尚未配置管理员命令的权限\n" - -#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428 +#: g10/app-openpgp.c:1649 g10/app-openpgp.c:2013 g10/app-openpgp.c:3483 msgid "error retrieving CHV status from card\n" msgstr "从智能卡中获取 CHV 状态时出错\n" -#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437 +#: g10/app-openpgp.c:1655 g10/app-openpgp.c:3492 msgid "card is permanently locked!\n" msgstr "智能卡被永久锁定！\n" -#: g10/app-openpgp.c:1334 +#: g10/app-openpgp.c:1662 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\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 -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 +#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at +#. the start of the string. Use %%0A to force a linefeed. +#: g10/app-openpgp.c:1669 +#, fuzzy, c-format +msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]" +msgstr "||请输入 PIN%%0A[完成的签字：%lu]" + +#: g10/app-openpgp.c:1673 +#, fuzzy +msgid "|A|Please enter the Admin PIN" +msgstr "||请输入 PIN%%0A[完成的签字：%lu]" + +#: g10/app-openpgp.c:1694 +msgid "access to admin commands is not configured\n" +msgstr "尚未配置管理员命令的权限\n" + +#: g10/app-openpgp.c:2022 g10/card-util.c:108 +#, fuzzy +msgid "Reset Code not or not anymore available\n" +msgstr "私钥部分不可用\n" + +#: g10/app-openpgp.c:2028 +#, fuzzy +msgid "||Please enter the Reset Code for the card" +msgstr "请选择吊销的原因：\n" + +#: g10/app-openpgp.c:2038 g10/app-openpgp.c:2090 +#, fuzzy, c-format +msgid "Reset Code is too short; minimum length is %d\n" +msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n" + +#: g10/app-openpgp.c:2060 +msgid "|RN|New Reset Code" +msgstr "" + +#: g10/app-openpgp.c:2061 msgid "|AN|New Admin PIN" msgstr "|AN|新的管理员 PIN" -#: g10/app-openpgp.c:1490 +#: g10/app-openpgp.c:2061 msgid "|N|New PIN" msgstr "新的 PIN" -#: g10/app-openpgp.c:1494 +#: g10/app-openpgp.c:2065 #, 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:2171 g10/app-openpgp.c:2961 msgid "error reading application data\n" msgstr "读取应用程序数据时出错\n" -#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001 +#: g10/app-openpgp.c:2177 g10/app-openpgp.c:2968 msgid "error reading fingerprint DO\n" msgstr "读取指纹 D0 出错\n" -#: g10/app-openpgp.c:1560 +#: g10/app-openpgp.c:2187 msgid "key already exists\n" msgstr "密钥已存在\n" -#: g10/app-openpgp.c:1564 +#: g10/app-openpgp.c:2191 msgid "existing key will be replaced\n" msgstr "现有的密钥将被替换\n" -#: g10/app-openpgp.c:1566 +#: g10/app-openpgp.c:2193 msgid "generating new key\n" msgstr "生成新密钥\n" -#: g10/app-openpgp.c:1733 +#: g10/app-openpgp.c:2195 +#, fuzzy +msgid "writing new key\n" +msgstr "生成新密钥\n" + +#: g10/app-openpgp.c:2620 msgid "creation timestamp missing\n" msgstr "缺少创建时间戳\n" -#: g10/app-openpgp.c:1740 +#: g10/app-openpgp.c:2640 #, 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:2652 #, 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:2662 g10/app-openpgp.c:2670 #, 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:2766 #, c-format msgid "failed to store the key: %s\n" msgstr "无法存储密钥：%s\n" -#: g10/app-openpgp.c:1884 +#: g10/app-openpgp.c:2852 msgid "please wait while key is being generated ...\n" msgstr "请稍候，正在生成密钥……\n" -#: g10/app-openpgp.c:1899 +#: g10/app-openpgp.c:2865 msgid "generating key failed\n" msgstr "生成密钥失败\n" -#: g10/app-openpgp.c:1902 +#: g10/app-openpgp.c:2868 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "密钥已生成(耗时 %d 秒)\n" -#: g10/app-openpgp.c:1959 +#: g10/app-openpgp.c:2926 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n" -#: g10/app-openpgp.c:2085 +#: g10/app-openpgp.c:2976 +msgid "fingerprint on card does not match requested one\n" +msgstr "" + +#: g10/app-openpgp.c:3092 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "智能卡不支持散列算法 %s\n" -#: g10/app-openpgp.c:2132 +#: g10/app-openpgp.c:3168 #, c-format msgid "signatures created so far: %lu\n" msgstr "目前已创建的签名：%lu\n" -#: g10/app-openpgp.c:2140 -#, c-format -msgid "||Please enter the PIN%%0A[sigs done: %lu]" -msgstr "||请输入 PIN%%0A[完成的签字：%lu]" - -#: g10/app-openpgp.c:2442 +#: g10/app-openpgp.c:3497 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "目前禁止通过此命令验证管理员 PIN\n" -#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523 +#: g10/app-openpgp.c:3722 g10/app-openpgp.c:3733 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "不能存取 %s――无效的 OpenPGP 卡？\n" @@ -384,163 +430,225 @@ 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:309 +#: g10/card-util.c:85 g10/card-util.c:371 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP 卡不可用：%s\n" -#: g10/card-util.c:66 +#: g10/card-util.c:90 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "检测到 OpenPGP 卡号 %s\n" -#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516 -#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454 +#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1516 +#: g10/keygen.c:2756 g10/revoke.c:216 g10/revoke.c:454 msgid "can't do this in batch mode\n" msgstr "在批处理模式中无法完成此操作\n" -#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218 -#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400 -#: g10/keygen.c:1467 +#: g10/card-util.c:106 +#, fuzzy +msgid "This command is only available for version 2 cards\n" +msgstr "在 %s 模式中不允许使用这个指令。\n" + +#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1434 +#: g10/keygen.c:1514 msgid "Your selection? " msgstr "您的选择？ " -#: g10/card-util.c:219 g10/card-util.c:269 +#: g10/card-util.c:269 g10/card-util.c:319 msgid "[not set]" msgstr "[未设定]" -#: g10/card-util.c:416 +#: g10/card-util.c:509 msgid "male" msgstr "男性" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "female" msgstr "女性" -#: g10/card-util.c:417 +#: g10/card-util.c:510 msgid "unspecified" msgstr "未定义" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "not forced" msgstr "可选" -#: g10/card-util.c:444 +#: g10/card-util.c:537 msgid "forced" msgstr "必须" -#: g10/card-util.c:522 +#: g10/card-util.c:628 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "错误：目前只允许使用 ASCII 字符。\n" -#: g10/card-util.c:524 +#: g10/card-util.c:630 msgid "Error: The \"<\" character may not be used.\n" msgstr "错误：不能使用字符“<”。\n" -#: g10/card-util.c:526 +#: g10/card-util.c:632 msgid "Error: Double spaces are not allowed.\n" msgstr "错误：不允许出现两个空格。\n" -#: g10/card-util.c:543 +#: g10/card-util.c:649 msgid "Cardholder's surname: " msgstr "智能卡持有人的姓：" -#: g10/card-util.c:545 +#: g10/card-util.c:651 msgid "Cardholder's given name: " msgstr "智能卡持有人的名：" -#: g10/card-util.c:563 +#: g10/card-util.c:669 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n" -#: g10/card-util.c:584 +#: g10/card-util.c:690 msgid "URL to retrieve public key: " msgstr "获取公钥的 URL：" -#: g10/card-util.c:592 +#: g10/card-util.c:698 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "错误：URL 太长(至多 %d 个字符)\n" -#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279 +#: g10/card-util.c:791 +#, fuzzy, c-format +msgid "error allocating enough memory: %s\n" +msgstr "建立钥匙环‘%s’时发生错误：%s\n" + +#: g10/card-util.c:803 g10/import.c:279 #, c-format msgid "error reading `%s': %s\n" msgstr "读取‘%s’时出错：%s\n" -#: g10/card-util.c:698 +#: g10/card-util.c:836 +#, fuzzy, c-format +msgid "error writing `%s': %s\n" +msgstr "建立‘%s’时发生错误：%s\n" + +#: g10/card-util.c:863 msgid "Login data (account name): " msgstr "登录数据(帐号名)：" -#: g10/card-util.c:708 +#: g10/card-util.c:873 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "错误：登录数据太长(至多 %d 个字符)。\n" -#: g10/card-util.c:767 +#: g10/card-util.c:909 msgid "Private DO data: " msgstr "个人 DO 数据：" -#: g10/card-util.c:777 +#: g10/card-util.c:919 #, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n" -#: g10/card-util.c:797 +#: g10/card-util.c:1002 msgid "Language preferences: " msgstr "首选语言：" -#: g10/card-util.c:805 +#: g10/card-util.c:1010 msgid "Error: invalid length of preference string.\n" msgstr "错误：首选项字符串长度无效。\n" -#: g10/card-util.c:814 +#: g10/card-util.c:1019 msgid "Error: invalid characters in preference string.\n" msgstr "错误：首选项字符串里有无效字符。\n" -#: g10/card-util.c:835 +#: g10/card-util.c:1041 msgid "Sex ((M)ale, (F)emale or space): " msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)：" -#: g10/card-util.c:849 +#: g10/card-util.c:1055 msgid "Error: invalid response.\n" msgstr "错误：无效的响应。\n" -#: g10/card-util.c:870 +#: g10/card-util.c:1077 msgid "CA fingerprint: " msgstr "CA 指纹：" -#: g10/card-util.c:893 +#: g10/card-util.c:1100 msgid "Error: invalid formatted fingerprint.\n" msgstr "错误：指纹格式无效。\n" -#: g10/card-util.c:941 +#: g10/card-util.c:1150 #, c-format msgid "key operation not possible: %s\n" msgstr "针对密钥的操作无法实现：%s\n" -#: g10/card-util.c:942 +#: g10/card-util.c:1151 msgid "not an OpenPGP card" msgstr "不是一个 OpenPGP 卡" -#: g10/card-util.c:951 +#: g10/card-util.c:1164 #, c-format msgid "error getting current key info: %s\n" msgstr "取得当前密钥信息时出错：%s\n" -#: g10/card-util.c:1036 +#: g10/card-util.c:1251 msgid "Replace existing key? (y/N) " msgstr "替换已有的密钥？(y/N)" -#: g10/card-util.c:1057 g10/card-util.c:1066 +#: g10/card-util.c:1267 +msgid "" +"NOTE: There is no guarantee that the card supports the requested size.\n" +" If the key generation does not succeed, please check the\n" +" documentation of your card to see what sizes are allowed.\n" +msgstr "" + +#: g10/card-util.c:1292 +#, fuzzy, c-format +msgid "What keysize do you want for the Signature key? (%u) " +msgstr "您想要用多大的密钥尺寸？(%u)" + +#: g10/card-util.c:1294 +#, fuzzy, c-format +msgid "What keysize do you want for the Encryption key? (%u) " +msgstr "您想要用多大的密钥尺寸？(%u)" + +#: g10/card-util.c:1295 +#, fuzzy, c-format +msgid "What keysize do you want for the Authentication key? (%u) " +msgstr "您想要用多大的密钥尺寸？(%u)" + +#: g10/card-util.c:1306 g10/keygen.c:1648 g10/keygen.c:1654 +#, c-format +msgid "rounded up to %u bits\n" +msgstr "舍入到 %u 位\n" + +#: g10/card-util.c:1314 g10/keygen.c:1635 +#, c-format +msgid "%s keysizes must be in the range %u-%u\n" +msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n" + +#: g10/card-util.c:1319 +#, c-format +msgid "The card will now be re-configured to generate a key of %u bits\n" +msgstr "" + +#: g10/card-util.c:1339 +#, fuzzy, c-format +msgid "error changing size of key %d to %u bits: %s\n" +msgstr "读取私钥区块“%s”时出错：%s\n" + +#: g10/card-util.c:1361 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "是否为加密密钥创建智能卡外的备份？(Y/n)" -#: g10/card-util.c:1078 +#: g10/card-util.c:1375 +#, fuzzy +msgid "NOTE: keys are already stored on the card!\n" +msgstr "私钥已存储在智能卡上\n" + +#: g10/card-util.c:1378 msgid "Replace existing keys? (y/N) " msgstr "替换已有的密钥？(y/N)" -#: g10/card-util.c:1087 +#: g10/card-util.c:1390 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -551,137 +659,146 @@ msgstr "" " PIN = ‘%s’ 管理员 PIN = ‘%s’\n" "您应当使用 --change-pin 命令来更改它们\n" -#: g10/card-util.c:1126 +#: g10/card-util.c:1446 msgid "Please select the type of key to generate:\n" msgstr "请选择您要使用的密钥种类：\n" -#: g10/card-util.c:1128 g10/card-util.c:1209 +#: g10/card-util.c:1448 g10/card-util.c:1556 msgid " (1) Signature key\n" msgstr " (1) 签名密钥\n" -#: g10/card-util.c:1129 g10/card-util.c:1211 +#: g10/card-util.c:1449 g10/card-util.c:1558 msgid " (2) Encryption key\n" msgstr " (2) 加密密钥\n" -#: g10/card-util.c:1130 g10/card-util.c:1213 +#: g10/card-util.c:1450 g10/card-util.c:1560 msgid " (3) Authentication key\n" msgstr " (3) 认证密钥\n" -#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938 -#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683 +#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:938 +#: g10/keygen.c:1438 g10/keygen.c:1466 g10/keygen.c:1567 g10/revoke.c:681 msgid "Invalid selection.\n" msgstr "无效的选择。\n" -#: g10/card-util.c:1206 +#: g10/card-util.c:1553 msgid "Please select where to store the key:\n" msgstr "请选择在哪里存储密钥：\n" -#: g10/card-util.c:1241 +#: g10/card-util.c:1597 msgid "unknown key protection algorithm\n" msgstr "不支持的密钥保护算法\n" -#: g10/card-util.c:1246 +#: g10/card-util.c:1602 msgid "secret parts of key are not available\n" msgstr "私钥部分不可用\n" -#: g10/card-util.c:1251 +#: g10/card-util.c:1607 msgid "secret key already stored on a card\n" msgstr "私钥已存储在智能卡上\n" -#: g10/card-util.c:1322 g10/keyedit.c:1349 +#: g10/card-util.c:1620 +#, fuzzy, c-format +msgid "error writing key to card: %s\n" +msgstr "写入钥匙环‘%s’时出错： %s\n" + +#: g10/card-util.c:1679 g10/keyedit.c:1349 msgid "quit this menu" msgstr "离开这个菜单" -#: g10/card-util.c:1324 +#: g10/card-util.c:1681 msgid "show admin commands" msgstr "显示管理员命令" -#: g10/card-util.c:1325 g10/keyedit.c:1352 +#: g10/card-util.c:1682 g10/keyedit.c:1352 msgid "show this help" msgstr "显示这份在线说明" -#: g10/card-util.c:1327 +#: g10/card-util.c:1684 msgid "list all available data" msgstr "列出所有可用数据" -#: g10/card-util.c:1330 +#: g10/card-util.c:1687 msgid "change card holder's name" msgstr "更改智能卡持有人的姓名" -#: g10/card-util.c:1331 +#: g10/card-util.c:1688 msgid "change URL to retrieve key" msgstr "更改获取密钥的 URL" -#: g10/card-util.c:1332 +#: g10/card-util.c:1689 msgid "fetch the key specified in the card URL" msgstr "根据智能卡中指定的 URL 获取密钥" -#: g10/card-util.c:1333 +#: g10/card-util.c:1690 msgid "change the login name" msgstr "更改登录名" -#: g10/card-util.c:1334 +#: g10/card-util.c:1691 msgid "change the language preferences" msgstr "更改首选语言首选" -#: g10/card-util.c:1335 +#: g10/card-util.c:1692 msgid "change card holder's sex" msgstr "更改智能卡持有人的性别" -#: g10/card-util.c:1336 +#: g10/card-util.c:1693 msgid "change a CA fingerprint" msgstr "更改一个 CA 指纹" -#: g10/card-util.c:1337 +#: g10/card-util.c:1694 msgid "toggle the signature force PIN flag" msgstr "设定 PIN 签名是否必须" -#: g10/card-util.c:1338 +#: g10/card-util.c:1695 msgid "generate new keys" msgstr "生成新的密钥" -#: g10/card-util.c:1339 +#: g10/card-util.c:1696 msgid "menu to change or unblock the PIN" msgstr "更改或解锁 PIN 的菜单" -#: g10/card-util.c:1340 +#: g10/card-util.c:1697 msgid "verify the PIN and list all data" msgstr "验证 PIN 并列出所有数据" -#: g10/card-util.c:1460 g10/keyedit.c:1619 +#: g10/card-util.c:1698 +msgid "unblock the PIN using a Reset Code" +msgstr "" + +#: g10/card-util.c:1820 g10/keyedit.c:1619 msgid "Command> " msgstr "命令> " -#: g10/card-util.c:1498 +#: g10/card-util.c:1861 msgid "Admin-only command\n" msgstr "仅供管理员使用的命令\n" -#: g10/card-util.c:1529 +#: g10/card-util.c:1892 msgid "Admin commands are allowed\n" msgstr "允许使用管理员命令\n" -#: g10/card-util.c:1531 +#: g10/card-util.c:1894 msgid "Admin commands are not allowed\n" msgstr "不允许使用管理员命令\n" -#: g10/card-util.c:1605 g10/keyedit.c:2240 +#: g10/card-util.c:1985 g10/keyedit.c:2242 msgid "Invalid command (try \"help\")\n" msgstr "无效的指令(尝试“help”)\n" -#: g10/cardglue.c:414 +#: g10/cardglue.c:457 msgid "card reader not available\n" msgstr "读卡器不可用\n" -#: g10/cardglue.c:432 +#: g10/cardglue.c:475 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "请插入智能卡并回车，或输入‘c’来取消：" -#: g10/cardglue.c:444 +#: g10/cardglue.c:487 #, c-format msgid "selecting openpgp failed: %s\n" msgstr "选择 OpenPGP 时失败：%s\n" -#: g10/cardglue.c:571 +#: g10/cardglue.c:614 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -690,36 +807,36 @@ msgstr "" "请取出当前的智能卡，并插入有下列序列号的智能卡：\n" " %.*s\n" -#: g10/cardglue.c:580 +#: g10/cardglue.c:623 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "就绪后请回车，或输入‘c’取消" -#: g10/cardglue.c:915 +#: g10/cardglue.c:1013 msgid "Enter New Admin PIN: " msgstr "输入新的管理员 PIN：" -#: g10/cardglue.c:916 +#: g10/cardglue.c:1014 msgid "Enter New PIN: " msgstr "输入新的 PIN：" -#: g10/cardglue.c:917 +#: g10/cardglue.c:1015 msgid "Enter Admin PIN: " msgstr "输入管理员 PIN：" -#: g10/cardglue.c:918 +#: g10/cardglue.c:1016 msgid "Enter PIN: " msgstr "输入 PIN：" -#: g10/cardglue.c:935 +#: g10/cardglue.c:1033 msgid "Repeat this PIN: " msgstr "再次输入此 PIN：" -#: g10/cardglue.c:950 +#: g10/cardglue.c:1048 msgid "PIN not correctly repeated; try again" msgstr "PIN 再次输入时与首次输入不符；请再试一次" #: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375 -#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156 +#: g10/keyring.c:666 g10/verify.c:101 g10/verify.c:156 #, c-format msgid "can't open `%s'\n" msgstr "无法打开‘%s’\n" @@ -728,13 +845,13 @@ msgstr "无法打开‘%s’\n" 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/delkey.c:73 g10/export.c:309 g10/keyedit.c:3390 g10/keyserver.c:1741 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "密钥‘%s’找不到：%s\n" -#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725 +#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1755 #: g10/revoke.c:232 g10/revoke.c:476 #, c-format msgid "error reading keyblock: %s\n" @@ -830,7 +947,7 @@ msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项� 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:769 g10/pkclist.c:805 g10/pkclist.c:853 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "您不该将 %s 用于 %s 模式中\n" @@ -1219,7 +1336,7 @@ msgstr "" msgid "Pubkey: " msgstr "公钥：" -#: g10/gpg.c:809 g10/keyedit.c:2306 +#: g10/gpg.c:809 g10/keyedit.c:2308 msgid "Cipher: " msgstr "对称加密：" @@ -1227,7 +1344,7 @@ msgstr "对称加密：" msgid "Hash: " msgstr "散列：" -#: g10/gpg.c:821 g10/keyedit.c:2352 +#: g10/gpg.c:821 g10/keyedit.c:2354 msgid "Compression: " msgstr "压缩：" @@ -1360,397 +1477,397 @@ msgstr "列出签名时显示过期日期" msgid "NOTE: old default options file `%s' ignored\n" msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n" -#: g10/gpg.c:2059 +#: g10/gpg.c:2060 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "注意：没有默认配置文件‘%s’\n" -#: g10/gpg.c:2063 +#: g10/gpg.c:2064 #, c-format msgid "option file `%s': %s\n" msgstr "配置文件‘%s’：%s\n" -#: g10/gpg.c:2070 +#: g10/gpg.c:2071 #, c-format msgid "reading options from `%s'\n" msgstr "从‘%s’读取选项\n" -#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974 +#: g10/gpg.c:2292 g10/gpg.c:2953 g10/gpg.c:2972 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "注意：一般情况下不会用到 %s！\n" -#: g10/gpg.c:2299 +#: g10/gpg.c:2305 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n" -#: g10/gpg.c:2488 g10/gpg.c:2500 +#: g10/gpg.c:2494 g10/gpg.c:2506 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "‘%s’不是一个有效的签名过期日期\n" -#: g10/gpg.c:2577 +#: g10/gpg.c:2583 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’不是一个有效的字符集\n" -#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076 +#: g10/gpg.c:2607 g10/gpg.c:2796 g10/keyedit.c:4084 msgid "could not parse keyserver URL\n" msgstr "无法解析公钥服务器 URL\n" -#: g10/gpg.c:2613 +#: g10/gpg.c:2619 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s：%d：无效的公钥服务器选项\n" -#: g10/gpg.c:2616 +#: g10/gpg.c:2622 msgid "invalid keyserver options\n" msgstr "无效的公钥服务器选项\n" -#: g10/gpg.c:2623 +#: g10/gpg.c:2629 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s：%d：无效的导入选项\n" -#: g10/gpg.c:2626 +#: g10/gpg.c:2632 msgid "invalid import options\n" msgstr "无效的导入选项\n" -#: g10/gpg.c:2633 +#: g10/gpg.c:2639 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s：%d：无效的导出选项\n" -#: g10/gpg.c:2636 +#: g10/gpg.c:2642 msgid "invalid export options\n" msgstr "无效的导出选项\n" -#: g10/gpg.c:2643 +#: g10/gpg.c:2649 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s：%d：无效的列表选项\n" -#: g10/gpg.c:2646 +#: g10/gpg.c:2652 msgid "invalid list options\n" msgstr "无效的列表选项\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2660 msgid "display photo IDs during signature verification" msgstr "验证签名时显示照片标识" -#: g10/gpg.c:2656 +#: g10/gpg.c:2662 msgid "show policy URLs during signature verification" msgstr "验证签名时显示策略 URL" -#: g10/gpg.c:2658 +#: g10/gpg.c:2664 msgid "show all notations during signature verification" msgstr "验证签名时显示所有注记" -#: g10/gpg.c:2660 +#: g10/gpg.c:2666 msgid "show IETF standard notations during signature verification" msgstr "验证签名时显示 IETF 标准注记" -#: g10/gpg.c:2664 +#: g10/gpg.c:2670 msgid "show user-supplied notations during signature verification" msgstr "验证签名时显示用户提供的注记" -#: g10/gpg.c:2666 +#: g10/gpg.c:2672 msgid "show preferred keyserver URLs during signature verification" msgstr "验证签名时显示首选公钥服务器 URL" -#: g10/gpg.c:2668 +#: g10/gpg.c:2674 msgid "show user ID validity during signature verification" msgstr "验证签名时显示用户标识的有效性" -#: g10/gpg.c:2670 +#: g10/gpg.c:2676 msgid "show revoked and expired user IDs in signature verification" msgstr "验证密钥时显示已吊销或已过期的子钥" -#: g10/gpg.c:2672 +#: g10/gpg.c:2678 msgid "show only the primary user ID in signature verification" msgstr "在签名验证中只显示主用户标识" -#: g10/gpg.c:2674 +#: g10/gpg.c:2680 msgid "validate signatures with PKA data" msgstr "使用 PKA 数据验证签名的有效性" -#: g10/gpg.c:2676 +#: g10/gpg.c:2682 msgid "elevate the trust of signatures with valid PKA data" msgstr "提升带有有效 PKA 数据的签名的信任度" -#: g10/gpg.c:2683 +#: g10/gpg.c:2689 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s：%d：无效的校验选项\n" -#: g10/gpg.c:2686 +#: g10/gpg.c:2692 msgid "invalid verify options\n" msgstr "无效的校验选项\n" -#: g10/gpg.c:2693 +#: g10/gpg.c:2699 #, c-format msgid "unable to set exec-path to %s\n" msgstr "无法把运行路径设成 %s\n" -#: g10/gpg.c:2856 +#: g10/gpg.c:2862 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s：%d：无效的 auto-key-locate 清单\n" -#: g10/gpg.c:2859 +#: g10/gpg.c:2865 msgid "invalid auto-key-locate list\n" msgstr "无效的 auto-key-locate 清单\n" -#: g10/gpg.c:2944 +#: g10/gpg.c:2942 msgid "WARNING: program may create a core file!\n" msgstr "警告：程序可能会创建核心内存转储！\n" -#: g10/gpg.c:2948 +#: g10/gpg.c:2946 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告：%s 会使得 %s 失效\n" -#: g10/gpg.c:2957 +#: g10/gpg.c:2955 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 不可与 %s 并用\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:2958 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 与 %s 并用无意义！\n" -#: g10/gpg.c:2967 +#: g10/gpg.c:2965 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "注意：%s 本版本中不可用\n" -#: g10/gpg.c:2982 +#: g10/gpg.c:2980 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "不会在内存不安全的情况下运行，原因是 %s\n" -#: g10/gpg.c:2996 +#: g10/gpg.c:2994 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n" -#: g10/gpg.c:3002 +#: g10/gpg.c:3000 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n" -#: g10/gpg.c:3008 +#: g10/gpg.c:3006 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n" -#: g10/gpg.c:3021 +#: g10/gpg.c:3019 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n" -#: g10/gpg.c:3088 g10/gpg.c:3112 +#: g10/gpg.c:3087 g10/gpg.c:3111 msgid "selected cipher algorithm is invalid\n" msgstr "所选的对称加密算法无效\n" -#: g10/gpg.c:3094 g10/gpg.c:3118 +#: g10/gpg.c:3093 g10/gpg.c:3117 msgid "selected digest algorithm is invalid\n" msgstr "所选的散列算法无效\n" -#: g10/gpg.c:3100 +#: g10/gpg.c:3099 msgid "selected compression algorithm is invalid\n" msgstr "所选的压缩算法无效\n" -#: g10/gpg.c:3106 +#: g10/gpg.c:3105 msgid "selected certification digest algorithm is invalid\n" msgstr "所选的证书散列算法无效\n" -#: g10/gpg.c:3121 +#: g10/gpg.c:3120 msgid "completes-needed must be greater than 0\n" msgstr "需要的完全可信签名数一定要大于 0\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3122 msgid "marginals-needed must be greater than 1\n" msgstr "需要的勉强可信签名数一定要大于 1\n" -#: g10/gpg.c:3125 +#: g10/gpg.c:3124 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "最大验证深度一定要介于 1 和 255 之间\n" -#: g10/gpg.c:3127 +#: g10/gpg.c:3126 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n" -#: g10/gpg.c:3129 +#: g10/gpg.c:3128 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "无效的最小验证级别；一定要是 1，2 或 3\n" -#: g10/gpg.c:3132 +#: g10/gpg.c:3131 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n" -#: g10/gpg.c:3136 +#: g10/gpg.c:3135 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "无效的 S2K 模式；必须是 0，1 或 3\n" -#: g10/gpg.c:3143 +#: g10/gpg.c:3142 msgid "invalid default preferences\n" msgstr "无效的默认首选项\n" -#: g10/gpg.c:3152 +#: g10/gpg.c:3151 msgid "invalid personal cipher preferences\n" msgstr "无效的个人对称加密算法首选项\n" -#: g10/gpg.c:3156 +#: g10/gpg.c:3155 msgid "invalid personal digest preferences\n" msgstr "无效的个人散列算法首选项\n" -#: g10/gpg.c:3160 +#: g10/gpg.c:3159 msgid "invalid personal compress preferences\n" msgstr "无效的个人压缩算法首选项\n" -#: g10/gpg.c:3193 +#: g10/gpg.c:3192 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s 尚不能和 %s 并用\n" -#: g10/gpg.c:3240 +#: g10/gpg.c:3239 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n" -#: g10/gpg.c:3245 +#: g10/gpg.c:3244 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’散列算法\n" -#: g10/gpg.c:3250 +#: g10/gpg.c:3249 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n" -#: g10/gpg.c:3352 +#: g10/gpg.c:3354 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "初始化信任度数据库失败：%s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3365 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n" -#: g10/gpg.c:3374 +#: g10/gpg.c:3376 msgid "--store [filename]" msgstr "--store [文件名]" -#: g10/gpg.c:3381 +#: g10/gpg.c:3383 msgid "--symmetric [filename]" msgstr "--symmetric [文件名]" -#: g10/gpg.c:3383 +#: g10/gpg.c:3385 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "对称加密‘%s’失败：%s\n" -#: g10/gpg.c:3393 +#: g10/gpg.c:3395 msgid "--encrypt [filename]" msgstr "--encrypt [文件名]" -#: g10/gpg.c:3406 +#: g10/gpg.c:3408 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [文件名]" -#: g10/gpg.c:3408 +#: g10/gpg.c:3410 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n" -#: g10/gpg.c:3411 +#: g10/gpg.c:3413 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n" -#: g10/gpg.c:3429 +#: g10/gpg.c:3431 msgid "--sign [filename]" msgstr "--sign [文件名]" -#: g10/gpg.c:3442 +#: g10/gpg.c:3444 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [文件名]" -#: g10/gpg.c:3457 +#: g10/gpg.c:3459 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [文件名]" -#: g10/gpg.c:3459 +#: g10/gpg.c:3461 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n" -#: g10/gpg.c:3462 +#: g10/gpg.c:3464 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n" -#: g10/gpg.c:3482 +#: g10/gpg.c:3484 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [文件名]" -#: g10/gpg.c:3491 +#: g10/gpg.c:3493 msgid "--clearsign [filename]" msgstr "--clearsign [文件名]" -#: g10/gpg.c:3516 +#: g10/gpg.c:3518 msgid "--decrypt [filename]" msgstr "--decrypt [文件名]" -#: g10/gpg.c:3524 +#: g10/gpg.c:3526 msgid "--sign-key user-id" msgstr "--sign-key 用户标识" -#: g10/gpg.c:3528 +#: g10/gpg.c:3530 msgid "--lsign-key user-id" msgstr "--lsign-key 用户标识" -#: g10/gpg.c:3549 +#: g10/gpg.c:3551 msgid "--edit-key user-id [commands]" msgstr "--edit-key 用户标识 [指令]" -#: g10/gpg.c:3620 +#: g10/gpg.c:3622 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [用户标识] [钥匙环]" -#: g10/gpg.c:3662 +#: g10/gpg.c:3664 #, c-format msgid "keyserver send failed: %s\n" msgstr "上传至公钥服务器失败：%s\n" -#: g10/gpg.c:3664 +#: g10/gpg.c:3666 #, c-format msgid "keyserver receive failed: %s\n" msgstr "从公钥服务器接收失败：%s\n" -#: g10/gpg.c:3666 +#: g10/gpg.c:3668 #, c-format msgid "key export failed: %s\n" msgstr "导出密钥失败：%s\n" -#: g10/gpg.c:3677 +#: g10/gpg.c:3679 #, c-format msgid "keyserver search failed: %s\n" msgstr "搜寻公钥服务器失败：%s\n" -#: g10/gpg.c:3687 +#: g10/gpg.c:3689 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "从公钥服务器更新失败：%s\n" -#: g10/gpg.c:3738 +#: g10/gpg.c:3740 #, c-format msgid "dearmoring failed: %s\n" msgstr "解开 ASCII 封装失败：%s\n" -#: g10/gpg.c:3746 +#: g10/gpg.c:3748 #, c-format msgid "enarmoring failed: %s\n" msgstr "进行 ASCII 封装失败：%s\n" -#: g10/gpg.c:3833 +#: g10/gpg.c:3835 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "无效的‘%s’散列算法\n" @@ -1794,17 +1911,17 @@ msgstr "自动获取‘%s’，通过 %s\n" msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n" -#: g10/getkey.c:2389 g10/keyedit.c:3719 +#: g10/getkey.c:2435 g10/keyedit.c:3726 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "公钥 %s 没有相对应的私钥――忽略\n" -#: g10/getkey.c:2620 +#: g10/getkey.c:2656 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "使用子钥 %s 而非主钥 %s\n" -#: g10/getkey.c:2667 +#: g10/getkey.c:2703 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "密钥 %s：无相应公钥的私钥――已跳过\n" @@ -1830,8 +1947,9 @@ msgid "Usage: gpgv [options] [files] (-h for help)" msgstr "用法：gpgv [选项] [文件] (用 -h 求助)" #: g10/gpgv.c:102 +#, fuzzy msgid "" -"Syntax: gpg [options] [files]\n" +"Syntax: gpgv [options] [files]\n" "Check signatures against known trusted keys\n" msgstr "" "语法：gpg [选项] [文件]\n" @@ -2601,12 +2719,12 @@ msgstr "建立钥匙环‘%s’时发生错误：%s\n" msgid "keyring `%s' created\n" msgstr "钥匙环‘%s’已建立\n" -#: g10/keydb.c:314 g10/keydb.c:317 +#: g10/keydb.c:319 g10/keydb.c:322 #, c-format msgid "keyblock resource `%s': %s\n" msgstr "密钥块资源‘%s’：%s\n" -#: g10/keydb.c:696 +#: g10/keydb.c:701 #, c-format msgid "failed to rebuild keyring cache: %s\n" msgstr "重新建立钥匙环缓存失败： %s\n" @@ -2655,7 +2773,7 @@ msgstr "检测到 1 个没有有效自身签名的用户标识\n" msgid "%d user IDs without valid self-signatures detected\n" msgstr "检测到 %d 个没有有效自身签名的用户标识\n" -#: g10/keyedit.c:413 g10/pkclist.c:264 +#: g10/keyedit.c:413 g10/pkclist.c:265 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2666,12 +2784,12 @@ msgstr "" "查\n" "指纹等)？\n" -#: g10/keyedit.c:417 g10/pkclist.c:276 +#: g10/keyedit.c:417 g10/pkclist.c:277 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = 我勉强相信\n" -#: g10/keyedit.c:418 g10/pkclist.c:278 +#: g10/keyedit.c:418 g10/pkclist.c:279 #, c-format msgid " %d = I trust fully\n" msgstr " %d = 我完全相信\n" @@ -2878,8 +2996,8 @@ msgstr "我非常小心地检查过这把密钥。\n" 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:1059 g10/keyedit.c:4803 g10/keyedit.c:4894 g10/keyedit.c:4958 +#: g10/keyedit.c:5019 g10/sign.c:317 #, c-format msgid "signing failed: %s\n" msgstr "签名时失败： %s\n" @@ -2888,19 +3006,19 @@ msgstr "签名时失败： %s\n" msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "只有占位密钥，或者密钥存储在智能卡上——没有密码可以更改。\n" -#: g10/keyedit.c:1135 g10/keygen.c:3226 +#: g10/keyedit.c:1135 g10/keygen.c:3412 msgid "This key is not protected.\n" msgstr "这把密钥没有被保护。\n" -#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537 +#: g10/keyedit.c:1139 g10/keygen.c:3400 g10/revoke.c:535 msgid "Secret parts of primary key are not available.\n" msgstr "主钥的私钥部分无法取用。\n" -#: g10/keyedit.c:1143 g10/keygen.c:3229 +#: g10/keyedit.c:1143 g10/keygen.c:3415 msgid "Secret parts of primary key are stored on-card.\n" msgstr "主钥的私钥部分存储在智能卡上。\n" -#: g10/keyedit.c:1147 g10/keygen.c:3233 +#: g10/keyedit.c:1147 g10/keygen.c:3419 msgid "Key is protected.\n" msgstr "密钥受保护。\n" @@ -2917,7 +3035,7 @@ msgstr "" "输入要给这把私钥用的新密码。\n" "\n" -#: g10/keyedit.c:1186 g10/keygen.c:1906 +#: g10/keyedit.c:1186 g10/keygen.c:2004 msgid "passphrase not correctly repeated; try again" msgstr "密码再次输入时与首次输入不符；请再试一次" @@ -3226,136 +3344,136 @@ msgstr "真的要更新所选用户标识的首选项吗？(y/N)" msgid "Really update the preferences? (y/N) " msgstr "真的要更新首选项吗？(y/N)" -#: g10/keyedit.c:2201 +#: g10/keyedit.c:2203 msgid "Save changes? (y/N) " msgstr "要保存变动吗？(y/N)" -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2206 msgid "Quit without saving? (y/N) " msgstr "要不保存而离开吗？(y/N)" -#: g10/keyedit.c:2214 +#: g10/keyedit.c:2216 #, c-format msgid "update failed: %s\n" msgstr "更新失败：%s\n" -#: g10/keyedit.c:2221 +#: g10/keyedit.c:2223 #, c-format msgid "update secret failed: %s\n" msgstr "更新私钥失败：%s\n" -#: g10/keyedit.c:2228 +#: g10/keyedit.c:2230 msgid "Key not changed so no update needed.\n" msgstr "密钥没有变动所以不需要更新。\n" -#: g10/keyedit.c:2329 +#: g10/keyedit.c:2331 msgid "Digest: " msgstr "散列：" -#: g10/keyedit.c:2381 +#: g10/keyedit.c:2383 msgid "Features: " msgstr "特点：" -#: g10/keyedit.c:2392 +#: g10/keyedit.c:2394 msgid "Keyserver no-modify" msgstr "公钥服务器不可变造" -#: g10/keyedit.c:2407 g10/keylist.c:306 +#: g10/keyedit.c:2409 g10/keylist.c:306 msgid "Preferred keyserver: " msgstr "首选公钥服务器：" -#: g10/keyedit.c:2415 g10/keyedit.c:2416 +#: g10/keyedit.c:2417 g10/keyedit.c:2418 msgid "Notations: " msgstr "注记：" -#: g10/keyedit.c:2626 +#: g10/keyedit.c:2628 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:2687 #, 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:2708 #, c-format msgid "This key may be revoked by %s key %s" msgstr "这把密钥可被 %s 密钥 %s 吊销" -#: g10/keyedit.c:2712 +#: g10/keyedit.c:2714 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:2730 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862 +#: g10/keylist.c:192 g10/keyserver.c:520 #, c-format msgid "created: %s" msgstr "创建于：%s" -#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997 +#: g10/keyedit.c:2733 g10/keylist.c:784 g10/keylist.c:878 g10/mainproc.c:997 #, 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:2735 g10/keylist.c:755 g10/keylist.c:790 g10/keylist.c:884 #, 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:1003 +#: g10/keyedit.c:2737 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 +#: g10/keylist.c:194 g10/keylist.c:761 g10/keylist.c:796 g10/keylist.c:890 +#: g10/keylist.c:911 g10/keyserver.c:526 g10/mainproc.c:1003 #, c-format msgid "expires: %s" msgstr "有效至：%s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2739 #, c-format msgid "usage: %s" msgstr "可用于：%s" -#: g10/keyedit.c:2752 +#: g10/keyedit.c:2754 #, c-format msgid "trust: %s" msgstr "信任度：%s" -#: g10/keyedit.c:2756 +#: g10/keyedit.c:2758 #, c-format msgid "validity: %s" msgstr "有效性：%s" -#: g10/keyedit.c:2763 +#: g10/keyedit.c:2765 msgid "This key has been disabled" msgstr "这把密钥已经被禁用" -#: g10/keyedit.c:2791 g10/keylist.c:198 +#: g10/keyedit.c:2793 g10/keylist.c:198 msgid "card-no: " msgstr "卡号：" -#: g10/keyedit.c:2815 +#: g10/keyedit.c:2817 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:1815 g10/trustdb.c:1177 g10/trustdb.c:1697 +#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:530 +#: g10/mainproc.c:1816 g10/trustdb.c:1198 g10/trustdb.c:1718 msgid "revoked" msgstr "已吊销" -#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531 -#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:534 +#: g10/mainproc.c:1818 g10/trustdb.c:551 g10/trustdb.c:1720 msgid "expired" msgstr "已过期" -#: g10/keyedit.c:2946 +#: g10/keyedit.c:2948 msgid "" "WARNING: no user ID has been marked as primary. This command may\n" " cause a different user ID to become the assumed primary.\n" msgstr "" "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n" -#: g10/keyedit.c:3007 +#: g10/keyedit.c:3009 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3364,74 +3482,74 @@ msgstr "" "警告：这是一把 PGP2 样式的密钥。\n" " 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n" -#: g10/keyedit.c:3012 g10/keyedit.c:3347 +#: g10/keyedit.c:3014 g10/keyedit.c:3349 msgid "Are you sure you still want to add it? (y/N) " msgstr "您确定仍然想要增加吗？(y/N)" -#: g10/keyedit.c:3018 +#: g10/keyedit.c:3020 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n" -#: g10/keyedit.c:3158 +#: g10/keyedit.c:3160 msgid "Delete this good signature? (y/N/q)" msgstr "删除这个完好的签名吗？(y/N/q)" -#: g10/keyedit.c:3168 +#: g10/keyedit.c:3170 msgid "Delete this invalid signature? (y/N/q)" msgstr "删除这个无效的签名吗？(y/N/q)" -#: g10/keyedit.c:3172 +#: g10/keyedit.c:3174 msgid "Delete this unknown signature? (y/N/q)" msgstr "删除这个未知的签名吗？(y/N/q)" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3180 msgid "Really delete this self-signature? (y/N)" msgstr "真的要删除这个自身签名吗？(y/N)" -#: g10/keyedit.c:3192 +#: g10/keyedit.c:3194 #, c-format msgid "Deleted %d signature.\n" msgstr "已经删除了 %d 个签名。\n" -#: g10/keyedit.c:3193 +#: g10/keyedit.c:3195 #, c-format msgid "Deleted %d signatures.\n" msgstr "已经删除了 %d 个签名。\n" -#: g10/keyedit.c:3196 +#: g10/keyedit.c:3198 msgid "Nothing deleted.\n" msgstr "没有东西被删除。\n" -#: g10/keyedit.c:3229 g10/trustdb.c:1701 +#: g10/keyedit.c:3231 g10/trustdb.c:1722 msgid "invalid" msgstr "无效" -#: g10/keyedit.c:3231 +#: g10/keyedit.c:3233 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "用户标识“%s”无用部分被清除：%s\n" -#: g10/keyedit.c:3238 +#: g10/keyedit.c:3240 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgstr "用户标识“%s”：%d 个签名被清除\n" -#: g10/keyedit.c:3239 +#: g10/keyedit.c:3241 #, c-format msgid "User ID \"%s\": %d signatures removed\n" msgstr "用户标识“%s”：%d 个签名被清除\n" -#: g10/keyedit.c:3247 +#: g10/keyedit.c:3249 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "用户标识“%s”：已经最小化\n" -#: g10/keyedit.c:3248 +#: g10/keyedit.c:3250 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "用户标识“%s”：无用部分已清除\n" -#: g10/keyedit.c:3342 +#: g10/keyedit.c:3344 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3440,255 +3558,256 @@ msgstr "" "警告：这是一把 PGP2 样式的密钥。\n" " 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n" -#: g10/keyedit.c:3353 +#: g10/keyedit.c:3355 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:3375 msgid "Enter the user ID of the designated revoker: " msgstr "输入指定吊销者的用户标识：" -#: g10/keyedit.c:3398 +#: g10/keyedit.c:3400 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:3415 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:3437 msgid "this key has already been designated as a revoker\n" msgstr "这把密钥已被指定为一个吊销者\n" -#: g10/keyedit.c:3454 +#: g10/keyedit.c:3456 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n" -#: g10/keyedit.c:3460 +#: g10/keyedit.c:3462 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:3524 msgid "Please remove selections from the secret keys.\n" msgstr "请从私钥中删除选择。\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3530 msgid "Please select at most one subkey.\n" msgstr "请至多选择一个子钥。\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3534 msgid "Changing expiration time for a subkey.\n" msgstr "将要变更子钥的使用期限。\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3537 msgid "Changing expiration time for the primary key.\n" msgstr "将要变更主钥的使用期限。\n" -#: g10/keyedit.c:3584 +#: g10/keyedit.c:3586 msgid "You can't change the expiration date of a v3 key\n" msgstr "您不能变更 v3 密钥的使用期限\n" -#: g10/keyedit.c:3600 +#: g10/keyedit.c:3602 msgid "No corresponding signature in secret ring\n" msgstr "在私钥环里没有相应的签名\n" -#: g10/keyedit.c:3680 +#: g10/keyedit.c:3687 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "签名的子钥 %s 已经交叉验证\n" -#: g10/keyedit.c:3686 +#: g10/keyedit.c:3693 #, 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:3856 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:3895 g10/keyedit.c:4005 g10/keyedit.c:4125 g10/keyedit.c:4266 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "跳过用户标识“%s”的 v3 自身签名\n" -#: g10/keyedit.c:4058 +#: g10/keyedit.c:4066 msgid "Enter your preferred keyserver URL: " msgstr "输入您首选的公钥服务器的 URL：" -#: g10/keyedit.c:4138 +#: g10/keyedit.c:4146 msgid "Are you sure you want to replace it? (y/N) " msgstr "您确定要替换它吗？(y/N)" -#: g10/keyedit.c:4139 +#: g10/keyedit.c:4147 msgid "Are you sure you want to delete it? (y/N) " msgstr "您确定要删除它吗？(y/N)" -#: g10/keyedit.c:4201 +#: g10/keyedit.c:4209 msgid "Enter the notation: " msgstr "输入注记：" -#: g10/keyedit.c:4350 +#: g10/keyedit.c:4358 msgid "Proceed? (y/N) " msgstr "继续？(y/N)" -#: g10/keyedit.c:4414 +#: g10/keyedit.c:4422 #, c-format msgid "No user ID with index %d\n" msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4480 #, c-format msgid "No user ID with hash %s\n" msgstr "没有散列值为 %s 的用户标识\n" -#: g10/keyedit.c:4499 +#: g10/keyedit.c:4507 #, c-format msgid "No subkey with index %d\n" msgstr "没有索引为 %d 的子钥\n" -#: g10/keyedit.c:4634 +#: g10/keyedit.c:4642 #, 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:4645 g10/keyedit.c:4709 g10/keyedit.c:4752 #, 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:4647 g10/keyedit.c:4711 g10/keyedit.c:4754 msgid " (non-exportable)" msgstr " (不可导出)" -#: g10/keyedit.c:4643 +#: g10/keyedit.c:4651 #, c-format msgid "This signature expired on %s.\n" msgstr "这份签名已在 %s 过期。\n" -#: g10/keyedit.c:4647 +#: g10/keyedit.c:4655 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "您确定您仍然想要吊销它吗？(y/N)" -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4659 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "要为这份签名生成一份吊销证书吗？(y/N)" -#: g10/keyedit.c:4678 +#: g10/keyedit.c:4686 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n" -#: g10/keyedit.c:4704 +#: g10/keyedit.c:4712 msgid " (non-revocable)" msgstr " (不可吊销)" -#: g10/keyedit.c:4711 +#: g10/keyedit.c:4719 #, c-format msgid "revoked by your key %s on %s\n" msgstr "由您的密钥 %s 于 %s 吊销\n" -#: g10/keyedit.c:4733 +#: g10/keyedit.c:4741 msgid "You are about to revoke these signatures:\n" msgstr "您正在吊销这些签名：\n" -#: g10/keyedit.c:4753 +#: g10/keyedit.c:4761 msgid "Really create the revocation certificates? (y/N) " msgstr "真的要生成吊销证书吗？(y/N)" -#: g10/keyedit.c:4783 +#: g10/keyedit.c:4791 msgid "no secret key\n" msgstr "没有私钥\n" -#: g10/keyedit.c:4853 +#: g10/keyedit.c:4861 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "用户标识“%s”已经被吊销。\n" -#: g10/keyedit.c:4870 +#: g10/keyedit.c:4878 #, 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:4942 #, c-format msgid "Key %s is already revoked.\n" msgstr "密钥 %s 已被吊销。\n" -#: g10/keyedit.c:4996 +#: g10/keyedit.c:5004 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "子钥 %s 已被吊销。\n" -#: g10/keyedit.c:5091 +#: g10/keyedit.c:5099 #, 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:266 #, c-format msgid "preference `%s' duplicated\n" msgstr "首选项‘%s’重复\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many cipher preferences\n" msgstr "太多对称加密算法首选项\n" -#: g10/keygen.c:272 +#: g10/keygen.c:275 msgid "too many digest preferences\n" msgstr "太多散列算法首选项\n" -#: g10/keygen.c:274 +#: g10/keygen.c:277 msgid "too many compression preferences\n" msgstr "太多首选压缩算法\n" -#: g10/keygen.c:399 +#: g10/keygen.c:417 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "首选项字符串里有无效项‘%s’\n" -#: g10/keygen.c:874 +#: g10/keygen.c:898 msgid "writing direct signature\n" msgstr "正在写入直接签名\n" -#: g10/keygen.c:913 +#: g10/keygen.c:938 msgid "writing self signature\n" msgstr "正在写入自身签名\n" -#: g10/keygen.c:963 +#: g10/keygen.c:989 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:2787 +#: g10/keygen.c:1052 g10/keygen.c:1135 g10/keygen.c:1140 g10/keygen.c:1265 +#: g10/keygen.c:2952 #, 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:2793 +#: g10/keygen.c:1057 g10/keygen.c:1146 g10/keygen.c:1154 g10/keygen.c:1270 +#: g10/keygen.c:2958 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "密钥尺寸舍入到 %u 位\n" -#: g10/keygen.c:1329 +#: g10/keygen.c:1363 msgid "Sign" msgstr "签名" -#: g10/keygen.c:1332 +#: g10/keygen.c:1366 msgid "Certify" msgstr "验证" -#: g10/keygen.c:1335 +#: g10/keygen.c:1369 msgid "Encrypt" msgstr "加密" -#: g10/keygen.c:1338 +#: g10/keygen.c:1372 msgid "Authenticate" msgstr "认证" @@ -3701,109 +3820,104 @@ msgstr "认证" #. a = Toggle authentication capability #. q = Finish #. -#: g10/keygen.c:1355 +#: g10/keygen.c:1389 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1378 +#: g10/keygen.c:1412 #, c-format msgid "Possible actions for a %s key: " msgstr "%s 密钥可能的操作：" -#: g10/keygen.c:1382 +#: g10/keygen.c:1416 msgid "Current allowed actions: " msgstr "目前允许的操作：" -#: g10/keygen.c:1387 +#: g10/keygen.c:1421 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) 选择是否用于签名\n" -#: g10/keygen.c:1390 +#: g10/keygen.c:1424 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) 选择是否用于加密\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1427 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) 选择是否用于认证\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1430 #, c-format msgid " (%c) Finished\n" msgstr " (%c) 已完成\n" -#: g10/keygen.c:1452 +#: g10/keygen.c:1490 msgid "Please select what kind of key you want:\n" msgstr "请选择您要使用的密钥种类：\n" -#: g10/keygen.c:1454 -#, c-format -msgid " (%d) DSA and Elgamal (default)\n" +#: g10/keygen.c:1492 +#, fuzzy, c-format +msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) DSA 和 ElGamal (默认)\n" -#: g10/keygen.c:1455 +#: g10/keygen.c:1494 +#, fuzzy, c-format +msgid " (%d) DSA and Elgamal\n" +msgstr " (%d) DSA 和 ElGamal (默认)\n" + +#: g10/keygen.c:1496 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (仅用于签名)\n" -#: g10/keygen.c:1457 +#: g10/keygen.c:1497 #, c-format -msgid " (%d) DSA (set your own capabilities)\n" -msgstr " (%d) DSA (自定义用途)\n" +msgid " (%d) RSA (sign only)\n" +msgstr " (%d) RSA (仅用于签名)\n" -#: g10/keygen.c:1459 +#: g10/keygen.c:1501 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (仅用于加密)\n" -#: g10/keygen.c:1460 -#, c-format -msgid " (%d) RSA (sign only)\n" -msgstr " (%d) RSA (仅用于签名)\n" - -#: g10/keygen.c:1462 +#: g10/keygen.c:1502 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (仅用于加密)\n" -#: g10/keygen.c:1464 +#: g10/keygen.c:1506 #, c-format -msgid " (%d) RSA (set your own capabilities)\n" -msgstr " (%d) RSA (自定义用途)\n" +msgid " (%d) DSA (set your own capabilities)\n" +msgstr " (%d) DSA (自定义用途)\n" -#: g10/keygen.c:1533 +#: g10/keygen.c:1507 #, c-format -msgid "DSA keypair will have %u bits.\n" -msgstr "DSA 密钥对会有 %u 位。\n" +msgid " (%d) RSA (set your own capabilities)\n" +msgstr " (%d) RSA (自定义用途)\n" -#: g10/keygen.c:1543 +#: g10/keygen.c:1615 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n" -#: g10/keygen.c:1550 -#, c-format -msgid "What keysize do you want? (%u) " +#: g10/keygen.c:1623 +#, fuzzy, c-format +msgid "What keysize do you want for the subkey? (%u) " msgstr "您想要用多大的密钥尺寸？(%u)" -#: g10/keygen.c:1564 +#: g10/keygen.c:1626 #, c-format -msgid "%s keysizes must be in the range %u-%u\n" -msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n" +msgid "What keysize do you want? (%u) " +msgstr "您想要用多大的密钥尺寸？(%u)" -#: g10/keygen.c:1570 +#: g10/keygen.c:1641 #, c-format msgid "Requested keysize is %u bits\n" msgstr "您所要求的密钥尺寸是 %u 位\n" -#: g10/keygen.c:1575 g10/keygen.c:1580 -#, c-format -msgid "rounded up to %u bits\n" -msgstr "舍入到 %u 位\n" - -#: g10/keygen.c:1629 +#: g10/keygen.c:1721 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3819,7 +3933,7 @@ msgstr "" " <n>m = 密钥在 n 月后过期\n" " <n>y = 密钥在 n 年后过期\n" -#: g10/keygen.c:1640 +#: g10/keygen.c:1732 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3835,38 +3949,38 @@ msgstr "" " <n>m = 签名在 n 月后过期\n" " <n>y = 签名在 n 年后过期\n" -#: g10/keygen.c:1661 +#: g10/keygen.c:1753 msgid "Key is valid for? (0) " msgstr "密钥的有效期限是？(0) " -#: g10/keygen.c:1666 +#: g10/keygen.c:1758 #, c-format msgid "Signature is valid for? (%s) " msgstr "签名的有效期限是多久？(%s) " -#: g10/keygen.c:1684 +#: g10/keygen.c:1776 g10/keygen.c:1801 msgid "invalid value\n" msgstr "无效的数值\n" -#: g10/keygen.c:1691 +#: g10/keygen.c:1783 msgid "Key does not expire at all\n" msgstr "密钥永远不会过期\n" -#: g10/keygen.c:1692 +#: g10/keygen.c:1784 msgid "Signature does not expire at all\n" msgstr "签名永远不会过期\n" -#: g10/keygen.c:1697 +#: g10/keygen.c:1789 #, c-format msgid "Key expires at %s\n" msgstr "密钥于 %s 过期\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1790 #, c-format msgid "Signature expires at %s\n" msgstr "签名于 %s 过期\n" -#: g10/keygen.c:1704 +#: g10/keygen.c:1794 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3874,11 +3988,11 @@ msgstr "" "您的系统无法显示 2038 年以后的日期。\n" "不过，它可以正确处理 2106 年之前的年份。\n" -#: g10/keygen.c:1709 +#: g10/keygen.c:1807 msgid "Is this correct? (y/N) " msgstr "以上正确吗？(y/n)" -#: g10/keygen.c:1724 +#: g10/keygen.c:1822 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3894,44 +4008,44 @@ msgstr "" " “Heinrich Heine (Der Dichter) <[email protected]>”\n" "\n" -#: g10/keygen.c:1737 +#: g10/keygen.c:1835 msgid "Real name: " msgstr "真实姓名：" -#: g10/keygen.c:1745 +#: g10/keygen.c:1843 msgid "Invalid character in name\n" msgstr "姓名含有无效的字符\n" -#: g10/keygen.c:1747 +#: g10/keygen.c:1845 msgid "Name may not start with a digit\n" msgstr "姓名不可以用数字开头\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1847 msgid "Name must be at least 5 characters long\n" msgstr "姓名至少要有五个字符长\n" -#: g10/keygen.c:1757 +#: g10/keygen.c:1855 msgid "Email address: " msgstr "电子邮件地址：" -#: g10/keygen.c:1763 +#: g10/keygen.c:1861 msgid "Not a valid email address\n" msgstr "电子邮件地址无效\n" -#: g10/keygen.c:1771 +#: g10/keygen.c:1869 msgid "Comment: " msgstr "注释：" -#: g10/keygen.c:1777 +#: g10/keygen.c:1875 msgid "Invalid character in comment\n" msgstr "注释含有无效的字符\n" -#: g10/keygen.c:1800 +#: g10/keygen.c:1898 #, c-format msgid "You are using the `%s' character set.\n" msgstr "您正在使用‘%s’字符集。\n" -#: g10/keygen.c:1806 +#: g10/keygen.c:1904 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3942,7 +4056,7 @@ msgstr "" " “%s”\n" "\n" -#: g10/keygen.c:1811 +#: g10/keygen.c:1909 msgid "Please don't put the email address into the real name or the comment\n" msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n" @@ -3957,23 +4071,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n" #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1827 +#: g10/keygen.c:1925 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1837 +#: g10/keygen.c:1935 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？" -#: g10/keygen.c:1838 +#: g10/keygen.c:1936 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？" -#: g10/keygen.c:1857 +#: g10/keygen.c:1955 msgid "Please correct the error first\n" msgstr "请先改正错误\n" -#: g10/keygen.c:1897 +#: g10/keygen.c:1995 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3981,12 +4095,12 @@ msgstr "" "您需要一个密码来保护您的私钥。\n" "\n" -#: g10/keygen.c:1907 g10/passphrase.c:808 +#: g10/keygen.c:2005 g10/passphrase.c:808 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1913 +#: g10/keygen.c:2011 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" @@ -3998,7 +4112,7 @@ msgstr "" "再次执行这个程序，并且使用“--edit-key”选项即可。\n" "\n" -#: g10/keygen.c:1935 +#: g10/keygen.c:2033 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" @@ -4008,50 +4122,50 @@ msgstr "" "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n" "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n" -#: g10/keygen.c:2733 +#: g10/keygen.c:2898 msgid "Key generation canceled.\n" msgstr "密钥生成已取消。\n" -#: g10/keygen.c:2932 g10/keygen.c:3079 +#: g10/keygen.c:3098 g10/keygen.c:3265 #, c-format msgid "writing public key to `%s'\n" msgstr "正在将公钥写至`%s'\n" -#: g10/keygen.c:2934 g10/keygen.c:3082 +#: g10/keygen.c:3100 g10/keygen.c:3268 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "向‘%s’写入私钥占位符\n" -#: g10/keygen.c:2937 g10/keygen.c:3085 +#: g10/keygen.c:3103 g10/keygen.c:3271 #, c-format msgid "writing secret key to `%s'\n" msgstr "正在将私钥写至`%s'\n" -#: g10/keygen.c:3068 +#: g10/keygen.c:3254 #, c-format msgid "no writable public keyring found: %s\n" msgstr "找不到可写的公钥钥匙环：%s\n" -#: g10/keygen.c:3074 +#: g10/keygen.c:3260 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "找不到可写的私钥钥匙环：%s\n" -#: g10/keygen.c:3092 +#: g10/keygen.c:3278 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n" -#: g10/keygen.c:3099 +#: g10/keygen.c:3285 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n" -#: g10/keygen.c:3122 +#: g10/keygen.c:3308 msgid "public and secret key created and signed.\n" msgstr "公钥和私钥已经生成并经签名。\n" -#: g10/keygen.c:3133 +#: g10/keygen.c:3319 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" @@ -4059,42 +4173,42 @@ msgstr "" "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n" "生成用于加密的子钥。\n" -#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389 +#: g10/keygen.c:3331 g10/keygen.c:3463 g10/keygen.c:3580 #, c-format msgid "Key generation failed: %s\n" msgstr "生成密钥失败：%s\n" -#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242 +#: g10/keygen.c:3383 g10/keygen.c:3513 g10/sign.c:242 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n" -#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244 +#: g10/keygen.c:3385 g10/keygen.c:3515 g10/sign.c:244 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n" -#: g10/keygen.c:3208 g10/keygen.c:3337 +#: g10/keygen.c:3394 g10/keygen.c:3526 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n" -#: g10/keygen.c:3247 g10/keygen.c:3370 +#: g10/keygen.c:3433 g10/keygen.c:3559 msgid "Really create? (y/N) " msgstr "真的要建立吗？(y/N)" -#: g10/keygen.c:3535 +#: g10/keygen.c:3731 #, c-format msgid "storing key onto card failed: %s\n" msgstr "向智能卡上存储密钥时失败：%s\n" -#: g10/keygen.c:3582 +#: g10/keygen.c:3778 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "不能创建备份文件‘%s’：%s\n" -#: g10/keygen.c:3608 +#: g10/keygen.c:3804 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "注意：智能卡密钥的备份已保存到‘%s’\n" @@ -4127,246 +4241,246 @@ msgstr "签名注记：" msgid "Keyring" msgstr "钥匙环" -#: g10/keylist.c:1503 +#: g10/keylist.c:1518 msgid "Primary key fingerprint:" msgstr "主钥指纹：" -#: g10/keylist.c:1505 +#: g10/keylist.c:1520 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:1527 msgid " Primary key fingerprint:" msgstr " 主钥指纹：" -#: g10/keylist.c:1514 +#: g10/keylist.c:1529 msgid " Subkey fingerprint:" msgstr " 子钥指纹：" # use tty -#: g10/keylist.c:1518 g10/keylist.c:1522 +#: g10/keylist.c:1533 g10/keylist.c:1537 msgid " Key fingerprint =" msgstr "密钥指纹 =" -#: g10/keylist.c:1589 +#: g10/keylist.c:1604 msgid " Card serial no. =" msgstr "卡序列号 =" -#: g10/keyring.c:1244 +#: g10/keyring.c:1256 #, c-format msgid "renaming `%s' to `%s' failed: %s\n" msgstr "将‘%s’重命名为‘%s’时失败：%s\n" -#: g10/keyring.c:1250 +#: g10/keyring.c:1286 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "警告：两个文件存在有互相矛盾的信息。\n" -#: g10/keyring.c:1252 +#: g10/keyring.c:1287 #, c-format msgid "%s is the unchanged one\n" msgstr "%s 是没有改变的那一个\n" -#: g10/keyring.c:1253 +#: g10/keyring.c:1288 #, c-format msgid "%s is the new one\n" msgstr "%s 是新的那一个\n" -#: g10/keyring.c:1254 +#: g10/keyring.c:1289 msgid "Please fix this possible security flaw\n" msgstr "请修补这个可能的安全性漏洞\n" -#: g10/keyring.c:1374 +#: g10/keyring.c:1389 #, c-format msgid "caching keyring `%s'\n" msgstr "缓存钥匙环‘%s’\n" -#: g10/keyring.c:1420 +#: g10/keyring.c:1448 #, c-format msgid "%lu keys cached so far (%lu signatures)\n" msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n" -#: g10/keyring.c:1432 +#: g10/keyring.c:1460 #, c-format msgid "%lu keys cached (%lu signatures)\n" msgstr "缓存了 %lu 把密钥(%lu 份签名)\n" -#: g10/keyring.c:1503 +#: g10/keyring.c:1531 #, c-format msgid "%s: keyring created\n" msgstr "%s：钥匙环已建立\n" -#: g10/keyserver.c:67 +#: g10/keyserver.c:70 msgid "include revoked keys in search results" msgstr "在搜索结果中包含已吊销的密钥" -#: g10/keyserver.c:68 +#: g10/keyserver.c:71 msgid "include subkeys when searching by key ID" msgstr "按钥匙号搜索时包含子钥" -#: g10/keyserver.c:70 +#: g10/keyserver.c:73 msgid "use temporary files to pass data to keyserver helpers" msgstr "向公钥服务器辅助程序传递数据时使用临时文件" -#: g10/keyserver.c:72 +#: g10/keyserver.c:75 msgid "do not delete temporary files after using them" msgstr "不删除使用过的临时文件" -#: g10/keyserver.c:76 +#: g10/keyserver.c:79 msgid "automatically retrieve keys when verifying signatures" msgstr "验证签名时自动下载密钥" -#: g10/keyserver.c:78 +#: g10/keyserver.c:81 msgid "honor the preferred keyserver URL set on the key" msgstr "使用密钥中指定的首选公钥服务器 URL" -#: g10/keyserver.c:80 +#: g10/keyserver.c:83 msgid "honor the PKA record set on a key when retrieving keys" msgstr "获取密钥时使用密钥上的 PKA 记录" -#: g10/keyserver.c:146 +#: g10/keyserver.c:149 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n" -#: g10/keyserver.c:529 +#: g10/keyserver.c:532 msgid "disabled" msgstr "已禁用" -#: g10/keyserver.c:730 +#: g10/keyserver.c:733 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >" -#: g10/keyserver.c:814 g10/keyserver.c:1432 +#: g10/keyserver.c:817 g10/keyserver.c:1462 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "无效的公钥服务器协议(us %d!=handler %d)\n" -#: g10/keyserver.c:912 +#: g10/keyserver.c:915 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "在公钥服务器上找不到密钥“%s”\n" -#: g10/keyserver.c:914 +#: g10/keyserver.c:917 msgid "key not found on keyserver\n" msgstr "在公钥服务器上找不到密钥\n" -#: g10/keyserver.c:1151 +#: g10/keyserver.c:1156 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "下载密钥‘%s’，从 %s 服务器 %s\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1160 #, c-format msgid "requesting key %s from %s\n" msgstr "下载密钥 %s，从 %s\n" -#: g10/keyserver.c:1179 +#: g10/keyserver.c:1184 #, c-format msgid "searching for names from %s server %s\n" msgstr "在 %s 服务器 %s 上搜索名字\n" -#: g10/keyserver.c:1182 +#: g10/keyserver.c:1187 #, c-format msgid "searching for names from %s\n" msgstr "在 %s 上搜索名字\n" -#: g10/keyserver.c:1335 +#: g10/keyserver.c:1365 #, c-format msgid "sending key %s to %s server %s\n" msgstr "将密钥‘%s’上传到 %s 服务器 %s\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1369 #, c-format msgid "sending key %s to %s\n" msgstr "将密钥‘%s’上传到 %s\n" -#: g10/keyserver.c:1382 +#: g10/keyserver.c:1412 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "搜索“%s”，在 %s 服务器 %s 上\n" -#: g10/keyserver.c:1385 +#: g10/keyserver.c:1415 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "搜索“%s”，在 %s 上\n" -#: g10/keyserver.c:1392 g10/keyserver.c:1488 +#: g10/keyserver.c:1422 g10/keyserver.c:1518 msgid "no keyserver action!\n" msgstr "公钥服务器无动作！\n" -#: g10/keyserver.c:1440 +#: g10/keyserver.c:1470 #, 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:1479 msgid "keyserver did not send VERSION\n" msgstr "公钥服务器未发送 VERSION\n" -#: g10/keyserver.c:1511 g10/keyserver.c:2039 +#: g10/keyserver.c:1541 g10/keyserver.c:2063 msgid "no keyserver known (use option --keyserver)\n" msgstr "未给出公钥服务器(使用 --keyserver 选项)\n" -#: g10/keyserver.c:1517 +#: g10/keyserver.c:1547 msgid "external keyserver calls are not supported in this build\n" msgstr "这一编译版本不支持外部调用公钥服务器\n" -#: g10/keyserver.c:1529 +#: g10/keyserver.c:1559 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "没有处理‘%s’公钥服务器的程序\n" -#: g10/keyserver.c:1534 +#: g10/keyserver.c:1564 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1572 #, c-format msgid "%s does not support handler version %d\n" msgstr "%s 不支持对版本 %d 的处理\n" -#: g10/keyserver.c:1549 +#: g10/keyserver.c:1579 msgid "keyserver timed out\n" msgstr "公钥服务器超时\n" -#: g10/keyserver.c:1554 +#: g10/keyserver.c:1584 msgid "keyserver internal error\n" msgstr "公钥服务器内部错误\n" -#: g10/keyserver.c:1563 +#: g10/keyserver.c:1593 #, c-format msgid "keyserver communications error: %s\n" msgstr "公钥服务器通讯错误：%s\n" -#: g10/keyserver.c:1588 g10/keyserver.c:1622 +#: g10/keyserver.c:1618 g10/keyserver.c:1652 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "“%s”不是一个用户标识：跳过\n" -#: g10/keyserver.c:1881 +#: g10/keyserver.c:1911 #, 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:1933 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1 个密钥正从 %s 得到更新\n" -#: g10/keyserver.c:1905 +#: g10/keyserver.c:1935 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%d 个密钥正从 %s 得到更新\n" -#: g10/keyserver.c:1961 +#: g10/keyserver.c:1991 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "警告：无法获取 URI %s：%s\n" -#: g10/keyserver.c:1967 +#: g10/keyserver.c:1997 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "不能解析 URI %s\n" @@ -4518,62 +4632,62 @@ msgstr "完好的签名，来自于“%s”" msgid "[uncertain]" msgstr "[不确定]" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1809 #, c-format msgid " aka \"%s\"" msgstr " 亦即“%s”" -#: g10/mainproc.c:1906 +#: g10/mainproc.c:1907 #, c-format msgid "Signature expired %s\n" msgstr "这份签名已于 %s 过期。\n" -#: g10/mainproc.c:1911 +#: g10/mainproc.c:1912 #, c-format msgid "Signature expires %s\n" msgstr "这份签名在 %s 过期。\n" -#: g10/mainproc.c:1914 +#: g10/mainproc.c:1915 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s 签名，散列算法 %s\n" -#: g10/mainproc.c:1915 +#: g10/mainproc.c:1916 msgid "binary" msgstr "二进制" -#: g10/mainproc.c:1916 +#: g10/mainproc.c:1917 msgid "textmode" msgstr "文本模式" -#: g10/mainproc.c:1916 g10/trustdb.c:529 +#: g10/mainproc.c:1917 g10/trustdb.c:550 msgid "unknown" msgstr "未知" -#: g10/mainproc.c:1936 +#: g10/mainproc.c:1937 #, c-format msgid "Can't check signature: %s\n" msgstr "无法检查签名：%s\n" -#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107 +#: g10/mainproc.c:2006 g10/mainproc.c:2022 g10/mainproc.c:2108 msgid "not a detached signature\n" msgstr "不是一份分离的签名\n" -#: g10/mainproc.c:2048 +#: g10/mainproc.c:2049 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "警告：检测到多重签名。只检查第一个签名。\n" -#: g10/mainproc.c:2056 +#: g10/mainproc.c:2057 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "等级 0x%02x 的独立签名\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2114 msgid "old style (PGP 2.x) signature\n" msgstr "旧式(PGP 2.x)签名\n" -#: g10/mainproc.c:2123 +#: g10/mainproc.c:2124 msgid "invalid root packet detected in proc_tree()\n" msgstr "在 proc_tree() 中检测到无效的根包\n" @@ -4612,59 +4726,64 @@ msgstr "警告：使用试验性质的对称加密算法 %s\n" msgid "WARNING: using experimental digest algorithm %s\n" msgstr "警告：使用试验性质的散列算法 %s\n" -#: g10/misc.c:353 -#, c-format -msgid "WARNING: digest algorithm %s is deprecated\n" -msgstr "警告：不建议使用散列算法 %s\n" - -#: g10/misc.c:459 +#: g10/misc.c:458 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA 算法插件不存在\n" -#: g10/misc.c:460 g10/sig-check.c:101 +#: g10/misc.c:459 g10/misc.c:477 g10/misc.c:492 g10/sig-check.c:101 #, c-format msgid "please see %s for more information\n" msgstr "请参见 %s 以得到更多信息。\n" -#: g10/misc.c:693 +#: g10/misc.c:475 +#, c-format +msgid "WARNING: digest algorithm %s is deprecated\n" +msgstr "警告：不建议使用散列算法 %s\n" + +#: g10/misc.c:491 +#, fuzzy, c-format +msgid "NOTE: This feature is not available in %s\n" +msgstr "注意：%s 本版本中不可用\n" + +#: g10/misc.c:748 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d：不建议使用该选项“%s”\n" -#: g10/misc.c:697 +#: g10/misc.c:752 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "警告：“%s”选项已不建议使用\n" -#: g10/misc.c:699 +#: g10/misc.c:754 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "请以“%s%s”代替\n" -#: g10/misc.c:706 +#: g10/misc.c:761 #, c-format msgid "WARNING: \"%s\" is a deprecated command - do not use it\n" msgstr "警告：“%s”命令已不建议使用——不要使用它\n" -#: g10/misc.c:719 +#: g10/misc.c:774 msgid "Uncompressed" msgstr "不压缩" -#: g10/misc.c:744 +#: g10/misc.c:799 msgid "uncompressed|none" msgstr "未压缩|无" -#: g10/misc.c:871 +#: g10/misc.c:926 #, c-format msgid "this message may not be usable by %s\n" msgstr "%s 也许不能使用这个报文\n" -#: g10/misc.c:1046 +#: g10/misc.c:1101 #, c-format msgid "ambiguous option `%s'\n" msgstr "有歧义的选项‘%s’\n" -#: g10/misc.c:1071 +#: g10/misc.c:1126 #, c-format msgid "unknown option `%s'\n" msgstr "未知的选项 '%s'\n" @@ -4716,11 +4835,11 @@ msgstr "已创建目录‘%s’\n" msgid "can't handle public key algorithm %d\n" msgstr "无法操作公钥算法 %d\n" -#: g10/parse-packet.c:747 +#: g10/parse-packet.c:756 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "警告：潜在不安全的对称加密会话密钥\n" -#: g10/parse-packet.c:1198 +#: g10/parse-packet.c:1207 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "%d 类别的子包设定了关键位\n" @@ -4804,7 +4923,7 @@ msgstr " (主钥 %s 的子钥)" msgid "Repeat passphrase: " msgstr "请再输入一次密码：" -#: g10/photoid.c:71 +#: g10/photoid.c:72 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -4817,58 +4936,58 @@ msgstr "" "片会被存放在您的公钥里。如果您挑了非常大的图片的话，您的密钥也会变得非\n" "常大！请尽量把图片尺寸控制在240x288左右，这是个理想的尺寸。\n" -#: g10/photoid.c:93 +#: g10/photoid.c:94 msgid "Enter JPEG filename for photo ID: " msgstr "输入要当作相片标识的JPEG文件名： " -#: g10/photoid.c:114 +#: g10/photoid.c:115 #, c-format msgid "unable to open JPEG file `%s': %s\n" msgstr "无法打开 JPEG 文件‘%s’：%s\n" -#: g10/photoid.c:125 +#: g10/photoid.c:126 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "这个 JPEG 文件太大了(%d 字节)！\n" -#: g10/photoid.c:127 +#: g10/photoid.c:128 msgid "Are you sure you want to use it? (y/N) " msgstr "您确定要用它吗？(y/N)" -#: g10/photoid.c:144 +#: g10/photoid.c:145 #, c-format msgid "`%s' is not a JPEG file\n" msgstr "“%s”不是一个 JPEG 文件\n" -#: g10/photoid.c:163 +#: g10/photoid.c:164 msgid "Is this photo correct (y/N/q)? " msgstr "这张照片正确吗？(y/N/q)" -#: g10/photoid.c:327 +#: g10/photoid.c:332 msgid "no photo viewer set\n" msgstr "没有设置照片查看程序\n" -#: g10/photoid.c:381 +#: g10/photoid.c:386 msgid "unable to display photo ID!\n" msgstr "无法显示照片标识！\n" -#: g10/pkclist.c:63 g10/revoke.c:621 +#: g10/pkclist.c:63 g10/revoke.c:619 msgid "No reason specified" msgstr "未指定原因" -#: g10/pkclist.c:65 g10/revoke.c:623 +#: g10/pkclist.c:65 g10/revoke.c:621 msgid "Key is superseded" msgstr "密钥被替换" -#: g10/pkclist.c:67 g10/revoke.c:622 +#: g10/pkclist.c:67 g10/revoke.c:620 msgid "Key has been compromised" msgstr "密钥已泄漏" -#: g10/pkclist.c:69 g10/revoke.c:624 +#: g10/pkclist.c:69 g10/revoke.c:622 msgid "Key is no longer used" msgstr "密钥不再使用" -#: g10/pkclist.c:71 g10/revoke.c:625 +#: g10/pkclist.c:71 g10/revoke.c:623 msgid "User ID is no longer valid" msgstr "用户标识不再有效" @@ -4889,44 +5008,44 @@ msgstr "iImMqQsS" msgid "No trust value assigned to:\n" msgstr "下列项目没有指定信任度：\n" -#: g10/pkclist.c:247 +#: g10/pkclist.c:248 #, c-format msgid " aka \"%s\"\n" msgstr " 亦即“%s”\n" -#: g10/pkclist.c:257 +#: g10/pkclist.c:258 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:273 #, c-format msgid " %d = I don't know or won't say\n" msgstr " %d = 我不知道或我不作答\n" -#: g10/pkclist.c:274 +#: g10/pkclist.c:275 #, c-format msgid " %d = I do NOT trust\n" msgstr " %d = 我不相信\n" -#: g10/pkclist.c:280 +#: g10/pkclist.c:281 #, c-format msgid " %d = I trust ultimately\n" msgstr " %d = 我绝对相信\n" -#: g10/pkclist.c:286 +#: g10/pkclist.c:287 msgid " m = back to the main menu\n" msgstr " m = 回到主菜单\n" -#: g10/pkclist.c:289 +#: g10/pkclist.c:290 msgid " s = skip this key\n" msgstr " s = 跳过这把密钥\n" -#: g10/pkclist.c:290 +#: g10/pkclist.c:291 msgid " q = quit\n" msgstr " q = 退出\n" -#: g10/pkclist.c:294 +#: g10/pkclist.c:295 #, c-format msgid "" "The minimum trust level for this key is: %s\n" @@ -4935,37 +5054,37 @@ msgstr "" "这把密钥的最小信任等级为：%s\n" "\n" -#: g10/pkclist.c:300 g10/revoke.c:650 +#: g10/pkclist.c:301 g10/revoke.c:648 msgid "Your decision? " msgstr "您的决定是什么？" -#: g10/pkclist.c:321 +#: g10/pkclist.c:322 msgid "Do you really want to set this key to ultimate trust? (y/N) " msgstr "您真的要把这把密钥设成绝对信任？(y/N)" -#: g10/pkclist.c:335 +#: g10/pkclist.c:336 msgid "Certificates leading to an ultimately trusted key:\n" msgstr "被绝对信任的密钥的证书：\n" -#: g10/pkclist.c:420 +#: g10/pkclist.c:421 #, 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:426 #, 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:432 msgid "This key probably belongs to the named user\n" msgstr "这把密钥有可能属于它所声称的持有者\n" -#: g10/pkclist.c:436 +#: g10/pkclist.c:437 msgid "This key belongs to us\n" msgstr "这把密钥是属于我们的\n" -#: g10/pkclist.c:462 +#: g10/pkclist.c:463 msgid "" "It is NOT certain that the key belongs to the person named\n" "in the user ID. If you *really* know what you are doing,\n" @@ -4974,105 +5093,105 @@ msgstr "" "这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n" "己在做什么，您可以在下一个问题回答 yes。\n" -#: g10/pkclist.c:469 +#: g10/pkclist.c:470 msgid "Use this key anyway? (y/N) " msgstr "无论如何还是使用这把密钥吗？(y/N)" -#: g10/pkclist.c:503 +#: g10/pkclist.c:504 msgid "WARNING: Using untrusted key!\n" msgstr "警告：正在使用不被信任的密钥！\n" -#: g10/pkclist.c:510 +#: g10/pkclist.c:511 msgid "WARNING: this key might be revoked (revocation key not present)\n" msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n" -#: g10/pkclist.c:519 +#: g10/pkclist.c:520 msgid "WARNING: This key has been revoked by its designated revoker!\n" msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n" -#: g10/pkclist.c:522 +#: g10/pkclist.c:523 msgid "WARNING: This key has been revoked by its owner!\n" msgstr "警告：这把密钥已经被它的持有者吊销了！\n" -#: g10/pkclist.c:523 +#: g10/pkclist.c:524 msgid " This could mean that the signature is forged.\n" msgstr " 这表明这个签名有可能是伪造的。\n" -#: g10/pkclist.c:529 +#: g10/pkclist.c:530 msgid "WARNING: This subkey has been revoked by its owner!\n" msgstr "警告：这把子钥已经被它的持有者吊销了！\n" -#: g10/pkclist.c:534 +#: g10/pkclist.c:535 msgid "Note: This key has been disabled.\n" msgstr "注意：这把密钥已经被禁用了。\n" -#: g10/pkclist.c:554 +#: g10/pkclist.c:555 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "注意：验证过的签名者的地址是‘%s’\n" -#: g10/pkclist.c:561 +#: g10/pkclist.c:562 #, 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:574 msgid "trustlevel adjusted to FULL due to valid PKA info\n" msgstr "PKA 信息有效，信任级别调整到“完全”\n" -#: g10/pkclist.c:581 +#: g10/pkclist.c:582 msgid "trustlevel adjusted to NEVER due to bad PKA info\n" msgstr "PKA 信息无效，信任级别调整到“从不”\n" -#: g10/pkclist.c:592 +#: g10/pkclist.c:593 msgid "Note: This key has expired!\n" msgstr "注意：这把密钥已经过期了！\n" -#: g10/pkclist.c:603 +#: g10/pkclist.c:604 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "警告：这把密钥未经受信任的签名认证！\n" -#: g10/pkclist.c:605 +#: g10/pkclist.c:606 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " 没有证据表明这个签名属于它所声称的持有者。\n" -#: g10/pkclist.c:613 +#: g10/pkclist.c:614 msgid "WARNING: We do NOT trust this key!\n" msgstr "警告：我们不信任这把密钥！\n" -#: g10/pkclist.c:614 +#: g10/pkclist.c:615 msgid " The signature is probably a FORGERY.\n" msgstr " 这个签名很有可能是伪造的。\n" -#: g10/pkclist.c:622 +#: g10/pkclist.c:623 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "警告：这把密钥未经有足够信任度的签名所认证。\n" -#: g10/pkclist.c:624 +#: g10/pkclist.c:625 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:824 g10/pkclist.c:866 g10/pkclist.c:1078 g10/pkclist.c:1148 #, c-format msgid "%s: skipped: %s\n" msgstr "%s：已跳过：%s\n" -#: g10/pkclist.c:835 g10/pkclist.c:1115 +#: g10/pkclist.c:836 g10/pkclist.c:1116 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: 已跳过：公钥已存在\n" -#: g10/pkclist.c:886 +#: g10/pkclist.c:887 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n" -#: g10/pkclist.c:910 +#: g10/pkclist.c:911 msgid "Current recipients:\n" msgstr "当前收件人：\n" -#: g10/pkclist.c:936 +#: g10/pkclist.c:937 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -5080,33 +5199,33 @@ msgstr "" "\n" "输入用户标识。以空白行结束：" -#: g10/pkclist.c:961 +#: g10/pkclist.c:962 msgid "No such user ID.\n" msgstr "没有这个用户标识。\n" -#: g10/pkclist.c:970 g10/pkclist.c:1044 +#: g10/pkclist.c:971 g10/pkclist.c:1045 msgid "skipped: public key already set as default recipient\n" msgstr "已跳过：公钥已被设为默认收件者\n" -#: g10/pkclist.c:991 +#: g10/pkclist.c:992 msgid "Public key is disabled.\n" msgstr "公钥被禁用。\n" -#: g10/pkclist.c:1000 +#: g10/pkclist.c:1001 msgid "skipped: public key already set\n" msgstr "已跳过：公钥已被设定\n" -#: g10/pkclist.c:1035 +#: g10/pkclist.c:1036 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "未知的默认收件者“%s”\n" -#: g10/pkclist.c:1093 +#: g10/pkclist.c:1094 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s：已跳过：公钥已被禁用\n" -#: g10/pkclist.c:1155 +#: g10/pkclist.c:1156 msgid "no valid addressees\n" msgstr "没有有效的地址\n" @@ -5173,7 +5292,7 @@ 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:186 g10/revoke.c:584 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet 失败：%s\n" @@ -5195,11 +5314,11 @@ msgstr "(这是一把敏感的吊销密钥)\n" 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:327 g10/revoke.c:550 msgid "ASCII armored output forced.\n" msgstr "已强行使用 ASCII 封装过的输出。\n" -#: g10/revoke.c:342 g10/revoke.c:566 +#: g10/revoke.c:342 g10/revoke.c:564 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 失败： %s\n" @@ -5218,28 +5337,28 @@ msgstr "没有找到“%s”的吊销密钥\n" msgid "secret key \"%s\" not found: %s\n" msgstr "找不到私钥“%s”：%s\n" -#: g10/revoke.c:498 +#: g10/revoke.c:496 #, c-format msgid "no corresponding public key: %s\n" msgstr "没有相对应的公钥：%s\n" -#: g10/revoke.c:509 +#: g10/revoke.c:507 msgid "public key does not match secret key!\n" msgstr "公钥与私钥不吻合！\n" -#: g10/revoke.c:516 +#: g10/revoke.c:514 msgid "Create a revocation certificate for this key? (y/N) " msgstr "要为这把密钥建立一份吊销证书吗？(y/N)" -#: g10/revoke.c:533 +#: g10/revoke.c:531 msgid "unknown protection algorithm\n" msgstr "未知的保护算法\n" -#: g10/revoke.c:541 +#: g10/revoke.c:539 msgid "NOTE: This key is not protected!\n" msgstr "注意：这把密钥没有被保护！\n" -#: g10/revoke.c:592 +#: g10/revoke.c:590 msgid "" "Revocation certificate created.\n" "\n" @@ -5257,33 +5376,33 @@ msgstr "" "小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n" "人也能够看得到的地方！\n" -#: g10/revoke.c:633 +#: g10/revoke.c:631 msgid "Please select the reason for the revocation:\n" msgstr "请选择吊销的原因：\n" -#: g10/revoke.c:643 +#: g10/revoke.c:641 msgid "Cancel" msgstr "取消" -#: g10/revoke.c:645 +#: g10/revoke.c:643 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(也许您会想要在这里选择 %d)\n" -#: g10/revoke.c:686 +#: g10/revoke.c:684 msgid "Enter an optional description; end it with an empty line:\n" msgstr "请输入描述(可选)；以空白行结束：\n" -#: g10/revoke.c:714 +#: g10/revoke.c:712 #, c-format msgid "Reason for revocation: %s\n" msgstr "吊销原因：%s\n" -#: g10/revoke.c:716 +#: g10/revoke.c:714 msgid "(No description given)\n" msgstr "(不给定描述)\n" -#: g10/revoke.c:721 +#: g10/revoke.c:719 msgid "Is this okay? (y/N) " msgstr "这样可以吗？ (y/N)" @@ -5355,44 +5474,44 @@ msgstr "警告：签名的子钥 %s 未经交叉验证\n" msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "警告：签名的子钥 %s 交叉验证无效\n" -#: g10/sig-check.c:179 +#: g10/sig-check.c:191 #, 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:192 #, c-format msgid "public key %s is %lu seconds newer than the signature\n" msgstr "公钥 %s 在其签名后 %lu 秒生成\n" -#: g10/sig-check.c:191 +#: g10/sig-check.c:203 #, 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 +#: g10/sig-check.c:205 #, 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:203 +#: g10/sig-check.c:215 #, c-format msgid "NOTE: signature key %s expired %s\n" msgstr "注意：签名密钥 %s 已于 %s 过期\n" -#: g10/sig-check.c:311 +#: g10/sig-check.c:329 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n" -#: g10/sig-check.c:568 +#: g10/sig-check.c:587 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n" -#: g10/sig-check.c:594 +#: g10/sig-check.c:613 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n" @@ -5520,12 +5639,12 @@ msgstr "读取‘%s’错误：%s\n" msgid "trustdb: sync failed: %s\n" msgstr "信任度数据库：同步失败：%s\n" -#: g10/tdbio.c:127 g10/tdbio.c:1443 +#: g10/tdbio.c:127 g10/tdbio.c:1444 #, 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:133 g10/tdbio.c:1451 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n" @@ -5569,84 +5688,85 @@ msgstr "%s：建立了无效的信任度数据库\n" msgid "%s: trustdb created\n" msgstr "%s：建立了信任度数据库\n" -#: g10/tdbio.c:600 +#: g10/tdbio.c:601 msgid "NOTE: trustdb not writable\n" msgstr "注意：信任度数据库不可写入\n" -#: g10/tdbio.c:617 +#: g10/tdbio.c:618 #, c-format msgid "%s: invalid trustdb\n" msgstr "%s：无效的信任度数据库\n" -#: g10/tdbio.c:649 +#: g10/tdbio.c:650 #, c-format msgid "%s: failed to create hashtable: %s\n" msgstr "%s：建立散列表失败：%s\n" -#: g10/tdbio.c:657 +#: g10/tdbio.c:658 #, 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:675 g10/tdbio.c:695 g10/tdbio.c:711 g10/tdbio.c:725 +#: g10/tdbio.c:755 g10/tdbio.c:1377 g10/tdbio.c:1404 #, c-format msgid "%s: error reading version record: %s\n" msgstr "%s：读取版本记录时出错： %s\n" -#: g10/tdbio.c:733 +#: g10/tdbio.c:734 #, c-format msgid "%s: error writing version record: %s\n" msgstr "%s：写入版本记录时出错：%s\n" -#: g10/tdbio.c:1172 +#: g10/tdbio.c:1173 #, c-format msgid "trustdb: lseek failed: %s\n" msgstr "信任度数据库：lseek 失败：%s\n" -#: g10/tdbio.c:1180 +#: g10/tdbio.c:1181 #, c-format msgid "trustdb: read failed (n=%d): %s\n" msgstr "信任度数据库：read 失败(n=%d)：%s\n" -#: g10/tdbio.c:1201 +#: g10/tdbio.c:1202 #, c-format msgid "%s: not a trustdb file\n" msgstr "%s：不是一个信任度数据库文件\n" -#: g10/tdbio.c:1219 +#: g10/tdbio.c:1220 #, c-format msgid "%s: version record with recnum %lu\n" msgstr "%s：记录编号为%lu的版本记录\n" -#: g10/tdbio.c:1224 +#: g10/tdbio.c:1225 #, c-format msgid "%s: invalid file version %d\n" msgstr "%s：无效的文件版本%d\n" -#: g10/tdbio.c:1409 +#: g10/tdbio.c:1410 #, c-format msgid "%s: error reading free record: %s\n" msgstr "%s：读取自由记录时出错：%s\n" -#: g10/tdbio.c:1417 +#: g10/tdbio.c:1418 #, c-format msgid "%s: error writing dir record: %s\n" msgstr "%s：写入目录记录时出错：%s\n" -#: g10/tdbio.c:1427 +#: g10/tdbio.c:1428 #, c-format msgid "%s: failed to zero a record: %s\n" msgstr "%s：记录归零时失败：%s\n" -#: g10/tdbio.c:1457 +#: g10/tdbio.c:1458 #, c-format msgid "%s: failed to append a record: %s\n" msgstr "%s：附加记录时失败：%s\n" #: g10/tdbio.c:1502 -msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" -msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n" +#, fuzzy +msgid "Error: The trustdb is corrupted.\n" +msgstr "%s：建立了信任度数据库\n" #: g10/textfilter.c:147 #, c-format @@ -5693,127 +5813,135 @@ msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n" msgid "trust record %lu is not of requested type %d\n" msgstr "信任记录 %lu 不属于所请求的类别 %d\n" -#: g10/trustdb.c:445 +#: g10/trustdb.c:422 +msgid "You may try to re-create the trustdb using the commands:\n" +msgstr "" + +#: g10/trustdb.c:431 +msgid "If that does not work, please consult the manual\n" +msgstr "" + +#: g10/trustdb.c:466 #, 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:472 #, c-format msgid "using %s trust model\n" msgstr "使用 %s 信任模型\n" -#: g10/trustdb.c:503 +#: g10/trustdb.c:524 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:526 msgid "[ revoked]" msgstr "[已吊销]" -#: g10/trustdb.c:507 g10/trustdb.c:512 +#: g10/trustdb.c:528 g10/trustdb.c:533 msgid "[ expired]" msgstr "[已过期]" -#: g10/trustdb.c:511 +#: g10/trustdb.c:532 msgid "[ unknown]" msgstr "[ 未知 ]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:534 msgid "[ undef ]" msgstr "[未定义]" -#: g10/trustdb.c:514 +#: g10/trustdb.c:535 msgid "[marginal]" msgstr "[ 勉强 ]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:536 msgid "[ full ]" msgstr "[ 完全 ]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:537 msgid "[ultimate]" msgstr "[ 绝对 ]" -#: g10/trustdb.c:531 +#: g10/trustdb.c:552 msgid "undefined" msgstr "未定义" -#: g10/trustdb.c:532 +#: g10/trustdb.c:553 msgid "never" msgstr "从不" -#: g10/trustdb.c:533 +#: g10/trustdb.c:554 msgid "marginal" msgstr "勉强" -#: g10/trustdb.c:534 +#: g10/trustdb.c:555 msgid "full" msgstr "完全" -#: g10/trustdb.c:535 +#: g10/trustdb.c:556 msgid "ultimate" msgstr "绝对" -#: g10/trustdb.c:575 +#: g10/trustdb.c:596 msgid "no need for a trustdb check\n" msgstr "不需要检查信任度数据库\n" -#: g10/trustdb.c:581 g10/trustdb.c:2425 +#: g10/trustdb.c:602 g10/trustdb.c:2468 #, c-format msgid "next trustdb check due at %s\n" msgstr "下次信任度数据库检查将于 %s 进行\n" -#: g10/trustdb.c:590 +#: g10/trustdb.c:611 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n" -#: g10/trustdb.c:605 +#: g10/trustdb.c:626 #, 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:858 g10/trustdb.c:1296 #, c-format msgid "public key %s not found: %s\n" msgstr "找不到公钥 %s：%s\n" -#: g10/trustdb.c:1032 +#: g10/trustdb.c:1053 msgid "please do a --check-trustdb\n" msgstr "请执行一次 --check-trustdb\n" -#: g10/trustdb.c:1036 +#: g10/trustdb.c:1057 msgid "checking the trustdb\n" msgstr "正在检查信任度数据库\n" -#: g10/trustdb.c:2168 +#: g10/trustdb.c:2211 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n" -#: g10/trustdb.c:2233 +#: g10/trustdb.c:2276 msgid "no ultimately trusted keys found\n" msgstr "没有找到任何绝对信任的密钥\n" -#: g10/trustdb.c:2247 +#: g10/trustdb.c:2290 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "绝对信任的密钥 %s 的公钥未被找到\n" -#: g10/trustdb.c:2270 +#: g10/trustdb.c:2313 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n" -#: g10/trustdb.c:2356 +#: g10/trustdb.c:2399 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" "深度：%d 有效性：%3d 已签名：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n" -#: g10/trustdb.c:2431 +#: g10/trustdb.c:2474 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "无法更新信任度数据库版本记录：写入失败：%s\n" @@ -6072,47 +6200,47 @@ 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:379 util/miscutil.c:416 msgid "yes" msgstr "yes" -#: util/miscutil.c:329 util/miscutil.c:370 +#: util/miscutil.c:380 util/miscutil.c:421 msgid "yY" msgstr "yY" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:331 util/miscutil.c:367 +#: util/miscutil.c:382 util/miscutil.c:418 msgid "no" msgstr "no" -#: util/miscutil.c:332 util/miscutil.c:371 +#: util/miscutil.c:383 util/miscutil.c:422 msgid "nN" msgstr "nN" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:369 +#: util/miscutil.c:420 msgid "quit" msgstr "quit" -#: util/miscutil.c:372 +#: util/miscutil.c:423 msgid "qQ" msgstr "qQ" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:405 +#: util/miscutil.c:456 msgid "okay|okay" msgstr "okay|ok" #. TRANSLATORS: See doc/TRANSLATE about this string. -#: util/miscutil.c:407 +#: util/miscutil.c:458 msgid "cancel|cancel" msgstr "cancel|cancel" -#: util/miscutil.c:408 +#: util/miscutil.c:459 msgid "oO" msgstr "oO" -#: util/miscutil.c:409 +#: util/miscutil.c:460 msgid "cC" msgstr "cC" @@ -6132,6 +6260,15 @@ msgstr "安全内存未初始化，不能进行操作\n" msgid "(you may have used the wrong program for this task)\n" msgstr "(您可能使用了错误的程序来完成此项任务)\n" +#~ msgid "DSA keypair will have %u bits.\n" +#~ msgstr "DSA 密钥对会有 %u 位。\n" + +#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" +#~ msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n" + +#~ msgid "|A|Admin PIN" +#~ msgstr "|A|管理员 PIN" + #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n" #~ msgstr "无法在 v3 (PGP 2.x样式)的签名内放入注记数据\n" |