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.po696
1 files changed, 373 insertions, 323 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f3262bf81..a72fbfb2e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-09-01 08:59+0200\n"
+"POT-Creation-Date: 2008-09-29 16:25+0200\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -100,20 +100,20 @@ msgstr "不支持保护散列 %d\n"
#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3221
#: g10/keygen.c:3254 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
-#: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
#, c-format
msgid "can't create `%s': %s\n"
msgstr "无法建立‘%s’:%s\n"
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
-#: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
-#: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2706 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
-#: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
-#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193 g10/keygen.c:2706
+#: g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
+#: g10/sign.c:1247 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2073
+#: sm/gpgsm.c:2110 sm/gpgsm.c:2148 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’: %s\n"
@@ -176,21 +176,35 @@ msgstr ""
msgid "failed to create stream from socket: %s\n"
msgstr "%s:建立散列表失败:%s\n"
-#: agent/divert-scd.c:217
+#: agent/divert-scd.c:219
#, fuzzy
msgid "Admin PIN"
msgstr "|A|管理员 PIN"
-#: agent/divert-scd.c:275
+#: agent/divert-scd.c:224
+msgid "Reset Code"
+msgstr ""
+
+#: agent/divert-scd.c:284
+#, fuzzy
+msgid "Repeat this Reset Code"
+msgstr "再次输入此 PIN:"
+
+#: agent/divert-scd.c:285
#, fuzzy
msgid "Repeat this PIN"
msgstr "再次输入此 PIN:"
-#: agent/divert-scd.c:278
+#: agent/divert-scd.c:290
+#, fuzzy
+msgid "Reset Code not correctly repeated; try again"
+msgstr "PIN 再次输入时与首次输入不符;请再试一次"
+
+#: agent/divert-scd.c:291
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符;请再试一次"
-#: agent/divert-scd.c:290
+#: agent/divert-scd.c:303
#, fuzzy, c-format
msgid "Please enter the PIN%s%s%s to unlock the card"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
@@ -382,7 +396,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
+#: scd/scdaemon.c:207 sm/gpgsm.c:570 tools/gpg-connect-agent.c:171
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -401,30 +415,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:732
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
#: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:970 sm/gpgsm.c:973 tools/symcryptrun.c:997
#: tools/gpg-check-pattern.c:178
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1061
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
#: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1065 tools/symcryptrun.c:930
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1072
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
@@ -1106,7 +1120,7 @@ msgstr "找不到有效的 OpenPGP 数据。\n"
msgid "not human readable"
msgstr ""
-#: g10/card-util.c:62 g10/card-util.c:310
+#: g10/card-util.c:62 g10/card-util.c:358
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP 卡不可用:%s\n"
@@ -1116,153 +1130,168 @@ msgstr "OpenPGP 卡不可用:%s\n"
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
-#: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
+#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1529
#: g10/keygen.c:2897 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
-#: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
+#: g10/card-util.c:83
+#, fuzzy
+msgid "This command is only available for version 2 cards\n"
+msgstr "在 %s 模式中不允许使用这个指令。\n"
+
+#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#, fuzzy
+msgid "Reset Code not or not anymore available\n"
+msgstr "私钥部分不可用\n"
+
+#: g10/card-util.c:122 g10/card-util.c:1215 g10/card-util.c:1294
#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
msgid "Your selection? "
msgstr "您的选择? "
-#: g10/card-util.c:220 g10/card-util.c:270
+#: g10/card-util.c:256 g10/card-util.c:306
msgid "[not set]"
msgstr "[未设定]"
-#: g10/card-util.c:417
+#: g10/card-util.c:465
msgid "male"
msgstr "男性"
-#: g10/card-util.c:418
+#: g10/card-util.c:466
msgid "female"
msgstr "女性"
-#: g10/card-util.c:418
+#: g10/card-util.c:466
msgid "unspecified"
msgstr "未定义"
-#: g10/card-util.c:445
+#: g10/card-util.c:493
msgid "not forced"
msgstr "可选"
-#: g10/card-util.c:445
+#: g10/card-util.c:493
msgid "forced"
msgstr "必须"
-#: g10/card-util.c:523
+#: g10/card-util.c:574
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "错误:目前只允许使用 ASCII 字符。\n"
-#: g10/card-util.c:525
+#: g10/card-util.c:576
msgid "Error: The \"<\" character may not be used.\n"
msgstr "错误:不能使用字符“<”。\n"
-#: g10/card-util.c:527
+#: g10/card-util.c:578
msgid "Error: Double spaces are not allowed.\n"
msgstr "错误:不允许出现两个空格。\n"
-#: g10/card-util.c:544
+#: g10/card-util.c:595
msgid "Cardholder's surname: "
msgstr "卡持有人的姓:"
-#: g10/card-util.c:546
+#: g10/card-util.c:597
msgid "Cardholder's given name: "
msgstr "卡持有人的名:"
-#: g10/card-util.c:564
+#: g10/card-util.c:615
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "错误:合成的姓名太长(至多 %d 个字符)。\n"
-#: g10/card-util.c:585
+#: g10/card-util.c:636
msgid "URL to retrieve public key: "
msgstr "获取公钥的 URL:"
-#: g10/card-util.c:593
+#: g10/card-util.c:644
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误:URL 太长(至多 %d 个字符)\n"
-#: g10/card-util.c:691 g10/card-util.c:760 g10/import.c:283
+#: g10/card-util.c:740 tools/no-libgcrypt.c:30
+#, fuzzy, c-format
+msgid "error allocating enough memory: %s\n"
+msgstr "建立钥匙环‘%s’时发生错误:%s\n"
+
+#: g10/card-util.c:752 g10/import.c:283
#, c-format
msgid "error reading `%s': %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: g10/card-util.c:699
+#: g10/card-util.c:779
msgid "Login data (account name): "
msgstr "登录数据(帐号名):"
-#: g10/card-util.c:709
+#: g10/card-util.c:789
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "错误:登录数据太长(至多 %d 个字符)。\n"
-#: g10/card-util.c:768
+#: g10/card-util.c:824
msgid "Private DO data: "
msgstr "个人 DO 数据:"
-#: g10/card-util.c:778
+#: g10/card-util.c:834
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "错误:个人 DO 太长(至多 %d 个字符)。\n"
-#: g10/card-util.c:798
+#: g10/card-util.c:884
msgid "Language preferences: "
msgstr "首选语言:"
-#: g10/card-util.c:806
+#: g10/card-util.c:892
msgid "Error: invalid length of preference string.\n"
msgstr "错误:首选项字符串长度无效。\n"
-#: g10/card-util.c:815
+#: g10/card-util.c:901
msgid "Error: invalid characters in preference string.\n"
msgstr "错误:首选项字符串里有无效字符。\n"
-#: g10/card-util.c:836
+#: g10/card-util.c:922
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性别(男性输入 M,女性输入 F,不指定输入空格):"
-#: g10/card-util.c:850
+#: g10/card-util.c:936
msgid "Error: invalid response.\n"
msgstr "错误:无效的响应。\n"
-#: g10/card-util.c:871
+#: g10/card-util.c:957
msgid "CA fingerprint: "
msgstr "CA 指纹:"
-#: g10/card-util.c:894
+#: g10/card-util.c:980
msgid "Error: invalid formatted fingerprint.\n"
msgstr "错误:指纹格式无效。\n"
-#: g10/card-util.c:942
+#: g10/card-util.c:1028
#, c-format
msgid "key operation not possible: %s\n"
msgstr "针对密钥的操作无法实现:%s\n"
-#: g10/card-util.c:943
+#: g10/card-util.c:1029
msgid "not an OpenPGP card"
msgstr "不是一个 OpenPGP 卡"
-#: g10/card-util.c:952
+#: g10/card-util.c:1038
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得当前密钥信息时出错:%s\n"
-#: g10/card-util.c:1036
+#: g10/card-util.c:1122
msgid "Replace existing key? (y/N) "
msgstr "替换已有的密钥?(y/N)"
-#: g10/card-util.c:1056 g10/card-util.c:1065
+#: g10/card-util.c:1142 g10/card-util.c:1151
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否为加密密钥创建卡外的备份?(Y/n)"
-#: g10/card-util.c:1077
+#: g10/card-util.c:1163
msgid "Replace existing keys? (y/N) "
msgstr "替换已有的密钥?(y/N)"
-#: g10/card-util.c:1086
+#: g10/card-util.c:1172
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@ -1273,120 +1302,124 @@ msgstr ""
" PIN = ‘%s’ 管理员 PIN = ‘%s’\n"
"您应当使用 --change-pin 命令来更改它们\n"
-#: g10/card-util.c:1120
+#: g10/card-util.c:1206
msgid "Please select the type of key to generate:\n"
msgstr "请选择您要使用的密钥种类:\n"
-#: g10/card-util.c:1122 g10/card-util.c:1199
+#: g10/card-util.c:1208 g10/card-util.c:1285
msgid " (1) Signature key\n"
msgstr " (1) 签名密钥\n"
-#: g10/card-util.c:1123 g10/card-util.c:1201
+#: g10/card-util.c:1209 g10/card-util.c:1287
msgid " (2) Encryption key\n"
msgstr " (2) 加密密钥\n"
-#: g10/card-util.c:1124 g10/card-util.c:1203
+#: g10/card-util.c:1210 g10/card-util.c:1289
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
-#: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
+#: g10/card-util.c:1226 g10/card-util.c:1305 g10/keyedit.c:945
#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
-#: g10/card-util.c:1196
+#: g10/card-util.c:1282
msgid "Please select where to store the key:\n"
msgstr "请选择在哪里存储密钥:\n"
-#: g10/card-util.c:1231
+#: g10/card-util.c:1317
msgid "unknown key protection algorithm\n"
msgstr "不支持的密钥保护算法\n"
-#: g10/card-util.c:1236
+#: g10/card-util.c:1322
msgid "secret parts of key are not available\n"
msgstr "私钥部分不可用\n"
-#: g10/card-util.c:1241
+#: g10/card-util.c:1327
msgid "secret key already stored on a card\n"
msgstr "私钥已存储在卡上\n"
-#: g10/card-util.c:1309 g10/keyedit.c:1362
+#: g10/card-util.c:1396 g10/keyedit.c:1362
msgid "quit this menu"
msgstr "离开这个菜单"
-#: g10/card-util.c:1311
+#: g10/card-util.c:1398
msgid "show admin commands"
msgstr "显示管理员命令"
-#: g10/card-util.c:1312 g10/keyedit.c:1365
+#: g10/card-util.c:1399 g10/keyedit.c:1365
msgid "show this help"
msgstr "显示这份在线说明"
-#: g10/card-util.c:1314
+#: g10/card-util.c:1401
msgid "list all available data"
msgstr "列出所有可用数据"
-#: g10/card-util.c:1317
+#: g10/card-util.c:1404
msgid "change card holder's name"
msgstr "更改卡持有人的姓名"
-#: g10/card-util.c:1318
+#: g10/card-util.c:1405
msgid "change URL to retrieve key"
msgstr "更改获取密钥的 URL"
-#: g10/card-util.c:1319
+#: g10/card-util.c:1406
msgid "fetch the key specified in the card URL"
msgstr "根据卡中指定的 URL 获取密钥"
-#: g10/card-util.c:1320
+#: g10/card-util.c:1407
msgid "change the login name"
msgstr "更改登录名"
-#: g10/card-util.c:1321
+#: g10/card-util.c:1408
msgid "change the language preferences"
msgstr "更改首选语言首选"
-#: g10/card-util.c:1322
+#: g10/card-util.c:1409
msgid "change card holder's sex"
msgstr "更改卡持有人的性别"
-#: g10/card-util.c:1323
+#: g10/card-util.c:1410
msgid "change a CA fingerprint"
msgstr "更改一个 CA 指纹"
-#: g10/card-util.c:1324
+#: g10/card-util.c:1411
msgid "toggle the signature force PIN flag"
msgstr "设定 PIN 签名是否必须"
-#: g10/card-util.c:1325
+#: g10/card-util.c:1412
msgid "generate new keys"
msgstr "生成新的密钥"
-#: g10/card-util.c:1326
+#: g10/card-util.c:1413
msgid "menu to change or unblock the PIN"
msgstr "更改或解锁 PIN 的菜单"
-#: g10/card-util.c:1327
+#: g10/card-util.c:1414
msgid "verify the PIN and list all data"
msgstr "验证 PIN 并列出所有数据"
-#: g10/card-util.c:1447 g10/keyedit.c:1634
+#: g10/card-util.c:1415
+msgid "unblock the PIN using a Reset Code"
+msgstr ""
+
+#: g10/card-util.c:1537 g10/keyedit.c:1634
msgid "Command> "
msgstr "命令> "
-#: g10/card-util.c:1485
+#: g10/card-util.c:1580
msgid "Admin-only command\n"
msgstr "仅供管理员使用的命令\n"
-#: g10/card-util.c:1516
+#: g10/card-util.c:1611
msgid "Admin commands are allowed\n"
msgstr "允许使用管理员命令\n"
-#: g10/card-util.c:1518
+#: g10/card-util.c:1613
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
-#: g10/card-util.c:1592 g10/keyedit.c:2255
+#: g10/card-util.c:1699 g10/keyedit.c:2257
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
@@ -1394,12 +1427,12 @@ msgstr "无效的指令(尝试“help”)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/decrypt.c:166 g10/gpg.c:3959 g10/keyring.c:376 g10/keyring.c:663
+#: g10/decrypt.c:166 g10/gpg.c:3950 g10/keyring.c:376 g10/keyring.c:663
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3402 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3404 g10/keyserver.c:1727
#: g10/revoke.c:226
#, c-format
msgid "key \"%s\" not found: %s\n"
@@ -1445,7 +1478,7 @@ msgstr "公钥“%s”有对应的私钥!\n"
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
-#: g10/encode.c:226 g10/sign.c:1268
+#: g10/encode.c:226 g10/sign.c:1266
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
@@ -1464,7 +1497,7 @@ msgstr "使用对称加密算法 %s\n"
msgid "`%s' already compressed\n"
msgstr "‘%s’已被压缩\n"
-#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:563
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:561
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "警告:‘%s’是一个空文件\n"
@@ -1489,7 +1522,7 @@ msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告:强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:655 g10/sign.c:938
+#: g10/encode.c:655 g10/sign.c:936
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1675,7 +1708,7 @@ msgstr "CA 指纹:"
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2531 g10/keyedit.c:3727
+#: g10/getkey.c:2531 g10/keyedit.c:3729
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -1922,7 +1955,7 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:791 sm/gpgsm.c:587
+#: g10/gpg.c:791 sm/gpgsm.c:583
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1934,7 +1967,7 @@ msgstr ""
msgid "Pubkey: "
msgstr "公钥:"
-#: g10/gpg.c:801 g10/keyedit.c:2321
+#: g10/gpg.c:801 g10/keyedit.c:2323
msgid "Cipher: "
msgstr "对称加密:"
@@ -1942,11 +1975,11 @@ msgstr "对称加密:"
msgid "Hash: "
msgstr "散列:"
-#: g10/gpg.c:815 g10/keyedit.c:2366
+#: g10/gpg.c:815 g10/keyedit.c:2368
msgid "Compression: "
msgstr "压缩:"
-#: g10/gpg.c:822 sm/gpgsm.c:607
+#: g10/gpg.c:822 sm/gpgsm.c:603
msgid "Used libraries:"
msgstr ""
@@ -1954,7 +1987,7 @@ msgstr ""
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1100 sm/gpgsm.c:772
+#: g10/gpg.c:1100 sm/gpgsm.c:768
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
@@ -2099,7 +2132,7 @@ msgstr "‘%s’不是一个有效的签名过期日期\n"
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4085
+#: g10/gpg.c:2590 g10/gpg.c:2785 g10/keyedit.c:4087
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
@@ -2207,7 +2240,7 @@ msgstr "%s:%d:无效的 auto-key-locate 清单\n"
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2965 sm/gpgsm.c:1485
+#: g10/gpg.c:2965 sm/gpgsm.c:1481
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
@@ -2247,11 +2280,11 @@ msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1553
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1561 sm/gpgsm.c:1567
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
@@ -2327,147 +2360,147 @@ msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3355
+#: g10/gpg.c:3346
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/gpg.c:3366
+#: g10/gpg.c:3357
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3387
+#: g10/gpg.c:3378
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3394
+#: g10/gpg.c:3385
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3396
+#: g10/gpg.c:3387
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/gpg.c:3406
+#: g10/gpg.c:3397
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3419
+#: g10/gpg.c:3410
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3421
+#: g10/gpg.c:3412
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3424
+#: g10/gpg.c:3415
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3442
+#: g10/gpg.c:3433
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3455
+#: g10/gpg.c:3446
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3470
+#: g10/gpg.c:3461
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3472
+#: g10/gpg.c:3463
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3475
+#: g10/gpg.c:3466
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3495
+#: g10/gpg.c:3486
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3504
+#: g10/gpg.c:3495
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3529
+#: g10/gpg.c:3520
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3537
+#: g10/gpg.c:3528
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3541
+#: g10/gpg.c:3532
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3562
+#: g10/gpg.c:3553
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3654
+#: g10/gpg.c:3645
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/gpg.c:3656
+#: g10/gpg.c:3647
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/gpg.c:3658
+#: g10/gpg.c:3649
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/gpg.c:3669
+#: g10/gpg.c:3660
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/gpg.c:3679
+#: g10/gpg.c:3670
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/gpg.c:3730
+#: g10/gpg.c:3721
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3738
+#: g10/gpg.c:3729
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3828
+#: g10/gpg.c:3819
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3945
+#: g10/gpg.c:3936
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3949
+#: g10/gpg.c:3940
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4261
+#: g10/gpg.c:4252
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4263
+#: g10/gpg.c:4254
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
-#: g10/gpg.c:4296
+#: g10/gpg.c:4287
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -2691,7 +2724,7 @@ msgstr "密钥 %s:新密钥――已跳过\n"
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环:%s\n"
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:804 g10/sign.c:1113
+#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:802 g10/sign.c:1111
#, c-format
msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
@@ -3234,8 +3267,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
msgid "Really sign? (y/N) "
msgstr "真的要签名吗?(y/N)"
-#: g10/keyedit.c:1066 g10/keyedit.c:4804 g10/keyedit.c:4895 g10/keyedit.c:4959
-#: g10/keyedit.c:5020 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4806 g10/keyedit.c:4897 g10/keyedit.c:4961
+#: g10/keyedit.c:5022 g10/sign.c:316
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败: %s\n"
@@ -3581,136 +3614,136 @@ msgstr "真的要更新所选用户标识的首选项吗?(y/N)"
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗?(y/N)"
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2218
msgid "Save changes? (y/N) "
msgstr "要保存变动吗?(y/N)"
-#: g10/keyedit.c:2219
+#: g10/keyedit.c:2221
msgid "Quit without saving? (y/N) "
msgstr "要不保存而离开吗?(y/N)"
-#: g10/keyedit.c:2229
+#: g10/keyedit.c:2231
#, c-format
msgid "update failed: %s\n"
msgstr "更新失败:%s\n"
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2238
#, c-format
msgid "update secret failed: %s\n"
msgstr "更新私钥失败:%s\n"
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
msgid "Key not changed so no update needed.\n"
msgstr "密钥没有变动所以不需要更新。\n"
-#: g10/keyedit.c:2344
+#: g10/keyedit.c:2346
msgid "Digest: "
msgstr "散列:"
-#: g10/keyedit.c:2395
+#: g10/keyedit.c:2397
msgid "Features: "
msgstr "特点:"
-#: g10/keyedit.c:2406
+#: g10/keyedit.c:2408
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
-#: g10/keyedit.c:2421 g10/keylist.c:310
+#: g10/keyedit.c:2423 g10/keylist.c:310
msgid "Preferred keyserver: "
msgstr "首选公钥服务器:"
-#: g10/keyedit.c:2429 g10/keyedit.c:2430
+#: g10/keyedit.c:2431 g10/keyedit.c:2432
msgid "Notations: "
msgstr "注记:"
-#: g10/keyedit.c:2640
+#: g10/keyedit.c:2642
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
-#: g10/keyedit.c:2699
+#: g10/keyedit.c:2701
#, c-format
msgid "This key was revoked on %s by %s key %s\n"
msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
-#: g10/keyedit.c:2720
+#: g10/keyedit.c:2722
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "这把密钥可被 %s 密钥 %s 吊销"
-#: g10/keyedit.c:2726
+#: g10/keyedit.c:2728
msgid "(sensitive)"
msgstr " (敏感的)"
-#: g10/keyedit.c:2742 g10/keyedit.c:2798 g10/keyedit.c:2859 g10/keyedit.c:2874
+#: g10/keyedit.c:2744 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
#: g10/keylist.c:196 g10/keyserver.c:529
#, c-format
msgid "created: %s"
msgstr "创建于:%s"
-#: g10/keyedit.c:2745 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2747 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
#, c-format
msgid "revoked: %s"
msgstr "已吊销:%s"
-#: g10/keyedit.c:2747 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2749 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
#, c-format
msgid "expired: %s"
msgstr "已过期:%s"
-#: g10/keyedit.c:2749 g10/keyedit.c:2800 g10/keyedit.c:2861 g10/keyedit.c:2876
+#: g10/keyedit.c:2751 g10/keyedit.c:2802 g10/keyedit.c:2863 g10/keyedit.c:2878
#: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
#: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
#, c-format
msgid "expires: %s"
msgstr "有效至:%s"
-#: g10/keyedit.c:2751
+#: g10/keyedit.c:2753
#, c-format
msgid "usage: %s"
msgstr "可用于:%s"
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2768
#, c-format
msgid "trust: %s"
msgstr "信任度:%s"
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2772
#, c-format
msgid "validity: %s"
msgstr "有效性:%s"
-#: g10/keyedit.c:2777
+#: g10/keyedit.c:2779
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
-#: g10/keyedit.c:2805 g10/keylist.c:202
+#: g10/keyedit.c:2807 g10/keylist.c:202
msgid "card-no: "
msgstr "卡号:"
-#: g10/keyedit.c:2829
+#: g10/keyedit.c:2831
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
-#: g10/keyedit.c:2893 g10/keyedit.c:3239 g10/keyserver.c:539
+#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:539
#: g10/mainproc.c:1841 g10/trustdb.c:1173 g10/trustdb.c:1693
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:2895 g10/keyedit.c:3241 g10/keyserver.c:543
+#: g10/keyedit.c:2897 g10/keyedit.c:3243 g10/keyserver.c:543
#: g10/mainproc.c:1843 g10/trustdb.c:526 g10/trustdb.c:1695
msgid "expired"
msgstr "已过期"
-#: g10/keyedit.c:2960
+#: g10/keyedit.c:2962
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:3021
+#: g10/keyedit.c:3023
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3719,74 +3752,74 @@ msgstr ""
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
-#: g10/keyedit.c:3026 g10/keyedit.c:3361
+#: g10/keyedit.c:3028 g10/keyedit.c:3363
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗?(y/N)"
-#: g10/keyedit.c:3032
+#: g10/keyedit.c:3034
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
-#: g10/keyedit.c:3172
+#: g10/keyedit.c:3174
msgid "Delete this good signature? (y/N/q)"
msgstr "删除这个完好的签名吗?(y/N/q)"
-#: g10/keyedit.c:3182
+#: g10/keyedit.c:3184
msgid "Delete this invalid signature? (y/N/q)"
msgstr "删除这个无效的签名吗?(y/N/q)"
-#: g10/keyedit.c:3186
+#: g10/keyedit.c:3188
msgid "Delete this unknown signature? (y/N/q)"
msgstr "删除这个未知的签名吗?(y/N/q)"
-#: g10/keyedit.c:3192
+#: g10/keyedit.c:3194
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要删除这个自身签名吗?(y/N)"
-#: g10/keyedit.c:3206
+#: g10/keyedit.c:3208
#, c-format
msgid "Deleted %d signature.\n"
msgstr "已经删除了 %d 个签名。\n"
-#: g10/keyedit.c:3207
+#: g10/keyedit.c:3209
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "已经删除了 %d 个签名。\n"
-#: g10/keyedit.c:3210
+#: g10/keyedit.c:3212
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
-#: g10/keyedit.c:3243 g10/trustdb.c:1697
+#: g10/keyedit.c:3245 g10/trustdb.c:1697
msgid "invalid"
msgstr "无效"
-#: g10/keyedit.c:3245
+#: g10/keyedit.c:3247
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "用户标识“%s”:无用部分已清除\n"
-#: g10/keyedit.c:3252
+#: g10/keyedit.c:3254
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3255
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "密钥 %s:“%s”%d 个签名被清除\n"
-#: g10/keyedit.c:3261
+#: g10/keyedit.c:3263
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "用户标识“%s”:无用部分已清除\n"
-#: g10/keyedit.c:3262
+#: g10/keyedit.c:3264
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "用户标识“%s”:无用部分已清除\n"
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3358
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3795,193 +3828,193 @@ msgstr ""
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
-#: g10/keyedit.c:3367
+#: g10/keyedit.c:3369
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
-#: g10/keyedit.c:3387
+#: g10/keyedit.c:3389
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识:"
-#: g10/keyedit.c:3412
+#: g10/keyedit.c:3414
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:3427
+#: g10/keyedit.c:3429
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:3449
+#: g10/keyedit.c:3451
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3470
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告:将某把密钥指派为指定吊销者的操作无法撤销!\n"
-#: g10/keyedit.c:3474
+#: g10/keyedit.c:3476
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3537
msgid "Please remove selections from the secret keys.\n"
msgstr "请从私钥中删除选择。\n"
-#: g10/keyedit.c:3541
+#: g10/keyedit.c:3543
msgid "Please select at most one subkey.\n"
msgstr "请至多选择一个子钥。\n"
-#: g10/keyedit.c:3545
+#: g10/keyedit.c:3547
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
-#: g10/keyedit.c:3548
+#: g10/keyedit.c:3550
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
-#: g10/keyedit.c:3594
+#: g10/keyedit.c:3596
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
-#: g10/keyedit.c:3610
+#: g10/keyedit.c:3612
msgid "No corresponding signature in secret ring\n"
msgstr "在私钥环里没有相应的签名\n"
-#: g10/keyedit.c:3688
+#: g10/keyedit.c:3690
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "签名的子钥 %s 已经交叉验证\n"
-#: g10/keyedit.c:3694
+#: g10/keyedit.c:3696
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子钥 %s 不签名,因此不需要交叉验证\n"
-#: g10/keyedit.c:3857
+#: g10/keyedit.c:3859
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
-#: g10/keyedit.c:3896 g10/keyedit.c:4006 g10/keyedit.c:4126 g10/keyedit.c:4267
+#: g10/keyedit.c:3898 g10/keyedit.c:4008 g10/keyedit.c:4128 g10/keyedit.c:4269
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签名\n"
-#: g10/keyedit.c:4067
+#: g10/keyedit.c:4069
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL:"
-#: g10/keyedit.c:4147
+#: g10/keyedit.c:4149
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗?(y/N)"
-#: g10/keyedit.c:4148
+#: g10/keyedit.c:4150
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗?(y/N)"
-#: g10/keyedit.c:4210
+#: g10/keyedit.c:4212
msgid "Enter the notation: "
msgstr "输入注记:"
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4361
msgid "Proceed? (y/N) "
msgstr "继续?(y/N)"
-#: g10/keyedit.c:4423
+#: g10/keyedit.c:4425
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4481
+#: g10/keyedit.c:4483
#, c-format
msgid "No user ID with hash %s\n"
msgstr "没有散列值为 %s 的用户标识\n"
-#: g10/keyedit.c:4508
+#: g10/keyedit.c:4510
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
-#: g10/keyedit.c:4643
+#: g10/keyedit.c:4645
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识:“%s”\n"
-#: g10/keyedit.c:4646 g10/keyedit.c:4710 g10/keyedit.c:4753
+#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
-#: g10/keyedit.c:4648 g10/keyedit.c:4712 g10/keyedit.c:4755
+#: g10/keyedit.c:4650 g10/keyedit.c:4714 g10/keyedit.c:4757
msgid " (non-exportable)"
msgstr " (不可导出)"
-#: g10/keyedit.c:4652
+#: g10/keyedit.c:4654
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签名已在 %s 过期。\n"
-#: g10/keyedit.c:4656
+#: g10/keyedit.c:4658
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗?(y/N)"
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4662
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签名生成一份吊销证书吗?(y/N)"
-#: g10/keyedit.c:4687
+#: g10/keyedit.c:4689
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名:\n"
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4715
msgid " (non-revocable)"
msgstr " (不可吊销)"
-#: g10/keyedit.c:4720
+#: g10/keyedit.c:4722
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4744
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签名:\n"
-#: g10/keyedit.c:4762
+#: g10/keyedit.c:4764
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗?(y/N)"
-#: g10/keyedit.c:4792
+#: g10/keyedit.c:4794
msgid "no secret key\n"
msgstr "没有私钥\n"
-#: g10/keyedit.c:4862
+#: g10/keyedit.c:4864
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:4879
+#: g10/keyedit.c:4881
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告:有一份用户标识签名的日期标记为 %d 秒后的未来\n"
-#: g10/keyedit.c:4943
+#: g10/keyedit.c:4945
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
-#: g10/keyedit.c:5005
+#: g10/keyedit.c:5007
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
-#: g10/keyedit.c:5100
+#: g10/keyedit.c:5102
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
@@ -4673,7 +4706,7 @@ msgstr "警告:处理公钥服务器的程序来自不同版本的 GnuPG (%s)\
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1527 g10/keyserver.c:2062
+#: g10/keyserver.c:1527 g10/keyserver.c:2056
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
@@ -5085,11 +5118,11 @@ msgstr "警告:在‘%s’里的选项于此次运行期间未被使用\n"
msgid "can't handle public key algorithm %d\n"
msgstr "无法操作公钥算法 %d\n"
-#: g10/parse-packet.c:796
+#: g10/parse-packet.c:806
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告:潜在不安全的对称加密会话密钥\n"
-#: g10/parse-packet.c:1247
+#: g10/parse-packet.c:1257
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
@@ -5448,12 +5481,12 @@ msgstr "%s:已跳过:公钥已被禁用\n"
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
-#: g10/pkclist.c:1478
+#: g10/pkclist.c:1488
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "密钥 %s:没有有效的用户标识\n"
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "密钥 %s:没有有效的用户标识\n"
@@ -5675,7 +5708,7 @@ msgstr "建立了弱密钥――正在重试\n"
msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
msgstr "对称加密无法避免生成弱密钥;已经尝试 %d 次!\n"
-#: g10/seskey.c:227 sm/certcheck.c:89
+#: g10/seskey.c:227 sm/certcheck.c:85
msgid "DSA requires the hash length to be a multiple of 8 bits\n"
msgstr "DSA 需要散列值长度为 8 位的倍数\n"
@@ -5778,48 +5811,48 @@ msgstr "检查已建立的签名时发生错误: %s\n"
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 签名来自:“%s”\n"
-#: g10/sign.c:760
+#: g10/sign.c:758
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:836
+#: g10/sign.c:834
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告:强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
-#: g10/sign.c:963
+#: g10/sign.c:961
msgid "signing:"
msgstr "正在签名:"
-#: g10/sign.c:1078
+#: g10/sign.c:1076
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:1262
+#: g10/sign.c:1260
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
-#: g10/skclist.c:149 g10/skclist.c:213
+#: g10/skclist.c:138 g10/skclist.c:202
msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用!\n"
-#: g10/skclist.c:180
+#: g10/skclist.c:169
#, c-format
msgid "skipped \"%s\": duplicated\n"
msgstr "“%s”已跳过:重复\n"
-#: g10/skclist.c:188 g10/skclist.c:198 g10/skclist.c:207
+#: g10/skclist.c:177 g10/skclist.c:187 g10/skclist.c:196
#, c-format
msgid "skipped \"%s\": %s\n"
msgstr "“%s”已跳过:%s\n"
-#: g10/skclist.c:193
+#: g10/skclist.c:182
msgid "skipped: secret key already present\n"
msgstr "已跳过:私钥已存在\n"
-#: g10/skclist.c:208
+#: g10/skclist.c:197
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "这是一把由 PGP 生成的 ElGamal 密钥,用于签名不安全!"
@@ -6191,67 +6224,77 @@ msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
msgid "can't open fd %d: %s\n"
msgstr "无法打开‘%s’: %s\n"
-#: jnlib/argparse.c:176
+#: jnlib/argparse.c:177
#, fuzzy
msgid "argument not expected"
msgstr "不允许使用管理员命令\n"
-#: jnlib/argparse.c:178
+#: jnlib/argparse.c:179
#, fuzzy
msgid "read error"
msgstr "文件读取错误"
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:181
#, fuzzy
msgid "keyword too long"
msgstr "列太长"
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:183
#, fuzzy
msgid "missing argument"
msgstr "无效的参数"
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:185
#, fuzzy
msgid "invalid command"
msgstr "仅供管理员使用的命令\n"
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:187
#, fuzzy
msgid "invalid alias definition"
msgstr "无效的列表选项\n"
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:189
+#, fuzzy
+msgid "out of core"
+msgstr "可选"
+
+#: jnlib/argparse.c:191
#, fuzzy
msgid "invalid option"
msgstr "无效的列表选项\n"
-#: jnlib/argparse.c:196
+#: jnlib/argparse.c:199
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:198
+#: jnlib/argparse.c:201
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:201
+#: jnlib/argparse.c:204
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "无效的指令(尝试“help”)\n"
-#: jnlib/argparse.c:203
+#: jnlib/argparse.c:206
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:205
+#: jnlib/argparse.c:208
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:210
+#, fuzzy
+msgid "out of core\n"
+msgstr "可选"
+
+#: jnlib/argparse.c:212
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "无效的列表选项\n"
@@ -6345,12 +6388,13 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:326 scd/app-openpgp.c:1392 scd/app-dinsig.c:297
+#: scd/app-nks.c:326 scd/app-openpgp.c:1459 scd/app-dinsig.c:297
msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
-#: scd/app-nks.c:330 scd/app-openpgp.c:1396 scd/app-openpgp.c:1428
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1593 scd/app-dinsig.c:301
+#: scd/app-nks.c:330 scd/app-openpgp.c:1463 scd/app-openpgp.c:1495
+#: scd/app-openpgp.c:1642 scd/app-openpgp.c:1660 scd/app-openpgp.c:1857
+#: scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN 回调返回错误:%s\n"
@@ -6362,103 +6406,103 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-nks.c:555 scd/app-openpgp.c:1747
+#: scd/app-nks.c:555 scd/app-openpgp.c:1897
msgid "|N|New PIN"
msgstr "新的 PIN"
-#: scd/app-nks.c:558 scd/app-openpgp.c:1751 scd/app-dinsig.c:529
+#: scd/app-nks.c:558 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: scd/app-openpgp.c:602
+#: scd/app-openpgp.c:667
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "无法存储指纹:%s\n"
-#: scd/app-openpgp.c:615
+#: scd/app-openpgp.c:680
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "无法存储创建日期:%s\n"
-#: scd/app-openpgp.c:1011
+#: scd/app-openpgp.c:1076
#, c-format
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: scd/app-openpgp.c:1019 scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2549
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1027 scd/app-openpgp.c:2173
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2557
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1036 scd/app-openpgp.c:2183
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2567
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
-#: scd/app-openpgp.c:1352
+#: scd/app-openpgp.c:1419
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1426
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1378
+#: scd/app-openpgp.c:1445
#, 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:1412
+#: scd/app-openpgp.c:1479
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1424
+#: scd/app-openpgp.c:1491
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1435 scd/app-openpgp.c:1600
+#: scd/app-openpgp.c:1502 scd/app-openpgp.c:1667
#, 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:1448 scd/app-openpgp.c:1488 scd/app-openpgp.c:1612
-#: scd/app-openpgp.c:2436
+#: scd/app-openpgp.c:1515 scd/app-openpgp.c:1555 scd/app-openpgp.c:1679
+#: scd/app-openpgp.c:2866
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败:%s\n"
-#: scd/app-openpgp.c:1511
+#: scd/app-openpgp.c:1578
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:1532 scd/app-openpgp.c:2687
+#: scd/app-openpgp.c:1599 scd/app-openpgp.c:1839 scd/app-openpgp.c:3117
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1538 scd/app-openpgp.c:2696
+#: scd/app-openpgp.c:1605 scd/app-openpgp.c:3126
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定!\n"
-#: scd/app-openpgp.c:1545
+#: scd/app-openpgp.c:1612
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
-#: scd/app-openpgp.c:1555
+#: scd/app-openpgp.c:1622
#, fuzzy, c-format
msgid ""
"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
"%d]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1570
+#: scd/app-openpgp.c:1637
#, fuzzy
msgid "|A|Please enter the Admin PIN at the reader's keypad"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
@@ -6466,98 +6510,109 @@ msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
#. TRANSLATORS: Do not translate the "|A|" prefix but keep
#. it at the start of the string. We need this elsewhere to
#. get some infos on the string.
-#: scd/app-openpgp.c:1590
+#: scd/app-openpgp.c:1657
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:1747
+#: scd/app-openpgp.c:1853
+#, fuzzy
+msgid "||Please enter the Reset Code for the card"
+msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
+
+#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#, fuzzy, c-format
+msgid "Reset Code is too short; minimum length is %d\n"
+msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
+
+#: scd/app-openpgp.c:1896
+msgid "|RN|New Reset Code"
+msgstr ""
+
+#: scd/app-openpgp.c:1897
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:1801 scd/app-openpgp.c:2251
+#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2635
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:1807 scd/app-openpgp.c:2258
+#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2642
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:1817
+#: scd/app-openpgp.c:2003
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:1821
+#: scd/app-openpgp.c:2007
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:1823
+#: scd/app-openpgp.c:2009
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:1990
+#: scd/app-openpgp.c:2333
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:1997
+#: scd/app-openpgp.c:2342
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2004
+#: scd/app-openpgp.c:2354
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-openpgp.c:2012 scd/app-openpgp.c:2019
+#: scd/app-openpgp.c:2364 scd/app-openpgp.c:2372
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2082
+#: scd/app-openpgp.c:2466
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥:%s\n"
-#: scd/app-openpgp.c:2142
+#: scd/app-openpgp.c:2526
msgid "please wait while key is being generated ...\n"
msgstr "请稍候,正在生成密钥……\n"
-#: scd/app-openpgp.c:2156
+#: scd/app-openpgp.c:2540
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:2159
+#: scd/app-openpgp.c:2543
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:2216
+#: scd/app-openpgp.c:2600
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2266
+#: scd/app-openpgp.c:2650
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2354
+#: scd/app-openpgp.c:2765
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:2415
+#: scd/app-openpgp.c:2841
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名:%lu\n"
-#: scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:3131
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:2777 scd/app-openpgp.c:2787
+#: scd/app-openpgp.c:3355 scd/app-openpgp.c:3366
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@ -6915,17 +6970,17 @@ msgstr ""
msgid "validation model used: %s"
msgstr ""
-#: sm/certcheck.c:101
+#: sm/certcheck.c:97
#, fuzzy, c-format
msgid "%s key uses an unsafe (%u bit) hash\n"
msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
-#: sm/certcheck.c:111
+#: sm/certcheck.c:107
#, c-format
msgid "a %u bit hash is not valid for a %u bit %s key\n"
msgstr ""
-#: sm/certcheck.c:248 sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
msgid "(this is the MD2 algorithm)\n"
msgstr ""
@@ -7151,7 +7206,7 @@ msgid "Ready. You should now send this request to your CA.\n"
msgstr ""
#: sm/certreqgen-ui.c:303
-msgid "resource problem: out or core\n"
+msgid "resource problem: out of core\n"
msgstr ""
#: sm/decrypt.c:324
@@ -7379,12 +7434,12 @@ msgstr "%s 签名,散列算法 %s\n"
msgid "|N|use compress algorithm N"
msgstr "未知的压缩算法"
-#: sm/gpgsm.c:577
+#: sm/gpgsm.c:573
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: sm/gpgsm.c:580
+#: sm/gpgsm.c:576
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7395,60 +7450,60 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: sm/gpgsm.c:707
+#: sm/gpgsm.c:703
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "用法:gpg [选项] "
-#: sm/gpgsm.c:805
+#: sm/gpgsm.c:801
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "无法连接至‘%s’:%s\n"
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:812
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "未知的选项 '%s'\n"
-#: sm/gpgsm.c:867
+#: sm/gpgsm.c:863
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(不给定描述)\n"
-#: sm/gpgsm.c:886
+#: sm/gpgsm.c:882
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:907
+#: sm/gpgsm.c:903
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = 跳过这把密钥\n"
-#: sm/gpgsm.c:1419
+#: sm/gpgsm.c:1415
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "无法解析公钥服务器 URL\n"
-#: sm/gpgsm.c:1502
+#: sm/gpgsm.c:1498
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1604
+#: sm/gpgsm.c:1600
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1642
+#: sm/gpgsm.c:1638
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "无法存取‘%s’:%s\n"
-#: sm/gpgsm.c:1813
+#: sm/gpgsm.c:1809
msgid "this command has not yet been implemented\n"
msgstr ""
-#: sm/gpgsm.c:1968
+#: sm/gpgsm.c:1964
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7928,11 +7983,6 @@ msgstr "找不到公钥"
msgid "No argument allowed"
msgstr "不允许使用管理员命令\n"
-#: tools/no-libgcrypt.c:30
-#, fuzzy, c-format
-msgid "error allocating enough memory: %s\n"
-msgstr "建立钥匙环‘%s’时发生错误:%s\n"
-
#: tools/symcryptrun.c:152
#, fuzzy
msgid ""