aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po607
1 files changed, 307 insertions, 300 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4bc14e930..656b87274 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: [email protected]\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
"PO-Revision-Date: 2005-03-17 22:24+0800\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -45,9 +45,9 @@ 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:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 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:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 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
@@ -81,7 +81,7 @@ msgstr "无法读取‘%s’:%s\n"
msgid "note: random_seed file not updated\n"
msgstr "注意:随机数种子文件未被更新\n"
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 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:805 g10/sign.c:1076 g10/tdbio.c:536
#, c-format
@@ -662,11 +662,11 @@ msgstr "不允许使用管理员命令\n"
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
msgid "Please insert the card and hit return or enter 'c' to cancel: "
msgstr "请插入卡并回车,或输入‘c’来取消:"
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
#, c-format
msgid ""
"Please remove the current card and insert the one with serial number:\n"
@@ -675,35 +675,35 @@ msgstr ""
"请取出当前的卡,并插入有下列序列号的卡:\n"
" %.*s\n"
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
msgid "Hit return when ready or enter 'c' to cancel: "
msgstr "就绪后请回车,或输入‘c’取消"
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
msgid "Enter New Admin PIN: "
msgstr "输入新的管理员 PIN:"
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
msgid "Enter New PIN: "
msgstr "输入新的 PIN:"
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
msgid "Enter Admin PIN: "
msgstr "输入管理员 PIN:"
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
msgid "Enter PIN: "
msgstr "输入 PIN:"
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
msgid "Repeat this PIN: "
msgstr "再次输入此 PIN:"
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符;请再试一次"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -713,13 +713,13 @@ msgstr "无法打开‘%s’\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到:%s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %s\n"
@@ -825,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:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 加密过的数据\n"
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以未知的算法 %d 加密\n"
@@ -966,7 +966,7 @@ msgstr "警告:私钥 %s 不存在简单 SK 检验和\n"
msgid "WARNING: nothing exported\n"
msgstr "警告:没有导出任何东西\n"
-#: g10/gpg.c:372
+#: g10/gpg.c:373
msgid ""
"@Commands:\n"
" "
@@ -974,127 +974,127 @@ msgstr ""
"@指令:\n"
" "
-#: g10/gpg.c:374
+#: g10/gpg.c:375
msgid "|[file]|make a signature"
msgstr "|[文件名]|生成一份签字"
-#: g10/gpg.c:375
+#: g10/gpg.c:376
msgid "|[file]|make a clear text signature"
msgstr "|[文件名]|生成一份明文签字"
-#: g10/gpg.c:376
+#: g10/gpg.c:377
msgid "make a detached signature"
msgstr "生成一份分离的签字"
-#: g10/gpg.c:377
+#: g10/gpg.c:378
msgid "encrypt data"
msgstr "加密数据"
-#: g10/gpg.c:379
+#: g10/gpg.c:380
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:381
+#: g10/gpg.c:382
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/gpg.c:383
+#: g10/gpg.c:384
msgid "verify a signature"
msgstr "验证签字"
-#: g10/gpg.c:385
+#: g10/gpg.c:386
msgid "list keys"
msgstr "列出密钥"
-#: g10/gpg.c:387
+#: g10/gpg.c:388
msgid "list keys and signatures"
msgstr "列出密钥和签字"
-#: g10/gpg.c:388
+#: g10/gpg.c:389
msgid "list and check key signatures"
msgstr "列出并检查密钥签字"
-#: g10/gpg.c:389
+#: g10/gpg.c:390
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:390
+#: g10/gpg.c:391
msgid "list secret keys"
msgstr "列出私钥"
-#: g10/gpg.c:391
+#: g10/gpg.c:392
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
-#: g10/gpg.c:392
+#: g10/gpg.c:393
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: g10/gpg.c:394
+#: g10/gpg.c:395
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
-#: g10/gpg.c:395
+#: g10/gpg.c:396
msgid "sign a key"
msgstr "为某把密钥添加签字"
-#: g10/gpg.c:396
+#: g10/gpg.c:397
msgid "sign a key locally"
msgstr "为某把密钥添加本地签字"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签字"
-#: g10/gpg.c:398
+#: g10/gpg.c:399
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/gpg.c:400
+#: g10/gpg.c:401
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:401
+#: g10/gpg.c:402
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:402
+#: g10/gpg.c:403
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/gpg.c:404
+#: g10/gpg.c:405
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/gpg.c:406
+#: g10/gpg.c:407
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
-#: g10/gpg.c:410
+#: g10/gpg.c:411
msgid "import/merge keys"
msgstr "导入/合并密钥"
-#: g10/gpg.c:413
+#: g10/gpg.c:414
msgid "print the card status"
msgstr "打印卡状态"
-#: g10/gpg.c:414
+#: g10/gpg.c:415
msgid "change data on a card"
msgstr "更改卡上的数据"
-#: g10/gpg.c:415
+#: g10/gpg.c:416
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
-#: g10/gpg.c:423
+#: g10/gpg.c:424
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/gpg.c:430
+#: g10/gpg.c:431
msgid "|algo [files]|print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1104,51 +1104,51 @@ msgstr ""
"选项:\n"
" "
-#: g10/gpg.c:436
+#: g10/gpg.c:437
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:438
+#: g10/gpg.c:439
msgid "|NAME|encrypt for NAME"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:449
+#: g10/gpg.c:450
msgid "use this user-id to sign or decrypt"
msgstr "使用这个用户标识来签字或解密"
-#: g10/gpg.c:450
+#: g10/gpg.c:451
msgid "|N|set compress level N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:455
+#: g10/gpg.c:456
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:469
+#: g10/gpg.c:470
msgid "use as output file"
msgstr "指定输出文件"
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
msgid "verbose"
msgstr "详细模式"
-#: g10/gpg.c:482
+#: g10/gpg.c:483
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/gpg.c:483
+#: g10/gpg.c:484
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/gpg.c:524
+#: g10/gpg.c:525
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/gpg.c:525
+#: g10/gpg.c:526
msgid "generate PGP 2.x compatible messages"
msgstr "生成与 PGP 2.x 兼容的报文"
-#: g10/gpg.c:553
+#: g10/gpg.c:554
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1156,7 +1156,7 @@ msgstr ""
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/gpg.c:556
+#: g10/gpg.c:557
msgid ""
"@\n"
"Examples:\n"
@@ -1176,17 +1176,17 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"请向 <[email protected]> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: g10/gpg.c:763
+#: g10/gpg.c:768
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: g10/gpg.c:766
+#: g10/gpg.c:771
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1196,7 +1196,7 @@ msgstr ""
"签字、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:782
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1204,568 +1204,577 @@ msgstr ""
"\n"
"支持的算法:\n"
-#: g10/gpg.c:780
+#: g10/gpg.c:785
msgid "Pubkey: "
msgstr "公钥:"
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
msgid "Cipher: "
msgstr "对称加密:"
-#: g10/gpg.c:792
+#: g10/gpg.c:797
msgid "Hash: "
msgstr "散列:"
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
msgid "Compression: "
msgstr "压缩:"
-#: g10/gpg.c:881
+#: g10/gpg.c:886
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
#, fuzzy
msgid "show all notations during signature listings"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "给定的首选公钥服务器 URL 无效\n"
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "在私钥和公钥清单间切换"
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意:一般情况下不会用到 %s!\n"
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
#, fuzzy
msgid "show all notations during signature verification"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "给定的首选公钥服务器 URL 无效\n"
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d:无效的校验选项\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时,不能同时签字和加密\n"
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签字数一定要大于 0\n"
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签字数一定要大于 1\n"
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr "标记名称必须只含有可打印的字符或空格,并以一个“=”来结尾\n"
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
msgid "a user notation name must contain the '@' character\n"
msgstr "用户标记名称一定要含有“@”字符\n"
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "用户标记名称一定要含有“@”字符\n"
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
msgid "a notation value must not use any control characters\n"
msgstr "标记值一定不能使用任何的控制字符\n"
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签字策略 URL 无效\n"
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -1773,31 +1782,32 @@ msgstr "给定的首选公钥服务器 URL 无效\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk 缓存里项目太多――已禁用\n"
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
#, c-format
msgid "Automatically retrieved `%s' via %s\n"
msgstr ""
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的私钥――忽略\n"
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
#, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s:无相应公钥的私钥――已跳过\n"
@@ -3274,12 +3284,12 @@ msgid "(sensitive)"
msgstr " (敏感的)"
#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
#, c-format
msgid "created: %s"
msgstr "创建于:%s"
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
#, c-format
msgid "revoked: %s"
msgstr "已吊销:%s"
@@ -3291,7 +3301,7 @@ msgstr "已过期:%s"
#: 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:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
#, c-format
msgid "expires: %s"
msgstr "有效至:%s"
@@ -3325,13 +3335,13 @@ msgid ""
"unless you restart the program.\n"
msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
msgid "expired"
msgstr "已过期"
@@ -4149,381 +4159,378 @@ msgstr "%s:钥匙环已建立\n"
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
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
+#: g10/keyserver.c:87
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "输入您首选的公钥服务器的 URL:"
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr "警告:公钥服务器选项‘%s’在此平台上没有被使用\n"
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
msgid "disabled"
msgstr "已禁用"
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’,从 %s 服务器 %s\n"
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s,从 %s\n"
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "搜索“%s”,在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "搜索“%s”,在 %s 上\n"
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”,在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”,在 %s 上\n"
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
msgid "no keyserver action!\n"
msgstr "公钥服务器无动作!\n"
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告:处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n"
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n"
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
#, fuzzy, c-format
msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n"
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n"
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误:%s\n"
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识:跳过\n"
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "加密过的会话密钥尺寸(%d)诡异\n"
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 加密过的会话密钥\n"
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密码由未知的散列算法 %d 生成\n"
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
#, c-format
msgid "public key is %s\n"
msgstr "公钥是 %s\n"
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
msgid "public key encrypted data: good DEK\n"
msgstr "公钥加密过的数据:完好的数据加密密钥\n"
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "由 %u 位的 %s 密钥加密,钥匙号为 %s、生成于 %s\n"
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
#, c-format
msgid " \"%s\"\n"
msgstr " “%s”\n"
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "由 %s 密钥加密、钥匙号为 %s\n"
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公钥解密失败:%s\n"
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "以 %lu 个密码加密\n"
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
msgid "encrypted with 1 passphrase\n"
msgstr "以 1 个密码加密\n"
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 为加密过的数据\n"
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 算法不可用,试以 %s 代替\n"
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
msgid "decryption okay\n"
msgstr "解密成功\n"
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
msgid "WARNING: message was not integrity protected\n"
msgstr "警告:报文未受到完整的保护\n"
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告:加密过的报文已经变造!\n"
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失败:%s\n"
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "注意:发件者要求您“只阅读不存盘”\n"
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
#, fuzzy
msgid "no signature found\n"
msgstr "完好的签字,来自于“%s”"
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
msgid "signature verification suppressed\n"
msgstr "签字验证已被抑制\n"
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些多重签字\n"
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
#, c-format
msgid "Signature made %s\n"
msgstr "签字建立于 %s\n"
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签字,使用 %s,钥匙号 %s\n"
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
msgid "Key available at: "
msgstr "可用的密钥在:"
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签字,来自于“%s”"
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签字,来自于“%s”"
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签字,来自于“%s”"
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
msgid "[uncertain]"
msgstr "[不确定]"
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签字已于 %s 过期。\n"
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签字在 %s 过期。\n"
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s 签字,散列算法 %s\n"
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
msgid "binary"
msgstr "二进制"
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
msgid "textmode"
msgstr "文本模式"
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
msgid "unknown"
msgstr "未知"
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签字:%s\n"
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
msgid "not a detached signature\n"
msgstr "不是一份分离的签字\n"
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告:检测到多重签字。只检查第一个签字。\n"
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签字\n"
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签字\n"
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
msgid "invalid root packet detected in proc_tree()\n"
msgstr "在 proc_tree() 中检测到无效的根包\n"
@@ -5060,23 +5067,23 @@ msgstr "数据未被保存;请用“--output”选项来保存它们\n"
msgid "error creating `%s': %s\n"
msgstr "建立‘%s’时发生错误:%s\n"
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
msgid "Detached signature.\n"
msgstr "分离的签字。\n"
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
msgid "Please enter name of data file: "
msgstr "请输入数据文件的名称: "
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
msgid "reading stdin ...\n"
msgstr "正在从标准输入读取 ...\n"
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
msgid "no signed data\n"
msgstr "不含签字的数据\n"
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "无法打开有签字的数据‘%s’\n"