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.po371
1 files changed, 192 insertions, 179 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0217965ed..7224d3605 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: 2006-10-10 17:29+0200\n"
+"POT-Creation-Date: 2006-10-17 14:51+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"
@@ -89,8 +89,8 @@ msgstr "无法建立‘%s’:%s\n"
#: g10/keyring.c:1534 g10/openfile.c:188 g10/openfile.c:343
#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1755
-#: sm/gpgsm.c:1792 sm/qualified.c:74
+#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1748
+#: sm/gpgsm.c:1785 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’: %s\n"
@@ -203,13 +203,13 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:113 g10/gpg.c:462 g10/gpgv.c:71 kbx/kbxutil.c:82
-#: scd/scdaemon.c:107 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
+#: scd/scdaemon.c:107 sm/gpgsm.c:333 tools/gpg-connect-agent.c:59
#: tools/gpgconf.c:63 tools/symcryptrun.c:182
msgid "verbose"
msgstr "详细模式"
#: agent/gpg-agent.c:114 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:108
-#: sm/gpgsm.c:336
+#: sm/gpgsm.c:334
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
@@ -234,7 +234,7 @@ msgstr ""
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:338
+#: agent/gpg-agent.c:124 scd/scdaemon.c:120 sm/gpgsm.c:336
#: tools/symcryptrun.c:184
#, fuzzy
msgid "use a log file for the server"
@@ -292,7 +292,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
#: tools/gpgconf.c:86 tools/symcryptrun.c:222
#, fuzzy
msgid "Please report bugs to <"
@@ -301,7 +301,7 @@ msgstr ""
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
#: agent/gpg-agent.c:236 agent/preset-passphrase.c:96 agent/protect-tool.c:143
-#: scd/scdaemon.c:188 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
+#: scd/scdaemon.c:188 sm/gpgsm.c:515 tools/gpg-connect-agent.c:123
#: tools/gpgconf.c:86 tools/symcryptrun.c:222
msgid ">.\n"
msgstr ""
@@ -327,30 +327,30 @@ msgstr ""
msgid "out of core while allocating %lu bytes"
msgstr ""
-#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:646
+#: agent/gpg-agent.c:334 g10/gpg.c:919 scd/scdaemon.c:262 sm/gpgsm.c:644
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:505 agent/protect-tool.c:1073 g10/gpg.c:1779
-#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:767
+#: kbx/kbxutil.c:432 scd/scdaemon.c:354 sm/gpgsm.c:765
#: tools/symcryptrun.c:1053
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:869
+#: agent/gpg-agent.c:599 g10/gpg.c:1978 scd/scdaemon.c:431 sm/gpgsm.c:862
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
#: agent/gpg-agent.c:604 agent/gpg-agent.c:1115 g10/gpg.c:1982
-#: scd/scdaemon.c:436 sm/gpgsm.c:873 tools/symcryptrun.c:986
+#: scd/scdaemon.c:436 sm/gpgsm.c:866 tools/symcryptrun.c:986
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:880
+#: agent/gpg-agent.c:612 g10/gpg.c:1989 scd/scdaemon.c:444 sm/gpgsm.c:873
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
@@ -583,58 +583,58 @@ msgstr ""
#. plain % sign, you need to encode it as "%%25". The
#. "%s" gets replaced by the name as store in the
#. certificate.
-#: agent/trustlist.c:494
+#: agent/trustlist.c:500
#, c-format
msgid ""
"Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user "
"certificates?"
msgstr ""
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
#, fuzzy
msgid "Yes"
msgstr "yes"
-#: agent/trustlist.c:500
+#: agent/trustlist.c:506
msgid "No"
msgstr ""
-#: common/exechelp.c:279 common/exechelp.c:370
+#: common/exechelp.c:285 common/exechelp.c:376
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
-#: common/exechelp.c:346 common/exechelp.c:403
+#: common/exechelp.c:352 common/exechelp.c:409
#, fuzzy, c-format
msgid "can't fdopen pipe for reading: %s\n"
msgstr "无法打开有签名的数据‘%s’\n"
-#: common/exechelp.c:382 common/exechelp.c:540
+#: common/exechelp.c:388 common/exechelp.c:546
#, fuzzy, c-format
msgid "error forking process: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: common/exechelp.c:438 common/exechelp.c:481
+#: common/exechelp.c:444 common/exechelp.c:487
#, c-format
msgid "waiting for process %d to terminate failed: %s\n"
msgstr ""
-#: common/exechelp.c:446
+#: common/exechelp.c:452
#, fuzzy, c-format
msgid "error getting exit code of process %d: %s\n"
msgstr "取得当前密钥信息时出错:%s\n"
-#: common/exechelp.c:452 common/exechelp.c:492
+#: common/exechelp.c:458 common/exechelp.c:498
#, fuzzy, c-format
msgid "error running `%s': exit status %d\n"
msgstr "读取‘%s’时出错:%s\n"
-#: common/exechelp.c:487
+#: common/exechelp.c:493
#, c-format
msgid "error running `%s': probably not installed\n"
msgstr ""
-#: common/exechelp.c:498
+#: common/exechelp.c:504
#, fuzzy, c-format
msgid "error running `%s': terminated\n"
msgstr "读取‘%s’时出错:%s\n"
@@ -1419,7 +1419,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s:无相应公钥的私钥――已跳过\n"
-#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:242 tools/gpgconf.c:54
+#: g10/gpg.c:363 kbx/kbxutil.c:69 sm/gpgsm.c:240 tools/gpgconf.c:54
msgid ""
"@Commands:\n"
" "
@@ -1435,27 +1435,27 @@ msgstr "|[文件名]|生成一份签名"
msgid "|[file]|make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
-#: g10/gpg.c:367 sm/gpgsm.c:246
+#: g10/gpg.c:367 sm/gpgsm.c:244
msgid "make a detached signature"
msgstr "生成一份分离的签名"
-#: g10/gpg.c:368 sm/gpgsm.c:247
+#: g10/gpg.c:368 sm/gpgsm.c:245
msgid "encrypt data"
msgstr "加密数据"
-#: g10/gpg.c:370 sm/gpgsm.c:248
+#: g10/gpg.c:370 sm/gpgsm.c:246
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:372 sm/gpgsm.c:249
+#: g10/gpg.c:372 sm/gpgsm.c:247
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/gpg.c:374 sm/gpgsm.c:250
+#: g10/gpg.c:374 sm/gpgsm.c:248
msgid "verify a signature"
msgstr "验证签名"
-#: g10/gpg.c:376 sm/gpgsm.c:252
+#: g10/gpg.c:376 sm/gpgsm.c:250
msgid "list keys"
msgstr "列出密钥"
@@ -1467,15 +1467,15 @@ msgstr "列出密钥和签名"
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
-#: g10/gpg.c:380 sm/gpgsm.c:256
+#: g10/gpg.c:380 sm/gpgsm.c:254
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:381 sm/gpgsm.c:254
+#: g10/gpg.c:381 sm/gpgsm.c:252
msgid "list secret keys"
msgstr "列出私钥"
-#: g10/gpg.c:382 sm/gpgsm.c:257
+#: g10/gpg.c:382 sm/gpgsm.c:255
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
@@ -1507,11 +1507,11 @@ msgstr "生成一份吊销证书"
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:392 sm/gpgsm.c:259
+#: g10/gpg.c:392 sm/gpgsm.c:257
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:393 sm/gpgsm.c:260
+#: g10/gpg.c:393 sm/gpgsm.c:258
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
@@ -1547,7 +1547,7 @@ msgstr "更新信任度数据库"
msgid "|algo [files]|print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:425 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:276
#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:175
msgid ""
"@\n"
@@ -1558,31 +1558,31 @@ msgstr ""
"选项:\n"
" "
-#: g10/gpg.c:427 sm/gpgsm.c:280
+#: g10/gpg.c:427 sm/gpgsm.c:278
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:429 sm/gpgsm.c:290
+#: g10/gpg.c:429 sm/gpgsm.c:288
msgid "|NAME|encrypt for NAME"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:440 sm/gpgsm.c:326
+#: g10/gpg.c:440 sm/gpgsm.c:324
msgid "use this user-id to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
-#: g10/gpg.c:441 sm/gpgsm.c:329
+#: g10/gpg.c:441 sm/gpgsm.c:327
msgid "|N|set compress level N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:446 sm/gpgsm.c:331
+#: g10/gpg.c:446 sm/gpgsm.c:329
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:460 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:460 sm/gpgsm.c:332 tools/gpgconf.c:62
msgid "use as output file"
msgstr "指定输出文件"
-#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:473 kbx/kbxutil.c:84 sm/gpgsm.c:342 tools/gpgconf.c:65
msgid "do not make any changes"
msgstr "不做任何改变"
@@ -1598,7 +1598,7 @@ msgstr "行为严格遵循 OpenPGP 定义"
msgid "generate PGP 2.x compatible messages"
msgstr "生成与 PGP 2.x 兼容的报文"
-#: g10/gpg.c:545 sm/gpgsm.c:392
+#: g10/gpg.c:545 sm/gpgsm.c:390
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1606,7 +1606,7 @@ msgstr ""
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/gpg.c:548 sm/gpgsm.c:395
+#: g10/gpg.c:548 sm/gpgsm.c:393
msgid ""
"@\n"
"Examples:\n"
@@ -1646,7 +1646,7 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:770 sm/gpgsm.c:530
+#: g10/gpg.c:770 sm/gpgsm.c:528
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1674,7 +1674,7 @@ msgstr "压缩:"
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1048 sm/gpgsm.c:682
+#: g10/gpg.c:1048 sm/gpgsm.c:680
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
@@ -1922,7 +1922,7 @@ msgstr "%s:%d:无效的 auto-key-locate 清单\n"
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2810 sm/gpgsm.c:1235
+#: g10/gpg.c:2810 sm/gpgsm.c:1228
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
@@ -1962,11 +1962,11 @@ msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1278
+#: g10/gpg.c:2946 g10/gpg.c:2970 sm/gpgsm.c:1271
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1286
+#: g10/gpg.c:2952 g10/gpg.c:2976 sm/gpgsm.c:1279
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
@@ -2194,7 +2194,7 @@ msgstr "从这个钥匙环里取用密钥"
msgid "make timestamp conflicts only a warning"
msgstr "把时间戳矛盾仅视为警告"
-#: g10/gpgv.c:76 sm/gpgsm.c:367
+#: g10/gpgv.c:76 sm/gpgsm.c:365
msgid "|FD|write status info to this FD"
msgstr "|FD|把状态信息写入文件描述符 FD"
@@ -6193,62 +6193,62 @@ msgstr ""
msgid "the NullPIN has not yet been changed\n"
msgstr ""
-#: scd/app-openpgp.c:596
+#: scd/app-openpgp.c:601
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "无法存储指纹:%s\n"
-#: scd/app-openpgp.c:609
+#: scd/app-openpgp.c:614
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "无法存储创建日期:%s\n"
-#: scd/app-openpgp.c:1004
+#: scd/app-openpgp.c:1009
#, c-format
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: scd/app-openpgp.c:1012 scd/app-openpgp.c:1948
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1953
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1020 scd/app-openpgp.c:1956
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1961
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1029 scd/app-openpgp.c:1966
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1971
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
-#: scd/app-openpgp.c:1297 scd/app-openpgp.c:1385 scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:1302 scd/app-openpgp.c:1390 scd/app-openpgp.c:2222
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN 回调返回错误:%s\n"
-#: scd/app-openpgp.c:1303 scd/app-openpgp.c:1391 scd/app-openpgp.c:2208
+#: scd/app-openpgp.c:1308 scd/app-openpgp.c:1396 scd/app-openpgp.c:2228
#, 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:1312 scd/app-openpgp.c:1326 scd/app-openpgp.c:1401
-#: scd/app-openpgp.c:2217 scd/app-openpgp.c:2231
+#: scd/app-openpgp.c:1317 scd/app-openpgp.c:1331 scd/app-openpgp.c:1406
+#: scd/app-openpgp.c:2237 scd/app-openpgp.c:2251
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败:%s\n"
-#: scd/app-openpgp.c:1349
+#: scd/app-openpgp.c:1354
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:1364 scd/app-openpgp.c:2441
+#: scd/app-openpgp.c:1369 scd/app-openpgp.c:2461
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1370 scd/app-openpgp.c:2450
+#: scd/app-openpgp.c:1375 scd/app-openpgp.c:2470
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定!\n"
-#: scd/app-openpgp.c:1375
+#: scd/app-openpgp.c:1380
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
@@ -6256,108 +6256,108 @@ msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
#. TRANSLATORS: Do not translate the "|A|" prefix but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1382
+#: scd/app-openpgp.c:1387
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:1531
+#: scd/app-openpgp.c:1536
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:1531
+#: scd/app-openpgp.c:1536
msgid "|N|New PIN"
msgstr "新的 PIN"
-#: scd/app-openpgp.c:1535
+#: scd/app-openpgp.c:1540
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: scd/app-openpgp.c:1585 scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:1590 scd/app-openpgp.c:2039
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:1591 scd/app-openpgp.c:2041
+#: scd/app-openpgp.c:1596 scd/app-openpgp.c:2046
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:1601
+#: scd/app-openpgp.c:1606
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:1605
+#: scd/app-openpgp.c:1610
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:1607
+#: scd/app-openpgp.c:1612
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:1774
+#: scd/app-openpgp.c:1779
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:1781
+#: scd/app-openpgp.c:1786
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:1788
+#: scd/app-openpgp.c:1793
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-openpgp.c:1796 scd/app-openpgp.c:1803
+#: scd/app-openpgp.c:1801 scd/app-openpgp.c:1808
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:1866
+#: scd/app-openpgp.c:1871
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥:%s\n"
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1930
msgid "please wait while key is being generated ...\n"
msgstr "请稍候,正在生成密钥……\n"
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1944
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:1942
+#: scd/app-openpgp.c:1947
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:1999
+#: scd/app-openpgp.c:2004
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2131
+#: scd/app-openpgp.c:2141
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2202
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名:%lu\n"
-#: scd/app-openpgp.c:2190
+#: scd/app-openpgp.c:2210
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:2455
+#: scd/app-openpgp.c:2475
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:2528 scd/app-openpgp.c:2538
+#: scd/app-openpgp.c:2548 scd/app-openpgp.c:2558
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@ -6366,7 +6366,7 @@ msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:111 sm/gpgsm.c:356
+#: scd/scdaemon.c:111 sm/gpgsm.c:354
#, fuzzy
msgid "read options from file"
msgstr "从‘%s’读取选项\n"
@@ -6445,131 +6445,139 @@ msgstr "不支持 gpg-agent 协议版本 %d\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:115
+#: sm/certchain.c:159
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "不支持 gpg-agent 协议版本 %d\n"
-#: sm/certchain.c:153
+#: sm/certchain.c:197
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:191
+#: sm/certchain.c:235
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:201
+#: sm/certchain.c:245
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "无法打开‘%s’:%s\n"
-#: sm/certchain.c:208 sm/certchain.c:237
+#: sm/certchain.c:252 sm/certchain.c:281
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:212 sm/certchain.c:241
+#: sm/certchain.c:256 sm/certchain.c:285
#, fuzzy
msgid "certificate policy not allowed"
msgstr "不允许导出私钥\n"
-#: sm/certchain.c:352
+#: sm/certchain.c:396
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:372
+#: sm/certchain.c:416
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:525 sm/certchain.c:689 sm/certchain.c:1192 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:325 sm/verify.c:107
+#: sm/certchain.c:569 sm/certchain.c:733 sm/certchain.c:1259 sm/decrypt.c:261
+#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "无法存储密钥:%s\n"
-#: sm/certchain.c:616
+#: sm/certchain.c:660
#, fuzzy
msgid "certificate has been revoked"
msgstr "注意:密钥已被吊销"
-#: sm/certchain.c:625
+#: sm/certchain.c:669
#, fuzzy
msgid "no CRL found for certificate"
msgstr "证书已损坏"
-#: sm/certchain.c:629
+#: sm/certchain.c:673
#, fuzzy
msgid "the available CRL is too old"
msgstr "可用的密钥在:"
-#: sm/certchain.c:631
+#: sm/certchain.c:675
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:636
+#: sm/certchain.c:680
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:714
+#: sm/certchain.c:758
#, fuzzy
msgid "no issuer found in certificate"
msgstr "生成一份吊销证书"
-#: sm/certchain.c:741
+#: sm/certchain.c:785
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:757
+#: sm/certchain.c:801
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:770
+#: sm/certchain.c:814
#, fuzzy
msgid "certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:813
+#: sm/certchain.c:857
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:881
+#: sm/certchain.c:925
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:892
+#: sm/certchain.c:940
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA 指纹:"
-#: sm/certchain.c:897
+#: sm/certchain.c:948
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:912
+#: sm/certchain.c:963
+msgid "interactive marking as trusted not enabled in gpg-agent\n"
+msgstr ""
+
+#: sm/certchain.c:969
+msgid "interactive marking as trusted disabled for this session\n"
+msgstr ""
+
+#: sm/certchain.c:979
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:939 sm/import.c:158
+#: sm/certchain.c:1006 sm/import.c:158
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:951
+#: sm/certchain.c:1018
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:984
+#: sm/certchain.c:1051
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "验证签名"
-#: sm/certchain.c:1014
+#: sm/certchain.c:1081
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1065
+#: sm/certchain.c:1132
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
@@ -6578,7 +6586,7 @@ msgstr ""
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA 要求使用 160 位的散列算法\n"
-#: sm/certcheck.c:177 sm/sign.c:479 sm/verify.c:189
+#: sm/certcheck.c:177 sm/sign.c:482 sm/verify.c:189
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -6654,42 +6662,47 @@ msgstr ""
msgid "certificate is not usable for signing\n"
msgstr ""
-#: sm/certreqgen.c:466
+#: sm/certreqgen.c:476
#, fuzzy, c-format
msgid "line %d: invalid algorithm\n"
msgstr "无效的‘%s’散列算法\n"
-#: sm/certreqgen.c:479
+#: sm/certreqgen.c:489
#, c-format
msgid "line %d: invalid key length %u (valid are %d to %d)\n"
msgstr ""
-#: sm/certreqgen.c:493
+#: sm/certreqgen.c:507
#, c-format
msgid "line %d: no subject name given\n"
msgstr ""
-#: sm/certreqgen.c:501
+#: sm/certreqgen.c:516
#, c-format
msgid "line %d: invalid subject name label `%.*s'\n"
msgstr ""
-#: sm/certreqgen.c:504
+#: sm/certreqgen.c:519
#, c-format
msgid "line %d: invalid subject name `%s' at pos %d\n"
msgstr ""
-#: sm/certreqgen.c:520
+#: sm/certreqgen.c:536
#, fuzzy, c-format
msgid "line %d: not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: sm/certreqgen.c:532
+#: sm/certreqgen.c:548
+#, fuzzy, c-format
+msgid "line %d: error reading key `%s' from card: %s\n"
+msgstr "建立钥匙环‘%s’时发生错误:%s\n"
+
+#: sm/certreqgen.c:560
#, fuzzy, c-format
msgid "line %d: error getting key by keygrip `%s': %s\n"
msgstr "建立钥匙环‘%s’时发生错误:%s\n"
-#: sm/certreqgen.c:547
+#: sm/certreqgen.c:576
#, fuzzy, c-format
msgid "line %d: key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
@@ -6742,194 +6755,194 @@ msgstr "生成密码的时候发生错误:%s\n"
msgid "error writing to temporary file: %s\n"
msgstr "%s:写入目录记录时出错:%s\n"
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
#, fuzzy
msgid "|[FILE]|make a signature"
msgstr "|[文件名]|生成一份签名"
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:243
#, fuzzy
msgid "|[FILE]|make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
-#: sm/gpgsm.c:253
+#: sm/gpgsm.c:251
#, fuzzy
msgid "list external keys"
msgstr "列出私钥"
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:253
#, fuzzy
msgid "list certificate chain"
msgstr "证书已损坏"
-#: sm/gpgsm.c:258
+#: sm/gpgsm.c:256
#, fuzzy
msgid "remove key from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:259
#, fuzzy
msgid "import certificates"
msgstr "证书已损坏"
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
#, fuzzy
msgid "export certificates"
msgstr "证书已损坏"
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:261
#, fuzzy
msgid "register a smartcard"
msgstr "在智能卡上添加一把密钥"
-#: sm/gpgsm.c:264
+#: sm/gpgsm.c:262
msgid "run in server mode"
msgstr ""
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:267
+#: sm/gpgsm.c:265
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:280
#, fuzzy
msgid "create base-64 encoded output"
msgstr "输出经 ASCII 封装"
-#: sm/gpgsm.c:284
+#: sm/gpgsm.c:282
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:286
+#: sm/gpgsm.c:284
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:286
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:299
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:304
+#: sm/gpgsm.c:302
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:307
+#: sm/gpgsm.c:305
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:308
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:314
+#: sm/gpgsm.c:312
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:316
msgid "|NAME|use NAME as default recipient"
msgstr ""
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:318
#, fuzzy
msgid "use the default key as default recipient"
msgstr "已跳过:公钥已被设为默认收件者\n"
-#: sm/gpgsm.c:337
+#: sm/gpgsm.c:335
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:341
+#: sm/gpgsm.c:339
#, fuzzy
msgid "force v3 signatures"
msgstr "检查签名"
-#: sm/gpgsm.c:342
+#: sm/gpgsm.c:340
msgid "always use a MDC for encryption"
msgstr ""
-#: sm/gpgsm.c:347
+#: sm/gpgsm.c:345
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:348
+#: sm/gpgsm.c:346
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:349
+#: sm/gpgsm.c:347
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:351
+#: sm/gpgsm.c:349
#, fuzzy
msgid "add this keyring to the list of keyrings"
msgstr "从这个钥匙环里取用密钥"
-#: sm/gpgsm.c:352
+#: sm/gpgsm.c:350
#, fuzzy
msgid "add this secret keyring to the list"
msgstr "要有私钥才能这么做。\n"
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:351
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: sm/gpgsm.c:354
+#: sm/gpgsm.c:352
msgid "|HOST|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:353
#, fuzzy
msgid "|NAME|set terminal charset to NAME"
msgstr "|某甲|为收件者“某甲”加密"
-#: sm/gpgsm.c:359
+#: sm/gpgsm.c:357
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: sm/gpgsm.c:374
+#: sm/gpgsm.c:372
msgid "|FILE|load extension module FILE"
msgstr ""
-#: sm/gpgsm.c:380
+#: sm/gpgsm.c:378
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "未知的对称加密算法"
-#: sm/gpgsm.c:382
+#: sm/gpgsm.c:380
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s 签名,散列算法 %s\n"
-#: sm/gpgsm.c:384
+#: sm/gpgsm.c:382
#, fuzzy
msgid "|N|use compress algorithm N"
msgstr "未知的压缩算法"
-#: sm/gpgsm.c:520
+#: sm/gpgsm.c:518
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: sm/gpgsm.c:523
+#: sm/gpgsm.c:521
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -6940,36 +6953,36 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: sm/gpgsm.c:617
+#: sm/gpgsm.c:615
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "用法:gpg [选项] "
-#: sm/gpgsm.c:698
+#: sm/gpgsm.c:696
#, fuzzy, c-format
msgid "can't encrypt to `%s': %s\n"
msgstr "无法连接至‘%s’:%s\n"
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:770
#, c-format
msgid "libksba is too old (need %s, have %s)\n"
msgstr ""
-#: sm/gpgsm.c:1252
+#: sm/gpgsm.c:1245
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1317
+#: sm/gpgsm.c:1310
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1335
+#: sm/gpgsm.c:1328
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "无法存取‘%s’:%s\n"
-#: sm/gpgsm.c:1519
+#: sm/gpgsm.c:1512
msgid "this command has not yet been implemented\n"
msgstr ""
@@ -7090,7 +7103,7 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:444
+#: sm/sign.c:447
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "检查已建立的签名时发生错误: %s\n"