diff options
| author | Werner Koch <wk@gnupg.org> | 2005-02-03 11:21:26 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2005-02-03 11:21:26 +0100 |
| commit | 907353ed605378601679152d3c645a56c3f5d0f8 (patch) | |
| tree | 6fb7ba32e356c907f7bb1eff0ff7814b504daaed /po/zh_CN.po | |
| parent | Updated to match the switch to the NSIS installer. (diff) | |
| download | gnupg2-907353ed605378601679152d3c645a56c3f5d0f8.tar.xz gnupg2-907353ed605378601679152d3c645a56c3f5d0f8.zip | |
About to do a release candidate
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 1664 |
1 files changed, 895 insertions, 769 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index a3f2c83bd..a07bfe99b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2004-12-16 10:56+0100\n" +"POT-Creation-Date: 2005-02-03 10:35+0100\n" "PO-Revision-Date: 2004-11-08 21:30+0800\n" "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n" "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" @@ -29,9 +29,9 @@ msgstr "少于 %d 位时不能生成质数\n" msgid "no entropy gathering module detected\n" msgstr "检测不到熵数搜集模块\n" -#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682 +#: cipher/random.c:387 g10/card-util.c:640 g10/card-util.c:709 #: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488 -#: g10/g10.c:962 g10/g10.c:3222 g10/import.c:177 g10/keygen.c:2248 +#: g10/g10.c:966 g10/g10.c:3223 g10/import.c:178 g10/keygen.c:2254 #: g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333 #: g10/plaintext.c:469 g10/sign.c:761 g10/sign.c:913 g10/sign.c:1021 #: g10/sign.c:1166 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539 @@ -67,8 +67,8 @@ msgstr "无法读取‘%s’：%s\n" msgid "note: random_seed file not updated\n" msgstr "注意：随机数种子文件未被更新\n" -#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:961 g10/keygen.c:2716 -#: g10/keygen.c:2746 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 +#: cipher/random.c:473 g10/exec.c:489 g10/g10.c:965 g10/keygen.c:2722 +#: g10/keygen.c:2752 g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 #: g10/openfile.c:348 g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535 #, c-format msgid "can't create `%s': %s\n" @@ -122,143 +122,146 @@ msgstr "" "随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵数！\n" "(还需要%d字节)\n" -#: g10/app-openpgp.c:539 +#: g10/app-openpgp.c:547 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "无法存储指纹：%s\n" -#: g10/app-openpgp.c:552 +#: g10/app-openpgp.c:560 #, c-format msgid "failed to store the creation date: %s\n" msgstr "无法存储创建日期：%s\n" -#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379 +#: g10/app-openpgp.c:784 g10/app-openpgp.c:872 g10/app-openpgp.c:1376 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN 回调返回错误：%s\n" -#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385 +#: g10/app-openpgp.c:790 g10/app-openpgp.c:878 g10/app-openpgp.c:1382 #, 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:791 g10/app-openpgp.c:805 g10/app-openpgp.c:884 -#: g10/app-openpgp.c:1394 g10/app-openpgp.c:1408 +#: g10/app-openpgp.c:799 g10/app-openpgp.c:813 g10/app-openpgp.c:888 +#: g10/app-openpgp.c:1391 g10/app-openpgp.c:1405 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "验证 CHV%d 失败：%s\n" -#: g10/app-openpgp.c:828 +#: g10/app-openpgp.c:836 msgid "access to admin commands is not configured\n" msgstr "尚未配置管理员命令的权限\n" -#: g10/app-openpgp.c:845 +#: g10/app-openpgp.c:851 msgid "error retrieving CHV status from card\n" msgstr "从卡中获取 CHV 状态时出错\n" -#: g10/app-openpgp.c:851 +#: g10/app-openpgp.c:857 msgid "card is permanently locked!\n" msgstr "卡被永久锁定！\n" -#: g10/app-openpgp.c:858 +#: g10/app-openpgp.c:862 #, c-format msgid "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n" -#: g10/app-openpgp.c:865 +#. 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:869 msgid "|A|Admin PIN" msgstr "|A|管理员 PIN" -#: g10/app-openpgp.c:1021 +#: g10/app-openpgp.c:1018 #, fuzzy msgid "|AN|New Admin PIN" msgstr "|A|新的管理员 PIN" -#: g10/app-openpgp.c:1021 +#: g10/app-openpgp.c:1018 #, fuzzy msgid "|N|New PIN" msgstr "新的 PIN" -#: g10/app-openpgp.c:1025 +#: g10/app-openpgp.c:1022 #, c-format msgid "error getting new PIN: %s\n" msgstr "获取新 PIN 时出错：%s\n" -#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233 +#: g10/app-openpgp.c:1088 g10/app-openpgp.c:1230 msgid "error reading application data\n" msgstr "读取应用程序数据时出错\n" -#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240 +#: g10/app-openpgp.c:1095 g10/app-openpgp.c:1237 msgid "error reading fingerprint DO\n" msgstr "读取指纹 D0 出错\n" -#: g10/app-openpgp.c:1107 +#: g10/app-openpgp.c:1104 msgid "key already exists\n" msgstr "密钥已存在\n" -#: g10/app-openpgp.c:1111 +#: g10/app-openpgp.c:1108 msgid "existing key will be replaced\n" msgstr "现有的密钥将被替换\n" -#: g10/app-openpgp.c:1113 +#: g10/app-openpgp.c:1110 msgid "generating new key\n" msgstr "生成新密钥\n" -#: g10/app-openpgp.c:1123 +#: g10/app-openpgp.c:1120 msgid "please wait while key is being generated ...\n" msgstr "请稍候，正在生成密钥……\n" -#: g10/app-openpgp.c:1138 +#: g10/app-openpgp.c:1135 msgid "generating key failed\n" msgstr "生成密钥失败\n" -#: g10/app-openpgp.c:1141 +#: g10/app-openpgp.c:1138 #, c-format msgid "key generation completed (%d seconds)\n" msgstr "密钥已生成(耗时 %d 秒)\n" -#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878 +#: g10/app-openpgp.c:1144 g10/app-openpgp.c:1875 msgid "response does not contain the public key data\n" msgstr "响应未包含公钥数据\n" -#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886 +#: g10/app-openpgp.c:1152 g10/app-openpgp.c:1883 msgid "response does not contain the RSA modulus\n" msgstr "响应未包含 RSA 余数\n" -#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897 +#: g10/app-openpgp.c:1162 g10/app-openpgp.c:1894 msgid "response does not contain the RSA public exponent\n" msgstr "响应未包含 RSA 公共指数\n" -#: g10/app-openpgp.c:1198 +#: g10/app-openpgp.c:1195 msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n" -#: g10/app-openpgp.c:1359 +#: g10/app-openpgp.c:1356 #, c-format msgid "signatures created so far: %lu\n" msgstr "目前已创建的签字：%lu\n" -#: g10/app-openpgp.c:1367 +#: g10/app-openpgp.c:1364 #, c-format msgid "PIN [sigs done: %lu]" msgstr "PIN [完成签字：%lu]" -#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663 +#: g10/app-openpgp.c:1650 g10/app-openpgp.c:1660 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "不能存取 %s――无效的 OpenPGP 卡？\n" -#: g10/app-openpgp.c:1734 +#: g10/app-openpgp.c:1731 #, c-format msgid "error getting serial number: %s\n" msgstr "取得序列号时出错：%s\n" -#: g10/app-openpgp.c:1829 +#: g10/app-openpgp.c:1826 #, c-format msgid "failed to store the key: %s\n" msgstr "无法存储密钥：%s\n" -#: g10/app-openpgp.c:1871 +#: g10/app-openpgp.c:1868 msgid "reading the key failed\n" msgstr "无法读出密钥\n" @@ -291,7 +294,7 @@ msgstr "与预期不符的 ASCII 封装：" msgid "invalid dash escaped line: " msgstr "以连字符开头的行格式错误：" -#: g10/armor.c:715 g10/armor.c:1300 +#: g10/armor.c:715 g10/armor.c:1322 #, c-format msgid "invalid radix64 character %02X skipped\n" msgstr "跳过无效的 64 进制字符 %02x\n" @@ -308,7 +311,7 @@ msgstr "文件先于预期结束(CRC 部分未结束)\n" msgid "malformed CRC\n" msgstr "异常的 CRC\n" -#: g10/armor.c:804 g10/armor.c:1337 +#: g10/armor.c:804 g10/armor.c:1359 #, c-format msgid "CRC error; %06lX - %06lX\n" msgstr "CRC 错误：%06lx - %06lx\n" @@ -321,21 +324,21 @@ msgstr "文件先于预期结束(于结尾处)\n" msgid "error in trailer line\n" msgstr "结尾行有问题\n" -#: g10/armor.c:1115 +#: g10/armor.c:1137 msgid "no valid OpenPGP data found.\n" msgstr "找不到有效的 OpenPGP 数据。\n" -#: g10/armor.c:1120 +#: g10/armor.c:1142 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "无效的 ASCII 封装：一行超过 %d 字符\n" -#: g10/armor.c:1124 +#: g10/armor.c:1146 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n" -#: g10/card-util.c:58 g10/card-util.c:282 +#: g10/card-util.c:58 g10/card-util.c:283 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP 卡不可用：%s\n" @@ -345,14 +348,14 @@ msgstr "OpenPGP 卡不可用：%s\n" msgid "OpenPGP card no. %s detected\n" msgstr "检测到 OpenPGP 卡号 %s\n" -#: g10/card-util.c:70 g10/card-util.c:1285 g10/delkey.c:120 g10/keyedit.c:1353 -#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417 +#: g10/card-util.c:70 g10/card-util.c:1312 g10/delkey.c:120 g10/keyedit.c:1398 +#: g10/keygen.c:2438 g10/revoke.c:216 g10/revoke.c:417 msgid "can't do this in batch mode\n" msgstr "在批处理模式中无法完成此操作\n" -#: g10/card-util.c:94 g10/card-util.c:1065 g10/card-util.c:1147 -#: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298 -#: g10/keygen.c:1363 +#: g10/card-util.c:94 g10/card-util.c:1092 g10/card-util.c:1174 +#: g10/keyedit.c:413 g10/keyedit.c:434 g10/keyedit.c:448 g10/keygen.c:1300 +#: g10/keygen.c:1365 msgid "Your selection? " msgstr "您的选择？ " @@ -360,138 +363,138 @@ msgstr "您的选择？ " msgid "[not set]" msgstr "[未设定]" -#: g10/card-util.c:378 +#: g10/card-util.c:379 msgid "male" msgstr "男性" -#: g10/card-util.c:379 +#: g10/card-util.c:380 msgid "female" msgstr "女性" -#: g10/card-util.c:379 +#: g10/card-util.c:380 msgid "unspecified" msgstr "未定义" -#: g10/card-util.c:406 +#: g10/card-util.c:407 msgid "not forced" msgstr "可选" -#: g10/card-util.c:406 +#: g10/card-util.c:407 msgid "forced" msgstr "必须" -#: g10/card-util.c:458 +#: g10/card-util.c:485 msgid "Error: Only plain ASCII is currently allowed.\n" msgstr "错误：目前只允许使用 ASCII 字符。\n" -#: g10/card-util.c:460 +#: g10/card-util.c:487 msgid "Error: The \"<\" character may not be used.\n" msgstr "错误：不能使用字符“<”。\n" -#: g10/card-util.c:462 +#: g10/card-util.c:489 msgid "Error: Double spaces are not allowed.\n" msgstr "错误：不允许出现两个空格。\n" -#: g10/card-util.c:479 +#: g10/card-util.c:506 msgid "Cardholder's surname: " msgstr "卡持有人的姓：" -#: g10/card-util.c:481 +#: g10/card-util.c:508 msgid "Cardholder's given name: " msgstr "卡持有人的名：" -#: g10/card-util.c:499 +#: g10/card-util.c:526 #, c-format msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n" -#: g10/card-util.c:521 +#: g10/card-util.c:548 msgid "URL to retrieve public key: " msgstr "获取公钥的 URL：" -#: g10/card-util.c:529 +#: g10/card-util.c:556 #, c-format msgid "Error: URL too long (limit is %d characters).\n" msgstr "错误：URL 太长(至多 %d 个字符)\n" -#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263 +#: g10/card-util.c:649 g10/card-util.c:718 g10/import.c:264 #, c-format msgid "error reading `%s': %s\n" msgstr "读取‘%s’时出错：%s\n" -#: g10/card-util.c:630 +#: g10/card-util.c:657 msgid "Login data (account name): " msgstr "登录数据(帐号名)：" -#: g10/card-util.c:640 +#: g10/card-util.c:667 #, c-format msgid "Error: Login data too long (limit is %d characters).\n" msgstr "错误：登录数据太长(至多 %d 个字符)。\n" -#: g10/card-util.c:699 +#: g10/card-util.c:726 msgid "Private DO data: " msgstr "" -#: g10/card-util.c:709 +#: g10/card-util.c:736 #, fuzzy, c-format msgid "Error: Private DO too long (limit is %d characters).\n" msgstr "错误：URL 太长(至多 %d 个字符)\n" -#: g10/card-util.c:729 +#: g10/card-util.c:756 msgid "Language preferences: " msgstr "首选语言：" -#: g10/card-util.c:737 +#: g10/card-util.c:764 msgid "Error: invalid length of preference string.\n" msgstr "错误：首选项字符串长度无效。\n" -#: g10/card-util.c:746 +#: g10/card-util.c:773 msgid "Error: invalid characters in preference string.\n" msgstr "错误：首选项字符串里有无效字符。\n" -#: g10/card-util.c:767 +#: g10/card-util.c:794 msgid "Sex ((M)ale, (F)emale or space): " msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)：" -#: g10/card-util.c:781 +#: g10/card-util.c:808 msgid "Error: invalid response.\n" msgstr "错误：无效的响应。\n" -#: g10/card-util.c:802 +#: g10/card-util.c:829 msgid "CA fingerprint: " msgstr "CA 指纹：" -#: g10/card-util.c:825 +#: g10/card-util.c:852 msgid "Error: invalid formatted fingerprint.\n" msgstr "错误：指纹格式无效。\n" -#: g10/card-util.c:873 +#: g10/card-util.c:900 #, c-format msgid "key operation not possible: %s\n" msgstr "针对密钥的操作无法实现：%s\n" -#: g10/card-util.c:874 +#: g10/card-util.c:901 msgid "not an OpenPGP card" msgstr "不是一个 OpenPGP 卡" -#: g10/card-util.c:883 +#: g10/card-util.c:910 #, c-format msgid "error getting current key info: %s\n" msgstr "取得当前密钥信息时出错：%s\n" -#: g10/card-util.c:966 +#: g10/card-util.c:993 msgid "Replace existing key? (y/N) " msgstr "替换已有的密钥？(y/N)" -#: g10/card-util.c:987 g10/card-util.c:996 +#: g10/card-util.c:1014 g10/card-util.c:1023 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "是否为加密密钥创建卡外的备份？(Y/n)" -#: g10/card-util.c:1008 +#: g10/card-util.c:1035 msgid "Replace existing keys? (y/N) " msgstr "替换已有的密钥？(y/N)" -#: g10/card-util.c:1017 +#: g10/card-util.c:1044 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -502,116 +505,116 @@ msgstr "" " PIN = ‘%s’ 管理员 PIN = ‘%s’\n" "您应当使用 --change-pin 命令来更改它们\n" -#: g10/card-util.c:1056 +#: g10/card-util.c:1083 msgid "Please select the type of key to generate:\n" msgstr "请选择您要使用的密钥种类：\n" -#: g10/card-util.c:1058 g10/card-util.c:1138 +#: g10/card-util.c:1085 g10/card-util.c:1165 msgid " (1) Signature key\n" msgstr " (1) 签字密钥\n" -#: g10/card-util.c:1059 g10/card-util.c:1140 +#: g10/card-util.c:1086 g10/card-util.c:1167 msgid " (2) Encryption key\n" msgstr " (1) 加密密钥\n" -#: g10/card-util.c:1060 g10/card-util.c:1142 +#: g10/card-util.c:1087 g10/card-util.c:1169 msgid " (3) Authentication key\n" msgstr " (1) 认证密钥\n" -#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907 -#: g10/keygen.c:1402 g10/revoke.c:642 +#: g10/card-util.c:1103 g10/card-util.c:1185 g10/keyedit.c:908 +#: g10/keygen.c:1404 g10/revoke.c:642 msgid "Invalid selection.\n" msgstr "无效的选择。\n" -#: g10/card-util.c:1135 +#: g10/card-util.c:1162 msgid "Please select where to store the key:\n" msgstr "请选择在哪里存储密钥：\n" -#: g10/card-util.c:1170 +#: g10/card-util.c:1197 msgid "unknown key protection algorithm\n" msgstr "不支持的密钥保护算法\n" -#: g10/card-util.c:1175 +#: g10/card-util.c:1202 msgid "secret parts of key are not available\n" msgstr "私钥部分不可用\n" -#: g10/card-util.c:1180 +#: g10/card-util.c:1207 msgid "secret key already stored on a card\n" msgstr "私钥已存储在卡上\n" -#: g10/card-util.c:1250 g10/keyedit.c:1285 +#: g10/card-util.c:1277 g10/keyedit.c:1317 msgid "quit this menu" msgstr "离开这个菜单" -#: g10/card-util.c:1252 +#: g10/card-util.c:1279 msgid "show admin commands" msgstr "显示管理员命令" -#: g10/card-util.c:1253 g10/keyedit.c:1288 +#: g10/card-util.c:1280 g10/keyedit.c:1320 msgid "show this help" msgstr "显示这份在线说明" -#: g10/card-util.c:1255 +#: g10/card-util.c:1282 msgid "list all available data" msgstr "列出所有可用数据" -#: g10/card-util.c:1258 +#: g10/card-util.c:1285 msgid "change card holder's name" msgstr "更改卡持有人的姓名" -#: g10/card-util.c:1259 +#: g10/card-util.c:1286 msgid "change URL to retrieve key" msgstr "更改获取密钥的 URL" -#: g10/card-util.c:1260 +#: g10/card-util.c:1287 msgid "fetch the key specified in the card URL" msgstr "根据卡中指定的 URL 获取密钥" -#: g10/card-util.c:1261 +#: g10/card-util.c:1288 msgid "change the login name" msgstr "更改登录名" -#: g10/card-util.c:1262 +#: g10/card-util.c:1289 msgid "change the language preferences" msgstr "更改首选语言首选" -#: g10/card-util.c:1263 +#: g10/card-util.c:1290 msgid "change card holder's sex" msgstr "更改卡持有人的性别" -#: g10/card-util.c:1264 +#: g10/card-util.c:1291 msgid "change a CA fingerprint" msgstr "更改一个 CA 指纹" -#: g10/card-util.c:1265 +#: g10/card-util.c:1292 msgid "toggle the signature force PIN flag" msgstr "设定 PIN 签字是否必须" -#: g10/card-util.c:1266 +#: g10/card-util.c:1293 msgid "generate new keys" msgstr "生成新的密钥" -#: g10/card-util.c:1267 +#: g10/card-util.c:1294 msgid "menu to change or unblock the PIN" msgstr "更改或解锁 PIN 的菜单" -#: g10/card-util.c:1333 g10/keyedit.c:1436 +#: g10/card-util.c:1360 g10/keyedit.c:1481 msgid "Command> " msgstr "命令> " -#: g10/card-util.c:1368 +#: g10/card-util.c:1395 msgid "Admin-only command\n" msgstr "仅供管理员使用的命令\n" -#: g10/card-util.c:1384 +#: g10/card-util.c:1411 msgid "Admin commands are allowed\n" msgstr "允许使用管理员命令\n" -#: g10/card-util.c:1386 +#: g10/card-util.c:1413 msgid "Admin commands are not allowed\n" msgstr "不允许使用管理员命令\n" -#: g10/card-util.c:1455 g10/keyedit.c:1928 +#: g10/card-util.c:1482 g10/keyedit.c:1994 msgid "Invalid command (try \"help\")\n" msgstr "无效的指令(尝试“help”)\n" @@ -619,7 +622,7 @@ msgstr "无效的指令(尝试“help”)\n" msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "请插入卡并回车，或输入‘c’来取消：" -#: g10/cardglue.c:371 +#: g10/cardglue.c:372 #, c-format msgid "" "Please remove the current card and insert the one with serial number:\n" @@ -628,37 +631,37 @@ msgstr "" "请取出当前的卡，并插入有下列序列号的卡：\n" " %.*s\n" -#: g10/cardglue.c:379 +#: g10/cardglue.c:380 msgid "Hit return when ready or enter 'c' to cancel: " msgstr "就绪后请回车，或输入‘c’取消" -#: g10/cardglue.c:687 +#: g10/cardglue.c:688 #, fuzzy msgid "Enter New Admin PIN: " msgstr "输入管理员 PIN：" -#: g10/cardglue.c:688 +#: g10/cardglue.c:689 #, fuzzy msgid "Enter New PIN: " msgstr "输入 PIN：" -#: g10/cardglue.c:689 +#: g10/cardglue.c:690 msgid "Enter Admin PIN: " msgstr "输入管理员 PIN：" -#: g10/cardglue.c:690 +#: g10/cardglue.c:691 msgid "Enter PIN: " msgstr "输入 PIN：" -#: g10/cardglue.c:704 +#: g10/cardglue.c:705 msgid "Repeat this PIN: " msgstr "再次输入此 PIN：" -#: g10/cardglue.c:718 +#: g10/cardglue.c:719 msgid "PIN not correctly repeated; try again" msgstr "PIN 再次输入时与首次输入不符；请再试一次" -#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3572 g10/keyring.c:376 +#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3573 g10/keyring.c:376 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154 #, c-format msgid "can't open `%s'\n" @@ -668,14 +671,14 @@ msgstr "无法打开‘%s’\n" msgid "--output doesn't work for this command\n" msgstr "--output 在这个命令中不起作用\n" -#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2982 g10/keyserver.c:1421 +#: g10/delkey.c:74 g10/export.c:169 g10/keyedit.c:3057 g10/keyserver.c:1502 #: g10/revoke.c:226 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "密钥‘%s’找不到：%s\n" -#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1435 g10/revoke.c:232 -#: g10/revoke.c:439 +#: g10/delkey.c:82 g10/export.c:199 g10/import.c:2303 g10/keyserver.c:1516 +#: g10/revoke.c:232 g10/revoke.c:439 #, c-format msgid "error reading keyblock: %s\n" msgstr "读取密钥区块时发生错误：%s\n" @@ -855,31 +858,31 @@ msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "警告：无法删除临时目录‘%s’：%s\n" -#: g10/export.c:182 +#: g10/export.c:183 msgid "exporting secret keys not allowed\n" msgstr "不允许导出私钥\n" -#: g10/export.c:211 +#: g10/export.c:212 #, c-format msgid "key %s: not protected - skipped\n" msgstr "密钥 %s：未被保护――已跳过\n" -#: g10/export.c:219 +#: g10/export.c:220 #, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n" # I hope this warning doesn't confuse people. -#: g10/export.c:384 +#: g10/export.c:395 #, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "警告：私钥 %s 不存在简单 SK 检验和\n" -#: g10/export.c:416 +#: g10/export.c:427 msgid "WARNING: nothing exported\n" msgstr "警告：没有导出任何东西\n" -#: g10/g10.c:358 +#: g10/g10.c:360 msgid "" "@Commands:\n" " " @@ -887,127 +890,127 @@ msgstr "" "@指令：\n" " " -#: g10/g10.c:360 +#: g10/g10.c:362 msgid "|[file]|make a signature" msgstr "|[文件名]|生成一份签字" -#: g10/g10.c:361 +#: g10/g10.c:363 msgid "|[file]|make a clear text signature" msgstr "|[文件名]|生成一份明文签字" -#: g10/g10.c:362 +#: g10/g10.c:364 msgid "make a detached signature" msgstr "生成一份分离的签字" -#: g10/g10.c:363 +#: g10/g10.c:365 msgid "encrypt data" msgstr "加密数据" -#: g10/g10.c:365 +#: g10/g10.c:367 msgid "encryption only with symmetric cipher" msgstr "仅使用对称加密" -#: g10/g10.c:367 +#: g10/g10.c:369 msgid "decrypt data (default)" msgstr "解密数据(默认)" -#: g10/g10.c:369 +#: g10/g10.c:371 msgid "verify a signature" msgstr "验证签字" -#: g10/g10.c:371 +#: g10/g10.c:373 msgid "list keys" msgstr "列出密钥" -#: g10/g10.c:373 +#: g10/g10.c:375 msgid "list keys and signatures" msgstr "列出密钥和签字" -#: g10/g10.c:374 +#: g10/g10.c:376 msgid "list and check key signatures" msgstr "列出并检查密钥签字" -#: g10/g10.c:375 +#: g10/g10.c:377 msgid "list keys and fingerprints" msgstr "列出密钥和指纹" -#: g10/g10.c:376 +#: g10/g10.c:378 msgid "list secret keys" msgstr "列出私钥" -#: g10/g10.c:377 +#: g10/g10.c:379 msgid "generate a new key pair" msgstr "生成一副新的密钥对" -#: g10/g10.c:378 +#: g10/g10.c:380 msgid "remove keys from the public keyring" msgstr "从公钥钥匙环里删除密钥" -#: g10/g10.c:380 +#: g10/g10.c:382 msgid "remove keys from the secret keyring" msgstr "从私钥钥匙环里删除密钥" -#: g10/g10.c:381 +#: g10/g10.c:383 msgid "sign a key" msgstr "为某把密钥添加签字" -#: g10/g10.c:382 +#: g10/g10.c:384 msgid "sign a key locally" msgstr "为某把密钥添加本地签字" -#: g10/g10.c:383 +#: g10/g10.c:385 msgid "sign or edit a key" msgstr "编辑某把密钥或为其添加签字" -#: g10/g10.c:384 +#: g10/g10.c:386 msgid "generate a revocation certificate" msgstr "生成一份吊销证书" -#: g10/g10.c:386 +#: g10/g10.c:388 msgid "export keys" msgstr "导出密钥" -#: g10/g10.c:387 +#: g10/g10.c:389 msgid "export keys to a key server" msgstr "把密钥导出到某个公钥服务器上" -#: g10/g10.c:388 +#: g10/g10.c:390 msgid "import keys from a key server" msgstr "从公钥服务器上导入密钥" -#: g10/g10.c:390 +#: g10/g10.c:392 msgid "search for keys on a key server" msgstr "在公钥服务器上搜寻密钥" -#: g10/g10.c:392 +#: g10/g10.c:394 msgid "update all keys from a keyserver" msgstr "从公钥服务器更新所有的本地密钥" -#: g10/g10.c:395 +#: g10/g10.c:397 msgid "import/merge keys" msgstr "导入/合并密钥" -#: g10/g10.c:398 +#: g10/g10.c:400 msgid "print the card status" msgstr "打印卡状态" -#: g10/g10.c:399 +#: g10/g10.c:401 msgid "change data on a card" msgstr "更改卡上的数据" -#: g10/g10.c:400 +#: g10/g10.c:402 msgid "change a card's PIN" msgstr "更改卡的 PIN" -#: g10/g10.c:408 +#: g10/g10.c:410 msgid "update the trust database" msgstr "更新信任度数据库" -#: g10/g10.c:415 +#: g10/g10.c:417 msgid "|algo [files]|print message digests" msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值" -#: g10/g10.c:419 g10/gpgv.c:65 +#: g10/g10.c:421 g10/gpgv.c:66 msgid "" "@\n" "Options:\n" @@ -1017,51 +1020,51 @@ msgstr "" "选项：\n" " " -#: g10/g10.c:421 +#: g10/g10.c:423 msgid "create ascii armored output" msgstr "输出经 ASCII 封装" -#: g10/g10.c:423 +#: g10/g10.c:425 msgid "|NAME|encrypt for NAME" msgstr "|某甲|为收件者“某甲”加密" -#: g10/g10.c:434 +#: g10/g10.c:436 msgid "use this user-id to sign or decrypt" msgstr "使用这个用户标识来签字或解密" -#: g10/g10.c:435 +#: g10/g10.c:437 msgid "|N|set compress level N (0 disables)" msgstr "|N|设定压缩等级为 N (0 表示不压缩)" -#: g10/g10.c:440 +#: g10/g10.c:442 msgid "use canonical text mode" msgstr "使用标准的文本模式" -#: g10/g10.c:450 +#: g10/g10.c:452 msgid "use as output file" msgstr "指定输出文件" -#: g10/g10.c:452 g10/gpgv.c:67 +#: g10/g10.c:454 g10/gpgv.c:68 msgid "verbose" msgstr "详细模式" -#: g10/g10.c:463 +#: g10/g10.c:465 msgid "do not make any changes" msgstr "不做任何改变" -#: g10/g10.c:464 +#: g10/g10.c:466 msgid "prompt before overwriting" msgstr "覆盖前先询问" -#: g10/g10.c:505 +#: g10/g10.c:507 msgid "use strict OpenPGP behavior" msgstr "行为严格遵循 OpenPGP 定义" -#: g10/g10.c:506 +#: g10/g10.c:508 msgid "generate PGP 2.x compatible messages" msgstr "生成与 PGP 2.x 兼容的报文" -#: g10/g10.c:532 +#: g10/g10.c:536 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1069,7 +1072,7 @@ msgstr "" "@\n" "(请参考在线说明以获得所有命令和选项的完整清单)\n" -#: g10/g10.c:535 +#: g10/g10.c:539 msgid "" "@\n" "Examples:\n" @@ -1089,17 +1092,17 @@ msgstr "" " --list-keys [某甲] 显示密钥\n" " --fingerprint [某甲] 显示指纹\n" -#: g10/g10.c:716 g10/gpgv.c:92 +#: g10/g10.c:720 g10/gpgv.c:93 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n" msgstr "" "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n" "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n" -#: g10/g10.c:733 +#: g10/g10.c:737 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "用法： gpg [选项] [文件] (用 -h 求助)" -#: g10/g10.c:736 +#: g10/g10.c:740 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1109,7 +1112,7 @@ msgstr "" "签字、检查、加密或解密\n" "默认的操作依输入数据而定\n" -#: g10/g10.c:747 +#: g10/g10.c:751 msgid "" "\n" "Supported algorithms:\n" @@ -1117,470 +1120,470 @@ msgstr "" "\n" "支持的算法：\n" -#: g10/g10.c:750 +#: g10/g10.c:754 msgid "Pubkey: " msgstr "公钥：" -#: g10/g10.c:756 g10/keyedit.c:1965 +#: g10/g10.c:760 g10/keyedit.c:2031 msgid "Cipher: " msgstr "对称加密：" -#: g10/g10.c:762 +#: g10/g10.c:766 msgid "Hash: " msgstr "散列：" -#: g10/g10.c:768 g10/keyedit.c:2011 +#: g10/g10.c:772 g10/keyedit.c:2077 msgid "Compression: " msgstr "压缩：" -#: g10/g10.c:851 +#: g10/g10.c:855 msgid "usage: gpg [options] " msgstr "用法：gpg [选项] " -#: g10/g10.c:999 +#: g10/g10.c:1003 msgid "conflicting commands\n" msgstr "冲突的指令\n" -#: g10/g10.c:1017 +#: g10/g10.c:1021 #, c-format msgid "no = sign found in group definition `%s'\n" msgstr "在‘%s’组定义里找不到等号(=)\n" -#: g10/g10.c:1214 +#: g10/g10.c:1218 #, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "警告：用户目录‘%s’所有权不安全\n" -#: g10/g10.c:1217 +#: g10/g10.c:1221 #, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "警告：配置文件‘%s’所有权不安全\n" -#: g10/g10.c:1220 +#: g10/g10.c:1224 #, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "警告：扩展模块‘%s’所有权不安全\n" -#: g10/g10.c:1226 +#: g10/g10.c:1230 #, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "警告：用户目录‘%s’权限不安全\n" -#: g10/g10.c:1229 +#: g10/g10.c:1233 #, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "警告：配置文件‘%s’权限不安全\n" -#: g10/g10.c:1232 +#: g10/g10.c:1236 #, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "警告：扩展模块‘%s’权限不安全\n" -#: g10/g10.c:1238 +#: g10/g10.c:1242 #, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n" -#: g10/g10.c:1241 +#: g10/g10.c:1245 #, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n" -#: g10/g10.c:1244 +#: g10/g10.c:1248 #, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n" -#: g10/g10.c:1250 +#: g10/g10.c:1254 #, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n" -#: g10/g10.c:1253 +#: g10/g10.c:1257 #, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n" -#: g10/g10.c:1256 +#: g10/g10.c:1260 #, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n" -#: g10/g10.c:1397 +#: g10/g10.c:1401 #, c-format msgid "unknown configuration item `%s'\n" msgstr "未知的配置项‘%s’\n" -#: g10/g10.c:1798 +#: g10/g10.c:1796 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n" -#: g10/g10.c:1840 +#: g10/g10.c:1838 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "注意：没有默认配置文件‘%s’\n" -#: g10/g10.c:1844 +#: g10/g10.c:1842 #, c-format msgid "option file `%s': %s\n" msgstr "配置文件‘%s’：%s\n" -#: g10/g10.c:1851 +#: g10/g10.c:1849 #, c-format msgid "reading options from `%s'\n" msgstr "从‘%s’读取选项\n" -#: g10/g10.c:2065 g10/g10.c:2583 g10/g10.c:2594 +#: g10/g10.c:2063 g10/g10.c:2584 g10/g10.c:2595 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "注意：一般情况下不会用到 %s！\n" -#: g10/g10.c:2078 +#: g10/g10.c:2076 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n" -#: g10/g10.c:2292 +#: g10/g10.c:2293 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’不是一个有效的字符集\n" -#: g10/g10.c:2311 g10/keyedit.c:3498 +#: g10/g10.c:2312 g10/keyedit.c:3573 msgid "could not parse keyserver URL\n" msgstr "无法解析公钥服务器 URL\n" -#: g10/g10.c:2317 +#: g10/g10.c:2318 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s：%d：无效的公钥服务器选项\n" -#: g10/g10.c:2320 +#: g10/g10.c:2321 msgid "invalid keyserver options\n" msgstr "无效的公钥服务器选项\n" -#: g10/g10.c:2327 +#: g10/g10.c:2328 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s：%d：无效的导入选项\n" -#: g10/g10.c:2330 +#: g10/g10.c:2331 msgid "invalid import options\n" msgstr "无效的导入选项\n" -#: g10/g10.c:2337 +#: g10/g10.c:2338 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s：%d：无效的导出选项\n" -#: g10/g10.c:2340 +#: g10/g10.c:2341 msgid "invalid export options\n" msgstr "无效的导出选项\n" -#: g10/g10.c:2347 +#: g10/g10.c:2348 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s：%d：无效的列表选项\n" -#: g10/g10.c:2350 +#: g10/g10.c:2351 msgid "invalid list options\n" msgstr "无效的列表选项\n" -#: g10/g10.c:2372 +#: g10/g10.c:2373 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s：%d：无效的校验选项\n" -#: g10/g10.c:2375 +#: g10/g10.c:2376 msgid "invalid verify options\n" msgstr "无效的校验选项\n" -#: g10/g10.c:2382 +#: g10/g10.c:2383 #, c-format msgid "unable to set exec-path to %s\n" msgstr "无法把运行路径设成 %s\n" -#: g10/g10.c:2572 +#: g10/g10.c:2573 msgid "WARNING: program may create a core file!\n" msgstr "警告：程序可能会创建核心内存转储！\n" -#: g10/g10.c:2576 +#: g10/g10.c:2577 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告：%s 会使得 %s 失效\n" -#: g10/g10.c:2585 +#: g10/g10.c:2586 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 不可与 %s 并用\n" -#: g10/g10.c:2588 +#: g10/g10.c:2589 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 与 %s 并用无意义！\n" -#: g10/g10.c:2602 -#, c-format -msgid "will not run with insecure memory due to %s" -msgstr "" +#: g10/g10.c:2603 +#, fuzzy, c-format +msgid "will not run with insecure memory due to %s\n" +msgstr "向‘%s’写入私钥占位符\n" -#: g10/g10.c:2616 +#: g10/g10.c:2617 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n" -#: g10/g10.c:2622 +#: g10/g10.c:2623 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n" -#: g10/g10.c:2628 +#: g10/g10.c:2629 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n" -#: g10/g10.c:2641 +#: g10/g10.c:2642 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n" -#: g10/g10.c:2711 g10/g10.c:2735 +#: g10/g10.c:2712 g10/g10.c:2736 msgid "selected cipher algorithm is invalid\n" msgstr "所选的对称加密算法无效\n" -#: g10/g10.c:2717 g10/g10.c:2741 +#: g10/g10.c:2718 g10/g10.c:2742 msgid "selected digest algorithm is invalid\n" msgstr "所选的散列算法无效\n" -#: g10/g10.c:2723 +#: g10/g10.c:2724 msgid "selected compression algorithm is invalid\n" msgstr "所选的压缩算法无效\n" -#: g10/g10.c:2729 +#: g10/g10.c:2730 msgid "selected certification digest algorithm is invalid\n" msgstr "所选的证书散列算法无效\n" -#: g10/g10.c:2744 +#: g10/g10.c:2745 msgid "completes-needed must be greater than 0\n" msgstr "需要的完全可信签字数一定要大于 0\n" -#: g10/g10.c:2746 +#: g10/g10.c:2747 msgid "marginals-needed must be greater than 1\n" msgstr "需要的勉强可信签字数一定要大于 1\n" -#: g10/g10.c:2748 +#: g10/g10.c:2749 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "最大认证深度一定要介于 1 和 255 之间\n" -#: g10/g10.c:2750 +#: g10/g10.c:2751 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n" -#: g10/g10.c:2752 +#: g10/g10.c:2753 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "无效的最小验证级别；一定要是 1，2 或 3\n" -#: g10/g10.c:2755 +#: g10/g10.c:2756 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n" -#: g10/g10.c:2759 +#: g10/g10.c:2760 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "无效的 S2K 模式；必须是 0，1 或 3\n" -#: g10/g10.c:2766 +#: g10/g10.c:2767 msgid "invalid default preferences\n" msgstr "无效的默认首选项\n" -#: g10/g10.c:2775 +#: g10/g10.c:2776 msgid "invalid personal cipher preferences\n" msgstr "无效的个人对称加密算法首选项\n" -#: g10/g10.c:2779 +#: g10/g10.c:2780 msgid "invalid personal digest preferences\n" msgstr "无效的个人散列算法首选项\n" -#: g10/g10.c:2783 +#: g10/g10.c:2784 msgid "invalid personal compress preferences\n" msgstr "无效的个人压缩算法首选项\n" -#: g10/g10.c:2816 +#: g10/g10.c:2817 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s 尚不能和 %s 并用\n" -#: g10/g10.c:2863 +#: g10/g10.c:2864 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n" -#: g10/g10.c:2868 +#: g10/g10.c:2869 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’散列算法\n" -#: g10/g10.c:2873 +#: g10/g10.c:2874 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n" -#: g10/g10.c:2969 +#: g10/g10.c:2970 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "初始化信任度数据库失败：%s\n" -#: g10/g10.c:2980 +#: g10/g10.c:2981 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n" -#: g10/g10.c:2991 +#: g10/g10.c:2992 msgid "--store [filename]" msgstr "--store [文件名]" -#: g10/g10.c:2998 +#: g10/g10.c:2999 msgid "--symmetric [filename]" msgstr "--symmetric [文件名]" -#: g10/g10.c:3000 +#: g10/g10.c:3001 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "对称加密‘%s’失败：%s\n" -#: g10/g10.c:3010 +#: g10/g10.c:3011 msgid "--encrypt [filename]" msgstr "--encrypt [文件名]" -#: g10/g10.c:3023 +#: g10/g10.c:3024 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [文件名]" -#: g10/g10.c:3025 +#: g10/g10.c:3026 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n" -#: g10/g10.c:3028 +#: g10/g10.c:3029 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n" -#: g10/g10.c:3046 +#: g10/g10.c:3047 msgid "--sign [filename]" msgstr "--sign [文件名]" -#: g10/g10.c:3059 +#: g10/g10.c:3060 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [文件名]" -#: g10/g10.c:3074 +#: g10/g10.c:3075 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [文件名]" -#: g10/g10.c:3076 +#: g10/g10.c:3077 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n" -#: g10/g10.c:3079 +#: g10/g10.c:3080 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n" -#: g10/g10.c:3099 +#: g10/g10.c:3100 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [文件名]" -#: g10/g10.c:3108 +#: g10/g10.c:3109 msgid "--clearsign [filename]" msgstr "--clearsign [文件名]" -#: g10/g10.c:3133 +#: g10/g10.c:3134 msgid "--decrypt [filename]" msgstr "--decrypt [文件名]" -#: g10/g10.c:3141 +#: g10/g10.c:3142 msgid "--sign-key user-id" msgstr "--sign-key 用户标识" -#: g10/g10.c:3145 +#: g10/g10.c:3146 msgid "--lsign-key user-id" msgstr "--lsign-key 用户标识" -#: g10/g10.c:3166 +#: g10/g10.c:3167 msgid "--edit-key user-id [commands]" msgstr "--edit-key 用户标识 [指令]" -#: g10/g10.c:3237 +#: g10/g10.c:3238 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [用户标识] [钥匙环]" -#: g10/g10.c:3274 +#: g10/g10.c:3275 #, c-format msgid "keyserver send failed: %s\n" msgstr "上传至公钥服务器失败：%s\n" -#: g10/g10.c:3276 +#: g10/g10.c:3277 #, c-format msgid "keyserver receive failed: %s\n" msgstr "从公钥服务器接收失败：%s\n" -#: g10/g10.c:3278 +#: g10/g10.c:3279 #, c-format msgid "key export failed: %s\n" msgstr "导出密钥失败：%s\n" -#: g10/g10.c:3289 +#: g10/g10.c:3290 #, c-format msgid "keyserver search failed: %s\n" msgstr "搜寻公钥服务器失败：%s\n" -#: g10/g10.c:3299 +#: g10/g10.c:3300 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "从公钥服务器更新失败：%s\n" -#: g10/g10.c:3340 +#: g10/g10.c:3341 #, c-format msgid "dearmoring failed: %s\n" msgstr "解开 ASCII 封装失败：%s\n" -#: g10/g10.c:3348 +#: g10/g10.c:3349 #, c-format msgid "enarmoring failed: %s\n" msgstr "进行 ASCII 封装失败：%s\n" -#: g10/g10.c:3435 +#: g10/g10.c:3436 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "无效的‘%s’散列算法\n" -#: g10/g10.c:3558 +#: g10/g10.c:3559 msgid "[filename]" msgstr "[文件名]" -#: g10/g10.c:3562 +#: g10/g10.c:3563 msgid "Go ahead and type your message ...\n" msgstr "请开始键入您的报文……\n" -#: g10/g10.c:3852 +#: g10/g10.c:3853 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n" -#: g10/g10.c:3860 +#: g10/g10.c:3861 msgid "a user notation name must contain the '@' character\n" msgstr "用户标记名称一定要含有“@”字符\n" -#: g10/g10.c:3870 +#: g10/g10.c:3871 msgid "a notation value must not use any control characters\n" msgstr "标记值一定不能使用任何的控制字符\n" -#: g10/g10.c:3904 +#: g10/g10.c:3905 msgid "the given certification policy URL is invalid\n" msgstr "给定的的验证策略 URL 无效\n" -#: g10/g10.c:3906 +#: g10/g10.c:3907 msgid "the given signature policy URL is invalid\n" msgstr "给定的签字策略 URL 无效\n" -#: g10/g10.c:3939 +#: g10/g10.c:3940 msgid "the given preferred keyserver URL is invalid\n" msgstr "给定的首选公钥服务器 URL 无效\n" @@ -1588,51 +1591,51 @@ msgstr "给定的首选公钥服务器 URL 无效\n" msgid "too many entries in pk cache - disabled\n" msgstr "pk 缓存里项目太多――已禁用\n" -#: g10/getkey.c:186 g10/getkey.c:2711 +#: g10/getkey.c:186 g10/getkey.c:2749 msgid "[User ID not found]" msgstr "[找不到用户标识]" -#: g10/getkey.c:1639 +#: g10/getkey.c:1677 #, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n" -#: g10/getkey.c:2189 +#: g10/getkey.c:2227 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "公钥 %s 没有相对应的私钥――忽略\n" -#: g10/getkey.c:2420 -#, c-format -msgid "using secondary key %s instead of primary key %s\n" +#: g10/getkey.c:2458 +#, fuzzy, c-format +msgid "using subkey %s instead of primary key %s\n" msgstr "使用子钥 %s 而非主钥 %s\n" -#: g10/getkey.c:2467 +#: g10/getkey.c:2505 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "密钥 %s：无相应公钥的私钥――已跳过\n" -#: g10/gpgv.c:68 +#: g10/gpgv.c:69 msgid "be somewhat more quiet" msgstr "尽量减少提示信息" -#: g10/gpgv.c:69 +#: g10/gpgv.c:70 msgid "take the keys from this keyring" msgstr "从这个钥匙环里取用密钥" -#: g10/gpgv.c:71 +#: g10/gpgv.c:72 msgid "make timestamp conflicts only a warning" msgstr "把时间戳矛盾仅视为警告" -#: g10/gpgv.c:72 +#: g10/gpgv.c:73 msgid "|FD|write status info to this FD" msgstr "|FD|把状态信息写入文件描述符 FD" -#: g10/gpgv.c:96 +#: g10/gpgv.c:97 msgid "Usage: gpgv [options] [files] (-h for help)" msgstr "用法：gpgv [选项] [文件] (用 -h 求助)" -#: g10/gpgv.c:99 +#: g10/gpgv.c:100 msgid "" "Syntax: gpg [options] [files]\n" "Check signatures against known trusted keys\n" @@ -1947,322 +1950,323 @@ msgstr "没有可用的帮助" msgid "No help available for `%s'" msgstr "‘%s’没有可用的帮助" -#: g10/import.c:249 +#: g10/import.c:250 #, c-format msgid "skipping block of type %d\n" msgstr "跳过 %d 样式的区块\n" -#: g10/import.c:258 +#: g10/import.c:259 #, c-format msgid "%lu keys processed so far\n" msgstr "目前已处理 %lu 把密钥\n" -#: g10/import.c:275 +#: g10/import.c:276 #, c-format msgid "Total number processed: %lu\n" msgstr "合计被处理的数量：%lu\n" -#: g10/import.c:277 +#: g10/import.c:278 #, c-format msgid " skipped new keys: %lu\n" msgstr " 已跳过的新密钥：%lu\n" -#: g10/import.c:280 +#: g10/import.c:281 #, c-format msgid " w/o user IDs: %lu\n" msgstr " 遗失用户标识：%lu\n" -#: g10/import.c:282 +#: g10/import.c:283 #, c-format msgid " imported: %lu" msgstr " 已导入：%lu" -#: g10/import.c:288 +#: g10/import.c:289 #, c-format msgid " unchanged: %lu\n" msgstr " 未改变：%lu\n" -#: g10/import.c:290 +#: g10/import.c:291 #, c-format msgid " new user IDs: %lu\n" msgstr " 新用户标识：%lu\n" -#: g10/import.c:292 +#: g10/import.c:293 #, c-format msgid " new subkeys: %lu\n" msgstr " 新的子钥：%lu\n" -#: g10/import.c:294 +#: g10/import.c:295 #, c-format msgid " new signatures: %lu\n" msgstr " 新的签字：%lu\n" -#: g10/import.c:296 +#: g10/import.c:297 #, c-format msgid " new key revocations: %lu\n" msgstr " 新的密钥吊销：%lu\n" -#: g10/import.c:298 +#: g10/import.c:299 #, c-format msgid " secret keys read: %lu\n" msgstr " 读取的私钥：%lu\n" -#: g10/import.c:300 +#: g10/import.c:301 #, c-format msgid " secret keys imported: %lu\n" msgstr " 导入的私钥：%lu\n" -#: g10/import.c:302 +#: g10/import.c:303 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " 未改变的私钥：%lu\n" -#: g10/import.c:304 +#: g10/import.c:305 #, c-format msgid " not imported: %lu\n" msgstr " 未被导入：%lu\n" -#: g10/import.c:545 +#: g10/import.c:546 #, c-format msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的\n" -#: g10/import.c:547 +#: g10/import.c:548 msgid "algorithms on these user IDs:\n" msgstr "算法：\n" -#: g10/import.c:584 +#: g10/import.c:585 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr " “%s”：对称加密算法 %s 对应首选项\n" -#: g10/import.c:596 +#: g10/import.c:597 #, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr " “%s”：散列算法 %s 对应首选项\n" -#: g10/import.c:608 +#: g10/import.c:609 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr " “%s”：压缩算法 %s 对应首选项\n" -#: g10/import.c:621 +#: g10/import.c:622 msgid "it is strongly suggested that you update your preferences and\n" msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n" -#: g10/import.c:623 +#: g10/import.c:624 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "以避免可能的算法不匹配问题\n" -#: g10/import.c:647 +#: g10/import.c:648 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n" -#: g10/import.c:695 g10/import.c:1049 +#: g10/import.c:696 g10/import.c:1050 #, c-format msgid "key %s: no user ID\n" msgstr "密钥 %s：没有用户标识\n" -#: g10/import.c:715 +#: g10/import.c:716 #, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "密钥 %s：PKS 子钥破损已修复\n" -#: g10/import.c:730 +#: g10/import.c:731 #, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n" -#: g10/import.c:736 +#: g10/import.c:737 #, c-format msgid "key %s: no valid user IDs\n" msgstr "密钥 %s：没有有效的用户标识\n" -#: g10/import.c:738 +#: g10/import.c:739 msgid "this may be caused by a missing self-signature\n" msgstr "这可能由于遗失自身签字所致\n" -#: g10/import.c:748 g10/import.c:1170 +#: g10/import.c:749 g10/import.c:1171 #, c-format msgid "key %s: public key not found: %s\n" msgstr "密钥 %s：找不到公钥：%s\n" -#: g10/import.c:754 +#: g10/import.c:755 #, c-format msgid "key %s: new key - skipped\n" msgstr "密钥 %s：新密钥――已跳过\n" -#: g10/import.c:763 +#: g10/import.c:764 #, c-format msgid "no writable keyring found: %s\n" msgstr "找不到可写的钥匙环：%s\n" -#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 +#: g10/import.c:769 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042 #, c-format msgid "writing to `%s'\n" msgstr "正在写入‘%s’\n" -#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231 +#: g10/import.c:775 g10/import.c:865 g10/import.c:1090 g10/import.c:1232 +#: g10/import.c:2317 g10/import.c:2339 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "写入钥匙环‘%s’时出错： %s\n" -#: g10/import.c:793 +#: g10/import.c:794 #, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "密钥 %s：公钥“%s”已导入\n" -#: g10/import.c:817 +#: g10/import.c:818 #, c-format msgid "key %s: doesn't match our copy\n" msgstr "密钥 %s：与我们的副本不吻合\n" -#: g10/import.c:834 g10/import.c:1188 +#: g10/import.c:835 g10/import.c:1189 #, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "密钥 %s：无法定位原始的密钥区块：%s\n" -#: g10/import.c:842 g10/import.c:1195 +#: g10/import.c:843 g10/import.c:1196 #, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "密钥 %s：无法读取原始的密钥区块： %s\n" -#: g10/import.c:874 +#: g10/import.c:875 #, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "密钥 %s：“%s”一个新的用户标识\n" -#: g10/import.c:877 +#: g10/import.c:878 #, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "密钥 %s：“%s”%d 个新的用户标识\n" -#: g10/import.c:880 +#: g10/import.c:881 #, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "密钥 %s：“%s”1 个新的签字\n" -#: g10/import.c:883 +#: g10/import.c:884 #, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "密钥 %s：“%s”%d 个新的签字\n" -#: g10/import.c:886 +#: g10/import.c:887 #, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "密钥 %s：“%s”1 个新的子钥\n" -#: g10/import.c:889 +#: g10/import.c:890 #, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "密钥 %s：“%s”%d 个新的子钥\n" -#: g10/import.c:910 +#: g10/import.c:911 #, c-format msgid "key %s: \"%s\" not changed\n" msgstr "密钥 %s：“%s”未改变\n" -#: g10/import.c:1055 +#: g10/import.c:1056 #, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n" -#: g10/import.c:1066 +#: g10/import.c:1067 msgid "importing secret keys not allowed\n" msgstr "不允许导入私钥\n" -#: g10/import.c:1083 +#: g10/import.c:1084 g10/import.c:2332 #, c-format msgid "no default secret keyring: %s\n" msgstr "没有默认的私钥钥匙环： %s\n" -#: g10/import.c:1094 +#: g10/import.c:1095 #, c-format msgid "key %s: secret key imported\n" msgstr "密钥 %s：私钥已导入\n" -#: g10/import.c:1123 +#: g10/import.c:1124 #, c-format msgid "key %s: already in secret keyring\n" msgstr "密钥 %s：已在私钥钥匙环中\n" -#: g10/import.c:1133 +#: g10/import.c:1134 #, c-format msgid "key %s: secret key not found: %s\n" msgstr "密钥 %s：找不到私钥：%s\n" -#: g10/import.c:1163 +#: g10/import.c:1164 #, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "密钥 %s：没有公钥――无法应用吊销证书\n" -#: g10/import.c:1206 +#: g10/import.c:1207 #, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n" -#: g10/import.c:1238 +#: g10/import.c:1239 #, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "密钥 %s：“%s”吊销证书已被导入\n" -#: g10/import.c:1303 +#: g10/import.c:1304 #, c-format msgid "key %s: no user ID for signature\n" msgstr "密钥 %s：签字没有用户标识\n" -#: g10/import.c:1318 +#: g10/import.c:1319 #, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n" -#: g10/import.c:1320 +#: g10/import.c:1321 #, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "密钥 %s：用户标识“%s”自身签字无效\n" -#: g10/import.c:1338 +#: g10/import.c:1339 #, c-format msgid "key %s: no subkey for key binding\n" msgstr "密钥 %s：没有可供绑定的子钥\n" -#: g10/import.c:1349 g10/import.c:1399 +#: g10/import.c:1350 g10/import.c:1400 #, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "密钥 %s：不支持的公钥算法\n" -#: g10/import.c:1351 +#: g10/import.c:1352 #, c-format msgid "key %s: invalid subkey binding\n" msgstr "密钥 %s：无效的子钥绑定\n" -#: g10/import.c:1366 +#: g10/import.c:1367 #, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "密钥 %s：已删除多重子钥绑定\n" -#: g10/import.c:1388 +#: g10/import.c:1389 #, c-format msgid "key %s: no subkey for key revocation\n" msgstr "密钥 %s：没有用于密钥吊销的子钥\n" -#: g10/import.c:1401 +#: g10/import.c:1402 #, c-format msgid "key %s: invalid subkey revocation\n" msgstr "密钥 %s：无效的子钥吊销\n" -#: g10/import.c:1416 +#: g10/import.c:1417 #, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "密钥 %s：已删除多重子钥吊销\n" -#: g10/import.c:1458 +#: g10/import.c:1459 #, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "密钥 %s：已跳过用户标识“%s”\n" -#: g10/import.c:1479 +#: g10/import.c:1480 #, c-format msgid "key %s: skipped subkey\n" msgstr "密钥 %s：已跳过子钥\n" @@ -2271,56 +2275,76 @@ msgstr "密钥 %s：已跳过子钥\n" # * to import non-exportable signature when we have the # * the secret key used to create this signature - it # * seems that this makes sense -#: g10/import.c:1506 +#: g10/import.c:1507 #, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n" -#: g10/import.c:1516 +#: g10/import.c:1517 #, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "密钥 %s：吊销证书位置错误――已跳过\n" -#: g10/import.c:1533 +#: g10/import.c:1534 #, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n" -#: g10/import.c:1547 +#: g10/import.c:1548 #, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "密钥 %s：子钥签字位置错误――已跳过\n" -#: g10/import.c:1555 +#: g10/import.c:1556 #, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n" -#: g10/import.c:1655 +#: g10/import.c:1577 +#, fuzzy, c-format +msgid "key %s: expired signature from key %s - skipped\n" +msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n" + +#: g10/import.c:1680 #, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "密钥 %s：检测到重复的用户标识――已合并\n" -#: g10/import.c:1717 +#: g10/import.c:1742 #, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n" -#: g10/import.c:1731 +#: g10/import.c:1756 #, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n" -#: g10/import.c:1790 +#: g10/import.c:1815 #, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "密钥 %s：已新增吊销证书“%s”\n" -#: g10/import.c:1824 +#: g10/import.c:1849 #, c-format msgid "key %s: direct key signature added\n" msgstr "密钥 %s：已新增直接密钥签字\n" +#: g10/import.c:2238 +#, fuzzy +msgid "NOTE: a key's S/N does not match the card's one\n" +msgstr "公钥与私钥不吻合！\n" + +#: g10/import.c:2246 +#, fuzzy +msgid "NOTE: primary key is online and stored on card\n" +msgstr "私钥已存储在卡上\n" + +#: g10/import.c:2248 +#, fuzzy +msgid "NOTE: secondary key is online and stored on card\n" +msgstr "私钥已存储在卡上\n" + #: g10/keydb.c:167 #, c-format msgid "error creating keyring `%s': %s\n" @@ -2336,51 +2360,51 @@ msgstr "钥匙环‘%s’已建立\n" msgid "failed to rebuild keyring cache: %s\n" msgstr "重新建立钥匙环缓存失败： %s\n" -#: g10/keyedit.c:253 +#: g10/keyedit.c:254 msgid "[revocation]" msgstr "[吊销]" -#: g10/keyedit.c:254 +#: g10/keyedit.c:255 msgid "[self-signature]" msgstr "[自身签字]" -#: g10/keyedit.c:332 g10/keylist.c:342 +#: g10/keyedit.c:333 g10/keylist.c:405 msgid "1 bad signature\n" msgstr "1 个损坏的签字\n" -#: g10/keyedit.c:334 g10/keylist.c:344 +#: g10/keyedit.c:335 g10/keylist.c:407 #, c-format msgid "%d bad signatures\n" msgstr "%d 个损坏的签字\n" -#: g10/keyedit.c:336 g10/keylist.c:346 +#: g10/keyedit.c:337 g10/keylist.c:409 msgid "1 signature not checked due to a missing key\n" msgstr "有 1 份签字因为遗失密钥而未被检查\n" -#: g10/keyedit.c:338 g10/keylist.c:348 +#: g10/keyedit.c:339 g10/keylist.c:411 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "有 %d 份签字因为遗失密钥而未被检查\n" -#: g10/keyedit.c:340 g10/keylist.c:350 +#: g10/keyedit.c:341 g10/keylist.c:413 msgid "1 signature not checked due to an error\n" msgstr "有 1 份签字因为某个错误而未被检查\n" -#: g10/keyedit.c:342 g10/keylist.c:352 +#: g10/keyedit.c:343 g10/keylist.c:415 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "有 %d 份签字因为某些错误而未被检查\n" -#: g10/keyedit.c:344 +#: g10/keyedit.c:345 msgid "1 user ID without valid self-signature detected\n" msgstr "检测到 1 个没有有效自身签字的用户标识\n" -#: g10/keyedit.c:346 +#: g10/keyedit.c:347 #, c-format msgid "%d user IDs without valid self-signatures detected\n" msgstr "检测到 %d 个没有有效自身签字的用户标识\n" -#: g10/keyedit.c:402 g10/pkclist.c:262 +#: g10/keyedit.c:403 g10/pkclist.c:262 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2391,17 +2415,17 @@ msgstr "" "查\n" "指纹等)？\n" -#: g10/keyedit.c:406 g10/pkclist.c:274 +#: g10/keyedit.c:407 g10/pkclist.c:274 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = 我勉强相信\n" -#: g10/keyedit.c:407 g10/pkclist.c:276 +#: g10/keyedit.c:408 g10/pkclist.c:276 #, c-format msgid " %d = I trust fully\n" msgstr " %d = 我完全相信\n" -#: g10/keyedit.c:426 +#: g10/keyedit.c:427 msgid "" "Please enter the depth of this trust signature.\n" "A depth greater than 1 allows the key you are signing to make\n" @@ -2410,36 +2434,36 @@ msgstr "" "请输入这份信任签字的深度。\n" "深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n" -#: g10/keyedit.c:442 +#: g10/keyedit.c:443 msgid "Please enter a domain to restrict this signature, or enter for none.\n" msgstr "请输入这份签字的限制域，如果没有请按回车。\n" -#: g10/keyedit.c:584 +#: g10/keyedit.c:585 #, c-format msgid "User ID \"%s\" is revoked." msgstr "用户标识“%s”已被吊销。" -#: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799 -#: g10/keyedit.c:857 g10/keyedit.c:1543 +#: g10/keyedit.c:594 g10/keyedit.c:620 g10/keyedit.c:645 g10/keyedit.c:800 +#: g10/keyedit.c:858 g10/keyedit.c:1596 msgid "Are you sure you still want to sign it? (y/N) " msgstr "您仍然想要为它签字吗？(y/N)" -#: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805 -#: g10/keyedit.c:1549 +#: g10/keyedit.c:606 g10/keyedit.c:632 g10/keyedit.c:657 g10/keyedit.c:806 +#: g10/keyedit.c:1602 msgid " Unable to sign.\n" msgstr " 无法添加签字。\n" -#: g10/keyedit.c:610 +#: g10/keyedit.c:611 #, c-format msgid "User ID \"%s\" is expired." msgstr "用户标识“%s”已过期。" -#: g10/keyedit.c:636 +#: g10/keyedit.c:637 #, c-format msgid "User ID \"%s\" is not self-signed." msgstr "警告：用户标识“%s”不含自身签字。" -#: g10/keyedit.c:675 +#: g10/keyedit.c:676 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2448,11 +2472,11 @@ msgstr "" "“%s”里的自身签字\n" "是 PGP 2.x 样式的签字。\n" -#: g10/keyedit.c:684 +#: g10/keyedit.c:685 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)" -#: g10/keyedit.c:698 +#: g10/keyedit.c:699 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2461,11 +2485,11 @@ msgstr "" "您目前为“%s”的签字\n" "已经过期了。\n" -#: g10/keyedit.c:702 +#: g10/keyedit.c:703 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)" -#: g10/keyedit.c:723 +#: g10/keyedit.c:724 #, c-format msgid "" "Your current signature on \"%s\"\n" @@ -2474,53 +2498,53 @@ msgstr "" "您目前在“%s”的签字\n" "是一份本地签字。\n" -#: g10/keyedit.c:727 +#: g10/keyedit.c:728 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "您是否想要把他升级成可以完全导出的签字？(y/N)" -#: g10/keyedit.c:748 +#: g10/keyedit.c:749 #, c-format msgid "\"%s\" was already locally signed by key %s\n" msgstr "“%s”已由密钥 %s 在本地签字\n" -#: g10/keyedit.c:751 +#: g10/keyedit.c:752 #, c-format msgid "\"%s\" was already signed by key %s\n" msgstr "“%s”已由密钥 %s 签字\n" -#: g10/keyedit.c:756 +#: g10/keyedit.c:757 msgid "Do you want to sign it again anyway? (y/N) " msgstr "您仍然想要为它再次签字吗？(y/N)" -#: g10/keyedit.c:778 +#: g10/keyedit.c:779 #, c-format msgid "Nothing to sign with key %s\n" msgstr "没有东西可以让密钥 %s签字\n" -#: g10/keyedit.c:793 +#: g10/keyedit.c:794 msgid "This key has expired!" msgstr "这把密钥已经过期！" -#: g10/keyedit.c:813 +#: g10/keyedit.c:814 #, c-format msgid "This key is due to expire on %s.\n" msgstr "这把密钥将在 %s 过期。\n" -#: g10/keyedit.c:817 +#: g10/keyedit.c:818 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "您想要让您的签字也同时过期吗？ (Y/n) " -#: g10/keyedit.c:850 +#: g10/keyedit.c:851 msgid "" "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 " "mode.\n" msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签字。\n" -#: g10/keyedit.c:852 +#: g10/keyedit.c:853 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n" -#: g10/keyedit.c:877 +#: g10/keyedit.c:878 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2529,32 +2553,32 @@ msgstr "" "您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n" "如果您不知道这个问题的答案，请输入“0”。\n" -#: g10/keyedit.c:882 +#: g10/keyedit.c:883 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) 我不作答。 %s\n" -#: g10/keyedit.c:884 +#: g10/keyedit.c:885 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) 我根本没有检查过。 %s\n" -#: g10/keyedit.c:886 +#: g10/keyedit.c:887 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) 我随意检查过。 %s\n" -#: g10/keyedit.c:888 +#: g10/keyedit.c:889 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) 我非常小心地检查过。 %s\n" -#: g10/keyedit.c:894 +#: g10/keyedit.c:895 #, fuzzy msgid "Your selection? (enter `?' for more information): " msgstr "您的选择？(输入‘?’以获得更多的信息)：" -#: g10/keyedit.c:918 +#: g10/keyedit.c:919 #, c-format msgid "" "Are you sure that you want to sign this key with your\n" @@ -2563,66 +2587,75 @@ msgstr "" "您真的确定要签字这把密钥，使用您的密钥\n" "“%s”(%s)\n" -#: g10/keyedit.c:925 +#: g10/keyedit.c:926 msgid "This will be a self-signature.\n" msgstr "这将是一个自身签字。\n" -#: g10/keyedit.c:931 +#: g10/keyedit.c:932 msgid "WARNING: the signature will not be marked as non-exportable.\n" msgstr "警告：这份签字不会被标记为不可导出。\n" -#: g10/keyedit.c:939 +#: g10/keyedit.c:940 msgid "WARNING: the signature will not be marked as non-revocable.\n" msgstr "警告：这份签字不会被标记成不可吊销。\n" -#: g10/keyedit.c:949 +#: g10/keyedit.c:950 msgid "The signature will be marked as non-exportable.\n" msgstr "这份签字会被标记成不可导出。\n" -#: g10/keyedit.c:956 +#: g10/keyedit.c:957 msgid "The signature will be marked as non-revocable.\n" msgstr "这份签字会被标记成不可吊销。\n" -#: g10/keyedit.c:963 +#: g10/keyedit.c:964 msgid "I have not checked this key at all.\n" msgstr "我根本没有检查过这把密钥。\n" -#: g10/keyedit.c:968 +#: g10/keyedit.c:969 msgid "I have checked this key casually.\n" msgstr "我随意检查过这把密钥。\n" -#: g10/keyedit.c:973 +#: g10/keyedit.c:974 msgid "I have checked this key very carefully.\n" msgstr "我非常小心地检查过这把密钥。\n" -#: g10/keyedit.c:983 +#: g10/keyedit.c:984 msgid "Really sign? (y/N) " msgstr "真的要签字吗？(y/N)" -#: g10/keyedit.c:1028 g10/keyedit.c:3946 g10/keyedit.c:4037 g10/keyedit.c:4110 -#: g10/sign.c:369 +#: g10/keyedit.c:1029 g10/keyedit.c:4022 g10/keyedit.c:4113 g10/keyedit.c:4177 +#: g10/keyedit.c:4238 g10/sign.c:369 #, c-format msgid "signing failed: %s\n" msgstr "签字时失败： %s\n" -#: g10/keyedit.c:1084 +#: g10/keyedit.c:1094 +msgid "Key has only stub or on-card key items - no passphrase to change.\n" +msgstr "" + +#: g10/keyedit.c:1105 g10/keygen.c:3056 msgid "This key is not protected.\n" msgstr "这把密钥没有被保护。\n" -#: g10/keyedit.c:1088 +#: g10/keyedit.c:1109 g10/keygen.c:3044 msgid "Secret parts of primary key are not available.\n" msgstr "主钥的私钥部分无法取用。\n" -#: g10/keyedit.c:1092 +#: g10/keyedit.c:1113 g10/keygen.c:3059 +#, fuzzy +msgid "Secret parts of primary key are stored on-card.\n" +msgstr "主钥的私钥部分无法取用。\n" + +#: g10/keyedit.c:1117 g10/keygen.c:3063 msgid "Key is protected.\n" msgstr "密钥受保护。\n" -#: g10/keyedit.c:1112 +#: g10/keyedit.c:1141 #, c-format msgid "Can't edit this key: %s\n" msgstr "无法编辑这把密钥： %s\n" -#: g10/keyedit.c:1118 +#: g10/keyedit.c:1147 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2630,11 +2663,11 @@ msgstr "" "输入要给这把私钥用的新密码。\n" "\n" -#: g10/keyedit.c:1127 g10/keygen.c:1818 +#: g10/keyedit.c:1156 g10/keygen.c:1824 msgid "passphrase not correctly repeated; try again" msgstr "密码再次输入时与首次输入不符；请再试一次" -#: g10/keyedit.c:1132 +#: g10/keyedit.c:1161 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2642,375 +2675,419 @@ msgstr "" "您不想要用密码――这大概是个坏主意！\n" "\n" -#: g10/keyedit.c:1135 +#: g10/keyedit.c:1164 msgid "Do you really want to do this? (y/N) " msgstr "您真的想要这么做吗？(y/N)" -#: g10/keyedit.c:1201 +#: g10/keyedit.c:1235 msgid "moving a key signature to the correct place\n" msgstr "正在把密钥的签字移动到正确的位置去\n" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1319 msgid "save and quit" msgstr "保存并离开" -#: g10/keyedit.c:1290 -msgid "show fingerprint" +#: g10/keyedit.c:1322 +#, fuzzy +msgid "show key fingerprint" msgstr "显示指纹" -#: g10/keyedit.c:1291 +#: g10/keyedit.c:1323 msgid "list key and user IDs" msgstr "列出密钥和用户标识" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1325 msgid "select user ID N" msgstr "选择用户标识 N" -#: g10/keyedit.c:1294 -msgid "select secondary key N" -msgstr "选择子钥 N" +#: g10/keyedit.c:1326 +#, fuzzy +msgid "select subkey N" +msgstr "选择用户标识 N" -#: g10/keyedit.c:1295 -msgid "list signatures" -msgstr "列出签字" +#: g10/keyedit.c:1327 +#, fuzzy +msgid "check signatures" +msgstr "吊销签字" -#: g10/keyedit.c:1297 -msgid "sign the key" -msgstr "为密钥添加签字" +#: g10/keyedit.c:1329 +msgid "sign selected user IDs [* see below for related commands]" +msgstr "" -#: g10/keyedit.c:1301 -msgid "sign the key locally" +#: g10/keyedit.c:1334 +#, fuzzy +msgid "sign selected user IDs locally" msgstr "为密钥添加本地签字" -#: g10/keyedit.c:1303 +#: g10/keyedit.c:1335 +#, fuzzy +msgid "sign selected user IDs with a trust signature" +msgstr "提示：选择要添加签字的用户标识\n" + +#: g10/keyedit.c:1336 +msgid "sign selected user IDs with a non-revocable signature" +msgstr "" + +#: g10/keyedit.c:1338 msgid "add a user ID" msgstr "增加一个用户标识" -#: g10/keyedit.c:1304 +#: g10/keyedit.c:1339 msgid "add a photo ID" msgstr "增加一个照片标识" -#: g10/keyedit.c:1305 -msgid "delete user ID" +#: g10/keyedit.c:1340 +#, fuzzy +msgid "delete selected user IDs" msgstr "删除一个用户/照片标识" -#: g10/keyedit.c:1308 -msgid "add a secondary key" -msgstr "增加一把子钥" +#: g10/keyedit.c:1343 +#, fuzzy +msgid "add a subkey" +msgstr "addkey" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1345 msgid "add a key to a smartcard" msgstr "在智能卡上添加一把密钥" -#: g10/keyedit.c:1311 +#: g10/keyedit.c:1346 msgid "move a key to a smartcard" msgstr "将一把密钥移动到智能卡上" -#: g10/keyedit.c:1313 -msgid "delete a secondary key" +#: g10/keyedit.c:1348 +#, fuzzy +msgid "delete selected subkeys" msgstr "删除一把子钥" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1349 msgid "add a revocation key" msgstr "增加一把吊销密钥" -#: g10/keyedit.c:1315 -msgid "delete signatures" -msgstr "删除签字" +#: g10/keyedit.c:1350 +#, fuzzy +msgid "delete signatures from the selected user IDs" +msgstr "真的要更新被选择用户标识的首选项吗？(y/N)" -#: g10/keyedit.c:1316 -msgid "change the expire date" -msgstr "更改使用期限" +#: g10/keyedit.c:1351 +#, fuzzy +msgid "change the expiration date for the key or selected subkeys" +msgstr "您不能变更v3密钥的使用期限\n" -#: g10/keyedit.c:1317 -msgid "flag user ID as primary" +#: g10/keyedit.c:1352 +#, fuzzy +msgid "flag the selected user ID as primary" msgstr "设定首选用户标识" -#: g10/keyedit.c:1318 -msgid "toggle between secret and public key listing" +#: g10/keyedit.c:1353 +#, fuzzy +msgid "toggle between the secret and public key listings" msgstr "在私钥和公钥清单间切换" -#: g10/keyedit.c:1320 +#: g10/keyedit.c:1355 msgid "list preferences (expert)" msgstr "列出首选项(专家模式)" -#: g10/keyedit.c:1321 +#: g10/keyedit.c:1356 msgid "list preferences (verbose)" msgstr "列出首选项(详细模式)" -#: g10/keyedit.c:1322 -msgid "set preference list" -msgstr "设定首选项" - -#: g10/keyedit.c:1323 -msgid "updated preferences" -msgstr "更新过的首选项" +#: g10/keyedit.c:1357 +#, fuzzy +msgid "set preference list for the selected user IDs" +msgstr "真的要更新被选择用户标识的首选项吗？(y/N)" -#: g10/keyedit.c:1324 -msgid "set preferred keyserver URL" +#: g10/keyedit.c:1360 +#, fuzzy +msgid "set preferred keyserver URL for the selected user IDs" msgstr "设定首选公钥服务器的 URL" -#: g10/keyedit.c:1325 +#: g10/keyedit.c:1361 msgid "change the passphrase" msgstr "更改密码" -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1364 msgid "change the ownertrust" msgstr "更改信任度" -#: g10/keyedit.c:1327 -msgid "revoke signatures" -msgstr "吊销签字" +#: g10/keyedit.c:1365 +#, fuzzy +msgid "revoke signatures on the selected user IDs" +msgstr "真的要吊销所有被选择的用户标识吗？(y/N)" -#: g10/keyedit.c:1328 -msgid "revoke a user ID" +#: g10/keyedit.c:1366 +#, fuzzy +msgid "revoke selected user IDs" msgstr "吊销一个用户标识" -#: g10/keyedit.c:1329 -msgid "revoke a secondary key" +#: g10/keyedit.c:1369 +#, fuzzy +msgid "revoke key or selected subkeys" msgstr "吊销一把子钥" -#: g10/keyedit.c:1330 -msgid "disable a key" -msgstr "禁用一把密钥" - -#: g10/keyedit.c:1331 -msgid "enable a key" +#: g10/keyedit.c:1370 +#, fuzzy +msgid "enable key" msgstr "启用一把密钥" -#: g10/keyedit.c:1332 -msgid "show photo ID" +#: g10/keyedit.c:1371 +#, fuzzy +msgid "disable key" +msgstr "禁用一把密钥" + +#: g10/keyedit.c:1372 +#, fuzzy +msgid "show selected photo IDs" msgstr "显示照片标识" -#: g10/keyedit.c:1386 +#: g10/keyedit.c:1431 #, c-format msgid "error reading secret keyblock \"%s\": %s\n" msgstr "读取私钥区块“%s”时出错：%s\n" -#: g10/keyedit.c:1404 +#: g10/keyedit.c:1449 msgid "Secret key is available.\n" msgstr "私钥可用。\n" -#: g10/keyedit.c:1481 +#: g10/keyedit.c:1526 msgid "Need the secret key to do this.\n" msgstr "要有私钥才能这么做。\n" -#: g10/keyedit.c:1489 +#: g10/keyedit.c:1534 msgid "Please use the command \"toggle\" first.\n" msgstr "请先使用“toggle”指令。\n" -#: g10/keyedit.c:1537 +#: g10/keyedit.c:1553 +msgid "" +"* The `sign' command may be prefixed with an `l' for local signatures " +"(lsign),\n" +" a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n" +" (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n" +msgstr "" + +#: g10/keyedit.c:1590 msgid "Key is revoked." msgstr "密钥已被吊销。" -#: g10/keyedit.c:1557 +#: g10/keyedit.c:1610 msgid "Really sign all user IDs? (y/N) " msgstr "真的为所有的用户标识签字吗？(y/N)" -#: g10/keyedit.c:1560 +#: g10/keyedit.c:1613 msgid "Hint: Select the user IDs to sign\n" msgstr "提示：选择要添加签字的用户标识\n" -#: g10/keyedit.c:1568 +#: g10/keyedit.c:1621 #, fuzzy, c-format msgid "Unknown signature type `%s'\n" msgstr "未知的签字等级" -#: g10/keyedit.c:1591 +#: g10/keyedit.c:1644 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "在 %s 模式中不允许使用这个指令。\n" -#: g10/keyedit.c:1613 g10/keyedit.c:1633 g10/keyedit.c:1736 +#: g10/keyedit.c:1666 g10/keyedit.c:1686 g10/keyedit.c:1789 msgid "You must select at least one user ID.\n" msgstr "您至少得选择一个用户标识。\n" -#: g10/keyedit.c:1615 +#: g10/keyedit.c:1668 msgid "You can't delete the last user ID!\n" msgstr "您不能删除最后一个用户标识！\n" -#: g10/keyedit.c:1617 +#: g10/keyedit.c:1670 msgid "Really remove all selected user IDs? (y/N) " msgstr "真的要删除所有被选择的用户标识吗？(y/N)" -#: g10/keyedit.c:1618 +#: g10/keyedit.c:1671 msgid "Really remove this user ID? (y/N) " msgstr "真的要删除这个用户标识吗？(y/N)" -#: g10/keyedit.c:1668 +#: g10/keyedit.c:1721 msgid "Really move the primary key? (y/N) " msgstr "真的要删除主钥吗？(y/N)" -#: g10/keyedit.c:1680 +#: g10/keyedit.c:1733 msgid "You must select exactly one key.\n" msgstr "您必须指定一把密钥。\n" -#: g10/keyedit.c:1700 g10/keyedit.c:1755 +#: g10/keyedit.c:1753 msgid "You must select at least one key.\n" msgstr "您必须选择至少一把密钥。\n" -#: g10/keyedit.c:1703 +#: g10/keyedit.c:1756 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "您真的想要删除被选择的密钥吗？(y/N)" -#: g10/keyedit.c:1704 +#: g10/keyedit.c:1757 msgid "Do you really want to delete this key? (y/N) " msgstr "您真的要删除这把密钥吗？(y/N)" -#: g10/keyedit.c:1739 +#: g10/keyedit.c:1792 msgid "Really revoke all selected user IDs? (y/N) " msgstr "真的要吊销所有被选择的用户标识吗？(y/N)" -#: g10/keyedit.c:1740 +#: g10/keyedit.c:1793 msgid "Really revoke this user ID? (y/N) " msgstr "真的要吊销这个用户标识吗？(y/N)" -#: g10/keyedit.c:1759 -msgid "Do you really want to revoke the selected keys? (y/N) " +#: g10/keyedit.c:1811 +#, fuzzy +msgid "Do you really want to revoke the entire key? (y/N) " +msgstr "您真的想要吊销这把密钥吗？(y/N)" + +#: g10/keyedit.c:1822 +#, fuzzy +msgid "Do you really want to revoke the selected subkeys? (y/N) " msgstr "您真的想要吊销被选择的密钥吗？(y/N)" -#: g10/keyedit.c:1760 -msgid "Do you really want to revoke this key? (y/N) " +#: g10/keyedit.c:1824 +#, fuzzy +msgid "Do you really want to revoke this subkey? (y/N) " msgstr "您真的想要吊销这把密钥吗？(y/N)" -#: g10/keyedit.c:1799 +#: g10/keyedit.c:1865 msgid "" "Owner trust may not be set while using an user provided trust database\n" msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n" -#: g10/keyedit.c:1831 +#: g10/keyedit.c:1897 msgid "Set preference list to:\n" msgstr "设为首选项列表为：\n" -#: g10/keyedit.c:1837 +#: g10/keyedit.c:1903 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "真的要更新被选择用户标识的首选项吗？(y/N)" -#: g10/keyedit.c:1839 +#: g10/keyedit.c:1905 msgid "Really update the preferences? (y/N) " msgstr "真的要更新首选项吗？(y/N)" -#: g10/keyedit.c:1889 +#: g10/keyedit.c:1955 msgid "Save changes? (y/N) " msgstr "要保存变动吗？(y/N)" -#: g10/keyedit.c:1892 +#: g10/keyedit.c:1958 msgid "Quit without saving? (y/N) " msgstr "要不保存而离开吗？(y/N)" -#: g10/keyedit.c:1902 +#: g10/keyedit.c:1968 #, c-format msgid "update failed: %s\n" msgstr "更新失败：%s\n" -#: g10/keyedit.c:1909 +#: g10/keyedit.c:1975 #, c-format msgid "update secret failed: %s\n" msgstr "更新私钥失败：%s\n" -#: g10/keyedit.c:1916 +#: g10/keyedit.c:1982 msgid "Key not changed so no update needed.\n" msgstr "密钥没有变动所以不需要更新。\n" -#: g10/keyedit.c:1988 +#: g10/keyedit.c:2054 msgid "Digest: " msgstr "散列：" -#: g10/keyedit.c:2040 +#: g10/keyedit.c:2106 msgid "Features: " msgstr "特点：" -#: g10/keyedit.c:2051 +#: g10/keyedit.c:2117 msgid "Keyserver no-modify" msgstr "公钥服务器不可变造" -#: g10/keyedit.c:2066 g10/keylist.c:244 +#: g10/keyedit.c:2132 g10/keylist.c:307 msgid "Preferred keyserver: " msgstr "首选公钥服务器：" -#: g10/keyedit.c:2309 +#: g10/keyedit.c:2363 +#, fuzzy, c-format +msgid "This key was revoked on %s by %s key %s\n" +msgstr "这把密钥可被 %s 密钥 %s 吊销" + +#: g10/keyedit.c:2384 #, c-format msgid "This key may be revoked by %s key %s" msgstr "这把密钥可被 %s 密钥 %s 吊销" -#: g10/keyedit.c:2315 +#: g10/keyedit.c:2390 msgid "(sensitive)" msgstr " (敏感的)" -#: g10/keyedit.c:2331 g10/keyedit.c:2387 g10/keyedit.c:2499 g10/keyedit.c:2514 -#: g10/keyserver.c:366 +#: g10/keyedit.c:2406 g10/keyedit.c:2462 g10/keyedit.c:2574 g10/keyedit.c:2589 +#: g10/keylist.c:193 g10/keyserver.c:413 #, c-format msgid "created: %s" msgstr "创建于：%s" -#: g10/keyedit.c:2334 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929 +#: g10/keyedit.c:2409 g10/keylist.c:786 g10/keylist.c:880 g10/mainproc.c:929 #, c-format msgid "revoked: %s" msgstr "已吊销：%s" -#: g10/keyedit.c:2336 g10/keylist.c:694 g10/keylist.c:823 +#: g10/keyedit.c:2411 g10/keylist.c:757 g10/keylist.c:886 #, c-format msgid "expired: %s" msgstr "已过期：%s" -#: g10/keyedit.c:2338 g10/keyedit.c:2389 g10/keyedit.c:2501 g10/keyedit.c:2516 -#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:829 g10/keylist.c:850 -#: g10/keyserver.c:372 g10/mainproc.c:935 +#: g10/keyedit.c:2413 g10/keyedit.c:2464 g10/keyedit.c:2576 g10/keyedit.c:2591 +#: g10/keylist.c:195 g10/keylist.c:763 g10/keylist.c:798 g10/keylist.c:892 +#: g10/keylist.c:913 g10/keyserver.c:419 g10/mainproc.c:935 #, c-format msgid "expires: %s" msgstr "有效至：%s" -#: g10/keyedit.c:2340 +#: g10/keyedit.c:2415 #, c-format msgid "usage: %s" msgstr "可用于：%s" -#: g10/keyedit.c:2355 +#: g10/keyedit.c:2430 #, c-format msgid "trust: %s" msgstr "信任度：%s" -#: g10/keyedit.c:2359 +#: g10/keyedit.c:2434 #, c-format msgid "validity: %s" msgstr "有效性：%s" -#: g10/keyedit.c:2366 +#: g10/keyedit.c:2441 msgid "This key has been disabled" msgstr "这把密钥已经被禁用" -#: g10/keyedit.c:2394 +#: g10/keyedit.c:2469 g10/keylist.c:199 msgid "card-no: " msgstr "卡号：" -#: g10/keyedit.c:2461 +#: g10/keyedit.c:2536 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x 样式的用户标识没有首选项。\n" -#: g10/keyedit.c:2469 +#: g10/keyedit.c:2544 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n" -#: g10/keyedit.c:2533 g10/keyserver.c:376 g10/mainproc.c:1575 +#: g10/keyedit.c:2608 g10/keyserver.c:423 g10/mainproc.c:1575 #: g10/trustdb.c:1164 msgid "revoked" msgstr "已吊销" -#: g10/keyedit.c:2535 g10/keyserver.c:380 g10/mainproc.c:1577 +#: g10/keyedit.c:2610 g10/keyserver.c:427 g10/mainproc.c:1577 #: g10/trustdb.c:531 msgid "expired" msgstr "已过期" -#: g10/keyedit.c:2600 +#: g10/keyedit.c:2675 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:2660 +#: g10/keyedit.c:2735 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3019,45 +3096,45 @@ msgstr "" "警告：这是一把 PGP2 样式的密钥。\n" " 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n" -#: g10/keyedit.c:2665 g10/keyedit.c:2943 +#: g10/keyedit.c:2740 g10/keyedit.c:3018 msgid "Are you sure you still want to add it? (y/N) " msgstr "您确定仍然想要增加吗？(y/N)" -#: g10/keyedit.c:2671 +#: g10/keyedit.c:2746 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n" -#: g10/keyedit.c:2811 +#: g10/keyedit.c:2886 msgid "Delete this good signature? (y/N/q)" msgstr "删除这个完好的签字吗？(y/N/q)" -#: g10/keyedit.c:2821 +#: g10/keyedit.c:2896 msgid "Delete this invalid signature? (y/N/q)" msgstr "删除这个无效的签字吗？(y/N/q)" -#: g10/keyedit.c:2825 +#: g10/keyedit.c:2900 msgid "Delete this unknown signature? (y/N/q)" msgstr "删除这个未知的签字吗？(y/N/q)" -#: g10/keyedit.c:2831 +#: g10/keyedit.c:2906 msgid "Really delete this self-signature? (y/N)" msgstr "真的要删除这个自身签字吗？(y/N)" -#: g10/keyedit.c:2845 +#: g10/keyedit.c:2920 #, c-format msgid "Deleted %d signature.\n" msgstr "已经删除了 %d 个签字。\n" -#: g10/keyedit.c:2846 +#: g10/keyedit.c:2921 #, c-format msgid "Deleted %d signatures.\n" msgstr "已经删除了 %d 个签字。\n" -#: g10/keyedit.c:2849 +#: g10/keyedit.c:2924 msgid "Nothing deleted.\n" msgstr "没有东西被删除。\n" -#: g10/keyedit.c:2938 +#: g10/keyedit.c:3013 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3066,160 +3143,172 @@ msgstr "" "警告：这是一把 PGP2 样式的密钥。\n" " 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n" -#: g10/keyedit.c:2949 +#: g10/keyedit.c:3024 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n" -#: g10/keyedit.c:2969 +#: g10/keyedit.c:3044 msgid "Enter the user ID of the designated revoker: " msgstr "输入指定吊销者的用户标识：" -#: g10/keyedit.c:2992 +#: g10/keyedit.c:3067 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:3007 +#: g10/keyedit.c:3082 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:3029 +#: g10/keyedit.c:3104 msgid "this key has already been designated as a revoker\n" msgstr "这把密钥已被指定为一个吊销者\n" -#: g10/keyedit.c:3048 +#: g10/keyedit.c:3123 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n" -#: g10/keyedit.c:3054 +#: g10/keyedit.c:3129 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)：" -#: g10/keyedit.c:3115 +#: g10/keyedit.c:3190 msgid "Please remove selections from the secret keys.\n" msgstr "请从私钥中删除选择。\n" -#: g10/keyedit.c:3121 -msgid "Please select at most one secondary key.\n" +#: g10/keyedit.c:3196 +#, fuzzy +msgid "Please select at most one subkey.\n" msgstr "请至多选择一把子钥。\n" -#: g10/keyedit.c:3125 -msgid "Changing expiration time for a secondary key.\n" +#: g10/keyedit.c:3200 +#, fuzzy +msgid "Changing expiration time for a subkey.\n" msgstr "正在变更子钥的使用期限。\n" -#: g10/keyedit.c:3128 +#: g10/keyedit.c:3203 msgid "Changing expiration time for the primary key.\n" msgstr "正在变更主钥的使用期限。\n" -#: g10/keyedit.c:3174 +#: g10/keyedit.c:3249 msgid "You can't change the expiration date of a v3 key\n" msgstr "您不能变更v3密钥的使用期限\n" -#: g10/keyedit.c:3190 +#: g10/keyedit.c:3265 msgid "No corresponding signature in secret ring\n" msgstr "在私钥环里没有一致的签字\n" -#: g10/keyedit.c:3270 +#: g10/keyedit.c:3345 msgid "Please select exactly one user ID.\n" msgstr "请精确地选择一个用户标识。\n" -#: g10/keyedit.c:3309 g10/keyedit.c:3419 g10/keyedit.c:3538 +#: g10/keyedit.c:3384 g10/keyedit.c:3494 g10/keyedit.c:3614 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "跳过用户标识“%s”的 v3 自身签字\n" -#: g10/keyedit.c:3480 +#: g10/keyedit.c:3555 msgid "Enter your preferred keyserver URL: " msgstr "输入您首选的公钥服务器的 URL：" -#: g10/keyedit.c:3559 +#: g10/keyedit.c:3635 msgid "Are you sure you want to replace it? (y/N) " msgstr "您确定要替换它吗？(y/N)" -#: g10/keyedit.c:3560 +#: g10/keyedit.c:3636 msgid "Are you sure you want to delete it? (y/N) " msgstr "您确定要删除它吗？(y/N)" -#: g10/keyedit.c:3622 +#: g10/keyedit.c:3698 #, c-format msgid "No user ID with index %d\n" msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:3668 -#, c-format -msgid "No secondary key with index %d\n" -msgstr "没有索引为 %d 的子钥\n" +#: g10/keyedit.c:3744 +#, fuzzy, c-format +msgid "No subkey with index %d\n" +msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:3785 +#: g10/keyedit.c:3861 #, c-format msgid "user ID: \"%s\"\n" msgstr "用户标识：“%s”\n" -#: g10/keyedit.c:3788 g10/keyedit.c:3852 g10/keyedit.c:3895 +#: g10/keyedit.c:3864 g10/keyedit.c:3928 g10/keyedit.c:3971 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "由您的密钥 %s 于 %s%s(%s) 签字\n" -#: g10/keyedit.c:3790 g10/keyedit.c:3854 g10/keyedit.c:3897 +#: g10/keyedit.c:3866 g10/keyedit.c:3930 g10/keyedit.c:3973 msgid " (non-exportable)" msgstr " (不可导出)" -#: g10/keyedit.c:3794 +#: g10/keyedit.c:3870 #, c-format msgid "This signature expired on %s.\n" msgstr "这份签字已在 %s 过期。\n" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3874 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "您确定您仍然想要吊销它吗？(y/N)" -#: g10/keyedit.c:3802 +#: g10/keyedit.c:3878 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "要为这份签字生成一份吊销证书吗？(y/N)" -#: g10/keyedit.c:3829 +#: g10/keyedit.c:3905 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n" -#: g10/keyedit.c:3855 +#: g10/keyedit.c:3931 msgid " (non-revocable)" msgstr " (不可吊销)" -#: g10/keyedit.c:3862 +#: g10/keyedit.c:3938 #, c-format msgid "revoked by your key %s on %s\n" msgstr "由您的密钥 %s 于 %s 吊销\n" -#: g10/keyedit.c:3884 +#: g10/keyedit.c:3960 msgid "You are about to revoke these signatures:\n" msgstr "您正在吊销这些签字：\n" -#: g10/keyedit.c:3904 +#: g10/keyedit.c:3980 msgid "Really create the revocation certificates? (y/N) " msgstr "真的要生成吊销证书吗？(y/N)" -#: g10/keyedit.c:3934 +#: g10/keyedit.c:4010 msgid "no secret key\n" msgstr "没有私钥\n" -#: g10/keyedit.c:4004 +#: g10/keyedit.c:4080 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "用户标识“%s”已经被吊销。\n" -#: g10/keyedit.c:4021 +#: g10/keyedit.c:4097 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n" -#: g10/keyedit.c:4190 +#: g10/keyedit.c:4161 +#, fuzzy, c-format +msgid "Key %s is already revoked.\n" +msgstr "用户标识“%s”已经被吊销。\n" + +#: g10/keyedit.c:4223 +#, fuzzy, c-format +msgid "Subkey %s is already revoked.\n" +msgstr "用户标识“%s”已经被吊销。\n" + +#: g10/keyedit.c:4318 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n" @@ -3246,143 +3335,143 @@ msgstr "太多首选压缩算法\n" msgid "invalid item `%s' in preference string\n" msgstr "首选项字符串里有无效项‘%s’\n" -#: g10/keygen.c:827 +#: g10/keygen.c:829 msgid "writing direct signature\n" msgstr "正在写入直接签字\n" -#: g10/keygen.c:866 +#: g10/keygen.c:868 msgid "writing self signature\n" msgstr "正在写入自身签字\n" -#: g10/keygen.c:912 +#: g10/keygen.c:914 msgid "writing key binding signature\n" msgstr "正在写入密钥绑定签字\n" -#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625 +#: g10/keygen.c:976 g10/keygen.c:1060 g10/keygen.c:1151 g10/keygen.c:2631 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "密钥尺寸无效：改用 %u 位\n" -#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631 +#: g10/keygen.c:981 g10/keygen.c:1065 g10/keygen.c:1156 g10/keygen.c:2637 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "密钥尺寸舍入到 %u 位\n" -#: g10/keygen.c:1247 +#: g10/keygen.c:1249 msgid "Sign" msgstr "签字" -#: g10/keygen.c:1250 +#: g10/keygen.c:1252 msgid "Encrypt" msgstr "加密" -#: g10/keygen.c:1253 +#: g10/keygen.c:1255 msgid "Authenticate" msgstr "认证" -#: g10/keygen.c:1261 +#: g10/keygen.c:1263 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1276 +#: g10/keygen.c:1278 #, c-format msgid "Possible actions for a %s key: " msgstr "%s 密钥可能的操作：" -#: g10/keygen.c:1280 +#: g10/keygen.c:1282 msgid "Current allowed actions: " msgstr "目前允许的操作：" -#: g10/keygen.c:1285 +#: g10/keygen.c:1287 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) 选择是否用于签字\n" -#: g10/keygen.c:1288 +#: g10/keygen.c:1290 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) 选择是否用于加密\n" -#: g10/keygen.c:1291 +#: g10/keygen.c:1293 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) 选择是否用于认证\n" -#: g10/keygen.c:1294 +#: g10/keygen.c:1296 #, c-format msgid " (%c) Finished\n" msgstr " (%c) 已完成\n" -#: g10/keygen.c:1348 +#: g10/keygen.c:1350 msgid "Please select what kind of key you want:\n" msgstr "请选择您要使用的密钥种类：\n" -#: g10/keygen.c:1350 +#: g10/keygen.c:1352 #, c-format msgid " (%d) DSA and Elgamal (default)\n" msgstr " (%d) DSA 和 ElGamal (默认)\n" -#: g10/keygen.c:1351 +#: g10/keygen.c:1353 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (仅用于签字)\n" -#: g10/keygen.c:1353 +#: g10/keygen.c:1355 #, fuzzy, c-format msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) RSA (自定义用途)\n" -#: g10/keygen.c:1355 +#: g10/keygen.c:1357 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (仅用于加密)\n" -#: g10/keygen.c:1356 +#: g10/keygen.c:1358 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (仅用于签字)\n" -#: g10/keygen.c:1358 +#: g10/keygen.c:1360 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (仅用于加密)\n" -#: g10/keygen.c:1360 +#: g10/keygen.c:1362 #, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (自定义用途)\n" -#: g10/keygen.c:1429 g10/keygen.c:2502 +#: g10/keygen.c:1431 g10/keygen.c:2508 #, fuzzy, c-format msgid "DSA keypair will have %u bits.\n" msgstr "DSA 密钥对会有 1024 位。\n" -#: g10/keygen.c:1439 +#: g10/keygen.c:1441 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1446 +#: g10/keygen.c:1448 #, fuzzy, c-format msgid "What keysize do you want? (%u) " msgstr "您想要用多大的密钥尺寸？(1024)" -#: g10/keygen.c:1460 +#: g10/keygen.c:1462 #, c-format msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -#: g10/keygen.c:1466 +#: g10/keygen.c:1468 #, c-format msgid "Requested keysize is %u bits\n" msgstr "您所要求的密钥尺寸是 %u 位\n" -#: g10/keygen.c:1471 g10/keygen.c:1476 +#: g10/keygen.c:1473 g10/keygen.c:1478 #, c-format msgid "rounded up to %u bits\n" msgstr "舍入到 %u 位\n" -#: g10/keygen.c:1528 +#: g10/keygen.c:1530 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3398,7 +3487,7 @@ msgstr "" " <n>m = 密钥在 n 月后过期\n" " <n>y = 密钥在 n 年后过期\n" -#: g10/keygen.c:1537 +#: g10/keygen.c:1539 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3414,29 +3503,39 @@ msgstr "" " <n>m = 签字在 n 月后过期\n" " <n>y = 签字在 n 年后过期\n" -#: g10/keygen.c:1559 +#: g10/keygen.c:1561 msgid "Key is valid for? (0) " msgstr "密钥的有效期限是？(0) " -#: g10/keygen.c:1561 +#: g10/keygen.c:1563 msgid "Signature is valid for? (0) " msgstr "签字的有效期限是多久？(0) " -#: g10/keygen.c:1566 +#: g10/keygen.c:1568 msgid "invalid value\n" msgstr "无效的数值\n" -#: g10/keygen.c:1571 -#, c-format -msgid "%s does not expire at all\n" +#: g10/keygen.c:1575 +#, fuzzy +msgid "Key does not expire at all\n" msgstr "%s 永远不会过期\n" -#: g10/keygen.c:1578 -#, c-format -msgid "%s expires at %s\n" +#: g10/keygen.c:1576 +#, fuzzy +msgid "Signature does not expire at all\n" +msgstr "%s 永远不会过期\n" + +#: g10/keygen.c:1583 +#, fuzzy, c-format +msgid "Key expires at %s\n" msgstr "%s 将在 %s 过期\n" #: g10/keygen.c:1584 +#, fuzzy, c-format +msgid "Signature expires at %s\n" +msgstr "这份签字在 %s 过期。\n" + +#: g10/keygen.c:1590 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3444,11 +3543,11 @@ msgstr "" "您的系统无法显示 2038 年以后的日期。\n" "不过，它可以正确处理 2106 年之前的年份。\n" -#: g10/keygen.c:1589 +#: g10/keygen.c:1595 msgid "Is this correct? (y/N) " msgstr "以上正确吗？(y/n)" -#: g10/keygen.c:1632 +#: g10/keygen.c:1638 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3464,44 +3563,44 @@ msgstr "" " “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n" "\n" -#: g10/keygen.c:1644 +#: g10/keygen.c:1650 msgid "Real name: " msgstr "真实姓名：" -#: g10/keygen.c:1652 +#: g10/keygen.c:1658 msgid "Invalid character in name\n" msgstr "姓名含有无效的字符\n" -#: g10/keygen.c:1654 +#: g10/keygen.c:1660 msgid "Name may not start with a digit\n" msgstr "姓名不可以用数字开头\n" -#: g10/keygen.c:1656 +#: g10/keygen.c:1662 msgid "Name must be at least 5 characters long\n" msgstr "姓名至少要有五个字符长\n" -#: g10/keygen.c:1664 +#: g10/keygen.c:1670 msgid "Email address: " msgstr "电子邮件地址：" -#: g10/keygen.c:1675 +#: g10/keygen.c:1681 msgid "Not a valid email address\n" msgstr "电子邮件地址无效\n" -#: g10/keygen.c:1683 +#: g10/keygen.c:1689 msgid "Comment: " msgstr "注释：" -#: g10/keygen.c:1689 +#: g10/keygen.c:1695 msgid "Invalid character in comment\n" msgstr "注释含有无效的字符\n" -#: g10/keygen.c:1712 +#: g10/keygen.c:1718 #, c-format msgid "You are using the `%s' character set.\n" msgstr "您正在使用‘%s’字符集。\n" -#: g10/keygen.c:1718 +#: g10/keygen.c:1724 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3512,27 +3611,27 @@ msgstr "" " “%s”\n" "\n" -#: g10/keygen.c:1723 +#: g10/keygen.c:1729 msgid "Please don't put the email address into the real name or the comment\n" msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n" -#: g10/keygen.c:1739 +#: g10/keygen.c:1745 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:1749 +#: g10/keygen.c:1755 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？" -#: g10/keygen.c:1750 +#: g10/keygen.c:1756 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？" -#: g10/keygen.c:1769 +#: g10/keygen.c:1775 msgid "Please correct the error first\n" msgstr "请先改正错误\n" -#: g10/keygen.c:1809 +#: g10/keygen.c:1815 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3540,12 +3639,12 @@ msgstr "" "您需要一个密码来保护您的私钥。\n" "\n" -#: g10/keygen.c:1819 g10/passphrase.c:1101 +#: g10/keygen.c:1825 g10/passphrase.c:1101 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1825 +#: g10/keygen.c:1831 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" @@ -3557,7 +3656,7 @@ msgstr "" "再次执行这个程序，并且使用“--edit-key”选项即可。\n" "\n" -#: g10/keygen.c:1847 +#: g10/keygen.c:1853 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" @@ -3567,107 +3666,108 @@ msgstr "" "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n" "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n" -#: g10/keygen.c:2571 +#: g10/keygen.c:2577 msgid "Key generation canceled.\n" msgstr "密钥生成已取消。\n" -#: g10/keygen.c:2759 g10/keygen.c:2896 +#: g10/keygen.c:2765 g10/keygen.c:2909 #, c-format msgid "writing public key to `%s'\n" msgstr "正在将公钥写至`%s'\n" -#: g10/keygen.c:2761 g10/keygen.c:2899 +#: g10/keygen.c:2767 g10/keygen.c:2912 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "向‘%s’写入私钥占位符\n" -#: g10/keygen.c:2764 g10/keygen.c:2902 +#: g10/keygen.c:2770 g10/keygen.c:2915 #, c-format msgid "writing secret key to `%s'\n" msgstr "正在将私钥写至`%s'\n" -#: g10/keygen.c:2885 +#: g10/keygen.c:2898 #, c-format msgid "no writable public keyring found: %s\n" msgstr "找不到可写的公钥钥匙环：%s\n" -#: g10/keygen.c:2891 +#: g10/keygen.c:2904 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "找不到可写的私钥钥匙环：%s\n" -#: g10/keygen.c:2909 +#: g10/keygen.c:2922 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n" -#: g10/keygen.c:2916 +#: g10/keygen.c:2929 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n" -#: g10/keygen.c:2939 +#: g10/keygen.c:2952 msgid "public and secret key created and signed.\n" msgstr "公钥和私钥已经生成并经签字。\n" -#: g10/keygen.c:2950 +#: g10/keygen.c:2963 +#, fuzzy msgid "" "Note that this key cannot be used for encryption. You may want to use\n" -"the command \"--edit-key\" to generate a secondary key for this purpose.\n" +"the command \"--edit-key\" to generate a subkey for this purpose.\n" msgstr "" "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n" "生成用于加密的子钥。\n" -#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192 +#: g10/keygen.c:2975 g10/keygen.c:3104 g10/keygen.c:3219 #, c-format msgid "Key generation failed: %s\n" msgstr "生成密钥失败：%s\n" -#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290 +#: g10/keygen.c:3027 g10/keygen.c:3155 g10/sign.c:290 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n" -#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292 +#: g10/keygen.c:3029 g10/keygen.c:3157 g10/sign.c:292 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n" -#: g10/keygen.c:3024 g10/keygen.c:3141 +#: g10/keygen.c:3038 g10/keygen.c:3168 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n" -#: g10/keygen.c:3052 g10/keygen.c:3174 +#: g10/keygen.c:3077 g10/keygen.c:3201 msgid "Really create? (y/N) " msgstr "真的要建立吗？(y/N)" -#: g10/keygen.c:3327 +#: g10/keygen.c:3354 #, c-format msgid "storing key onto card failed: %s\n" msgstr "向卡上存储密钥时失败：%s\n" -#: g10/keygen.c:3374 +#: g10/keygen.c:3401 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "不能创建备份文件‘%s’：%s\n" -#: g10/keygen.c:3397 +#: g10/keygen.c:3424 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "注意：卡密钥的备份已保存到‘%s’\n" -#: g10/keygen.c:3464 +#: g10/keygen.c:3491 #, c-format msgid "length of RSA modulus is not %d\n" msgstr "RSA 余数的长度不为 %d\n" -#: g10/keygen.c:3470 +#: g10/keygen.c:3497 msgid "public exponent too large (more than 32 bits)\n" msgstr "公钥指数太大(超过 32 位)\n" -#: g10/keygen.c:3476 g10/keygen.c:3482 +#: g10/keygen.c:3503 g10/keygen.c:3509 #, c-format msgid "length of an RSA prime is not %d\n" msgstr "RSA 质数的长度不为 %d\n" @@ -3676,65 +3776,67 @@ msgstr "RSA 质数的长度不为 %d\n" msgid "never " msgstr "永不过期" -#: g10/keylist.c:201 +#: g10/keylist.c:264 msgid "Critical signature policy: " msgstr "关键签字策略：" -#: g10/keylist.c:203 +#: g10/keylist.c:266 msgid "Signature policy: " msgstr "签字策略：" -#: g10/keylist.c:242 +#: g10/keylist.c:305 msgid "Critical preferred keyserver: " msgstr "关键首选公钥服务器：" -#: g10/keylist.c:291 g10/keylist.c:335 +#: g10/keylist.c:354 g10/keylist.c:398 msgid "WARNING: invalid notation data found\n" msgstr "警告：找到无效的标记数据\n" -#: g10/keylist.c:309 +#: g10/keylist.c:372 msgid "Critical signature notation: " msgstr "关键签字标记：" -#: g10/keylist.c:311 +#: g10/keylist.c:374 msgid "Signature notation: " msgstr "签字标记：" -#: g10/keylist.c:322 +#: g10/keylist.c:385 msgid "not human readable" msgstr "不是人类能读懂的" -#: g10/keylist.c:423 +#: g10/keylist.c:486 msgid "Keyring" msgstr "钥匙环" -#: g10/keylist.c:729 +#: g10/keylist.c:792 #, c-format msgid "expired: %s)" msgstr "已过期：%s)" -#: g10/keylist.c:1425 +#: g10/keylist.c:1488 msgid "Primary key fingerprint:" msgstr "主钥指纹：" -#: g10/keylist.c:1427 +#: g10/keylist.c:1490 msgid " Subkey fingerprint:" msgstr "子钥指纹：" -#: g10/keylist.c:1434 +#. TRANSLATORS: this should fit into 24 bytes to that the +#. * fingerprint data is properly aligned with the user ID +#: g10/keylist.c:1497 msgid " Primary key fingerprint:" msgstr " 主钥指纹：" -#: g10/keylist.c:1436 +#: g10/keylist.c:1499 msgid " Subkey fingerprint:" msgstr " 子钥指纹：" # use tty -#: g10/keylist.c:1440 g10/keylist.c:1444 +#: g10/keylist.c:1503 g10/keylist.c:1507 msgid " Key fingerprint =" msgstr " 密钥指纹 =" -#: g10/keylist.c:1511 +#: g10/keylist.c:1574 msgid " Card serial no. =" msgstr " 卡序列号 =" @@ -3786,123 +3888,123 @@ msgstr "%s：钥匙环已建立\n" msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n" -#: g10/keyserver.c:378 +#: g10/keyserver.c:425 msgid "disabled" msgstr "已禁用" -#: g10/keyserver.c:579 +#: g10/keyserver.c:626 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >" -#: g10/keyserver.c:662 g10/keyserver.c:1147 +#: g10/keyserver.c:709 g10/keyserver.c:1229 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "无效的公钥服务器协议(us %d!=handler %d)\n" -#: g10/keyserver.c:752 +#: g10/keyserver.c:799 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "在公钥服务器上找不到密钥“%s”\n" -#: g10/keyserver.c:754 +#: g10/keyserver.c:801 msgid "key not found on keyserver\n" msgstr "在公钥服务器上找不到密钥\n" -#: g10/keyserver.c:901 +#: g10/keyserver.c:976 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "下载密钥‘%s’，从 %s 服务器 %s\n" -#: g10/keyserver.c:905 +#: g10/keyserver.c:980 #, c-format msgid "requesting key %s from %s\n" msgstr "下载密钥 %s，从 %s\n" -#: g10/keyserver.c:1050 +#: g10/keyserver.c:1132 #, c-format msgid "sending key %s to %s server %s\n" msgstr "将密钥‘%s’上传到 %s 服务器 %s\n" -#: g10/keyserver.c:1054 +#: g10/keyserver.c:1136 #, c-format msgid "sending key %s to %s\n" msgstr "将密钥‘%s’上传到 %s\n" -#: g10/keyserver.c:1097 +#: g10/keyserver.c:1179 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "搜索“%s”，在 %s 服务器 %s 上\n" -#: g10/keyserver.c:1100 +#: g10/keyserver.c:1182 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "搜索“%s”，在 %s 上\n" -#: g10/keyserver.c:1107 g10/keyserver.c:1202 +#: g10/keyserver.c:1189 g10/keyserver.c:1284 msgid "no keyserver action!\n" msgstr "公钥服务器无动作！\n" -#: g10/keyserver.c:1155 +#: g10/keyserver.c:1237 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n" -#: g10/keyserver.c:1164 +#: g10/keyserver.c:1246 msgid "keyserver did not send VERSION\n" msgstr "公钥服务器未发送 VERSION\n" -#: g10/keyserver.c:1223 +#: g10/keyserver.c:1305 msgid "no keyserver known (use option --keyserver)\n" msgstr "未给出公钥服务器(使用 --keyserver 选项)\n" -#: g10/keyserver.c:1229 +#: g10/keyserver.c:1311 msgid "external keyserver calls are not supported in this build\n" msgstr "这一编译版本不支持外部调用公钥服务器\n" -#: g10/keyserver.c:1241 +#: g10/keyserver.c:1323 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "没有处理‘%s’公钥服务器的程序\n" -#: g10/keyserver.c:1246 +#: g10/keyserver.c:1328 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n" -#: g10/keyserver.c:1254 +#: g10/keyserver.c:1336 #, c-format msgid "gpgkeys_%s does not support handler version %d\n" msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n" -#: g10/keyserver.c:1261 +#: g10/keyserver.c:1342 msgid "keyserver timed out\n" msgstr "公钥服务器超时\n" -#: g10/keyserver.c:1266 +#: g10/keyserver.c:1347 msgid "keyserver internal error\n" msgstr "公钥服务器内部错误\n" -#: g10/keyserver.c:1275 +#: g10/keyserver.c:1356 #, c-format msgid "keyserver communications error: %s\n" msgstr "公钥服务器通讯错误：%s\n" -#: g10/keyserver.c:1300 g10/keyserver.c:1334 +#: g10/keyserver.c:1381 g10/keyserver.c:1415 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "“%s”不是一个用户标识：跳过\n" -#: g10/keyserver.c:1585 +#: g10/keyserver.c:1666 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "警告：无法更新密钥 %s，通过 %s：%s\n" -#: g10/keyserver.c:1607 +#: g10/keyserver.c:1688 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1 个密钥正从 %s 得到更新\n" -#: g10/keyserver.c:1609 +#: g10/keyserver.c:1690 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%d 个密钥正从 %s 得到更新\n" @@ -4110,84 +4212,84 @@ msgstr "旧式(PGP 2.x)签字\n" msgid "invalid root packet detected in proc_tree()\n" msgstr "在 proc_tree() 中检测到无效的根包\n" -#: g10/misc.c:105 +#: g10/misc.c:119 #, c-format msgid "can't disable core dumps: %s\n" msgstr "无法禁用核心内存转储：%s\n" -#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225 +#: g10/misc.c:139 g10/misc.c:167 g10/misc.c:239 #, c-format msgid "fstat of `%s' failed in %s: %s\n" msgstr "‘%s’的 fstat 在 %s 中出错：%s\n" -#: g10/misc.c:190 +#: g10/misc.c:204 #, c-format msgid "fstat(%d) failed in %s: %s\n" msgstr "fstat(%d) 在 %s 中出错：%s\n" -#: g10/misc.c:299 +#: g10/misc.c:313 #, fuzzy, c-format msgid "WARNING: using experimental public key algorithm %s\n" msgstr "无法操作公钥算法 %d\n" -#: g10/misc.c:314 +#: g10/misc.c:328 #, fuzzy, c-format msgid "WARNING: using experimental cipher algorithm %s\n" msgstr "尚未实现的对称加密算法" -#: g10/misc.c:329 +#: g10/misc.c:343 #, fuzzy, c-format msgid "WARNING: using experimental digest algorithm %s\n" msgstr "%s签字，散列算法 %s\n" -#: g10/misc.c:334 +#: g10/misc.c:348 #, fuzzy, c-format msgid "WARNING: digest algorithm %s is deprecated\n" msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n" -#: g10/misc.c:430 +#: g10/misc.c:444 msgid "the IDEA cipher plugin is not present\n" msgstr "IDEA 算法插件不存在\n" -#: g10/misc.c:431 +#: g10/misc.c:445 msgid "" "please see http://www.gnupg.org/why-not-idea.html for more information\n" msgstr "请访问 http://www.gnupg.org/why-not-idea.html 以获得更详细的信息\n" -#: g10/misc.c:664 +#: g10/misc.c:678 #, c-format msgid "%s:%d: deprecated option \"%s\"\n" msgstr "%s:%d：不建议使用该选项“%s”\n" -#: g10/misc.c:668 +#: g10/misc.c:682 #, c-format msgid "WARNING: \"%s\" is a deprecated option\n" msgstr "警告：“%s”选项已不建议使用\n" -#: g10/misc.c:670 +#: g10/misc.c:684 #, c-format msgid "please use \"%s%s\" instead\n" msgstr "请以“%s%s”代替\n" -#: g10/misc.c:681 +#: g10/misc.c:695 msgid "Uncompressed" msgstr "不压缩" -#: g10/misc.c:706 +#: g10/misc.c:720 msgid "uncompressed|none" msgstr "未压缩|无" -#: g10/misc.c:816 +#: g10/misc.c:830 #, c-format msgid "this message may not be usable by %s\n" msgstr "%s 也许不能使用这个报文\n" -#: g10/misc.c:973 +#: g10/misc.c:987 #, c-format msgid "ambiguous option `%s'\n" msgstr "有歧义的选项‘%s’\n" -#: g10/misc.c:998 +#: g10/misc.c:1012 #, c-format msgid "unknown option `%s'\n" msgstr "未知的选项 '%s'\n" @@ -4234,16 +4336,16 @@ msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n" msgid "directory `%s' created\n" msgstr "已创建目录‘%s’\n" -#: g10/parse-packet.c:119 +#: g10/parse-packet.c:137 #, c-format msgid "can't handle public key algorithm %d\n" msgstr "无法操作公钥算法 %d\n" -#: g10/parse-packet.c:688 +#: g10/parse-packet.c:707 msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "警告：潜在不安全的对称加密会话密钥\n" -#: g10/parse-packet.c:1112 +#: g10/parse-packet.c:1132 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "%d 类别的子包设定了关键位\n" @@ -4282,16 +4384,16 @@ msgstr "无法连接至‘%s’：%s\n" msgid "communication problem with gpg-agent\n" msgstr "与 gpg-agent 通讯有问题\n" -#: g10/passphrase.c:597 g10/passphrase.c:932 g10/passphrase.c:1044 +#: g10/passphrase.c:597 g10/passphrase.c:934 g10/passphrase.c:1046 msgid "problem with the agent - disabling agent use\n" msgstr "代理程序的问题――正在停用代理程序\n" -#: g10/passphrase.c:700 g10/passphrase.c:1205 +#: g10/passphrase.c:699 g10/passphrase.c:1205 #, c-format msgid " (main key ID %s)" msgstr "(主钥匙号 %s)" -#: g10/passphrase.c:714 +#: g10/passphrase.c:713 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4302,27 +4404,27 @@ msgstr "" "“%.*s”\n" "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n" -#: g10/passphrase.c:739 +#: g10/passphrase.c:738 msgid "Repeat passphrase\n" msgstr "请再输入一次密码\n" -#: g10/passphrase.c:741 +#: g10/passphrase.c:740 msgid "Enter passphrase\n" msgstr "请输入密码\n" -#: g10/passphrase.c:779 +#: g10/passphrase.c:780 msgid "passphrase too long\n" msgstr "密码太长\n" -#: g10/passphrase.c:792 +#: g10/passphrase.c:793 msgid "invalid response from agent\n" msgstr "代理程序响应无效\n" -#: g10/passphrase.c:807 g10/passphrase.c:926 +#: g10/passphrase.c:808 g10/passphrase.c:928 msgid "cancelled by user\n" msgstr "用户取消\n" -#: g10/passphrase.c:812 g10/passphrase.c:1015 +#: g10/passphrase.c:813 g10/passphrase.c:1017 #, c-format msgid "problem with the agent: agent returns 0x%lx\n" msgstr "代理程序的问题：代理程序返回 0x%lx\n" @@ -4831,20 +4933,20 @@ msgstr "保护算法 %d%s 未被支持\n" msgid "protection digest %d is not supported\n" msgstr "不支持保护散列 %d\n" -#: g10/seckey-cert.c:250 +#: g10/seckey-cert.c:265 msgid "Invalid passphrase; please try again" msgstr "无效的密码；请再试一次" -#: g10/seckey-cert.c:251 +#: g10/seckey-cert.c:266 #, c-format msgid "%s ...\n" msgstr "%s……\n" -#: g10/seckey-cert.c:311 +#: g10/seckey-cert.c:326 msgid "WARNING: Weak key detected - please change passphrase again.\n" msgstr "警告：检测到弱密钥――请更换密码。\n" -#: g10/seckey-cert.c:349 +#: g10/seckey-cert.c:364 msgid "generating the deprecated 16-bit checksum for secret key protection\n" msgstr "正在产生私钥保护使用的旧式 16 位校验和\n" @@ -5184,12 +5286,12 @@ msgstr "%s：附加记录时失败：%s\n" msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n" msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n" -#: g10/textfilter.c:142 +#: g10/textfilter.c:147 #, c-format msgid "can't handle text lines longer than %d characters\n" msgstr "无法处理长于 %d 字符的文本行\n" -#: g10/textfilter.c:239 +#: g10/textfilter.c:244 #, c-format msgid "input line longer than %d characters\n" msgstr "输入行长度超过 %d 字符\n" @@ -5664,6 +5766,33 @@ msgstr "安全内存未初始化，不能进行操作\n" msgid "(you may have used the wrong program for this task)\n" msgstr "(您可能使用了错误的程序来完成此项任务)\n" +#~ msgid "select secondary key N" +#~ msgstr "选择子钥 N" + +#~ msgid "list signatures" +#~ msgstr "列出签字" + +#~ msgid "sign the key" +#~ msgstr "为密钥添加签字" + +#~ msgid "add a secondary key" +#~ msgstr "增加一把子钥" + +#~ msgid "delete signatures" +#~ msgstr "删除签字" + +#~ msgid "change the expire date" +#~ msgstr "更改使用期限" + +#~ msgid "set preference list" +#~ msgstr "设定首选项" + +#~ msgid "updated preferences" +#~ msgstr "更新过的首选项" + +#~ msgid "No secondary key with index %d\n" +#~ msgstr "没有索引为 %d 的子钥\n" + #~ msgid "--nrsign-key user-id" #~ msgstr "--nrsign-key 用户标识" @@ -5775,9 +5904,6 @@ msgstr "(您可能使用了错误的程序来完成此项任务)\n" #~ msgid "delphoto" #~ msgstr "delphoto" -#~ msgid "addkey" -#~ msgstr "addkey" - #~ msgid "addcardkey" #~ msgstr "addcardkey" |