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.po1714
1 files changed, 899 insertions, 815 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 072706509..769938f81 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2006-11-28 16:59+0100\n"
+"POT-Creation-Date: 2007-01-31 14:33+0100\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -37,36 +37,41 @@ msgid ""
"this session"
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/call-pinentry.c:458 agent/call-pinentry.c:470
+#: agent/call-pinentry.c:440
+#, c-format
+msgid "SETERROR %s (try %d of %d)"
+msgstr ""
+
+#: agent/call-pinentry.c:460 agent/call-pinentry.c:472
#, fuzzy
msgid "PIN too long"
msgstr "列太长"
-#: agent/call-pinentry.c:459
+#: agent/call-pinentry.c:461
#, fuzzy
msgid "Passphrase too long"
msgstr "列太长"
-#: agent/call-pinentry.c:467
+#: agent/call-pinentry.c:469
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "姓名含有无效的字符\n"
-#: agent/call-pinentry.c:472
+#: agent/call-pinentry.c:474
msgid "PIN too short"
msgstr ""
-#: agent/call-pinentry.c:484
+#: agent/call-pinentry.c:486
#, fuzzy
msgid "Bad PIN"
msgstr "损坏的多精度整数(MPI)"
-#: agent/call-pinentry.c:485
+#: agent/call-pinentry.c:487
#, fuzzy
msgid "Bad Passphrase"
msgstr "错误的密码"
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:523
#, fuzzy
msgid "Passphrase"
msgstr "错误的密码"
@@ -76,21 +81,21 @@ msgstr "错误的密码"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
-#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1016 g10/keygen.c:3048
-#: g10/keygen.c:3078 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
-#: g10/openfile.c:360 g10/sign.c:830 g10/sign.c:1136 g10/tdbio.c:538
+#: agent/command-ssh.c:692 g10/exec.c:480 g10/gpg.c:1020 g10/keygen.c:3067
+#: g10/keygen.c:3096 g10/keyring.c:1204 g10/keyring.c:1508 g10/openfile.c:267
+#: g10/openfile.c:360 g10/sign.c:832 g10/sign.c:1141 g10/tdbio.c:538
#, c-format
msgid "can't create `%s': %s\n"
msgstr "无法建立‘%s’:%s\n"
#: agent/command-ssh.c:704 g10/card-util.c:679 g10/card-util.c:748
-#: g10/dearmor.c:62 g10/dearmor.c:111 g10/decrypt.c:70 g10/encode.c:196
-#: g10/encode.c:488 g10/gpg.c:1017 g10/import.c:195 g10/keygen.c:2556
+#: g10/dearmor.c:62 g10/dearmor.c:109 g10/decrypt.c:72 g10/encode.c:196
+#: g10/encode.c:506 g10/gpg.c:1021 g10/import.c:195 g10/keygen.c:2562
#: g10/keyring.c:1534 g10/openfile.c:190 g10/openfile.c:345
-#: g10/plaintext.c:491 g10/sign.c:812 g10/sign.c:1007 g10/sign.c:1120
-#: g10/sign.c:1272 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
-#: g10/tdbio.c:605 g10/verify.c:102 g10/verify.c:158 sm/gpgsm.c:1771
-#: sm/gpgsm.c:1808 sm/qualified.c:74
+#: g10/plaintext.c:493 g10/sign.c:814 g10/sign.c:1009 g10/sign.c:1125
+#: g10/sign.c:1281 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:542
+#: g10/tdbio.c:605 g10/verify.c:100 g10/verify.c:163 sm/gpgsm.c:1775
+#: sm/gpgsm.c:1812 sm/qualified.c:74
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’: %s\n"
@@ -161,29 +166,50 @@ msgstr "PIN 再次输入时与首次输入不符;请再试一次"
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: agent/genkey.c:109
+#: agent/genkey.c:90
+#, c-format
+msgid ""
+"Warning: You have entered a passphrase that%%0Ais obviously not secure. A "
+"passphrase should%%0Abe at least %u character long."
+msgid_plural ""
+"Warning: You have entered a passphrase that%%0Ais obviously not secure. A "
+"passphrase should%%0Abe at least %u characters long."
+msgstr[0] ""
+msgstr[1] ""
+
+#: agent/genkey.c:100
+#, fuzzy
+msgid "Take this one anyway"
+msgstr "无论如何还是使用这把密钥吗?(y/N)"
+
+#: agent/genkey.c:101
+#, fuzzy
+msgid "Enter new passphrase"
+msgstr "请输入密码\n"
+
+#: agent/genkey.c:146
#, fuzzy, c-format
msgid "Please enter the passphrase to%0Ato protect your new key"
msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: agent/genkey.c:111 agent/genkey.c:219 agent/protect-tool.c:1215
+#: agent/genkey.c:148 agent/genkey.c:266 agent/protect-tool.c:1216
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "更改密码"
-#: agent/genkey.c:132 agent/genkey.c:239 agent/protect-tool.c:1221
+#: agent/genkey.c:175 agent/genkey.c:293 agent/protect-tool.c:1222
#: tools/symcryptrun.c:487
msgid "does not match - try again"
msgstr ""
-#: agent/genkey.c:218
+#: agent/genkey.c:265
#, fuzzy
msgid "Please enter the new passphrase"
msgstr "更改密码"
-#: agent/gpg-agent.c:111 agent/preset-passphrase.c:74 agent/protect-tool.c:109
+#: agent/gpg-agent.c:112 agent/preset-passphrase.c:74 agent/protect-tool.c:109
#: scd/scdaemon.c:103
#, fuzzy
msgid ""
@@ -194,104 +220,104 @@ msgstr ""
"选项:\n"
" "
-#: agent/gpg-agent.c:113 scd/scdaemon.c:105
+#: agent/gpg-agent.c:114 scd/scdaemon.c:105
msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:114 scd/scdaemon.c:108
+#: agent/gpg-agent.c:115 scd/scdaemon.c:108
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:115 g10/gpg.c:465 g10/gpgv.c:71 kbx/kbxutil.c:82
+#: agent/gpg-agent.c:116 g10/gpg.c:468 g10/gpgv.c:71 kbx/kbxutil.c:82
#: scd/scdaemon.c:109 sm/gpgsm.c:335 tools/gpg-connect-agent.c:59
#: tools/gpgconf.c:63 tools/symcryptrun.c:185
msgid "verbose"
msgstr "详细模式"
-#: agent/gpg-agent.c:116 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
+#: agent/gpg-agent.c:117 g10/gpgv.c:72 kbx/kbxutil.c:83 scd/scdaemon.c:110
#: sm/gpgsm.c:336
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
-#: agent/gpg-agent.c:117 scd/scdaemon.c:111
+#: agent/gpg-agent.c:118 scd/scdaemon.c:111
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:118 scd/scdaemon.c:112
+#: agent/gpg-agent.c:119 scd/scdaemon.c:112
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:119 tools/symcryptrun.c:188
+#: agent/gpg-agent.c:120 tools/symcryptrun.c:188
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
-#: agent/gpg-agent.c:124 scd/scdaemon.c:121
+#: agent/gpg-agent.c:125 scd/scdaemon.c:121
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:125
+#: agent/gpg-agent.c:126
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:126 scd/scdaemon.c:122 sm/gpgsm.c:338
+#: agent/gpg-agent.c:127 scd/scdaemon.c:122 sm/gpgsm.c:338
#: tools/symcryptrun.c:187
#, fuzzy
msgid "use a log file for the server"
msgstr "在公钥服务器上搜寻密钥"
-#: agent/gpg-agent.c:128
+#: agent/gpg-agent.c:129
#, fuzzy
msgid "use a standard location for the socket"
msgstr "为所选用户标识的设定注记"
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:134
+#: agent/gpg-agent.c:135
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "导入后不更新信任度数据库"
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:145
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:147
+#: agent/gpg-agent.c:148
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:152
+#: agent/gpg-agent.c:154
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
msgid "allow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
#, fuzzy
msgid "allow presetting passphrase"
msgstr "生成密码的时候发生错误:%s\n"
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:159
msgid "enable ssh-agent emulation"
msgstr ""
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
msgid "|FILE|write environment settings also to FILE"
msgstr ""
-#: agent/gpg-agent.c:241 agent/preset-passphrase.c:96 agent/protect-tool.c:143
+#: agent/gpg-agent.c:244 agent/preset-passphrase.c:96 agent/protect-tool.c:143
#: scd/scdaemon.c:190 sm/gpgsm.c:517 tools/gpg-connect-agent.c:123
#: tools/gpgconf.c:86 tools/symcryptrun.c:225
#, fuzzy
@@ -300,148 +326,148 @@ msgstr ""
"请向 <[email protected]> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:247
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:249
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:305
+#: agent/gpg-agent.c:308
#, c-format
msgid "out of core in secure memory while allocating %lu bytes"
msgstr ""
-#: agent/gpg-agent.c:308
+#: agent/gpg-agent.c:311
#, c-format
msgid "out of core while allocating %lu bytes"
msgstr ""
-#: agent/gpg-agent.c:339 g10/gpg.c:923 scd/scdaemon.c:264 sm/gpgsm.c:646
+#: agent/gpg-agent.c:342 g10/gpg.c:927 scd/scdaemon.c:264 sm/gpgsm.c:646
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:510 agent/protect-tool.c:1073 g10/gpg.c:1808
-#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:767
+#: agent/gpg-agent.c:516 agent/protect-tool.c:1073 g10/gpg.c:1831
+#: kbx/kbxutil.c:432 scd/scdaemon.c:356 sm/gpgsm.c:768
#: tools/symcryptrun.c:1056
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:604 g10/gpg.c:2007 scd/scdaemon.c:433 sm/gpgsm.c:864
+#: agent/gpg-agent.c:610 g10/gpg.c:2031 scd/scdaemon.c:433 sm/gpgsm.c:865
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: agent/gpg-agent.c:609 agent/gpg-agent.c:1160 g10/gpg.c:2011
-#: scd/scdaemon.c:438 sm/gpgsm.c:868 tools/symcryptrun.c:989
+#: agent/gpg-agent.c:615 agent/gpg-agent.c:1166 g10/gpg.c:2035
+#: scd/scdaemon.c:438 sm/gpgsm.c:869 tools/symcryptrun.c:989
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:617 g10/gpg.c:2018 scd/scdaemon.c:446 sm/gpgsm.c:875
+#: agent/gpg-agent.c:623 g10/gpg.c:2042 scd/scdaemon.c:446 sm/gpgsm.c:876
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: agent/gpg-agent.c:930 g10/plaintext.c:136 g10/plaintext.c:141
+#: agent/gpg-agent.c:936 g10/plaintext.c:136 g10/plaintext.c:141
#: g10/plaintext.c:158
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立‘%s’时发生错误:%s\n"
-#: agent/gpg-agent.c:1210 agent/gpg-agent.c:1313 agent/gpg-agent.c:1317
-#: agent/gpg-agent.c:1353 agent/gpg-agent.c:1357 g10/exec.c:174
+#: agent/gpg-agent.c:1216 agent/gpg-agent.c:1319 agent/gpg-agent.c:1323
+#: agent/gpg-agent.c:1359 agent/gpg-agent.c:1363 g10/exec.c:174
#: g10/openfile.c:418 scd/scdaemon.c:932
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1224 scd/scdaemon.c:946
+#: agent/gpg-agent.c:1230 scd/scdaemon.c:946
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1250 scd/scdaemon.c:972
+#: agent/gpg-agent.c:1256 scd/scdaemon.c:972
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’:%s\n"
-#: agent/gpg-agent.c:1279 scd/scdaemon.c:1001
+#: agent/gpg-agent.c:1285 scd/scdaemon.c:1001
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
-#: agent/gpg-agent.c:1287 scd/scdaemon.c:1009
+#: agent/gpg-agent.c:1293 scd/scdaemon.c:1009
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败:%s\n"
-#: agent/gpg-agent.c:1293 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1299 scd/scdaemon.c:1015
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: agent/gpg-agent.c:1321 agent/gpg-agent.c:1363 g10/openfile.c:421
+#: agent/gpg-agent.c:1327 agent/gpg-agent.c:1369 g10/openfile.c:421
#, c-format
msgid "directory `%s' created\n"
msgstr "已创建目录‘%s’\n"
-#: agent/gpg-agent.c:1369
+#: agent/gpg-agent.c:1375
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错:%s\n"
-#: agent/gpg-agent.c:1373
+#: agent/gpg-agent.c:1379
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "无法建立目录‘%s’:%s\n"
-#: agent/gpg-agent.c:1475
+#: agent/gpg-agent.c:1481
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1486
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1497
+#: agent/gpg-agent.c:1503
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1502
+#: agent/gpg-agent.c:1508
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1598 scd/scdaemon.c:1134
+#: agent/gpg-agent.c:1604 scd/scdaemon.c:1134
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "更新私钥失败:%s\n"
-#: agent/gpg-agent.c:1704 scd/scdaemon.c:1201
+#: agent/gpg-agent.c:1710 scd/scdaemon.c:1201
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s:已跳过:%s\n"
-#: agent/gpg-agent.c:1725
+#: agent/gpg-agent.c:1731
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:1735 common/simple-pwquery.c:324 g10/call-agent.c:137
+#: agent/gpg-agent.c:1741 common/simple-pwquery.c:324 g10/call-agent.c:137
#: sm/call-agent.c:144 tools/gpg-connect-agent.c:713
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-#: agent/gpg-agent.c:1747 common/simple-pwquery.c:336 g10/call-agent.c:149
+#: agent/gpg-agent.c:1753 common/simple-pwquery.c:336 g10/call-agent.c:149
#: sm/call-agent.c:156 tools/gpg-connect-agent.c:724
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
@@ -469,40 +495,40 @@ msgid ""
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1206
+#: agent/protect-tool.c:1207
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1209
+#: agent/protect-tool.c:1210
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1212
+#: agent/protect-tool.c:1213
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1217
+#: agent/protect-tool.c:1218
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1222 tools/symcryptrun.c:488
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:488
#, fuzzy
msgid "Passphrase:"
msgstr "错误的密码"
-#: agent/protect-tool.c:1235 tools/symcryptrun.c:501
+#: agent/protect-tool.c:1236 tools/symcryptrun.c:501
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
-#: agent/protect-tool.c:1238 tools/symcryptrun.c:505
+#: agent/protect-tool.c:1239 tools/symcryptrun.c:505
#, fuzzy
msgid "cancelled\n"
msgstr "已取消"
@@ -660,12 +686,12 @@ msgstr ""
msgid "problem setting the gpg-agent options\n"
msgstr ""
-#: common/simple-pwquery.c:527 common/simple-pwquery.c:615
+#: common/simple-pwquery.c:531 common/simple-pwquery.c:619
#, fuzzy
msgid "canceled by user\n"
msgstr "用户取消\n"
-#: common/simple-pwquery.c:534 common/simple-pwquery.c:621
+#: common/simple-pwquery.c:538 common/simple-pwquery.c:625
#, fuzzy
msgid "problem with the agent\n"
msgstr "代理程序有问题――正在停用代理程序\n"
@@ -730,75 +756,75 @@ msgstr "oO"
msgid "cC"
msgstr "cC"
-#: g10/armor.c:320
+#: g10/armor.c:368
#, c-format
msgid "armor: %s\n"
msgstr "ASCII 封装:%s\n"
-#: g10/armor.c:359
+#: g10/armor.c:407
msgid "invalid armor header: "
msgstr "无效的 ASCII 封装头:"
-#: g10/armor.c:370
+#: g10/armor.c:418
msgid "armor header: "
msgstr "ASCII 封装头:"
-#: g10/armor.c:381
+#: g10/armor.c:429
msgid "invalid clearsig header\n"
msgstr "无效的明文签名头\n"
-#: g10/armor.c:433
+#: g10/armor.c:481
msgid "nested clear text signatures\n"
msgstr "多层明文签名\n"
-#: g10/armor.c:568
+#: g10/armor.c:616
msgid "unexpected armor: "
msgstr "与预期不符的 ASCII 封装:"
-#: g10/armor.c:580
+#: g10/armor.c:628
msgid "invalid dash escaped line: "
msgstr "以连字符开头的行格式错误:"
-#: g10/armor.c:734 g10/armor.c:1343
+#: g10/armor.c:782 g10/armor.c:1392
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "跳过无效的 64 进制字符 %02x\n"
-#: g10/armor.c:777
+#: g10/armor.c:825
msgid "premature eof (no CRC)\n"
msgstr "文件先于预期结束(没有 CRC 部分)\n"
-#: g10/armor.c:811
+#: g10/armor.c:859
msgid "premature eof (in CRC)\n"
msgstr "文件先于预期结束(CRC 部分未结束)\n"
-#: g10/armor.c:819
+#: g10/armor.c:867
msgid "malformed CRC\n"
msgstr "异常的 CRC\n"
-#: g10/armor.c:823 g10/armor.c:1380
+#: g10/armor.c:871 g10/armor.c:1429
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC 错误:%06lx - %06lx\n"
-#: g10/armor.c:843
+#: g10/armor.c:891
msgid "premature eof (in trailer)\n"
msgstr "文件先于预期结束(于结尾处)\n"
-#: g10/armor.c:847
+#: g10/armor.c:895
msgid "error in trailer line\n"
msgstr "结尾行有问题\n"
-#: g10/armor.c:1158
+#: g10/armor.c:1206
msgid "no valid OpenPGP data found.\n"
msgstr "找不到有效的 OpenPGP 数据。\n"
-#: g10/armor.c:1163
+#: g10/armor.c:1211
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "无效的 ASCII 封装:一行超过 %d 字符\n"
-#: g10/armor.c:1167
+#: g10/armor.c:1215
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
@@ -848,8 +874,8 @@ msgstr "OpenPGP 卡不可用:%s\n"
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
-#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1525
-#: g10/keygen.c:2740 g10/revoke.c:218 g10/revoke.c:456
+#: g10/card-util.c:77 g10/card-util.c:1403 g10/delkey.c:128 g10/keyedit.c:1531
+#: g10/keygen.c:2749 g10/revoke.c:218 g10/revoke.c:457
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@ -917,7 +943,7 @@ msgstr "获取公钥的 URL:"
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误:URL 太长(至多 %d 个字符)\n"
-#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:282
+#: g10/card-util.c:688 g10/card-util.c:757 g10/import.c:285
#, c-format
msgid "error reading `%s': %s\n"
msgstr "读取‘%s’时出错:%s\n"
@@ -1022,7 +1048,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:947
-#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:685
+#: g10/keygen.c:1554 g10/keygen.c:1582 g10/keygen.c:1656 g10/revoke.c:687
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
@@ -1042,7 +1068,7 @@ msgstr "私钥部分不可用\n"
msgid "secret key already stored on a card\n"
msgstr "私钥已存储在卡上\n"
-#: g10/card-util.c:1316 g10/keyedit.c:1358
+#: g10/card-util.c:1316 g10/keyedit.c:1364
msgid "quit this menu"
msgstr "离开这个菜单"
@@ -1050,7 +1076,7 @@ msgstr "离开这个菜单"
msgid "show admin commands"
msgstr "显示管理员命令"
-#: g10/card-util.c:1319 g10/keyedit.c:1361
+#: g10/card-util.c:1319 g10/keyedit.c:1367
msgid "show this help"
msgstr "显示这份在线说明"
@@ -1102,7 +1128,7 @@ msgstr "更改或解锁 PIN 的菜单"
msgid "verify the PIN and list all data"
msgstr "验证 PIN 并列出所有数据"
-#: g10/card-util.c:1454 g10/keyedit.c:1626
+#: g10/card-util.c:1454 g10/keyedit.c:1632
msgid "Command> "
msgstr "命令> "
@@ -1118,27 +1144,27 @@ msgstr "允许使用管理员命令\n"
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
-#: g10/card-util.c:1599 g10/keyedit.c:2247
+#: g10/card-util.c:1599 g10/keyedit.c:2253
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
-#: g10/decrypt.c:107 g10/encode.c:869
+#: g10/decrypt.c:112 g10/encode.c:892
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/decrypt.c:162 g10/gpg.c:3820 g10/keyring.c:378 g10/keyring.c:665
+#: g10/decrypt.c:168 g10/gpg.c:3869 g10/keyring.c:378 g10/keyring.c:665
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
-#: g10/delkey.c:75 g10/export.c:325 g10/keyedit.c:3390 g10/keyserver.c:1713
+#: g10/delkey.c:75 g10/export.c:326 g10/keyedit.c:3401 g10/keyserver.c:1714
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到:%s\n"
-#: g10/delkey.c:83 g10/export.c:355 g10/import.c:2348 g10/keyserver.c:1727
-#: g10/revoke.c:234 g10/revoke.c:478
+#: g10/delkey.c:83 g10/export.c:356 g10/import.c:2351 g10/keyserver.c:1728
+#: g10/revoke.c:234 g10/revoke.c:479
#, c-format
msgid "error reading keyblock: %s\n"
msgstr "读取密钥区块时发生错误:%s\n"
@@ -1177,88 +1203,88 @@ msgstr "公钥“%s”有对应的私钥!\n"
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
-#: g10/encode.c:225 g10/sign.c:1291
+#: g10/encode.c:228 g10/sign.c:1300
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
-#: g10/encode.c:230
+#: g10/encode.c:234
msgid "can't use a symmetric ESK packet due to the S2K mode\n"
msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
-#: g10/encode.c:244
+#: g10/encode.c:248
#, c-format
msgid "using cipher %s\n"
msgstr "使用对称加密算法 %s\n"
-#: g10/encode.c:254 g10/encode.c:558
+#: g10/encode.c:258 g10/encode.c:579
#, c-format
msgid "`%s' already compressed\n"
msgstr "‘%s’已被压缩\n"
-#: g10/encode.c:305 g10/encode.c:606 g10/sign.c:596
+#: g10/encode.c:313 g10/encode.c:627 g10/sign.c:597
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "警告:‘%s’是一个空文件\n"
-#: g10/encode.c:469
+#: g10/encode.c:487
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "在 --pgp2 模式中,您只能使用 2048 位及以下的 RSA 密钥加密\n"
-#: g10/encode.c:494
+#: g10/encode.c:512
#, c-format
msgid "reading from `%s'\n"
msgstr "正在从‘%s’读取\n"
-#: g10/encode.c:522
+#: g10/encode.c:543
msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
-#: g10/encode.c:540
+#: g10/encode.c:561
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告:强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:650 g10/sign.c:968
+#: g10/encode.c:671 g10/sign.c:970
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "警告:强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
-#: g10/encode.c:744
+#: g10/encode.c:767
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:814 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:837 g10/pkclist.c:815 g10/pkclist.c:863
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "您不该将 %s 用于 %s 模式中\n"
-#: g10/encode.c:841
+#: g10/encode.c:864
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给:“%s”\n"
-#: g10/encr-data.c:70 g10/mainproc.c:265
+#: g10/encr-data.c:95 g10/mainproc.c:283
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 加密过的数据\n"
-#: g10/encr-data.c:72 g10/mainproc.c:269
+#: g10/encr-data.c:97 g10/mainproc.c:287
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以未知的算法 %d 加密\n"
-#: g10/encr-data.c:110 sm/decrypt.c:128
+#: g10/encr-data.c:135 sm/decrypt.c:128
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "警告:报文被使用对称加密算法的弱密钥加密。\n"
-#: g10/encr-data.c:122
+#: g10/encr-data.c:147
msgid "problem handling encrypted packet\n"
msgstr "处理加密包有问题\n"
@@ -1341,41 +1367,41 @@ msgstr "导出时尽可能清除密钥中的可选部分"
msgid "export keys in an S-expression based format"
msgstr ""
-#: g10/export.c:339
+#: g10/export.c:340
msgid "exporting secret keys not allowed\n"
msgstr "不允许导出私钥\n"
-#: g10/export.c:368
+#: g10/export.c:369
#, c-format
msgid "key %s: not protected - skipped\n"
msgstr "密钥 %s:未被保护――已跳过\n"
-#: g10/export.c:376
+#: g10/export.c:377
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "密钥 %s:PGP 2.x 样式的密钥――已跳过\n"
-#: g10/export.c:387
+#: g10/export.c:388
#, c-format
msgid "key %s: key material on-card - skipped\n"
msgstr "密钥 %s:密钥在卡上——已跳过\n"
-#: g10/export.c:538
+#: g10/export.c:539
msgid "about to export an unprotected subkey\n"
msgstr "准备导出一把不受保护的子钥\n"
-#: g10/export.c:561
+#: g10/export.c:562
#, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "无法取消保护子钥:%s\n"
# I hope this warning doesn't confuse people.
-#: g10/export.c:582
+#: g10/export.c:583
#, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "警告:私钥 %s 不存在简单 SK 检验和\n"
-#: g10/export.c:631
+#: g10/export.c:632
msgid "WARNING: nothing exported\n"
msgstr "警告:没有导出任何东西\n"
@@ -1398,7 +1424,7 @@ msgstr "自动获取‘%s’,通过 %s\n"
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2385 g10/keyedit.c:3710
+#: g10/getkey.c:2385 g10/keyedit.c:3721
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -1413,7 +1439,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s:无相应公钥的私钥――已跳过\n"
-#: g10/gpg.c:365 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
+#: g10/gpg.c:367 kbx/kbxutil.c:69 sm/gpgsm.c:241 tools/gpgconf.c:54
msgid ""
"@Commands:\n"
" "
@@ -1421,127 +1447,131 @@ msgstr ""
"@指令:\n"
" "
-#: g10/gpg.c:367
+#: g10/gpg.c:369
msgid "|[file]|make a signature"
msgstr "|[文件名]|生成一份签名"
-#: g10/gpg.c:368
+#: g10/gpg.c:370
msgid "|[file]|make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
-#: g10/gpg.c:369 sm/gpgsm.c:245
+#: g10/gpg.c:371 sm/gpgsm.c:245
msgid "make a detached signature"
msgstr "生成一份分离的签名"
-#: g10/gpg.c:370 sm/gpgsm.c:246
+#: g10/gpg.c:372 sm/gpgsm.c:246
msgid "encrypt data"
msgstr "加密数据"
-#: g10/gpg.c:372 sm/gpgsm.c:247
+#: g10/gpg.c:374 sm/gpgsm.c:247
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:374 sm/gpgsm.c:248
+#: g10/gpg.c:376 sm/gpgsm.c:248
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/gpg.c:376 sm/gpgsm.c:249
+#: g10/gpg.c:378 sm/gpgsm.c:249
msgid "verify a signature"
msgstr "验证签名"
-#: g10/gpg.c:378 sm/gpgsm.c:251
+#: g10/gpg.c:380 sm/gpgsm.c:251
msgid "list keys"
msgstr "列出密钥"
-#: g10/gpg.c:380
+#: g10/gpg.c:382
msgid "list keys and signatures"
msgstr "列出密钥和签名"
-#: g10/gpg.c:381
+#: g10/gpg.c:383
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
-#: g10/gpg.c:382 sm/gpgsm.c:255
+#: g10/gpg.c:384 sm/gpgsm.c:255
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:383 sm/gpgsm.c:253
+#: g10/gpg.c:385 sm/gpgsm.c:253
msgid "list secret keys"
msgstr "列出私钥"
-#: g10/gpg.c:384 sm/gpgsm.c:256
+#: g10/gpg.c:386
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
-#: g10/gpg.c:385
+#: g10/gpg.c:387
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: g10/gpg.c:387
+#: g10/gpg.c:389
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
-#: g10/gpg.c:388
+#: g10/gpg.c:390
msgid "sign a key"
msgstr "为某把密钥添加签名"
-#: g10/gpg.c:389
+#: g10/gpg.c:391
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
-#: g10/gpg.c:390
+#: g10/gpg.c:392
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
-#: g10/gpg.c:391
+#: g10/gpg.c:393
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/gpg.c:393
+#: g10/gpg.c:395
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:394 sm/gpgsm.c:258
+#: g10/gpg.c:396 sm/gpgsm.c:258
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:395 sm/gpgsm.c:259
+#: g10/gpg.c:397 sm/gpgsm.c:259
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/gpg.c:397
+#: g10/gpg.c:399
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/gpg.c:399
+#: g10/gpg.c:401
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
-#: g10/gpg.c:403
+#: g10/gpg.c:405
msgid "import/merge keys"
msgstr "导入/合并密钥"
-#: g10/gpg.c:406
+#: g10/gpg.c:408
msgid "print the card status"
msgstr "打印卡状态"
-#: g10/gpg.c:407
+#: g10/gpg.c:409
msgid "change data on a card"
msgstr "更改卡上的数据"
-#: g10/gpg.c:408
+#: g10/gpg.c:410
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
-#: g10/gpg.c:417
+#: g10/gpg.c:419
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/gpg.c:424
+#: g10/gpg.c:426
msgid "|algo [files]|print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:428 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
+#: g10/gpg.c:429 sm/gpgsm.c:263
+msgid "run in server mode"
+msgstr ""
+
+#: g10/gpg.c:431 g10/gpgv.c:69 kbx/kbxutil.c:77 sm/gpgsm.c:278
#: tools/gpg-connect-agent.c:57 tools/gpgconf.c:60 tools/symcryptrun.c:178
msgid ""
"@\n"
@@ -1552,47 +1582,47 @@ msgstr ""
"选项:\n"
" "
-#: g10/gpg.c:430 sm/gpgsm.c:280
+#: g10/gpg.c:433 sm/gpgsm.c:280
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:432 sm/gpgsm.c:290
+#: g10/gpg.c:435 sm/gpgsm.c:290
msgid "|NAME|encrypt for NAME"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:443 sm/gpgsm.c:326
+#: g10/gpg.c:446 sm/gpgsm.c:326
msgid "use this user-id to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
-#: g10/gpg.c:444 sm/gpgsm.c:329
+#: g10/gpg.c:447 sm/gpgsm.c:329
msgid "|N|set compress level N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:449 sm/gpgsm.c:331
+#: g10/gpg.c:452 sm/gpgsm.c:331
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:463 sm/gpgsm.c:334 tools/gpgconf.c:62
+#: g10/gpg.c:466 sm/gpgsm.c:334 tools/gpgconf.c:62
msgid "use as output file"
msgstr "指定输出文件"
-#: g10/gpg.c:476 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
+#: g10/gpg.c:479 kbx/kbxutil.c:84 sm/gpgsm.c:344 tools/gpgconf.c:65
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/gpg.c:477
+#: g10/gpg.c:480
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/gpg.c:519
+#: g10/gpg.c:522
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/gpg.c:520
+#: g10/gpg.c:523
msgid "generate PGP 2.x compatible messages"
msgstr "生成与 PGP 2.x 兼容的报文"
-#: g10/gpg.c:549 sm/gpgsm.c:392
+#: g10/gpg.c:552 sm/gpgsm.c:392
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1600,7 +1630,7 @@ msgstr ""
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/gpg.c:552 sm/gpgsm.c:395
+#: g10/gpg.c:555 sm/gpgsm.c:395
msgid ""
"@\n"
"Examples:\n"
@@ -1620,17 +1650,17 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/gpg.c:743 g10/gpgv.c:96
+#: g10/gpg.c:747 g10/gpgv.c:96
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"请向 <[email protected]> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: g10/gpg.c:760
+#: g10/gpg.c:764
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: g10/gpg.c:763
+#: g10/gpg.c:767
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1640,7 +1670,7 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:774 sm/gpgsm.c:530
+#: g10/gpg.c:778 sm/gpgsm.c:530
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1648,535 +1678,535 @@ msgstr ""
"\n"
"支持的算法:\n"
-#: g10/gpg.c:777
+#: g10/gpg.c:781
msgid "Pubkey: "
msgstr "公钥:"
-#: g10/gpg.c:784 g10/keyedit.c:2313
+#: g10/gpg.c:788 g10/keyedit.c:2319
msgid "Cipher: "
msgstr "对称加密:"
-#: g10/gpg.c:791
+#: g10/gpg.c:795
msgid "Hash: "
msgstr "散列:"
-#: g10/gpg.c:798 g10/keyedit.c:2359
+#: g10/gpg.c:802 g10/keyedit.c:2365
msgid "Compression: "
msgstr "压缩:"
-#: g10/gpg.c:882
+#: g10/gpg.c:886
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1052 sm/gpgsm.c:682
+#: g10/gpg.c:1056 sm/gpgsm.c:682
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1070
+#: g10/gpg.c:1074
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1267
+#: g10/gpg.c:1271
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1270
+#: g10/gpg.c:1274
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1273
+#: g10/gpg.c:1277
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1279
+#: g10/gpg.c:1283
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1282
+#: g10/gpg.c:1286
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1285
+#: g10/gpg.c:1289
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1291
+#: g10/gpg.c:1295
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1294
+#: g10/gpg.c:1298
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1297
+#: g10/gpg.c:1301
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1303
+#: g10/gpg.c:1307
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1306
+#: g10/gpg.c:1310
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1309
+#: g10/gpg.c:1313
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1452
+#: g10/gpg.c:1456
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1545
+#: g10/gpg.c:1549
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
-#: g10/gpg.c:1547
+#: g10/gpg.c:1551
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
-#: g10/gpg.c:1549
+#: g10/gpg.c:1553
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1551
+#: g10/gpg.c:1555
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1555
+#: g10/gpg.c:1559
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
-#: g10/gpg.c:1557
+#: g10/gpg.c:1561
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
-#: g10/gpg.c:1559
+#: g10/gpg.c:1563
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
-#: g10/gpg.c:1561
+#: g10/gpg.c:1565
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
-#: g10/gpg.c:1563
+#: g10/gpg.c:1567
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:1565
+#: g10/gpg.c:1569
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
-#: g10/gpg.c:1567
+#: g10/gpg.c:1571
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
-#: g10/gpg.c:1965
+#: g10/gpg.c:1989
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:2211 g10/gpg.c:2854 g10/gpg.c:2866
+#: g10/gpg.c:2249 g10/gpg.c:2893 g10/gpg.c:2905
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意:一般情况下不会用到 %s!\n"
-#: g10/gpg.c:2224
+#: g10/gpg.c:2262
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
-#: g10/gpg.c:2379 g10/gpg.c:2391
+#: g10/gpg.c:2417 g10/gpg.c:2429
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
-#: g10/gpg.c:2472
+#: g10/gpg.c:2511
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2495 g10/gpg.c:2688 g10/keyedit.c:4067
+#: g10/gpg.c:2534 g10/gpg.c:2727 g10/keyedit.c:4078
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2507
+#: g10/gpg.c:2546
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
-#: g10/gpg.c:2510
+#: g10/gpg.c:2549
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2517
+#: g10/gpg.c:2556
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
-#: g10/gpg.c:2520
+#: g10/gpg.c:2559
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2527
+#: g10/gpg.c:2566
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
-#: g10/gpg.c:2530
+#: g10/gpg.c:2569
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2537
+#: g10/gpg.c:2576
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
-#: g10/gpg.c:2540
+#: g10/gpg.c:2579
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2548
+#: g10/gpg.c:2587
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
-#: g10/gpg.c:2550
+#: g10/gpg.c:2589
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
-#: g10/gpg.c:2552
+#: g10/gpg.c:2591
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
-#: g10/gpg.c:2554
+#: g10/gpg.c:2593
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
-#: g10/gpg.c:2558
+#: g10/gpg.c:2597
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
-#: g10/gpg.c:2560
+#: g10/gpg.c:2599
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
-#: g10/gpg.c:2562
+#: g10/gpg.c:2601
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
-#: g10/gpg.c:2564
+#: g10/gpg.c:2603
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2566
+#: g10/gpg.c:2605
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
-#: g10/gpg.c:2568
+#: g10/gpg.c:2607
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
-#: g10/gpg.c:2575
+#: g10/gpg.c:2614
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2617
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2585
+#: g10/gpg.c:2624
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2759
+#: g10/gpg.c:2798
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d:无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2762
+#: g10/gpg.c:2801
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2843 sm/gpgsm.c:1231
+#: g10/gpg.c:2882 sm/gpgsm.c:1232
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
-#: g10/gpg.c:2847
+#: g10/gpg.c:2886
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
-#: g10/gpg.c:2856
+#: g10/gpg.c:2895
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:2859
+#: g10/gpg.c:2898
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
-#: g10/gpg.c:2874
+#: g10/gpg.c:2913
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
-#: g10/gpg.c:2888
+#: g10/gpg.c:2927
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
-#: g10/gpg.c:2894
+#: g10/gpg.c:2933
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时,不能同时签名和加密\n"
-#: g10/gpg.c:2900
+#: g10/gpg.c:2939
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
-#: g10/gpg.c:2913
+#: g10/gpg.c:2952
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:2979 g10/gpg.c:3003 sm/gpgsm.c:1287
+#: g10/gpg.c:3018 g10/gpg.c:3042 sm/gpgsm.c:1288
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:2985 g10/gpg.c:3009 sm/gpgsm.c:1295
+#: g10/gpg.c:3024 g10/gpg.c:3048 sm/gpgsm.c:1296
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:2991
+#: g10/gpg.c:3030
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:2997
+#: g10/gpg.c:3036
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:3012
+#: g10/gpg.c:3051
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
-#: g10/gpg.c:3014
+#: g10/gpg.c:3053
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
-#: g10/gpg.c:3016
+#: g10/gpg.c:3055
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:3018
+#: g10/gpg.c:3057
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
-#: g10/gpg.c:3020
+#: g10/gpg.c:3059
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
-#: g10/gpg.c:3023
+#: g10/gpg.c:3062
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:3027
+#: g10/gpg.c:3066
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
-#: g10/gpg.c:3034
+#: g10/gpg.c:3073
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:3043
+#: g10/gpg.c:3082
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:3047
+#: g10/gpg.c:3086
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:3051
+#: g10/gpg.c:3090
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:3084
+#: g10/gpg.c:3123
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3131
+#: g10/gpg.c:3170
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3136
+#: g10/gpg.c:3175
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3141
+#: g10/gpg.c:3180
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3233
+#: g10/gpg.c:3272
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/gpg.c:3244
+#: g10/gpg.c:3283
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3255
+#: g10/gpg.c:3304
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3262
+#: g10/gpg.c:3311
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3264
+#: g10/gpg.c:3313
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/gpg.c:3274
+#: g10/gpg.c:3323
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3287
+#: g10/gpg.c:3336
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3289
+#: g10/gpg.c:3338
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3292
+#: g10/gpg.c:3341
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3310
+#: g10/gpg.c:3359
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3323
+#: g10/gpg.c:3372
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3338
+#: g10/gpg.c:3387
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3340
+#: g10/gpg.c:3389
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3343
+#: g10/gpg.c:3392
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3363
+#: g10/gpg.c:3412
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3372
+#: g10/gpg.c:3421
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3397
+#: g10/gpg.c:3446
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3405
+#: g10/gpg.c:3454
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3409
+#: g10/gpg.c:3458
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3430
+#: g10/gpg.c:3479
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3515
+#: g10/gpg.c:3564
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/gpg.c:3517
+#: g10/gpg.c:3566
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/gpg.c:3519
+#: g10/gpg.c:3568
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/gpg.c:3530
+#: g10/gpg.c:3579
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/gpg.c:3540
+#: g10/gpg.c:3589
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/gpg.c:3591
+#: g10/gpg.c:3640
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3599
+#: g10/gpg.c:3648
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3689
+#: g10/gpg.c:3738
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3806
+#: g10/gpg.c:3855
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3810
+#: g10/gpg.c:3859
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4121
+#: g10/gpg.c:4171
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4123
+#: g10/gpg.c:4173
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
-#: g10/gpg.c:4156
+#: g10/gpg.c:4206
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -2539,351 +2569,351 @@ msgstr "导入后清除密钥中无用的部分"
msgid "remove as much as possible from key after import"
msgstr "导入后尽可能清除密钥中的可选部分"
-#: g10/import.c:268
+#: g10/import.c:271
#, c-format
msgid "skipping block of type %d\n"
msgstr "跳过 %d 样式的区块\n"
-#: g10/import.c:277
+#: g10/import.c:280
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已处理 %lu 把密钥\n"
-#: g10/import.c:294
+#: g10/import.c:297
#, c-format
msgid "Total number processed: %lu\n"
msgstr "合计被处理的数量:%lu\n"
-#: g10/import.c:296
+#: g10/import.c:299
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳过的新密钥:%lu\n"
-#: g10/import.c:299
+#: g10/import.c:302
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 遗失用户标识:%lu\n"
-#: g10/import.c:301 sm/import.c:113
+#: g10/import.c:304 sm/import.c:113
#, c-format
msgid " imported: %lu"
msgstr " 已导入:%lu"
-#: g10/import.c:307 sm/import.c:117
+#: g10/import.c:310 sm/import.c:117
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改变:%lu\n"
-#: g10/import.c:309
+#: g10/import.c:312
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新用户标识:%lu\n"
-#: g10/import.c:311
+#: g10/import.c:314
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子钥:%lu\n"
-#: g10/import.c:313
+#: g10/import.c:316
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的签名:%lu\n"
-#: g10/import.c:315
+#: g10/import.c:318
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的密钥吊销:%lu\n"
-#: g10/import.c:317 sm/import.c:119
+#: g10/import.c:320 sm/import.c:119
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 读取的私钥:%lu\n"
-#: g10/import.c:319 sm/import.c:121
+#: g10/import.c:322 sm/import.c:121
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 导入的私钥:%lu\n"
-#: g10/import.c:321 sm/import.c:123
+#: g10/import.c:324 sm/import.c:123
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改变的私钥:%lu\n"
-#: g10/import.c:323 sm/import.c:125
+#: g10/import.c:326 sm/import.c:125
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被导入:%lu\n"
-#: g10/import.c:325
+#: g10/import.c:328
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 清除的签名:%lu\n"
-#: g10/import.c:327
+#: g10/import.c:330
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 清除的用户标识:%lu\n"
-#: g10/import.c:568
+#: g10/import.c:571
#, fuzzy, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告:密钥 %s 下列用户标识的首选项中包含不可用的算法:\n"
-#: g10/import.c:606
+#: g10/import.c:609
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”:对称加密算法 %s 对应首选项\n"
-#: g10/import.c:618
+#: g10/import.c:621
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”:散列算法 %s 对应首选项\n"
-#: g10/import.c:630
+#: g10/import.c:633
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”:压缩算法 %s 对应首选项\n"
-#: g10/import.c:643
+#: g10/import.c:646
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "强烈建议您更新您的首选项并重新分发这把密钥,\n"
-#: g10/import.c:645
+#: g10/import.c:648
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "以避免可能的算法不匹配问题\n"
-#: g10/import.c:669
+#: g10/import.c:672
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "您可以这样更新您的首选项:gpg --edit-key %s updpref save\n"
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:722 g10/import.c:1120
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s:没有用户标识\n"
-#: g10/import.c:748
+#: g10/import.c:751
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s:PKS 子钥破损已修复\n"
-#: g10/import.c:763
+#: g10/import.c:766
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s:已接受不含自身签名的用户标识“%s”\n"
-#: g10/import.c:769
+#: g10/import.c:772
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s:没有有效的用户标识\n"
-#: g10/import.c:771
+#: g10/import.c:774
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签名所致\n"
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:784 g10/import.c:1242
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s:找不到公钥:%s\n"
-#: g10/import.c:787
+#: g10/import.c:790
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s:新密钥――已跳过\n"
-#: g10/import.c:796
+#: g10/import.c:799
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环:%s\n"
-#: g10/import.c:801 g10/openfile.c:270 g10/sign.c:834 g10/sign.c:1140
+#: g10/import.c:804 g10/openfile.c:270 g10/sign.c:836 g10/sign.c:1145
#, c-format
msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2362 g10/import.c:2384
+#: g10/import.c:808 g10/import.c:903 g10/import.c:1160 g10/import.c:1303
+#: g10/import.c:2365 g10/import.c:2387
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "写入钥匙环‘%s’时出错: %s\n"
-#: g10/import.c:824
+#: g10/import.c:827
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s:公钥“%s”已导入\n"
-#: g10/import.c:848
+#: g10/import.c:851
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s:与我们的副本不吻合\n"
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:868 g10/import.c:1260
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s:无法定位原始的密钥区块:%s\n"
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:876 g10/import.c:1267
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s:无法读取原始的密钥区块: %s\n"
-#: g10/import.c:910
+#: g10/import.c:913
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s:“%s”一个新的用户标识\n"
-#: g10/import.c:913
+#: g10/import.c:916
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s:“%s”%d 个新的用户标识\n"
-#: g10/import.c:916
+#: g10/import.c:919
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s:“%s”1 个新的签名\n"
-#: g10/import.c:919
+#: g10/import.c:922
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s:“%s”%d 个新的签名\n"
-#: g10/import.c:922
+#: g10/import.c:925
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s:“%s”1 个新的子钥\n"
-#: g10/import.c:925
+#: g10/import.c:928
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s:“%s”%d 个新的子钥\n"
-#: g10/import.c:928
+#: g10/import.c:931
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
-#: g10/import.c:931
+#: g10/import.c:934
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
-#: g10/import.c:934
+#: g10/import.c:937
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
-#: g10/import.c:937
+#: g10/import.c:940
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s:“%s”%d 个用户标识被清除\n"
-#: g10/import.c:960
+#: g10/import.c:963
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s:“%s”未改变\n"
-#: g10/import.c:1123
+#: g10/import.c:1126
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s:私钥使用了无效的加密算法 %d――已跳过\n"
-#: g10/import.c:1134
+#: g10/import.c:1137
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
-#: g10/import.c:1151 g10/import.c:2377
+#: g10/import.c:1154 g10/import.c:2380
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "没有默认的私钥钥匙环: %s\n"
-#: g10/import.c:1162
+#: g10/import.c:1165
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s:私钥已导入\n"
-#: g10/import.c:1192
+#: g10/import.c:1195
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "密钥 %s:已在私钥钥匙环中\n"
-#: g10/import.c:1202
+#: g10/import.c:1205
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "密钥 %s:找不到私钥:%s\n"
-#: g10/import.c:1232
+#: g10/import.c:1235
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s:没有公钥――无法应用吊销证书\n"
-#: g10/import.c:1275
+#: g10/import.c:1278
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s:无效的吊销证书:%s――已拒绝\n"
-#: g10/import.c:1307
+#: g10/import.c:1310
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s:“%s”吊销证书已被导入\n"
-#: g10/import.c:1373
+#: g10/import.c:1376
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s:签名没有用户标识\n"
-#: g10/import.c:1388
+#: g10/import.c:1391
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”使用了不支持的公钥算法\n"
-#: g10/import.c:1390
+#: g10/import.c:1393
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”自身签名无效\n"
-#: g10/import.c:1408
+#: g10/import.c:1411
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s:没有可供绑定的子钥\n"
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1422 g10/import.c:1472
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s:不支持的公钥算法\n"
-#: g10/import.c:1421
+#: g10/import.c:1424
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s:无效的子钥绑定\n"
-#: g10/import.c:1436
+#: g10/import.c:1439
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s:已删除多重子钥绑定\n"
-#: g10/import.c:1458
+#: g10/import.c:1461
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s:没有用于密钥吊销的子钥\n"
-#: g10/import.c:1471
+#: g10/import.c:1474
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s:无效的子钥吊销\n"
-#: g10/import.c:1486
+#: g10/import.c:1489
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s:已删除多重子钥吊销\n"
-#: g10/import.c:1528
+#: g10/import.c:1531
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s:已跳过用户标识“%s”\n"
-#: g10/import.c:1549
+#: g10/import.c:1552
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s:已跳过子钥\n"
@@ -2892,65 +2922,65 @@ msgstr "密钥 %s:已跳过子钥\n"
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
-#: g10/import.c:1576
+#: g10/import.c:1579
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s:不可导出的签名(验证级别 0x%02X)――已跳过\n"
-#: g10/import.c:1586
+#: g10/import.c:1589
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s:吊销证书位置错误――已跳过\n"
-#: g10/import.c:1603
+#: g10/import.c:1606
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s:无效的吊销证书:%s――已跳过\n"
-#: g10/import.c:1617
+#: g10/import.c:1620
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s:子钥签名位置错误――已跳过\n"
-#: g10/import.c:1625
+#: g10/import.c:1628
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s:与预期不符的签名验证级别(0x%02X)――已跳过\n"
-#: g10/import.c:1725
+#: g10/import.c:1728
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s:检测到重复的用户标识――已合并\n"
-#: g10/import.c:1787
+#: g10/import.c:1790
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告:密钥 %s 可能已被吊销:正在取回吊销密钥 %s\n"
-#: g10/import.c:1801
+#: g10/import.c:1804
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告:密钥 %s 可能已被吊销:吊销密钥 %s 不存在。\n"
-#: g10/import.c:1860
+#: g10/import.c:1863
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s:已新增吊销证书“%s”\n"
-#: g10/import.c:1894
+#: g10/import.c:1897
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s:已新增直接密钥签名\n"
-#: g10/import.c:2283
+#: g10/import.c:2286
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "注意:密钥的序列号与卡的不符\n"
-#: g10/import.c:2291
+#: g10/import.c:2294
msgid "NOTE: primary key is online and stored on card\n"
msgstr "注意:主钥在线,存储在卡上\n"
-#: g10/import.c:2293
+#: g10/import.c:2296
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "注意:子钥在线,存储在卡上\n"
@@ -3058,12 +3088,12 @@ msgid "User ID \"%s\" is revoked."
msgstr "用户标识“%s”已被吊销。"
#: g10/keyedit.c:609 g10/keyedit.c:637 g10/keyedit.c:664 g10/keyedit.c:832
-#: g10/keyedit.c:897 g10/keyedit.c:1745
+#: g10/keyedit.c:897 g10/keyedit.c:1751
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "您仍然想要为它签名吗?(y/N)"
#: g10/keyedit.c:623 g10/keyedit.c:651 g10/keyedit.c:678 g10/keyedit.c:838
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1757
msgid " Unable to sign.\n"
msgstr " 无法添加签名。\n"
@@ -3241,8 +3271,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
msgid "Really sign? (y/N) "
msgstr "真的要签名吗?(y/N)"
-#: g10/keyedit.c:1068 g10/keyedit.c:4786 g10/keyedit.c:4877 g10/keyedit.c:4941
-#: g10/keyedit.c:5002 g10/sign.c:352
+#: g10/keyedit.c:1068 g10/keyedit.c:4797 g10/keyedit.c:4888 g10/keyedit.c:4952
+#: g10/keyedit.c:5013 g10/sign.c:352
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败: %s\n"
@@ -3251,19 +3281,19 @@ msgstr "签名时失败: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1144 g10/keygen.c:3383
+#: g10/keyedit.c:1144 g10/keygen.c:3401
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1148 g10/keygen.c:3371 g10/revoke.c:539
+#: g10/keyedit.c:1148 g10/keygen.c:3389 g10/revoke.c:540
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1152 g10/keygen.c:3386
+#: g10/keyedit.c:1152 g10/keygen.c:3404
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3390
+#: g10/keyedit.c:1156 g10/keygen.c:3408
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
@@ -3280,11 +3310,11 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1195 g10/keygen.c:2065
+#: g10/keyedit.c:1201 g10/keygen.c:2069
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符;请再试一次"
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1206
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -3292,184 +3322,184 @@ msgstr ""
"您不想要用密码――这大概是个坏主意!\n"
"\n"
-#: g10/keyedit.c:1203
+#: g10/keyedit.c:1209
msgid "Do you really want to do this? (y/N) "
msgstr "您真的想要这么做吗?(y/N)"
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1280
msgid "moving a key signature to the correct place\n"
msgstr "正在把密钥的签名移动到正确的位置去\n"
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1366
msgid "save and quit"
msgstr "保存并离开"
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1369
msgid "show key fingerprint"
msgstr "显示密钥指纹"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1370
msgid "list key and user IDs"
msgstr "列出密钥和用户标识"
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1372
msgid "select user ID N"
msgstr "选择用户标识 N"
-#: g10/keyedit.c:1367
+#: g10/keyedit.c:1373
msgid "select subkey N"
msgstr "选择子钥 N"
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1374
msgid "check signatures"
msgstr "检查签名"
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1379
msgid "sign selected user IDs [* see below for related commands]"
msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1384
msgid "sign selected user IDs locally"
msgstr "为所选用户标识添加本地签名"
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1386
msgid "sign selected user IDs with a trust signature"
msgstr "为所选用户标识添加信任签名"
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1388
msgid "sign selected user IDs with a non-revocable signature"
msgstr "为所选用户标识添加不可吊销签名"
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1392
msgid "add a user ID"
msgstr "增加一个用户标识"
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1394
msgid "add a photo ID"
msgstr "增加一个照片标识"
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1396
msgid "delete selected user IDs"
msgstr "删除选定的用户标识"
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1401
msgid "add a subkey"
msgstr "添加一个子钥"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1405
msgid "add a key to a smartcard"
msgstr "在智能卡上添加一把密钥"
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1407
msgid "move a key to a smartcard"
msgstr "将一把密钥移动到智能卡上"
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1409
msgid "move a backup key to a smartcard"
msgstr "将备份密钥转移到卡上"
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1413
msgid "delete selected subkeys"
msgstr "删除选定的子钥"
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1415
msgid "add a revocation key"
msgstr "增加一把吊销密钥"
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1417
msgid "delete signatures from the selected user IDs"
msgstr "删除所选用户标识上的签名"
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1419
msgid "change the expiration date for the key or selected subkeys"
msgstr "变更密钥或所选子钥的使用期限"
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1421
msgid "flag the selected user ID as primary"
msgstr "将所选的用户标识设为首选用户标识"
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1423
msgid "toggle between the secret and public key listings"
msgstr "在私钥和公钥清单间切换"
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1426
msgid "list preferences (expert)"
msgstr "列出首选项(专家模式)"
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1428
msgid "list preferences (verbose)"
msgstr "列出首选项(详细模式)"
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1430
msgid "set preference list for the selected user IDs"
msgstr "设定所选用户标识的首选项"
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1435
msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "设定所选用户标识的首选公钥服务器的 URL"
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1437
msgid "set a notation for the selected user IDs"
msgstr "为所选用户标识的设定注记"
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1439
msgid "change the passphrase"
msgstr "更改密码"
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1443
msgid "change the ownertrust"
msgstr "更改信任度"
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
msgid "revoke signatures on the selected user IDs"
msgstr "吊销所选用户标识上的签名"
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
msgid "revoke selected user IDs"
msgstr "吊销选定的用户标识"
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
msgid "revoke key or selected subkeys"
msgstr "吊销密钥或选定的子钥"
-#: g10/keyedit.c:1447
+#: g10/keyedit.c:1453
msgid "enable key"
msgstr "启用密钥"
-#: g10/keyedit.c:1448
+#: g10/keyedit.c:1454
msgid "disable key"
msgstr "禁用密钥"
-#: g10/keyedit.c:1449
+#: g10/keyedit.c:1455
msgid "show selected photo IDs"
msgstr "显示选定的照片标识"
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1457
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr "压缩不可用的用户标识并删除不可用的签名"
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1459
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "压缩不可用的用户标识并删除所有签名"
-#: g10/keyedit.c:1571
+#: g10/keyedit.c:1577
#, c-format
msgid "error reading secret keyblock \"%s\": %s\n"
msgstr "读取私钥区块“%s”时出错:%s\n"
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1595
msgid "Secret key is available.\n"
msgstr "私钥可用。\n"
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1678
msgid "Need the secret key to do this.\n"
msgstr "要有私钥才能这么做。\n"
-#: g10/keyedit.c:1680
+#: g10/keyedit.c:1686
msgid "Please use the command \"toggle\" first.\n"
msgstr "请先使用“toggle”指令。\n"
-#: g10/keyedit.c:1699
+#: g10/keyedit.c:1705
msgid ""
"* The `sign' command may be prefixed with an `l' for local signatures "
"(lsign),\n"
@@ -3480,245 +3510,245 @@ msgstr ""
" 信任签名,或‘nr’前缀(nrsign)以添加不可吊销签名,或者以上三种前缀的任何组\n"
" 合(ltsign、tnrsign 等)。\n"
-#: g10/keyedit.c:1739
+#: g10/keyedit.c:1745
msgid "Key is revoked."
msgstr "密钥已被吊销。"
-#: g10/keyedit.c:1758
+#: g10/keyedit.c:1764
msgid "Really sign all user IDs? (y/N) "
msgstr "真的为所有的用户标识签名吗?(y/N)"
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示:选择要添加签名的用户标识\n"
-#: g10/keyedit.c:1774
+#: g10/keyedit.c:1780
#, c-format
msgid "Unknown signature type `%s'\n"
msgstr "未知的签名类型‘%s’\n"
-#: g10/keyedit.c:1797
+#: g10/keyedit.c:1803
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
-#: g10/keyedit.c:1819 g10/keyedit.c:1839 g10/keyedit.c:2005
+#: g10/keyedit.c:1825 g10/keyedit.c:1845 g10/keyedit.c:2011
msgid "You must select at least one user ID.\n"
msgstr "您至少得选择一个用户标识。\n"
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1827
msgid "You can't delete the last user ID!\n"
msgstr "您不能删除最后一个用户标识!\n"
-#: g10/keyedit.c:1823
+#: g10/keyedit.c:1829
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要删除所有选定的用户标识吗?(y/N)"
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1830
msgid "Really remove this user ID? (y/N) "
msgstr "真的要删除这个用户标识吗?(y/N)"
-#: g10/keyedit.c:1874
+#: g10/keyedit.c:1880
msgid "Really move the primary key? (y/N) "
msgstr "真的要删除主钥吗?(y/N)"
-#: g10/keyedit.c:1886
+#: g10/keyedit.c:1892
msgid "You must select exactly one key.\n"
msgstr "您必须指定一把密钥。\n"
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1920
msgid "Command expects a filename argument\n"
msgstr "命令需要一个文件名作为参数\n"
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1934
#, c-format
msgid "Can't open `%s': %s\n"
msgstr "无法打开‘%s’:%s\n"
-#: g10/keyedit.c:1945
+#: g10/keyedit.c:1951
#, c-format
msgid "Error reading backup key from `%s': %s\n"
msgstr "从‘%s’读取备份密钥时出错:%s\n"
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1975
msgid "You must select at least one key.\n"
msgstr "您必须选择至少一把密钥。\n"
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1978
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "您真的想要删除选定的密钥吗?(y/N)"
-#: g10/keyedit.c:1973
+#: g10/keyedit.c:1979
msgid "Do you really want to delete this key? (y/N) "
msgstr "您真的要删除这把密钥吗?(y/N)"
-#: g10/keyedit.c:2008
+#: g10/keyedit.c:2014
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要吊销所有选定的用户标识吗?(y/N)"
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2015
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要吊销这个用户标识吗?(y/N)"
-#: g10/keyedit.c:2027
+#: g10/keyedit.c:2033
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "您真的要吊销整把密钥吗?(y/N)"
-#: g10/keyedit.c:2038
+#: g10/keyedit.c:2044
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "您真的要吊销选定的子钥吗?(y/N)"
-#: g10/keyedit.c:2040
+#: g10/keyedit.c:2046
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "您真的要吊销这把子钥吗?(y/N)"
-#: g10/keyedit.c:2090
+#: g10/keyedit.c:2096
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
-#: g10/keyedit.c:2132
+#: g10/keyedit.c:2138
msgid "Set preference list to:\n"
msgstr "设为首选项列表为:\n"
-#: g10/keyedit.c:2138
+#: g10/keyedit.c:2144
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所选用户标识的首选项吗?(y/N)"
-#: g10/keyedit.c:2140
+#: g10/keyedit.c:2146
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗?(y/N)"
-#: g10/keyedit.c:2208
+#: g10/keyedit.c:2214
msgid "Save changes? (y/N) "
msgstr "要保存变动吗?(y/N)"
-#: g10/keyedit.c:2211
+#: g10/keyedit.c:2217
msgid "Quit without saving? (y/N) "
msgstr "要不保存而离开吗?(y/N)"
-#: g10/keyedit.c:2221
+#: g10/keyedit.c:2227
#, c-format
msgid "update failed: %s\n"
msgstr "更新失败:%s\n"
-#: g10/keyedit.c:2228
+#: g10/keyedit.c:2234
#, c-format
msgid "update secret failed: %s\n"
msgstr "更新私钥失败:%s\n"
-#: g10/keyedit.c:2235
+#: g10/keyedit.c:2241
msgid "Key not changed so no update needed.\n"
msgstr "密钥没有变动所以不需要更新。\n"
-#: g10/keyedit.c:2336
+#: g10/keyedit.c:2342
msgid "Digest: "
msgstr "散列:"
-#: g10/keyedit.c:2388
+#: g10/keyedit.c:2394
msgid "Features: "
msgstr "特点:"
-#: g10/keyedit.c:2399
+#: g10/keyedit.c:2405
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
-#: g10/keyedit.c:2414 g10/keylist.c:308
+#: g10/keyedit.c:2420 g10/keylist.c:308
msgid "Preferred keyserver: "
msgstr "首选公钥服务器:"
-#: g10/keyedit.c:2422 g10/keyedit.c:2423
+#: g10/keyedit.c:2428 g10/keyedit.c:2429
msgid "Notations: "
msgstr "注记:"
-#: g10/keyedit.c:2633
+#: g10/keyedit.c:2639
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
-#: g10/keyedit.c:2692
+#: g10/keyedit.c:2698
#, c-format
msgid "This key was revoked on %s by %s key %s\n"
msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
-#: g10/keyedit.c:2713
+#: g10/keyedit.c:2719
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "这把密钥可被 %s 密钥 %s 吊销"
-#: g10/keyedit.c:2719
+#: g10/keyedit.c:2725
msgid "(sensitive)"
msgstr " (敏感的)"
-#: g10/keyedit.c:2735 g10/keyedit.c:2791 g10/keyedit.c:2852 g10/keyedit.c:2867
+#: g10/keyedit.c:2741 g10/keyedit.c:2797 g10/keyedit.c:2858 g10/keyedit.c:2873
#: g10/keylist.c:194 g10/keyserver.c:516
#, c-format
msgid "created: %s"
msgstr "创建于:%s"
-#: g10/keyedit.c:2738 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:952
+#: g10/keyedit.c:2744 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:961
#, c-format
msgid "revoked: %s"
msgstr "已吊销:%s"
-#: g10/keyedit.c:2740 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
+#: g10/keyedit.c:2746 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
#, c-format
msgid "expired: %s"
msgstr "已过期:%s"
-#: g10/keyedit.c:2742 g10/keyedit.c:2793 g10/keyedit.c:2854 g10/keyedit.c:2869
+#: g10/keyedit.c:2748 g10/keyedit.c:2799 g10/keyedit.c:2860 g10/keyedit.c:2875
#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
-#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:958
+#: g10/keylist.c:898 g10/keyserver.c:522 g10/mainproc.c:967
#, c-format
msgid "expires: %s"
msgstr "有效至:%s"
-#: g10/keyedit.c:2744
+#: g10/keyedit.c:2750
#, c-format
msgid "usage: %s"
msgstr "可用于:%s"
-#: g10/keyedit.c:2759
+#: g10/keyedit.c:2765
#, c-format
msgid "trust: %s"
msgstr "信任度:%s"
-#: g10/keyedit.c:2763
+#: g10/keyedit.c:2769
#, c-format
msgid "validity: %s"
msgstr "有效性:%s"
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
-#: g10/keyedit.c:2798 g10/keylist.c:200
+#: g10/keyedit.c:2804 g10/keylist.c:200
msgid "card-no: "
msgstr "卡号:"
-#: g10/keyedit.c:2822
+#: g10/keyedit.c:2828
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
-#: g10/keyedit.c:2886 g10/keyedit.c:3232 g10/keyserver.c:526
-#: g10/mainproc.c:1753 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2892 g10/keyedit.c:3238 g10/keyserver.c:526
+#: g10/mainproc.c:1803 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:2888 g10/keyedit.c:3234 g10/keyserver.c:530
-#: g10/mainproc.c:1755 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2894 g10/keyedit.c:3240 g10/keyserver.c:530
+#: g10/mainproc.c:1805 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "已过期"
-#: g10/keyedit.c:2953
+#: g10/keyedit.c:2959
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
"警告:没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
-#: g10/keyedit.c:3014
+#: g10/keyedit.c:3020
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3727,54 +3757,74 @@ msgstr ""
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
-#: g10/keyedit.c:3019 g10/keyedit.c:3349
+#: g10/keyedit.c:3025 g10/keyedit.c:3360
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗?(y/N)"
-#: g10/keyedit.c:3025
+#: g10/keyedit.c:3031
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
-#: g10/keyedit.c:3165
+#: g10/keyedit.c:3171
msgid "Delete this good signature? (y/N/q)"
msgstr "删除这个完好的签名吗?(y/N/q)"
-#: g10/keyedit.c:3175
+#: g10/keyedit.c:3181
msgid "Delete this invalid signature? (y/N/q)"
msgstr "删除这个无效的签名吗?(y/N/q)"
-#: g10/keyedit.c:3179
+#: g10/keyedit.c:3185
msgid "Delete this unknown signature? (y/N/q)"
msgstr "删除这个未知的签名吗?(y/N/q)"
-#: g10/keyedit.c:3185
+#: g10/keyedit.c:3191
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要删除这个自身签名吗?(y/N)"
-#: g10/keyedit.c:3199
+#: g10/keyedit.c:3205
#, c-format
msgid "Deleted %d signature.\n"
msgstr "已经删除了 %d 个签名。\n"
-#: g10/keyedit.c:3200
+#: g10/keyedit.c:3206
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "已经删除了 %d 个签名。\n"
-#: g10/keyedit.c:3203
+#: g10/keyedit.c:3209
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
-#: g10/keyedit.c:3236 g10/trustdb.c:1703
+#: g10/keyedit.c:3242 g10/trustdb.c:1703
msgid "invalid"
msgstr "无效"
+#: g10/keyedit.c:3244
+#, fuzzy, c-format
+msgid "User ID \"%s\" compacted: %s\n"
+msgstr "用户标识“%s”:无用部分已清除\n"
+
+#: g10/keyedit.c:3251
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signature removed\n"
+msgstr "密钥 %s:“%s”%d 个签名被清除\n"
+
#: g10/keyedit.c:3252
+#, fuzzy, c-format
+msgid "User ID \"%s\": %d signatures removed\n"
+msgstr "密钥 %s:“%s”%d 个签名被清除\n"
+
+#: g10/keyedit.c:3260
+#, fuzzy, c-format
+msgid "User ID \"%s\": already minimized\n"
+msgstr "用户标识“%s”:无用部分已清除\n"
+
+#: g10/keyedit.c:3261
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "用户标识“%s”:无用部分已清除\n"
-#: g10/keyedit.c:3344
+#: g10/keyedit.c:3355
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3783,193 +3833,193 @@ msgstr ""
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
-#: g10/keyedit.c:3355
+#: g10/keyedit.c:3366
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
-#: g10/keyedit.c:3375
+#: g10/keyedit.c:3386
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识:"
-#: g10/keyedit.c:3400
+#: g10/keyedit.c:3411
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3426
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
-#: g10/keyedit.c:3437
+#: g10/keyedit.c:3448
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
-#: g10/keyedit.c:3456
+#: g10/keyedit.c:3467
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告:将某把密钥指派为指定吊销者的操作无法撤销!\n"
-#: g10/keyedit.c:3462
+#: g10/keyedit.c:3473
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
-#: g10/keyedit.c:3523
+#: g10/keyedit.c:3534
msgid "Please remove selections from the secret keys.\n"
msgstr "请从私钥中删除选择。\n"
-#: g10/keyedit.c:3529
+#: g10/keyedit.c:3540
msgid "Please select at most one subkey.\n"
msgstr "请至多选择一个子钥。\n"
-#: g10/keyedit.c:3533
+#: g10/keyedit.c:3544
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
-#: g10/keyedit.c:3536
+#: g10/keyedit.c:3547
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
-#: g10/keyedit.c:3582
+#: g10/keyedit.c:3593
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
-#: g10/keyedit.c:3598
+#: g10/keyedit.c:3609
msgid "No corresponding signature in secret ring\n"
msgstr "在私钥环里没有相应的签名\n"
-#: g10/keyedit.c:3671
+#: g10/keyedit.c:3682
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "签名的子钥 %s 已经交叉验证\n"
-#: g10/keyedit.c:3677
+#: g10/keyedit.c:3688
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子钥 %s 不签名,因此不需要交叉验证\n"
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3850
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
-#: g10/keyedit.c:3878 g10/keyedit.c:3988 g10/keyedit.c:4108 g10/keyedit.c:4249
+#: g10/keyedit.c:3889 g10/keyedit.c:3999 g10/keyedit.c:4119 g10/keyedit.c:4260
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签名\n"
-#: g10/keyedit.c:4049
+#: g10/keyedit.c:4060
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL:"
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4140
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗?(y/N)"
-#: g10/keyedit.c:4130
+#: g10/keyedit.c:4141
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗?(y/N)"
-#: g10/keyedit.c:4192
+#: g10/keyedit.c:4203
msgid "Enter the notation: "
msgstr "输入注记:"
-#: g10/keyedit.c:4341
+#: g10/keyedit.c:4352
msgid "Proceed? (y/N) "
msgstr "继续?(y/N)"
-#: g10/keyedit.c:4405
+#: g10/keyedit.c:4416
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4463
+#: g10/keyedit.c:4474
#, c-format
msgid "No user ID with hash %s\n"
msgstr "没有散列值为 %s 的用户标识\n"
-#: g10/keyedit.c:4490
+#: g10/keyedit.c:4501
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
-#: g10/keyedit.c:4625
+#: g10/keyedit.c:4636
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识:“%s”\n"
-#: g10/keyedit.c:4628 g10/keyedit.c:4692 g10/keyedit.c:4735
+#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
-#: g10/keyedit.c:4630 g10/keyedit.c:4694 g10/keyedit.c:4737
+#: g10/keyedit.c:4641 g10/keyedit.c:4705 g10/keyedit.c:4748
msgid " (non-exportable)"
msgstr " (不可导出)"
-#: g10/keyedit.c:4634
+#: g10/keyedit.c:4645
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签名已在 %s 过期。\n"
-#: g10/keyedit.c:4638
+#: g10/keyedit.c:4649
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗?(y/N)"
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4653
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签名生成一份吊销证书吗?(y/N)"
-#: g10/keyedit.c:4669
+#: g10/keyedit.c:4680
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名:\n"
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4706
msgid " (non-revocable)"
msgstr " (不可吊销)"
-#: g10/keyedit.c:4702
+#: g10/keyedit.c:4713
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
-#: g10/keyedit.c:4724
+#: g10/keyedit.c:4735
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签名:\n"
-#: g10/keyedit.c:4744
+#: g10/keyedit.c:4755
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗?(y/N)"
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4785
msgid "no secret key\n"
msgstr "没有私钥\n"
-#: g10/keyedit.c:4844
+#: g10/keyedit.c:4855
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:4861
+#: g10/keyedit.c:4872
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告:有一份用户标识签名的日期标记为 %d 秒后的未来\n"
-#: g10/keyedit.c:4925
+#: g10/keyedit.c:4936
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
-#: g10/keyedit.c:4987
+#: g10/keyedit.c:4998
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
-#: g10/keyedit.c:5082
+#: g10/keyedit.c:5093
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
@@ -4009,12 +4059,12 @@ msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
#: g10/keygen.c:1125 g10/keygen.c:1239 g10/keygen.c:1244 g10/keygen.c:1377
-#: g10/keygen.c:2934
+#: g10/keygen.c:2948
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效:改用 %u 位\n"
-#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2940
+#: g10/keygen.c:1130 g10/keygen.c:1250 g10/keygen.c:1382 g10/keygen.c:2954
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
@@ -4312,7 +4362,7 @@ msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:2056
+#: g10/keygen.c:2055
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4320,12 +4370,12 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:2066
+#: g10/keygen.c:2070
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2072
+#: g10/keygen.c:2076
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"
@@ -4337,7 +4387,7 @@ msgstr ""
"再次执行这个程序,并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:2094
+#: g10/keygen.c:2098
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"
@@ -4347,50 +4397,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:2879
+#: g10/keygen.c:2888 g10/keygen.c:2915
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:3091 g10/keygen.c:3236
+#: g10/keygen.c:3108 g10/keygen.c:3253
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:3093 g10/keygen.c:3239
+#: g10/keygen.c:3110 g10/keygen.c:3256
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:3096 g10/keygen.c:3242
+#: g10/keygen.c:3113 g10/keygen.c:3259
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:3225
+#: g10/keygen.c:3242
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环:%s\n"
-#: g10/keygen.c:3231
+#: g10/keygen.c:3248
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环:%s\n"
-#: g10/keygen.c:3249
+#: g10/keygen.c:3266
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3256
+#: g10/keygen.c:3273
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3279
+#: g10/keygen.c:3296
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
-#: g10/keygen.c:3290
+#: g10/keygen.c:3307
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"
@@ -4398,42 +4448,42 @@ msgstr ""
"请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3302 g10/keygen.c:3431 g10/keygen.c:3547
+#: g10/keygen.c:3319 g10/keygen.c:3454 g10/keygen.c:3570
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
-#: g10/keygen.c:3354 g10/keygen.c:3482 g10/sign.c:277
+#: g10/keygen.c:3372 g10/keygen.c:3505 g10/sign.c:277
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3356 g10/keygen.c:3484 g10/sign.c:279
+#: g10/keygen.c:3374 g10/keygen.c:3507 g10/sign.c:279
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3365 g10/keygen.c:3495
+#: g10/keygen.c:3383 g10/keygen.c:3518
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3404 g10/keygen.c:3528
+#: g10/keygen.c:3422 g10/keygen.c:3551
msgid "Really create? (y/N) "
msgstr "真的要建立吗?(y/N)"
-#: g10/keygen.c:3691
+#: g10/keygen.c:3714
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败:%s\n"
-#: g10/keygen.c:3739
+#: g10/keygen.c:3762
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
-#: g10/keygen.c:3765
+#: g10/keygen.c:3788
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意:卡密钥的备份已保存到‘%s’\n"
@@ -4577,7 +4627,7 @@ msgstr "已禁用"
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
-#: g10/keyserver.c:813 g10/keyserver.c:1434
+#: g10/keyserver.c:813 g10/keyserver.c:1435
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
@@ -4611,304 +4661,304 @@ msgstr "在 %s 服务器 %s 上搜索名字\n"
msgid "searching for names from %s\n"
msgstr "在 %s 上搜索名字\n"
-#: g10/keyserver.c:1337
+#: g10/keyserver.c:1338
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
-#: g10/keyserver.c:1341
+#: g10/keyserver.c:1342
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1384
+#: g10/keyserver.c:1385
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”,在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1387
+#: g10/keyserver.c:1388
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”,在 %s 上\n"
-#: g10/keyserver.c:1394 g10/keyserver.c:1490
+#: g10/keyserver.c:1395 g10/keyserver.c:1491
msgid "no keyserver action!\n"
msgstr "公钥服务器无动作!\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1443
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告:处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1451
+#: g10/keyserver.c:1452
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1513 g10/keyserver.c:2041
+#: g10/keyserver.c:1514 g10/keyserver.c:2042
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1519
+#: g10/keyserver.c:1520
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n"
-#: g10/keyserver.c:1531
+#: g10/keyserver.c:1532
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n"
-#: g10/keyserver.c:1536
+#: g10/keyserver.c:1537
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
-#: g10/keyserver.c:1544
+#: g10/keyserver.c:1545
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s 不支持对版本 %d 的处理\n"
-#: g10/keyserver.c:1551
+#: g10/keyserver.c:1552
msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1557
msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n"
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1566
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误:%s\n"
-#: g10/keyserver.c:1590 g10/keyserver.c:1624
+#: g10/keyserver.c:1591 g10/keyserver.c:1625
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识:跳过\n"
-#: g10/keyserver.c:1883
+#: g10/keyserver.c:1884
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/keyserver.c:1905
+#: g10/keyserver.c:1906
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:1908
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1964
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告:无法获取 URI %s:%s\n"
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1970
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "不能解析 URI %s\n"
-#: g10/mainproc.c:210
+#: g10/mainproc.c:228
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "加密过的会话密钥尺寸(%d)诡异\n"
-#: g10/mainproc.c:263
+#: g10/mainproc.c:281
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 加密过的会话密钥\n"
-#: g10/mainproc.c:273
+#: g10/mainproc.c:291
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密码由未知的散列算法 %d 生成\n"
-#: g10/mainproc.c:354
+#: g10/mainproc.c:357
#, c-format
msgid "public key is %s\n"
msgstr "公钥是 %s\n"
-#: g10/mainproc.c:411
+#: g10/mainproc.c:414
msgid "public key encrypted data: good DEK\n"
msgstr "公钥加密过的数据:完好的数据加密密钥\n"
-#: g10/mainproc.c:444
+#: g10/mainproc.c:447
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "由 %u 位的 %s 密钥加密,钥匙号为 %s、生成于 %s\n"
-#: g10/mainproc.c:448 g10/pkclist.c:219
+#: g10/mainproc.c:451 g10/pkclist.c:219
#, c-format
msgid " \"%s\"\n"
msgstr " “%s”\n"
-#: g10/mainproc.c:452
+#: g10/mainproc.c:455
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "由 %s 密钥加密、钥匙号为 %s\n"
-#: g10/mainproc.c:466
+#: g10/mainproc.c:469
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公钥解密失败:%s\n"
-#: g10/mainproc.c:480
+#: g10/mainproc.c:483
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "以 %lu 个密码加密\n"
-#: g10/mainproc.c:482
+#: g10/mainproc.c:485
msgid "encrypted with 1 passphrase\n"
msgstr "以 1 个密码加密\n"
-#: g10/mainproc.c:514 g10/mainproc.c:536
+#: g10/mainproc.c:517 g10/mainproc.c:539
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 为加密过的数据\n"
-#: g10/mainproc.c:522
+#: g10/mainproc.c:525
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 算法不可用,试以 %s 代替\n"
-#: g10/mainproc.c:555
+#: g10/mainproc.c:558
msgid "decryption okay\n"
msgstr "解密成功\n"
-#: g10/mainproc.c:559
+#: g10/mainproc.c:562
msgid "WARNING: message was not integrity protected\n"
msgstr "警告:报文未受到完整的保护\n"
-#: g10/mainproc.c:572
+#: g10/mainproc.c:575
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告:加密过的报文已经变造!\n"
-#: g10/mainproc.c:578
+#: g10/mainproc.c:581
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失败:%s\n"
-#: g10/mainproc.c:597
+#: g10/mainproc.c:600
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "注意:发件者要求您“只阅读不存盘”\n"
-#: g10/mainproc.c:599
+#: g10/mainproc.c:602
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
-#: g10/mainproc.c:805
+#: g10/mainproc.c:814
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
-#: g10/mainproc.c:1154
+#: g10/mainproc.c:1167 g10/mainproc.c:1204
msgid "no signature found\n"
msgstr "未找到签名\n"
-#: g10/mainproc.c:1392
+#: g10/mainproc.c:1442
msgid "signature verification suppressed\n"
msgstr "签名验证已被抑制\n"
-#: g10/mainproc.c:1492
+#: g10/mainproc.c:1542
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些有歧义的签名\n"
-#: g10/mainproc.c:1503
+#: g10/mainproc.c:1553
#, c-format
msgid "Signature made %s\n"
msgstr "签名建立于 %s\n"
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1554
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
-#: g10/mainproc.c:1508
+#: g10/mainproc.c:1558
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签名,使用 %s,钥匙号 %s\n"
-#: g10/mainproc.c:1528
+#: g10/mainproc.c:1578
msgid "Key available at: "
msgstr "可用的密钥在:"
-#: g10/mainproc.c:1661 g10/mainproc.c:1709
+#: g10/mainproc.c:1711 g10/mainproc.c:1759
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签名,来自于“%s”"
-#: g10/mainproc.c:1663 g10/mainproc.c:1711
+#: g10/mainproc.c:1713 g10/mainproc.c:1761
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签名,来自于“%s”"
-#: g10/mainproc.c:1665 g10/mainproc.c:1713
+#: g10/mainproc.c:1715 g10/mainproc.c:1763
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签名,来自于“%s”"
-#: g10/mainproc.c:1715
+#: g10/mainproc.c:1765
msgid "[uncertain]"
msgstr "[不确定]"
-#: g10/mainproc.c:1746
+#: g10/mainproc.c:1796
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
-#: g10/mainproc.c:1844
+#: g10/mainproc.c:1894
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签名已于 %s 过期。\n"
-#: g10/mainproc.c:1849
+#: g10/mainproc.c:1899
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签名在 %s 过期。\n"
-#: g10/mainproc.c:1852
+#: g10/mainproc.c:1902
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s 签名,散列算法 %s\n"
-#: g10/mainproc.c:1853
+#: g10/mainproc.c:1903
msgid "binary"
msgstr "二进制"
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1904
msgid "textmode"
msgstr "文本模式"
-#: g10/mainproc.c:1854 g10/trustdb.c:531
+#: g10/mainproc.c:1904 g10/trustdb.c:531
msgid "unknown"
msgstr "未知"
-#: g10/mainproc.c:1874
+#: g10/mainproc.c:1924
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签名:%s\n"
-#: g10/mainproc.c:1946 g10/mainproc.c:1962 g10/mainproc.c:2052
+#: g10/mainproc.c:2008 g10/mainproc.c:2024 g10/mainproc.c:2120
msgid "not a detached signature\n"
msgstr "不是一份分离的签名\n"
-#: g10/mainproc.c:1989
+#: g10/mainproc.c:2051
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告:检测到多重签名。只检查第一个签名。\n"
-#: g10/mainproc.c:1997
+#: g10/mainproc.c:2059
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签名\n"
-#: g10/mainproc.c:2056
+#: g10/mainproc.c:2124
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签名\n"
-#: g10/mainproc.c:2066
+#: g10/mainproc.c:2134
msgid "invalid root packet detected in proc_tree()\n"
msgstr "在 proc_tree() 中检测到无效的根包\n"
@@ -4942,55 +4992,65 @@ msgstr "警告:使用试验性质的散列算法 %s\n"
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "警告:不建议使用散列算法 %s\n"
-#: g10/misc.c:486
+#: g10/misc.c:490
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA 算法插件不存在\n"
-#: g10/misc.c:487 g10/sig-check.c:109
+#: g10/misc.c:491 g10/sig-check.c:109
#, c-format
msgid "please see %s for more information\n"
msgstr "请参见 %s 以得到更多信息。\n"
-#: g10/misc.c:722
+#: g10/misc.c:726
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d:不建议使用该选项“%s”\n"
-#: g10/misc.c:726
+#: g10/misc.c:730
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告:“%s”选项已不建议使用\n"
-#: g10/misc.c:728
+#: g10/misc.c:732
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "请以“%s%s”代替\n"
-#: g10/misc.c:735
+#: g10/misc.c:739
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告:“%s”命令已不建议使用——不要使用它\n"
-#: g10/misc.c:796
+#: g10/misc.c:749
+#, c-format
+msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
+msgstr ""
+
+#: g10/misc.c:752
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
+msgstr "警告:“%s”选项已不建议使用\n"
+
+#: g10/misc.c:813
msgid "Uncompressed"
msgstr "不压缩"
#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:821
+#: g10/misc.c:838
msgid "uncompressed|none"
msgstr "未压缩|无"
-#: g10/misc.c:931
+#: g10/misc.c:948
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s 也许不能使用这个报文\n"
-#: g10/misc.c:1106
+#: g10/misc.c:1123
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "有歧义的选项‘%s’\n"
-#: g10/misc.c:1131
+#: g10/misc.c:1148
#, c-format
msgid "unknown option `%s'\n"
msgstr "未知的选项 '%s'\n"
@@ -5046,7 +5106,7 @@ msgstr "警告:潜在不安全的对称加密会话密钥\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
-#: g10/passphrase.c:310 g10/passphrase.c:585
+#: g10/passphrase.c:310 g10/passphrase.c:600
#, c-format
msgid " (main key ID %s)"
msgstr " (主钥匙号 %s)"
@@ -5074,24 +5134,24 @@ msgstr "请输入密码\n"
msgid "cancelled by user\n"
msgstr "用户取消\n"
-#: g10/passphrase.c:380 g10/passphrase.c:436
+#: g10/passphrase.c:381 g10/passphrase.c:447
#, fuzzy, c-format
msgid "problem with the agent: %s\n"
msgstr "代理程序有问题――正在停用代理程序\n"
-#: g10/passphrase.c:564
+#: g10/passphrase.c:579
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr "您需要输入密码,才能解开这个用户的私钥:“%s”\n"
-#: g10/passphrase.c:572
+#: g10/passphrase.c:587
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u 位的 %s 密钥,钥匙号 %s,建立于 %s"
-#: g10/passphrase.c:581
+#: g10/passphrase.c:596
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
@@ -5140,23 +5200,23 @@ msgstr "这张照片正确吗?(y/N/q)"
msgid "unable to display photo ID!\n"
msgstr "无法显示照片标识!\n"
-#: g10/pkclist.c:62 g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:625
msgid "No reason specified"
msgstr "未指定原因"
-#: g10/pkclist.c:64 g10/revoke.c:625
+#: g10/pkclist.c:64 g10/revoke.c:627
msgid "Key is superseded"
msgstr "密钥被替换"
-#: g10/pkclist.c:66 g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:626
msgid "Key has been compromised"
msgstr "密钥已泄漏"
-#: g10/pkclist.c:68 g10/revoke.c:626
+#: g10/pkclist.c:68 g10/revoke.c:628
msgid "Key is no longer used"
msgstr "密钥不再使用"
-#: g10/pkclist.c:70 g10/revoke.c:627
+#: g10/pkclist.c:70 g10/revoke.c:629
msgid "User ID is no longer valid"
msgstr "用户标识不再有效"
@@ -5223,7 +5283,7 @@ msgstr ""
"这把密钥的最小信任等级为:%s\n"
"\n"
-#: g10/pkclist.c:299 g10/revoke.c:652
+#: g10/pkclist.c:299 g10/revoke.c:654
msgid "Your decision? "
msgstr "您的决定是什么?"
@@ -5262,105 +5322,105 @@ msgstr ""
"这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
"己在做什么,您可以在下一个问题回答 yes。\n"
-#: g10/pkclist.c:468
+#: g10/pkclist.c:480
msgid "Use this key anyway? (y/N) "
msgstr "无论如何还是使用这把密钥吗?(y/N)"
-#: g10/pkclist.c:502
+#: g10/pkclist.c:514
msgid "WARNING: Using untrusted key!\n"
msgstr "警告:正在使用不被信任的密钥!\n"
-#: g10/pkclist.c:509
+#: g10/pkclist.c:521
msgid "WARNING: this key might be revoked (revocation key not present)\n"
msgstr "警告:此密钥可能已被吊销(吊销密钥不存在)\n"
-#: g10/pkclist.c:518
+#: g10/pkclist.c:530
msgid "WARNING: This key has been revoked by its designated revoker!\n"
msgstr "警告:这把密钥已经被它的指定吊销者吊销了!\n"
-#: g10/pkclist.c:521
+#: g10/pkclist.c:533
msgid "WARNING: This key has been revoked by its owner!\n"
msgstr "警告:这把密钥已经被它的持有者吊销了!\n"
-#: g10/pkclist.c:522
+#: g10/pkclist.c:534
msgid " This could mean that the signature is forged.\n"
msgstr " 这表明这个签名有可能是伪造的。\n"
-#: g10/pkclist.c:528
+#: g10/pkclist.c:540
msgid "WARNING: This subkey has been revoked by its owner!\n"
msgstr "警告:这把子钥已经被它的持有者吊销了!\n"
-#: g10/pkclist.c:533
+#: g10/pkclist.c:545
msgid "Note: This key has been disabled.\n"
msgstr "注意:这把密钥已经被禁用了。\n"
-#: g10/pkclist.c:553
+#: g10/pkclist.c:565
#, c-format
msgid "Note: Verified signer's address is `%s'\n"
msgstr "注意:验证过的签名者的地址是‘%s’\n"
-#: g10/pkclist.c:560
+#: g10/pkclist.c:572
#, c-format
msgid "Note: Signer's address `%s' does not match DNS entry\n"
msgstr "注意:签名者的地址‘%s’不匹配任何 DNS 记录\n"
-#: g10/pkclist.c:572
+#: g10/pkclist.c:584
msgid "trustlevel adjusted to FULL due to valid PKA info\n"
msgstr "PKA 信息有效,信任级别调整到“完全”\n"
-#: g10/pkclist.c:580
+#: g10/pkclist.c:592
msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
msgstr "PKA 信息无效,信任级别调整到“从不”\n"
-#: g10/pkclist.c:591
+#: g10/pkclist.c:603
msgid "Note: This key has expired!\n"
msgstr "注意:这把密钥已经过期了!\n"
-#: g10/pkclist.c:602
+#: g10/pkclist.c:614
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告:这把密钥未经受信任的签名认证!\n"
-#: g10/pkclist.c:604
+#: g10/pkclist.c:616
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 没有证据表明这个签名属于它所声称的持有者。\n"
-#: g10/pkclist.c:612
+#: g10/pkclist.c:624
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告:我们不信任这把密钥!\n"
-#: g10/pkclist.c:613
+#: g10/pkclist.c:625
msgid " The signature is probably a FORGERY.\n"
msgstr " 这个签名很有可能是伪造的。\n"
-#: g10/pkclist.c:621
+#: g10/pkclist.c:633
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告:这把密钥未经有足够信任度的签名所认证。\n"
-#: g10/pkclist.c:623
+#: g10/pkclist.c:635
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 这份签名并不一定属于它所声称的持有者\n"
-#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
+#: g10/pkclist.c:834 g10/pkclist.c:876 g10/pkclist.c:1088 g10/pkclist.c:1158
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s:已跳过:%s\n"
-#: g10/pkclist.c:834 g10/pkclist.c:1114
+#: g10/pkclist.c:846 g10/pkclist.c:1126
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳过:公钥已存在\n"
-#: g10/pkclist.c:885
+#: g10/pkclist.c:897
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
-#: g10/pkclist.c:909
+#: g10/pkclist.c:921
msgid "Current recipients:\n"
msgstr "当前收件人:\n"
-#: g10/pkclist.c:935
+#: g10/pkclist.c:947
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -5368,42 +5428,42 @@ msgstr ""
"\n"
"输入用户标识。以空白行结束:"
-#: g10/pkclist.c:960
+#: g10/pkclist.c:972
msgid "No such user ID.\n"
msgstr "没有这个用户标识。\n"
-#: g10/pkclist.c:969 g10/pkclist.c:1043
+#: g10/pkclist.c:981 g10/pkclist.c:1055
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳过:公钥已被设为默认收件者\n"
-#: g10/pkclist.c:990
+#: g10/pkclist.c:1002
msgid "Public key is disabled.\n"
msgstr "公钥被禁用。\n"
-#: g10/pkclist.c:999
+#: g10/pkclist.c:1011
msgid "skipped: public key already set\n"
msgstr "已跳过:公钥已被设定\n"
-#: g10/pkclist.c:1034
+#: g10/pkclist.c:1046
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的默认收件者“%s”\n"
-#: g10/pkclist.c:1092
+#: g10/pkclist.c:1104
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s:已跳过:公钥已被禁用\n"
-#: g10/pkclist.c:1154
+#: g10/pkclist.c:1166
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
-#: g10/pkclist.c:1468
+#: g10/pkclist.c:1480
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "密钥 %s:没有有效的用户标识\n"
-#: g10/pkclist.c:1493
+#: g10/pkclist.c:1505
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "密钥 %s:没有有效的用户标识\n"
@@ -5412,27 +5472,32 @@ msgstr "密钥 %s:没有有效的用户标识\n"
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "数据未被保存;请用“--output”选项来保存它们\n"
-#: g10/plaintext.c:461
+#: g10/plaintext.c:462
msgid "Detached signature.\n"
msgstr "分离的签名。\n"
-#: g10/plaintext.c:467
+#: g10/plaintext.c:469
msgid "Please enter name of data file: "
msgstr "请输入数据文件的名称: "
-#: g10/plaintext.c:499
+#: g10/plaintext.c:501
msgid "reading stdin ...\n"
msgstr "正在从标准输入读取 ...\n"
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
msgid "no signed data\n"
msgstr "不含签名的数据\n"
-#: g10/plaintext.c:548
+#: g10/plaintext.c:555
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "无法打开有签名的数据‘%s’\n"
+#: g10/plaintext.c:589
+#, fuzzy, c-format
+msgid "can't open signed data fd=%d: %s\n"
+msgstr "无法打开有签名的数据‘%s’\n"
+
#: g10/pubkey-enc.c:107
#, c-format
msgid "anonymous recipient; trying secret key %s ...\n"
@@ -5466,7 +5531,7 @@ msgid "NOTE: key has been revoked"
msgstr "注意:密钥已被吊销"
#: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:588
+#: g10/revoke.c:188 g10/revoke.c:589
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet 失败:%s\n"
@@ -5488,11 +5553,11 @@ msgstr "(这是一把敏感的吊销密钥)\n"
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "要为这把密钥建立一份指定吊销者证书吗?(y/N)"
-#: g10/revoke.c:329 g10/revoke.c:554
+#: g10/revoke.c:329 g10/revoke.c:555
msgid "ASCII armored output forced.\n"
msgstr "已强行使用 ASCII 封装过的输出。\n"
-#: g10/revoke.c:344 g10/revoke.c:568
+#: g10/revoke.c:344 g10/revoke.c:569
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet 失败: %s\n"
@@ -5506,33 +5571,33 @@ msgstr "已建立吊销证书。\n"
msgid "no revocation keys found for \"%s\"\n"
msgstr "没有找到“%s”的吊销密钥\n"
-#: g10/revoke.c:471
+#: g10/revoke.c:472
#, c-format
msgid "secret key \"%s\" not found: %s\n"
msgstr "找不到私钥“%s”:%s\n"
-#: g10/revoke.c:500
+#: g10/revoke.c:501
#, c-format
msgid "no corresponding public key: %s\n"
msgstr "没有相对应的公钥:%s\n"
-#: g10/revoke.c:511
+#: g10/revoke.c:512
msgid "public key does not match secret key!\n"
msgstr "公钥与私钥不吻合!\n"
-#: g10/revoke.c:518
+#: g10/revoke.c:519
msgid "Create a revocation certificate for this key? (y/N) "
msgstr "要为这把密钥建立一份吊销证书吗?(y/N)"
-#: g10/revoke.c:535
+#: g10/revoke.c:536
msgid "unknown protection algorithm\n"
msgstr "未知的保护算法\n"
-#: g10/revoke.c:543
+#: g10/revoke.c:544
msgid "NOTE: This key is not protected!\n"
msgstr "注意:这把密钥没有被保护!\n"
-#: g10/revoke.c:594
+#: g10/revoke.c:595
msgid ""
"Revocation certificate created.\n"
"\n"
@@ -5550,33 +5615,33 @@ msgstr ""
"小心:您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
"人也能够看得到的地方!\n"
-#: g10/revoke.c:635
+#: g10/revoke.c:637
msgid "Please select the reason for the revocation:\n"
msgstr "请选择吊销的原因:\n"
-#: g10/revoke.c:645
+#: g10/revoke.c:647
msgid "Cancel"
msgstr "取消"
-#: g10/revoke.c:647
+#: g10/revoke.c:649
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(也许您会想要在这里选择 %d)\n"
-#: g10/revoke.c:688
+#: g10/revoke.c:690
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "请输入描述(可选);以空白行结束:\n"
-#: g10/revoke.c:716
+#: g10/revoke.c:718
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "吊销原因:%s\n"
-#: g10/revoke.c:718
+#: g10/revoke.c:720
msgid "(No description given)\n"
msgstr "(不给定描述)\n"
-#: g10/revoke.c:723
+#: g10/revoke.c:725
msgid "Is this okay? (y/N) "
msgstr "这样可以吗? (y/N)"
@@ -5734,25 +5799,25 @@ msgstr "检查已建立的签名时发生错误: %s\n"
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 签名来自:“%s”\n"
-#: g10/sign.c:790
+#: g10/sign.c:792
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签名\n"
-#: g10/sign.c:866
+#: g10/sign.c:868
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告:强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
-#: g10/sign.c:993
+#: g10/sign.c:995
msgid "signing:"
msgstr "正在签名:"
-#: g10/sign.c:1105
+#: g10/sign.c:1110
msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签名\n"
-#: g10/sign.c:1285
+#: g10/sign.c:1294
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
@@ -6127,7 +6192,7 @@ msgstr ""
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录:写入失败:%s\n"
-#: g10/verify.c:118
+#: g10/verify.c:119
msgid ""
"the signature could not be verified.\n"
"Please remember that the signature file (.sig or .asc)\n"
@@ -6137,11 +6202,16 @@ msgstr ""
"请记住签名文件(.sig或.asc)\n"
"应该是在命令行中给定的第一个文件。\n"
-#: g10/verify.c:195
+#: g10/verify.c:204
#, c-format
msgid "input line %u too long or missing LF\n"
msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
+#: g10/verify.c:249
+#, fuzzy, c-format
+msgid "can't open fd %d: %s\n"
+msgstr "无法打开‘%s’: %s\n"
+
#: jnlib/logging.c:626
#, c-format
msgid "you found a bug ... (%s:%d)\n"
@@ -6207,52 +6277,61 @@ msgstr "无法存储创建日期:%s\n"
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: scd/app-openpgp.c:1017 scd/app-openpgp.c:1978
+#: scd/app-openpgp.c:1017 scd/app-openpgp.c:2048
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1025 scd/app-openpgp.c:1986
+#: scd/app-openpgp.c:1025 scd/app-openpgp.c:2056
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1034 scd/app-openpgp.c:1996
+#: scd/app-openpgp.c:1034 scd/app-openpgp.c:2066
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
-#: scd/app-openpgp.c:1306
+#: scd/app-openpgp.c:1316
+#, fuzzy, c-format
+msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
+msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#: scd/app-openpgp.c:1330
msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
-#: scd/app-openpgp.c:1310 scd/app-openpgp.c:1324 scd/app-openpgp.c:1415
-#: scd/app-openpgp.c:2247
+#: scd/app-openpgp.c:1334 scd/app-openpgp.c:1366 scd/app-openpgp.c:1485
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN 回调返回错误:%s\n"
-#: scd/app-openpgp.c:1331 scd/app-openpgp.c:1421 scd/app-openpgp.c:2253
+#: scd/app-openpgp.c:1350
+#, c-format
+msgid "||Please enter the PIN%%0A[sigs done: %lu]"
+msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#: scd/app-openpgp.c:1373 scd/app-openpgp.c:1491
#, 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:1342 scd/app-openpgp.c:1356 scd/app-openpgp.c:1431
-#: scd/app-openpgp.c:2262 scd/app-openpgp.c:2276
+#: scd/app-openpgp.c:1386 scd/app-openpgp.c:1426 scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:2319
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败:%s\n"
-#: scd/app-openpgp.c:1379
+#: scd/app-openpgp.c:1449
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:1394 scd/app-openpgp.c:2486
+#: scd/app-openpgp.c:1464 scd/app-openpgp.c:2529
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1400 scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:1470 scd/app-openpgp.c:2538
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定!\n"
-#: scd/app-openpgp.c:1405
+#: scd/app-openpgp.c:1475
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
@@ -6260,108 +6339,107 @@ msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
#. TRANSLATORS: Do not translate the "|A|" prefix but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1412
+#: scd/app-openpgp.c:1482
msgid "|A|Admin PIN"
msgstr "|A|管理员 PIN"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:1561
+#: scd/app-openpgp.c:1631
msgid "|N|New PIN"
msgstr "新的 PIN"
-#: scd/app-openpgp.c:1565
+#: scd/app-openpgp.c:1635
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: scd/app-openpgp.c:1615 scd/app-openpgp.c:2064
+#: scd/app-openpgp.c:1685 scd/app-openpgp.c:2134
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:2071
+#: scd/app-openpgp.c:1691 scd/app-openpgp.c:2141
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:1631
+#: scd/app-openpgp.c:1701
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:1635
+#: scd/app-openpgp.c:1705
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:1637
+#: scd/app-openpgp.c:1707
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:1804
+#: scd/app-openpgp.c:1874
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:1811
+#: scd/app-openpgp.c:1881
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:1818
+#: scd/app-openpgp.c:1888
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-openpgp.c:1826 scd/app-openpgp.c:1833
+#: scd/app-openpgp.c:1896 scd/app-openpgp.c:1903
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1966
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥:%s\n"
-#: scd/app-openpgp.c:1955
+#: scd/app-openpgp.c:2025
msgid "please wait while key is being generated ...\n"
msgstr "请稍候,正在生成密钥……\n"
-#: scd/app-openpgp.c:1969
+#: scd/app-openpgp.c:2039
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:1972
+#: scd/app-openpgp.c:2042
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:2029
+#: scd/app-openpgp.c:2099
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2166
+#: scd/app-openpgp.c:2149
+msgid "fingerprint on card does not match requested one\n"
+msgstr ""
+
+#: scd/app-openpgp.c:2237
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:2227
+#: scd/app-openpgp.c:2298
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名:%lu\n"
-#: scd/app-openpgp.c:2235
-#, c-format
-msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-
-#: scd/app-openpgp.c:2500
+#: scd/app-openpgp.c:2543
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:2573 scd/app-openpgp.c:2583
+#: scd/app-openpgp.c:2616 scd/app-openpgp.c:2626
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@ -6425,7 +6503,7 @@ msgstr ""
msgid "handler for fd %d terminated\n"
msgstr ""
-#: sm/base64.c:318
+#: sm/base64.c:323
#, fuzzy, c-format
msgid "invalid radix64 character %02x skipped\n"
msgstr "跳过无效的 64 进制字符 %02x\n"
@@ -6449,139 +6527,139 @@ msgstr "不支持 gpg-agent 协议版本 %d\n"
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: sm/certchain.c:159
+#: sm/certchain.c:165
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "不支持 gpg-agent 协议版本 %d\n"
-#: sm/certchain.c:197
+#: sm/certchain.c:203
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:236
+#: sm/certchain.c:242
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:246
+#: sm/certchain.c:252
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "无法打开‘%s’:%s\n"
-#: sm/certchain.c:253 sm/certchain.c:282
+#: sm/certchain.c:259 sm/certchain.c:288
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:257 sm/certchain.c:286
+#: sm/certchain.c:263 sm/certchain.c:292
#, fuzzy
msgid "certificate policy not allowed"
msgstr "不允许导出私钥\n"
-#: sm/certchain.c:397
+#: sm/certchain.c:403
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:417
+#: sm/certchain.c:423
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:570 sm/certchain.c:734 sm/certchain.c:1260 sm/decrypt.c:261
-#: sm/encrypt.c:342 sm/sign.c:328 sm/verify.c:107
+#: sm/certchain.c:576 sm/certchain.c:740 sm/certchain.c:1266 sm/decrypt.c:261
+#: sm/encrypt.c:343 sm/sign.c:328 sm/verify.c:107
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "无法存储密钥:%s\n"
-#: sm/certchain.c:661
+#: sm/certchain.c:667
#, fuzzy
msgid "certificate has been revoked"
msgstr "注意:密钥已被吊销"
-#: sm/certchain.c:670
+#: sm/certchain.c:676
#, fuzzy
msgid "no CRL found for certificate"
msgstr "证书已损坏"
-#: sm/certchain.c:674
+#: sm/certchain.c:680
#, fuzzy
msgid "the available CRL is too old"
msgstr "可用的密钥在:"
-#: sm/certchain.c:676
+#: sm/certchain.c:682
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:681
+#: sm/certchain.c:687
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:759
+#: sm/certchain.c:765
#, fuzzy
msgid "no issuer found in certificate"
msgstr "生成一份吊销证书"
-#: sm/certchain.c:786
+#: sm/certchain.c:792
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:802
+#: sm/certchain.c:808
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:815
+#: sm/certchain.c:821
#, fuzzy
msgid "certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:858
+#: sm/certchain.c:864
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:926
+#: sm/certchain.c:932
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:941
+#: sm/certchain.c:947
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA 指纹:"
-#: sm/certchain.c:949
+#: sm/certchain.c:955
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:964
+#: sm/certchain.c:970
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:970
+#: sm/certchain.c:976
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:980
+#: sm/certchain.c:986
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:1007 sm/import.c:158
+#: sm/certchain.c:1013 sm/import.c:158
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1019
+#: sm/certchain.c:1025
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1052
+#: sm/certchain.c:1058
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "验证签名"
-#: sm/certchain.c:1082
+#: sm/certchain.c:1088
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1133
+#: sm/certchain.c:1139
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
@@ -6744,7 +6822,7 @@ msgstr "首选项‘%s’重复\n"
msgid "deleting certificate \"%s\" failed: %s\n"
msgstr "删除密钥区块时失败:%s\n"
-#: sm/encrypt.c:333
+#: sm/encrypt.c:334
#, fuzzy
msgid "no valid recipients given\n"
msgstr "(不给定描述)\n"
@@ -6799,10 +6877,6 @@ msgstr "证书已损坏"
msgid "register a smartcard"
msgstr "在智能卡上添加一把密钥"
-#: sm/gpgsm.c:263
-msgid "run in server mode"
-msgstr ""
-
#: sm/gpgsm.c:264
msgid "pass a command to the dirmngr"
msgstr ""
@@ -6967,29 +7041,39 @@ msgstr "用法:gpg [选项] "
msgid "can't encrypt to `%s': %s\n"
msgstr "无法连接至‘%s’:%s\n"
-#: sm/gpgsm.c:772
+#: sm/gpgsm.c:773
#, c-format
msgid "libksba is too old (need %s, have %s)\n"
msgstr ""
-#: sm/gpgsm.c:1248
+#: sm/gpgsm.c:1249
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1327
+#: sm/gpgsm.c:1328
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1345
+#: sm/gpgsm.c:1346
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "无法存取‘%s’:%s\n"
-#: sm/gpgsm.c:1535
+#: sm/gpgsm.c:1536
msgid "this command has not yet been implemented\n"
msgstr ""
+#: sm/gpgsm.c:1601
+#, fuzzy
+msgid "key generation is not available from the commandline\n"
+msgstr "gpg-agent 在此次舍话中无法使用\n"
+
+#: sm/gpgsm.c:1602
+#, fuzzy, c-format
+msgid "please use the script \"%s\" to generate a new key\n"
+msgstr "请选择您要使用的密钥种类:\n"
+
#: sm/import.c:110
#, fuzzy, c-format
msgid "total number processed: %lu\n"