diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 1504 |
1 files changed, 784 insertions, 720 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index ac7f73ec1..4bc14e930 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.1\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2005-11-20 17:57+0100\n" +"POT-Creation-Date: 2006-02-14 15:28+0100\n" "PO-Revision-Date: 2005-03-17 22:24+0800\n" "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n" "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n" @@ -29,70 +29,80 @@ msgstr "当 pbits=%u 而 qbits=%u 时不能生成质数\n" msgid "can't generate a prime with less than %d bits\n" msgstr "少于 %d 位时不能生成质数\n" -#: cipher/random.c:164 +#: cipher/random.c:173 msgid "no entropy gathering module detected\n" msgstr "检测不到熵搜集模块\n" -#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746 +#: cipher/random.c:403 +#, fuzzy, c-format +msgid "can't lock `%s': %s\n" +msgstr "无法锁定‘%s’\n" + +#: cipher/random.c:408 +#, fuzzy, c-format +msgid "waiting for lock on `%s'...\n" +msgstr "正在将私钥写至`%s'\n" + +#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488 -#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274 +#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340 -#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050 -#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540 +#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060 +#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540 #: g10/tdbio.c:605 #, c-format msgid "can't open `%s': %s\n" msgstr "无法打开‘%s’： %s\n" -#: cipher/random.c:392 +#: cipher/random.c:458 #, c-format msgid "can't stat `%s': %s\n" msgstr "无法获得文件‘%s’的信息： %s\n" -#: cipher/random.c:397 +#: cipher/random.c:463 #, c-format msgid "`%s' is not a regular file - ignored\n" msgstr "‘%s’不是一个普通文件――已忽略\n" -#: cipher/random.c:402 +#: cipher/random.c:468 msgid "note: random_seed file is empty\n" msgstr "注意：随机数种子文件为空\n" -#: cipher/random.c:408 +#: cipher/random.c:474 msgid "WARNING: invalid size of random_seed file - not used\n" msgstr "警告：随机数种子文件大小无效――未使用\n" -#: cipher/random.c:416 +#: cipher/random.c:482 #, c-format msgid "can't read `%s': %s\n" msgstr "无法读取‘%s’：%s\n" -#: cipher/random.c:454 +#: cipher/random.c:520 msgid "note: random_seed file not updated\n" msgstr "注意：随机数种子文件未被更新\n" -#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753 +#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261 -#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536 +#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536 #, c-format msgid "can't create `%s': %s\n" msgstr "无法建立‘%s’：%s\n" -#: cipher/random.c:481 +#: cipher/random.c:556 cipher/random.c:566 #, c-format msgid "can't write `%s': %s\n" msgstr "无法写入‘%s’：%s\n" -#: cipher/random.c:484 +#: cipher/random.c:569 #, c-format msgid "can't close `%s': %s\n" msgstr "无法关闭‘%s’：%s\n" -#: cipher/random.c:729 +#: cipher/random.c:814 msgid "WARNING: using insecure random number generator!!\n" msgstr "警告：正在使用不安全的随机数发生器！！\n" -#: cipher/random.c:730 +#: cipher/random.c:815 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -106,7 +116,7 @@ msgstr "" "绝对不要在现实世界中使用这个程序产生的任何数据！！\n" "\n" -#: cipher/rndegd.c:205 +#: cipher/rndegd.c:202 msgid "" "Please wait, entropy is being gathered. Do some work if it would\n" "keep you from getting bored, because it will improve the quality\n" @@ -115,7 +125,7 @@ msgstr "" "请稍待片刻，系统此时正在搜集熵。如果您觉得无聊的话，不妨做些\n" "别的事——事实上这甚至能够让熵数的品质更好。\n" -#: cipher/rndlinux.c:135 +#: cipher/rndlinux.c:132 #, c-format msgid "" "\n" @@ -153,18 +163,18 @@ msgstr "响应未包含 RSA 余数\n" msgid "response does not contain the RSA public exponent\n" msgstr "响应未包含 RSA 公钥指数\n" -#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150 +#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN 回调返回错误：%s\n" -#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156 +#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160 #, c-format msgid "PIN for CHV%d is too short; minimum length is %d\n" msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n" #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362 -#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179 +#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "验证 CHV%d 失败：%s\n" @@ -173,11 +183,11 @@ msgstr "验证 CHV%d 失败：%s\n" msgid "access to admin commands is not configured\n" msgstr "尚未配置管理员命令的权限\n" -#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385 +#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389 msgid "error retrieving CHV status from card\n" msgstr "从卡中获取 CHV 状态时出错\n" -#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394 +#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398 msgid "card is permanently locked!\n" msgstr "卡被永久锁定！\n" @@ -270,22 +280,27 @@ msgstr "密钥已生成(耗时 %d 秒)\n" msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n" -#: g10/app-openpgp.c:2130 +#: g10/app-openpgp.c:2087 +#, fuzzy, c-format +msgid "card does not support digest algorithm %s\n" +msgstr "%s 签字，散列算法 %s\n" + +#: g10/app-openpgp.c:2134 #, c-format msgid "signatures created so far: %lu\n" msgstr "目前已创建的签字：%lu\n" -#: g10/app-openpgp.c:2138 +#: g10/app-openpgp.c:2142 #, fuzzy, c-format msgid "||Please enter the PIN%%0A[sigs done: %lu]" msgstr "PIN [完成签字：%lu]" -#: g10/app-openpgp.c:2399 +#: g10/app-openpgp.c:2403 msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "" -#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480 +#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "不能存取 %s――无效的 OpenPGP 卡？\n" @@ -295,70 +310,70 @@ msgstr "不能存取 %s――无效的 OpenPGP 卡？\n" msgid "armor: %s\n" msgstr "ASCII 封装：%s\n" -#: g10/armor.c:347 +#: g10/armor.c:357 msgid "invalid armor header: " msgstr "无效的 ASCII 封装头：" -#: g10/armor.c:354 +#: g10/armor.c:368 msgid "armor header: " msgstr "ASCII 封装头：" -#: g10/armor.c:365 +#: g10/armor.c:379 msgid "invalid clearsig header\n" msgstr "无效的明文签字头\n" -#: g10/armor.c:417 +#: g10/armor.c:431 msgid "nested clear text signatures\n" msgstr "多层明文签字\n" -#: g10/armor.c:552 +#: g10/armor.c:566 msgid "unexpected armor: " msgstr "与预期不符的 ASCII 封装：" -#: g10/armor.c:564 +#: g10/armor.c:578 msgid "invalid dash escaped line: " msgstr "以连字符开头的行格式错误：" -#: g10/armor.c:716 g10/armor.c:1323 +#: g10/armor.c:730 g10/armor.c:1337 #, c-format msgid "invalid radix64 character %02X skipped\n" msgstr "跳过无效的 64 进制字符 %02x\n" -#: g10/armor.c:759 +#: g10/armor.c:773 msgid "premature eof (no CRC)\n" msgstr "文件先于预期结束(没有 CRC 部分)\n" -#: g10/armor.c:793 +#: g10/armor.c:807 msgid "premature eof (in CRC)\n" msgstr "文件先于预期结束(CRC 部分未结束)\n" -#: g10/armor.c:801 +#: g10/armor.c:815 msgid "malformed CRC\n" msgstr "异常的 CRC\n" -#: g10/armor.c:805 g10/armor.c:1360 +#: g10/armor.c:819 g10/armor.c:1374 #, c-format msgid "CRC error; %06lX - %06lX\n" msgstr "CRC 错误：%06lx - %06lx\n" -#: g10/armor.c:825 +#: g10/armor.c:839 msgid "premature eof (in trailer)\n" msgstr "文件先于预期结束(于结尾处)\n" -#: g10/armor.c:829 +#: g10/armor.c:843 msgid "error in trailer line\n" msgstr "结尾行有问题\n" -#: g10/armor.c:1138 +#: g10/armor.c:1152 msgid "no valid OpenPGP data found.\n" msgstr "找不到有效的 OpenPGP 数据。\n" -#: g10/armor.c:1143 +#: g10/armor.c:1157 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "无效的 ASCII 封装：一行超过 %d 字符\n" -#: g10/armor.c:1147 +#: g10/armor.c:1161 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n" @@ -374,12 +389,12 @@ msgid "OpenPGP card no. %s detected\n" msgstr "检测到 OpenPGP 卡号 %s\n" #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518 -#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418 +#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456 msgid "can't do this in batch mode\n" msgstr "在批处理模式中无法完成此操作\n" #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214 -#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290 +#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290 #: g10/keygen.c:1357 msgid "Your selection? " msgstr "您的选择？ " @@ -546,8 +561,8 @@ msgstr " (2) 加密密钥\n" msgid " (3) Authentication key\n" msgstr " (3) 认证密钥\n" -#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945 -#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647 +#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944 +#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685 msgid "Invalid selection.\n" msgstr "无效的选择。\n" @@ -567,7 +582,7 @@ msgstr "私钥部分不可用\n" msgid "secret key already stored on a card\n" msgstr "私钥已存储在卡上\n" -#: g10/card-util.c:1318 g10/keyedit.c:1355 +#: g10/card-util.c:1318 g10/keyedit.c:1354 msgid "quit this menu" msgstr "离开这个菜单" @@ -575,7 +590,7 @@ msgstr "离开这个菜单" msgid "show admin commands" msgstr "显示管理员命令" -#: g10/card-util.c:1321 g10/keyedit.c:1358 +#: g10/card-util.c:1321 g10/keyedit.c:1357 msgid "show this help" msgstr "显示这份在线说明" @@ -643,7 +658,7 @@ msgstr "允许使用管理员命令\n" msgid "Admin commands are not allowed\n" msgstr "不允许使用管理员命令\n" -#: g10/card-util.c:1601 g10/keyedit.c:2243 +#: g10/card-util.c:1601 g10/keyedit.c:2228 msgid "Invalid command (try \"help\")\n" msgstr "无效的指令(尝试“help”)\n" @@ -688,7 +703,7 @@ msgstr "再次输入此 PIN：" msgid "PIN not correctly repeated; try again" msgstr "PIN 再次输入时与首次输入不符；请再试一次" -#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377 +#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157 #, c-format msgid "can't open `%s'\n" @@ -698,14 +713,14 @@ msgstr "无法打开‘%s’\n" msgid "--output doesn't work for this command\n" msgstr "--output 在这个命令中不起作用\n" -#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584 -#: g10/revoke.c:227 +#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644 +#: g10/revoke.c:228 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "密钥‘%s’找不到：%s\n" -#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598 -#: g10/revoke.c:233 g10/revoke.c:440 +#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658 +#: g10/revoke.c:234 g10/revoke.c:478 #, c-format msgid "error reading keyblock: %s\n" msgstr "读取密钥区块时发生错误：%s\n" @@ -744,7 +759,7 @@ msgstr "公钥“%s”有对应的私钥！\n" msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "请先使用“--delete-secret-keys”选项来删除它。\n" -#: g10/encode.c:213 g10/sign.c:1220 +#: g10/encode.c:213 g10/sign.c:1230 #, c-format msgid "error creating passphrase: %s\n" msgstr "生成密码的时候发生错误：%s\n" @@ -763,7 +778,7 @@ msgstr "使用对称加密算法 %s\n" msgid "`%s' already compressed\n" msgstr "‘%s’已被压缩\n" -#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568 +#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "警告：‘%s’是一个空文件\n" @@ -788,7 +803,7 @@ msgid "" "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n" -#: g10/encode.c:642 g10/sign.c:901 +#: g10/encode.c:642 g10/sign.c:911 #, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " @@ -800,7 +815,7 @@ msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n" -#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847 +#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "您不该将 %s 用于 %s 模式中\n" @@ -810,12 +825,12 @@ msgstr "您不该将 %s 用于 %s 模式中\n" msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s 已经加密给：“%s”\n" -#: g10/encr-data.c:67 g10/mainproc.c:302 +#: g10/encr-data.c:67 g10/mainproc.c:306 #, c-format msgid "%s encrypted data\n" msgstr "%s 加密过的数据\n" -#: g10/encr-data.c:69 g10/mainproc.c:306 +#: g10/encr-data.c:69 g10/mainproc.c:310 #, c-format msgid "encrypted with unknown algorithm %d\n" msgstr "以未知的算法 %d 加密\n" @@ -885,79 +900,73 @@ msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n" msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "警告：无法删除临时目录‘%s’：%s\n" -#: g10/export.c:62 +#: g10/export.c:61 #, fuzzy msgid "export signatures that are marked as local-only" msgstr "这份签字会被标记成不可吊销。\n" -#: g10/export.c:64 +#: g10/export.c:63 msgid "export attribute user IDs (generally photo IDs)" msgstr "" -#: g10/export.c:66 -msgid "export revocation keys that are marked as \"sensitive\"" -msgstr "" - -#: g10/export.c:68 -msgid "remove unusable signatures during export" -msgstr "" - -#: g10/export.c:70 -msgid "remove unusable user IDs during export" -msgstr "" - -#: g10/export.c:72 -msgid "all export-clean-* options from above" -msgstr "" - -#: g10/export.c:75 -msgid "export the smallest key possible" -msgstr "" +#: g10/export.c:65 +#, fuzzy +msgid "export revocation keys marked as \"sensitive\"" +msgstr "没有找到“%s”的吊销密钥\n" -#: g10/export.c:77 +#: g10/export.c:67 #, fuzzy msgid "remove the passphrase from exported subkeys" msgstr "吊销密钥或选定的子钥" -#: g10/export.c:330 +#: g10/export.c:69 +#, fuzzy +msgid "remove unusable parts from key during export" +msgstr "不可用的私钥" + +#: g10/export.c:71 +msgid "remove as much as possible from key during export" +msgstr "" + +#: g10/export.c:325 msgid "exporting secret keys not allowed\n" msgstr "不允许导出私钥\n" -#: g10/export.c:359 +#: g10/export.c:354 #, c-format msgid "key %s: not protected - skipped\n" msgstr "密钥 %s：未被保护――已跳过\n" -#: g10/export.c:367 +#: g10/export.c:362 #, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n" -#: g10/export.c:378 +#: g10/export.c:373 #, fuzzy, c-format msgid "key %s: key material on-card - skipped\n" msgstr "密钥 %s：子钥签字位置错误――已跳过\n" -#: g10/export.c:543 +#: g10/export.c:521 msgid "about to export an unprotected subkey\n" msgstr "" -#: g10/export.c:566 +#: g10/export.c:544 #, fuzzy, c-format msgid "failed to unprotect the subkey: %s\n" msgstr "无法存储密钥：%s\n" # I hope this warning doesn't confuse people. -#: g10/export.c:587 +#: g10/export.c:565 #, c-format msgid "WARNING: secret key %s does not have a simple SK checksum\n" msgstr "警告：私钥 %s 不存在简单 SK 检验和\n" -#: g10/export.c:620 +#: g10/export.c:598 msgid "WARNING: nothing exported\n" msgstr "警告：没有导出任何东西\n" -#: g10/gpg.c:367 +#: g10/gpg.c:372 msgid "" "@Commands:\n" " " @@ -965,127 +974,127 @@ msgstr "" "@指令：\n" " " -#: g10/gpg.c:369 +#: g10/gpg.c:374 msgid "|[file]|make a signature" msgstr "|[文件名]|生成一份签字" -#: g10/gpg.c:370 +#: g10/gpg.c:375 msgid "|[file]|make a clear text signature" msgstr "|[文件名]|生成一份明文签字" -#: g10/gpg.c:371 +#: g10/gpg.c:376 msgid "make a detached signature" msgstr "生成一份分离的签字" -#: g10/gpg.c:372 +#: g10/gpg.c:377 msgid "encrypt data" msgstr "加密数据" -#: g10/gpg.c:374 +#: g10/gpg.c:379 msgid "encryption only with symmetric cipher" msgstr "仅使用对称加密" -#: g10/gpg.c:376 +#: g10/gpg.c:381 msgid "decrypt data (default)" msgstr "解密数据(默认)" -#: g10/gpg.c:378 +#: g10/gpg.c:383 msgid "verify a signature" msgstr "验证签字" -#: g10/gpg.c:380 +#: g10/gpg.c:385 msgid "list keys" msgstr "列出密钥" -#: g10/gpg.c:382 +#: g10/gpg.c:387 msgid "list keys and signatures" msgstr "列出密钥和签字" -#: g10/gpg.c:383 +#: g10/gpg.c:388 msgid "list and check key signatures" msgstr "列出并检查密钥签字" -#: g10/gpg.c:384 +#: g10/gpg.c:389 msgid "list keys and fingerprints" msgstr "列出密钥和指纹" -#: g10/gpg.c:385 +#: g10/gpg.c:390 msgid "list secret keys" msgstr "列出私钥" -#: g10/gpg.c:386 +#: g10/gpg.c:391 msgid "generate a new key pair" msgstr "生成一副新的密钥对" -#: g10/gpg.c:387 +#: g10/gpg.c:392 msgid "remove keys from the public keyring" msgstr "从公钥钥匙环里删除密钥" -#: g10/gpg.c:389 +#: g10/gpg.c:394 msgid "remove keys from the secret keyring" msgstr "从私钥钥匙环里删除密钥" -#: g10/gpg.c:390 +#: g10/gpg.c:395 msgid "sign a key" msgstr "为某把密钥添加签字" -#: g10/gpg.c:391 +#: g10/gpg.c:396 msgid "sign a key locally" msgstr "为某把密钥添加本地签字" -#: g10/gpg.c:392 +#: g10/gpg.c:397 msgid "sign or edit a key" msgstr "编辑某把密钥或为其添加签字" -#: g10/gpg.c:393 +#: g10/gpg.c:398 msgid "generate a revocation certificate" msgstr "生成一份吊销证书" -#: g10/gpg.c:395 +#: g10/gpg.c:400 msgid "export keys" msgstr "导出密钥" -#: g10/gpg.c:396 +#: g10/gpg.c:401 msgid "export keys to a key server" msgstr "把密钥导出到某个公钥服务器上" -#: g10/gpg.c:397 +#: g10/gpg.c:402 msgid "import keys from a key server" msgstr "从公钥服务器上导入密钥" -#: g10/gpg.c:399 +#: g10/gpg.c:404 msgid "search for keys on a key server" msgstr "在公钥服务器上搜寻密钥" -#: g10/gpg.c:401 +#: g10/gpg.c:406 msgid "update all keys from a keyserver" msgstr "从公钥服务器更新所有的本地密钥" -#: g10/gpg.c:404 +#: g10/gpg.c:410 msgid "import/merge keys" msgstr "导入/合并密钥" -#: g10/gpg.c:407 +#: g10/gpg.c:413 msgid "print the card status" msgstr "打印卡状态" -#: g10/gpg.c:408 +#: g10/gpg.c:414 msgid "change data on a card" msgstr "更改卡上的数据" -#: g10/gpg.c:409 +#: g10/gpg.c:415 msgid "change a card's PIN" msgstr "更改卡的 PIN" -#: g10/gpg.c:417 +#: g10/gpg.c:423 msgid "update the trust database" msgstr "更新信任度数据库" -#: g10/gpg.c:424 +#: g10/gpg.c:430 msgid "|algo [files]|print message digests" msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值" -#: g10/gpg.c:428 g10/gpgv.c:71 +#: g10/gpg.c:434 g10/gpgv.c:71 msgid "" "@\n" "Options:\n" @@ -1095,51 +1104,51 @@ msgstr "" "选项：\n" " " -#: g10/gpg.c:430 +#: g10/gpg.c:436 msgid "create ascii armored output" msgstr "输出经 ASCII 封装" -#: g10/gpg.c:432 +#: g10/gpg.c:438 msgid "|NAME|encrypt for NAME" msgstr "|某甲|为收件者“某甲”加密" -#: g10/gpg.c:443 +#: g10/gpg.c:449 msgid "use this user-id to sign or decrypt" msgstr "使用这个用户标识来签字或解密" -#: g10/gpg.c:444 +#: g10/gpg.c:450 msgid "|N|set compress level N (0 disables)" msgstr "|N|设定压缩等级为 N (0 表示不压缩)" -#: g10/gpg.c:449 +#: g10/gpg.c:455 msgid "use canonical text mode" msgstr "使用标准的文本模式" -#: g10/gpg.c:463 +#: g10/gpg.c:469 msgid "use as output file" msgstr "指定输出文件" -#: g10/gpg.c:465 g10/gpgv.c:73 +#: g10/gpg.c:471 g10/gpgv.c:73 msgid "verbose" msgstr "详细模式" -#: g10/gpg.c:476 +#: g10/gpg.c:482 msgid "do not make any changes" msgstr "不做任何改变" -#: g10/gpg.c:477 +#: g10/gpg.c:483 msgid "prompt before overwriting" msgstr "覆盖前先询问" -#: g10/gpg.c:518 +#: g10/gpg.c:524 msgid "use strict OpenPGP behavior" msgstr "行为严格遵循 OpenPGP 定义" -#: g10/gpg.c:519 +#: g10/gpg.c:525 msgid "generate PGP 2.x compatible messages" msgstr "生成与 PGP 2.x 兼容的报文" -#: g10/gpg.c:547 +#: g10/gpg.c:553 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1147,7 +1156,7 @@ msgstr "" "@\n" "(请参考在线说明以获得所有命令和选项的完整清单)\n" -#: g10/gpg.c:550 +#: g10/gpg.c:556 msgid "" "@\n" "Examples:\n" @@ -1167,17 +1176,17 @@ msgstr "" " --list-keys [某甲] 显示密钥\n" " --fingerprint [某甲] 显示指纹\n" -#: g10/gpg.c:739 g10/gpgv.c:98 +#: g10/gpg.c:746 g10/gpgv.c:98 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n" msgstr "" "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n" "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n" -#: g10/gpg.c:756 +#: g10/gpg.c:763 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "用法： gpg [选项] [文件] (用 -h 求助)" -#: g10/gpg.c:759 +#: g10/gpg.c:766 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1187,7 +1196,7 @@ msgstr "" "签字、检查、加密或解密\n" "默认的操作依输入数据而定\n" -#: g10/gpg.c:770 +#: g10/gpg.c:777 msgid "" "\n" "Supported algorithms:\n" @@ -1195,568 +1204,568 @@ msgstr "" "\n" "支持的算法：\n" -#: g10/gpg.c:773 +#: g10/gpg.c:780 msgid "Pubkey: " msgstr "公钥：" -#: g10/gpg.c:779 g10/keyedit.c:2281 +#: g10/gpg.c:786 g10/keyedit.c:2266 msgid "Cipher: " msgstr "对称加密：" -#: g10/gpg.c:785 +#: g10/gpg.c:792 msgid "Hash: " msgstr "散列：" -#: g10/gpg.c:791 g10/keyedit.c:2327 +#: g10/gpg.c:798 g10/keyedit.c:2312 msgid "Compression: " msgstr "压缩：" -#: g10/gpg.c:874 +#: g10/gpg.c:881 msgid "usage: gpg [options] " msgstr "用法：gpg [选项] " -#: g10/gpg.c:1022 +#: g10/gpg.c:1029 msgid "conflicting commands\n" msgstr "冲突的指令\n" -#: g10/gpg.c:1040 +#: g10/gpg.c:1047 #, c-format msgid "no = sign found in group definition `%s'\n" msgstr "在‘%s’组定义里找不到等号(=)\n" -#: g10/gpg.c:1237 +#: g10/gpg.c:1244 #, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "警告：用户目录‘%s’所有权不安全\n" -#: g10/gpg.c:1240 +#: g10/gpg.c:1247 #, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "警告：配置文件‘%s’所有权不安全\n" -#: g10/gpg.c:1243 +#: g10/gpg.c:1250 #, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "警告：扩展模块‘%s’所有权不安全\n" -#: g10/gpg.c:1249 +#: g10/gpg.c:1256 #, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "警告：用户目录‘%s’权限不安全\n" -#: g10/gpg.c:1252 +#: g10/gpg.c:1259 #, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "警告：配置文件‘%s’权限不安全\n" -#: g10/gpg.c:1255 +#: g10/gpg.c:1262 #, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "警告：扩展模块‘%s’权限不安全\n" -#: g10/gpg.c:1261 +#: g10/gpg.c:1268 #, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n" -#: g10/gpg.c:1264 +#: g10/gpg.c:1271 #, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n" -#: g10/gpg.c:1267 +#: g10/gpg.c:1274 #, c-format msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n" -#: g10/gpg.c:1273 +#: g10/gpg.c:1280 #, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n" -#: g10/gpg.c:1276 +#: g10/gpg.c:1283 #, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n" -#: g10/gpg.c:1279 +#: g10/gpg.c:1286 #, c-format msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n" -#: g10/gpg.c:1420 +#: g10/gpg.c:1427 #, c-format msgid "unknown configuration item `%s'\n" msgstr "未知的配置项‘%s’\n" -#: g10/gpg.c:1513 +#: g10/gpg.c:1521 msgid "display photo IDs during key listings" msgstr "" -#: g10/gpg.c:1515 +#: g10/gpg.c:1523 msgid "show policy URLs during signature listings" msgstr "" -#: g10/gpg.c:1517 +#: g10/gpg.c:1525 #, fuzzy msgid "show all notations during signature listings" msgstr "在私钥环里没有相应的签字\n" -#: g10/gpg.c:1519 +#: g10/gpg.c:1527 msgid "show IETF standard notations during signature listings" msgstr "" -#: g10/gpg.c:1523 +#: g10/gpg.c:1531 msgid "show user-supplied notations during signature listings" msgstr "" -#: g10/gpg.c:1525 +#: g10/gpg.c:1533 #, fuzzy msgid "show preferred keyserver URLs during signature listings" msgstr "给定的首选公钥服务器 URL 无效\n" -#: g10/gpg.c:1527 +#: g10/gpg.c:1535 msgid "show user ID validity during key listings" msgstr "" -#: g10/gpg.c:1529 +#: g10/gpg.c:1537 msgid "show revoked and expired user IDs in key listings" msgstr "" -#: g10/gpg.c:1531 +#: g10/gpg.c:1539 msgid "show revoked and expired subkeys in key listings" msgstr "" -#: g10/gpg.c:1533 +#: g10/gpg.c:1541 #, fuzzy msgid "show the keyring name in key listings" msgstr "在私钥和公钥清单间切换" -#: g10/gpg.c:1535 +#: g10/gpg.c:1543 #, fuzzy msgid "show expiration dates during signature listings" msgstr "在私钥环里没有相应的签字\n" -#: g10/gpg.c:1830 +#: g10/gpg.c:1874 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n" -#: g10/gpg.c:1872 +#: g10/gpg.c:1916 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "注意：没有默认配置文件‘%s’\n" -#: g10/gpg.c:1876 +#: g10/gpg.c:1920 #, c-format msgid "option file `%s': %s\n" msgstr "配置文件‘%s’：%s\n" -#: g10/gpg.c:1883 +#: g10/gpg.c:1927 #, c-format msgid "reading options from `%s'\n" msgstr "从‘%s’读取选项\n" -#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684 +#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "注意：一般情况下不会用到 %s！\n" -#: g10/gpg.c:2110 +#: g10/gpg.c:2158 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n" -#: g10/gpg.c:2264 g10/gpg.c:2276 +#: g10/gpg.c:2312 g10/gpg.c:2324 #, fuzzy, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "‘%s’不是一个有效的字符集\n" -#: g10/gpg.c:2352 +#: g10/gpg.c:2400 #, c-format msgid "`%s' is not a valid character set\n" msgstr "‘%s’不是一个有效的字符集\n" -#: g10/gpg.c:2371 g10/keyedit.c:4050 +#: g10/gpg.c:2422 g10/keyedit.c:3997 msgid "could not parse keyserver URL\n" msgstr "无法解析公钥服务器 URL\n" -#: g10/gpg.c:2377 +#: g10/gpg.c:2428 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s：%d：无效的公钥服务器选项\n" -#: g10/gpg.c:2380 +#: g10/gpg.c:2431 msgid "invalid keyserver options\n" msgstr "无效的公钥服务器选项\n" -#: g10/gpg.c:2387 +#: g10/gpg.c:2438 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s：%d：无效的导入选项\n" -#: g10/gpg.c:2390 +#: g10/gpg.c:2441 msgid "invalid import options\n" msgstr "无效的导入选项\n" -#: g10/gpg.c:2397 +#: g10/gpg.c:2448 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s：%d：无效的导出选项\n" -#: g10/gpg.c:2400 +#: g10/gpg.c:2451 msgid "invalid export options\n" msgstr "无效的导出选项\n" -#: g10/gpg.c:2407 +#: g10/gpg.c:2458 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s：%d：无效的列表选项\n" -#: g10/gpg.c:2410 +#: g10/gpg.c:2461 msgid "invalid list options\n" msgstr "无效的列表选项\n" -#: g10/gpg.c:2418 +#: g10/gpg.c:2469 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2420 +#: g10/gpg.c:2471 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2422 +#: g10/gpg.c:2473 #, fuzzy msgid "show all notations during signature verification" msgstr "‘%s’不是一个有效的字符集\n" -#: g10/gpg.c:2424 +#: g10/gpg.c:2475 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2428 +#: g10/gpg.c:2479 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2430 +#: g10/gpg.c:2481 #, fuzzy msgid "show preferred keyserver URLs during signature verification" msgstr "给定的首选公钥服务器 URL 无效\n" -#: g10/gpg.c:2432 +#: g10/gpg.c:2483 #, fuzzy msgid "show user ID validity during signature verification" msgstr "‘%s’不是一个有效的字符集\n" -#: g10/gpg.c:2434 +#: g10/gpg.c:2485 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2441 +#: g10/gpg.c:2492 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s：%d：无效的校验选项\n" -#: g10/gpg.c:2444 +#: g10/gpg.c:2495 msgid "invalid verify options\n" msgstr "无效的校验选项\n" -#: g10/gpg.c:2451 +#: g10/gpg.c:2502 #, c-format msgid "unable to set exec-path to %s\n" msgstr "无法把运行路径设成 %s\n" -#: g10/gpg.c:2654 +#: g10/gpg.c:2705 msgid "WARNING: program may create a core file!\n" msgstr "警告：程序可能会创建核心内存转储！\n" -#: g10/gpg.c:2658 +#: g10/gpg.c:2709 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告：%s 会使得 %s 失效\n" -#: g10/gpg.c:2667 +#: g10/gpg.c:2718 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 不可与 %s 并用\n" -#: g10/gpg.c:2670 +#: g10/gpg.c:2721 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 与 %s 并用无意义！\n" -#: g10/gpg.c:2677 +#: g10/gpg.c:2728 #, fuzzy, c-format msgid "NOTE: %s is not available in this version\n" msgstr "gpg-agent 在此次舍话中无法使用\n" -#: g10/gpg.c:2692 +#: g10/gpg.c:2743 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "不会在内存不安全的情况下运行，原因是 %s\n" -#: g10/gpg.c:2706 +#: g10/gpg.c:2757 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n" -#: g10/gpg.c:2712 +#: g10/gpg.c:2763 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n" -#: g10/gpg.c:2718 +#: g10/gpg.c:2769 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n" -#: g10/gpg.c:2731 +#: g10/gpg.c:2782 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n" -#: g10/gpg.c:2798 g10/gpg.c:2822 +#: g10/gpg.c:2849 g10/gpg.c:2873 msgid "selected cipher algorithm is invalid\n" msgstr "所选的对称加密算法无效\n" -#: g10/gpg.c:2804 g10/gpg.c:2828 +#: g10/gpg.c:2855 g10/gpg.c:2879 msgid "selected digest algorithm is invalid\n" msgstr "所选的散列算法无效\n" -#: g10/gpg.c:2810 +#: g10/gpg.c:2861 msgid "selected compression algorithm is invalid\n" msgstr "所选的压缩算法无效\n" -#: g10/gpg.c:2816 +#: g10/gpg.c:2867 msgid "selected certification digest algorithm is invalid\n" msgstr "所选的证书散列算法无效\n" -#: g10/gpg.c:2831 +#: g10/gpg.c:2882 msgid "completes-needed must be greater than 0\n" msgstr "需要的完全可信签字数一定要大于 0\n" -#: g10/gpg.c:2833 +#: g10/gpg.c:2884 msgid "marginals-needed must be greater than 1\n" msgstr "需要的勉强可信签字数一定要大于 1\n" -#: g10/gpg.c:2835 +#: g10/gpg.c:2886 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "最大验证深度一定要介于 1 和 255 之间\n" -#: g10/gpg.c:2837 +#: g10/gpg.c:2888 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n" -#: g10/gpg.c:2839 +#: g10/gpg.c:2890 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "无效的最小验证级别；一定要是 1，2 或 3\n" -#: g10/gpg.c:2842 +#: g10/gpg.c:2893 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n" -#: g10/gpg.c:2846 +#: g10/gpg.c:2897 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "无效的 S2K 模式；必须是 0，1 或 3\n" -#: g10/gpg.c:2853 +#: g10/gpg.c:2904 msgid "invalid default preferences\n" msgstr "无效的默认首选项\n" -#: g10/gpg.c:2862 +#: g10/gpg.c:2913 msgid "invalid personal cipher preferences\n" msgstr "无效的个人对称加密算法首选项\n" -#: g10/gpg.c:2866 +#: g10/gpg.c:2917 msgid "invalid personal digest preferences\n" msgstr "无效的个人散列算法首选项\n" -#: g10/gpg.c:2870 +#: g10/gpg.c:2921 msgid "invalid personal compress preferences\n" msgstr "无效的个人压缩算法首选项\n" -#: g10/gpg.c:2903 +#: g10/gpg.c:2954 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s 尚不能和 %s 并用\n" -#: g10/gpg.c:2950 +#: g10/gpg.c:3001 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n" -#: g10/gpg.c:2955 +#: g10/gpg.c:3006 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’散列算法\n" -#: g10/gpg.c:2960 +#: g10/gpg.c:3011 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n" -#: g10/gpg.c:3056 +#: g10/gpg.c:3107 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "初始化信任度数据库失败：%s\n" -#: g10/gpg.c:3067 +#: g10/gpg.c:3118 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n" -#: g10/gpg.c:3078 +#: g10/gpg.c:3129 msgid "--store [filename]" msgstr "--store [文件名]" -#: g10/gpg.c:3085 +#: g10/gpg.c:3136 msgid "--symmetric [filename]" msgstr "--symmetric [文件名]" -#: g10/gpg.c:3087 +#: g10/gpg.c:3138 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "对称加密‘%s’失败：%s\n" -#: g10/gpg.c:3097 +#: g10/gpg.c:3148 msgid "--encrypt [filename]" msgstr "--encrypt [文件名]" -#: g10/gpg.c:3110 +#: g10/gpg.c:3161 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [文件名]" -#: g10/gpg.c:3112 +#: g10/gpg.c:3163 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n" -#: g10/gpg.c:3115 +#: g10/gpg.c:3166 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n" -#: g10/gpg.c:3133 +#: g10/gpg.c:3184 msgid "--sign [filename]" msgstr "--sign [文件名]" -#: g10/gpg.c:3146 +#: g10/gpg.c:3197 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [文件名]" -#: g10/gpg.c:3161 +#: g10/gpg.c:3212 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [文件名]" -#: g10/gpg.c:3163 +#: g10/gpg.c:3214 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n" -#: g10/gpg.c:3166 +#: g10/gpg.c:3217 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n" -#: g10/gpg.c:3186 +#: g10/gpg.c:3237 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [文件名]" -#: g10/gpg.c:3195 +#: g10/gpg.c:3246 msgid "--clearsign [filename]" msgstr "--clearsign [文件名]" -#: g10/gpg.c:3220 +#: g10/gpg.c:3271 msgid "--decrypt [filename]" msgstr "--decrypt [文件名]" -#: g10/gpg.c:3228 +#: g10/gpg.c:3279 msgid "--sign-key user-id" msgstr "--sign-key 用户标识" -#: g10/gpg.c:3232 +#: g10/gpg.c:3283 msgid "--lsign-key user-id" msgstr "--lsign-key 用户标识" -#: g10/gpg.c:3253 +#: g10/gpg.c:3304 msgid "--edit-key user-id [commands]" msgstr "--edit-key 用户标识 [指令]" -#: g10/gpg.c:3324 +#: g10/gpg.c:3375 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [用户标识] [钥匙环]" -#: g10/gpg.c:3361 +#: g10/gpg.c:3412 #, c-format msgid "keyserver send failed: %s\n" msgstr "上传至公钥服务器失败：%s\n" -#: g10/gpg.c:3363 +#: g10/gpg.c:3414 #, c-format msgid "keyserver receive failed: %s\n" msgstr "从公钥服务器接收失败：%s\n" -#: g10/gpg.c:3365 +#: g10/gpg.c:3416 #, c-format msgid "key export failed: %s\n" msgstr "导出密钥失败：%s\n" -#: g10/gpg.c:3376 +#: g10/gpg.c:3427 #, c-format msgid "keyserver search failed: %s\n" msgstr "搜寻公钥服务器失败：%s\n" -#: g10/gpg.c:3386 +#: g10/gpg.c:3437 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "从公钥服务器更新失败：%s\n" -#: g10/gpg.c:3427 +#: g10/gpg.c:3488 #, c-format msgid "dearmoring failed: %s\n" msgstr "解开 ASCII 封装失败：%s\n" -#: g10/gpg.c:3435 +#: g10/gpg.c:3496 #, c-format msgid "enarmoring failed: %s\n" msgstr "进行 ASCII 封装失败：%s\n" -#: g10/gpg.c:3522 +#: g10/gpg.c:3583 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "无效的‘%s’散列算法\n" -#: g10/gpg.c:3645 +#: g10/gpg.c:3706 msgid "[filename]" msgstr "[文件名]" -#: g10/gpg.c:3649 +#: g10/gpg.c:3710 msgid "Go ahead and type your message ...\n" msgstr "请开始键入您的报文……\n" -#: g10/gpg.c:3939 +#: g10/gpg.c:4000 msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n" -#: g10/gpg.c:3947 +#: g10/gpg.c:4008 msgid "a user notation name must contain the '@' character\n" msgstr "用户标记名称一定要含有“@”字符\n" -#: g10/gpg.c:3952 +#: g10/gpg.c:4013 #, fuzzy msgid "a notation name must not contain more than one '@' character\n" msgstr "用户标记名称一定要含有“@”字符\n" -#: g10/gpg.c:3963 +#: g10/gpg.c:4024 msgid "a notation value must not use any control characters\n" msgstr "标记值一定不能使用任何的控制字符\n" -#: g10/gpg.c:3997 +#: g10/gpg.c:4058 msgid "the given certification policy URL is invalid\n" msgstr "给定的的验证策略 URL 无效\n" -#: g10/gpg.c:3999 +#: g10/gpg.c:4060 msgid "the given signature policy URL is invalid\n" msgstr "给定的签字策略 URL 无效\n" -#: g10/gpg.c:4032 +#: g10/gpg.c:4093 msgid "the given preferred keyserver URL is invalid\n" msgstr "给定的首选公钥服务器 URL 无效\n" @@ -1764,26 +1773,31 @@ msgstr "给定的首选公钥服务器 URL 无效\n" msgid "too many entries in pk cache - disabled\n" msgstr "pk 缓存里项目太多――已禁用\n" -#: g10/getkey.c:188 g10/getkey.c:2805 +#: g10/getkey.c:188 g10/getkey.c:2845 msgid "[User ID not found]" msgstr "[找不到用户标识]" -#: g10/getkey.c:1731 +#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976 +#, c-format +msgid "Automatically retrieved `%s' via %s\n" +msgstr "" + +#: g10/getkey.c:1769 #, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n" -#: g10/getkey.c:2283 +#: g10/getkey.c:2323 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "公钥 %s 没有相对应的私钥――忽略\n" -#: g10/getkey.c:2514 +#: g10/getkey.c:2554 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "使用子钥 %s 而非主钥 %s\n" -#: g10/getkey.c:2561 +#: g10/getkey.c:2601 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "密钥 %s：无相应公钥的私钥――已跳过\n" @@ -2146,15 +2160,12 @@ msgid "only accept updates to existing keys" msgstr "" #: g10/import.c:105 -msgid "remove unusable signatures after import" -msgstr "" +#, fuzzy +msgid "remove unusable parts from key after import" +msgstr "不可用的私钥" #: g10/import.c:107 -msgid "remove unusable user IDs after import" -msgstr "" - -#: g10/import.c:109 -msgid "all import-clean-* options from above" +msgid "remove as much as possible from key after import" msgstr "" #: g10/import.c:262 @@ -2279,231 +2290,231 @@ msgstr "以避免可能的算法不匹配问题\n" 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:726 g10/import.c:1112 +#: g10/import.c:712 g10/import.c:1092 #, c-format msgid "key %s: no user ID\n" msgstr "密钥 %s：没有用户标识\n" -#: g10/import.c:756 +#: g10/import.c:741 #, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "密钥 %s：PKS 子钥破损已修复\n" -#: g10/import.c:771 +#: g10/import.c:756 #, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n" -#: g10/import.c:777 +#: g10/import.c:762 #, c-format msgid "key %s: no valid user IDs\n" msgstr "密钥 %s：没有有效的用户标识\n" -#: g10/import.c:779 +#: g10/import.c:764 msgid "this may be caused by a missing self-signature\n" msgstr "这可能由于遗失自身签字所致\n" -#: g10/import.c:789 g10/import.c:1233 +#: g10/import.c:774 g10/import.c:1213 #, c-format msgid "key %s: public key not found: %s\n" msgstr "密钥 %s：找不到公钥：%s\n" -#: g10/import.c:795 +#: g10/import.c:780 #, c-format msgid "key %s: new key - skipped\n" msgstr "密钥 %s：新密钥――已跳过\n" -#: g10/import.c:804 +#: g10/import.c:789 #, c-format msgid "no writable keyring found: %s\n" msgstr "找不到可写的钥匙环：%s\n" -#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071 +#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081 #, c-format msgid "writing to `%s'\n" msgstr "正在写入‘%s’\n" -#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294 -#: g10/import.c:2356 g10/import.c:2378 +#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274 +#: g10/import.c:2336 g10/import.c:2358 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "写入钥匙环‘%s’时出错： %s\n" -#: g10/import.c:834 +#: g10/import.c:817 #, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "密钥 %s：公钥“%s”已导入\n" -#: g10/import.c:858 +#: g10/import.c:841 #, c-format msgid "key %s: doesn't match our copy\n" msgstr "密钥 %s：与我们的副本不吻合\n" -#: g10/import.c:875 g10/import.c:1251 +#: g10/import.c:858 g10/import.c:1231 #, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "密钥 %s：无法定位原始的密钥区块：%s\n" -#: g10/import.c:883 g10/import.c:1258 +#: g10/import.c:866 g10/import.c:1238 #, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "密钥 %s：无法读取原始的密钥区块： %s\n" -#: g10/import.c:923 +#: g10/import.c:903 #, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "密钥 %s：“%s”一个新的用户标识\n" -#: g10/import.c:926 +#: g10/import.c:906 #, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "密钥 %s：“%s”%d 个新的用户标识\n" -#: g10/import.c:929 +#: g10/import.c:909 #, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "密钥 %s：“%s”1 个新的签字\n" -#: g10/import.c:932 +#: g10/import.c:912 #, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "密钥 %s：“%s”%d 个新的签字\n" -#: g10/import.c:935 +#: g10/import.c:915 #, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "密钥 %s：“%s”1 个新的子钥\n" -#: g10/import.c:938 +#: g10/import.c:918 #, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "密钥 %s：“%s”%d 个新的子钥\n" -#: g10/import.c:941 +#: g10/import.c:921 #, fuzzy, c-format msgid "key %s: \"%s\" %d signature cleaned\n" msgstr "密钥 %s：“%s”%d 个新的签字\n" -#: g10/import.c:944 +#: g10/import.c:924 #, fuzzy, c-format msgid "key %s: \"%s\" %d signatures cleaned\n" msgstr "密钥 %s：“%s”%d 个新的签字\n" -#: g10/import.c:947 +#: g10/import.c:927 #, fuzzy, c-format msgid "key %s: \"%s\" %d user ID cleaned\n" msgstr "密钥 %s：“%s”%d 个新的用户标识\n" -#: g10/import.c:950 +#: g10/import.c:930 #, fuzzy, c-format msgid "key %s: \"%s\" %d user IDs cleaned\n" msgstr "密钥 %s：“%s”%d 个新的用户标识\n" -#: g10/import.c:973 +#: g10/import.c:953 #, c-format msgid "key %s: \"%s\" not changed\n" msgstr "密钥 %s：“%s”未改变\n" -#: g10/import.c:1118 +#: g10/import.c:1098 #, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n" -#: g10/import.c:1129 +#: g10/import.c:1109 msgid "importing secret keys not allowed\n" msgstr "不允许导入私钥\n" -#: g10/import.c:1146 g10/import.c:2371 +#: g10/import.c:1126 g10/import.c:2351 #, c-format msgid "no default secret keyring: %s\n" msgstr "没有默认的私钥钥匙环： %s\n" -#: g10/import.c:1157 +#: g10/import.c:1137 #, c-format msgid "key %s: secret key imported\n" msgstr "密钥 %s：私钥已导入\n" -#: g10/import.c:1186 +#: g10/import.c:1166 #, c-format msgid "key %s: already in secret keyring\n" msgstr "密钥 %s：已在私钥钥匙环中\n" -#: g10/import.c:1196 +#: g10/import.c:1176 #, c-format msgid "key %s: secret key not found: %s\n" msgstr "密钥 %s：找不到私钥：%s\n" -#: g10/import.c:1226 +#: g10/import.c:1206 #, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "密钥 %s：没有公钥――无法应用吊销证书\n" -#: g10/import.c:1269 +#: g10/import.c:1249 #, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n" -#: g10/import.c:1301 +#: g10/import.c:1281 #, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "密钥 %s：“%s”吊销证书已被导入\n" -#: g10/import.c:1367 +#: g10/import.c:1347 #, c-format msgid "key %s: no user ID for signature\n" msgstr "密钥 %s：签字没有用户标识\n" -#: g10/import.c:1382 +#: g10/import.c:1362 #, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n" -#: g10/import.c:1384 +#: g10/import.c:1364 #, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "密钥 %s：用户标识“%s”自身签字无效\n" -#: g10/import.c:1402 +#: g10/import.c:1382 #, c-format msgid "key %s: no subkey for key binding\n" msgstr "密钥 %s：没有可供绑定的子钥\n" -#: g10/import.c:1413 g10/import.c:1463 +#: g10/import.c:1393 g10/import.c:1443 #, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "密钥 %s：不支持的公钥算法\n" -#: g10/import.c:1415 +#: g10/import.c:1395 #, c-format msgid "key %s: invalid subkey binding\n" msgstr "密钥 %s：无效的子钥绑定\n" -#: g10/import.c:1430 +#: g10/import.c:1410 #, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "密钥 %s：已删除多重子钥绑定\n" -#: g10/import.c:1452 +#: g10/import.c:1432 #, c-format msgid "key %s: no subkey for key revocation\n" msgstr "密钥 %s：没有用于密钥吊销的子钥\n" -#: g10/import.c:1465 +#: g10/import.c:1445 #, c-format msgid "key %s: invalid subkey revocation\n" msgstr "密钥 %s：无效的子钥吊销\n" -#: g10/import.c:1480 +#: g10/import.c:1460 #, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "密钥 %s：已删除多重子钥吊销\n" -#: g10/import.c:1522 +#: g10/import.c:1502 #, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "密钥 %s：已跳过用户标识“%s”\n" -#: g10/import.c:1543 +#: g10/import.c:1523 #, c-format msgid "key %s: skipped subkey\n" msgstr "密钥 %s：已跳过子钥\n" @@ -2512,65 +2523,65 @@ 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:1570 +#: g10/import.c:1550 #, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n" -#: g10/import.c:1580 +#: g10/import.c:1560 #, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "密钥 %s：吊销证书位置错误――已跳过\n" -#: g10/import.c:1597 +#: g10/import.c:1577 #, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n" -#: g10/import.c:1611 +#: g10/import.c:1591 #, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "密钥 %s：子钥签字位置错误――已跳过\n" -#: g10/import.c:1619 +#: g10/import.c:1599 #, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n" -#: g10/import.c:1719 +#: g10/import.c:1699 #, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "密钥 %s：检测到重复的用户标识――已合并\n" -#: g10/import.c:1781 +#: g10/import.c:1761 #, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n" -#: g10/import.c:1795 +#: g10/import.c:1775 #, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n" -#: g10/import.c:1854 +#: g10/import.c:1834 #, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "密钥 %s：已新增吊销证书“%s”\n" -#: g10/import.c:1888 +#: g10/import.c:1868 #, c-format msgid "key %s: direct key signature added\n" msgstr "密钥 %s：已新增直接密钥签字\n" -#: g10/import.c:2277 +#: g10/import.c:2257 msgid "NOTE: a key's S/N does not match the card's one\n" msgstr "注意：密钥的序列号与卡的不符\n" -#: g10/import.c:2285 +#: g10/import.c:2265 msgid "NOTE: primary key is online and stored on card\n" msgstr "注意：主钥在线，存储在卡上\n" -#: g10/import.c:2287 +#: g10/import.c:2267 msgid "NOTE: secondary key is online and stored on card\n" msgstr "注意：子钥在线，存储在卡上\n" @@ -2594,51 +2605,51 @@ msgstr "建立‘%s’时发生错误：%s\n" msgid "failed to rebuild keyring cache: %s\n" msgstr "重新建立钥匙环缓存失败： %s\n" -#: g10/keyedit.c:265 +#: g10/keyedit.c:264 msgid "[revocation]" msgstr "[吊销]" -#: g10/keyedit.c:266 +#: g10/keyedit.c:265 msgid "[self-signature]" msgstr "[自身签字]" -#: g10/keyedit.c:344 g10/keylist.c:406 +#: g10/keyedit.c:343 g10/keylist.c:406 msgid "1 bad signature\n" msgstr "1 个损坏的签字\n" -#: g10/keyedit.c:346 g10/keylist.c:408 +#: g10/keyedit.c:345 g10/keylist.c:408 #, c-format msgid "%d bad signatures\n" msgstr "%d 个损坏的签字\n" -#: g10/keyedit.c:348 g10/keylist.c:410 +#: g10/keyedit.c:347 g10/keylist.c:410 msgid "1 signature not checked due to a missing key\n" msgstr "有 1 份签字因为遗失密钥而未被检查\n" -#: g10/keyedit.c:350 g10/keylist.c:412 +#: g10/keyedit.c:349 g10/keylist.c:412 #, c-format msgid "%d signatures not checked due to missing keys\n" msgstr "有 %d 份签字因为遗失密钥而未被检查\n" -#: g10/keyedit.c:352 g10/keylist.c:414 +#: g10/keyedit.c:351 g10/keylist.c:414 msgid "1 signature not checked due to an error\n" msgstr "有 1 份签字因为某个错误而未被检查\n" -#: g10/keyedit.c:354 g10/keylist.c:416 +#: g10/keyedit.c:353 g10/keylist.c:416 #, c-format msgid "%d signatures not checked due to errors\n" msgstr "有 %d 份签字因为某些错误而未被检查\n" -#: g10/keyedit.c:356 +#: g10/keyedit.c:355 msgid "1 user ID without valid self-signature detected\n" msgstr "检测到 1 个没有有效自身签字的用户标识\n" -#: g10/keyedit.c:358 +#: g10/keyedit.c:357 #, c-format msgid "%d user IDs without valid self-signatures detected\n" msgstr "检测到 %d 个没有有效自身签字的用户标识\n" -#: g10/keyedit.c:414 g10/pkclist.c:263 +#: g10/keyedit.c:413 g10/pkclist.c:263 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -2649,17 +2660,17 @@ msgstr "" "查\n" "指纹等)？\n" -#: g10/keyedit.c:418 g10/pkclist.c:275 +#: g10/keyedit.c:417 g10/pkclist.c:275 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = 我勉强相信\n" -#: g10/keyedit.c:419 g10/pkclist.c:277 +#: g10/keyedit.c:418 g10/pkclist.c:277 #, c-format msgid " %d = I trust fully\n" msgstr " %d = 我完全相信\n" -#: g10/keyedit.c:438 +#: g10/keyedit.c:437 msgid "" "Please enter the depth of this trust signature.\n" "A depth greater than 1 allows the key you are signing to make\n" @@ -2668,46 +2679,46 @@ msgstr "" "请输入这份信任签字的深度。\n" "深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n" -#: g10/keyedit.c:454 +#: g10/keyedit.c:453 msgid "Please enter a domain to restrict this signature, or enter for none.\n" msgstr "请输入这份签字的限制域，如果没有请按回车。\n" -#: g10/keyedit.c:598 +#: g10/keyedit.c:597 #, c-format msgid "User ID \"%s\" is revoked." msgstr "用户标识“%s”已被吊销。" -#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830 -#: g10/keyedit.c:895 g10/keyedit.c:1736 +#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829 +#: g10/keyedit.c:894 g10/keyedit.c:1736 msgid "Are you sure you still want to sign it? (y/N) " msgstr "您仍然想要为它签字吗？(y/N)" -#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836 +#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835 #: g10/keyedit.c:1742 msgid " Unable to sign.\n" msgstr " 无法添加签字。\n" -#: g10/keyedit.c:626 +#: g10/keyedit.c:625 #, c-format msgid "User ID \"%s\" is expired." msgstr "用户标识“%s”已过期。" -#: g10/keyedit.c:654 +#: g10/keyedit.c:653 #, c-format msgid "User ID \"%s\" is not self-signed." msgstr "警告：用户标识“%s”不含自身签字。" -#: g10/keyedit.c:682 +#: g10/keyedit.c:681 #, fuzzy, c-format msgid "User ID \"%s\" is signable. " msgstr "警告：用户标识“%s”不含自身签字。" -#: g10/keyedit.c:684 +#: g10/keyedit.c:683 #, fuzzy msgid "Sign it? (y/N) " msgstr "真的要签字吗？(y/N)" -#: g10/keyedit.c:706 +#: g10/keyedit.c:705 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -2716,75 +2727,75 @@ msgstr "" "“%s”的自身签字是 PGP 2.x 样\n" "式的签字。\n" -#: g10/keyedit.c:715 +#: g10/keyedit.c:714 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)" -#: g10/keyedit.c:729 +#: g10/keyedit.c:728 #, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "您目前为“%s”的签字已经过期了。\n" -#: g10/keyedit.c:733 +#: g10/keyedit.c:732 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)" -#: g10/keyedit.c:754 +#: g10/keyedit.c:753 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "您目前为“%s”的签字是一份本地签字。\n" -#: g10/keyedit.c:758 +#: g10/keyedit.c:757 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "您是否想要把它升级成可以完全导出的签字？(y/N)" -#: g10/keyedit.c:779 +#: g10/keyedit.c:778 #, c-format msgid "\"%s\" was already locally signed by key %s\n" msgstr "“%s”已由密钥 %s 在本地签字\n" -#: g10/keyedit.c:782 +#: g10/keyedit.c:781 #, c-format msgid "\"%s\" was already signed by key %s\n" msgstr "“%s”已由密钥 %s 签字\n" -#: g10/keyedit.c:787 +#: g10/keyedit.c:786 msgid "Do you want to sign it again anyway? (y/N) " msgstr "您仍然想要为它再次签字吗？(y/N)" -#: g10/keyedit.c:809 +#: g10/keyedit.c:808 #, c-format msgid "Nothing to sign with key %s\n" msgstr "没有东西可以让密钥 %s 签字\n" -#: g10/keyedit.c:824 +#: g10/keyedit.c:823 msgid "This key has expired!" msgstr "这把密钥已经过期！" -#: g10/keyedit.c:842 +#: g10/keyedit.c:841 #, c-format msgid "This key is due to expire on %s.\n" msgstr "这把密钥将在 %s 过期。\n" -#: g10/keyedit.c:848 +#: g10/keyedit.c:847 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "您想要让您的签字也同时过期吗？ (Y/n) " -#: g10/keyedit.c:888 +#: g10/keyedit.c:887 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:890 +#: g10/keyedit.c:889 msgid "This would make the key unusable in PGP 2.x.\n" msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n" -#: g10/keyedit.c:915 +#: g10/keyedit.c:914 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -2793,31 +2804,31 @@ msgstr "" "您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n" "如果您不知道这个问题的答案，请输入“0”。\n" -#: g10/keyedit.c:920 +#: g10/keyedit.c:919 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) 我不作答。 %s\n" -#: g10/keyedit.c:922 +#: g10/keyedit.c:921 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) 我根本没有检查过。 %s\n" -#: g10/keyedit.c:924 +#: g10/keyedit.c:923 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) 我随意检查过。 %s\n" -#: g10/keyedit.c:926 +#: g10/keyedit.c:925 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) 我非常小心地检查过。 %s\n" -#: g10/keyedit.c:932 +#: g10/keyedit.c:931 msgid "Your selection? (enter `?' for more information): " msgstr "您的选择？(输入‘?’以获得更多的信息)：" -#: g10/keyedit.c:956 +#: g10/keyedit.c:955 #, c-format msgid "" "Are you sure that you want to sign this key with your\n" @@ -2826,74 +2837,74 @@ msgstr "" "您真的确定要签字这把密钥，使用您的密钥\n" "“%s”(%s)\n" -#: g10/keyedit.c:963 +#: g10/keyedit.c:962 msgid "This will be a self-signature.\n" msgstr "这将是一个自身签字。\n" -#: g10/keyedit.c:969 +#: g10/keyedit.c:968 msgid "WARNING: the signature will not be marked as non-exportable.\n" msgstr "警告：这份签字不会被标记为不可导出。\n" -#: g10/keyedit.c:977 +#: g10/keyedit.c:976 msgid "WARNING: the signature will not be marked as non-revocable.\n" msgstr "警告：这份签字不会被标记成不可吊销。\n" -#: g10/keyedit.c:987 +#: g10/keyedit.c:986 msgid "The signature will be marked as non-exportable.\n" msgstr "这份签字会被标记成不可导出。\n" -#: g10/keyedit.c:994 +#: g10/keyedit.c:993 msgid "The signature will be marked as non-revocable.\n" msgstr "这份签字会被标记成不可吊销。\n" -#: g10/keyedit.c:1001 +#: g10/keyedit.c:1000 msgid "I have not checked this key at all.\n" msgstr "我根本没有检查过这把密钥。\n" -#: g10/keyedit.c:1006 +#: g10/keyedit.c:1005 msgid "I have checked this key casually.\n" msgstr "我随意检查过这把密钥。\n" -#: g10/keyedit.c:1011 +#: g10/keyedit.c:1010 msgid "I have checked this key very carefully.\n" msgstr "我非常小心地检查过这把密钥。\n" -#: g10/keyedit.c:1021 +#: g10/keyedit.c:1020 msgid "Really sign? (y/N) " msgstr "真的要签字吗？(y/N)" -#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711 -#: g10/keyedit.c:4772 g10/sign.c:370 +#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658 +#: g10/keyedit.c:4719 g10/sign.c:370 #, c-format msgid "signing failed: %s\n" msgstr "签字时失败： %s\n" -#: g10/keyedit.c:1131 +#: g10/keyedit.c:1130 msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n" -#: g10/keyedit.c:1142 g10/keygen.c:3087 +#: g10/keyedit.c:1141 g10/keygen.c:3087 msgid "This key is not protected.\n" msgstr "这把密钥没有被保护。\n" -#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501 +#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539 msgid "Secret parts of primary key are not available.\n" msgstr "主钥的私钥部分无法取用。\n" -#: g10/keyedit.c:1150 g10/keygen.c:3090 +#: g10/keyedit.c:1149 g10/keygen.c:3090 msgid "Secret parts of primary key are stored on-card.\n" msgstr "主钥的私钥部分存储在卡上。\n" -#: g10/keyedit.c:1154 g10/keygen.c:3094 +#: g10/keyedit.c:1153 g10/keygen.c:3094 msgid "Key is protected.\n" msgstr "密钥受保护。\n" -#: g10/keyedit.c:1178 +#: g10/keyedit.c:1177 #, c-format msgid "Can't edit this key: %s\n" msgstr "无法编辑这把密钥： %s\n" -#: g10/keyedit.c:1184 +#: g10/keyedit.c:1183 msgid "" "Enter the new passphrase for this secret key.\n" "\n" @@ -2901,11 +2912,11 @@ msgstr "" "输入要给这把私钥用的新密码。\n" "\n" -#: g10/keyedit.c:1193 g10/keygen.c:1806 +#: g10/keyedit.c:1192 g10/keygen.c:1806 msgid "passphrase not correctly repeated; try again" msgstr "密码再次输入时与首次输入不符；请再试一次" -#: g10/keyedit.c:1198 +#: g10/keyedit.c:1197 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "\n" @@ -2913,158 +2924,161 @@ msgstr "" "您不想要用密码――这大概是个坏主意！\n" "\n" -#: g10/keyedit.c:1201 +#: g10/keyedit.c:1200 msgid "Do you really want to do this? (y/N) " msgstr "您真的想要这么做吗？(y/N)" -#: g10/keyedit.c:1272 +#: g10/keyedit.c:1271 msgid "moving a key signature to the correct place\n" msgstr "正在把密钥的签字移动到正确的位置去\n" -#: g10/keyedit.c:1357 +#: g10/keyedit.c:1356 msgid "save and quit" msgstr "保存并离开" -#: g10/keyedit.c:1360 +#: g10/keyedit.c:1359 msgid "show key fingerprint" msgstr "显示密钥指纹" -#: g10/keyedit.c:1361 +#: g10/keyedit.c:1360 msgid "list key and user IDs" msgstr "列出密钥和用户标识" -#: g10/keyedit.c:1363 +#: g10/keyedit.c:1362 msgid "select user ID N" msgstr "选择用户标识 N" -#: g10/keyedit.c:1364 +#: g10/keyedit.c:1363 msgid "select subkey N" msgstr "选择子钥 N" -#: g10/keyedit.c:1365 +#: g10/keyedit.c:1364 msgid "check signatures" msgstr "检查签字" -#: g10/keyedit.c:1369 +#: g10/keyedit.c:1368 msgid "sign selected user IDs [* see below for related commands]" msgstr "为所选用户标识添加签字[* 参见下面的相关命令]" -#: g10/keyedit.c:1374 +#: g10/keyedit.c:1373 msgid "sign selected user IDs locally" msgstr "为所选用户标识添加本地签字" -#: g10/keyedit.c:1376 +#: g10/keyedit.c:1375 msgid "sign selected user IDs with a trust signature" msgstr "为所选用户标识添加信任签字" -#: g10/keyedit.c:1378 +#: g10/keyedit.c:1377 msgid "sign selected user IDs with a non-revocable signature" msgstr "为所选用户标识添加不可吊销签字" -#: g10/keyedit.c:1382 +#: g10/keyedit.c:1381 msgid "add a user ID" msgstr "增加一个用户标识" -#: g10/keyedit.c:1384 +#: g10/keyedit.c:1383 msgid "add a photo ID" msgstr "增加一个照片标识" -#: g10/keyedit.c:1386 +#: g10/keyedit.c:1385 msgid "delete selected user IDs" msgstr "删除选定的用户标识" -#: g10/keyedit.c:1391 +#: g10/keyedit.c:1390 msgid "add a subkey" msgstr "添加一个子钥" -#: g10/keyedit.c:1395 +#: g10/keyedit.c:1394 msgid "add a key to a smartcard" msgstr "在智能卡上添加一把密钥" -#: g10/keyedit.c:1397 +#: g10/keyedit.c:1396 msgid "move a key to a smartcard" msgstr "将一把密钥移动到智能卡上" -#: g10/keyedit.c:1399 +#: g10/keyedit.c:1398 msgid "move a backup key to a smartcard" msgstr "将备份密钥转移到卡上" -#: g10/keyedit.c:1403 +#: g10/keyedit.c:1402 msgid "delete selected subkeys" msgstr "删除选定的子钥" -#: g10/keyedit.c:1405 +#: g10/keyedit.c:1404 msgid "add a revocation key" msgstr "增加一把吊销密钥" -#: g10/keyedit.c:1407 +#: g10/keyedit.c:1406 msgid "delete signatures from the selected user IDs" msgstr "删除所选用户标识上的签字" -#: g10/keyedit.c:1409 +#: g10/keyedit.c:1408 msgid "change the expiration date for the key or selected subkeys" msgstr "变更密钥或所选子钥的使用期限" -#: g10/keyedit.c:1411 +#: g10/keyedit.c:1410 msgid "flag the selected user ID as primary" msgstr "将所选的用户标识设为首选用户标识" -#: g10/keyedit.c:1413 +#: g10/keyedit.c:1412 msgid "toggle between the secret and public key listings" msgstr "在私钥和公钥清单间切换" -#: g10/keyedit.c:1416 +#: g10/keyedit.c:1415 msgid "list preferences (expert)" msgstr "列出首选项(专家模式)" -#: g10/keyedit.c:1418 +#: g10/keyedit.c:1417 msgid "list preferences (verbose)" msgstr "列出首选项(详细模式)" -#: g10/keyedit.c:1420 +#: g10/keyedit.c:1419 msgid "set preference list for the selected user IDs" msgstr "设定所选用户标识的首选项" -#: g10/keyedit.c:1425 +#: g10/keyedit.c:1424 msgid "set preferred keyserver URL for the selected user IDs" msgstr "设定所选用户标识的首选公钥服务器的 URL" -#: g10/keyedit.c:1427 +#: g10/keyedit.c:1426 msgid "change the passphrase" msgstr "更改密码" -#: g10/keyedit.c:1431 +#: g10/keyedit.c:1430 msgid "change the ownertrust" msgstr "更改信任度" -#: g10/keyedit.c:1433 +#: g10/keyedit.c:1432 msgid "revoke signatures on the selected user IDs" msgstr "吊销所选用户标识上的签字" -#: g10/keyedit.c:1435 +#: g10/keyedit.c:1434 msgid "revoke selected user IDs" msgstr "吊销选定的用户标识" -#: g10/keyedit.c:1440 +#: g10/keyedit.c:1439 msgid "revoke key or selected subkeys" msgstr "吊销密钥或选定的子钥" -#: g10/keyedit.c:1441 +#: g10/keyedit.c:1440 msgid "enable key" msgstr "启用密钥" -#: g10/keyedit.c:1442 +#: g10/keyedit.c:1441 msgid "disable key" msgstr "禁用密钥" -#: g10/keyedit.c:1443 +#: g10/keyedit.c:1442 msgid "show selected photo IDs" msgstr "显示选定的照片标识" -#: g10/keyedit.c:1445 -#, fuzzy -msgid "clean unusable parts from key" -msgstr "不可用的私钥" +#: g10/keyedit.c:1444 +msgid "compact unusable user IDs and remove unusable signatures from key" +msgstr "" + +#: g10/keyedit.c:1446 +msgid "compact unusable user IDs and remove all signatures from key" +msgstr "" #: g10/keyedit.c:1564 #, c-format @@ -3203,132 +3217,132 @@ msgstr "真的要更新所选用户标识的首选项吗？(y/N)" msgid "Really update the preferences? (y/N) " msgstr "真的要更新首选项吗？(y/N)" -#: g10/keyedit.c:2204 +#: g10/keyedit.c:2189 msgid "Save changes? (y/N) " msgstr "要保存变动吗？(y/N)" -#: g10/keyedit.c:2207 +#: g10/keyedit.c:2192 msgid "Quit without saving? (y/N) " msgstr "要不保存而离开吗？(y/N)" -#: g10/keyedit.c:2217 +#: g10/keyedit.c:2202 #, c-format msgid "update failed: %s\n" msgstr "更新失败：%s\n" -#: g10/keyedit.c:2224 +#: g10/keyedit.c:2209 #, c-format msgid "update secret failed: %s\n" msgstr "更新私钥失败：%s\n" -#: g10/keyedit.c:2231 +#: g10/keyedit.c:2216 msgid "Key not changed so no update needed.\n" msgstr "密钥没有变动所以不需要更新。\n" -#: g10/keyedit.c:2304 +#: g10/keyedit.c:2289 msgid "Digest: " msgstr "散列：" -#: g10/keyedit.c:2356 +#: g10/keyedit.c:2341 msgid "Features: " msgstr "特点：" -#: g10/keyedit.c:2367 +#: g10/keyedit.c:2352 msgid "Keyserver no-modify" msgstr "公钥服务器不可变造" -#: g10/keyedit.c:2382 g10/keylist.c:308 +#: g10/keyedit.c:2367 g10/keylist.c:308 msgid "Preferred keyserver: " msgstr "首选公钥服务器：" -#: g10/keyedit.c:2611 +#: g10/keyedit.c:2579 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "PGP 2.x 样式的用户标识没有首选项。\n" -#: g10/keyedit.c:2670 +#: g10/keyedit.c:2638 #, c-format msgid "This key was revoked on %s by %s key %s\n" msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n" -#: g10/keyedit.c:2691 +#: g10/keyedit.c:2659 #, c-format msgid "This key may be revoked by %s key %s" msgstr "这把密钥可被 %s 密钥 %s 吊销" -#: g10/keyedit.c:2697 +#: g10/keyedit.c:2665 msgid "(sensitive)" msgstr " (敏感的)" -#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845 -#: g10/keylist.c:194 g10/keyserver.c:450 +#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813 +#: g10/keylist.c:194 g10/keyserver.c:471 #, c-format msgid "created: %s" msgstr "创建于：%s" -#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963 +#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967 #, c-format msgid "revoked: %s" msgstr "已吊销：%s" -#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887 +#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887 #, c-format msgid "expired: %s" msgstr "已过期：%s" -#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847 +#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893 -#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969 +#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973 #, c-format msgid "expires: %s" msgstr "有效至：%s" -#: g10/keyedit.c:2722 +#: g10/keyedit.c:2690 #, c-format msgid "usage: %s" msgstr "可用于：%s" -#: g10/keyedit.c:2737 +#: g10/keyedit.c:2705 #, c-format msgid "trust: %s" msgstr "信任度：%s" -#: g10/keyedit.c:2741 +#: g10/keyedit.c:2709 #, c-format msgid "validity: %s" msgstr "有效性：%s" -#: g10/keyedit.c:2748 +#: g10/keyedit.c:2716 msgid "This key has been disabled" msgstr "这把密钥已经被禁用" -#: g10/keyedit.c:2776 g10/keylist.c:200 +#: g10/keyedit.c:2744 g10/keylist.c:200 msgid "card-no: " msgstr "卡号：" -#: g10/keyedit.c:2800 +#: g10/keyedit.c:2768 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n" -#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460 -#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694 +#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481 +#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704 msgid "revoked" msgstr "已吊销" -#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464 -#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696 +#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485 +#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706 msgid "expired" msgstr "已过期" -#: g10/keyedit.c:2931 +#: g10/keyedit.c:2899 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:2992 +#: g10/keyedit.c:2960 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -3337,55 +3351,55 @@ msgstr "" "警告：这是一把 PGP2 样式的密钥。\n" " 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n" -#: g10/keyedit.c:2997 g10/keyedit.c:3350 +#: g10/keyedit.c:2965 g10/keyedit.c:3295 msgid "Are you sure you still want to add it? (y/N) " msgstr "您确定仍然想要增加吗？(y/N)" -#: g10/keyedit.c:3003 +#: g10/keyedit.c:2971 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n" -#: g10/keyedit.c:3143 +#: g10/keyedit.c:3111 msgid "Delete this good signature? (y/N/q)" msgstr "删除这个完好的签字吗？(y/N/q)" -#: g10/keyedit.c:3153 +#: g10/keyedit.c:3121 msgid "Delete this invalid signature? (y/N/q)" msgstr "删除这个无效的签字吗？(y/N/q)" -#: g10/keyedit.c:3157 +#: g10/keyedit.c:3125 msgid "Delete this unknown signature? (y/N/q)" msgstr "删除这个未知的签字吗？(y/N/q)" -#: g10/keyedit.c:3163 +#: g10/keyedit.c:3131 msgid "Really delete this self-signature? (y/N)" msgstr "真的要删除这个自身签字吗？(y/N)" -#: g10/keyedit.c:3177 +#: g10/keyedit.c:3145 #, c-format msgid "Deleted %d signature.\n" msgstr "已经删除了 %d 个签字。\n" -#: g10/keyedit.c:3178 +#: g10/keyedit.c:3146 #, c-format msgid "Deleted %d signatures.\n" msgstr "已经删除了 %d 个签字。\n" -#: g10/keyedit.c:3181 +#: g10/keyedit.c:3149 msgid "Nothing deleted.\n" msgstr "没有东西被删除。\n" -#: g10/keyedit.c:3212 -#, fuzzy, c-format -msgid "User ID \"%s\": already clean.\n" -msgstr "用户标识“%s”已经被吊销。\n" - -#: g10/keyedit.c:3246 g10/trustdb.c:1698 +#: g10/keyedit.c:3182 g10/trustdb.c:1708 #, fuzzy msgid "invalid" msgstr "无效的 ASCII 封装格式" -#: g10/keyedit.c:3345 +#: g10/keyedit.c:3198 +#, fuzzy, c-format +msgid "User ID \"%s\": already clean\n" +msgstr "用户标识“%s”已经被吊销。\n" + +#: g10/keyedit.c:3290 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -3394,175 +3408,175 @@ msgstr "" "警告：这是一把 PGP2 样式的密钥。\n" " 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n" -#: g10/keyedit.c:3356 +#: g10/keyedit.c:3301 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n" -#: g10/keyedit.c:3376 +#: g10/keyedit.c:3321 msgid "Enter the user ID of the designated revoker: " msgstr "输入指定吊销者的用户标识：" -#: g10/keyedit.c:3399 +#: g10/keyedit.c:3346 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:3414 +#: g10/keyedit.c:3361 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:3436 +#: g10/keyedit.c:3383 msgid "this key has already been designated as a revoker\n" msgstr "这把密钥已被指定为一个吊销者\n" -#: g10/keyedit.c:3455 +#: g10/keyedit.c:3402 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n" -#: g10/keyedit.c:3461 +#: g10/keyedit.c:3408 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)：" -#: g10/keyedit.c:3522 +#: g10/keyedit.c:3469 msgid "Please remove selections from the secret keys.\n" msgstr "请从私钥中删除选择。\n" -#: g10/keyedit.c:3528 +#: g10/keyedit.c:3475 msgid "Please select at most one subkey.\n" msgstr "请至多选择一个子钥。\n" -#: g10/keyedit.c:3532 +#: g10/keyedit.c:3479 msgid "Changing expiration time for a subkey.\n" msgstr "将要变更子钥的使用期限。\n" -#: g10/keyedit.c:3535 +#: g10/keyedit.c:3482 msgid "Changing expiration time for the primary key.\n" msgstr "将要变更主钥的使用期限。\n" -#: g10/keyedit.c:3581 +#: g10/keyedit.c:3528 msgid "You can't change the expiration date of a v3 key\n" msgstr "您不能变更 v3 密钥的使用期限\n" -#: g10/keyedit.c:3597 +#: g10/keyedit.c:3544 msgid "No corresponding signature in secret ring\n" msgstr "在私钥环里没有相应的签字\n" -#: g10/keyedit.c:3822 +#: g10/keyedit.c:3769 msgid "Please select exactly one user ID.\n" msgstr "请精确地选择一个用户标识。\n" -#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091 +#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "跳过用户标识“%s”的 v3 自身签字\n" -#: g10/keyedit.c:4032 +#: g10/keyedit.c:3979 msgid "Enter your preferred keyserver URL: " msgstr "输入您首选的公钥服务器的 URL：" -#: g10/keyedit.c:4112 +#: g10/keyedit.c:4059 msgid "Are you sure you want to replace it? (y/N) " msgstr "您确定要替换它吗？(y/N)" -#: g10/keyedit.c:4113 +#: g10/keyedit.c:4060 msgid "Are you sure you want to delete it? (y/N) " msgstr "您确定要删除它吗？(y/N)" -#: g10/keyedit.c:4175 +#: g10/keyedit.c:4122 #, c-format msgid "No user ID with index %d\n" msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:4233 +#: g10/keyedit.c:4180 #, fuzzy, c-format msgid "No user ID with hash %s\n" msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:4260 +#: g10/keyedit.c:4207 #, c-format msgid "No subkey with index %d\n" msgstr "没有索引为 %d 的子钥\n" -#: g10/keyedit.c:4395 +#: g10/keyedit.c:4342 #, c-format msgid "user ID: \"%s\"\n" msgstr "用户标识：“%s”\n" -#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505 +#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "由您的密钥 %s 于 %s%s%s 签字\n" -#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507 +#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454 msgid " (non-exportable)" msgstr " (不可导出)" -#: g10/keyedit.c:4404 +#: g10/keyedit.c:4351 #, c-format msgid "This signature expired on %s.\n" msgstr "这份签字已在 %s 过期。\n" -#: g10/keyedit.c:4408 +#: g10/keyedit.c:4355 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "您确定您仍然想要吊销它吗？(y/N)" -#: g10/keyedit.c:4412 +#: g10/keyedit.c:4359 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "要为这份签字生成一份吊销证书吗？(y/N)" -#: g10/keyedit.c:4439 +#: g10/keyedit.c:4386 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n" -#: g10/keyedit.c:4465 +#: g10/keyedit.c:4412 msgid " (non-revocable)" msgstr " (不可吊销)" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4419 #, c-format msgid "revoked by your key %s on %s\n" msgstr "由您的密钥 %s 于 %s 吊销\n" -#: g10/keyedit.c:4494 +#: g10/keyedit.c:4441 msgid "You are about to revoke these signatures:\n" msgstr "您正在吊销这些签字：\n" -#: g10/keyedit.c:4514 +#: g10/keyedit.c:4461 msgid "Really create the revocation certificates? (y/N) " msgstr "真的要生成吊销证书吗？(y/N)" -#: g10/keyedit.c:4544 +#: g10/keyedit.c:4491 msgid "no secret key\n" msgstr "没有私钥\n" -#: g10/keyedit.c:4614 +#: g10/keyedit.c:4561 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "用户标识“%s”已经被吊销。\n" -#: g10/keyedit.c:4631 +#: g10/keyedit.c:4578 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n" -#: g10/keyedit.c:4695 +#: g10/keyedit.c:4642 #, c-format msgid "Key %s is already revoked.\n" msgstr "密钥 %s 已被吊销。\n" -#: g10/keyedit.c:4757 +#: g10/keyedit.c:4704 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "子钥 %s 已被吊销。\n" -#: g10/keyedit.c:4852 +#: g10/keyedit.c:4799 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n" @@ -3907,7 +3921,7 @@ msgstr "" "您需要一个密码来保护您的私钥。\n" "\n" -#: g10/keygen.c:1807 g10/passphrase.c:817 +#: g10/keygen.c:1807 g10/passphrase.c:810 #, c-format msgid "%s.\n" msgstr "%s.\n" @@ -4061,30 +4075,30 @@ msgstr "不是人类能读懂的" msgid "Keyring" msgstr "钥匙环" -#: g10/keylist.c:1497 +#: g10/keylist.c:1521 msgid "Primary key fingerprint:" msgstr "主钥指纹：" -#: g10/keylist.c:1499 +#: g10/keylist.c:1523 msgid " Subkey fingerprint:" msgstr "子钥指纹：" #. TRANSLATORS: this should fit into 24 bytes to that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:1506 +#: g10/keylist.c:1530 msgid " Primary key fingerprint:" msgstr " 主钥指纹：" -#: g10/keylist.c:1508 +#: g10/keylist.c:1532 msgid " Subkey fingerprint:" msgstr " 子钥指纹：" # use tty -#: g10/keylist.c:1512 g10/keylist.c:1516 +#: g10/keylist.c:1536 g10/keylist.c:1540 msgid " Key fingerprint =" msgstr "密钥指纹 =" -#: g10/keylist.c:1583 +#: g10/keylist.c:1607 msgid " Card serial no. =" msgstr "卡序列号 =" @@ -4131,352 +4145,385 @@ msgstr "缓存了 %lu 把密钥(%lu 份签字)\n" msgid "%s: keyring created\n" msgstr "%s：钥匙环已建立\n" -#: g10/keyserver.c:78 +#: g10/keyserver.c:76 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:80 +#: g10/keyserver.c:78 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:83 +#: g10/keyserver.c:81 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:85 +#: g10/keyserver.c:83 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:89 +#: g10/keyserver.c:87 msgid "automatically retrieve keys when verifying signatures" msgstr "" +#: g10/keyserver.c:89 +msgid "automatically retrieve keys from PKA records" +msgstr "" + +#: g10/keyserver.c:91 +msgid "automatically retrieve keys from DNS" +msgstr "" + #: g10/keyserver.c:95 #, fuzzy msgid "honor the preferred keyserver URL set on the key" msgstr "输入您首选的公钥服务器的 URL：" -#: g10/keyserver.c:130 +#: g10/keyserver.c:139 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n" -#: g10/keyserver.c:462 +#: g10/keyserver.c:483 msgid "disabled" msgstr "已禁用" -#: g10/keyserver.c:663 +#: g10/keyserver.c:684 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >" -#: g10/keyserver.c:746 g10/keyserver.c:1309 +#: g10/keyserver.c:767 g10/keyserver.c:1368 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "无效的公钥服务器协议(us %d!=handler %d)\n" -#: g10/keyserver.c:844 +#: g10/keyserver.c:865 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "在公钥服务器上找不到密钥“%s”\n" -#: g10/keyserver.c:846 +#: g10/keyserver.c:867 msgid "key not found on keyserver\n" msgstr "在公钥服务器上找不到密钥\n" -#: g10/keyserver.c:1056 +#: g10/keyserver.c:1092 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "下载密钥‘%s’，从 %s 服务器 %s\n" -#: g10/keyserver.c:1060 +#: g10/keyserver.c:1096 #, c-format msgid "requesting key %s from %s\n" msgstr "下载密钥 %s，从 %s\n" -#: g10/keyserver.c:1212 +#: g10/keyserver.c:1120 +#, fuzzy, c-format +msgid "searching for names from %s server %s\n" +msgstr "搜索“%s”，在 %s 服务器 %s 上\n" + +#: g10/keyserver.c:1123 +#, fuzzy, c-format +msgid "searching for names from %s\n" +msgstr "搜索“%s”，在 %s 上\n" + +#: g10/keyserver.c:1271 #, c-format msgid "sending key %s to %s server %s\n" msgstr "将密钥‘%s’上传到 %s 服务器 %s\n" -#: g10/keyserver.c:1216 +#: g10/keyserver.c:1275 #, c-format msgid "sending key %s to %s\n" msgstr "将密钥‘%s’上传到 %s\n" -#: g10/keyserver.c:1259 +#: g10/keyserver.c:1318 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "搜索“%s”，在 %s 服务器 %s 上\n" -#: g10/keyserver.c:1262 +#: g10/keyserver.c:1321 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "搜索“%s”，在 %s 上\n" -#: g10/keyserver.c:1269 g10/keyserver.c:1364 +#: g10/keyserver.c:1328 g10/keyserver.c:1424 msgid "no keyserver action!\n" msgstr "公钥服务器无动作！\n" -#: g10/keyserver.c:1317 +#: g10/keyserver.c:1376 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n" -#: g10/keyserver.c:1326 +#: g10/keyserver.c:1385 msgid "keyserver did not send VERSION\n" msgstr "公钥服务器未发送 VERSION\n" -#: g10/keyserver.c:1386 +#: g10/keyserver.c:1446 msgid "no keyserver known (use option --keyserver)\n" msgstr "未给出公钥服务器(使用 --keyserver 选项)\n" -#: g10/keyserver.c:1392 +#: g10/keyserver.c:1452 msgid "external keyserver calls are not supported in this build\n" msgstr "这一编译版本不支持外部调用公钥服务器\n" -#: g10/keyserver.c:1404 +#: g10/keyserver.c:1464 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "没有处理‘%s’公钥服务器的程序\n" -#: g10/keyserver.c:1409 +#: g10/keyserver.c:1469 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n" -#: g10/keyserver.c:1417 +#: g10/keyserver.c:1477 #, fuzzy, c-format msgid "%s does not support handler version %d\n" msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n" -#: g10/keyserver.c:1424 +#: g10/keyserver.c:1484 msgid "keyserver timed out\n" msgstr "公钥服务器超时\n" -#: g10/keyserver.c:1429 +#: g10/keyserver.c:1489 msgid "keyserver internal error\n" msgstr "公钥服务器内部错误\n" -#: g10/keyserver.c:1438 +#: g10/keyserver.c:1498 #, c-format msgid "keyserver communications error: %s\n" msgstr "公钥服务器通讯错误：%s\n" -#: g10/keyserver.c:1463 g10/keyserver.c:1497 +#: g10/keyserver.c:1523 g10/keyserver.c:1557 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "“%s”不是一个用户标识：跳过\n" -#: g10/keyserver.c:1754 +#: g10/keyserver.c:1814 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "警告：无法更新密钥 %s，通过 %s：%s\n" -#: g10/keyserver.c:1776 +#: g10/keyserver.c:1836 #, c-format msgid "refreshing 1 key from %s\n" msgstr "1 个密钥正从 %s 得到更新\n" -#: g10/keyserver.c:1778 +#: g10/keyserver.c:1838 #, c-format msgid "refreshing %d keys from %s\n" msgstr "%d 个密钥正从 %s 得到更新\n" -#: g10/mainproc.c:249 +#: g10/keyserver.c:1903 +#, fuzzy, c-format +msgid "WARNING: unable to fetch URI %s: %s\n" +msgstr "警告：无法更新密钥 %s，通过 %s：%s\n" + +#: g10/keyserver.c:1909 +#, fuzzy, c-format +msgid "WARNING: unable to parse URI %s\n" +msgstr "警告：无法更新密钥 %s，通过 %s：%s\n" + +#: g10/mainproc.c:253 #, c-format msgid "weird size for an encrypted session key (%d)\n" msgstr "加密过的会话密钥尺寸(%d)诡异\n" -#: g10/mainproc.c:300 +#: g10/mainproc.c:304 #, c-format msgid "%s encrypted session key\n" msgstr "%s 加密过的会话密钥\n" -#: g10/mainproc.c:310 +#: g10/mainproc.c:314 #, c-format msgid "passphrase generated with unknown digest algorithm %d\n" msgstr "密码由未知的散列算法 %d 生成\n" -#: g10/mainproc.c:391 +#: g10/mainproc.c:395 #, c-format msgid "public key is %s\n" msgstr "公钥是 %s\n" -#: g10/mainproc.c:446 +#: g10/mainproc.c:450 msgid "public key encrypted data: good DEK\n" msgstr "公钥加密过的数据：完好的数据加密密钥\n" -#: g10/mainproc.c:479 +#: g10/mainproc.c:483 #, c-format msgid "encrypted with %u-bit %s key, ID %s, created %s\n" msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n" -#: g10/mainproc.c:483 g10/pkclist.c:219 +#: g10/mainproc.c:487 g10/pkclist.c:219 #, c-format msgid " \"%s\"\n" msgstr " “%s”\n" -#: g10/mainproc.c:487 +#: g10/mainproc.c:491 #, c-format msgid "encrypted with %s key, ID %s\n" msgstr "由 %s 密钥加密、钥匙号为 %s\n" -#: g10/mainproc.c:501 +#: g10/mainproc.c:505 #, c-format msgid "public key decryption failed: %s\n" msgstr "公钥解密失败：%s\n" -#: g10/mainproc.c:515 +#: g10/mainproc.c:519 #, c-format msgid "encrypted with %lu passphrases\n" msgstr "以 %lu 个密码加密\n" -#: g10/mainproc.c:517 +#: g10/mainproc.c:521 msgid "encrypted with 1 passphrase\n" msgstr "以 1 个密码加密\n" -#: g10/mainproc.c:545 g10/mainproc.c:567 +#: g10/mainproc.c:549 g10/mainproc.c:571 #, c-format msgid "assuming %s encrypted data\n" msgstr "假定 %s 为加密过的数据\n" -#: g10/mainproc.c:553 +#: g10/mainproc.c:557 #, c-format msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" msgstr "IDEA 算法不可用，试以 %s 代替\n" -#: g10/mainproc.c:585 +#: g10/mainproc.c:589 msgid "decryption okay\n" msgstr "解密成功\n" -#: g10/mainproc.c:589 +#: g10/mainproc.c:593 msgid "WARNING: message was not integrity protected\n" msgstr "警告：报文未受到完整的保护\n" -#: g10/mainproc.c:602 +#: g10/mainproc.c:606 msgid "WARNING: encrypted message has been manipulated!\n" msgstr "警告：加密过的报文已经变造！\n" -#: g10/mainproc.c:608 +#: g10/mainproc.c:612 #, c-format msgid "decryption failed: %s\n" msgstr "解密失败：%s\n" -#: g10/mainproc.c:627 +#: g10/mainproc.c:631 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "注意：发件者要求您“只阅读不存盘”\n" -#: g10/mainproc.c:629 +#: g10/mainproc.c:633 #, c-format msgid "original file name='%.*s'\n" msgstr "原始文件名 =‘%.*s’\n" -#: g10/mainproc.c:818 +#: g10/mainproc.c:822 msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "独立的吊销证书――请用“gpg --import”来应用\n" -#: g10/mainproc.c:1402 +#: g10/mainproc.c:1168 +#, fuzzy +msgid "no signature found\n" +msgstr "完好的签字，来自于“%s”" + +#: g10/mainproc.c:1418 msgid "signature verification suppressed\n" msgstr "签字验证已被抑制\n" -#: g10/mainproc.c:1444 g10/mainproc.c:1454 +#: g10/mainproc.c:1460 g10/mainproc.c:1470 msgid "can't handle these multiple signatures\n" msgstr "无法处理这些多重签字\n" -#: g10/mainproc.c:1464 +#: g10/mainproc.c:1480 #, c-format msgid "Signature made %s\n" msgstr "签字建立于 %s\n" -#: g10/mainproc.c:1465 +#: g10/mainproc.c:1481 #, c-format msgid " using %s key %s\n" msgstr " 使用 %s 密钥 %s\n" -#: g10/mainproc.c:1469 +#: g10/mainproc.c:1485 #, c-format msgid "Signature made %s using %s key ID %s\n" msgstr "于 %s 创建的签字，使用 %s，钥匙号 %s\n" -#: g10/mainproc.c:1489 +#: g10/mainproc.c:1505 msgid "Key available at: " msgstr "可用的密钥在：" -#: g10/mainproc.c:1623 g10/mainproc.c:1671 +#: g10/mainproc.c:1639 g10/mainproc.c:1687 #, c-format msgid "BAD signature from \"%s\"" msgstr "已损坏的签字，来自于“%s”" -#: g10/mainproc.c:1625 g10/mainproc.c:1673 +#: g10/mainproc.c:1641 g10/mainproc.c:1689 #, c-format msgid "Expired signature from \"%s\"" msgstr "过期的签字，来自于“%s”" -#: g10/mainproc.c:1627 g10/mainproc.c:1675 +#: g10/mainproc.c:1643 g10/mainproc.c:1691 #, c-format msgid "Good signature from \"%s\"" msgstr "完好的签字，来自于“%s”" -#: g10/mainproc.c:1679 +#: g10/mainproc.c:1695 msgid "[uncertain]" msgstr "[不确定]" -#: g10/mainproc.c:1711 +#: g10/mainproc.c:1727 #, c-format msgid " aka \"%s\"" msgstr " 亦即“%s”" -#: g10/mainproc.c:1808 +#: g10/mainproc.c:1824 #, c-format msgid "Signature expired %s\n" msgstr "这份签字已于 %s 过期。\n" -#: g10/mainproc.c:1813 +#: g10/mainproc.c:1829 #, c-format msgid "Signature expires %s\n" msgstr "这份签字在 %s 过期。\n" -#: g10/mainproc.c:1816 +#: g10/mainproc.c:1832 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s 签字，散列算法 %s\n" -#: g10/mainproc.c:1817 +#: g10/mainproc.c:1833 msgid "binary" msgstr "二进制" -#: g10/mainproc.c:1818 +#: g10/mainproc.c:1834 msgid "textmode" msgstr "文本模式" -#: g10/mainproc.c:1818 g10/trustdb.c:531 +#: g10/mainproc.c:1834 g10/trustdb.c:536 msgid "unknown" msgstr "未知" -#: g10/mainproc.c:1838 +#: g10/mainproc.c:1854 #, c-format msgid "Can't check signature: %s\n" msgstr "无法检查签字：%s\n" -#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008 +#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024 msgid "not a detached signature\n" msgstr "不是一份分离的签字\n" -#: g10/mainproc.c:1949 +#: g10/mainproc.c:1965 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "警告：检测到多重签字。只检查第一个签字。\n" -#: g10/mainproc.c:1957 +#: g10/mainproc.c:1973 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "等级 0x%02x 的独立签字\n" -#: g10/mainproc.c:2014 +#: g10/mainproc.c:2030 msgid "old style (PGP 2.x) signature\n" msgstr "旧式(PGP 2.x)签字\n" -#: g10/mainproc.c:2024 +#: g10/mainproc.c:2040 msgid "invalid root packet detected in proc_tree()\n" msgstr "在 proc_tree() 中检测到无效的根包\n" @@ -4623,34 +4670,34 @@ msgstr "警告：潜在不安全的对称加密会话密钥\n" msgid "subpacket of type %d has critical bit set\n" msgstr "%d 类别的子包设定了关键位\n" -#: g10/passphrase.c:317 +#: g10/passphrase.c:310 msgid "gpg-agent is not available in this session\n" msgstr "gpg-agent 在此次舍话中无法使用\n" -#: g10/passphrase.c:333 +#: g10/passphrase.c:326 msgid "malformed GPG_AGENT_INFO environment variable\n" msgstr "GPG_AGENT_INFO 环境变量格式错误\n" -#: g10/passphrase.c:352 +#: g10/passphrase.c:345 #, c-format msgid "gpg-agent protocol version %d is not supported\n" msgstr "不支持 gpg-agent 协议版本 %d\n" -#: g10/passphrase.c:369 +#: g10/passphrase.c:362 #, c-format msgid "can't connect to `%s': %s\n" msgstr "无法连接至‘%s’：%s\n" -#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752 +#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745 msgid "problem with the agent - disabling agent use\n" msgstr "代理程序有问题――正在停用代理程序\n" -#: g10/passphrase.c:539 g10/passphrase.c:921 +#: g10/passphrase.c:532 g10/passphrase.c:914 #, c-format msgid " (main key ID %s)" msgstr " (主钥匙号 %s)" -#: g10/passphrase.c:553 +#: g10/passphrase.c:546 #, c-format msgid "" "You need a passphrase to unlock the secret key for user:\n" @@ -4661,44 +4708,44 @@ msgstr "" "“%.*s”\n" "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n" -#: g10/passphrase.c:578 +#: g10/passphrase.c:571 msgid "Repeat passphrase\n" msgstr "请再输入一次密码\n" -#: g10/passphrase.c:580 +#: g10/passphrase.c:573 msgid "Enter passphrase\n" msgstr "请输入密码\n" -#: g10/passphrase.c:656 +#: g10/passphrase.c:649 msgid "cancelled by user\n" msgstr "用户取消\n" -#: g10/passphrase.c:812 g10/passphrase.c:975 +#: g10/passphrase.c:805 g10/passphrase.c:968 msgid "can't query passphrase in batch mode\n" msgstr "在批处理模式中无法查询密码\n" -#: g10/passphrase.c:819 g10/passphrase.c:980 +#: g10/passphrase.c:812 g10/passphrase.c:973 msgid "Enter passphrase: " msgstr "请输入密码：" -#: g10/passphrase.c:902 +#: g10/passphrase.c:895 #, c-format msgid "" "You need a passphrase to unlock the secret key for\n" "user: \"%s\"\n" msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n" -#: g10/passphrase.c:908 +#: g10/passphrase.c:901 #, c-format msgid "%u-bit %s key, ID %s, created %s" msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s" -#: g10/passphrase.c:917 +#: g10/passphrase.c:910 #, c-format msgid " (subkey on main key ID %s)" msgstr " (主钥 %s 的子钥)" -#: g10/passphrase.c:984 +#: g10/passphrase.c:977 msgid "Repeat passphrase: " msgstr "请再输入一次密码：" @@ -4746,23 +4793,23 @@ msgstr "这张照片正确吗？(y/N/q)" msgid "unable to display photo ID!\n" msgstr "无法显示照片标识！\n" -#: g10/pkclist.c:62 g10/revoke.c:585 +#: g10/pkclist.c:62 g10/revoke.c:623 msgid "No reason specified" msgstr "未指定原因" -#: g10/pkclist.c:64 g10/revoke.c:587 +#: g10/pkclist.c:64 g10/revoke.c:625 msgid "Key is superseded" msgstr "密钥被替换" -#: g10/pkclist.c:66 g10/revoke.c:586 +#: g10/pkclist.c:66 g10/revoke.c:624 msgid "Key has been compromised" msgstr "密钥已泄漏" -#: g10/pkclist.c:68 g10/revoke.c:588 +#: g10/pkclist.c:68 g10/revoke.c:626 msgid "Key is no longer used" msgstr "密钥不再使用" -#: g10/pkclist.c:70 g10/revoke.c:589 +#: g10/pkclist.c:70 g10/revoke.c:627 msgid "User ID is no longer valid" msgstr "用户标识不再有效" @@ -4829,7 +4876,7 @@ msgstr "" "这把密钥的最小信任等级为：%s\n" "\n" -#: g10/pkclist.c:299 g10/revoke.c:614 +#: g10/pkclist.c:299 g10/revoke.c:652 msgid "Your decision? " msgstr "您的决定是什么？" @@ -4900,65 +4947,73 @@ msgstr "警告：这把子钥已经被它的持有者吊销了！\n" msgid "Note: This key has been disabled.\n" msgstr "注意：这把密钥已经被禁用了。\n" -#: g10/pkclist.c:552 +#: g10/pkclist.c:553 #, c-format msgid "Note: Verified signer's address is `%s'\n" msgstr "" -#: g10/pkclist.c:558 +#: g10/pkclist.c:560 #, c-format msgid "Note: Signer's address `%s' does not match DNS entry\n" msgstr "" -#: g10/pkclist.c:587 +#: g10/pkclist.c:572 +msgid "trustlevel adjusted to FULL due to valid PKA info\n" +msgstr "" + +#: g10/pkclist.c:580 +msgid "trustlevel adjusted to NEVER due to bad PKA info\n" +msgstr "" + +#: g10/pkclist.c:591 msgid "Note: This key has expired!\n" msgstr "注意：这把密钥已经过期了！\n" -#: g10/pkclist.c:598 +#: g10/pkclist.c:602 msgid "WARNING: This key is not certified with a trusted signature!\n" msgstr "警告：这把密钥未经受信任的签字认证！\n" -#: g10/pkclist.c:600 +#: g10/pkclist.c:604 msgid "" " There is no indication that the signature belongs to the owner.\n" msgstr " 没有证据表明这个签字属于它所声称的持有者。\n" -#: g10/pkclist.c:608 +#: g10/pkclist.c:612 msgid "WARNING: We do NOT trust this key!\n" msgstr "警告：我们不信任这把密钥！\n" -#: g10/pkclist.c:609 +#: g10/pkclist.c:613 msgid " The signature is probably a FORGERY.\n" msgstr " 这个签字很有可能是伪造的。\n" -#: g10/pkclist.c:617 +#: g10/pkclist.c:621 msgid "" "WARNING: This key is not certified with sufficiently trusted signatures!\n" msgstr "警告：这把密钥未经有足够信任度的签字所认证。\n" -#: g10/pkclist.c:619 +#: g10/pkclist.c:623 msgid " It is not certain that the signature belongs to the owner.\n" msgstr " 这份签字并不一定属于它所声称的持有者\n" -#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142 +#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146 #, c-format msgid "%s: skipped: %s\n" msgstr "%s：已跳过：%s\n" -#: g10/pkclist.c:830 g10/pkclist.c:1110 +#: g10/pkclist.c:834 g10/pkclist.c:1114 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: 已跳过：公钥已存在\n" -#: g10/pkclist.c:881 +#: g10/pkclist.c:885 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n" -#: g10/pkclist.c:905 +#: g10/pkclist.c:909 msgid "Current recipients:\n" msgstr "当前收件人：\n" -#: g10/pkclist.c:931 +#: g10/pkclist.c:935 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -4966,33 +5021,33 @@ msgstr "" "\n" "输入用户标识。以空白行结束：" -#: g10/pkclist.c:956 +#: g10/pkclist.c:960 msgid "No such user ID.\n" msgstr "没有这个用户标识。\n" -#: g10/pkclist.c:965 g10/pkclist.c:1039 +#: g10/pkclist.c:969 g10/pkclist.c:1043 msgid "skipped: public key already set as default recipient\n" msgstr "已跳过：公钥已被设为默认收件者\n" -#: g10/pkclist.c:986 +#: g10/pkclist.c:990 msgid "Public key is disabled.\n" msgstr "公钥被禁用。\n" -#: g10/pkclist.c:995 +#: g10/pkclist.c:999 msgid "skipped: public key already set\n" msgstr "已跳过：公钥已被设定\n" -#: g10/pkclist.c:1030 +#: g10/pkclist.c:1034 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "未知的默认收件者“%s”\n" -#: g10/pkclist.c:1088 +#: g10/pkclist.c:1092 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s：已跳过：公钥已被禁用\n" -#: g10/pkclist.c:1150 +#: g10/pkclist.c:1154 msgid "no valid addressees\n" msgstr "没有有效的地址\n" @@ -5031,35 +5086,35 @@ msgstr "无法打开有签字的数据‘%s’\n" msgid "anonymous recipient; trying secret key %s ...\n" msgstr "匿名收件者；正在尝试使用私钥 %s ……\n" -#: g10/pubkey-enc.c:120 +#: g10/pubkey-enc.c:135 msgid "okay, we are the anonymous recipient.\n" msgstr "很好，我们就是匿名收件者。\n" -#: g10/pubkey-enc.c:208 +#: g10/pubkey-enc.c:223 msgid "old encoding of the DEK is not supported\n" msgstr "不支持旧式的 DEK 编码\n" -#: g10/pubkey-enc.c:229 +#: g10/pubkey-enc.c:244 #, c-format msgid "cipher algorithm %d%s is unknown or disabled\n" msgstr "对称加密算法 %d%s 未知或已停用\n" -#: g10/pubkey-enc.c:267 +#: g10/pubkey-enc.c:282 #, c-format msgid "WARNING: cipher algorithm %s not found in recipient preferences\n" msgstr "注意：收件人的首选项中找不到加密算法 %s\n" -#: g10/pubkey-enc.c:287 +#: g10/pubkey-enc.c:302 #, c-format msgid "NOTE: secret key %s expired at %s\n" msgstr "注意：私钥 %s 已于 %s 过期\n" -#: g10/pubkey-enc.c:293 +#: g10/pubkey-enc.c:308 msgid "NOTE: key has been revoked" msgstr "注意：密钥已被吊销" #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176 -#: g10/revoke.c:188 g10/revoke.c:550 +#: g10/revoke.c:188 g10/revoke.c:588 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet 失败：%s\n" @@ -5069,63 +5124,63 @@ msgstr "build_packet 失败：%s\n" msgid "key %s has no user IDs\n" msgstr "密钥 %s：没有有效的用户标识\n" -#: g10/revoke.c:273 +#: g10/revoke.c:308 msgid "To be revoked by:\n" msgstr "将被吊销，吊销者：\n" -#: g10/revoke.c:277 +#: g10/revoke.c:312 msgid "(This is a sensitive revocation key)\n" msgstr "(这是一把敏感的吊销密钥)\n" -#: g10/revoke.c:281 +#: g10/revoke.c:316 msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)" -#: g10/revoke.c:294 g10/revoke.c:516 +#: g10/revoke.c:329 g10/revoke.c:554 msgid "ASCII armored output forced.\n" msgstr "已强行使用 ASCII 封装过的输出。\n" -#: g10/revoke.c:308 g10/revoke.c:530 +#: g10/revoke.c:344 g10/revoke.c:568 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 失败： %s\n" -#: g10/revoke.c:371 +#: g10/revoke.c:407 msgid "Revocation certificate created.\n" msgstr "已建立吊销证书。\n" -#: g10/revoke.c:377 +#: g10/revoke.c:413 #, c-format msgid "no revocation keys found for \"%s\"\n" msgstr "没有找到“%s”的吊销密钥\n" -#: g10/revoke.c:433 +#: g10/revoke.c:471 #, c-format msgid "secret key \"%s\" not found: %s\n" msgstr "找不到私钥“%s”：%s\n" -#: g10/revoke.c:462 +#: g10/revoke.c:500 #, c-format msgid "no corresponding public key: %s\n" msgstr "没有相对应的公钥：%s\n" -#: g10/revoke.c:473 +#: g10/revoke.c:511 msgid "public key does not match secret key!\n" msgstr "公钥与私钥不吻合！\n" -#: g10/revoke.c:480 +#: g10/revoke.c:518 msgid "Create a revocation certificate for this key? (y/N) " msgstr "要为这把密钥建立一份吊销证书吗？(y/N)" -#: g10/revoke.c:497 +#: g10/revoke.c:535 msgid "unknown protection algorithm\n" msgstr "未知的保护算法\n" -#: g10/revoke.c:505 +#: g10/revoke.c:543 msgid "NOTE: This key is not protected!\n" msgstr "注意：这把密钥没有被保护！\n" -#: g10/revoke.c:556 +#: g10/revoke.c:594 msgid "" "Revocation certificate created.\n" "\n" @@ -5143,33 +5198,33 @@ msgstr "" "小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n" "人也能够看得到的地方！\n" -#: g10/revoke.c:597 +#: g10/revoke.c:635 msgid "Please select the reason for the revocation:\n" msgstr "请选择吊销的原因：\n" -#: g10/revoke.c:607 +#: g10/revoke.c:645 msgid "Cancel" msgstr "取消" -#: g10/revoke.c:609 +#: g10/revoke.c:647 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "(也许您会想要在这里选择 %d)\n" -#: g10/revoke.c:650 +#: g10/revoke.c:688 msgid "Enter an optional description; end it with an empty line:\n" msgstr "请输入描述(可选)；以空白行结束：\n" -#: g10/revoke.c:678 +#: g10/revoke.c:716 #, c-format msgid "Reason for revocation: %s\n" msgstr "吊销原因：%s\n" -#: g10/revoke.c:680 +#: g10/revoke.c:718 msgid "(No description given)\n" msgstr "(不给定描述)\n" -#: g10/revoke.c:685 +#: g10/revoke.c:723 msgid "Is this okay? (y/N) " msgstr "这样可以吗？ (y/N)" @@ -5317,25 +5372,25 @@ msgstr "检查已建立的签字时发生错误： %s\n" msgid "%s/%s signature from: \"%s\"\n" msgstr "%s/%s 签字来自：“%s”\n" -#: g10/sign.c:763 +#: g10/sign.c:767 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签字\n" -#: g10/sign.c:832 +#: g10/sign.c:836 #, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n" -#: g10/sign.c:924 +#: g10/sign.c:934 msgid "signing:" msgstr "正在签字：" -#: g10/sign.c:1036 +#: g10/sign.c:1046 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签字\n" -#: g10/sign.c:1214 +#: g10/sign.c:1224 #, c-format msgid "%s encryption will be used\n" msgstr "%s 加密将被采用\n" @@ -5590,122 +5645,126 @@ msgstr "信任记录 %lu 不属于所请求的类别 %d\n" msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n" -#: g10/trustdb.c:453 +#: g10/trustdb.c:454 #, c-format msgid "using %s trust model\n" msgstr "使用 %s 信任模型\n" -#: g10/trustdb.c:505 +#: g10/trustdb.c:456 +msgid "PKA verification is allowed to leverage trust to full\n" +msgstr "" + +#: g10/trustdb.c:510 msgid "10 translator see trustdb.c:uid_trust_string_fixed" msgstr "10 translator see trustdb.c:uid_trust_string_fixed" -#: g10/trustdb.c:507 +#: g10/trustdb.c:512 msgid "[ revoked]" msgstr "[已吊销]" -#: g10/trustdb.c:509 g10/trustdb.c:514 +#: g10/trustdb.c:514 g10/trustdb.c:519 msgid "[ expired]" msgstr "[已过期]" -#: g10/trustdb.c:513 +#: g10/trustdb.c:518 msgid "[ unknown]" msgstr "[ 未知 ]" -#: g10/trustdb.c:515 +#: g10/trustdb.c:520 msgid "[ undef ]" msgstr "[未定义]" -#: g10/trustdb.c:516 +#: g10/trustdb.c:521 msgid "[marginal]" msgstr "[ 勉强 ]" -#: g10/trustdb.c:517 +#: g10/trustdb.c:522 msgid "[ full ]" msgstr "[ 完全 ]" -#: g10/trustdb.c:518 +#: g10/trustdb.c:523 msgid "[ultimate]" msgstr "[ 绝对 ]" -#: g10/trustdb.c:533 +#: g10/trustdb.c:538 msgid "undefined" msgstr "未定义" -#: g10/trustdb.c:534 +#: g10/trustdb.c:539 msgid "never" msgstr "从不" -#: g10/trustdb.c:535 +#: g10/trustdb.c:540 msgid "marginal" msgstr "勉强" -#: g10/trustdb.c:536 +#: g10/trustdb.c:541 msgid "full" msgstr "完全" -#: g10/trustdb.c:537 +#: g10/trustdb.c:542 msgid "ultimate" msgstr "绝对" -#: g10/trustdb.c:577 +#: g10/trustdb.c:582 msgid "no need for a trustdb check\n" msgstr "不需要检查信任度数据库\n" -#: g10/trustdb.c:583 g10/trustdb.c:2330 +#: g10/trustdb.c:588 g10/trustdb.c:2357 #, c-format msgid "next trustdb check due at %s\n" msgstr "下次信任度数据库检查将于 %s 进行\n" -#: g10/trustdb.c:592 +#: g10/trustdb.c:597 #, c-format msgid "no need for a trustdb check with `%s' trust model\n" msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n" -#: g10/trustdb.c:607 +#: g10/trustdb.c:612 #, c-format msgid "no need for a trustdb update with `%s' trust model\n" msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n" -#: g10/trustdb.c:839 g10/trustdb.c:1277 +#: g10/trustdb.c:844 g10/trustdb.c:1282 #, c-format msgid "public key %s not found: %s\n" msgstr "找不到公钥 %s：%s\n" -#: g10/trustdb.c:1034 +#: g10/trustdb.c:1039 msgid "please do a --check-trustdb\n" msgstr "请执行一次 --check-trustdb\n" -#: g10/trustdb.c:1038 +#: g10/trustdb.c:1043 msgid "checking the trustdb\n" msgstr "正在检查信任度数据库\n" -#: g10/trustdb.c:2074 +#: g10/trustdb.c:2100 #, c-format msgid "%d keys processed (%d validity counts cleared)\n" msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n" -#: g10/trustdb.c:2138 +#: g10/trustdb.c:2165 msgid "no ultimately trusted keys found\n" msgstr "没有找到任何绝对信任的密钥\n" -#: g10/trustdb.c:2152 +#: g10/trustdb.c:2179 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "绝对信任的密钥 %s 的公钥未被找到\n" -#: g10/trustdb.c:2175 +#: g10/trustdb.c:2202 #, c-format msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n" msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n" -#: g10/trustdb.c:2261 +#: g10/trustdb.c:2288 #, c-format msgid "" "depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n" msgstr "" "深度：%d 有效性：%3d 已签字：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n" -#: g10/trustdb.c:2336 +#: g10/trustdb.c:2363 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "无法更新信任度数据库版本记录：写入失败：%s\n" @@ -5941,6 +6000,11 @@ msgstr "已取消" msgid "no card" msgstr "没有卡" +#: util/errors.c:111 +#, fuzzy +msgid "no data" +msgstr "不含签字的数据\n" + #: util/logger.c:158 msgid "ERROR: " msgstr "错误：" @@ -5999,19 +6063,19 @@ msgstr "oO" msgid "cC" msgstr "cC" -#: util/secmem.c:91 +#: util/secmem.c:97 msgid "WARNING: using insecure memory!\n" msgstr "警告：正在使用不安全的内存！\n" -#: util/secmem.c:92 +#: util/secmem.c:98 msgid "please see http://www.gnupg.org/faq.html for more information\n" msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n" -#: util/secmem.c:344 +#: util/secmem.c:350 msgid "operation is not possible without initialized secure memory\n" msgstr "安全内存未初始化，不能进行操作\n" -#: util/secmem.c:345 +#: util/secmem.c:351 msgid "(you may have used the wrong program for this task)\n" msgstr "(您可能使用了错误的程序来完成此项任务)\n" |