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.po1474
1 files changed, 779 insertions, 695 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ab6e0dc4b..8a9efb34b 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: 2009-07-07 17:45+0200\n"
+"POT-Creation-Date: 2009-09-03 12:26+0200\n"
"PO-Revision-Date: 2009-07-09 10:03+0200\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -98,8 +98,8 @@ msgstr "错误的密码"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:478 g10/gpg.c:1090
-#: g10/keygen.c:3311 g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1089
+#: g10/keygen.c:3334 g10/keygen.c:3367 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
#: g10/tdbio.c:547 jnlib/dotlock.c:310
#, c-format
@@ -108,12 +108,12 @@ msgstr "无法建立‘%s’:%s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1091 g10/import.c:193 g10/keygen.c:2794
-#: g10/keyring.c:1582 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1090 g10/import.c:193 g10/keygen.c:2817
+#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2020
-#: sm/gpgsm.c:2050 sm/gpgsm.c:2088 sm/gpgsm.c:2126 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2001
+#: sm/gpgsm.c:2031 sm/gpgsm.c:2069 sm/gpgsm.c:2107 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’: %s\n"
@@ -175,56 +175,70 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s:建立散列表失败:%s\n"
-#: agent/divert-scd.c:199
+#: agent/divert-scd.c:92 g10/call-agent.c:863
+#, fuzzy
+msgid "Please insert the card with serial number"
+msgstr ""
+"请取出当前的卡,并插入有下列序列号的卡:\n"
+" %.*s\n"
+
+#: agent/divert-scd.c:93 g10/call-agent.c:864
+#, fuzzy
+msgid "Please remove the current card and insert the one with serial number"
+msgstr ""
+"请取出当前的卡,并插入有下列序列号的卡:\n"
+" %.*s\n"
+
+#: agent/divert-scd.c:200
#, fuzzy
msgid "Admin PIN"
msgstr "|A|管理员 PIN"
#. TRANSLATORS: A PUK is the Personal Unblocking Code
#. used to unblock a PIN.
-#: agent/divert-scd.c:204
+#: agent/divert-scd.c:205
msgid "PUK"
msgstr ""
-#: agent/divert-scd.c:211
+#: agent/divert-scd.c:212
msgid "Reset Code"
msgstr ""
-#: agent/divert-scd.c:237
+#: agent/divert-scd.c:238
#, c-format
msgid "%s%%0A%%0AUse the reader's keypad for input."
msgstr ""
-#: agent/divert-scd.c:286
+#: agent/divert-scd.c:287
#, fuzzy
msgid "Repeat this Reset Code"
msgstr "再次输入此 PIN:"
-#: agent/divert-scd.c:288
+#: agent/divert-scd.c:289
#, fuzzy
msgid "Repeat this PUK"
msgstr "再次输入此 PIN:"
-#: agent/divert-scd.c:289
+#: agent/divert-scd.c:290
#, fuzzy
msgid "Repeat this PIN"
msgstr "再次输入此 PIN:"
-#: agent/divert-scd.c:294
+#: agent/divert-scd.c:295
#, fuzzy
msgid "Reset Code not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符;请再试一次"
-#: agent/divert-scd.c:296
+#: agent/divert-scd.c:297
#, fuzzy
msgid "PUK not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符;请再试一次"
-#: agent/divert-scd.c:297
+#: agent/divert-scd.c:298
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符;请再试一次"
-#: agent/divert-scd.c:309
+#: agent/divert-scd.c:310
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
@@ -308,7 +322,7 @@ msgstr ""
msgid "Please enter the new passphrase"
msgstr "更改密码"
-#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:104
#: tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
@@ -319,40 +333,40 @@ msgstr ""
"选项:\n"
" "
-#: agent/gpg-agent.c:121 scd/scdaemon.c:105
+#: agent/gpg-agent.c:121 scd/scdaemon.c:106
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:122 scd/scdaemon.c:108
+#: agent/gpg-agent.c:122 scd/scdaemon.c:109
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: agent/gpg-agent.c:123 g10/gpg.c:484 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:110 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:80 tools/symcryptrun.c:164
msgid "verbose"
msgstr "详细模式"
-#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
#: sm/gpgsm.c:280
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112
+#: agent/gpg-agent.c:126 scd/scdaemon.c:113
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
+#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:309
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
-#: agent/gpg-agent.c:132 scd/scdaemon.c:123
+#: agent/gpg-agent.c:132 scd/scdaemon.c:124
msgid "do not detach from the console"
msgstr ""
@@ -416,167 +430,170 @@ msgstr ""
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
-#: scd/scdaemon.c:244 sm/gpgsm.c:512 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
-#, fuzzy
-msgid "Please report bugs to <"
+#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
+#. reporting address. This is so that we can change the
+#. reporting address without breaking the translations.
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: g10/gpg.c:808 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
+#: sm/gpgsm.c:512 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
+#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
-"请向 <[email protected]> 报告程序缺陷。\n"
+"请向 <@EMAIL@> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: agent/gpg-agent.c:338
+#: agent/gpg-agent.c:341
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: agent/gpg-agent.c:340
+#: agent/gpg-agent.c:343
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:375 g10/gpg.c:991 scd/scdaemon.c:305 sm/gpgsm.c:651
+#: agent/gpg-agent.c:378 g10/gpg.c:990 scd/scdaemon.c:306 sm/gpgsm.c:651
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
-#: scd/scdaemon.c:399 sm/gpgsm.c:890 sm/gpgsm.c:893 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:587 agent/protect-tool.c:1030 kbx/kbxutil.c:428
+#: scd/scdaemon.c:400 sm/gpgsm.c:880 sm/gpgsm.c:883 tools/symcryptrun.c:996
#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:695 g10/gpg.c:2100 scd/scdaemon.c:481 sm/gpgsm.c:987
+#: agent/gpg-agent.c:698 g10/gpg.c:2099 scd/scdaemon.c:482 sm/gpgsm.c:977
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: agent/gpg-agent.c:700 agent/gpg-agent.c:1301 g10/gpg.c:2104
-#: scd/scdaemon.c:486 sm/gpgsm.c:991 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:703 agent/gpg-agent.c:1304 g10/gpg.c:2103
+#: scd/scdaemon.c:487 sm/gpgsm.c:981 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:708 g10/gpg.c:2111 scd/scdaemon.c:494 sm/gpgsm.c:998
+#: agent/gpg-agent.c:711 g10/gpg.c:2110 scd/scdaemon.c:495 sm/gpgsm.c:988
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: agent/gpg-agent.c:1070 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1073 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立‘%s’时发生错误:%s\n"
-#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
-#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:990
+#: agent/gpg-agent.c:1417 agent/gpg-agent.c:1535 agent/gpg-agent.c:1539
+#: agent/gpg-agent.c:1580 agent/gpg-agent.c:1584 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:992
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
+#: agent/gpg-agent.c:1431 scd/scdaemon.c:1006
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
+#: agent/gpg-agent.c:1454 scd/scdaemon.c:1029
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’:%s\n"
-#: agent/gpg-agent.c:1460
+#: agent/gpg-agent.c:1463
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1478
+#: agent/gpg-agent.c:1481
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1492 scd/scdaemon.c:1048
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1497 scd/scdaemon.c:1051
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
-#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1509 scd/scdaemon.c:1060
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败:%s\n"
-#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1515 scd/scdaemon.c:1067
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
+#: agent/gpg-agent.c:1543 agent/gpg-agent.c:1590 g10/openfile.c:432
#, c-format
msgid "directory `%s' created\n"
msgstr "已创建目录‘%s’\n"
-#: agent/gpg-agent.c:1593
+#: agent/gpg-agent.c:1596
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错:%s\n"
-#: agent/gpg-agent.c:1597
+#: agent/gpg-agent.c:1600
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1730 scd/scdaemon.c:1083
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1754
+#: agent/gpg-agent.c:1757
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1779
+#: agent/gpg-agent.c:1782
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1922 scd/scdaemon.c:1220
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "更新私钥失败:%s\n"
-#: agent/gpg-agent.c:2042 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2045 scd/scdaemon.c:1287
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s:已跳过:%s\n"
-#: agent/gpg-agent.c:2170
+#: agent/gpg-agent.c:2173
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:2181 common/simple-pwquery.c:352 common/asshelp.c:283
+#: agent/gpg-agent.c:2184 common/simple-pwquery.c:352 common/asshelp.c:283
#: tools/gpg-connect-agent.c:2134
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-#: agent/gpg-agent.c:2194 common/simple-pwquery.c:364 common/asshelp.c:295
+#: agent/gpg-agent.c:2197 common/simple-pwquery.c:364 common/asshelp.c:295
#: tools/gpg-connect-agent.c:2145
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -602,7 +619,7 @@ msgstr ""
"@指令:\n"
" "
-#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:124 g10/gpg.c:437 g10/gpgv.c:69 kbx/kbxutil.c:81
#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
#: tools/symcryptrun.c:157
msgid ""
@@ -867,47 +884,47 @@ msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:31 common/yesno.c:68
+#: common/yesno.c:35 common/yesno.c:72
msgid "yes"
msgstr "yes"
-#: common/yesno.c:32 common/yesno.c:73
+#: common/yesno.c:36 common/yesno.c:77
msgid "yY"
msgstr "yY"
#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:34 common/yesno.c:70
+#: common/yesno.c:38 common/yesno.c:74
msgid "no"
msgstr "no"
-#: common/yesno.c:35 common/yesno.c:74
+#: common/yesno.c:39 common/yesno.c:78
msgid "nN"
msgstr "nN"
#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:72
+#: common/yesno.c:76
msgid "quit"
msgstr "quit"
-#: common/yesno.c:75
+#: common/yesno.c:79
msgid "qQ"
msgstr "qQ"
#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:109
+#: common/yesno.c:113
msgid "okay|okay"
msgstr "okay|ok"
#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:111
+#: common/yesno.c:115
msgid "cancel|cancel"
msgstr "cancel|cancel"
-#: common/yesno.c:112
+#: common/yesno.c:116
msgid "oO"
msgstr "oO"
-#: common/yesno.c:113
+#: common/yesno.c:117
msgid "cC"
msgstr "cC"
@@ -949,131 +966,146 @@ msgid "|audit-log-result|No certificate"
msgstr "证书已损坏"
#: common/audit.c:483
+#, fuzzy
+msgid "|audit-log-result|Not enabled"
+msgstr "证书已损坏"
+
+#: common/audit.c:485
msgid "|audit-log-result|Error"
msgstr ""
-#: common/audit.c:716
+#: common/audit.c:718
#, fuzzy
msgid "Certificate chain available"
msgstr "证书已损坏"
-#: common/audit.c:723
+#: common/audit.c:725
#, fuzzy
msgid "root certificate missing"
msgstr "证书已损坏"
-#: common/audit.c:749
+#: common/audit.c:751
msgid "Data encryption succeeded"
msgstr ""
-#: common/audit.c:754 common/audit.c:815 common/audit.c:835 common/audit.c:859
+#: common/audit.c:756 common/audit.c:817 common/audit.c:837 common/audit.c:861
#, fuzzy
msgid "Data available"
msgstr "列出所有可用数据"
-#: common/audit.c:757
+#: common/audit.c:759
#, fuzzy
msgid "Session key created"
msgstr "%s:钥匙环已建立\n"
-#: common/audit.c:762
+#: common/audit.c:764
#, fuzzy, c-format
msgid "algorithm: %s"
msgstr "有效性:%s"
-#: common/audit.c:764 common/audit.c:766
+#: common/audit.c:766 common/audit.c:768
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
"\n"
"支持的算法:\n"
-#: common/audit.c:768
+#: common/audit.c:770
#, fuzzy
msgid "seems to be not encrypted"
msgstr "未被加密"
-#: common/audit.c:774
+#: common/audit.c:776
#, fuzzy
msgid "Number of recipients"
msgstr "当前收件人:\n"
-#: common/audit.c:782
+#: common/audit.c:784
#, c-format
msgid "Recipient %d"
msgstr ""
-#: common/audit.c:810
+#: common/audit.c:812
msgid "Data signing succeeded"
msgstr ""
-#: common/audit.c:830
+#: common/audit.c:832
msgid "Data decryption succeeded"
msgstr ""
-#: common/audit.c:855
+#: common/audit.c:857
#, fuzzy
msgid "Data verification succeeded"
msgstr "签名验证已被抑制\n"
-#: common/audit.c:864
+#: common/audit.c:866
#, fuzzy
msgid "Signature available"
msgstr "签名建立于 %s\n"
-#: common/audit.c:869
+#: common/audit.c:871
#, fuzzy
msgid "Parsing signature succeeded"
msgstr "未找到签名\n"
-#: common/audit.c:874
+#: common/audit.c:876
#, fuzzy, c-format
msgid "Bad hash algorithm: %s"
msgstr "无效的‘%s’散列算法\n"
-#: common/audit.c:889
+#: common/audit.c:891
#, fuzzy, c-format
msgid "Signature %d"
msgstr "签名建立于 %s\n"
-#: common/audit.c:905
+#: common/audit.c:907
#, fuzzy
msgid "Certificate chain valid"
msgstr "这把密钥已经过期!"
-#: common/audit.c:916
+#: common/audit.c:918
#, fuzzy
msgid "Root certificate trustworthy"
msgstr "证书已损坏"
-#: common/audit.c:926
+#: common/audit.c:939 sm/certchain.c:920
+#, fuzzy
+msgid "no CRL found for certificate"
+msgstr "证书已损坏"
+
+#: common/audit.c:942 sm/certchain.c:930
+#, fuzzy
+msgid "the available CRL is too old"
+msgstr "可用的密钥在:"
+
+#: common/audit.c:947
#, fuzzy
msgid "CRL/OCSP check of certificates"
msgstr "证书已损坏"
-#: common/audit.c:943
+#: common/audit.c:967
#, fuzzy
msgid "Included certificates"
msgstr "证书已损坏"
-#: common/audit.c:1002
+#: common/audit.c:1026
msgid "No audit log entries."
msgstr ""
-#: common/audit.c:1051
+#: common/audit.c:1075
#, fuzzy
msgid "Unknown operation"
msgstr "未知的版本"
-#: common/audit.c:1069
+#: common/audit.c:1093
msgid "Gpg-Agent usable"
msgstr ""
-#: common/audit.c:1079
+#: common/audit.c:1103
msgid "Dirmngr usable"
msgstr ""
-#: common/audit.c:1115
+#: common/audit.c:1139
#, fuzzy, c-format
msgid "No help available for `%s'."
msgstr "‘%s’没有可用的帮助"
@@ -1203,8 +1235,8 @@ msgstr "OpenPGP 卡不可用:%s\n"
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
-#: g10/card-util.c:98 g10/card-util.c:1611 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:3008 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@ -1213,14 +1245,14 @@ msgstr "在批处理模式中无法完成此操作\n"
msgid "This command is only available for version 2 cards\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
-#: g10/card-util.c:108 scd/app-openpgp.c:2012
+#: g10/card-util.c:108 scd/app-openpgp.c:2020
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\n"
-#: g10/card-util.c:141 g10/card-util.c:1340 g10/card-util.c:1419
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1679 sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:249
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1621
+#: g10/keygen.c:1702 sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:249
#: sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "您的选择? "
@@ -1353,24 +1385,72 @@ msgstr "针对密钥的操作无法实现:%s\n"
msgid "not an OpenPGP card"
msgstr "不是一个 OpenPGP 卡"
-#: g10/card-util.c:1160
+#: g10/card-util.c:1164
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得当前密钥信息时出错:%s\n"
-#: g10/card-util.c:1247
+#: g10/card-util.c:1251
msgid "Replace existing key? (y/N) "
msgstr "替换已有的密钥?(y/N)"
-#: g10/card-util.c:1267 g10/card-util.c:1276
+#: g10/card-util.c:1267
+msgid ""
+"NOTE: There is no guarantee that the card supports the requested size.\n"
+" If the key generation does not succeed, please check the\n"
+" documentation of your card to see what sizes are allowed.\n"
+msgstr ""
+
+#: g10/card-util.c:1292
+#, fuzzy, c-format
+msgid "What keysize do you want for the Signature key? (%u) "
+msgstr "您想要用多大的密钥尺寸?(%u)"
+
+#: g10/card-util.c:1294
+#, fuzzy, c-format
+msgid "What keysize do you want for the Encryption key? (%u) "
+msgstr "您想要用多大的密钥尺寸?(%u)"
+
+#: g10/card-util.c:1295
+#, fuzzy, c-format
+msgid "What keysize do you want for the Authentication key? (%u) "
+msgstr "您想要用多大的密钥尺寸?(%u)"
+
+#: g10/card-util.c:1306 g10/keygen.c:1835 g10/keygen.c:1841
+#: sm/certreqgen-ui.c:194
+#, c-format
+msgid "rounded up to %u bits\n"
+msgstr "舍入到 %u 位\n"
+
+#: g10/card-util.c:1314 g10/keygen.c:1822 sm/certreqgen-ui.c:184
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
+
+#: g10/card-util.c:1319
+#, c-format
+msgid "The card will now be re-configured to generate a key of %u bits\n"
+msgstr ""
+
+#: g10/card-util.c:1339
+#, fuzzy, c-format
+msgid "error changing size of key %d to %u bits: %s\n"
+msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
+
+#: g10/card-util.c:1361
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否为加密密钥创建卡外的备份?(Y/n)"
-#: g10/card-util.c:1288
+#: g10/card-util.c:1375
+#, fuzzy
+msgid "NOTE: keys are already stored on the card!\n"
+msgstr "私钥已存储在卡上\n"
+
+#: g10/card-util.c:1378
msgid "Replace existing keys? (y/N) "
msgstr "替换已有的密钥?(y/N)"
-#: g10/card-util.c:1297
+#: g10/card-util.c:1390
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@ -1381,124 +1461,129 @@ msgstr ""
" PIN = ‘%s’ 管理员 PIN = ‘%s’\n"
"您应当使用 --change-pin 命令来更改它们\n"
-#: g10/card-util.c:1331
+#: g10/card-util.c:1446
msgid "Please select the type of key to generate:\n"
msgstr "请选择您要使用的密钥种类:\n"
-#: g10/card-util.c:1333 g10/card-util.c:1410
+#: g10/card-util.c:1448 g10/card-util.c:1556
msgid " (1) Signature key\n"
msgstr " (1) 签名密钥\n"
-#: g10/card-util.c:1334 g10/card-util.c:1412
+#: g10/card-util.c:1449 g10/card-util.c:1558
msgid " (2) Encryption key\n"
msgstr " (2) 加密密钥\n"
-#: g10/card-util.c:1335 g10/card-util.c:1414
+#: g10/card-util.c:1450 g10/card-util.c:1560
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
-#: g10/card-util.c:1351 g10/card-util.c:1430 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:945
+#: g10/keygen.c:1625 g10/keygen.c:1653 g10/keygen.c:1755 g10/revoke.c:683
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
-#: g10/card-util.c:1407
+#: g10/card-util.c:1553
msgid "Please select where to store the key:\n"
msgstr "请选择在哪里存储密钥:\n"
-#: g10/card-util.c:1442
+#: g10/card-util.c:1597
msgid "unknown key protection algorithm\n"
msgstr "不支持的密钥保护算法\n"
-#: g10/card-util.c:1447
+#: g10/card-util.c:1602
msgid "secret parts of key are not available\n"
msgstr "私钥部分不可用\n"
-#: g10/card-util.c:1452
+#: g10/card-util.c:1607
msgid "secret key already stored on a card\n"
msgstr "私钥已存储在卡上\n"
-#: g10/card-util.c:1521 g10/keyedit.c:1380
+#: g10/card-util.c:1620
+#, fuzzy, c-format
+msgid "error writing key to card: %s\n"
+msgstr "写入钥匙环‘%s’时出错: %s\n"
+
+#: g10/card-util.c:1679 g10/keyedit.c:1380
msgid "quit this menu"
msgstr "离开这个菜单"
-#: g10/card-util.c:1523
+#: g10/card-util.c:1681
msgid "show admin commands"
msgstr "显示管理员命令"
-#: g10/card-util.c:1524 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1383
msgid "show this help"
msgstr "显示这份在线说明"
-#: g10/card-util.c:1526
+#: g10/card-util.c:1684
msgid "list all available data"
msgstr "列出所有可用数据"
-#: g10/card-util.c:1529
+#: g10/card-util.c:1687
msgid "change card holder's name"
msgstr "更改卡持有人的姓名"
-#: g10/card-util.c:1530
+#: g10/card-util.c:1688
msgid "change URL to retrieve key"
msgstr "更改获取密钥的 URL"
-#: g10/card-util.c:1531
+#: g10/card-util.c:1689
msgid "fetch the key specified in the card URL"
msgstr "根据卡中指定的 URL 获取密钥"
-#: g10/card-util.c:1532
+#: g10/card-util.c:1690
msgid "change the login name"
msgstr "更改登录名"
-#: g10/card-util.c:1533
+#: g10/card-util.c:1691
msgid "change the language preferences"
msgstr "更改首选语言首选"
-#: g10/card-util.c:1534
+#: g10/card-util.c:1692
msgid "change card holder's sex"
msgstr "更改卡持有人的性别"
-#: g10/card-util.c:1535
+#: g10/card-util.c:1693
msgid "change a CA fingerprint"
msgstr "更改一个 CA 指纹"
-#: g10/card-util.c:1536
+#: g10/card-util.c:1694
msgid "toggle the signature force PIN flag"
msgstr "设定 PIN 签名是否必须"
-#: g10/card-util.c:1537
+#: g10/card-util.c:1695
msgid "generate new keys"
msgstr "生成新的密钥"
-#: g10/card-util.c:1538
+#: g10/card-util.c:1696
msgid "menu to change or unblock the PIN"
msgstr "更改或解锁 PIN 的菜单"
-#: g10/card-util.c:1539
+#: g10/card-util.c:1697
msgid "verify the PIN and list all data"
msgstr "验证 PIN 并列出所有数据"
-#: g10/card-util.c:1540
+#: g10/card-util.c:1698
msgid "unblock the PIN using a Reset Code"
msgstr ""
-#: g10/card-util.c:1663 g10/keyedit.c:1654
+#: g10/card-util.c:1820 g10/keyedit.c:1654
msgid "Command> "
msgstr "命令> "
-#: g10/card-util.c:1706
+#: g10/card-util.c:1861
msgid "Admin-only command\n"
msgstr "仅供管理员使用的命令\n"
-#: g10/card-util.c:1737
+#: g10/card-util.c:1892
msgid "Admin commands are allowed\n"
msgstr "允许使用管理员命令\n"
-#: g10/card-util.c:1739
+#: g10/card-util.c:1894
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
-#: g10/card-util.c:1830 g10/keyedit.c:2280
+#: g10/card-util.c:1985 g10/keyedit.c:2280
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
@@ -1506,18 +1591,18 @@ msgstr "无效的指令(尝试“help”)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/decrypt.c:166 g10/gpg.c:3993 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3986 g10/keyring.c:387 g10/keyring.c:698
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3438 g10/keyserver.c:1734
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3438 g10/keyserver.c:1737
#: 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:2417 g10/keyserver.c:1748
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1751
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1642,53 +1727,53 @@ msgstr "警告:报文被使用对称加密算法的弱密钥加密。\n"
msgid "problem handling encrypted packet\n"
msgstr "处理加密包有问题\n"
-#: g10/exec.c:49
+#: g10/exec.c:57
msgid "no remote program execution supported\n"
msgstr "不支持远程调用\n"
-#: g10/exec.c:313
+#: g10/exec.c:308
msgid ""
"external program calls are disabled due to unsafe options file permissions\n"
msgstr "由于配置文件权限不安全,外部程序调用被禁用\n"
-#: g10/exec.c:343
+#: g10/exec.c:338
msgid "this platform requires temporary files when calling external programs\n"
msgstr "在这个操作平台上调用外部程序时需要临时文件\n"
-#: g10/exec.c:421
+#: g10/exec.c:416
#, c-format
msgid "unable to execute program `%s': %s\n"
msgstr "无法执行程序‘%s’:%s\n"
-#: g10/exec.c:424
+#: g10/exec.c:419
#, c-format
msgid "unable to execute shell `%s': %s\n"
msgstr "无法在命令解释环境中执行‘%s’:%s\n"
-#: g10/exec.c:509
+#: g10/exec.c:510
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "调用外部程序时发生系统错误:%s\n"
-#: g10/exec.c:520 g10/exec.c:586
+#: g10/exec.c:521 g10/exec.c:588
msgid "unnatural exit of external program\n"
msgstr "外部程序异常退出\n"
-#: g10/exec.c:535
+#: g10/exec.c:536
msgid "unable to execute external program\n"
msgstr "无法执行外部程序\n"
-#: g10/exec.c:552
+#: g10/exec.c:553
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "无法读取外部程序响应:%s\n"
-#: g10/exec.c:597 g10/exec.c:604
+#: g10/exec.c:599 g10/exec.c:606
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "警告:无法删除临时文件(%s)‘%s’:%s\n"
-#: g10/exec.c:609
+#: g10/exec.c:611
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "警告:无法删除临时目录‘%s’:%s\n"
@@ -1876,100 +1961,100 @@ msgstr "为某把密钥添加本地签名"
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
-#: g10/gpg.c:397
+#: g10/gpg.c:398
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/gpg.c:399
+#: g10/gpg.c:400
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:400 sm/gpgsm.c:202
+#: g10/gpg.c:401 sm/gpgsm.c:202
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:401 sm/gpgsm.c:203
+#: g10/gpg.c:402 sm/gpgsm.c:203
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/gpg.c:403
+#: g10/gpg.c:404
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/gpg.c:405
+#: g10/gpg.c:406
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:424
+#: g10/gpg.c:425
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/gpg.c:431
+#: g10/gpg.c:432
#, fuzzy
msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:434 sm/gpgsm.c:208
+#: g10/gpg.c:435 sm/gpgsm.c:208
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:438 sm/gpgsm.c:226
+#: g10/gpg.c:439 sm/gpgsm.c:226
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:441 sm/gpgsm.c:239
+#: g10/gpg.c:442 sm/gpgsm.c:239
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:454 sm/gpgsm.c:276
+#: g10/gpg.c:455 sm/gpgsm.c:276
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
-#: g10/gpg.c:457
+#: g10/gpg.c:458
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:463
+#: g10/gpg.c:464
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:480 sm/gpgsm.c:278
+#: g10/gpg.c:481 sm/gpgsm.c:278
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
+#: g10/gpg.c:497 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/gpg.c:497
+#: g10/gpg.c:498
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/gpg.c:549
+#: g10/gpg.c:550
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/gpg.c:580 sm/gpgsm.c:333
+#: g10/gpg.c:581 sm/gpgsm.c:333
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1977,7 +2062,7 @@ msgstr ""
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/gpg.c:583 sm/gpgsm.c:336
+#: g10/gpg.c:584 sm/gpgsm.c:336
msgid ""
"@\n"
"Examples:\n"
@@ -1997,17 +2082,11 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/gpg.c:808 g10/gpgv.c:114
-msgid "Please report bugs to <[email protected]>.\n"
-msgstr ""
-"请向 <[email protected]> 报告程序缺陷。\n"
-"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-
-#: g10/gpg.c:831
+#: g10/gpg.c:830
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: g10/gpg.c:834
+#: g10/gpg.c:833
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2017,7 +2096,7 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:845 sm/gpgsm.c:536
+#: g10/gpg.c:844 sm/gpgsm.c:536
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2025,324 +2104,324 @@ msgstr ""
"\n"
"支持的算法:\n"
-#: g10/gpg.c:848
+#: g10/gpg.c:847
msgid "Pubkey: "
msgstr "公钥:"
-#: g10/gpg.c:855 g10/keyedit.c:2346
+#: g10/gpg.c:854 g10/keyedit.c:2346
msgid "Cipher: "
msgstr "对称加密:"
-#: g10/gpg.c:862
+#: g10/gpg.c:861
msgid "Hash: "
msgstr "散列:"
-#: g10/gpg.c:869 g10/keyedit.c:2391
+#: g10/gpg.c:868 g10/keyedit.c:2391
msgid "Compression: "
msgstr "压缩:"
-#: g10/gpg.c:939
+#: g10/gpg.c:938
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1126 sm/gpgsm.c:687
+#: g10/gpg.c:1125 sm/gpgsm.c:687
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1144
+#: g10/gpg.c:1143
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1341
+#: g10/gpg.c:1340
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1344
+#: g10/gpg.c:1343
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1347
+#: g10/gpg.c:1346
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1353
+#: g10/gpg.c:1352
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1356
+#: g10/gpg.c:1355
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1359
+#: g10/gpg.c:1358
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1365
+#: g10/gpg.c:1364
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1368
+#: g10/gpg.c:1367
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1371
+#: g10/gpg.c:1370
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1377
+#: g10/gpg.c:1376
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1380
+#: g10/gpg.c:1379
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1383
+#: g10/gpg.c:1382
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1562
+#: g10/gpg.c:1561
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
-#: g10/gpg.c:1675
+#: g10/gpg.c:1674
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
-#: g10/gpg.c:1677
+#: g10/gpg.c:1676
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
-#: g10/gpg.c:1679
+#: g10/gpg.c:1678
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:1681
+#: g10/gpg.c:1680
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
-#: g10/gpg.c:1683
+#: g10/gpg.c:1682
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
-#: g10/gpg.c:1844
+#: g10/gpg.c:1843
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1936
+#: g10/gpg.c:1935
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2328 g10/gpg.c:3016 g10/gpg.c:3028
+#: g10/gpg.c:2327 g10/gpg.c:3015 g10/gpg.c:3027
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意:一般情况下不会用到 %s!\n"
-#: g10/gpg.c:2509 g10/gpg.c:2521
+#: g10/gpg.c:2508 g10/gpg.c:2520
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
-#: g10/gpg.c:2603
+#: g10/gpg.c:2602
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2626 g10/gpg.c:2821 g10/keyedit.c:4121
+#: g10/gpg.c:2625 g10/gpg.c:2820 g10/keyedit.c:4121
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2638
+#: g10/gpg.c:2637
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
-#: g10/gpg.c:2641
+#: g10/gpg.c:2640
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2648
+#: g10/gpg.c:2647
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
-#: g10/gpg.c:2651
+#: g10/gpg.c:2650
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2658
+#: g10/gpg.c:2657
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
-#: g10/gpg.c:2661
+#: g10/gpg.c:2660
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2668
+#: g10/gpg.c:2667
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
-#: g10/gpg.c:2671
+#: g10/gpg.c:2670
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2679
+#: g10/gpg.c:2678
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
-#: g10/gpg.c:2681
+#: g10/gpg.c:2680
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
-#: g10/gpg.c:2683
+#: g10/gpg.c:2682
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
-#: g10/gpg.c:2685
+#: g10/gpg.c:2684
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
-#: g10/gpg.c:2689
+#: g10/gpg.c:2688
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
-#: g10/gpg.c:2691
+#: g10/gpg.c:2690
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
-#: g10/gpg.c:2693
+#: g10/gpg.c:2692
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
-#: g10/gpg.c:2695
+#: g10/gpg.c:2694
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2697
+#: g10/gpg.c:2696
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2699
+#: g10/gpg.c:2698
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
-#: g10/gpg.c:2701
+#: g10/gpg.c:2700
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
-#: g10/gpg.c:2708
+#: g10/gpg.c:2707
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
-#: g10/gpg.c:2711
+#: g10/gpg.c:2710
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2718
+#: g10/gpg.c:2717
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2904
+#: g10/gpg.c:2903
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d:无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2907
+#: g10/gpg.c:2906
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:3005 sm/gpgsm.c:1416
+#: g10/gpg.c:3004 sm/gpgsm.c:1406
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
-#: g10/gpg.c:3009
+#: g10/gpg.c:3008
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3017
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:3021
+#: g10/gpg.c:3020
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
-#: g10/gpg.c:3036
+#: g10/gpg.c:3035
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
-#: g10/gpg.c:3050
+#: g10/gpg.c:3049
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
-#: g10/gpg.c:3056
+#: g10/gpg.c:3055
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时,不能同时签名和加密\n"
-#: g10/gpg.c:3062
+#: g10/gpg.c:3061
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
-#: g10/gpg.c:3075
+#: g10/gpg.c:3074
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1488
+#: g10/gpg.c:3141 g10/gpg.c:3165 sm/gpgsm.c:1478
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:3147 g10/gpg.c:3171 sm/gpgsm.c:1494 sm/gpgsm.c:1500
+#: g10/gpg.c:3147 g10/gpg.c:3171 sm/gpgsm.c:1484 sm/gpgsm.c:1490
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
@@ -2386,179 +2465,179 @@ msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:3205
+#: g10/gpg.c:3200
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:3209
+#: g10/gpg.c:3204
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:3213
+#: g10/gpg.c:3208
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:3246
+#: g10/gpg.c:3241
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3293
+#: g10/gpg.c:3288
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3298
+#: g10/gpg.c:3293
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3303
+#: g10/gpg.c:3298
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3389
+#: g10/gpg.c:3384
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/gpg.c:3400
+#: g10/gpg.c:3395
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3421
+#: g10/gpg.c:3416
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3428
+#: g10/gpg.c:3423
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3430
+#: g10/gpg.c:3425
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/gpg.c:3440
+#: g10/gpg.c:3435
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3453
+#: g10/gpg.c:3448
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3455
+#: g10/gpg.c:3450
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3458
+#: g10/gpg.c:3453
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3476
+#: g10/gpg.c:3471
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3489
+#: g10/gpg.c:3484
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3504
+#: g10/gpg.c:3499
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3506
+#: g10/gpg.c:3501
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3509
+#: g10/gpg.c:3504
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3529
+#: g10/gpg.c:3524
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3538
+#: g10/gpg.c:3533
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3563
+#: g10/gpg.c:3558
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3571
+#: g10/gpg.c:3566
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3575
+#: g10/gpg.c:3570
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3596
+#: g10/gpg.c:3591
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3688
+#: g10/gpg.c:3683
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/gpg.c:3690
+#: g10/gpg.c:3685
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/gpg.c:3692
+#: g10/gpg.c:3687
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/gpg.c:3703
+#: g10/gpg.c:3698
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/gpg.c:3713
+#: g10/gpg.c:3708
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/gpg.c:3764
+#: g10/gpg.c:3759
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3772
+#: g10/gpg.c:3767
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3862
+#: g10/gpg.c:3857
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3979
+#: g10/gpg.c:3972
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3983
+#: g10/gpg.c:3976
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4297
+#: g10/gpg.c:4290
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4299
+#: g10/gpg.c:4292
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
-#: g10/gpg.c:4332
+#: g10/gpg.c:4325
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -3327,8 +3406,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
msgid "Really sign? (y/N) "
msgstr "真的要签名吗?(y/N)"
-#: g10/keyedit.c:1066 g10/keyedit.c:4840 g10/keyedit.c:4931 g10/keyedit.c:4995
-#: g10/keyedit.c:5056 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4870 g10/keyedit.c:4961 g10/keyedit.c:5025
+#: g10/keyedit.c:5086 g10/sign.c:316
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败: %s\n"
@@ -3337,19 +3416,19 @@ msgstr "签名时失败: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3687
+#: g10/keyedit.c:1142 g10/keygen.c:3713
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3674 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3700 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3690
+#: g10/keyedit.c:1150 g10/keygen.c:3716
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3694
+#: g10/keyedit.c:1156 g10/keygen.c:3720
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
@@ -3366,7 +3445,7 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2224
+#: g10/keyedit.c:1207 g10/keygen.c:2247
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符;请再试一次"
@@ -3738,12 +3817,12 @@ msgid "(sensitive)"
msgstr " (敏感的)"
#: g10/keyedit.c:2778 g10/keyedit.c:2834 g10/keyedit.c:2895 g10/keyedit.c:2910
-#: g10/keylist.c:200 g10/keyserver.c:529
+#: g10/keylist.c:200 g10/keyserver.c:532
#, c-format
msgid "created: %s"
msgstr "创建于:%s"
-#: g10/keyedit.c:2781 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:989
+#: g10/keyedit.c:2781 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
#, c-format
msgid "revoked: %s"
msgstr "已吊销:%s"
@@ -3755,7 +3834,7 @@ msgstr "已过期:%s"
#: g10/keyedit.c:2785 g10/keyedit.c:2836 g10/keyedit.c:2897 g10/keyedit.c:2912
#: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
-#: g10/keylist.c:959 g10/keyserver.c:535 g10/mainproc.c:995
+#: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
#, c-format
msgid "expires: %s"
msgstr "有效至:%s"
@@ -3789,13 +3868,13 @@ msgid ""
"unless you restart the program.\n"
msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
-#: g10/keyedit.c:2929 g10/keyedit.c:3275 g10/keyserver.c:539
-#: g10/mainproc.c:1842 g10/trustdb.c:1173 g10/trustdb.c:1701
+#: g10/keyedit.c:2929 g10/keyedit.c:3275 g10/keyserver.c:542
+#: g10/mainproc.c:1849 g10/trustdb.c:1194 g10/trustdb.c:1722
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:2931 g10/keyedit.c:3277 g10/keyserver.c:543
-#: g10/mainproc.c:1844 g10/trustdb.c:526 g10/trustdb.c:1703
+#: g10/keyedit.c:2931 g10/keyedit.c:3277 g10/keyserver.c:546
+#: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1724
msgid "expired"
msgstr "已过期"
@@ -3853,7 +3932,7 @@ msgstr "已经删除了 %d 个签名。\n"
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
-#: g10/keyedit.c:3279 g10/trustdb.c:1705
+#: g10/keyedit.c:3279 g10/trustdb.c:1726
msgid "invalid"
msgstr "无效"
@@ -4009,12 +4088,12 @@ msgstr "没有索引为 %d 的子钥\n"
msgid "user ID: \"%s\"\n"
msgstr "用户标识:“%s”\n"
-#: g10/keyedit.c:4682 g10/keyedit.c:4746 g10/keyedit.c:4789
+#: g10/keyedit.c:4682 g10/keyedit.c:4776 g10/keyedit.c:4819
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
-#: g10/keyedit.c:4684 g10/keyedit.c:4748 g10/keyedit.c:4791
+#: g10/keyedit.c:4684 g10/keyedit.c:4778 g10/keyedit.c:4821
msgid " (non-exportable)"
msgstr " (不可导出)"
@@ -4031,53 +4110,57 @@ msgstr "您确定您仍然想要吊销它吗?(y/N)"
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签名生成一份吊销证书吗?(y/N)"
-#: g10/keyedit.c:4723
+#: g10/keyedit.c:4747
+msgid "Not signed by you.\n"
+msgstr ""
+
+#: g10/keyedit.c:4753
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名:\n"
-#: g10/keyedit.c:4749
+#: g10/keyedit.c:4779
msgid " (non-revocable)"
msgstr " (不可吊销)"
-#: g10/keyedit.c:4756
+#: g10/keyedit.c:4786
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
-#: g10/keyedit.c:4778
+#: g10/keyedit.c:4808
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签名:\n"
-#: g10/keyedit.c:4798
+#: g10/keyedit.c:4828
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗?(y/N)"
-#: g10/keyedit.c:4828
+#: g10/keyedit.c:4858
msgid "no secret key\n"
msgstr "没有私钥\n"
-#: g10/keyedit.c:4898
+#: g10/keyedit.c:4928
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4945
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告:有一份用户标识签名的日期标记为 %d 秒后的未来\n"
-#: g10/keyedit.c:4979
+#: g10/keyedit.c:5009
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
-#: g10/keyedit.c:5041
+#: g10/keyedit.c:5071
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
-#: g10/keyedit.c:5136
+#: g10/keyedit.c:5166
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
@@ -4099,52 +4182,53 @@ msgstr "太多散列算法首选项\n"
msgid "too many compression preferences\n"
msgstr "太多首选压缩算法\n"
-#: g10/keygen.c:406
+#: g10/keygen.c:420
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
-#: g10/keygen.c:889
+#: g10/keygen.c:904
msgid "writing direct signature\n"
msgstr "正在写入直接签名\n"
-#: g10/keygen.c:931
+#: g10/keygen.c:946
msgid "writing self signature\n"
msgstr "正在写入自身签名\n"
-#: g10/keygen.c:988
+#: g10/keygen.c:1003
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
-#: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3186
+#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
+#: g10/keygen.c:3209
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效:改用 %u 位\n"
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
+#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
+#: g10/keygen.c:3215
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
-#: g10/keygen.c:1306
+#: g10/keygen.c:1329
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1526
+#: g10/keygen.c:1549
msgid "Sign"
msgstr "签名"
-#: g10/keygen.c:1529
+#: g10/keygen.c:1552
msgid "Certify"
msgstr "验证"
-#: g10/keygen.c:1532
+#: g10/keygen.c:1555
msgid "Encrypt"
msgstr "加密"
-#: g10/keygen.c:1535
+#: g10/keygen.c:1558
msgid "Authenticate"
msgstr "认证"
@@ -4158,114 +4242,104 @@ msgstr "认证"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1553
+#: g10/keygen.c:1576
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1576
+#: g10/keygen.c:1599
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 密钥可能的操作:"
-#: g10/keygen.c:1580
+#: g10/keygen.c:1603
msgid "Current allowed actions: "
msgstr "目前允许的操作:"
-#: g10/keygen.c:1585
+#: g10/keygen.c:1608
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 选择是否用于签名\n"
-#: g10/keygen.c:1588
+#: g10/keygen.c:1611
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 选择是否用于加密\n"
-#: g10/keygen.c:1591
+#: g10/keygen.c:1614
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 选择是否用于认证\n"
-#: g10/keygen.c:1594
+#: g10/keygen.c:1617
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
-#: g10/keygen.c:1654 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1677 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "请选择您要使用的密钥种类:\n"
-#: g10/keygen.c:1657
+#: g10/keygen.c:1680
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1659
+#: g10/keygen.c:1682
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1661
+#: g10/keygen.c:1684
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (仅用于签名)\n"
-#: g10/keygen.c:1662
+#: g10/keygen.c:1685
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (仅用于签名)\n"
-#: g10/keygen.c:1666
+#: g10/keygen.c:1689
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (仅用于加密)\n"
-#: g10/keygen.c:1667
+#: g10/keygen.c:1690
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
-#: g10/keygen.c:1671
+#: g10/keygen.c:1694
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
-#: g10/keygen.c:1672
+#: g10/keygen.c:1695
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
-#: g10/keygen.c:1780
+#: g10/keygen.c:1803
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
-#: g10/keygen.c:1788
+#: g10/keygen.c:1811
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "您想要用多大的密钥尺寸?(%u)"
-#: g10/keygen.c:1791 sm/certreqgen-ui.c:179
+#: g10/keygen.c:1814 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "您想要用多大的密钥尺寸?(%u)"
-#: g10/keygen.c:1799 sm/certreqgen-ui.c:184
-#, c-format
-msgid "%s keysizes must be in the range %u-%u\n"
-msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
-
-#: g10/keygen.c:1805 sm/certreqgen-ui.c:189
+#: g10/keygen.c:1828 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "您所要求的密钥尺寸是 %u 位\n"
-#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:194
-#, c-format
-msgid "rounded up to %u bits\n"
-msgstr "舍入到 %u 位\n"
-
-#: g10/keygen.c:1893
+#: g10/keygen.c:1916
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4281,7 +4355,7 @@ msgstr ""
" <n>m = 密钥在 n 月后过期\n"
" <n>y = 密钥在 n 年后过期\n"
-#: g10/keygen.c:1904
+#: g10/keygen.c:1927
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4297,38 +4371,38 @@ msgstr ""
" <n>m = 签名在 n 月后过期\n"
" <n>y = 签名在 n 年后过期\n"
-#: g10/keygen.c:1927
+#: g10/keygen.c:1950
msgid "Key is valid for? (0) "
msgstr "密钥的有效期限是?(0) "
-#: g10/keygen.c:1932
+#: g10/keygen.c:1955
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "签名的有效期限是多久?(%s) "
-#: g10/keygen.c:1950 g10/keygen.c:1975
+#: g10/keygen.c:1973 g10/keygen.c:1998
msgid "invalid value\n"
msgstr "无效的数值\n"
-#: g10/keygen.c:1957
+#: g10/keygen.c:1980
msgid "Key does not expire at all\n"
msgstr "密钥永远不会过期\n"
-#: g10/keygen.c:1958
+#: g10/keygen.c:1981
msgid "Signature does not expire at all\n"
msgstr "签名永远不会过期\n"
-#: g10/keygen.c:1963
+#: g10/keygen.c:1986
#, c-format
msgid "Key expires at %s\n"
msgstr "密钥于 %s 过期\n"
-#: g10/keygen.c:1964
+#: g10/keygen.c:1987
#, c-format
msgid "Signature expires at %s\n"
msgstr "签名于 %s 过期\n"
-#: g10/keygen.c:1968
+#: g10/keygen.c:1991
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4336,11 +4410,11 @@ msgstr ""
"您的系统无法显示 2038 年以后的日期。\n"
"不过,它可以正确处理 2106 年之前的年份。\n"
-#: g10/keygen.c:1981
+#: g10/keygen.c:2004
msgid "Is this correct? (y/N) "
msgstr "以上正确吗?(y/n)"
-#: g10/keygen.c:2011
+#: g10/keygen.c:2034
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4351,7 +4425,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2026
+#: g10/keygen.c:2049
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4367,44 +4441,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <[email protected]>”\n"
"\n"
-#: g10/keygen.c:2045
+#: g10/keygen.c:2068
msgid "Real name: "
msgstr "真实姓名:"
-#: g10/keygen.c:2053
+#: g10/keygen.c:2076
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:2055
+#: g10/keygen.c:2078
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:2057
+#: g10/keygen.c:2080
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:2065
+#: g10/keygen.c:2088
msgid "Email address: "
msgstr "电子邮件地址:"
-#: g10/keygen.c:2071
+#: g10/keygen.c:2094
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:2079
+#: g10/keygen.c:2102
msgid "Comment: "
msgstr "注释:"
-#: g10/keygen.c:2085
+#: g10/keygen.c:2108
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:2107
+#: g10/keygen.c:2130
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:2113
+#: g10/keygen.c:2136
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4415,7 +4489,7 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:2118
+#: g10/keygen.c:2141
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@ -4430,23 +4504,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2134
+#: g10/keygen.c:2157
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2144
+#: g10/keygen.c:2167
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
-#: g10/keygen.c:2145
+#: g10/keygen.c:2168
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
-#: g10/keygen.c:2164
+#: g10/keygen.c:2187
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:2206
+#: g10/keygen.c:2229
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4454,19 +4528,19 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:2209
+#: g10/keygen.c:2232
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: g10/keygen.c:2225
+#: g10/keygen.c:2248
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2231
+#: g10/keygen.c:2254
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4478,7 +4552,7 @@ msgstr ""
"再次执行这个程序,并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:2255
+#: g10/keygen.c:2278
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4488,50 +4562,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:3126 g10/keygen.c:3153
+#: g10/keygen.c:3149 g10/keygen.c:3176
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:3358 g10/keygen.c:3525
+#: g10/keygen.c:3381 g10/keygen.c:3551
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:3360 g10/keygen.c:3528
+#: g10/keygen.c:3383 g10/keygen.c:3554
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:3363 g10/keygen.c:3531
+#: g10/keygen.c:3386 g10/keygen.c:3557
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:3512
+#: g10/keygen.c:3538
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环:%s\n"
-#: g10/keygen.c:3519
+#: g10/keygen.c:3545
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环:%s\n"
-#: g10/keygen.c:3539
+#: g10/keygen.c:3565
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3547
+#: g10/keygen.c:3573
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3574
+#: g10/keygen.c:3600
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
-#: g10/keygen.c:3585
+#: g10/keygen.c:3611
msgid ""
"Note that this key cannot be used for encryption. You may want to use\n"
"the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -4539,42 +4613,42 @@ msgstr ""
"请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
+#: g10/keygen.c:3624 g10/keygen.c:3770 g10/keygen.c:3891
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
-#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
+#: g10/keygen.c:3680 g10/keygen.c:3821 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
+#: g10/keygen.c:3682 g10/keygen.c:3823 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3667 g10/keygen.c:3808
+#: g10/keygen.c:3693 g10/keygen.c:3834
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3708 g10/keygen.c:3841
+#: g10/keygen.c:3734 g10/keygen.c:3867
msgid "Really create? (y/N) "
msgstr "真的要建立吗?(y/N)"
-#: g10/keygen.c:4029
+#: g10/keygen.c:4055
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败:%s\n"
-#: g10/keygen.c:4078
+#: g10/keygen.c:4104
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
-#: g10/keygen.c:4104
+#: g10/keygen.c:4130
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意:卡密钥的备份已保存到‘%s’\n"
@@ -4662,191 +4736,191 @@ msgstr "请修补这个可能的安全性漏洞\n"
msgid "caching keyring `%s'\n"
msgstr "缓存钥匙环‘%s’\n"
-#: g10/keyring.c:1476
+#: g10/keyring.c:1489
#, c-format
msgid "%lu keys cached so far (%lu signatures)\n"
msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n"
-#: g10/keyring.c:1488
+#: g10/keyring.c:1501
#, c-format
msgid "%lu keys cached (%lu signatures)\n"
msgstr "缓存了 %lu 把密钥(%lu 份签名)\n"
-#: g10/keyring.c:1560
+#: g10/keyring.c:1573
#, c-format
msgid "%s: keyring created\n"
msgstr "%s:钥匙环已建立\n"
-#: g10/keyserver.c:71
+#: g10/keyserver.c:74
msgid "include revoked keys in search results"
msgstr "在搜索结果中包含已吊销的密钥"
-#: g10/keyserver.c:72
+#: g10/keyserver.c:75
msgid "include subkeys when searching by key ID"
msgstr "按钥匙号搜索时包含子钥"
-#: g10/keyserver.c:74
+#: g10/keyserver.c:77
msgid "use temporary files to pass data to keyserver helpers"
msgstr "向公钥服务器辅助程序传递数据时使用临时文件"
-#: g10/keyserver.c:76
+#: g10/keyserver.c:79
msgid "do not delete temporary files after using them"
msgstr "不删除使用过的临时文件"
-#: g10/keyserver.c:80
+#: g10/keyserver.c:83
msgid "automatically retrieve keys when verifying signatures"
msgstr "验证签名时自动下载密钥"
-#: g10/keyserver.c:82
+#: g10/keyserver.c:85
msgid "honor the preferred keyserver URL set on the key"
msgstr "使用密钥中指定的首选公钥服务器 URL"
-#: g10/keyserver.c:84
+#: g10/keyserver.c:87
msgid "honor the PKA record set on a key when retrieving keys"
msgstr "获取密钥时使用密钥上的 PKA 记录"
-#: g10/keyserver.c:150
+#: g10/keyserver.c:153
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr "警告:公钥服务器选项‘%s’在此平台上没有被使用\n"
-#: g10/keyserver.c:541
+#: g10/keyserver.c:544
msgid "disabled"
msgstr "已禁用"
-#: g10/keyserver.c:744
+#: g10/keyserver.c:747
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
-#: g10/keyserver.c:828 g10/keyserver.c:1455
+#: g10/keyserver.c:831 g10/keyserver.c:1458
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
-#: g10/keyserver.c:929
+#: g10/keyserver.c:932
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
-#: g10/keyserver.c:931
+#: g10/keyserver.c:934
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
-#: g10/keyserver.c:1174
+#: g10/keyserver.c:1177
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’,从 %s 服务器 %s\n"
-#: g10/keyserver.c:1178
+#: g10/keyserver.c:1181
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s,从 %s\n"
-#: g10/keyserver.c:1202
+#: g10/keyserver.c:1205
#, c-format
msgid "searching for names from %s server %s\n"
msgstr "在 %s 服务器 %s 上搜索名字\n"
-#: g10/keyserver.c:1205
+#: g10/keyserver.c:1208
#, c-format
msgid "searching for names from %s\n"
msgstr "在 %s 上搜索名字\n"
-#: g10/keyserver.c:1358
+#: g10/keyserver.c:1361
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
-#: g10/keyserver.c:1362
+#: g10/keyserver.c:1365
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1405
+#: g10/keyserver.c:1408
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”,在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1408
+#: g10/keyserver.c:1411
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”,在 %s 上\n"
-#: g10/keyserver.c:1415 g10/keyserver.c:1511
+#: g10/keyserver.c:1418 g10/keyserver.c:1514
msgid "no keyserver action!\n"
msgstr "公钥服务器无动作!\n"
-#: g10/keyserver.c:1463
+#: g10/keyserver.c:1466
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告:处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1472
+#: g10/keyserver.c:1475
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1534 g10/keyserver.c:2063
+#: g10/keyserver.c:1537 g10/keyserver.c:2066
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1540
+#: g10/keyserver.c:1543
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n"
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1555
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n"
-#: g10/keyserver.c:1557
+#: g10/keyserver.c:1560
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1568
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s 不支持对版本 %d 的处理\n"
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1575
msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n"
-#: g10/keyserver.c:1577
+#: g10/keyserver.c:1580
msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n"
-#: g10/keyserver.c:1586
+#: g10/keyserver.c:1589
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误:%s\n"
-#: g10/keyserver.c:1611 g10/keyserver.c:1645
+#: g10/keyserver.c:1614 g10/keyserver.c:1648
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识:跳过\n"
-#: g10/keyserver.c:1904
+#: g10/keyserver.c:1907
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/keyserver.c:1926
+#: g10/keyserver.c:1929
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1928
+#: g10/keyserver.c:1931
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1984
+#: g10/keyserver.c:1987
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告:无法获取 URI %s:%s\n"
-#: g10/keyserver.c:1990
+#: g10/keyserver.c:1993
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "不能解析 URI %s\n"
@@ -4926,134 +5000,139 @@ msgstr "警告:报文未受到完整的保护\n"
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告:加密过的报文已经变造!\n"
-#: g10/mainproc.c:590
+#: g10/mainproc.c:592
+#, c-format
+msgid "cleared passphrase cached with ID: %s\n"
+msgstr ""
+
+#: g10/mainproc.c:597
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失败:%s\n"
-#: g10/mainproc.c:611
+#: g10/mainproc.c:618
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "注意:发件者要求您“只阅读不存盘”\n"
-#: g10/mainproc.c:613
+#: g10/mainproc.c:620
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
-#: g10/mainproc.c:701
+#: g10/mainproc.c:708
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
-#: g10/mainproc.c:842
+#: g10/mainproc.c:849
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
-#: g10/mainproc.c:1195 g10/mainproc.c:1232
+#: g10/mainproc.c:1202 g10/mainproc.c:1239
msgid "no signature found\n"
msgstr "未找到签名\n"
-#: g10/mainproc.c:1470
+#: g10/mainproc.c:1477
msgid "signature verification suppressed\n"
msgstr "签名验证已被抑制\n"
-#: g10/mainproc.c:1579
+#: g10/mainproc.c:1586
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些有歧义的签名\n"
-#: g10/mainproc.c:1590
+#: g10/mainproc.c:1597
#, c-format
msgid "Signature made %s\n"
msgstr "签名建立于 %s\n"
-#: g10/mainproc.c:1591
+#: g10/mainproc.c:1598
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
-#: g10/mainproc.c:1595
+#: g10/mainproc.c:1602
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签名,使用 %s,钥匙号 %s\n"
-#: g10/mainproc.c:1615
+#: g10/mainproc.c:1622
msgid "Key available at: "
msgstr "可用的密钥在:"
-#: g10/mainproc.c:1748 g10/mainproc.c:1796
+#: g10/mainproc.c:1755 g10/mainproc.c:1803
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签名,来自于“%s”"
-#: g10/mainproc.c:1750 g10/mainproc.c:1798
+#: g10/mainproc.c:1757 g10/mainproc.c:1805
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签名,来自于“%s”"
-#: g10/mainproc.c:1752 g10/mainproc.c:1800
+#: g10/mainproc.c:1759 g10/mainproc.c:1807
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签名,来自于“%s”"
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1809
msgid "[uncertain]"
msgstr "[不确定]"
-#: g10/mainproc.c:1835
+#: g10/mainproc.c:1842
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
-#: g10/mainproc.c:1933
+#: g10/mainproc.c:1940
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签名已于 %s 过期。\n"
-#: g10/mainproc.c:1938
+#: g10/mainproc.c:1945
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签名在 %s 过期。\n"
-#: g10/mainproc.c:1941
+#: g10/mainproc.c:1948
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s 签名,散列算法 %s\n"
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1949
msgid "binary"
msgstr "二进制"
-#: g10/mainproc.c:1943
+#: g10/mainproc.c:1950
msgid "textmode"
msgstr "文本模式"
-#: g10/mainproc.c:1943 g10/trustdb.c:525
+#: g10/mainproc.c:1950 g10/trustdb.c:546
msgid "unknown"
msgstr "未知"
-#: g10/mainproc.c:1963
+#: g10/mainproc.c:1970
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签名:%s\n"
-#: g10/mainproc.c:2047 g10/mainproc.c:2063 g10/mainproc.c:2159
+#: g10/mainproc.c:2054 g10/mainproc.c:2070 g10/mainproc.c:2166
msgid "not a detached signature\n"
msgstr "不是一份分离的签名\n"
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2097
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告:检测到多重签名。只检查第一个签名。\n"
-#: g10/mainproc.c:2098
+#: g10/mainproc.c:2105
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签名\n"
-#: g10/mainproc.c:2163
+#: g10/mainproc.c:2170
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签名\n"
-#: g10/mainproc.c:2173
+#: g10/mainproc.c:2180
msgid "invalid root packet detected in proc_tree()\n"
msgstr "在 proc_tree() 中检测到无效的根包\n"
@@ -5206,12 +5285,12 @@ msgstr "警告:潜在不安全的对称加密会话密钥\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
-#: g10/passphrase.c:288 g10/passphrase.c:548
+#: g10/passphrase.c:292 g10/passphrase.c:553
#, c-format
msgid " (main key ID %s)"
msgstr " (主钥匙号 %s)"
-#: g10/passphrase.c:302
+#: g10/passphrase.c:306
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5224,32 +5303,32 @@ msgstr ""
"“%.*s”\n"
"%u 位的 %s 密钥,钥匙号 %s,建立于 %s%s\n"
-#: g10/passphrase.c:328
+#: g10/passphrase.c:332
msgid "Enter passphrase\n"
msgstr "请输入密码\n"
-#: g10/passphrase.c:356
+#: g10/passphrase.c:360
msgid "cancelled by user\n"
msgstr "用户取消\n"
-#: g10/passphrase.c:362 g10/passphrase.c:425
+#: g10/passphrase.c:366 g10/passphrase.c:429
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "代理程序有问题――正在停用代理程序\n"
-#: g10/passphrase.c:527
+#: g10/passphrase.c:532
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr "您需要输入密码,才能解开这个用户的私钥:“%s”\n"
-#: g10/passphrase.c:535
+#: g10/passphrase.c:540
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u 位的 %s 密钥,钥匙号 %s,建立于 %s"
-#: g10/passphrase.c:544
+#: g10/passphrase.c:549
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
@@ -5909,25 +5988,25 @@ msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明�
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
-#: g10/skclist.c:138 g10/skclist.c:202
+#: g10/skclist.c:140 g10/skclist.c:217
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用!\n"
-#: g10/skclist.c:169
+#: g10/skclist.c:174
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "“%s”已跳过:重复\n"
-#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
+#: g10/skclist.c:182 g10/skclist.c:195 g10/skclist.c:207
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "“%s”已跳过:%s\n"
-#: g10/skclist.c:182
+#: g10/skclist.c:190
msgid "skipped: secret key already present\n"
msgstr "已跳过:私钥已存在\n"
-#: g10/skclist.c:197
+#: g10/skclist.c:208
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "这是一把由 PGP 生成的 ElGamal 密钥,用于签名不安全!"
@@ -6105,9 +6184,10 @@ msgstr "%s:记录归零时失败:%s\n"
msgid "%s: failed to append a record: %s\n"
msgstr "%s:附加记录时失败:%s\n"
-#: g10/tdbio.c:1507
-msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "信任度数据库已损坏;请执行“gpg --fix-trustdb”。\n"
+#: g10/tdbio.c:1505
+#, fuzzy
+msgid "Error: The trustdb is corrupted.\n"
+msgstr "%s:建立了信任度数据库\n"
#: g10/textfilter.c:147
#, c-format
@@ -6154,127 +6234,135 @@ msgstr "信任记录 %lu,请求类别 %d:读取失败:%s\n"
msgid "trust record %lu is not of requested type %d\n"
msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
-#: g10/trustdb.c:441
+#: g10/trustdb.c:418
+msgid "You may try to re-create the trustdb using the commands:\n"
+msgstr ""
+
+#: g10/trustdb.c:427
+msgid "If that does not work, please consult the manual\n"
+msgstr ""
+
+#: g10/trustdb.c:462
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
-#: g10/trustdb.c:447
+#: g10/trustdb.c:468
#, c-format
msgid "using %s trust model\n"
msgstr "使用 %s 信任模型\n"
-#: g10/trustdb.c:499
+#: g10/trustdb.c:520
msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
-#: g10/trustdb.c:501
+#: g10/trustdb.c:522
msgid "[ revoked]"
msgstr "[已吊销]"
-#: g10/trustdb.c:503 g10/trustdb.c:508
+#: g10/trustdb.c:524 g10/trustdb.c:529
msgid "[ expired]"
msgstr "[已过期]"
-#: g10/trustdb.c:507
+#: g10/trustdb.c:528
msgid "[ unknown]"
msgstr "[ 未知 ]"
-#: g10/trustdb.c:509
+#: g10/trustdb.c:530
msgid "[ undef ]"
msgstr "[未定义]"
-#: g10/trustdb.c:510
+#: g10/trustdb.c:531
msgid "[marginal]"
msgstr "[ 勉强 ]"
-#: g10/trustdb.c:511
+#: g10/trustdb.c:532
msgid "[ full ]"
msgstr "[ 完全 ]"
-#: g10/trustdb.c:512
+#: g10/trustdb.c:533
msgid "[ultimate]"
msgstr "[ 绝对 ]"
-#: g10/trustdb.c:527
+#: g10/trustdb.c:548
msgid "undefined"
msgstr "未定义"
-#: g10/trustdb.c:528
+#: g10/trustdb.c:549
msgid "never"
msgstr "从不"
-#: g10/trustdb.c:529
+#: g10/trustdb.c:550
msgid "marginal"
msgstr "勉强"
-#: g10/trustdb.c:530
+#: g10/trustdb.c:551
msgid "full"
msgstr "完全"
-#: g10/trustdb.c:531
+#: g10/trustdb.c:552
msgid "ultimate"
msgstr "绝对"
-#: g10/trustdb.c:571
+#: g10/trustdb.c:592
msgid "no need for a trustdb check\n"
msgstr "不需要检查信任度数据库\n"
-#: g10/trustdb.c:577 g10/trustdb.c:2456
+#: g10/trustdb.c:598 g10/trustdb.c:2477
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任度数据库检查将于 %s 进行\n"
-#: g10/trustdb.c:586
+#: g10/trustdb.c:607
#, c-format
msgid "no need for a trustdb check with `%s' trust model\n"
msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
-#: g10/trustdb.c:601
+#: g10/trustdb.c:622
#, c-format
msgid "no need for a trustdb update with `%s' trust model\n"
msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
-#: g10/trustdb.c:833 g10/trustdb.c:1279
+#: g10/trustdb.c:854 g10/trustdb.c:1300
#, c-format
msgid "public key %s not found: %s\n"
msgstr "找不到公钥 %s:%s\n"
-#: g10/trustdb.c:1028
+#: g10/trustdb.c:1049
msgid "please do a --check-trustdb\n"
msgstr "请执行一次 --check-trustdb\n"
-#: g10/trustdb.c:1032
+#: g10/trustdb.c:1053
msgid "checking the trustdb\n"
msgstr "正在检查信任度数据库\n"
-#: g10/trustdb.c:2199
+#: g10/trustdb.c:2220
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
-#: g10/trustdb.c:2264
+#: g10/trustdb.c:2285
msgid "no ultimately trusted keys found\n"
msgstr "没有找到任何绝对信任的密钥\n"
-#: g10/trustdb.c:2278
+#: g10/trustdb.c:2299
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2322
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "需要 %d 份勉强信任和 %d 份完全信任,%s 信任模型\n"
-#: g10/trustdb.c:2387
+#: g10/trustdb.c:2408
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
"深度:%d 有效性:%3d 已签名:%3d 信任度:%d-,%dq,%dn,%dm,%df,%du\n"
-#: g10/trustdb.c:2462
+#: g10/trustdb.c:2483
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录:写入失败:%s\n"
@@ -6445,270 +6533,268 @@ msgstr ""
msgid "enable full debugging"
msgstr ""
-#: kbx/kbxutil.c:114
-#, fuzzy
-msgid "Please report bugs to "
-msgstr ""
-"请向 <[email protected]> 报告程序缺陷。\n"
-"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-
-#: kbx/kbxutil.c:118
+#: kbx/kbxutil.c:117
#, fuzzy
msgid "Usage: kbxutil [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: kbx/kbxutil.c:121
+#: kbx/kbxutil.c:120
msgid ""
"Syntax: kbxutil [options] [files]\n"
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:712 scd/app-openpgp.c:2520
+#: scd/app-nks.c:713 scd/app-openpgp.c:2638
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-nks.c:720 scd/app-openpgp.c:2532
+#: scd/app-nks.c:721 scd/app-openpgp.c:2650
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-nks.c:800 scd/app-openpgp.c:1536 scd/app-openpgp.c:1555
-#: scd/app-openpgp.c:1716 scd/app-openpgp.c:1733 scd/app-openpgp.c:1977
-#: scd/app-openpgp.c:2022 scd/app-dinsig.c:303
+#: scd/app-nks.c:801 scd/app-openpgp.c:1540 scd/app-openpgp.c:1559
+#: scd/app-openpgp.c:1720 scd/app-openpgp.c:1737 scd/app-openpgp.c:1985
+#: scd/app-openpgp.c:2030 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN 回调返回错误:%s\n"
-#: scd/app-nks.c:833
+#: scd/app-nks.c:834
msgid "the NullPIN has not yet been changed\n"
msgstr ""
-#: scd/app-nks.c:1090
+#: scd/app-nks.c:1092
#, fuzzy
msgid "|N|Please enter a new PIN for the standard keys."
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-nks.c:1091
+#: scd/app-nks.c:1093
#, fuzzy
msgid "||Please enter the PIN for the standard keys."
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-nks.c:1097
+#: scd/app-nks.c:1099
#, fuzzy
msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-nks.c:1099
+#: scd/app-nks.c:1101
#, fuzzy
msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-nks.c:1107
+#: scd/app-nks.c:1109
msgid "|N|Please enter a new PIN for the key to create qualified signatures."
msgstr ""
-#: scd/app-nks.c:1109
+#: scd/app-nks.c:1111
msgid "||Please enter the PIN for the key to create qualified signatures."
msgstr ""
-#: scd/app-nks.c:1117
+#: scd/app-nks.c:1119
msgid ""
"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
"qualified signatures."
msgstr ""
-#: scd/app-nks.c:1119
+#: scd/app-nks.c:1121
msgid ""
"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
"qualified signatures."
msgstr ""
-#: scd/app-nks.c:1220 scd/app-openpgp.c:2055 scd/app-dinsig.c:531
+#: scd/app-nks.c:1222 scd/app-openpgp.c:2063 scd/app-dinsig.c:532
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: scd/app-openpgp.c:691
+#: scd/app-openpgp.c:695
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "无法存储指纹:%s\n"
-#: scd/app-openpgp.c:704
+#: scd/app-openpgp.c:708
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "无法存储创建日期:%s\n"
-#: scd/app-openpgp.c:1143
+#: scd/app-openpgp.c:1147
#, c-format
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: scd/app-openpgp.c:1151 scd/app-openpgp.c:2755
+#: scd/app-openpgp.c:1155 scd/app-openpgp.c:2873
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1159 scd/app-openpgp.c:2763
+#: scd/app-openpgp.c:1163 scd/app-openpgp.c:2881
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1168 scd/app-openpgp.c:2773
+#: scd/app-openpgp.c:1172 scd/app-openpgp.c:2891
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
-#: scd/app-openpgp.c:1488
+#: scd/app-openpgp.c:1492
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1499
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1510
+#: scd/app-openpgp.c:1514
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1521 scd/app-openpgp.c:1971
+#: scd/app-openpgp.c:1525 scd/app-openpgp.c:1979
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1562 scd/app-openpgp.c:1740 scd/app-openpgp.c:1984
+#: scd/app-openpgp.c:1566 scd/app-openpgp.c:1744 scd/app-openpgp.c:1992
#, 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:1575 scd/app-openpgp.c:1614 scd/app-openpgp.c:1752
-#: scd/app-openpgp.c:3072
+#: scd/app-openpgp.c:1579 scd/app-openpgp.c:1618 scd/app-openpgp.c:1756
+#: scd/app-openpgp.c:3191
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败:%s\n"
-#: scd/app-openpgp.c:1643 scd/app-openpgp.c:2003 scd/app-openpgp.c:3335
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:2011 scd/app-openpgp.c:3487
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1649 scd/app-openpgp.c:3344
+#: scd/app-openpgp.c:1653 scd/app-openpgp.c:3496
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定!\n"
-#: scd/app-openpgp.c:1656
+#: scd/app-openpgp.c:1660
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
#. the start of the string. Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1663
+#: scd/app-openpgp.c:1667
#, fuzzy, c-format
msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1667
+#: scd/app-openpgp.c:1671
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1688
+#: scd/app-openpgp.c:1692
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:2018
+#: scd/app-openpgp.c:2026
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:2028 scd/app-openpgp.c:2080
+#: scd/app-openpgp.c:2036 scd/app-openpgp.c:2088
#, fuzzy, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
-#: scd/app-openpgp.c:2050
+#: scd/app-openpgp.c:2058
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:2051
+#: scd/app-openpgp.c:2059
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:2051
+#: scd/app-openpgp.c:2059
msgid "|N|New PIN"
msgstr "新的 PIN"
-#: scd/app-openpgp.c:2160 scd/app-openpgp.c:2841
+#: scd/app-openpgp.c:2169 scd/app-openpgp.c:2959
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:2166 scd/app-openpgp.c:2848
+#: scd/app-openpgp.c:2175 scd/app-openpgp.c:2966
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:2176
+#: scd/app-openpgp.c:2185
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:2180
+#: scd/app-openpgp.c:2189
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:2182
+#: scd/app-openpgp.c:2191
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:2508
+#: scd/app-openpgp.c:2193
+#, fuzzy
+msgid "writing new key\n"
+msgstr "生成新密钥\n"
+
+#: scd/app-openpgp.c:2618
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:2542 scd/app-openpgp.c:2550
+#: scd/app-openpgp.c:2660 scd/app-openpgp.c:2668
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2646
+#: scd/app-openpgp.c:2764
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥:%s\n"
-#: scd/app-openpgp.c:2732
+#: scd/app-openpgp.c:2850
msgid "please wait while key is being generated ...\n"
msgstr "请稍候,正在生成密钥……\n"
-#: scd/app-openpgp.c:2745
+#: scd/app-openpgp.c:2863
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:2748
+#: scd/app-openpgp.c:2866
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:2806
+#: scd/app-openpgp.c:2924
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2856
+#: scd/app-openpgp.c:2974
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2971
+#: scd/app-openpgp.c:3090
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:3047
+#: scd/app-openpgp.c:3166
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名:%lu\n"
-#: scd/app-openpgp.c:3349
+#: scd/app-openpgp.c:3501
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:3574 scd/app-openpgp.c:3585
+#: scd/app-openpgp.c:3726 scd/app-openpgp.c:3737
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@ -6720,74 +6806,74 @@ msgstr ""
#. 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-dinsig.c:528
+#: scd/app-dinsig.c:529
#, fuzzy
msgid "|N|Initial New PIN"
msgstr "新的 PIN"
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:108
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:117 sm/gpgsm.c:313
+#: scd/scdaemon.c:118 sm/gpgsm.c:313
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:125 tools/gpgconf-comp.c:620
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "从‘%s’读取选项\n"
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:127
msgid "|N|connect to reader at port N"
msgstr ""
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:129
msgid "|NAME|use NAME as ct-API driver"
msgstr ""
-#: scd/scdaemon.c:130
+#: scd/scdaemon.c:131
msgid "|NAME|use NAME as PC/SC driver"
msgstr ""
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:134
msgid "do not use the internal CCID driver"
msgstr ""
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:140
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:142
msgid "do not use a reader's keypad"
msgstr ""
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:145
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "显示管理员命令"
-#: scd/scdaemon.c:257
+#: scd/scdaemon.c:258
#, fuzzy
msgid "Usage: scdaemon [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: scd/scdaemon.c:259
+#: scd/scdaemon.c:260
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:737
+#: scd/scdaemon.c:738
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1090
+#: scd/scdaemon.c:1092
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1102
+#: scd/scdaemon.c:1104
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
@@ -6826,11 +6912,11 @@ msgstr ""
msgid "validation model requested by certificate: %s"
msgstr ""
-#: sm/certchain.c:197 sm/certchain.c:1807
+#: sm/certchain.c:197 sm/certchain.c:1813
msgid "chain"
msgstr ""
-#: sm/certchain.c:198 sm/certchain.c:1807
+#: sm/certchain.c:198 sm/certchain.c:1813
msgid "shell"
msgstr ""
@@ -6884,196 +6970,186 @@ msgstr "生成密码的时候发生错误:%s\n"
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
+#: sm/certchain.c:744 sm/certchain.c:1237 sm/certchain.c:1841 sm/decrypt.c:259
#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "无法存储密钥:%s\n"
-#: sm/certchain.c:904
+#: sm/certchain.c:910
#, fuzzy
msgid "certificate has been revoked"
msgstr "注意:密钥已被吊销"
-#: sm/certchain.c:914
-#, fuzzy
-msgid "no CRL found for certificate"
-msgstr "证书已损坏"
-
-#: sm/certchain.c:919
+#: sm/certchain.c:925
msgid "the status of the certificate is unknown"
msgstr ""
-#: sm/certchain.c:924
-#, fuzzy
-msgid "the available CRL is too old"
-msgstr "可用的密钥在:"
-
-#: sm/certchain.c:926
+#: sm/certchain.c:932
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:938
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:961 sm/certchain.c:1029
+#: sm/certchain.c:967 sm/certchain.c:1035
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:976 sm/certchain.c:1061
+#: sm/certchain.c:982 sm/certchain.c:1067
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:977 sm/certchain.c:1062
+#: sm/certchain.c:983 sm/certchain.c:1068
#, fuzzy
msgid "root certificate not yet valid"
msgstr "不允许导出私钥\n"
-#: sm/certchain.c:978 sm/certchain.c:1063
+#: sm/certchain.c:984 sm/certchain.c:1069
msgid "intermediate certificate not yet valid"
msgstr ""
-#: sm/certchain.c:991
+#: sm/certchain.c:997
#, fuzzy
msgid "certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:992
+#: sm/certchain.c:998
#, fuzzy
msgid "root certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:993
+#: sm/certchain.c:999
#, fuzzy
msgid "intermediate certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:1035
+#: sm/certchain.c:1041
#, c-format
msgid "required certificate attributes missing: %s%s%s"
msgstr ""
-#: sm/certchain.c:1044
+#: sm/certchain.c:1050
#, fuzzy
msgid "certificate with invalid validity"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:1081
+#: sm/certchain.c:1087
msgid "signature not created during lifetime of certificate"
msgstr ""
-#: sm/certchain.c:1083
+#: sm/certchain.c:1089
msgid "certificate not created during lifetime of issuer"
msgstr ""
-#: sm/certchain.c:1084
+#: sm/certchain.c:1090
msgid "intermediate certificate not created during lifetime of issuer"
msgstr ""
-#: sm/certchain.c:1088
+#: sm/certchain.c:1094
#, fuzzy
msgid " ( signature created at "
msgstr " 清除的签名:%lu\n"
-#: sm/certchain.c:1089
+#: sm/certchain.c:1095
#, fuzzy
msgid " (certificate created at "
msgstr "已建立吊销证书。\n"
-#: sm/certchain.c:1092
+#: sm/certchain.c:1098
#, fuzzy
msgid " (certificate valid from "
msgstr "证书已损坏"
-#: sm/certchain.c:1093
+#: sm/certchain.c:1099
#, fuzzy
msgid " ( issuer valid from "
msgstr "卡序列号 ="
-#: sm/certchain.c:1123
+#: sm/certchain.c:1129
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA 指纹:"
-#: sm/certchain.c:1132
+#: sm/certchain.c:1138
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:1145
+#: sm/certchain.c:1151
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:1151
+#: sm/certchain.c:1157
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:1208
+#: sm/certchain.c:1214
msgid "WARNING: creation time of signature not known - assuming current time"
msgstr ""
-#: sm/certchain.c:1272
+#: sm/certchain.c:1278
#, fuzzy
msgid "no issuer found in certificate"
msgstr "生成一份吊销证书"
-#: sm/certchain.c:1345
+#: sm/certchain.c:1351
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:1414
+#: sm/certchain.c:1420
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:1427
+#: sm/certchain.c:1433
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:1456 sm/import.c:160
+#: sm/certchain.c:1462 sm/import.c:160
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1468
+#: sm/certchain.c:1474
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1501
+#: sm/certchain.c:1507
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "验证签名"
-#: sm/certchain.c:1532
+#: sm/certchain.c:1538
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1583
+#: sm/certchain.c:1589
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certchain.c:1623 sm/certchain.c:1906
+#: sm/certchain.c:1629 sm/certchain.c:1912
#, fuzzy
msgid "certificate is good\n"
msgstr "首选项‘%s’重复\n"
-#: sm/certchain.c:1624
+#: sm/certchain.c:1630
#, fuzzy
msgid "intermediate certificate is good\n"
msgstr "已建立吊销证书。\n"
-#: sm/certchain.c:1625
+#: sm/certchain.c:1631
#, fuzzy
msgid "root certificate is good\n"
msgstr "证书已损坏"
-#: sm/certchain.c:1796
+#: sm/certchain.c:1802
msgid "switching to chain model"
msgstr ""
-#: sm/certchain.c:1805
+#: sm/certchain.c:1811
#, c-format
msgid "validation model used: %s"
msgstr ""
@@ -7537,51 +7613,51 @@ msgstr ""
msgid "usage: gpgsm [options] "
msgstr "用法:gpg [选项] "
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:710
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "无法连接至‘%s’:%s\n"
-#: sm/gpgsm.c:731
+#: sm/gpgsm.c:721
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "未知的选项 '%s'\n"
-#: sm/gpgsm.c:782
+#: sm/gpgsm.c:772
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(不给定描述)\n"
-#: sm/gpgsm.c:801
+#: sm/gpgsm.c:791
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:822
+#: sm/gpgsm.c:812
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = 跳过这把密钥\n"
-#: sm/gpgsm.c:1352
+#: sm/gpgsm.c:1342
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "无法解析公钥服务器 URL\n"
-#: sm/gpgsm.c:1433
+#: sm/gpgsm.c:1423
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1533
+#: sm/gpgsm.c:1523
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1571
+#: sm/gpgsm.c:1561
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "无法存取‘%s’:%s\n"
-#: sm/gpgsm.c:1911
+#: sm/gpgsm.c:1892
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7663,7 +7739,7 @@ msgstr ""
msgid "error storing flags: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: sm/keylist.c:640
+#: sm/keylist.c:642
msgid "Error - "
msgstr ""
@@ -7706,17 +7782,17 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:431
+#: sm/sign.c:441
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "保护算法 %d%s 未被支持\n"
-#: sm/sign.c:445
+#: sm/sign.c:455
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
-#: sm/sign.c:495
+#: sm/sign.c:505
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "检查已建立的签名时发生错误: %s\n"
@@ -8246,6 +8322,21 @@ msgid ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
+#~ msgstr "信任度数据库已损坏;请执行“gpg --fix-trustdb”。\n"
+
+#, fuzzy
+#~ msgid "Please report bugs to <"
+#~ msgstr ""
+#~ "请向 <[email protected]> 报告程序缺陷。\n"
+#~ "请向 <[email protected]> 反映简体中文翻译的问题。\n"
+
+#, fuzzy
+#~ msgid "Please report bugs to "
+#~ msgstr ""
+#~ "请向 <[email protected]> 报告程序缺陷。\n"
+#~ "请向 <[email protected]> 反映简体中文翻译的问题。\n"
+
#~ msgid "DSA keypair will have %u bits.\n"
#~ msgstr "DSA 密钥对会有 %u 位。\n"
@@ -8698,13 +8789,6 @@ msgstr ""
#~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
#~ msgstr "请插入卡并回车,或输入‘c’来取消:"
-#~ msgid ""
-#~ "Please remove the current card and insert the one with serial number:\n"
-#~ " %.*s\n"
-#~ msgstr ""
-#~ "请取出当前的卡,并插入有下列序列号的卡:\n"
-#~ " %.*s\n"
-
#~ msgid "Hit return when ready or enter 'c' to cancel: "
#~ msgstr "就绪后请回车,或输入‘c’取消"