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.po748
1 files changed, 388 insertions, 360 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bab75ee38..1a1e93068 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-03-27 13:41+0100\n"
+"POT-Creation-Date: 2008-04-24 16:10+0200\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -98,7 +98,7 @@ msgstr "错误的密码"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1057 g10/keygen.c:3155
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1058 g10/keygen.c:3155
#: g10/keygen.c:3188 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
#, c-format
@@ -107,7 +107,7 @@ msgstr "无法建立‘%s’:%s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1058 g10/import.c:193
+#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1059 g10/import.c:193
#: g10/keygen.c:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
@@ -400,7 +400,7 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:323 g10/gpg.c:964 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:323 g10/gpg.c:965 scd/scdaemon.c:247 sm/gpgsm.c:736
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
@@ -412,18 +412,18 @@ msgstr ""
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:621 g10/gpg.c:2057 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:621 g10/gpg.c:2063 scd/scdaemon.c:423 sm/gpgsm.c:972
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2061
+#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2067
#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:634 g10/gpg.c:2068 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:634 g10/gpg.c:2074 scd/scdaemon.c:436 sm/gpgsm.c:983
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
@@ -713,8 +713,8 @@ msgstr "更改密码"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1349
-#: tools/gpgconf-comp.c:1672
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1352
+#: tools/gpgconf-comp.c:1675
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
@@ -754,12 +754,12 @@ msgstr ""
msgid "error running `%s': terminated\n"
msgstr "读取‘%s’时出错:%s\n"
-#: common/http.c:1625
+#: common/http.c:1634
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "建立‘%s’时发生错误:%s\n"
-#: common/http.c:1669
+#: common/http.c:1678
#, fuzzy
msgid "host not found"
msgstr "[找不到用户标识]"
@@ -1393,18 +1393,18 @@ msgstr "无效的指令(尝试“help”)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/decrypt.c:166 g10/gpg.c:3926 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3941 g10/keyring.c:376 g10/keyring.c:663
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1719
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
#: g10/revoke.c:226
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到:%s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2385 g10/keyserver.c:1733
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2398 g10/keyserver.c:1741
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1500,7 +1500,7 @@ msgstr "警告:强行使用的 %s (%d)压缩算法不在收件者的首选项�
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:861
+#: g10/encode.c:821 g10/pkclist.c:812 g10/pkclist.c:861
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "您不该将 %s 用于 %s 模式中\n"
@@ -1654,28 +1654,37 @@ msgstr "pk 缓存里项目太多――已禁用\n"
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
-#: g10/getkey.c:951 g10/getkey.c:961 g10/getkey.c:971 g10/getkey.c:987
-#: g10/getkey.c:1002
+#: g10/getkey.c:1071
#, c-format
msgid "automatically retrieved `%s' via %s\n"
msgstr "自动获取‘%s’,通过 %s\n"
-#: g10/getkey.c:1834
+#: g10/getkey.c:1076
+#, fuzzy, c-format
+msgid "error retrieving `%s' via %s: %s\n"
+msgstr "建立‘%s’时发生错误:%s\n"
+
+#: g10/getkey.c:1078
+#, fuzzy
+msgid "No fingerprint"
+msgstr "CA 指纹:"
+
+#: g10/getkey.c:1873
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2391 g10/keyedit.c:3727
+#: g10/getkey.c:2476 g10/keyedit.c:3727
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的私钥――忽略\n"
-#: g10/getkey.c:2622
+#: g10/getkey.c:2707
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
-#: g10/getkey.c:2669
+#: g10/getkey.c:2754
#, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s:无相应公钥的私钥――已跳过\n"
@@ -1892,17 +1901,17 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/gpg.c:753 g10/gpgv.c:95
+#: g10/gpg.c:754 g10/gpgv.c:95
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"请向 <[email protected]> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: g10/gpg.c:770
+#: g10/gpg.c:771
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: g10/gpg.c:773
+#: g10/gpg.c:774
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1912,7 +1921,7 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:784 sm/gpgsm.c:587
+#: g10/gpg.c:785 sm/gpgsm.c:587
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1920,544 +1929,544 @@ msgstr ""
"\n"
"支持的算法:\n"
-#: g10/gpg.c:787
+#: g10/gpg.c:788
msgid "Pubkey: "
msgstr "公钥:"
-#: g10/gpg.c:794 g10/keyedit.c:2321
+#: g10/gpg.c:795 g10/keyedit.c:2321
msgid "Cipher: "
msgstr "对称加密:"
-#: g10/gpg.c:801
+#: g10/gpg.c:802
msgid "Hash: "
msgstr "散列:"
-#: g10/gpg.c:808 g10/keyedit.c:2366
+#: g10/gpg.c:809 g10/keyedit.c:2366
msgid "Compression: "
msgstr "压缩:"
-#: g10/gpg.c:815 sm/gpgsm.c:607
+#: g10/gpg.c:816 sm/gpgsm.c:607
msgid "Used libraries:"
msgstr ""
-#: g10/gpg.c:923
+#: g10/gpg.c:924
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1093 sm/gpgsm.c:772
+#: g10/gpg.c:1094 sm/gpgsm.c:772
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1111
+#: g10/gpg.c:1112
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1308
+#: g10/gpg.c:1309
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1311
+#: g10/gpg.c:1312
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1314
+#: g10/gpg.c:1315
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1320
+#: g10/gpg.c:1321
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1323
+#: g10/gpg.c:1324
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1326
+#: g10/gpg.c:1327
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1332
+#: g10/gpg.c:1333
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1335
+#: g10/gpg.c:1336
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1338
+#: g10/gpg.c:1339
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1344
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1347
+#: g10/gpg.c:1348
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1350
+#: g10/gpg.c:1351
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1529
+#: g10/gpg.c:1530
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1624
+#: g10/gpg.c:1630
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
-#: g10/gpg.c:1626
+#: g10/gpg.c:1632
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
-#: g10/gpg.c:1628
+#: g10/gpg.c:1634
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1630
+#: g10/gpg.c:1636
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1634
+#: g10/gpg.c:1640
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
-#: g10/gpg.c:1636
+#: g10/gpg.c:1642
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
-#: g10/gpg.c:1638
+#: g10/gpg.c:1644
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
-#: g10/gpg.c:1640
+#: g10/gpg.c:1646
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
-#: g10/gpg.c:1642
+#: g10/gpg.c:1648
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:1644
+#: g10/gpg.c:1650
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
-#: g10/gpg.c:1646
+#: g10/gpg.c:1652
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
-#: g10/gpg.c:1805
+#: g10/gpg.c:1811
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1896
+#: g10/gpg.c:1902
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2275 g10/gpg.c:2950 g10/gpg.c:2962
+#: g10/gpg.c:2281 g10/gpg.c:2965 g10/gpg.c:2977
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意:一般情况下不会用到 %s!\n"
-#: g10/gpg.c:2456 g10/gpg.c:2468
+#: g10/gpg.c:2462 g10/gpg.c:2474
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
-#: g10/gpg.c:2550
+#: g10/gpg.c:2556
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2573 g10/gpg.c:2768 g10/keyedit.c:4085
+#: g10/gpg.c:2579 g10/gpg.c:2774 g10/keyedit.c:4085
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2585
+#: g10/gpg.c:2591
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
-#: g10/gpg.c:2588
+#: g10/gpg.c:2594
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2595
+#: g10/gpg.c:2601
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
-#: g10/gpg.c:2598
+#: g10/gpg.c:2604
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2605
+#: g10/gpg.c:2611
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
-#: g10/gpg.c:2608
+#: g10/gpg.c:2614
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2615
+#: g10/gpg.c:2621
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
-#: g10/gpg.c:2618
+#: g10/gpg.c:2624
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
-#: g10/gpg.c:2628
+#: g10/gpg.c:2634
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
-#: g10/gpg.c:2630
+#: g10/gpg.c:2636
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
-#: g10/gpg.c:2632
+#: g10/gpg.c:2638
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
-#: g10/gpg.c:2638
+#: g10/gpg.c:2644
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
-#: g10/gpg.c:2640
+#: g10/gpg.c:2646
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
-#: g10/gpg.c:2642
+#: g10/gpg.c:2648
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2644
+#: g10/gpg.c:2650
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
-#: g10/gpg.c:2648
+#: g10/gpg.c:2654
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
-#: g10/gpg.c:2655
+#: g10/gpg.c:2661
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2671
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2840
+#: g10/gpg.c:2846
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d:无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2843
+#: g10/gpg.c:2849
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2939 sm/gpgsm.c:1374
+#: g10/gpg.c:2954 sm/gpgsm.c:1374
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
-#: g10/gpg.c:2943
+#: g10/gpg.c:2958
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
-#: g10/gpg.c:2952
+#: g10/gpg.c:2967
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:2955
+#: g10/gpg.c:2970
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
-#: g10/gpg.c:2970
+#: g10/gpg.c:2985
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
-#: g10/gpg.c:2984
+#: g10/gpg.c:2999
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
-#: g10/gpg.c:2990
+#: g10/gpg.c:3005
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时,不能同时签名和加密\n"
-#: g10/gpg.c:2996
+#: g10/gpg.c:3011
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
-#: g10/gpg.c:3009
+#: g10/gpg.c:3024
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:3075 g10/gpg.c:3099 sm/gpgsm.c:1446
+#: g10/gpg.c:3090 g10/gpg.c:3114 sm/gpgsm.c:1446
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:3081 g10/gpg.c:3105 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3096 g10/gpg.c:3120 sm/gpgsm.c:1454 sm/gpgsm.c:1460
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:3087
+#: g10/gpg.c:3102
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:3093
+#: g10/gpg.c:3108
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:3108
+#: g10/gpg.c:3123
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
-#: g10/gpg.c:3110
+#: g10/gpg.c:3125
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
-#: g10/gpg.c:3112
+#: g10/gpg.c:3127
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:3114
+#: g10/gpg.c:3129
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
-#: g10/gpg.c:3116
+#: g10/gpg.c:3131
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
-#: g10/gpg.c:3119
+#: g10/gpg.c:3134
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:3123
+#: g10/gpg.c:3138
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
-#: g10/gpg.c:3130
+#: g10/gpg.c:3145
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:3139
+#: g10/gpg.c:3154
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:3143
+#: g10/gpg.c:3158
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3162
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:3180
+#: g10/gpg.c:3195
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3227
+#: g10/gpg.c:3242
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3232
+#: g10/gpg.c:3247
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3237
+#: g10/gpg.c:3252
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3329
+#: g10/gpg.c:3344
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/gpg.c:3340
+#: g10/gpg.c:3355
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3361
+#: g10/gpg.c:3376
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3368
+#: g10/gpg.c:3383
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3370
+#: g10/gpg.c:3385
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3395
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3393
+#: g10/gpg.c:3408
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3395
+#: g10/gpg.c:3410
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3398
+#: g10/gpg.c:3413
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3416
+#: g10/gpg.c:3431
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3429
+#: g10/gpg.c:3444
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3444
+#: g10/gpg.c:3459
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3446
+#: g10/gpg.c:3461
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3449
+#: g10/gpg.c:3464
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3469
+#: g10/gpg.c:3484
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3478
+#: g10/gpg.c:3493
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3503
+#: g10/gpg.c:3518
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3511
+#: g10/gpg.c:3526
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3515
+#: g10/gpg.c:3530
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3536
+#: g10/gpg.c:3551
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3621
+#: g10/gpg.c:3636
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/gpg.c:3623
+#: g10/gpg.c:3638
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/gpg.c:3625
+#: g10/gpg.c:3640
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/gpg.c:3636
+#: g10/gpg.c:3651
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/gpg.c:3646
+#: g10/gpg.c:3661
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/gpg.c:3697
+#: g10/gpg.c:3712
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3705
+#: g10/gpg.c:3720
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3795
+#: g10/gpg.c:3810
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3912
+#: g10/gpg.c:3927
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3916
+#: g10/gpg.c:3931
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4228
+#: g10/gpg.c:4243
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4230
+#: g10/gpg.c:4245
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
-#: g10/gpg.c:4263
+#: g10/gpg.c:4278
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -2642,231 +2651,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:1124
+#: g10/import.c:729 g10/import.c:1137
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s:没有用户标识\n"
-#: g10/import.c:755
+#: g10/import.c:758
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s:PKS 子钥破损已修复\n"
-#: g10/import.c:770
+#: g10/import.c:773
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s:已接受不含自身签名的用户标识“%s”\n"
-#: g10/import.c:776
+#: g10/import.c:779
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s:没有有效的用户标识\n"
-#: g10/import.c:778
+#: g10/import.c:781
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签名所致\n"
-#: g10/import.c:788 g10/import.c:1246
+#: g10/import.c:791 g10/import.c:1259
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s:找不到公钥:%s\n"
-#: g10/import.c:794
+#: g10/import.c:797
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s:新密钥――已跳过\n"
-#: g10/import.c:803
+#: g10/import.c:806
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环:%s\n"
-#: g10/import.c:808 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
#, c-format
msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
-#: g10/import.c:812 g10/import.c:907 g10/import.c:1164 g10/import.c:1307
-#: g10/import.c:2399 g10/import.c:2421
+#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1320
+#: g10/import.c:2412 g10/import.c:2434
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "写入钥匙环‘%s’时出错: %s\n"
-#: g10/import.c:831
+#: g10/import.c:834
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s:公钥“%s”已导入\n"
-#: g10/import.c:855
+#: g10/import.c:858
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s:与我们的副本不吻合\n"
-#: g10/import.c:872 g10/import.c:1264
+#: g10/import.c:875 g10/import.c:1277
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s:无法定位原始的密钥区块:%s\n"
-#: g10/import.c:880 g10/import.c:1271
+#: g10/import.c:883 g10/import.c:1284
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s:无法读取原始的密钥区块: %s\n"
-#: g10/import.c:917
+#: g10/import.c:920
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s:“%s”一个新的用户标识\n"
-#: g10/import.c:920
+#: g10/import.c:923
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s:“%s”%d 个新的用户标识\n"
-#: g10/import.c:923
+#: g10/import.c:926
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s:“%s”1 个新的签名\n"
-#: g10/import.c:926
+#: g10/import.c:929
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s:“%s”%d 个新的签名\n"
-#: g10/import.c:929
+#: g10/import.c:932
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s:“%s”1 个新的子钥\n"
-#: g10/import.c:932
+#: g10/import.c:935
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s:“%s”%d 个新的子钥\n"
-#: g10/import.c:935
+#: g10/import.c:938
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
-#: g10/import.c:938
+#: g10/import.c:941
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
-#: g10/import.c:941
+#: g10/import.c:944
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
-#: g10/import.c:944
+#: g10/import.c:947
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
-#: g10/import.c:967
+#: g10/import.c:971
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s:“%s”未改变\n"
-#: g10/import.c:1130
+#: g10/import.c:1143
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s:私钥使用了无效的加密算法 %d――已跳过\n"
-#: g10/import.c:1141
+#: g10/import.c:1154
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
-#: g10/import.c:1158 g10/import.c:2414
+#: g10/import.c:1171 g10/import.c:2427
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "没有默认的私钥钥匙环: %s\n"
-#: g10/import.c:1169
+#: g10/import.c:1182
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s:私钥已导入\n"
-#: g10/import.c:1199
+#: g10/import.c:1212
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "密钥 %s:已在私钥钥匙环中\n"
-#: g10/import.c:1209
+#: g10/import.c:1222
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "密钥 %s:找不到私钥:%s\n"
-#: g10/import.c:1239
+#: g10/import.c:1252
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s:没有公钥――无法应用吊销证书\n"
-#: g10/import.c:1282
+#: g10/import.c:1295
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s:无效的吊销证书:%s――已拒绝\n"
-#: g10/import.c:1314
+#: g10/import.c:1327
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s:“%s”吊销证书已被导入\n"
-#: g10/import.c:1380
+#: g10/import.c:1393
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s:签名没有用户标识\n"
-#: g10/import.c:1395
+#: g10/import.c:1408
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”使用了不支持的公钥算法\n"
-#: g10/import.c:1397
+#: g10/import.c:1410
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”自身签名无效\n"
-#: g10/import.c:1415
+#: g10/import.c:1428
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s:没有可供绑定的子钥\n"
-#: g10/import.c:1426 g10/import.c:1476
+#: g10/import.c:1439 g10/import.c:1489
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s:不支持的公钥算法\n"
-#: g10/import.c:1428
+#: g10/import.c:1441
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s:无效的子钥绑定\n"
-#: g10/import.c:1443
+#: g10/import.c:1456
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s:已删除多重子钥绑定\n"
-#: g10/import.c:1465
+#: g10/import.c:1478
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s:没有用于密钥吊销的子钥\n"
-#: g10/import.c:1478
+#: g10/import.c:1491
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s:无效的子钥吊销\n"
-#: g10/import.c:1493
+#: g10/import.c:1506
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s:已删除多重子钥吊销\n"
-#: g10/import.c:1535
+#: g10/import.c:1548
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s:已跳过用户标识“%s”\n"
-#: g10/import.c:1556
+#: g10/import.c:1569
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s:已跳过子钥\n"
@@ -2875,65 +2884,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:1583
+#: g10/import.c:1596
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s:不可导出的签名(验证级别 0x%02X)――已跳过\n"
-#: g10/import.c:1593
+#: g10/import.c:1606
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s:吊销证书位置错误――已跳过\n"
-#: g10/import.c:1610
+#: g10/import.c:1623
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s:无效的吊销证书:%s――已跳过\n"
-#: g10/import.c:1624
+#: g10/import.c:1637
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s:子钥签名位置错误――已跳过\n"
-#: g10/import.c:1632
+#: g10/import.c:1645
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s:与预期不符的签名验证级别(0x%02X)――已跳过\n"
-#: g10/import.c:1761
+#: g10/import.c:1774
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s:检测到重复的用户标识――已合并\n"
-#: g10/import.c:1823
+#: g10/import.c:1836
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告:密钥 %s 可能已被吊销:正在取回吊销密钥 %s\n"
-#: g10/import.c:1837
+#: g10/import.c:1850
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告:密钥 %s 可能已被吊销:吊销密钥 %s 不存在。\n"
-#: g10/import.c:1896
+#: g10/import.c:1909
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s:已新增吊销证书“%s”\n"
-#: g10/import.c:1930
+#: g10/import.c:1943
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s:已新增直接密钥签名\n"
-#: g10/import.c:2319
+#: g10/import.c:2332
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "注意:密钥的序列号与卡的不符\n"
-#: g10/import.c:2327
+#: g10/import.c:2340
msgid "NOTE: primary key is online and stored on card\n"
msgstr "注意:主钥在线,存储在卡上\n"
-#: g10/import.c:2329
+#: g10/import.c:2342
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "注意:子钥在线,存储在卡上\n"
@@ -3632,7 +3641,7 @@ msgid "(sensitive)"
msgstr " (敏感的)"
#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
-#: g10/keylist.c:192 g10/keyserver.c:521
+#: g10/keylist.c:192 g10/keyserver.c:529
#, c-format
msgid "created: %s"
msgstr "创建于:%s"
@@ -3649,7 +3658,7 @@ msgstr "已过期:%s"
#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:527 g10/mainproc.c:995
+#: g10/keylist.c:896 g10/keyserver.c:535 g10/mainproc.c:995
#, c-format
msgid "expires: %s"
msgstr "有效至:%s"
@@ -3683,12 +3692,12 @@ msgid ""
"unless you restart the program.\n"
msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:531
+#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:535
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
msgid "expired"
msgstr "已过期"
@@ -4581,143 +4590,143 @@ msgstr "获取密钥时使用密钥上的 PKA 记录"
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr "警告:公钥服务器选项‘%s’在此平台上没有被使用\n"
-#: g10/keyserver.c:533
+#: g10/keyserver.c:541
msgid "disabled"
msgstr "已禁用"
-#: g10/keyserver.c:734
+#: g10/keyserver.c:742
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
-#: g10/keyserver.c:818 g10/keyserver.c:1440
+#: g10/keyserver.c:826 g10/keyserver.c:1448
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
-#: g10/keyserver.c:916
+#: g10/keyserver.c:924
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
-#: g10/keyserver.c:918
+#: g10/keyserver.c:926
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
-#: g10/keyserver.c:1159
+#: g10/keyserver.c:1167
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’,从 %s 服务器 %s\n"
-#: g10/keyserver.c:1163
+#: g10/keyserver.c:1171
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s,从 %s\n"
-#: g10/keyserver.c:1187
+#: g10/keyserver.c:1195
#, c-format
msgid "searching for names from %s server %s\n"
msgstr "在 %s 服务器 %s 上搜索名字\n"
-#: g10/keyserver.c:1190
+#: g10/keyserver.c:1198
#, c-format
msgid "searching for names from %s\n"
msgstr "在 %s 上搜索名字\n"
-#: g10/keyserver.c:1343
+#: g10/keyserver.c:1351
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
-#: g10/keyserver.c:1347
+#: g10/keyserver.c:1355
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1390
+#: g10/keyserver.c:1398
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”,在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1393
+#: g10/keyserver.c:1401
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”,在 %s 上\n"
-#: g10/keyserver.c:1400 g10/keyserver.c:1496
+#: g10/keyserver.c:1408 g10/keyserver.c:1504
msgid "no keyserver action!\n"
msgstr "公钥服务器无动作!\n"
-#: g10/keyserver.c:1448
+#: g10/keyserver.c:1456
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告:处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1457
+#: g10/keyserver.c:1465
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1519 g10/keyserver.c:2047
+#: g10/keyserver.c:1527 g10/keyserver.c:2062
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1525
+#: g10/keyserver.c:1533
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n"
-#: g10/keyserver.c:1537
+#: g10/keyserver.c:1545
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1550
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
-#: g10/keyserver.c:1550
+#: g10/keyserver.c:1558
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s 不支持对版本 %d 的处理\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1565
msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n"
-#: g10/keyserver.c:1562
+#: g10/keyserver.c:1570
msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n"
-#: g10/keyserver.c:1571
+#: g10/keyserver.c:1579
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误:%s\n"
-#: g10/keyserver.c:1596 g10/keyserver.c:1630
+#: g10/keyserver.c:1604 g10/keyserver.c:1638
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识:跳过\n"
-#: g10/keyserver.c:1889
+#: g10/keyserver.c:1897
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/keyserver.c:1911
+#: g10/keyserver.c:1919
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1913
+#: g10/keyserver.c:1921
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1977
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告:无法获取 URI %s:%s\n"
-#: g10/keyserver.c:1975
+#: g10/keyserver.c:1983
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "不能解析 URI %s\n"
@@ -4963,65 +4972,65 @@ msgstr "警告:使用试验性质的散列算法 %s\n"
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "警告:不建议使用散列算法 %s\n"
-#: g10/misc.c:479
+#: g10/misc.c:504
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA 算法插件不存在\n"
-#: g10/misc.c:480 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
#, c-format
msgid "please see %s for more information\n"
msgstr "请参见 %s 以得到更多信息。\n"
-#: g10/misc.c:715
+#: g10/misc.c:740
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d:不建议使用该选项“%s”\n"
-#: g10/misc.c:719
+#: g10/misc.c:744
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告:“%s”选项已不建议使用\n"
-#: g10/misc.c:721
+#: g10/misc.c:746
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "请以“%s%s”代替\n"
-#: g10/misc.c:728
+#: g10/misc.c:753
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告:“%s”命令已不建议使用——不要使用它\n"
-#: g10/misc.c:738
+#: g10/misc.c:763
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
-#: g10/misc.c:741
+#: g10/misc.c:766
#, fuzzy, c-format
msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgstr "警告:“%s”选项已不建议使用\n"
-#: g10/misc.c:802
+#: g10/misc.c:827
msgid "Uncompressed"
msgstr "不压缩"
#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:827
+#: g10/misc.c:852
msgid "uncompressed|none"
msgstr "未压缩|无"
-#: g10/misc.c:954
+#: g10/misc.c:979
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s 也许不能使用这个报文\n"
-#: g10/misc.c:1129
+#: g10/misc.c:1154
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "有歧义的选项‘%s’\n"
-#: g10/misc.c:1154
+#: g10/misc.c:1179
#, c-format
msgid "unknown option `%s'\n"
msgstr "未知的选项 '%s'\n"
@@ -6285,12 +6294,12 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:326 scd/app-openpgp.c:1328 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1347 scd/app-dinsig.c:297
msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
-#: scd/app-nks.c:330 scd/app-openpgp.c:1332 scd/app-openpgp.c:1364
-#: scd/app-openpgp.c:1511 scd/app-openpgp.c:1529 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1351 scd/app-openpgp.c:1383
+#: scd/app-openpgp.c:1530 scd/app-openpgp.c:1548 scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN 回调返回错误:%s\n"
@@ -6314,64 +6323,74 @@ msgstr "无法存储创建日期:%s\n"
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2095
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2103
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2113
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
+#: scd/app-openpgp.c:1307
+#, c-format
+msgid "using default PIN as %s\n"
+msgstr ""
+
#: scd/app-openpgp.c:1314
+#, c-format
+msgid "failed to use default PIN as %s: %s - disabling further default use\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1333
#, fuzzy, c-format
msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1348
+#: scd/app-openpgp.c:1367
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1371 scd/app-openpgp.c:1536
+#: scd/app-openpgp.c:1390 scd/app-openpgp.c:1555
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
-#: scd/app-openpgp.c:1384 scd/app-openpgp.c:1424 scd/app-openpgp.c:1548
-#: scd/app-openpgp.c:2366
+#: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
+#: scd/app-openpgp.c:2385
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败:%s\n"
-#: scd/app-openpgp.c:1447
+#: scd/app-openpgp.c:1466
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:1468 scd/app-openpgp.c:2617
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1474 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定!\n"
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1500
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
-#: scd/app-openpgp.c:1491
+#: scd/app-openpgp.c:1510
#, fuzzy, c-format
msgid ""
"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
"%d]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1506
+#: scd/app-openpgp.c:1525
#, fuzzy
msgid "|A|Please enter the Admin PIN at the reader's keypad"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
@@ -6379,107 +6398,107 @@ msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
#. TRANSLATORS: Do not translate the "|A|" prefix but keep
#. it at the start of the string. We need this elsewhere to
#. get some infos on the string.
-#: scd/app-openpgp.c:1526
+#: scd/app-openpgp.c:1545
msgid "|A|Admin PIN"
msgstr "|A|管理员 PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1677
+#: scd/app-openpgp.c:1696
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:1677
+#: scd/app-openpgp.c:1696
msgid "|N|New PIN"
msgstr "新的 PIN"
-#: scd/app-openpgp.c:1681
+#: scd/app-openpgp.c:1700
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: scd/app-openpgp.c:1731 scd/app-openpgp.c:2181
+#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:1737 scd/app-openpgp.c:2188
+#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:1747
+#: scd/app-openpgp.c:1766
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:1751
+#: scd/app-openpgp.c:1770
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:1753
+#: scd/app-openpgp.c:1772
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:1920
+#: scd/app-openpgp.c:1939
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:1927
+#: scd/app-openpgp.c:1946
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:1934
+#: scd/app-openpgp.c:1953
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-openpgp.c:1942 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2012
+#: scd/app-openpgp.c:2031
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥:%s\n"
-#: scd/app-openpgp.c:2072
+#: scd/app-openpgp.c:2091
msgid "please wait while key is being generated ...\n"
msgstr "请稍候,正在生成密钥……\n"
-#: scd/app-openpgp.c:2086
+#: scd/app-openpgp.c:2105
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:2089
+#: scd/app-openpgp.c:2108
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:2146
+#: scd/app-openpgp.c:2165
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2196
+#: scd/app-openpgp.c:2215
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2284
+#: scd/app-openpgp.c:2303
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:2345
+#: scd/app-openpgp.c:2364
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名:%lu\n"
-#: scd/app-openpgp.c:2631
+#: scd/app-openpgp.c:2650
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:2704 scd/app-openpgp.c:2714
+#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@ -6577,11 +6596,11 @@ msgstr ""
msgid "validation model requested by certificate: %s"
msgstr ""
-#: sm/certchain.c:197 sm/certchain.c:1803
+#: sm/certchain.c:197 sm/certchain.c:1805
msgid "chain"
msgstr ""
-#: sm/certchain.c:198 sm/certchain.c:1803
+#: sm/certchain.c:198 sm/certchain.c:1805
msgid "shell"
msgstr ""
@@ -6635,196 +6654,196 @@ msgstr "生成密码的时候发生错误:%s\n"
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: sm/certchain.c:740 sm/certchain.c:1227 sm/certchain.c:1831 sm/decrypt.c:259
+#: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "无法存储密钥:%s\n"
-#: sm/certchain.c:900
+#: sm/certchain.c:902
#, fuzzy
msgid "certificate has been revoked"
msgstr "注意:密钥已被吊销"
-#: sm/certchain.c:910
+#: sm/certchain.c:912
#, fuzzy
msgid "no CRL found for certificate"
msgstr "证书已损坏"
-#: sm/certchain.c:915
+#: sm/certchain.c:917
msgid "the status of the certificate is unknown"
msgstr ""
-#: sm/certchain.c:920
+#: sm/certchain.c:922
#, fuzzy
msgid "the available CRL is too old"
msgstr "可用的密钥在:"
-#: sm/certchain.c:922
+#: sm/certchain.c:924
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:928
+#: sm/certchain.c:930
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:957 sm/certchain.c:1025
+#: sm/certchain.c:959 sm/certchain.c:1027
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:972 sm/certchain.c:1057
+#: sm/certchain.c:974 sm/certchain.c:1059
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:973 sm/certchain.c:1058
+#: sm/certchain.c:975 sm/certchain.c:1060
#, fuzzy
msgid "root certificate not yet valid"
msgstr "不允许导出私钥\n"
-#: sm/certchain.c:974 sm/certchain.c:1059
+#: sm/certchain.c:976 sm/certchain.c:1061
msgid "intermediate certificate not yet valid"
msgstr ""
-#: sm/certchain.c:987
+#: sm/certchain.c:989
#, fuzzy
msgid "certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:988
+#: sm/certchain.c:990
#, fuzzy
msgid "root certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:989
+#: sm/certchain.c:991
#, fuzzy
msgid "intermediate certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:1031
+#: sm/certchain.c:1033
#, c-format
msgid "required certificate attributes missing: %s%s%s"
msgstr ""
-#: sm/certchain.c:1040
+#: sm/certchain.c:1042
#, fuzzy
msgid "certificate with invalid validity"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:1077
+#: sm/certchain.c:1079
msgid "signature not created during lifetime of certificate"
msgstr ""
-#: sm/certchain.c:1079
+#: sm/certchain.c:1081
msgid "certificate not created during lifetime of issuer"
msgstr ""
-#: sm/certchain.c:1080
+#: sm/certchain.c:1082
msgid "intermediate certificate not created during lifetime of issuer"
msgstr ""
-#: sm/certchain.c:1084
+#: sm/certchain.c:1086
#, fuzzy
msgid " ( signature created at "
msgstr " 清除的签名:%lu\n"
-#: sm/certchain.c:1085
+#: sm/certchain.c:1087
#, fuzzy
msgid " (certificate created at "
msgstr "已建立吊销证书。\n"
-#: sm/certchain.c:1088
+#: sm/certchain.c:1090
#, fuzzy
msgid " (certificate valid from "
msgstr "证书已损坏"
-#: sm/certchain.c:1089
+#: sm/certchain.c:1091
#, fuzzy
msgid " ( issuer valid from "
msgstr "卡序列号 ="
-#: sm/certchain.c:1119
+#: sm/certchain.c:1121
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA 指纹:"
-#: sm/certchain.c:1128
+#: sm/certchain.c:1130
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:1141
+#: sm/certchain.c:1143
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:1147
+#: sm/certchain.c:1149
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:1204
+#: sm/certchain.c:1206
msgid "WARNING: creation time of signature not known - assuming current time"
msgstr ""
-#: sm/certchain.c:1268
+#: sm/certchain.c:1270
#, fuzzy
msgid "no issuer found in certificate"
msgstr "生成一份吊销证书"
-#: sm/certchain.c:1341
+#: sm/certchain.c:1343
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:1410
+#: sm/certchain.c:1412
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:1423
+#: sm/certchain.c:1425
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:1452 sm/import.c:158
+#: sm/certchain.c:1454 sm/import.c:158
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1464
+#: sm/certchain.c:1466
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1497
+#: sm/certchain.c:1499
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "验证签名"
-#: sm/certchain.c:1528
+#: sm/certchain.c:1530
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1579
+#: sm/certchain.c:1581
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certchain.c:1619 sm/certchain.c:1902
+#: sm/certchain.c:1621 sm/certchain.c:1904
#, fuzzy
msgid "certificate is good\n"
msgstr "首选项‘%s’重复\n"
-#: sm/certchain.c:1620
+#: sm/certchain.c:1622
#, fuzzy
msgid "intermediate certificate is good\n"
msgstr "已建立吊销证书。\n"
-#: sm/certchain.c:1621
+#: sm/certchain.c:1623
#, fuzzy
msgid "root certificate is good\n"
msgstr "证书已损坏"
-#: sm/certchain.c:1792
+#: sm/certchain.c:1794
msgid "switching to chain model"
msgstr ""
-#: sm/certchain.c:1801
+#: sm/certchain.c:1803
#, c-format
msgid "validation model used: %s"
msgstr ""
@@ -7257,7 +7276,7 @@ msgstr "从这个钥匙环里取用密钥"
msgid "add this secret keyring to the list"
msgstr "要有私钥才能这么做。\n"
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:715
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
msgid "|NAME|use NAME as default secret key"
msgstr ""
@@ -7445,7 +7464,7 @@ msgid ""
"%s%sAre you really sure that you want to do this?"
msgstr ""
-#: sm/qualified.c:209 sm/verify.c:604
+#: sm/qualified.c:209 sm/verify.c:612
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@ -7478,17 +7497,22 @@ msgstr ""
msgid " using certificate ID 0x%08lX\n"
msgstr "取得当前密钥信息时出错:%s\n"
-#: sm/verify.c:582
+#: sm/verify.c:470
+msgid ""
+"invalid signature: message digest attribute does not match computed one\n"
+msgstr ""
+
+#: sm/verify.c:590
#, fuzzy
msgid "Good signature from"
msgstr "完好的签名,来自于“%s”"
-#: sm/verify.c:583
+#: sm/verify.c:591
#, fuzzy
msgid " aka"
msgstr " 亦即“%s”"
-#: sm/verify.c:601
+#: sm/verify.c:609
#, fuzzy
msgid "This is a qualified signature\n"
msgstr "这将是一个自身签名。\n"
@@ -7583,26 +7607,26 @@ msgid "error sending standard options: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:700 tools/gpgconf-comp.c:784
+#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
msgid "Options controlling the diagnostic output"
msgstr ""
#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:713 tools/gpgconf-comp.c:807
+#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
msgid "Options controlling the configuration"
msgstr ""
#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:735 tools/gpgconf-comp.c:814
+#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
msgid "Options useful for debugging"
msgstr ""
#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:740 tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:748
+#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
msgid "Options controlling the security"
msgstr ""
@@ -7648,7 +7672,7 @@ msgstr "从导出的子钥中删除所有密码"
msgid "do not allow the reuse of old passphrases"
msgstr "生成密码的时候发生错误:%s\n"
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:718
+#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|某甲|为收件者“某甲”加密"
@@ -7666,47 +7690,51 @@ msgstr "无法解析公钥服务器 URL\n"
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:727
-msgid "disable all access to the dirmngr"
+#: tools/gpgconf-comp.c:685
+msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
#: tools/gpgconf-comp.c:730
+msgid "disable all access to the dirmngr"
+msgstr ""
+
+#: tools/gpgconf-comp.c:733
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:753
+#: tools/gpgconf-comp.c:756
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:797
+#: tools/gpgconf-comp.c:800
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:833
+#: tools/gpgconf-comp.c:836
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:843
+#: tools/gpgconf-comp.c:846
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:854
+#: tools/gpgconf-comp.c:857
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:859
+#: tools/gpgconf-comp.c:862
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:888
+#: tools/gpgconf-comp.c:891
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:896
+#: tools/gpgconf-comp.c:899
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3057
+#: tools/gpgconf-comp.c:3060
msgid "Note that group specifications are ignored\n"
msgstr ""