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.po1810
1 files changed, 1000 insertions, 810 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a14e61b6d..ac7f73ec1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-07-28 21:11+0200\n"
+"POT-Creation-Date: 2005-11-20 17:57+0100\n"
"PO-Revision-Date: 2005-03-17 22:24+0800\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -33,12 +33,12 @@ msgstr "少于 %d 位时不能生成质数\n"
msgid "no entropy gathering module detected\n"
msgstr "检测不到熵搜集模块\n"
-#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:486
-#: g10/g10.c:973 g10/g10.c:3270 g10/import.c:185 g10/keygen.c:2231
+#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
+#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
-#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
+#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
#: g10/tdbio.c:605
#, c-format
msgid "can't open `%s': %s\n"
@@ -71,9 +71,9 @@ msgstr "无法读取‘%s’:%s\n"
msgid "note: random_seed file not updated\n"
msgstr "注意:随机数种子文件未被更新\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:972 g10/keygen.c:2710
-#: g10/keygen.c:2740 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
+#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
msgstr "无法建立‘%s’:%s\n"
@@ -363,7 +363,7 @@ msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
-#: g10/card-util.c:63 g10/card-util.c:303
+#: g10/card-util.c:63 g10/card-util.c:305
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP 卡不可用:%s\n"
@@ -373,153 +373,153 @@ 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:1513
-#: g10/keygen.c:2415 g10/revoke.c:217 g10/revoke.c:418
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
+#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
-#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
-#: g10/keygen.c:1355
+#: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keygen.c:1357
msgid "Your selection? "
msgstr "您的选择? "
-#: g10/card-util.c:213 g10/card-util.c:263
+#: g10/card-util.c:215 g10/card-util.c:265
msgid "[not set]"
msgstr "[未设定]"
-#: g10/card-util.c:410
+#: g10/card-util.c:412
msgid "male"
msgstr "男性"
-#: g10/card-util.c:411
+#: g10/card-util.c:413
msgid "female"
msgstr "女性"
-#: g10/card-util.c:411
+#: g10/card-util.c:413
msgid "unspecified"
msgstr "未定义"
-#: g10/card-util.c:438
+#: g10/card-util.c:440
msgid "not forced"
msgstr "可选"
-#: g10/card-util.c:438
+#: g10/card-util.c:440
msgid "forced"
msgstr "必须"
-#: g10/card-util.c:516
+#: g10/card-util.c:518
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "错误:目前只允许使用 ASCII 字符。\n"
-#: g10/card-util.c:518
+#: g10/card-util.c:520
msgid "Error: The \"<\" character may not be used.\n"
msgstr "错误:不能使用字符“<”。\n"
-#: g10/card-util.c:520
+#: g10/card-util.c:522
msgid "Error: Double spaces are not allowed.\n"
msgstr "错误:不允许出现两个空格。\n"
-#: g10/card-util.c:537
+#: g10/card-util.c:539
msgid "Cardholder's surname: "
msgstr "卡持有人的姓:"
-#: g10/card-util.c:539
+#: g10/card-util.c:541
msgid "Cardholder's given name: "
msgstr "卡持有人的名:"
-#: g10/card-util.c:557
+#: g10/card-util.c:559
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "错误:合成的姓名太长(至多 %d 个字符)。\n"
-#: g10/card-util.c:578
+#: g10/card-util.c:580
msgid "URL to retrieve public key: "
msgstr "获取公钥的 URL:"
-#: g10/card-util.c:586
+#: g10/card-util.c:588
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误:URL 太长(至多 %d 个字符)\n"
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
+#: g10/card-util.c:686 g10/card-util.c:755 g10/import.c:276
#, c-format
msgid "error reading `%s': %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: g10/card-util.c:692
+#: g10/card-util.c:694
msgid "Login data (account name): "
msgstr "登录数据(帐号名):"
-#: g10/card-util.c:702
+#: g10/card-util.c:704
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "错误:登录数据太长(至多 %d 个字符)。\n"
-#: g10/card-util.c:761
+#: g10/card-util.c:763
msgid "Private DO data: "
msgstr "个人 DO 数据:"
-#: g10/card-util.c:771
+#: g10/card-util.c:773
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "错误:个人 DO 太长(至多 %d 个字符)。\n"
-#: g10/card-util.c:791
+#: g10/card-util.c:793
msgid "Language preferences: "
msgstr "首选语言:"
-#: g10/card-util.c:799
+#: g10/card-util.c:801
msgid "Error: invalid length of preference string.\n"
msgstr "错误:首选项字符串长度无效。\n"
-#: g10/card-util.c:808
+#: g10/card-util.c:810
msgid "Error: invalid characters in preference string.\n"
msgstr "错误:首选项字符串里有无效字符。\n"
-#: g10/card-util.c:829
+#: g10/card-util.c:831
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性别(男性输入 M,女性输入 F,不指定输入空格):"
-#: g10/card-util.c:843
+#: g10/card-util.c:845
msgid "Error: invalid response.\n"
msgstr "错误:无效的响应。\n"
-#: g10/card-util.c:864
+#: g10/card-util.c:866
msgid "CA fingerprint: "
msgstr "CA 指纹:"
-#: g10/card-util.c:887
+#: g10/card-util.c:889
msgid "Error: invalid formatted fingerprint.\n"
msgstr "错误:指纹格式无效。\n"
-#: g10/card-util.c:935
+#: g10/card-util.c:937
#, c-format
msgid "key operation not possible: %s\n"
msgstr "针对密钥的操作无法实现:%s\n"
-#: g10/card-util.c:936
+#: g10/card-util.c:938
msgid "not an OpenPGP card"
msgstr "不是一个 OpenPGP 卡"
-#: g10/card-util.c:945
+#: g10/card-util.c:947
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得当前密钥信息时出错:%s\n"
-#: g10/card-util.c:1030
+#: g10/card-util.c:1032
msgid "Replace existing key? (y/N) "
msgstr "替换已有的密钥?(y/N)"
-#: g10/card-util.c:1051 g10/card-util.c:1060
+#: g10/card-util.c:1053 g10/card-util.c:1062
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否为加密密钥创建卡外的备份?(Y/n)"
-#: g10/card-util.c:1072
+#: g10/card-util.c:1074
msgid "Replace existing keys? (y/N) "
msgstr "替换已有的密钥?(y/N)"
-#: g10/card-util.c:1081
+#: g10/card-util.c:1083
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
@@ -530,120 +530,120 @@ msgstr ""
" PIN = ‘%s’ 管理员 PIN = ‘%s’\n"
"您应当使用 --change-pin 命令来更改它们\n"
-#: g10/card-util.c:1120
+#: g10/card-util.c:1122
msgid "Please select the type of key to generate:\n"
msgstr "请选择您要使用的密钥种类:\n"
-#: g10/card-util.c:1122 g10/card-util.c:1203
+#: g10/card-util.c:1124 g10/card-util.c:1205
msgid " (1) Signature key\n"
msgstr " (1) 签字密钥\n"
-#: g10/card-util.c:1123 g10/card-util.c:1205
+#: g10/card-util.c:1125 g10/card-util.c:1207
msgid " (2) Encryption key\n"
msgstr " (2) 加密密钥\n"
-#: g10/card-util.c:1124 g10/card-util.c:1207
+#: g10/card-util.c:1126 g10/card-util.c:1209
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:941
-#: g10/keygen.c:1394 g10/revoke.c:643
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
-#: g10/card-util.c:1200
+#: g10/card-util.c:1202
msgid "Please select where to store the key:\n"
msgstr "请选择在哪里存储密钥:\n"
-#: g10/card-util.c:1235
+#: g10/card-util.c:1237
msgid "unknown key protection algorithm\n"
msgstr "不支持的密钥保护算法\n"
-#: g10/card-util.c:1240
+#: g10/card-util.c:1242
msgid "secret parts of key are not available\n"
msgstr "私钥部分不可用\n"
-#: g10/card-util.c:1245
+#: g10/card-util.c:1247
msgid "secret key already stored on a card\n"
msgstr "私钥已存储在卡上\n"
-#: g10/card-util.c:1316 g10/keyedit.c:1351
+#: g10/card-util.c:1318 g10/keyedit.c:1355
msgid "quit this menu"
msgstr "离开这个菜单"
-#: g10/card-util.c:1318
+#: g10/card-util.c:1320
msgid "show admin commands"
msgstr "显示管理员命令"
-#: g10/card-util.c:1319 g10/keyedit.c:1354
+#: g10/card-util.c:1321 g10/keyedit.c:1358
msgid "show this help"
msgstr "显示这份在线说明"
-#: g10/card-util.c:1321
+#: g10/card-util.c:1323
msgid "list all available data"
msgstr "列出所有可用数据"
-#: g10/card-util.c:1324
+#: g10/card-util.c:1326
msgid "change card holder's name"
msgstr "更改卡持有人的姓名"
-#: g10/card-util.c:1325
+#: g10/card-util.c:1327
msgid "change URL to retrieve key"
msgstr "更改获取密钥的 URL"
-#: g10/card-util.c:1326
+#: g10/card-util.c:1328
msgid "fetch the key specified in the card URL"
msgstr "根据卡中指定的 URL 获取密钥"
-#: g10/card-util.c:1327
+#: g10/card-util.c:1329
msgid "change the login name"
msgstr "更改登录名"
-#: g10/card-util.c:1328
+#: g10/card-util.c:1330
msgid "change the language preferences"
msgstr "更改首选语言首选"
-#: g10/card-util.c:1329
+#: g10/card-util.c:1331
msgid "change card holder's sex"
msgstr "更改卡持有人的性别"
-#: g10/card-util.c:1330
+#: g10/card-util.c:1332
msgid "change a CA fingerprint"
msgstr "更改一个 CA 指纹"
-#: g10/card-util.c:1331
+#: g10/card-util.c:1333
msgid "toggle the signature force PIN flag"
msgstr "设定 PIN 签字是否必须"
-#: g10/card-util.c:1332
+#: g10/card-util.c:1334
msgid "generate new keys"
msgstr "生成新的密钥"
-#: g10/card-util.c:1333
+#: g10/card-util.c:1335
msgid "menu to change or unblock the PIN"
msgstr "更改或解锁 PIN 的菜单"
-#: g10/card-util.c:1334
+#: g10/card-util.c:1336
msgid "verify the PIN and list all data"
msgstr ""
-#: g10/card-util.c:1454 g10/keyedit.c:1612
+#: g10/card-util.c:1456 g10/keyedit.c:1617
msgid "Command> "
msgstr "命令> "
-#: g10/card-util.c:1492
+#: g10/card-util.c:1494
msgid "Admin-only command\n"
msgstr "仅供管理员使用的命令\n"
-#: g10/card-util.c:1523
+#: g10/card-util.c:1525
msgid "Admin commands are allowed\n"
msgstr "允许使用管理员命令\n"
-#: g10/card-util.c:1525
+#: g10/card-util.c:1527
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
-#: g10/card-util.c:1599 g10/keyedit.c:2219
+#: g10/card-util.c:1601 g10/keyedit.c:2243
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
@@ -651,7 +651,7 @@ msgstr "无效的指令(尝试“help”)\n"
msgid "Please insert the card and hit return or enter 'c' to cancel: "
msgstr "请插入卡并回车,或输入‘c’来取消:"
-#: g10/cardglue.c:558
+#: g10/cardglue.c:572
#, c-format
msgid ""
"Please remove the current card and insert the one with serial number:\n"
@@ -660,51 +660,51 @@ msgstr ""
"请取出当前的卡,并插入有下列序列号的卡:\n"
" %.*s\n"
-#: g10/cardglue.c:566
+#: g10/cardglue.c:580
msgid "Hit return when ready or enter 'c' to cancel: "
msgstr "就绪后请回车,或输入‘c’取消"
-#: g10/cardglue.c:891
+#: g10/cardglue.c:915
msgid "Enter New Admin PIN: "
msgstr "输入新的管理员 PIN:"
-#: g10/cardglue.c:892
+#: g10/cardglue.c:916
msgid "Enter New PIN: "
msgstr "输入新的 PIN:"
-#: g10/cardglue.c:893
+#: g10/cardglue.c:917
msgid "Enter Admin PIN: "
msgstr "输入管理员 PIN:"
-#: g10/cardglue.c:894
+#: g10/cardglue.c:918
msgid "Enter PIN: "
msgstr "输入 PIN:"
-#: g10/cardglue.c:911
+#: g10/cardglue.c:935
msgid "Repeat this PIN: "
msgstr "再次输入此 PIN:"
-#: g10/cardglue.c:925
+#: g10/cardglue.c:950
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符;请再试一次"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/g10.c:3620 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
-#: g10/decrypt.c:105 g10/encode.c:849
+#: g10/decrypt.c:105 g10/encode.c:853
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/delkey.c:75 g10/export.c:178 g10/keyedit.c:3360 g10/keyserver.c:1571
+#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
#: g10/revoke.c:227
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到:%s\n"
-#: g10/delkey.c:83 g10/export.c:208 g10/import.c:2334 g10/keyserver.c:1585
+#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
#: g10/revoke.c:233 g10/revoke.c:440
#, c-format
msgid "error reading keyblock: %s\n"
@@ -744,7 +744,7 @@ msgstr "公钥“%s”有对应的私钥!\n"
msgid "use option \"--delete-secret-keys\" to delete it first.\n"
msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
-#: g10/encode.c:213 g10/sign.c:1218
+#: g10/encode.c:213 g10/sign.c:1220
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
@@ -758,54 +758,54 @@ msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
msgid "using cipher %s\n"
msgstr "使用对称加密算法 %s\n"
-#: g10/encode.c:241 g10/encode.c:548
+#: g10/encode.c:241 g10/encode.c:550
#, c-format
msgid "`%s' already compressed\n"
msgstr "‘%s’已被压缩\n"
-#: g10/encode.c:304 g10/encode.c:594 g10/sign.c:566
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "警告:‘%s’是一个空文件\n"
-#: g10/encode.c:468
+#: g10/encode.c:470
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:492
+#: g10/encode.c:494
#, c-format
msgid "reading from `%s'\n"
msgstr "正在从‘%s’读取\n"
-#: g10/encode.c:520
+#: g10/encode.c:522
msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
-#: g10/encode.c:530
+#: g10/encode.c:532
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告:强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:638 g10/sign.c:899
+#: g10/encode.c:642 g10/sign.c:901
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "警告:强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
-#: g10/encode.c:725
+#: g10/encode.c:729
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:795 g10/pkclist.c:764 g10/pkclist.c:800
+#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "您不该将 %s 用于 %s 模式中\n"
-#: g10/encode.c:822
+#: g10/encode.c:826
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给:“%s”\n"
@@ -885,40 +885,79 @@ msgstr "警告:无法删除临时文件(%s)‘%s’:%s\n"
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "警告:无法删除临时目录‘%s’:%s\n"
-#: g10/export.c:192
+#: g10/export.c:62
+#, fuzzy
+msgid "export signatures that are marked as local-only"
+msgstr "这份签字会被标记成不可吊销。\n"
+
+#: g10/export.c:64
+msgid "export attribute user IDs (generally photo IDs)"
+msgstr ""
+
+#: g10/export.c:66
+msgid "export revocation keys that are marked as \"sensitive\""
+msgstr ""
+
+#: g10/export.c:68
+msgid "remove unusable signatures during export"
+msgstr ""
+
+#: g10/export.c:70
+msgid "remove unusable user IDs during export"
+msgstr ""
+
+#: g10/export.c:72
+msgid "all export-clean-* options from above"
+msgstr ""
+
+#: g10/export.c:75
+msgid "export the smallest key possible"
+msgstr ""
+
+#: g10/export.c:77
+#, fuzzy
+msgid "remove the passphrase from exported subkeys"
+msgstr "吊销密钥或选定的子钥"
+
+#: g10/export.c:330
msgid "exporting secret keys not allowed\n"
msgstr "不允许导出私钥\n"
-#: g10/export.c:221
+#: g10/export.c:359
#, c-format
msgid "key %s: not protected - skipped\n"
msgstr "密钥 %s:未被保护――已跳过\n"
-#: g10/export.c:229
+#: g10/export.c:367
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "密钥 %s:PGP 2.x 样式的密钥――已跳过\n"
-#: g10/export.c:409
+#: g10/export.c:378
+#, fuzzy, c-format
+msgid "key %s: key material on-card - skipped\n"
+msgstr "密钥 %s:子钥签字位置错误――已跳过\n"
+
+#: g10/export.c:543
msgid "about to export an unprotected subkey\n"
msgstr ""
-#: g10/export.c:432
+#: g10/export.c:566
#, fuzzy, c-format
msgid "failed to unprotect the subkey: %s\n"
msgstr "无法存储密钥:%s\n"
# I hope this warning doesn't confuse people.
-#: g10/export.c:453
+#: g10/export.c:587
#, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "警告:私钥 %s 不存在简单 SK 检验和\n"
-#: g10/export.c:485
+#: g10/export.c:620
msgid "WARNING: nothing exported\n"
msgstr "警告:没有导出任何东西\n"
-#: g10/g10.c:363
+#: g10/gpg.c:367
msgid ""
"@Commands:\n"
" "
@@ -926,127 +965,127 @@ msgstr ""
"@指令:\n"
" "
-#: g10/g10.c:365
+#: g10/gpg.c:369
msgid "|[file]|make a signature"
msgstr "|[文件名]|生成一份签字"
-#: g10/g10.c:366
+#: g10/gpg.c:370
msgid "|[file]|make a clear text signature"
msgstr "|[文件名]|生成一份明文签字"
-#: g10/g10.c:367
+#: g10/gpg.c:371
msgid "make a detached signature"
msgstr "生成一份分离的签字"
-#: g10/g10.c:368
+#: g10/gpg.c:372
msgid "encrypt data"
msgstr "加密数据"
-#: g10/g10.c:370
+#: g10/gpg.c:374
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/g10.c:372
+#: g10/gpg.c:376
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/g10.c:374
+#: g10/gpg.c:378
msgid "verify a signature"
msgstr "验证签字"
-#: g10/g10.c:376
+#: g10/gpg.c:380
msgid "list keys"
msgstr "列出密钥"
-#: g10/g10.c:378
+#: g10/gpg.c:382
msgid "list keys and signatures"
msgstr "列出密钥和签字"
-#: g10/g10.c:379
+#: g10/gpg.c:383
msgid "list and check key signatures"
msgstr "列出并检查密钥签字"
-#: g10/g10.c:380
+#: g10/gpg.c:384
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/g10.c:381
+#: g10/gpg.c:385
msgid "list secret keys"
msgstr "列出私钥"
-#: g10/g10.c:382
+#: g10/gpg.c:386
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
-#: g10/g10.c:383
+#: g10/gpg.c:387
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: g10/g10.c:385
+#: g10/gpg.c:389
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
-#: g10/g10.c:386
+#: g10/gpg.c:390
msgid "sign a key"
msgstr "为某把密钥添加签字"
-#: g10/g10.c:387
+#: g10/gpg.c:391
msgid "sign a key locally"
msgstr "为某把密钥添加本地签字"
-#: g10/g10.c:388
+#: g10/gpg.c:392
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签字"
-#: g10/g10.c:389
+#: g10/gpg.c:393
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/g10.c:391
+#: g10/gpg.c:395
msgid "export keys"
msgstr "导出密钥"
-#: g10/g10.c:392
+#: g10/gpg.c:396
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/g10.c:393
+#: g10/gpg.c:397
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/g10.c:395
+#: g10/gpg.c:399
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/g10.c:397
+#: g10/gpg.c:401
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
-#: g10/g10.c:400
+#: g10/gpg.c:404
msgid "import/merge keys"
msgstr "导入/合并密钥"
-#: g10/g10.c:403
+#: g10/gpg.c:407
msgid "print the card status"
msgstr "打印卡状态"
-#: g10/g10.c:404
+#: g10/gpg.c:408
msgid "change data on a card"
msgstr "更改卡上的数据"
-#: g10/g10.c:405
+#: g10/gpg.c:409
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
-#: g10/g10.c:413
+#: g10/gpg.c:417
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/g10.c:420
+#: g10/gpg.c:424
msgid "|algo [files]|print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/g10.c:424 g10/gpgv.c:71
+#: g10/gpg.c:428 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1056,51 +1095,51 @@ msgstr ""
"选项:\n"
" "
-#: g10/g10.c:426
+#: g10/gpg.c:430
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/g10.c:428
+#: g10/gpg.c:432
msgid "|NAME|encrypt for NAME"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/g10.c:439
+#: g10/gpg.c:443
msgid "use this user-id to sign or decrypt"
msgstr "使用这个用户标识来签字或解密"
-#: g10/g10.c:440
+#: g10/gpg.c:444
msgid "|N|set compress level N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/g10.c:445
+#: g10/gpg.c:449
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/g10.c:459
+#: g10/gpg.c:463
msgid "use as output file"
msgstr "指定输出文件"
-#: g10/g10.c:461 g10/gpgv.c:73
+#: g10/gpg.c:465 g10/gpgv.c:73
msgid "verbose"
msgstr "详细模式"
-#: g10/g10.c:472
+#: g10/gpg.c:476
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/g10.c:473
+#: g10/gpg.c:477
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/g10.c:514
+#: g10/gpg.c:518
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/g10.c:515
+#: g10/gpg.c:519
msgid "generate PGP 2.x compatible messages"
msgstr "生成与 PGP 2.x 兼容的报文"
-#: g10/g10.c:543
+#: g10/gpg.c:547
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1108,7 +1147,7 @@ msgstr ""
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/g10.c:546
+#: g10/gpg.c:550
msgid ""
"@\n"
"Examples:\n"
@@ -1128,17 +1167,17 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/g10.c:727 g10/gpgv.c:98
+#: g10/gpg.c:739 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"请向 <[email protected]> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: g10/g10.c:744
+#: g10/gpg.c:756
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: g10/g10.c:747
+#: g10/gpg.c:759
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1148,7 +1187,7 @@ msgstr ""
"签字、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/g10.c:758
+#: g10/gpg.c:770
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1156,512 +1195,595 @@ msgstr ""
"\n"
"支持的算法:\n"
-#: g10/g10.c:761
+#: g10/gpg.c:773
msgid "Pubkey: "
msgstr "公钥:"
-#: g10/g10.c:767 g10/keyedit.c:2257
+#: g10/gpg.c:779 g10/keyedit.c:2281
msgid "Cipher: "
msgstr "对称加密:"
-#: g10/g10.c:773
+#: g10/gpg.c:785
msgid "Hash: "
msgstr "散列:"
-#: g10/g10.c:779 g10/keyedit.c:2303
+#: g10/gpg.c:791 g10/keyedit.c:2327
msgid "Compression: "
msgstr "压缩:"
-#: g10/g10.c:862
+#: g10/gpg.c:874
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/g10.c:1010
+#: g10/gpg.c:1022
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/g10.c:1028
+#: g10/gpg.c:1040
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/g10.c:1225
+#: g10/gpg.c:1237
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’所有权不安全\n"
-#: g10/g10.c:1228
+#: g10/gpg.c:1240
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’所有权不安全\n"
-#: g10/g10.c:1231
+#: g10/gpg.c:1243
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’所有权不安全\n"
-#: g10/g10.c:1237
+#: g10/gpg.c:1249
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’权限不安全\n"
-#: g10/g10.c:1240
+#: g10/gpg.c:1252
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’权限不安全\n"
-#: g10/g10.c:1243
+#: g10/gpg.c:1255
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
-#: g10/g10.c:1249
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/g10.c:1252
+#: g10/gpg.c:1264
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/g10.c:1255
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/g10.c:1261
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/g10.c:1264
+#: g10/gpg.c:1276
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/g10.c:1267
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/g10.c:1408
+#: g10/gpg.c:1420
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/g10.c:1805
+#: g10/gpg.c:1513
+msgid "display photo IDs during key listings"
+msgstr ""
+
+#: g10/gpg.c:1515
+msgid "show policy URLs during signature listings"
+msgstr ""
+
+#: g10/gpg.c:1517
+#, fuzzy
+msgid "show all notations during signature listings"
+msgstr "在私钥环里没有相应的签字\n"
+
+#: g10/gpg.c:1519
+msgid "show IETF standard notations during signature listings"
+msgstr ""
+
+#: g10/gpg.c:1523
+msgid "show user-supplied notations during signature listings"
+msgstr ""
+
+#: g10/gpg.c:1525
+#, fuzzy
+msgid "show preferred keyserver URLs during signature listings"
+msgstr "给定的首选公钥服务器 URL 无效\n"
+
+#: g10/gpg.c:1527
+msgid "show user ID validity during key listings"
+msgstr ""
+
+#: g10/gpg.c:1529
+msgid "show revoked and expired user IDs in key listings"
+msgstr ""
+
+#: g10/gpg.c:1531
+msgid "show revoked and expired subkeys in key listings"
+msgstr ""
+
+#: g10/gpg.c:1533
+#, fuzzy
+msgid "show the keyring name in key listings"
+msgstr "在私钥和公钥清单间切换"
+
+#: g10/gpg.c:1535
+#, fuzzy
+msgid "show expiration dates during signature listings"
+msgstr "在私钥环里没有相应的签字\n"
+
+#: g10/gpg.c:1830
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/g10.c:1847
+#: g10/gpg.c:1872
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: g10/g10.c:1851
+#: g10/gpg.c:1876
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: g10/g10.c:1858
+#: g10/gpg.c:1883
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: g10/g10.c:2072 g10/g10.c:2626 g10/g10.c:2645
+#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意:一般情况下不会用到 %s!\n"
-#: g10/g10.c:2085
+#: g10/gpg.c:2110
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
-#: g10/g10.c:2239 g10/g10.c:2251
+#: g10/gpg.c:2264 g10/gpg.c:2276
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/g10.c:2324
+#: g10/gpg.c:2352
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/g10.c:2343 g10/keyedit.c:3876
+#: g10/gpg.c:2371 g10/keyedit.c:4050
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/g10.c:2349
+#: g10/gpg.c:2377
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
-#: g10/g10.c:2352
+#: g10/gpg.c:2380
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/g10.c:2359
+#: g10/gpg.c:2387
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
-#: g10/g10.c:2362
+#: g10/gpg.c:2390
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/g10.c:2369
+#: g10/gpg.c:2397
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
-#: g10/g10.c:2372
+#: g10/gpg.c:2400
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/g10.c:2379
+#: g10/gpg.c:2407
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
-#: g10/g10.c:2382
+#: g10/gpg.c:2410
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/g10.c:2404
+#: g10/gpg.c:2418
+msgid "display photo IDs during signature verification"
+msgstr ""
+
+#: g10/gpg.c:2420
+msgid "show policy URLs during signature verification"
+msgstr ""
+
+#: g10/gpg.c:2422
+#, fuzzy
+msgid "show all notations during signature verification"
+msgstr "‘%s’不是一个有效的字符集\n"
+
+#: g10/gpg.c:2424
+msgid "show IETF standard notations during signature verification"
+msgstr ""
+
+#: g10/gpg.c:2428
+msgid "show user-supplied notations during signature verification"
+msgstr ""
+
+#: g10/gpg.c:2430
+#, fuzzy
+msgid "show preferred keyserver URLs during signature verification"
+msgstr "给定的首选公钥服务器 URL 无效\n"
+
+#: g10/gpg.c:2432
+#, fuzzy
+msgid "show user ID validity during signature verification"
+msgstr "‘%s’不是一个有效的字符集\n"
+
+#: g10/gpg.c:2434
+msgid "show revoked and expired user IDs in signature verification"
+msgstr ""
+
+#: g10/gpg.c:2441
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
-#: g10/g10.c:2407
+#: g10/gpg.c:2444
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/g10.c:2414
+#: g10/gpg.c:2451
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/g10.c:2615
+#: g10/gpg.c:2654
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
-#: g10/g10.c:2619
+#: g10/gpg.c:2658
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
-#: g10/g10.c:2628
+#: g10/gpg.c:2667
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/g10.c:2631
+#: g10/gpg.c:2670
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
-#: g10/g10.c:2638
+#: g10/gpg.c:2677
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: g10/g10.c:2653
+#: g10/gpg.c:2692
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
-#: g10/g10.c:2667
+#: g10/gpg.c:2706
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
-#: g10/g10.c:2673
+#: g10/gpg.c:2712
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时,不能同时签字和加密\n"
-#: g10/g10.c:2679
+#: g10/gpg.c:2718
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
-#: g10/g10.c:2692
+#: g10/gpg.c:2731
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/g10.c:2759 g10/g10.c:2783
+#: g10/gpg.c:2798 g10/gpg.c:2822
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/g10.c:2765 g10/g10.c:2789
+#: g10/gpg.c:2804 g10/gpg.c:2828
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/g10.c:2771
+#: g10/gpg.c:2810
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/g10.c:2777
+#: g10/gpg.c:2816
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/g10.c:2792
+#: g10/gpg.c:2831
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签字数一定要大于 0\n"
-#: g10/g10.c:2794
+#: g10/gpg.c:2833
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签字数一定要大于 1\n"
-#: g10/g10.c:2796
+#: g10/gpg.c:2835
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/g10.c:2798
+#: g10/gpg.c:2837
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
-#: g10/g10.c:2800
+#: g10/gpg.c:2839
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
-#: g10/g10.c:2803
+#: g10/gpg.c:2842
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/g10.c:2807
+#: g10/gpg.c:2846
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
-#: g10/g10.c:2814
+#: g10/gpg.c:2853
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/g10.c:2823
+#: g10/gpg.c:2862
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/g10.c:2827
+#: g10/gpg.c:2866
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/g10.c:2831
+#: g10/gpg.c:2870
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/g10.c:2864
+#: g10/gpg.c:2903
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/g10.c:2911
+#: g10/gpg.c:2950
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/g10.c:2916
+#: g10/gpg.c:2955
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/g10.c:2921
+#: g10/gpg.c:2960
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/g10.c:3017
+#: g10/gpg.c:3056
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/g10.c:3028
+#: g10/gpg.c:3067
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/g10.c:3039
+#: g10/gpg.c:3078
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/g10.c:3046
+#: g10/gpg.c:3085
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/g10.c:3048
+#: g10/gpg.c:3087
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/g10.c:3058
+#: g10/gpg.c:3097
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/g10.c:3071
+#: g10/gpg.c:3110
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/g10.c:3073
+#: g10/gpg.c:3112
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/g10.c:3076
+#: g10/gpg.c:3115
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/g10.c:3094
+#: g10/gpg.c:3133
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/g10.c:3107
+#: g10/gpg.c:3146
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/g10.c:3122
+#: g10/gpg.c:3161
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/g10.c:3124
+#: g10/gpg.c:3163
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/g10.c:3127
+#: g10/gpg.c:3166
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/g10.c:3147
+#: g10/gpg.c:3186
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/g10.c:3156
+#: g10/gpg.c:3195
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/g10.c:3181
+#: g10/gpg.c:3220
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/g10.c:3189
+#: g10/gpg.c:3228
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/g10.c:3193
+#: g10/gpg.c:3232
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/g10.c:3214
+#: g10/gpg.c:3253
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/g10.c:3285
+#: g10/gpg.c:3324
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
-#: g10/g10.c:3322
+#: g10/gpg.c:3361
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/g10.c:3324
+#: g10/gpg.c:3363
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/g10.c:3326
+#: g10/gpg.c:3365
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/g10.c:3337
+#: g10/gpg.c:3376
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/g10.c:3347
+#: g10/gpg.c:3386
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/g10.c:3388
+#: g10/gpg.c:3427
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/g10.c:3396
+#: g10/gpg.c:3435
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/g10.c:3483
+#: g10/gpg.c:3522
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/g10.c:3606
+#: g10/gpg.c:3645
msgid "[filename]"
msgstr "[文件名]"
-#: g10/g10.c:3610
+#: g10/gpg.c:3649
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/g10.c:3900
+#: g10/gpg.c:3939
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr "标记名称必须只含有可打印的字符或空格,并以一个“=”来结尾\n"
-#: g10/g10.c:3908
+#: g10/gpg.c:3947
msgid "a user notation name must contain the '@' character\n"
msgstr "用户标记名称一定要含有“@”字符\n"
-#: g10/g10.c:3913
+#: g10/gpg.c:3952
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "用户标记名称一定要含有“@”字符\n"
-#: g10/g10.c:3924
+#: g10/gpg.c:3963
msgid "a notation value must not use any control characters\n"
msgstr "标记值一定不能使用任何的控制字符\n"
-#: g10/g10.c:3958
+#: g10/gpg.c:3997
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/g10.c:3960
+#: g10/gpg.c:3999
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签字策略 URL 无效\n"
-#: g10/g10.c:3993
+#: g10/gpg.c:4032
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
-#: g10/getkey.c:151
+#: g10/getkey.c:152
msgid "too many entries in pk cache - disabled\n"
msgstr "pk 缓存里项目太多――已禁用\n"
-#: g10/getkey.c:187 g10/getkey.c:2759
+#: g10/getkey.c:188 g10/getkey.c:2805
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
-#: g10/getkey.c:1683
+#: g10/getkey.c:1731
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2237
+#: g10/getkey.c:2283
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的私钥――忽略\n"
-#: g10/getkey.c:2468
+#: g10/getkey.c:2514
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
-#: g10/getkey.c:2515
+#: g10/getkey.c:2561
#, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s:无相应公钥的私钥――已跳过\n"
@@ -2001,353 +2123,387 @@ msgstr "没有可用的帮助"
msgid "No help available for `%s'"
msgstr "‘%s’没有可用的帮助"
-#: g10/import.c:254
+#: g10/import.c:95
+msgid "import signatures that are marked as local-only"
+msgstr ""
+
+#: g10/import.c:97
+msgid "repair damage from the pks keyserver during import"
+msgstr ""
+
+#: g10/import.c:99
+#, fuzzy
+msgid "do not update the trustdb after import"
+msgstr "更新信任度数据库"
+
+#: g10/import.c:101
+#, fuzzy
+msgid "create a public key when importing a secret key"
+msgstr "公钥与私钥不吻合!\n"
+
+#: g10/import.c:103
+msgid "only accept updates to existing keys"
+msgstr ""
+
+#: g10/import.c:105
+msgid "remove unusable signatures after import"
+msgstr ""
+
+#: g10/import.c:107
+msgid "remove unusable user IDs after import"
+msgstr ""
+
+#: g10/import.c:109
+msgid "all import-clean-* options from above"
+msgstr ""
+
+#: g10/import.c:262
#, c-format
msgid "skipping block of type %d\n"
msgstr "跳过 %d 样式的区块\n"
-#: g10/import.c:263
+#: g10/import.c:271
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已处理 %lu 把密钥\n"
-#: g10/import.c:280
+#: g10/import.c:288
#, c-format
msgid "Total number processed: %lu\n"
msgstr "合计被处理的数量:%lu\n"
-#: g10/import.c:282
+#: g10/import.c:290
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳过的新密钥:%lu\n"
-#: g10/import.c:285
+#: g10/import.c:293
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 遗失用户标识:%lu\n"
-#: g10/import.c:287
+#: g10/import.c:295
#, c-format
msgid " imported: %lu"
msgstr " 已导入:%lu"
-#: g10/import.c:293
+#: g10/import.c:301
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改变:%lu\n"
-#: g10/import.c:295
+#: g10/import.c:303
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新用户标识:%lu\n"
-#: g10/import.c:297
+#: g10/import.c:305
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子钥:%lu\n"
-#: g10/import.c:299
+#: g10/import.c:307
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的签字:%lu\n"
-#: g10/import.c:301
+#: g10/import.c:309
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的密钥吊销:%lu\n"
-#: g10/import.c:303
+#: g10/import.c:311
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 读取的私钥:%lu\n"
-#: g10/import.c:305
+#: g10/import.c:313
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 导入的私钥:%lu\n"
-#: g10/import.c:307
+#: g10/import.c:315
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改变的私钥:%lu\n"
-#: g10/import.c:309
+#: g10/import.c:317
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被导入:%lu\n"
-#: g10/import.c:311
+#: g10/import.c:319
#, fuzzy, c-format
msgid " signatures cleaned: %lu\n"
msgstr "目前已创建的签字:%lu\n"
-#: g10/import.c:313
+#: g10/import.c:321
#, fuzzy, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 读取的私钥:%lu\n"
-#: g10/import.c:554
+#: g10/import.c:562
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "警告:密钥 %s 下列用户标识的首选项中包含不可用的\n"
-#: g10/import.c:556
+#: g10/import.c:564
msgid "algorithms on these user IDs:\n"
msgstr "算法:\n"
-#: g10/import.c:593
+#: g10/import.c:601
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”:对称加密算法 %s 对应首选项\n"
-#: g10/import.c:605
+#: g10/import.c:613
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”:散列算法 %s 对应首选项\n"
-#: g10/import.c:617
+#: g10/import.c:625
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”:压缩算法 %s 对应首选项\n"
-#: g10/import.c:630
+#: g10/import.c:638
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "强烈建议您更新您的首选项并重新分发这把密钥,\n"
-#: g10/import.c:632
+#: g10/import.c:640
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "以避免可能的算法不匹配问题\n"
-#: g10/import.c:656
+#: g10/import.c:664
#, 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:718 g10/import.c:1104
+#: g10/import.c:726 g10/import.c:1112
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s:没有用户标识\n"
-#: g10/import.c:748
+#: g10/import.c:756
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s:PKS 子钥破损已修复\n"
-#: g10/import.c:763
+#: g10/import.c:771
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s:已接受不含自身签字的用户标识“%s”\n"
-#: g10/import.c:769
+#: g10/import.c:777
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s:没有有效的用户标识\n"
-#: g10/import.c:771
+#: g10/import.c:779
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签字所致\n"
-#: g10/import.c:781 g10/import.c:1225
+#: g10/import.c:789 g10/import.c:1233
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s:找不到公钥:%s\n"
-#: g10/import.c:787
+#: g10/import.c:795
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s:新密钥――已跳过\n"
-#: g10/import.c:796
+#: g10/import.c:804
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环:%s\n"
-#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
#, c-format
msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
-#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
-#: g10/import.c:2348 g10/import.c:2370
+#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
+#: g10/import.c:2356 g10/import.c:2378
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "写入钥匙环‘%s’时出错: %s\n"
-#: g10/import.c:826
+#: g10/import.c:834
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s:公钥“%s”已导入\n"
-#: g10/import.c:850
+#: g10/import.c:858
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s:与我们的副本不吻合\n"
-#: g10/import.c:867 g10/import.c:1243
+#: g10/import.c:875 g10/import.c:1251
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s:无法定位原始的密钥区块:%s\n"
-#: g10/import.c:875 g10/import.c:1250
+#: g10/import.c:883 g10/import.c:1258
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s:无法读取原始的密钥区块: %s\n"
-#: g10/import.c:915
+#: g10/import.c:923
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s:“%s”一个新的用户标识\n"
-#: g10/import.c:918
+#: g10/import.c:926
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s:“%s”%d 个新的用户标识\n"
-#: g10/import.c:921
+#: g10/import.c:929
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s:“%s”1 个新的签字\n"
-#: g10/import.c:924
+#: g10/import.c:932
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s:“%s”%d 个新的签字\n"
-#: g10/import.c:927
+#: g10/import.c:935
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s:“%s”1 个新的子钥\n"
-#: g10/import.c:930
+#: g10/import.c:938
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s:“%s”%d 个新的子钥\n"
-#: g10/import.c:933
+#: g10/import.c:941
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s:“%s”%d 个新的签字\n"
-#: g10/import.c:936
+#: g10/import.c:944
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s:“%s”%d 个新的签字\n"
-#: g10/import.c:939
+#: g10/import.c:947
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s:“%s”%d 个新的用户标识\n"
-#: g10/import.c:942
+#: g10/import.c:950
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s:“%s”%d 个新的用户标识\n"
-#: g10/import.c:965
+#: g10/import.c:973
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s:“%s”未改变\n"
-#: g10/import.c:1110
+#: g10/import.c:1118
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s:私钥使用了无效的加密算法 %d――已跳过\n"
-#: g10/import.c:1121
+#: g10/import.c:1129
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
-#: g10/import.c:1138 g10/import.c:2363
+#: g10/import.c:1146 g10/import.c:2371
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "没有默认的私钥钥匙环: %s\n"
-#: g10/import.c:1149
+#: g10/import.c:1157
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s:私钥已导入\n"
-#: g10/import.c:1178
+#: g10/import.c:1186
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "密钥 %s:已在私钥钥匙环中\n"
-#: g10/import.c:1188
+#: g10/import.c:1196
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "密钥 %s:找不到私钥:%s\n"
-#: g10/import.c:1218
+#: g10/import.c:1226
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s:没有公钥――无法应用吊销证书\n"
-#: g10/import.c:1261
+#: g10/import.c:1269
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s:无效的吊销证书:%s――已拒绝\n"
-#: g10/import.c:1293
+#: g10/import.c:1301
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s:“%s”吊销证书已被导入\n"
-#: g10/import.c:1359
+#: g10/import.c:1367
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s:签字没有用户标识\n"
-#: g10/import.c:1374
+#: g10/import.c:1382
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”使用了不支持的公钥算法\n"
-#: g10/import.c:1376
+#: g10/import.c:1384
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s:用户标识“%s”自身签字无效\n"
-#: g10/import.c:1394
+#: g10/import.c:1402
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s:没有可供绑定的子钥\n"
-#: g10/import.c:1405 g10/import.c:1455
+#: g10/import.c:1413 g10/import.c:1463
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s:不支持的公钥算法\n"
-#: g10/import.c:1407
+#: g10/import.c:1415
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s:无效的子钥绑定\n"
-#: g10/import.c:1422
+#: g10/import.c:1430
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s:已删除多重子钥绑定\n"
-#: g10/import.c:1444
+#: g10/import.c:1452
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s:没有用于密钥吊销的子钥\n"
-#: g10/import.c:1457
+#: g10/import.c:1465
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s:无效的子钥吊销\n"
-#: g10/import.c:1472
+#: g10/import.c:1480
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s:已删除多重子钥吊销\n"
-#: g10/import.c:1514
+#: g10/import.c:1522
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s:已跳过用户标识“%s”\n"
-#: g10/import.c:1535
+#: g10/import.c:1543
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s:已跳过子钥\n"
@@ -2356,65 +2512,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:1562
+#: g10/import.c:1570
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s:不可导出的签字(验证级别 0x%02X)――已跳过\n"
-#: g10/import.c:1572
+#: g10/import.c:1580
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s:吊销证书位置错误――已跳过\n"
-#: g10/import.c:1589
+#: g10/import.c:1597
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s:无效的吊销证书:%s――已跳过\n"
-#: g10/import.c:1603
+#: g10/import.c:1611
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s:子钥签字位置错误――已跳过\n"
-#: g10/import.c:1611
+#: g10/import.c:1619
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s:与预期不符的签字验证级别(0x%02X)――已跳过\n"
-#: g10/import.c:1711
+#: g10/import.c:1719
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s:检测到重复的用户标识――已合并\n"
-#: g10/import.c:1773
+#: g10/import.c:1781
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告:密钥 %s 可能已被吊销:正在取回吊销密钥 %s\n"
-#: g10/import.c:1787
+#: g10/import.c:1795
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告:密钥 %s 可能已被吊销:吊销密钥 %s 不存在。\n"
-#: g10/import.c:1846
+#: g10/import.c:1854
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s:已新增吊销证书“%s”\n"
-#: g10/import.c:1880
+#: g10/import.c:1888
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s:已新增直接密钥签字\n"
-#: g10/import.c:2269
+#: g10/import.c:2277
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "注意:密钥的序列号与卡的不符\n"
-#: g10/import.c:2277
+#: g10/import.c:2285
msgid "NOTE: primary key is online and stored on card\n"
msgstr "注意:主钥在线,存储在卡上\n"
-#: g10/import.c:2279
+#: g10/import.c:2287
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "注意:子钥在线,存储在卡上\n"
@@ -2438,51 +2594,51 @@ msgstr "建立‘%s’时发生错误:%s\n"
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立钥匙环缓存失败: %s\n"
-#: g10/keyedit.c:261
+#: g10/keyedit.c:265
msgid "[revocation]"
msgstr "[吊销]"
-#: g10/keyedit.c:262
+#: g10/keyedit.c:266
msgid "[self-signature]"
msgstr "[自身签字]"
-#: g10/keyedit.c:340 g10/keylist.c:406
+#: g10/keyedit.c:344 g10/keylist.c:406
msgid "1 bad signature\n"
msgstr "1 个损坏的签字\n"
-#: g10/keyedit.c:342 g10/keylist.c:408
+#: g10/keyedit.c:346 g10/keylist.c:408
#, c-format
msgid "%d bad signatures\n"
msgstr "%d 个损坏的签字\n"
-#: g10/keyedit.c:344 g10/keylist.c:410
+#: g10/keyedit.c:348 g10/keylist.c:410
msgid "1 signature not checked due to a missing key\n"
msgstr "有 1 份签字因为遗失密钥而未被检查\n"
-#: g10/keyedit.c:346 g10/keylist.c:412
+#: g10/keyedit.c:350 g10/keylist.c:412
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
-#: g10/keyedit.c:348 g10/keylist.c:414
+#: g10/keyedit.c:352 g10/keylist.c:414
msgid "1 signature not checked due to an error\n"
msgstr "有 1 份签字因为某个错误而未被检查\n"
-#: g10/keyedit.c:350 g10/keylist.c:416
+#: g10/keyedit.c:354 g10/keylist.c:416
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "有 %d 份签字因为某些错误而未被检查\n"
-#: g10/keyedit.c:352
+#: g10/keyedit.c:356
msgid "1 user ID without valid self-signature detected\n"
msgstr "检测到 1 个没有有效自身签字的用户标识\n"
-#: g10/keyedit.c:354
+#: g10/keyedit.c:358
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
-#: g10/keyedit.c:410 g10/pkclist.c:263
+#: g10/keyedit.c:414 g10/pkclist.c:263
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@ -2493,17 +2649,17 @@ msgstr ""
"查\n"
"指纹等)?\n"
-#: g10/keyedit.c:414 g10/pkclist.c:275
+#: g10/keyedit.c:418 g10/pkclist.c:275
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉强相信\n"
-#: g10/keyedit.c:415 g10/pkclist.c:277
+#: g10/keyedit.c:419 g10/pkclist.c:277
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全相信\n"
-#: g10/keyedit.c:434
+#: g10/keyedit.c:438
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@ -2512,46 +2668,46 @@ msgstr ""
"请输入这份信任签字的深度。\n"
"深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
-#: g10/keyedit.c:450
+#: g10/keyedit.c:454
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "请输入这份签字的限制域,如果没有请按回车。\n"
-#: g10/keyedit.c:594
+#: g10/keyedit.c:598
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "用户标识“%s”已被吊销。"
-#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
-#: g10/keyedit.c:891 g10/keyedit.c:1731
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1736
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "您仍然想要为它签字吗?(y/N)"
-#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
-#: g10/keyedit.c:1737
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1742
msgid " Unable to sign.\n"
msgstr " 无法添加签字。\n"
-#: g10/keyedit.c:622
+#: g10/keyedit.c:626
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "用户标识“%s”已过期。"
-#: g10/keyedit.c:650
+#: g10/keyedit.c:654
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "警告:用户标识“%s”不含自身签字。"
-#: g10/keyedit.c:678
+#: g10/keyedit.c:682
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "警告:用户标识“%s”不含自身签字。"
-#: g10/keyedit.c:680
+#: g10/keyedit.c:684
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "真的要签字吗?(y/N)"
-#: g10/keyedit.c:702
+#: g10/keyedit.c:706
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2560,75 +2716,75 @@ msgstr ""
"“%s”的自身签字是 PGP 2.x 样\n"
"式的签字。\n"
-#: g10/keyedit.c:711
+#: g10/keyedit.c:715
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "您是否想要将它升级成 OpenPGP 的自身签字?(y/N)"
-#: g10/keyedit.c:725
+#: g10/keyedit.c:729
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr "您目前为“%s”的签字已经过期了。\n"
-#: g10/keyedit.c:729
+#: g10/keyedit.c:733
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "您想要发布一份新的签字来取代已过期的那一个吗?(y/N)"
-#: g10/keyedit.c:750
+#: g10/keyedit.c:754
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr "您目前为“%s”的签字是一份本地签字。\n"
-#: g10/keyedit.c:754
+#: g10/keyedit.c:758
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "您是否想要把它升级成可以完全导出的签字?(y/N)"
-#: g10/keyedit.c:775
+#: g10/keyedit.c:779
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "“%s”已由密钥 %s 在本地签字\n"
-#: g10/keyedit.c:778
+#: g10/keyedit.c:782
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "“%s”已由密钥 %s 签字\n"
-#: g10/keyedit.c:783
+#: g10/keyedit.c:787
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "您仍然想要为它再次签字吗?(y/N)"
-#: g10/keyedit.c:805
+#: g10/keyedit.c:809
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "没有东西可以让密钥 %s 签字\n"
-#: g10/keyedit.c:820
+#: g10/keyedit.c:824
msgid "This key has expired!"
msgstr "这把密钥已经过期!"
-#: g10/keyedit.c:838
+#: g10/keyedit.c:842
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "这把密钥将在 %s 过期。\n"
-#: g10/keyedit.c:844
+#: g10/keyedit.c:848
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "您想要让您的签字也同时过期吗? (Y/n) "
-#: g10/keyedit.c:884
+#: g10/keyedit.c:888
msgid ""
"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
"mode.\n"
msgstr "您不能在 --pgp2 模式下,用 PGP 2.x 密钥生成 OpenPGP 签字。\n"
-#: g10/keyedit.c:886
+#: g10/keyedit.c:890
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
-#: g10/keyedit.c:911
+#: g10/keyedit.c:915
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2637,31 +2793,31 @@ msgstr ""
"您是否谨慎地检查过,确认正要签字的密钥的确属于以上它所声称的所有者呢?\n"
"如果您不知道这个问题的答案,请输入“0”。\n"
-#: g10/keyedit.c:916
+#: g10/keyedit.c:920
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答。 %s\n"
-#: g10/keyedit.c:918
+#: g10/keyedit.c:922
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本没有检查过。 %s\n"
-#: g10/keyedit.c:920
+#: g10/keyedit.c:924
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我随意检查过。 %s\n"
-#: g10/keyedit.c:922
+#: g10/keyedit.c:926
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地检查过。 %s\n"
-#: g10/keyedit.c:928
+#: g10/keyedit.c:932
msgid "Your selection? (enter `?' for more information): "
msgstr "您的选择?(输入‘?’以获得更多的信息):"
-#: g10/keyedit.c:952
+#: g10/keyedit.c:956
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@ -2670,74 +2826,74 @@ msgstr ""
"您真的确定要签字这把密钥,使用您的密钥\n"
"“%s”(%s)\n"
-#: g10/keyedit.c:959
+#: g10/keyedit.c:963
msgid "This will be a self-signature.\n"
msgstr "这将是一个自身签字。\n"
-#: g10/keyedit.c:965
+#: g10/keyedit.c:969
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告:这份签字不会被标记为不可导出。\n"
-#: g10/keyedit.c:973
+#: g10/keyedit.c:977
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告:这份签字不会被标记成不可吊销。\n"
-#: g10/keyedit.c:983
+#: g10/keyedit.c:987
msgid "The signature will be marked as non-exportable.\n"
msgstr "这份签字会被标记成不可导出。\n"
-#: g10/keyedit.c:990
+#: g10/keyedit.c:994
msgid "The signature will be marked as non-revocable.\n"
msgstr "这份签字会被标记成不可吊销。\n"
-#: g10/keyedit.c:997
+#: g10/keyedit.c:1001
msgid "I have not checked this key at all.\n"
msgstr "我根本没有检查过这把密钥。\n"
-#: g10/keyedit.c:1002
+#: g10/keyedit.c:1006
msgid "I have checked this key casually.\n"
msgstr "我随意检查过这把密钥。\n"
-#: g10/keyedit.c:1007
+#: g10/keyedit.c:1011
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地检查过这把密钥。\n"
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1021
msgid "Really sign? (y/N) "
msgstr "真的要签字吗?(y/N)"
-#: g10/keyedit.c:1062 g10/keyedit.c:4364 g10/keyedit.c:4455 g10/keyedit.c:4519
-#: g10/keyedit.c:4580 g10/sign.c:370
+#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
+#: g10/keyedit.c:4772 g10/sign.c:370
#, c-format
msgid "signing failed: %s\n"
msgstr "签字时失败: %s\n"
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1131
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1138 g10/keygen.c:3044
+#: g10/keyedit.c:1142 g10/keygen.c:3087
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3032
+#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3047
+#: g10/keyedit.c:1150 g10/keygen.c:3090
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3051
+#: g10/keyedit.c:1154 g10/keygen.c:3094
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
-#: g10/keyedit.c:1174
+#: g10/keyedit.c:1178
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "无法编辑这把密钥: %s\n"
-#: g10/keyedit.c:1180
+#: g10/keyedit.c:1184
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2745,11 +2901,11 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1189 g10/keygen.c:1807
+#: g10/keyedit.c:1193 g10/keygen.c:1806
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符;请再试一次"
-#: g10/keyedit.c:1194
+#: g10/keyedit.c:1198
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2757,177 +2913,177 @@ msgstr ""
"您不想要用密码――这大概是个坏主意!\n"
"\n"
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1201
msgid "Do you really want to do this? (y/N) "
msgstr "您真的想要这么做吗?(y/N)"
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1272
msgid "moving a key signature to the correct place\n"
msgstr "正在把密钥的签字移动到正确的位置去\n"
-#: g10/keyedit.c:1353
+#: g10/keyedit.c:1357
msgid "save and quit"
msgstr "保存并离开"
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1360
msgid "show key fingerprint"
msgstr "显示密钥指纹"
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1361
msgid "list key and user IDs"
msgstr "列出密钥和用户标识"
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1363
msgid "select user ID N"
msgstr "选择用户标识 N"
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1364
msgid "select subkey N"
msgstr "选择子钥 N"
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
msgid "check signatures"
msgstr "检查签字"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1369
msgid "sign selected user IDs [* see below for related commands]"
msgstr "为所选用户标识添加签字[* 参见下面的相关命令]"
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1374
msgid "sign selected user IDs locally"
msgstr "为所选用户标识添加本地签字"
-#: g10/keyedit.c:1371
+#: g10/keyedit.c:1376
msgid "sign selected user IDs with a trust signature"
msgstr "为所选用户标识添加信任签字"
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1378
msgid "sign selected user IDs with a non-revocable signature"
msgstr "为所选用户标识添加不可吊销签字"
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1382
msgid "add a user ID"
msgstr "增加一个用户标识"
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1384
msgid "add a photo ID"
msgstr "增加一个照片标识"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1386
msgid "delete selected user IDs"
msgstr "删除选定的用户标识"
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1391
msgid "add a subkey"
msgstr "添加一个子钥"
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1395
msgid "add a key to a smartcard"
msgstr "在智能卡上添加一把密钥"
-#: g10/keyedit.c:1392
+#: g10/keyedit.c:1397
msgid "move a key to a smartcard"
msgstr "将一把密钥移动到智能卡上"
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1399
msgid "move a backup key to a smartcard"
msgstr "将备份密钥转移到卡上"
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1403
msgid "delete selected subkeys"
msgstr "删除选定的子钥"
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1405
msgid "add a revocation key"
msgstr "增加一把吊销密钥"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1407
msgid "delete signatures from the selected user IDs"
msgstr "删除所选用户标识上的签字"
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1409
msgid "change the expiration date for the key or selected subkeys"
msgstr "变更密钥或所选子钥的使用期限"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1411
msgid "flag the selected user ID as primary"
msgstr "将所选的用户标识设为首选用户标识"
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1413
msgid "toggle between the secret and public key listings"
msgstr "在私钥和公钥清单间切换"
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1416
msgid "list preferences (expert)"
msgstr "列出首选项(专家模式)"
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1418
msgid "list preferences (verbose)"
msgstr "列出首选项(详细模式)"
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1420
msgid "set preference list for the selected user IDs"
msgstr "设定所选用户标识的首选项"
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1425
msgid "set preferred keyserver URL for the selected user IDs"
msgstr "设定所选用户标识的首选公钥服务器的 URL"
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1427
msgid "change the passphrase"
msgstr "更改密码"
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1431
msgid "change the ownertrust"
msgstr "更改信任度"
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1433
msgid "revoke signatures on the selected user IDs"
msgstr "吊销所选用户标识上的签字"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1435
msgid "revoke selected user IDs"
msgstr "吊销选定的用户标识"
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1440
msgid "revoke key or selected subkeys"
msgstr "吊销密钥或选定的子钥"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1441
msgid "enable key"
msgstr "启用密钥"
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1442
msgid "disable key"
msgstr "禁用密钥"
-#: g10/keyedit.c:1438
+#: g10/keyedit.c:1443
msgid "show selected photo IDs"
msgstr "显示选定的照片标识"
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1445
#, fuzzy
msgid "clean unusable parts from key"
msgstr "不可用的私钥"
-#: g10/keyedit.c:1559
+#: g10/keyedit.c:1564
#, c-format
msgid "error reading secret keyblock \"%s\": %s\n"
msgstr "读取私钥区块“%s”时出错:%s\n"
-#: g10/keyedit.c:1577
+#: g10/keyedit.c:1582
msgid "Secret key is available.\n"
msgstr "私钥可用。\n"
-#: g10/keyedit.c:1658
+#: g10/keyedit.c:1663
msgid "Need the secret key to do this.\n"
msgstr "要有私钥才能这么做。\n"
-#: g10/keyedit.c:1666
+#: g10/keyedit.c:1671
msgid "Please use the command \"toggle\" first.\n"
msgstr "请先使用“toggle”指令。\n"
-#: g10/keyedit.c:1685
+#: g10/keyedit.c:1690
msgid ""
"* The `sign' command may be prefixed with an `l' for local signatures "
"(lsign),\n"
@@ -2938,241 +3094,241 @@ msgstr ""
" 信任签字,或‘nr’前缀(nrsign)以添加不可吊销签字,或者以上三种前缀的任何组\n"
" 合(ltsign、tnrsign 等)。\n"
-#: g10/keyedit.c:1725
+#: g10/keyedit.c:1730
msgid "Key is revoked."
msgstr "密钥已被吊销。"
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1749
msgid "Really sign all user IDs? (y/N) "
msgstr "真的为所有的用户标识签字吗?(y/N)"
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1756
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示:选择要添加签字的用户标识\n"
-#: g10/keyedit.c:1760
+#: g10/keyedit.c:1765
#, c-format
msgid "Unknown signature type `%s'\n"
msgstr "未知的签字类型‘%s’\n"
-#: g10/keyedit.c:1783
+#: g10/keyedit.c:1788
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
-#: g10/keyedit.c:1805 g10/keyedit.c:1825 g10/keyedit.c:1991
+#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
msgid "You must select at least one user ID.\n"
msgstr "您至少得选择一个用户标识。\n"
-#: g10/keyedit.c:1807
+#: g10/keyedit.c:1812
msgid "You can't delete the last user ID!\n"
msgstr "您不能删除最后一个用户标识!\n"
-#: g10/keyedit.c:1809
+#: g10/keyedit.c:1814
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要删除所有选定的用户标识吗?(y/N)"
-#: g10/keyedit.c:1810
+#: g10/keyedit.c:1815
msgid "Really remove this user ID? (y/N) "
msgstr "真的要删除这个用户标识吗?(y/N)"
-#: g10/keyedit.c:1860
+#: g10/keyedit.c:1865
msgid "Really move the primary key? (y/N) "
msgstr "真的要删除主钥吗?(y/N)"
-#: g10/keyedit.c:1872
+#: g10/keyedit.c:1877
msgid "You must select exactly one key.\n"
msgstr "您必须指定一把密钥。\n"
-#: g10/keyedit.c:1900
+#: g10/keyedit.c:1905
msgid "Command expects a filename argument\n"
msgstr "命令需要一个文件名作为参数\n"
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1919
#, c-format
msgid "Can't open `%s': %s\n"
msgstr "无法打开‘%s’:%s\n"
-#: g10/keyedit.c:1931
+#: g10/keyedit.c:1936
#, c-format
msgid "Error reading backup key from `%s': %s\n"
msgstr "从‘%s’读取备份密钥时出错:%s\n"
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1960
msgid "You must select at least one key.\n"
msgstr "您必须选择至少一把密钥。\n"
-#: g10/keyedit.c:1958
+#: g10/keyedit.c:1963
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "您真的想要删除选定的密钥吗?(y/N)"
-#: g10/keyedit.c:1959
+#: g10/keyedit.c:1964
msgid "Do you really want to delete this key? (y/N) "
msgstr "您真的要删除这把密钥吗?(y/N)"
-#: g10/keyedit.c:1994
+#: g10/keyedit.c:1999
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要吊销所有选定的用户标识吗?(y/N)"
-#: g10/keyedit.c:1995
+#: g10/keyedit.c:2000
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要吊销这个用户标识吗?(y/N)"
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2018
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "您真的要吊销整把密钥吗?(y/N)"
-#: g10/keyedit.c:2024
+#: g10/keyedit.c:2029
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "您真的要吊销选定的子钥吗?(y/N)"
-#: g10/keyedit.c:2026
+#: g10/keyedit.c:2031
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "您真的要吊销这把子钥吗?(y/N)"
-#: g10/keyedit.c:2067
+#: g10/keyedit.c:2081
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
-#: g10/keyedit.c:2099
+#: g10/keyedit.c:2123
msgid "Set preference list to:\n"
msgstr "设为首选项列表为:\n"
-#: g10/keyedit.c:2105
+#: g10/keyedit.c:2129
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所选用户标识的首选项吗?(y/N)"
-#: g10/keyedit.c:2107
+#: g10/keyedit.c:2131
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗?(y/N)"
-#: g10/keyedit.c:2180
+#: g10/keyedit.c:2204
msgid "Save changes? (y/N) "
msgstr "要保存变动吗?(y/N)"
-#: g10/keyedit.c:2183
+#: g10/keyedit.c:2207
msgid "Quit without saving? (y/N) "
msgstr "要不保存而离开吗?(y/N)"
-#: g10/keyedit.c:2193
+#: g10/keyedit.c:2217
#, c-format
msgid "update failed: %s\n"
msgstr "更新失败:%s\n"
-#: g10/keyedit.c:2200
+#: g10/keyedit.c:2224
#, c-format
msgid "update secret failed: %s\n"
msgstr "更新私钥失败:%s\n"
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2231
msgid "Key not changed so no update needed.\n"
msgstr "密钥没有变动所以不需要更新。\n"
-#: g10/keyedit.c:2280
+#: g10/keyedit.c:2304
msgid "Digest: "
msgstr "散列:"
-#: g10/keyedit.c:2332
+#: g10/keyedit.c:2356
msgid "Features: "
msgstr "特点:"
-#: g10/keyedit.c:2343
+#: g10/keyedit.c:2367
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
-#: g10/keyedit.c:2358 g10/keylist.c:308
+#: g10/keyedit.c:2382 g10/keylist.c:308
msgid "Preferred keyserver: "
msgstr "首选公钥服务器:"
-#: g10/keyedit.c:2590
+#: g10/keyedit.c:2611
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
+
+#: g10/keyedit.c:2670
#, c-format
msgid "This key was revoked on %s by %s key %s\n"
msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2691
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "这把密钥可被 %s 密钥 %s 吊销"
-#: g10/keyedit.c:2617
+#: g10/keyedit.c:2697
msgid "(sensitive)"
msgstr " (敏感的)"
-#: g10/keyedit.c:2633 g10/keyedit.c:2689 g10/keyedit.c:2802 g10/keyedit.c:2817
-#: g10/keylist.c:194 g10/keyserver.c:428
+#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
+#: g10/keylist.c:194 g10/keyserver.c:450
#, c-format
msgid "created: %s"
msgstr "创建于:%s"
-#: g10/keyedit.c:2636 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:948
+#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
#, c-format
msgid "revoked: %s"
msgstr "已吊销:%s"
-#: g10/keyedit.c:2638 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
#, c-format
msgid "expired: %s"
msgstr "已过期:%s"
-#: g10/keyedit.c:2640 g10/keyedit.c:2691 g10/keyedit.c:2804 g10/keyedit.c:2819
+#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:434 g10/mainproc.c:954
+#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
#, c-format
msgid "expires: %s"
msgstr "有效至:%s"
-#: g10/keyedit.c:2642
+#: g10/keyedit.c:2722
#, c-format
msgid "usage: %s"
msgstr "可用于:%s"
-#: g10/keyedit.c:2657
+#: g10/keyedit.c:2737
#, c-format
msgid "trust: %s"
msgstr "信任度:%s"
-#: g10/keyedit.c:2661
+#: g10/keyedit.c:2741
#, c-format
msgid "validity: %s"
msgstr "有效性:%s"
-#: g10/keyedit.c:2668
+#: g10/keyedit.c:2748
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
-#: g10/keyedit.c:2696 g10/keylist.c:200
+#: g10/keyedit.c:2776 g10/keylist.c:200
msgid "card-no: "
msgstr "卡号:"
-#: g10/keyedit.c:2764
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
-
-#: g10/keyedit.c:2772
+#: g10/keyedit.c:2800
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr "请注意,在您重启程序之前,显示的密钥有效性未必正确,\n"
-#: g10/keyedit.c:2836 g10/keyedit.c:3213 g10/keyserver.c:438
-#: g10/mainproc.c:1700 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
+#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:2838 g10/keyedit.c:3215 g10/keyserver.c:442
-#: g10/mainproc.c:1702 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
+#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
msgid "expired"
msgstr "已过期"
-#: g10/keyedit.c:2903
+#: g10/keyedit.c:2931
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:2963
+#: g10/keyedit.c:2992
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3181,55 +3337,55 @@ msgstr ""
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
-#: g10/keyedit.c:2968 g10/keyedit.c:3321
+#: g10/keyedit.c:2997 g10/keyedit.c:3350
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗?(y/N)"
-#: g10/keyedit.c:2974
+#: g10/keyedit.c:3003
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
-#: g10/keyedit.c:3114
+#: g10/keyedit.c:3143
msgid "Delete this good signature? (y/N/q)"
msgstr "删除这个完好的签字吗?(y/N/q)"
-#: g10/keyedit.c:3124
+#: g10/keyedit.c:3153
msgid "Delete this invalid signature? (y/N/q)"
msgstr "删除这个无效的签字吗?(y/N/q)"
-#: g10/keyedit.c:3128
+#: g10/keyedit.c:3157
msgid "Delete this unknown signature? (y/N/q)"
msgstr "删除这个未知的签字吗?(y/N/q)"
-#: g10/keyedit.c:3134
+#: g10/keyedit.c:3163
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要删除这个自身签字吗?(y/N)"
-#: g10/keyedit.c:3148
+#: g10/keyedit.c:3177
#, c-format
msgid "Deleted %d signature.\n"
msgstr "已经删除了 %d 个签字。\n"
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3178
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "已经删除了 %d 个签字。\n"
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3181
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
-#: g10/keyedit.c:3183
+#: g10/keyedit.c:3212
#, fuzzy, c-format
msgid "User ID \"%s\": already clean.\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:3217 g10/trustdb.c:1698
+#: g10/keyedit.c:3246 g10/trustdb.c:1698
#, fuzzy
msgid "invalid"
msgstr "无效的 ASCII 封装格式"
-#: g10/keyedit.c:3316
+#: g10/keyedit.c:3345
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3238,236 +3394,240 @@ msgstr ""
"警告:这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
-#: g10/keyedit.c:3327
+#: g10/keyedit.c:3356
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
-#: g10/keyedit.c:3347
+#: g10/keyedit.c:3376
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识:"
-#: g10/keyedit.c:3370
+#: g10/keyedit.c:3399
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:3385
+#: g10/keyedit.c:3414
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:3407
+#: g10/keyedit.c:3436
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
-#: g10/keyedit.c:3426
+#: g10/keyedit.c:3455
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告:将某把密钥指派为指定吊销者的操作无法撤销!\n"
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3461
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗?(y/N):"
-#: g10/keyedit.c:3493
+#: g10/keyedit.c:3522
msgid "Please remove selections from the secret keys.\n"
msgstr "请从私钥中删除选择。\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3528
msgid "Please select at most one subkey.\n"
msgstr "请至多选择一个子钥。\n"
-#: g10/keyedit.c:3503
+#: g10/keyedit.c:3532
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
-#: g10/keyedit.c:3506
+#: g10/keyedit.c:3535
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
-#: g10/keyedit.c:3552
+#: g10/keyedit.c:3581
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
-#: g10/keyedit.c:3568
+#: g10/keyedit.c:3597
msgid "No corresponding signature in secret ring\n"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/keyedit.c:3648
+#: g10/keyedit.c:3822
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
-#: g10/keyedit.c:3687 g10/keyedit.c:3797 g10/keyedit.c:3917
+#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签字\n"
-#: g10/keyedit.c:3858
+#: g10/keyedit.c:4032
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL:"
-#: g10/keyedit.c:3938
+#: g10/keyedit.c:4112
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗?(y/N)"
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:4113
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗?(y/N)"
-#: g10/keyedit.c:4001
+#: g10/keyedit.c:4175
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4233
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4086
+#: g10/keyedit.c:4260
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
-#: g10/keyedit.c:4203
+#: g10/keyedit.c:4395
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识:“%s”\n"
-#: g10/keyedit.c:4206 g10/keyedit.c:4270 g10/keyedit.c:4313
+#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签字\n"
-#: g10/keyedit.c:4208 g10/keyedit.c:4272 g10/keyedit.c:4315
+#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
msgid " (non-exportable)"
msgstr " (不可导出)"
-#: g10/keyedit.c:4212
+#: g10/keyedit.c:4404
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签字已在 %s 过期。\n"
-#: g10/keyedit.c:4216
+#: g10/keyedit.c:4408
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗?(y/N)"
-#: g10/keyedit.c:4220
+#: g10/keyedit.c:4412
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签字生成一份吊销证书吗?(y/N)"
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4439
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字:\n"
-#: g10/keyedit.c:4273
+#: g10/keyedit.c:4465
msgid " (non-revocable)"
msgstr " (不可吊销)"
-#: g10/keyedit.c:4280
+#: g10/keyedit.c:4472
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
-#: g10/keyedit.c:4302
+#: g10/keyedit.c:4494
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签字:\n"
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4514
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗?(y/N)"
-#: g10/keyedit.c:4352
+#: g10/keyedit.c:4544
msgid "no secret key\n"
msgstr "没有私钥\n"
-#: g10/keyedit.c:4422
+#: g10/keyedit.c:4614
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4631
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告:有一份用户标识签字的日期标记为 %d 秒后的未来\n"
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4695
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4757
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
-#: g10/keyedit.c:4660
+#: g10/keyedit.c:4852
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
-#: g10/keygen.c:258
+#: g10/keygen.c:259
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "首选项‘%s’重复\n"
-#: g10/keygen.c:265
+#: g10/keygen.c:266
msgid "too many cipher preferences\n"
msgstr "太多对称加密算法首选项\n"
-#: g10/keygen.c:267
+#: g10/keygen.c:268
msgid "too many digest preferences\n"
msgstr "太多散列算法首选项\n"
-#: g10/keygen.c:269
+#: g10/keygen.c:270
msgid "too many compression preferences\n"
msgstr "太多首选压缩算法\n"
-#: g10/keygen.c:394
+#: g10/keygen.c:395
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
-#: g10/keygen.c:822
+#: g10/keygen.c:815
msgid "writing direct signature\n"
msgstr "正在写入直接签字\n"
-#: g10/keygen.c:861
+#: g10/keygen.c:854
msgid "writing self signature\n"
msgstr "正在写入自身签字\n"
-#: g10/keygen.c:912
+#: g10/keygen.c:905
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签字\n"
-#: g10/keygen.c:973 g10/keygen.c:1053 g10/keygen.c:1141 g10/keygen.c:2608
+#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效:改用 %u 位\n"
-#: g10/keygen.c:978 g10/keygen.c:1058 g10/keygen.c:1146 g10/keygen.c:2614
+#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
-#: g10/keygen.c:1239
+#: g10/keygen.c:1232
msgid "Sign"
msgstr "签字"
-#: g10/keygen.c:1242
+#: g10/keygen.c:1235
+msgid "Certify"
+msgstr ""
+
+#: g10/keygen.c:1238
msgid "Encrypt"
msgstr "加密"
-#: g10/keygen.c:1245
+#: g10/keygen.c:1241
msgid "Authenticate"
msgstr "认证"
-#: g10/keygen.c:1253
+#: g10/keygen.c:1249
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
@@ -3500,76 +3660,76 @@ msgstr " (%c) 选择是否用于认证\n"
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
-#: g10/keygen.c:1340
+#: g10/keygen.c:1342
msgid "Please select what kind of key you want:\n"
msgstr "请选择您要使用的密钥种类:\n"
-#: g10/keygen.c:1342
+#: g10/keygen.c:1344
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1343
+#: g10/keygen.c:1345
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (仅用于签字)\n"
-#: g10/keygen.c:1345
+#: g10/keygen.c:1347
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
-#: g10/keygen.c:1347
+#: g10/keygen.c:1349
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (仅用于加密)\n"
-#: g10/keygen.c:1348
+#: g10/keygen.c:1350
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (仅用于签字)\n"
-#: g10/keygen.c:1350
+#: g10/keygen.c:1352
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
-#: g10/keygen.c:1352
+#: g10/keygen.c:1354
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
-#: g10/keygen.c:1421 g10/keygen.c:2485
+#: g10/keygen.c:1423 g10/keygen.c:2528
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA 密钥对会有 %u 位。\n"
-#: g10/keygen.c:1431
+#: g10/keygen.c:1433
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
-#: g10/keygen.c:1438
+#: g10/keygen.c:1440
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "您想要用多大的密钥尺寸?(%u)"
-#: g10/keygen.c:1452
+#: g10/keygen.c:1454
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
-#: g10/keygen.c:1458
+#: g10/keygen.c:1460
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "您所要求的密钥尺寸是 %u 位\n"
-#: g10/keygen.c:1463 g10/keygen.c:1468
+#: g10/keygen.c:1465 g10/keygen.c:1470
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
-#: g10/keygen.c:1515
+#: g10/keygen.c:1519
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -3585,7 +3745,7 @@ msgstr ""
" <n>m = 密钥在 n 月后过期\n"
" <n>y = 密钥在 n 年后过期\n"
-#: g10/keygen.c:1526
+#: g10/keygen.c:1530
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -3601,38 +3761,38 @@ msgstr ""
" <n>m = 签字在 n 月后过期\n"
" <n>y = 签字在 n 年后过期\n"
-#: g10/keygen.c:1549
+#: g10/keygen.c:1553
msgid "Key is valid for? (0) "
msgstr "密钥的有效期限是?(0) "
-#: g10/keygen.c:1554
+#: g10/keygen.c:1558
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "签字的有效期限是多久?(0) "
-#: g10/keygen.c:1572
+#: g10/keygen.c:1576
msgid "invalid value\n"
msgstr "无效的数值\n"
-#: g10/keygen.c:1579
+#: g10/keygen.c:1583
msgid "Key does not expire at all\n"
msgstr "密钥永远不会过期\n"
-#: g10/keygen.c:1580
+#: g10/keygen.c:1584
msgid "Signature does not expire at all\n"
msgstr "签字永远不会过期\n"
-#: g10/keygen.c:1585
+#: g10/keygen.c:1589
#, c-format
msgid "Key expires at %s\n"
msgstr "密钥于 %s 过期\n"
-#: g10/keygen.c:1586
+#: g10/keygen.c:1590
#, c-format
msgid "Signature expires at %s\n"
msgstr "签字于 %s 过期\n"
-#: g10/keygen.c:1592
+#: g10/keygen.c:1596
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -3640,11 +3800,11 @@ msgstr ""
"您的系统无法显示 2038 年以后的日期。\n"
"不过,它可以正确处理 2106 年之前的年份。\n"
-#: g10/keygen.c:1597
+#: g10/keygen.c:1601
msgid "Is this correct? (y/N) "
msgstr "以上正确吗?(y/n)"
-#: g10/keygen.c:1620
+#: g10/keygen.c:1624
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3660,44 +3820,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <[email protected]>”\n"
"\n"
-#: g10/keygen.c:1633
+#: g10/keygen.c:1637
msgid "Real name: "
msgstr "真实姓名:"
-#: g10/keygen.c:1641
+#: g10/keygen.c:1645
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:1643
+#: g10/keygen.c:1647
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1649
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:1653
+#: g10/keygen.c:1657
msgid "Email address: "
msgstr "电子邮件地址:"
-#: g10/keygen.c:1664
+#: g10/keygen.c:1663
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:1672
+#: g10/keygen.c:1671
msgid "Comment: "
msgstr "注释:"
-#: g10/keygen.c:1678
+#: g10/keygen.c:1677
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:1701
+#: g10/keygen.c:1700
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:1707
+#: g10/keygen.c:1706
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3708,7 +3868,7 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:1712
+#: g10/keygen.c:1711
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@ -3723,23 +3883,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1728
+#: g10/keygen.c:1727
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1738
+#: g10/keygen.c:1737
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
-#: g10/keygen.c:1739
+#: g10/keygen.c:1738
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
-#: g10/keygen.c:1758
+#: g10/keygen.c:1757
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:1798
+#: g10/keygen.c:1797
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3747,12 +3907,12 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:1808 g10/passphrase.c:804
+#: g10/keygen.c:1807 g10/passphrase.c:817
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1814
+#: g10/keygen.c:1813
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"
@@ -3764,7 +3924,7 @@ msgstr ""
"再次执行这个程序,并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:1836
+#: g10/keygen.c:1835
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"
@@ -3774,50 +3934,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:2554
+#: g10/keygen.c:2597
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:2753 g10/keygen.c:2897
+#: g10/keygen.c:2796 g10/keygen.c:2940
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:2755 g10/keygen.c:2900
+#: g10/keygen.c:2798 g10/keygen.c:2943
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:2758 g10/keygen.c:2903
+#: g10/keygen.c:2801 g10/keygen.c:2946
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:2886
+#: g10/keygen.c:2929
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环:%s\n"
-#: g10/keygen.c:2892
+#: g10/keygen.c:2935
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环:%s\n"
-#: g10/keygen.c:2910
+#: g10/keygen.c:2953
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:2917
+#: g10/keygen.c:2960
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:2940
+#: g10/keygen.c:2983
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签字。\n"
-#: g10/keygen.c:2951
+#: g10/keygen.c:2994
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"
@@ -3825,42 +3985,42 @@ msgstr ""
"请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:2963 g10/keygen.c:3092 g10/keygen.c:3207
+#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
-#: g10/keygen.c:3015 g10/keygen.c:3143 g10/sign.c:291
+#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3017 g10/keygen.c:3145 g10/sign.c:293
+#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3026 g10/keygen.c:3156
+#: g10/keygen.c:3069 g10/keygen.c:3199
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3065 g10/keygen.c:3189
+#: g10/keygen.c:3108 g10/keygen.c:3232
msgid "Really create? (y/N) "
msgstr "真的要建立吗?(y/N)"
-#: g10/keygen.c:3342
+#: g10/keygen.c:3391
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败:%s\n"
-#: g10/keygen.c:3389
+#: g10/keygen.c:3438
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
-#: g10/keygen.c:3415
+#: g10/keygen.c:3464
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意:卡密钥的备份已保存到‘%s’\n"
@@ -3901,30 +4061,30 @@ msgstr "不是人类能读懂的"
msgid "Keyring"
msgstr "钥匙环"
-#: g10/keylist.c:1489
+#: g10/keylist.c:1497
msgid "Primary key fingerprint:"
msgstr "主钥指纹:"
-#: g10/keylist.c:1491
+#: g10/keylist.c:1499
msgid " Subkey fingerprint:"
msgstr "子钥指纹:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1498
+#: g10/keylist.c:1506
msgid " Primary key fingerprint:"
msgstr " 主钥指纹:"
-#: g10/keylist.c:1500
+#: g10/keylist.c:1508
msgid " Subkey fingerprint:"
msgstr " 子钥指纹:"
# use tty
-#: g10/keylist.c:1504 g10/keylist.c:1508
+#: g10/keylist.c:1512 g10/keylist.c:1516
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
-#: g10/keylist.c:1575
+#: g10/keylist.c:1583
msgid " Card serial no. ="
msgstr "卡序列号 ="
@@ -3971,128 +4131,153 @@ msgstr "缓存了 %lu 把密钥(%lu 份签字)\n"
msgid "%s: keyring created\n"
msgstr "%s:钥匙环已建立\n"
-#: g10/keyserver.c:108
+#: g10/keyserver.c:78
+msgid "include revoked keys in search results"
+msgstr ""
+
+#: g10/keyserver.c:80
+msgid "include subkeys when searching by key ID"
+msgstr ""
+
+#: g10/keyserver.c:83
+msgid "use temporary files to pass data to keyserver helpers"
+msgstr ""
+
+#: g10/keyserver.c:85
+msgid "do not delete temporary files after using them"
+msgstr ""
+
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys when verifying signatures"
+msgstr ""
+
+#: g10/keyserver.c:95
+#, fuzzy
+msgid "honor the preferred keyserver URL set on the key"
+msgstr "输入您首选的公钥服务器的 URL:"
+
+#: g10/keyserver.c:130
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr "警告:公钥服务器选项‘%s’在此平台上没有被使用\n"
-#: g10/keyserver.c:440
+#: g10/keyserver.c:462
msgid "disabled"
msgstr "已禁用"
-#: g10/keyserver.c:641
+#: g10/keyserver.c:663
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
-#: g10/keyserver.c:724 g10/keyserver.c:1296
+#: g10/keyserver.c:746 g10/keyserver.c:1309
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
-#: g10/keyserver.c:822
+#: g10/keyserver.c:844
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
-#: g10/keyserver.c:824
+#: g10/keyserver.c:846
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
-#: g10/keyserver.c:1043
+#: g10/keyserver.c:1056
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’,从 %s 服务器 %s\n"
-#: g10/keyserver.c:1047
+#: g10/keyserver.c:1060
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s,从 %s\n"
-#: g10/keyserver.c:1199
+#: g10/keyserver.c:1212
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
-#: g10/keyserver.c:1203
+#: g10/keyserver.c:1216
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1246
+#: g10/keyserver.c:1259
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”,在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1249
+#: g10/keyserver.c:1262
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”,在 %s 上\n"
-#: g10/keyserver.c:1256 g10/keyserver.c:1351
+#: g10/keyserver.c:1269 g10/keyserver.c:1364
msgid "no keyserver action!\n"
msgstr "公钥服务器无动作!\n"
-#: g10/keyserver.c:1304
+#: g10/keyserver.c:1317
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告:处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1313
+#: g10/keyserver.c:1326
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1373
+#: g10/keyserver.c:1386
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1379
+#: g10/keyserver.c:1392
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n"
-#: g10/keyserver.c:1391
+#: g10/keyserver.c:1404
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n"
-#: g10/keyserver.c:1396
+#: g10/keyserver.c:1409
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1417
#, fuzzy, c-format
msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
-#: g10/keyserver.c:1411
+#: g10/keyserver.c:1424
msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n"
-#: g10/keyserver.c:1416
+#: g10/keyserver.c:1429
msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n"
-#: g10/keyserver.c:1425
+#: g10/keyserver.c:1438
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误:%s\n"
-#: g10/keyserver.c:1450 g10/keyserver.c:1484
+#: g10/keyserver.c:1463 g10/keyserver.c:1497
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识:跳过\n"
-#: g10/keyserver.c:1741
+#: g10/keyserver.c:1754
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/keyserver.c:1763
+#: g10/keyserver.c:1776
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1765
+#: g10/keyserver.c:1778
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
@@ -4112,186 +4297,186 @@ msgstr "%s 加密过的会话密钥\n"
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密码由未知的散列算法 %d 生成\n"
-#: g10/mainproc.c:376
+#: g10/mainproc.c:391
#, c-format
msgid "public key is %s\n"
msgstr "公钥是 %s\n"
-#: g10/mainproc.c:431
+#: g10/mainproc.c:446
msgid "public key encrypted data: good DEK\n"
msgstr "公钥加密过的数据:完好的数据加密密钥\n"
-#: g10/mainproc.c:464
+#: g10/mainproc.c:479
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "由 %u 位的 %s 密钥加密,钥匙号为 %s、生成于 %s\n"
-#: g10/mainproc.c:468 g10/pkclist.c:219
+#: g10/mainproc.c:483 g10/pkclist.c:219
#, c-format
msgid " \"%s\"\n"
msgstr " “%s”\n"
-#: g10/mainproc.c:472
+#: g10/mainproc.c:487
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "由 %s 密钥加密、钥匙号为 %s\n"
-#: g10/mainproc.c:486
+#: g10/mainproc.c:501
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公钥解密失败:%s\n"
-#: g10/mainproc.c:500
+#: g10/mainproc.c:515
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "以 %lu 个密码加密\n"
-#: g10/mainproc.c:502
+#: g10/mainproc.c:517
msgid "encrypted with 1 passphrase\n"
msgstr "以 1 个密码加密\n"
-#: g10/mainproc.c:530 g10/mainproc.c:552
+#: g10/mainproc.c:545 g10/mainproc.c:567
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 为加密过的数据\n"
-#: g10/mainproc.c:538
+#: g10/mainproc.c:553
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 算法不可用,试以 %s 代替\n"
-#: g10/mainproc.c:570
+#: g10/mainproc.c:585
msgid "decryption okay\n"
msgstr "解密成功\n"
-#: g10/mainproc.c:574
+#: g10/mainproc.c:589
msgid "WARNING: message was not integrity protected\n"
msgstr "警告:报文未受到完整的保护\n"
-#: g10/mainproc.c:587
+#: g10/mainproc.c:602
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告:加密过的报文已经变造!\n"
-#: g10/mainproc.c:593
+#: g10/mainproc.c:608
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失败:%s\n"
-#: g10/mainproc.c:612
+#: g10/mainproc.c:627
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "注意:发件者要求您“只阅读不存盘”\n"
-#: g10/mainproc.c:614
+#: g10/mainproc.c:629
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
-#: g10/mainproc.c:803
+#: g10/mainproc.c:818
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
-#: g10/mainproc.c:1387
+#: g10/mainproc.c:1402
msgid "signature verification suppressed\n"
msgstr "签字验证已被抑制\n"
-#: g10/mainproc.c:1429 g10/mainproc.c:1439
+#: g10/mainproc.c:1444 g10/mainproc.c:1454
msgid "can't handle these multiple signatures\n"
msgstr "无法处理这些多重签字\n"
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1464
#, c-format
msgid "Signature made %s\n"
msgstr "签字建立于 %s\n"
-#: g10/mainproc.c:1450
+#: g10/mainproc.c:1465
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
-#: g10/mainproc.c:1454
+#: g10/mainproc.c:1469
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签字,使用 %s,钥匙号 %s\n"
-#: g10/mainproc.c:1474
+#: g10/mainproc.c:1489
msgid "Key available at: "
msgstr "可用的密钥在:"
-#: g10/mainproc.c:1605 g10/mainproc.c:1653
+#: g10/mainproc.c:1623 g10/mainproc.c:1671
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签字,来自于“%s”"
-#: g10/mainproc.c:1607 g10/mainproc.c:1655
+#: g10/mainproc.c:1625 g10/mainproc.c:1673
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签字,来自于“%s”"
-#: g10/mainproc.c:1609 g10/mainproc.c:1657
+#: g10/mainproc.c:1627 g10/mainproc.c:1675
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签字,来自于“%s”"
-#: g10/mainproc.c:1661
+#: g10/mainproc.c:1679
msgid "[uncertain]"
msgstr "[不确定]"
-#: g10/mainproc.c:1693
+#: g10/mainproc.c:1711
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
-#: g10/mainproc.c:1790
+#: g10/mainproc.c:1808
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签字已于 %s 过期。\n"
-#: g10/mainproc.c:1795
+#: g10/mainproc.c:1813
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签字在 %s 过期。\n"
-#: g10/mainproc.c:1798
+#: g10/mainproc.c:1816
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s 签字,散列算法 %s\n"
-#: g10/mainproc.c:1799
+#: g10/mainproc.c:1817
msgid "binary"
msgstr "二进制"
-#: g10/mainproc.c:1800
+#: g10/mainproc.c:1818
msgid "textmode"
msgstr "文本模式"
-#: g10/mainproc.c:1800 g10/trustdb.c:531
+#: g10/mainproc.c:1818 g10/trustdb.c:531
msgid "unknown"
msgstr "未知"
-#: g10/mainproc.c:1820
+#: g10/mainproc.c:1838
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签字:%s\n"
-#: g10/mainproc.c:1888 g10/mainproc.c:1904 g10/mainproc.c:1990
+#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
msgid "not a detached signature\n"
msgstr "不是一份分离的签字\n"
-#: g10/mainproc.c:1931
+#: g10/mainproc.c:1949
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告:检测到多重签字。只检查第一个签字。\n"
-#: g10/mainproc.c:1939
+#: g10/mainproc.c:1957
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签字\n"
-#: g10/mainproc.c:1996
+#: g10/mainproc.c:2014
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签字\n"
-#: g10/mainproc.c:2006
+#: g10/mainproc.c:2024
msgid "invalid root packet detected in proc_tree()\n"
msgstr "在 proc_tree() 中检测到无效的根包\n"
@@ -4372,12 +4557,12 @@ msgstr "未压缩|无"
msgid "this message may not be usable by %s\n"
msgstr "%s 也许不能使用这个报文\n"
-#: g10/misc.c:999
+#: g10/misc.c:1017
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "有歧义的选项‘%s’\n"
-#: g10/misc.c:1024
+#: g10/misc.c:1042
#, c-format
msgid "unknown option `%s'\n"
msgstr "未知的选项 '%s'\n"
@@ -4438,34 +4623,34 @@ msgstr "警告:潜在不安全的对称加密会话密钥\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
-#: g10/passphrase.c:304
+#: g10/passphrase.c:317
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: g10/passphrase.c:320
+#: g10/passphrase.c:333
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-#: g10/passphrase.c:339
+#: g10/passphrase.c:352
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "不支持 gpg-agent 协议版本 %d\n"
-#: g10/passphrase.c:356
+#: g10/passphrase.c:369
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "无法连接至‘%s’:%s\n"
-#: g10/passphrase.c:373 g10/passphrase.c:649 g10/passphrase.c:739
+#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
msgid "problem with the agent - disabling agent use\n"
msgstr "代理程序有问题――正在停用代理程序\n"
-#: g10/passphrase.c:526 g10/passphrase.c:908
+#: g10/passphrase.c:539 g10/passphrase.c:921
#, c-format
msgid " (main key ID %s)"
msgstr " (主钥匙号 %s)"
-#: g10/passphrase.c:540
+#: g10/passphrase.c:553
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -4476,48 +4661,48 @@ msgstr ""
"“%.*s”\n"
"%u 位的 %s 密钥,钥匙号 %s,建立于 %s%s\n"
-#: g10/passphrase.c:565
+#: g10/passphrase.c:578
msgid "Repeat passphrase\n"
msgstr "请再输入一次密码\n"
-#: g10/passphrase.c:567
+#: g10/passphrase.c:580
msgid "Enter passphrase\n"
msgstr "请输入密码\n"
-#: g10/passphrase.c:643
+#: g10/passphrase.c:656
msgid "cancelled by user\n"
msgstr "用户取消\n"
-#: g10/passphrase.c:799 g10/passphrase.c:962
+#: g10/passphrase.c:812 g10/passphrase.c:975
msgid "can't query passphrase in batch mode\n"
msgstr "在批处理模式中无法查询密码\n"
-#: g10/passphrase.c:806 g10/passphrase.c:967
+#: g10/passphrase.c:819 g10/passphrase.c:980
msgid "Enter passphrase: "
msgstr "请输入密码:"
-#: g10/passphrase.c:889
+#: g10/passphrase.c:902
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr "您需要输入密码,才能解开这个用户的私钥:“%s”\n"
-#: g10/passphrase.c:895
+#: g10/passphrase.c:908
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u 位的 %s 密钥,钥匙号 %s,建立于 %s"
-#: g10/passphrase.c:904
+#: g10/passphrase.c:917
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
-#: g10/passphrase.c:971
+#: g10/passphrase.c:984
msgid "Repeat passphrase: "
msgstr "请再输入一次密码:"
-#: g10/photoid.c:67
+#: g10/photoid.c:73
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
@@ -4530,54 +4715,54 @@ msgstr ""
"片会被存放在您的公钥里。如果您挑了非常大的图片的话,您的密钥也会变得非\n"
"常大!请尽量把图片尺寸控制在240x288左右,这是个理想的尺寸。\n"
-#: g10/photoid.c:81
+#: g10/photoid.c:95
msgid "Enter JPEG filename for photo ID: "
msgstr "输入要当作相片标识的JPEG文件名: "
-#: g10/photoid.c:95
+#: g10/photoid.c:116
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "无法打开 JPEG 文件‘%s’:%s\n"
-#: g10/photoid.c:103
+#: g10/photoid.c:127
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "这个 JPEG 文件太大了(%d 字节)!\n"
-#: g10/photoid.c:105
+#: g10/photoid.c:129
msgid "Are you sure you want to use it? (y/N) "
msgstr "您确定要用它吗?(y/N)"
-#: g10/photoid.c:120
+#: g10/photoid.c:146
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "“%s”不是一个 JPEG 文件\n"
-#: g10/photoid.c:137
+#: g10/photoid.c:165
msgid "Is this photo correct (y/N/q)? "
msgstr "这张照片正确吗?(y/N/q)"
-#: g10/photoid.c:339
+#: g10/photoid.c:369
msgid "unable to display photo ID!\n"
msgstr "无法显示照片标识!\n"
-#: g10/pkclist.c:62 g10/revoke.c:581
+#: g10/pkclist.c:62 g10/revoke.c:585
msgid "No reason specified"
msgstr "未指定原因"
-#: g10/pkclist.c:64 g10/revoke.c:583
+#: g10/pkclist.c:64 g10/revoke.c:587
msgid "Key is superseded"
msgstr "密钥被替换"
-#: g10/pkclist.c:66 g10/revoke.c:582
+#: g10/pkclist.c:66 g10/revoke.c:586
msgid "Key has been compromised"
msgstr "密钥已泄漏"
-#: g10/pkclist.c:68 g10/revoke.c:584
+#: g10/pkclist.c:68 g10/revoke.c:588
msgid "Key is no longer used"
msgstr "密钥不再使用"
-#: g10/pkclist.c:70 g10/revoke.c:585
+#: g10/pkclist.c:70 g10/revoke.c:589
msgid "User ID is no longer valid"
msgstr "用户标识不再有效"
@@ -4644,7 +4829,7 @@ msgstr ""
"这把密钥的最小信任等级为:%s\n"
"\n"
-#: g10/pkclist.c:299 g10/revoke.c:610
+#: g10/pkclist.c:299 g10/revoke.c:614
msgid "Your decision? "
msgstr "您的决定是什么?"
@@ -4715,60 +4900,65 @@ msgstr "警告:这把子钥已经被它的持有者吊销了!\n"
msgid "Note: This key has been disabled.\n"
msgstr "注意:这把密钥已经被禁用了。\n"
-#: g10/pkclist.c:543
+#: g10/pkclist.c:552
+#, c-format
+msgid "Note: Verified signer's address is `%s'\n"
+msgstr ""
+
+#: g10/pkclist.c:558
#, c-format
-msgid "Note: Verified address is `%s'\n"
+msgid "Note: Signer's address `%s' does not match DNS entry\n"
msgstr ""
-#: g10/pkclist.c:580
+#: g10/pkclist.c:587
msgid "Note: This key has expired!\n"
msgstr "注意:这把密钥已经过期了!\n"
-#: g10/pkclist.c:591
+#: g10/pkclist.c:598
msgid "WARNING: This key is not certified with a trusted signature!\n"
msgstr "警告:这把密钥未经受信任的签字认证!\n"
-#: g10/pkclist.c:593
+#: g10/pkclist.c:600
msgid ""
" There is no indication that the signature belongs to the owner.\n"
msgstr " 没有证据表明这个签字属于它所声称的持有者。\n"
-#: g10/pkclist.c:601
+#: g10/pkclist.c:608
msgid "WARNING: We do NOT trust this key!\n"
msgstr "警告:我们不信任这把密钥!\n"
-#: g10/pkclist.c:602
+#: g10/pkclist.c:609
msgid " The signature is probably a FORGERY.\n"
msgstr " 这个签字很有可能是伪造的。\n"
-#: g10/pkclist.c:610
+#: g10/pkclist.c:617
msgid ""
"WARNING: This key is not certified with sufficiently trusted signatures!\n"
msgstr "警告:这把密钥未经有足够信任度的签字所认证。\n"
-#: g10/pkclist.c:612
+#: g10/pkclist.c:619
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 这份签字并不一定属于它所声称的持有者\n"
-#: g10/pkclist.c:777 g10/pkclist.c:810 g10/pkclist.c:979 g10/pkclist.c:1039
+#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s:已跳过:%s\n"
-#: g10/pkclist.c:787 g10/pkclist.c:1011
+#: g10/pkclist.c:830 g10/pkclist.c:1110
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳过:公钥已存在\n"
-#: g10/pkclist.c:829
+#: g10/pkclist.c:881
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
-#: g10/pkclist.c:845
+#: g10/pkclist.c:905
msgid "Current recipients:\n"
msgstr "当前收件人:\n"
-#: g10/pkclist.c:871
+#: g10/pkclist.c:931
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
@@ -4776,33 +4966,33 @@ msgstr ""
"\n"
"输入用户标识。以空白行结束:"
-#: g10/pkclist.c:887
+#: g10/pkclist.c:956
msgid "No such user ID.\n"
msgstr "没有这个用户标识。\n"
-#: g10/pkclist.c:892 g10/pkclist.c:954
+#: g10/pkclist.c:965 g10/pkclist.c:1039
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳过:公钥已被设为默认收件者\n"
-#: g10/pkclist.c:910
+#: g10/pkclist.c:986
msgid "Public key is disabled.\n"
msgstr "公钥被禁用。\n"
-#: g10/pkclist.c:917
+#: g10/pkclist.c:995
msgid "skipped: public key already set\n"
msgstr "已跳过:公钥已被设定\n"
-#: g10/pkclist.c:946
+#: g10/pkclist.c:1030
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的默认收件者“%s”\n"
-#: g10/pkclist.c:991
+#: g10/pkclist.c:1088
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s:已跳过:公钥已被禁用\n"
-#: g10/pkclist.c:1046
+#: g10/pkclist.c:1150
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
@@ -4819,19 +5009,19 @@ msgstr "建立‘%s’时发生错误:%s\n"
msgid "Detached signature.\n"
msgstr "分离的签字。\n"
-#: g10/plaintext.c:452
+#: g10/plaintext.c:453
msgid "Please enter name of data file: "
msgstr "请输入数据文件的名称: "
-#: g10/plaintext.c:481
+#: g10/plaintext.c:485
msgid "reading stdin ...\n"
msgstr "正在从标准输入读取 ...\n"
-#: g10/plaintext.c:515
+#: g10/plaintext.c:519
msgid "no signed data\n"
msgstr "不含签字的数据\n"
-#: g10/plaintext.c:529
+#: g10/plaintext.c:533
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "无法打开有签字的数据‘%s’\n"
@@ -4869,7 +5059,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:546
+#: g10/revoke.c:188 g10/revoke.c:550
#, c-format
msgid "build_packet failed: %s\n"
msgstr "build_packet 失败:%s\n"
@@ -4891,11 +5081,11 @@ msgstr "(这是一把敏感的吊销密钥)\n"
msgid "Create a designated revocation certificate for this key? (y/N) "
msgstr "要为这把密钥建立一份指定吊销者证书吗?(y/N)"
-#: g10/revoke.c:294 g10/revoke.c:512
+#: g10/revoke.c:294 g10/revoke.c:516
msgid "ASCII armored output forced.\n"
msgstr "已强行使用 ASCII 封装过的输出。\n"
-#: g10/revoke.c:308 g10/revoke.c:526
+#: g10/revoke.c:308 g10/revoke.c:530
#, c-format
msgid "make_keysig_packet failed: %s\n"
msgstr "make_keysig_packet 失败: %s\n"
@@ -4931,11 +5121,11 @@ msgstr "要为这把密钥建立一份吊销证书吗?(y/N)"
msgid "unknown protection algorithm\n"
msgstr "未知的保护算法\n"
-#: g10/revoke.c:501
+#: g10/revoke.c:505
msgid "NOTE: This key is not protected!\n"
msgstr "注意:这把密钥没有被保护!\n"
-#: g10/revoke.c:552
+#: g10/revoke.c:556
msgid ""
"Revocation certificate created.\n"
"\n"
@@ -4953,33 +5143,33 @@ msgstr ""
"小心:您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
"人也能够看得到的地方!\n"
-#: g10/revoke.c:593
+#: g10/revoke.c:597
msgid "Please select the reason for the revocation:\n"
msgstr "请选择吊销的原因:\n"
-#: g10/revoke.c:603
+#: g10/revoke.c:607
msgid "Cancel"
msgstr "取消"
-#: g10/revoke.c:605
+#: g10/revoke.c:609
#, c-format
msgid "(Probably you want to select %d here)\n"
msgstr "(也许您会想要在这里选择 %d)\n"
-#: g10/revoke.c:646
+#: g10/revoke.c:650
msgid "Enter an optional description; end it with an empty line:\n"
msgstr "请输入描述(可选);以空白行结束:\n"
-#: g10/revoke.c:674
+#: g10/revoke.c:678
#, c-format
msgid "Reason for revocation: %s\n"
msgstr "吊销原因:%s\n"
-#: g10/revoke.c:676
+#: g10/revoke.c:680
msgid "(No description given)\n"
msgstr "(不给定描述)\n"
-#: g10/revoke.c:681
+#: g10/revoke.c:685
msgid "Is this okay? (y/N) "
msgstr "这样可以吗? (y/N)"
@@ -5006,11 +5196,11 @@ msgstr "无效的密码;请再试一次"
msgid "%s ...\n"
msgstr "%s……\n"
-#: g10/seckey-cert.c:327
+#: g10/seckey-cert.c:328
msgid "WARNING: Weak key detected - please change passphrase again.\n"
msgstr "警告:检测到弱密钥――请更换密码。\n"
-#: g10/seckey-cert.c:365
+#: g10/seckey-cert.c:366
msgid "generating the deprecated 16-bit checksum for secret key protection\n"
msgstr "正在产生私钥保护使用的旧式 16 位校验和\n"
@@ -5031,54 +5221,54 @@ msgstr "DSA 要求使用 160 位的散列算法\n"
msgid "WARNING: signature digest conflict in message\n"
msgstr "警告:签字散列值与报文不一致\n"
-#: g10/sig-check.c:100
+#: g10/sig-check.c:105
#, c-format
msgid "WARNING: signing subkey %s is not cross-certified\n"
msgstr "警告:正要签字的子钥 %s 未经交叉验证\n"
-#: g10/sig-check.c:103
+#: g10/sig-check.c:111
#, c-format
msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
msgstr "警告:正要签字的子钥 %s 交叉验证无效\n"
-#: g10/sig-check.c:169
+#: g10/sig-check.c:179
#, c-format
msgid "public key %s is %lu second newer than the signature\n"
msgstr "公钥 %s 在其签字后 %lu 秒生成\n"
-#: g10/sig-check.c:170
+#: g10/sig-check.c:180
#, c-format
msgid "public key %s is %lu seconds newer than the signature\n"
msgstr "公钥 %s 在其签字后 %lu 秒生成\n"
-#: g10/sig-check.c:181
+#: g10/sig-check.c:191
#, c-format
msgid ""
"key %s was created %lu second in the future (time warp or clock problem)\n"
msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/sig-check.c:183
+#: g10/sig-check.c:193
#, c-format
msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/sig-check.c:193
+#: g10/sig-check.c:203
#, c-format
msgid "NOTE: signature key %s expired %s\n"
msgstr "注意:签字密钥 %s 已于 %s 过期\n"
-#: g10/sig-check.c:276
+#: g10/sig-check.c:286
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "假定密钥 %s 的签字由于某个未知的关键位出错而损坏\n"
-#: g10/sig-check.c:533
+#: g10/sig-check.c:543
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "密钥 %s:没有子钥吊销签字所需的子钥\n"
-#: g10/sig-check.c:559
+#: g10/sig-check.c:569
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "密钥 %s:没有子钥绑定签字所需的子钥\n"
@@ -5127,25 +5317,25 @@ msgstr "检查已建立的签字时发生错误: %s\n"
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 签字来自:“%s”\n"
-#: g10/sign.c:761
+#: g10/sign.c:763
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:830
+#: g10/sign.c:832
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告:强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
-#: g10/sign.c:922
+#: g10/sign.c:924
msgid "signing:"
msgstr "正在签字:"
-#: g10/sign.c:1034
+#: g10/sign.c:1036
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:1212
+#: g10/sign.c:1214
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"