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.po1176
1 files changed, 599 insertions, 577 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 656b87274..104fa4969 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: 2006-03-07 11:29+0100\n"
+"POT-Creation-Date: 2006-03-09 13:31+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"
@@ -45,10 +45,10 @@ msgstr "正在将私钥写至`%s'\n"
#: cipher/random.c:448 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:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3363 g10/import.c:193 g10/keygen.c:2323
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
-#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:482 g10/sign.c:772 g10/sign.c:932 g10/sign.c:1045
+#: g10/sign.c:1195 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"
@@ -81,9 +81,9 @@ msgstr "无法读取‘%s’：%s\n"
msgid "note: random_seed file not updated\n"
msgstr "注意：随机数种子文件未被更新\n"
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 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:805 g10/sign.c:1076 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802
+#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
+#: g10/openfile.c:355 g10/sign.c:790 g10/sign.c:1061 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
msgstr "无法建立‘%s’：%s\n"
@@ -388,14 +388,14 @@ msgstr "OpenPGP 卡不可用：%s\n"
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
-#: 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:218 g10/revoke.c:456
+#: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1524
+#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
#: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
-#: g10/keygen.c:1357
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
+#: g10/keygen.c:1406
msgid "Your selection? "
msgstr "您的选择？ "
@@ -561,8 +561,8 @@ msgstr " (2) 加密密钥\n"
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:946
+#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
@@ -582,7 +582,7 @@ msgstr "私钥部分不可用\n"
msgid "secret key already stored on a card\n"
msgstr "私钥已存储在卡上\n"
-#: g10/card-util.c:1318 g10/keyedit.c:1354
+#: g10/card-util.c:1318 g10/keyedit.c:1357
msgid "quit this menu"
msgstr "离开这个菜单"
@@ -590,7 +590,7 @@ msgstr "离开这个菜单"
msgid "show admin commands"
msgstr "显示管理员命令"
-#: g10/card-util.c:1321 g10/keyedit.c:1357
+#: g10/card-util.c:1321 g10/keyedit.c:1360
msgid "show this help"
msgstr "显示这份在线说明"
@@ -642,7 +642,7 @@ msgstr "更改或解锁 PIN 的菜单"
msgid "verify the PIN and list all data"
msgstr ""
-#: g10/card-util.c:1456 g10/keyedit.c:1617
+#: g10/card-util.c:1456 g10/keyedit.c:1623
msgid "Command> "
msgstr "命令> "
@@ -658,7 +658,7 @@ msgstr "允许使用管理员命令\n"
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
-#: g10/card-util.c:1601 g10/keyedit.c:2228
+#: g10/card-util.c:1601 g10/keyedit.c:2244
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
@@ -703,7 +703,7 @@ msgstr "再次输入此 PIN："
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符；请再试一次"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3723 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
#, c-format
msgid "can't open `%s'\n"
@@ -713,7 +713,7 @@ msgstr "无法打开‘%s’\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1698
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
@@ -759,7 +759,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:1230
+#: g10/encode.c:213 g10/sign.c:1215
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
@@ -778,7 +778,7 @@ msgstr "使用对称加密算法 %s\n"
msgid "`%s' already compressed\n"
msgstr "‘%s’已被压缩\n"
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:557
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "警告：‘%s’是一个空文件\n"
@@ -803,7 +803,7 @@ msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:642 g10/sign.c:911
+#: g10/encode.c:642 g10/sign.c:896
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -966,7 +966,7 @@ msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
msgid "WARNING: nothing exported\n"
msgstr "警告：没有导出任何东西\n"
-#: g10/gpg.c:373
+#: g10/gpg.c:372
msgid ""
"@Commands:\n"
" "
@@ -974,127 +974,127 @@ msgstr ""
"@指令：\n"
" "
-#: g10/gpg.c:375
+#: g10/gpg.c:374
msgid "|[file]|make a signature"
msgstr "|[文件名]|生成一份签字"
-#: g10/gpg.c:376
+#: g10/gpg.c:375
msgid "|[file]|make a clear text signature"
msgstr "|[文件名]|生成一份明文签字"
-#: g10/gpg.c:377
+#: g10/gpg.c:376
msgid "make a detached signature"
msgstr "生成一份分离的签字"
-#: g10/gpg.c:378
+#: g10/gpg.c:377
msgid "encrypt data"
msgstr "加密数据"
-#: g10/gpg.c:380
+#: g10/gpg.c:379
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:382
+#: g10/gpg.c:381
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/gpg.c:384
+#: g10/gpg.c:383
msgid "verify a signature"
msgstr "验证签字"
-#: g10/gpg.c:386
+#: g10/gpg.c:385
msgid "list keys"
msgstr "列出密钥"
-#: g10/gpg.c:388
+#: g10/gpg.c:387
msgid "list keys and signatures"
msgstr "列出密钥和签字"
-#: g10/gpg.c:389
+#: g10/gpg.c:388
msgid "list and check key signatures"
msgstr "列出并检查密钥签字"
-#: g10/gpg.c:390
+#: g10/gpg.c:389
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:391
+#: g10/gpg.c:390
msgid "list secret keys"
msgstr "列出私钥"
-#: g10/gpg.c:392
+#: g10/gpg.c:391
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
-#: g10/gpg.c:393
+#: g10/gpg.c:392
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: g10/gpg.c:395
+#: g10/gpg.c:394
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
-#: g10/gpg.c:396
+#: g10/gpg.c:395
msgid "sign a key"
msgstr "为某把密钥添加签字"
-#: g10/gpg.c:397
+#: g10/gpg.c:396
msgid "sign a key locally"
msgstr "为某把密钥添加本地签字"
-#: g10/gpg.c:398
+#: g10/gpg.c:397
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签字"
-#: g10/gpg.c:399
+#: g10/gpg.c:398
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/gpg.c:401
+#: g10/gpg.c:400
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:402
+#: g10/gpg.c:401
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:403
+#: g10/gpg.c:402
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/gpg.c:405
+#: g10/gpg.c:404
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/gpg.c:407
+#: g10/gpg.c:406
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
-#: g10/gpg.c:411
+#: g10/gpg.c:410
msgid "import/merge keys"
msgstr "导入/合并密钥"
-#: g10/gpg.c:414
+#: g10/gpg.c:413
msgid "print the card status"
msgstr "打印卡状态"
-#: g10/gpg.c:415
+#: g10/gpg.c:414
msgid "change data on a card"
msgstr "更改卡上的数据"
-#: g10/gpg.c:416
+#: g10/gpg.c:415
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
-#: g10/gpg.c:424
+#: g10/gpg.c:423
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/gpg.c:431
+#: g10/gpg.c:430
msgid "|algo [files]|print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:435 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1104,51 +1104,51 @@ msgstr ""
"选项：\n"
" "
-#: g10/gpg.c:437
+#: g10/gpg.c:436
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:439
+#: g10/gpg.c:438
msgid "|NAME|encrypt for NAME"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:450
+#: g10/gpg.c:449
msgid "use this user-id to sign or decrypt"
msgstr "使用这个用户标识来签字或解密"
-#: g10/gpg.c:451
+#: g10/gpg.c:450
msgid "|N|set compress level N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:456
+#: g10/gpg.c:455
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:470
+#: g10/gpg.c:469
msgid "use as output file"
msgstr "指定输出文件"
-#: g10/gpg.c:472 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
msgid "verbose"
msgstr "详细模式"
-#: g10/gpg.c:483
+#: g10/gpg.c:482
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/gpg.c:484
+#: g10/gpg.c:483
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/gpg.c:525
+#: g10/gpg.c:524
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/gpg.c:526
+#: g10/gpg.c:525
msgid "generate PGP 2.x compatible messages"
msgstr "生成与 PGP 2.x 兼容的报文"
-#: g10/gpg.c:554
+#: g10/gpg.c:553
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -1156,7 +1156,7 @@ msgstr ""
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/gpg.c:557
+#: g10/gpg.c:556
msgid ""
"@\n"
"Examples:\n"
@@ -1208,7 +1208,7 @@ msgstr ""
msgid "Pubkey: "
msgstr "公钥："
-#: g10/gpg.c:791 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "对称加密："
@@ -1216,7 +1216,7 @@ msgstr "对称加密："
msgid "Hash: "
msgstr "散列："
-#: g10/gpg.c:803 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2356
msgid "Compression: "
msgstr "压缩："
@@ -1300,481 +1300,470 @@ msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1526
+#: g10/gpg.c:1525
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1528
+#: g10/gpg.c:1527
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1530
+#: g10/gpg.c:1529
#, fuzzy
msgid "show all notations during signature listings"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/gpg.c:1532
+#: g10/gpg.c:1531
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1536
+#: g10/gpg.c:1535
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1538
+#: g10/gpg.c:1537
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "给定的首选公钥服务器 URL 无效\n"
-#: g10/gpg.c:1540
+#: g10/gpg.c:1539
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1542
+#: g10/gpg.c:1541
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1544
+#: g10/gpg.c:1543
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1546
+#: g10/gpg.c:1545
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "在私钥和公钥清单间切换"
-#: g10/gpg.c:1548
+#: g10/gpg.c:1547
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/gpg.c:1879
+#: g10/gpg.c:1850
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1921
+#: g10/gpg.c:1892
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意：没有默认配置文件‘%s’\n"
-#: g10/gpg.c:1925
+#: g10/gpg.c:1896
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’：%s\n"
-#: g10/gpg.c:1932
+#: g10/gpg.c:1903
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
+#: g10/gpg.c:2118 g10/gpg.c:2719 g10/gpg.c:2738
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意：一般情况下不会用到 %s！\n"
-#: g10/gpg.c:2163
+#: g10/gpg.c:2131
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
-#: g10/gpg.c:2317 g10/gpg.c:2329
+#: g10/gpg.c:2285 g10/gpg.c:2297
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2405
+#: g10/gpg.c:2373
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2429 g10/keyedit.c:3997
+#: g10/gpg.c:2397 g10/keyedit.c:4048
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2441
+#: g10/gpg.c:2409
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
-#: g10/gpg.c:2444
+#: g10/gpg.c:2412
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2451
+#: g10/gpg.c:2419
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
-#: g10/gpg.c:2454
+#: g10/gpg.c:2422
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2461
+#: g10/gpg.c:2429
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
-#: g10/gpg.c:2464
+#: g10/gpg.c:2432
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2471
+#: g10/gpg.c:2439
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
-#: g10/gpg.c:2474
+#: g10/gpg.c:2442
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2482
+#: g10/gpg.c:2450
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2484
+#: g10/gpg.c:2452
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2486
+#: g10/gpg.c:2454
#, fuzzy
msgid "show all notations during signature verification"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2488
+#: g10/gpg.c:2456
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2492
+#: g10/gpg.c:2460
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2494
+#: g10/gpg.c:2462
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "给定的首选公钥服务器 URL 无效\n"
-#: g10/gpg.c:2496
+#: g10/gpg.c:2464
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2498
+#: g10/gpg.c:2466
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2505
+#: g10/gpg.c:2468
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2470
+msgid "elevate the trust of signatures with valid PKA data"
+msgstr ""
+
+#: g10/gpg.c:2477
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
-#: g10/gpg.c:2508
+#: g10/gpg.c:2480
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2515
+#: g10/gpg.c:2487
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2665
+#: g10/gpg.c:2637
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s：%d：无效的校验选项\n"
-#: g10/gpg.c:2668
+#: g10/gpg.c:2640
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2736
+#: g10/gpg.c:2708
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
-#: g10/gpg.c:2740
+#: g10/gpg.c:2712
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
-#: g10/gpg.c:2749
+#: g10/gpg.c:2721
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:2752
+#: g10/gpg.c:2724
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
-#: g10/gpg.c:2759
+#: g10/gpg.c:2731
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: g10/gpg.c:2774
+#: g10/gpg.c:2746
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
-#: g10/gpg.c:2788
+#: g10/gpg.c:2760
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
-#: g10/gpg.c:2794
+#: g10/gpg.c:2766
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
-#: g10/gpg.c:2800
+#: g10/gpg.c:2772
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
-#: g10/gpg.c:2813
+#: g10/gpg.c:2785
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:2880 g10/gpg.c:2904
+#: g10/gpg.c:2852 g10/gpg.c:2876
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:2886 g10/gpg.c:2910
+#: g10/gpg.c:2858 g10/gpg.c:2882
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:2892
+#: g10/gpg.c:2864
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:2898
+#: g10/gpg.c:2870
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:2913
+#: g10/gpg.c:2885
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签字数一定要大于 0\n"
-#: g10/gpg.c:2915
+#: g10/gpg.c:2887
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签字数一定要大于 1\n"
-#: g10/gpg.c:2917
+#: g10/gpg.c:2889
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:2919
+#: g10/gpg.c:2891
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
-#: g10/gpg.c:2921
+#: g10/gpg.c:2893
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
-#: g10/gpg.c:2924
+#: g10/gpg.c:2896
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:2928
+#: g10/gpg.c:2900
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
-#: g10/gpg.c:2935
+#: g10/gpg.c:2907
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:2944
+#: g10/gpg.c:2916
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:2948
+#: g10/gpg.c:2920
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:2952
+#: g10/gpg.c:2924
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:2985
+#: g10/gpg.c:2957
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3032
+#: g10/gpg.c:3004
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3037
+#: g10/gpg.c:3009
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3042
+#: g10/gpg.c:3014
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3138
+#: g10/gpg.c:3110
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
-#: g10/gpg.c:3149
+#: g10/gpg.c:3121
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3160
+#: g10/gpg.c:3132
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3167
+#: g10/gpg.c:3139
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3169
+#: g10/gpg.c:3141
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败：%s\n"
-#: g10/gpg.c:3179
+#: g10/gpg.c:3151
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3192
+#: g10/gpg.c:3164
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3194
+#: g10/gpg.c:3166
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3197
+#: g10/gpg.c:3169
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3215
+#: g10/gpg.c:3187
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3228
+#: g10/gpg.c:3200
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3243
+#: g10/gpg.c:3215
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3245
+#: g10/gpg.c:3217
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3248
+#: g10/gpg.c:3220
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3240
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3277
+#: g10/gpg.c:3249
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3302
+#: g10/gpg.c:3274
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3310
+#: g10/gpg.c:3282
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3314
+#: g10/gpg.c:3286
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3335
+#: g10/gpg.c:3307
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3406
+#: g10/gpg.c:3378
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3415
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
-#: g10/gpg.c:3445
+#: g10/gpg.c:3417
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
-#: g10/gpg.c:3447
+#: g10/gpg.c:3419
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
-#: g10/gpg.c:3458
+#: g10/gpg.c:3430
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
-#: g10/gpg.c:3468
+#: g10/gpg.c:3440
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
-#: g10/gpg.c:3519
+#: g10/gpg.c:3491
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
-#: g10/gpg.c:3527
+#: g10/gpg.c:3499
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
-#: g10/gpg.c:3614
+#: g10/gpg.c:3586
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3737
+#: g10/gpg.c:3709
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3741
+#: g10/gpg.c:3713
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4031
-msgid ""
-"a notation name must have only printable characters or spaces, and end with "
-"an '='\n"
-msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
-
-#: g10/gpg.c:4039
-msgid "a user notation name must contain the '@' character\n"
-msgstr "用户标记名称一定要含有“@”字符\n"
-
-#: g10/gpg.c:4044
-#, fuzzy
-msgid "a notation name must not contain more than one '@' character\n"
-msgstr "用户标记名称一定要含有“@”字符\n"
-
-#: g10/gpg.c:4055
-msgid "a notation value must not use any control characters\n"
-msgstr "标记值一定不能使用任何的控制字符\n"
-
-#: g10/gpg.c:4089
+#: g10/gpg.c:4014
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4091
+#: g10/gpg.c:4016
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签字策略 URL 无效\n"
-#: g10/gpg.c:4124
+#: g10/gpg.c:4049
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -2339,7 +2328,7 @@ msgstr "密钥 %s：新密钥――已跳过\n"
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环：%s\n"
-#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:795 g10/sign.c:1066
#, c-format
msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
@@ -2615,51 +2604,51 @@ msgstr "建立‘%s’时发生错误：%s\n"
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立钥匙环缓存失败： %s\n"
-#: g10/keyedit.c:264
+#: g10/keyedit.c:266
msgid "[revocation]"
msgstr "[吊销]"
-#: g10/keyedit.c:265
+#: g10/keyedit.c:267
msgid "[self-signature]"
msgstr "[自身签字]"
-#: g10/keyedit.c:343 g10/keylist.c:406
+#: g10/keyedit.c:345 g10/keylist.c:390
msgid "1 bad signature\n"
msgstr "1 个损坏的签字\n"
-#: g10/keyedit.c:345 g10/keylist.c:408
+#: g10/keyedit.c:347 g10/keylist.c:392
#, c-format
msgid "%d bad signatures\n"
msgstr "%d 个损坏的签字\n"
-#: g10/keyedit.c:347 g10/keylist.c:410
+#: g10/keyedit.c:349 g10/keylist.c:394
msgid "1 signature not checked due to a missing key\n"
msgstr "有 1 份签字因为遗失密钥而未被检查\n"
-#: g10/keyedit.c:349 g10/keylist.c:412
+#: g10/keyedit.c:351 g10/keylist.c:396
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
-#: g10/keyedit.c:351 g10/keylist.c:414
+#: g10/keyedit.c:353 g10/keylist.c:398
msgid "1 signature not checked due to an error\n"
msgstr "有 1 份签字因为某个错误而未被检查\n"
-#: g10/keyedit.c:353 g10/keylist.c:416
+#: g10/keyedit.c:355 g10/keylist.c:400
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "有 %d 份签字因为某些错误而未被检查\n"
-#: g10/keyedit.c:355
+#: g10/keyedit.c:357
msgid "1 user ID without valid self-signature detected\n"
msgstr "检测到 1 个没有有效自身签字的用户标识\n"
-#: g10/keyedit.c:357
+#: g10/keyedit.c:359
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
-#: g10/keyedit.c:413 g10/pkclist.c:263
+#: g10/keyedit.c:415 g10/pkclist.c:263
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@ -2670,17 +2659,17 @@ msgstr ""
"查\n"
"指纹等)？\n"
-#: g10/keyedit.c:417 g10/pkclist.c:275
+#: g10/keyedit.c:419 g10/pkclist.c:275
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉强相信\n"
-#: g10/keyedit.c:418 g10/pkclist.c:277
+#: g10/keyedit.c:420 g10/pkclist.c:277
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全相信\n"
-#: g10/keyedit.c:437
+#: g10/keyedit.c:439
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@ -2689,46 +2678,46 @@ msgstr ""
"请输入这份信任签字的深度。\n"
"深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
-#: g10/keyedit.c:453
+#: g10/keyedit.c:455
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "请输入这份签字的限制域，如果没有请按回车。\n"
-#: g10/keyedit.c:597
+#: g10/keyedit.c:599
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "用户标识“%s”已被吊销。"
-#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
-#: g10/keyedit.c:894 g10/keyedit.c:1736
+#: g10/keyedit.c:608 g10/keyedit.c:636 g10/keyedit.c:663 g10/keyedit.c:831
+#: g10/keyedit.c:896 g10/keyedit.c:1742
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "您仍然想要为它签字吗？(y/N)"
-#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:622 g10/keyedit.c:650 g10/keyedit.c:677 g10/keyedit.c:837
+#: g10/keyedit.c:1748
msgid " Unable to sign.\n"
msgstr " 无法添加签字。\n"
-#: g10/keyedit.c:625
+#: g10/keyedit.c:627
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "用户标识“%s”已过期。"
-#: g10/keyedit.c:653
+#: g10/keyedit.c:655
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "警告：用户标识“%s”不含自身签字。"
-#: g10/keyedit.c:681
+#: g10/keyedit.c:683
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "警告：用户标识“%s”不含自身签字。"
-#: g10/keyedit.c:683
+#: g10/keyedit.c:685
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "真的要签字吗？(y/N)"
-#: g10/keyedit.c:705
+#: g10/keyedit.c:707
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2737,75 +2726,75 @@ msgstr ""
"“%s”的自身签字是 PGP 2.x 样\n"
"式的签字。\n"
-#: g10/keyedit.c:714
+#: g10/keyedit.c:716
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)"
-#: g10/keyedit.c:728
+#: g10/keyedit.c:730
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr "您目前为“%s”的签字已经过期了。\n"
-#: g10/keyedit.c:732
+#: g10/keyedit.c:734
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)"
-#: g10/keyedit.c:753
+#: g10/keyedit.c:755
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr "您目前为“%s”的签字是一份本地签字。\n"
-#: g10/keyedit.c:757
+#: g10/keyedit.c:759
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "您是否想要把它升级成可以完全导出的签字？(y/N)"
-#: g10/keyedit.c:778
+#: g10/keyedit.c:780
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "“%s”已由密钥 %s 在本地签字\n"
-#: g10/keyedit.c:781
+#: g10/keyedit.c:783
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "“%s”已由密钥 %s 签字\n"
-#: g10/keyedit.c:786
+#: g10/keyedit.c:788
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "您仍然想要为它再次签字吗？(y/N)"
-#: g10/keyedit.c:808
+#: g10/keyedit.c:810
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "没有东西可以让密钥 %s 签字\n"
-#: g10/keyedit.c:823
+#: g10/keyedit.c:825
msgid "This key has expired!"
msgstr "这把密钥已经过期！"
-#: g10/keyedit.c:841
+#: g10/keyedit.c:843
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "这把密钥将在 %s 过期。\n"
-#: g10/keyedit.c:847
+#: g10/keyedit.c:849
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "您想要让您的签字也同时过期吗？ (Y/n) "
-#: g10/keyedit.c:887
+#: g10/keyedit.c:889
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:889
+#: g10/keyedit.c:891
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
-#: g10/keyedit.c:914
+#: g10/keyedit.c:916
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2814,31 +2803,31 @@ msgstr ""
"您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n"
"如果您不知道这个问题的答案，请输入“0”。\n"
-#: g10/keyedit.c:919
+#: g10/keyedit.c:921
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答。 %s\n"
-#: g10/keyedit.c:921
+#: g10/keyedit.c:923
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本没有检查过。 %s\n"
-#: g10/keyedit.c:923
+#: g10/keyedit.c:925
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我随意检查过。 %s\n"
-#: g10/keyedit.c:925
+#: g10/keyedit.c:927
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地检查过。 %s\n"
-#: g10/keyedit.c:931
+#: g10/keyedit.c:933
msgid "Your selection? (enter `?' for more information): "
msgstr "您的选择？(输入‘?’以获得更多的信息)："
-#: g10/keyedit.c:955
+#: g10/keyedit.c:957
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@ -2847,74 +2836,74 @@ msgstr ""
"您真的确定要签字这把密钥，使用您的密钥\n"
"“%s”(%s)\n"
-#: g10/keyedit.c:962
+#: g10/keyedit.c:964
msgid "This will be a self-signature.\n"
msgstr "这将是一个自身签字。\n"
-#: g10/keyedit.c:968
+#: g10/keyedit.c:970
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告：这份签字不会被标记为不可导出。\n"
-#: g10/keyedit.c:976
+#: g10/keyedit.c:978
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告：这份签字不会被标记成不可吊销。\n"
-#: g10/keyedit.c:986
+#: g10/keyedit.c:988
msgid "The signature will be marked as non-exportable.\n"
msgstr "这份签字会被标记成不可导出。\n"
-#: g10/keyedit.c:993
+#: g10/keyedit.c:995
msgid "The signature will be marked as non-revocable.\n"
msgstr "这份签字会被标记成不可吊销。\n"
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1002
msgid "I have not checked this key at all.\n"
msgstr "我根本没有检查过这把密钥。\n"
-#: g10/keyedit.c:1005
+#: g10/keyedit.c:1007
msgid "I have checked this key casually.\n"
msgstr "我随意检查过这把密钥。\n"
-#: g10/keyedit.c:1010
+#: g10/keyedit.c:1012
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地检查过这把密钥。\n"
-#: g10/keyedit.c:1020
+#: g10/keyedit.c:1022
msgid "Really sign? (y/N) "
msgstr "真的要签字吗？(y/N)"
-#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
-#: g10/keyedit.c:4719 g10/sign.c:370
+#: g10/keyedit.c:1067 g10/keyedit.c:4744 g10/keyedit.c:4835 g10/keyedit.c:4899
+#: g10/keyedit.c:4960 g10/sign.c:355
#, c-format
msgid "signing failed: %s\n"
msgstr "签字时失败： %s\n"
-#: g10/keyedit.c:1130
+#: g10/keyedit.c:1132
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1141 g10/keygen.c:3087
+#: g10/keyedit.c:1143 g10/keygen.c:3136
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1149 g10/keygen.c:3090
+#: g10/keyedit.c:1151 g10/keygen.c:3139
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1153 g10/keygen.c:3094
+#: g10/keyedit.c:1155 g10/keygen.c:3143
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
-#: g10/keyedit.c:1177
+#: g10/keyedit.c:1179
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "无法编辑这把密钥： %s\n"
-#: g10/keyedit.c:1183
+#: g10/keyedit.c:1185
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2922,11 +2911,11 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1192 g10/keygen.c:1806
+#: g10/keyedit.c:1194 g10/keygen.c:1855
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符；请再试一次"
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1199
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2934,180 +2923,186 @@ msgstr ""
"您不想要用密码――这大概是个坏主意！\n"
"\n"
-#: g10/keyedit.c:1200
+#: g10/keyedit.c:1202
msgid "Do you really want to do this? (y/N) "
msgstr "您真的想要这么做吗？(y/N)"
-#: g10/keyedit.c:1271
+#: g10/keyedit.c:1273
msgid "moving a key signature to the correct place\n"
msgstr "正在把密钥的签字移动到正确的位置去\n"
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1359
msgid "save and quit"
msgstr "保存并离开"
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1362
msgid "show key fingerprint"
msgstr "显示密钥指纹"
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1363
msgid "list key and user IDs"
msgstr "列出密钥和用户标识"
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1365
msgid "select user ID N"
msgstr "选择用户标识 N"
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1366
msgid "select subkey N"
msgstr "选择子钥 N"
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1367
msgid "check signatures"
msgstr "检查签字"
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1372
msgid "sign selected user IDs [* see below for related commands]"
msgstr "为所选用户标识添加签字[* 参见下面的相关命令]"
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1377
msgid "sign selected user IDs locally"
msgstr "为所选用户标识添加本地签字"
-#: g10/keyedit.c:1375
+#: g10/keyedit.c:1379
msgid "sign selected user IDs with a trust signature"
msgstr "为所选用户标识添加信任签字"
-#: g10/keyedit.c:1377
+#: g10/keyedit.c:1381
msgid "sign selected user IDs with a non-revocable signature"
msgstr "为所选用户标识添加不可吊销签字"
-#: g10/keyedit.c:1381
+#: g10/keyedit.c:1385
msgid "add a user ID"
msgstr "增加一个用户标识"
-#: g10/keyedit.c:1383
+#: g10/keyedit.c:1387
msgid "add a photo ID"
msgstr "增加一个照片标识"
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1389
msgid "delete selected user IDs"
msgstr "删除选定的用户标识"
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1394
msgid "add a subkey"
msgstr "添加一个子钥"
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1398
msgid "add a key to a smartcard"
msgstr "在智能卡上添加一把密钥"
-#: g10/keyedit.c:1396
+#: g10/keyedit.c:1400
msgid "move a key to a smartcard"
msgstr "将一把密钥移动到智能卡上"
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1402
msgid "move a backup key to a smartcard"
msgstr "将备份密钥转移到卡上"
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1406
msgid "delete selected subkeys"
msgstr "删除选定的子钥"
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1408
msgid "add a revocation key"
msgstr "增加一把吊销密钥"
-#: g10/keyedit.c:1406
+#: g10/keyedit.c:1410
msgid "delete signatures from the selected user IDs"
msgstr "删除所选用户标识上的签字"
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1412
msgid "change the expiration date for the key or selected subkeys"
msgstr "变更密钥或所选子钥的使用期限"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1414
msgid "flag the selected user ID as primary"
msgstr "将所选的用户标识设为首选用户标识"
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1416
msgid "toggle between the secret and public key listings"
msgstr "在私钥和公钥清单间切换"
-#: g10/keyedit.c:1415
+#: g10/keyedit.c:1419
msgid "list preferences (expert)"
msgstr "列出首选项(专家模式)"
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1421
msgid "list preferences (verbose)"
msgstr "列出首选项(详细模式)"
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1423
msgid "set preference list for the selected user IDs"
msgstr "设定所选用户标识的首选项"
-#: g10/keyedit.c:1424
-msgid "set preferred keyserver URL for the selected user IDs"
+#: g10/keyedit.c:1428
+#, fuzzy
+msgid "set the preferred keyserver URL for the selected user IDs"
msgstr "设定所选用户标识的首选公钥服务器的 URL"
-#: g10/keyedit.c:1426
+#: g10/keyedit.c:1430
+#, fuzzy
+msgid "set a notation for the selected user IDs"
+msgstr "设定所选用户标识的首选项"
+
+#: g10/keyedit.c:1432
msgid "change the passphrase"
msgstr "更改密码"
-#: g10/keyedit.c:1430
+#: g10/keyedit.c:1436
msgid "change the ownertrust"
msgstr "更改信任度"
-#: g10/keyedit.c:1432
+#: g10/keyedit.c:1438
msgid "revoke signatures on the selected user IDs"
msgstr "吊销所选用户标识上的签字"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1440
msgid "revoke selected user IDs"
msgstr "吊销选定的用户标识"
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1445
msgid "revoke key or selected subkeys"
msgstr "吊销密钥或选定的子钥"
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1446
msgid "enable key"
msgstr "启用密钥"
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1447
msgid "disable key"
msgstr "禁用密钥"
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1448
msgid "show selected photo IDs"
msgstr "显示选定的照片标识"
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1450
msgid "compact unusable user IDs and remove unusable signatures from key"
msgstr ""
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1452
msgid "compact unusable user IDs and remove all signatures from key"
msgstr ""
-#: g10/keyedit.c:1564
+#: g10/keyedit.c:1570
#, c-format
msgid "error reading secret keyblock \"%s\": %s\n"
msgstr "读取私钥区块“%s”时出错：%s\n"
-#: g10/keyedit.c:1582
+#: g10/keyedit.c:1588
msgid "Secret key is available.\n"
msgstr "私钥可用。\n"
-#: g10/keyedit.c:1663
+#: g10/keyedit.c:1669
msgid "Need the secret key to do this.\n"
msgstr "要有私钥才能这么做。\n"
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1677
msgid "Please use the command \"toggle\" first.\n"
msgstr "请先使用“toggle”指令。\n"
-#: g10/keyedit.c:1690
+#: g10/keyedit.c:1696
msgid ""
"* The `sign' command may be prefixed with an `l' for local signatures "
"(lsign),\n"
@@ -3118,241 +3113,249 @@ msgstr ""
" 信任签字，或‘nr’前缀(nrsign)以添加不可吊销签字，或者以上三种前缀的任何组\n"
" 合(ltsign、tnrsign 等)。\n"
-#: g10/keyedit.c:1730
+#: g10/keyedit.c:1736
msgid "Key is revoked."
msgstr "密钥已被吊销。"
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
msgid "Really sign all user IDs? (y/N) "
msgstr "真的为所有的用户标识签字吗？(y/N)"
-#: g10/keyedit.c:1756
+#: g10/keyedit.c:1762
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示：选择要添加签字的用户标识\n"
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1771
#, c-format
msgid "Unknown signature type `%s'\n"
msgstr "未知的签字类型‘%s’\n"
-#: g10/keyedit.c:1788
+#: g10/keyedit.c:1794
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
-#: g10/keyedit.c:1810 g10/keyedit.c:1830 g10/keyedit.c:1996
+#: g10/keyedit.c:1816 g10/keyedit.c:1836 g10/keyedit.c:2002
msgid "You must select at least one user ID.\n"
msgstr "您至少得选择一个用户标识。\n"
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1818
msgid "You can't delete the last user ID!\n"
msgstr "您不能删除最后一个用户标识！\n"
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1820
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要删除所有选定的用户标识吗？(y/N)"
-#: g10/keyedit.c:1815
+#: g10/keyedit.c:1821
msgid "Really remove this user ID? (y/N) "
msgstr "真的要删除这个用户标识吗？(y/N)"
-#: g10/keyedit.c:1865
+#: g10/keyedit.c:1871
msgid "Really move the primary key? (y/N) "
msgstr "真的要删除主钥吗？(y/N)"
-#: g10/keyedit.c:1877
+#: g10/keyedit.c:1883
msgid "You must select exactly one key.\n"
msgstr "您必须指定一把密钥。\n"
-#: g10/keyedit.c:1905
+#: g10/keyedit.c:1911
msgid "Command expects a filename argument\n"
msgstr "命令需要一个文件名作为参数\n"
-#: g10/keyedit.c:1919
+#: g10/keyedit.c:1925
#, c-format
msgid "Can't open `%s': %s\n"
msgstr "无法打开‘%s’：%s\n"
-#: g10/keyedit.c:1936
+#: g10/keyedit.c:1942
#, c-format
msgid "Error reading backup key from `%s': %s\n"
msgstr "从‘%s’读取备份密钥时出错：%s\n"
-#: g10/keyedit.c:1960
+#: g10/keyedit.c:1966
msgid "You must select at least one key.\n"
msgstr "您必须选择至少一把密钥。\n"
-#: g10/keyedit.c:1963
+#: g10/keyedit.c:1969
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "您真的想要删除选定的密钥吗？(y/N)"
-#: g10/keyedit.c:1964
+#: g10/keyedit.c:1970
msgid "Do you really want to delete this key? (y/N) "
msgstr "您真的要删除这把密钥吗？(y/N)"
-#: g10/keyedit.c:1999
+#: g10/keyedit.c:2005
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
-#: g10/keyedit.c:2000
+#: g10/keyedit.c:2006
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要吊销这个用户标识吗？(y/N)"
-#: g10/keyedit.c:2018
+#: g10/keyedit.c:2024
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "您真的要吊销整把密钥吗？(y/N)"
-#: g10/keyedit.c:2029
+#: g10/keyedit.c:2035
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "您真的要吊销选定的子钥吗？(y/N)"
-#: g10/keyedit.c:2031
+#: g10/keyedit.c:2037
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "您真的要吊销这把子钥吗？(y/N)"
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2087
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
-#: g10/keyedit.c:2123
+#: g10/keyedit.c:2129
msgid "Set preference list to:\n"
msgstr "设为首选项列表为：\n"
-#: g10/keyedit.c:2129
+#: g10/keyedit.c:2135
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2137
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗？(y/N)"
-#: g10/keyedit.c:2189
+#: g10/keyedit.c:2205
msgid "Save changes? (y/N) "
msgstr "要保存变动吗？(y/N)"
-#: g10/keyedit.c:2192
+#: g10/keyedit.c:2208
msgid "Quit without saving? (y/N) "
msgstr "要不保存而离开吗？(y/N)"
-#: g10/keyedit.c:2202
+#: g10/keyedit.c:2218
#, c-format
msgid "update failed: %s\n"
msgstr "更新失败：%s\n"
-#: g10/keyedit.c:2209
+#: g10/keyedit.c:2225
#, c-format
msgid "update secret failed: %s\n"
msgstr "更新私钥失败：%s\n"
-#: g10/keyedit.c:2216
+#: g10/keyedit.c:2232
msgid "Key not changed so no update needed.\n"
msgstr "密钥没有变动所以不需要更新。\n"
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2333
msgid "Digest: "
msgstr "散列："
-#: g10/keyedit.c:2341
+#: g10/keyedit.c:2385
msgid "Features: "
msgstr "特点："
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2396
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
-#: g10/keyedit.c:2367 g10/keylist.c:308
+#: g10/keyedit.c:2411 g10/keylist.c:308
msgid "Preferred keyserver: "
msgstr "首选公钥服务器："
-#: g10/keyedit.c:2579
+#: g10/keyedit.c:2419 g10/keyedit.c:2420
+#, fuzzy
+msgid "Notations: "
+msgstr ""
+"@\n"
+"选项：\n"
+" "
+
+#: g10/keyedit.c:2630
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2689
#, c-format
msgid "This key was revoked on %s by %s key %s\n"
msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
-#: g10/keyedit.c:2659
+#: g10/keyedit.c:2710
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "这把密钥可被 %s 密钥 %s 吊销"
-#: g10/keyedit.c:2665
+#: g10/keyedit.c:2716
msgid "(sensitive)"
msgstr " (敏感的)"
-#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
#: g10/keylist.c:194 g10/keyserver.c:525
#, c-format
msgid "created: %s"
msgstr "创建于：%s"
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
#, c-format
msgid "revoked: %s"
msgstr "已吊销：%s"
-#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2737 g10/keylist.c:742 g10/keylist.c:777 g10/keylist.c:871
#, c-format
msgid "expired: %s"
msgstr "已过期：%s"
-#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
-#: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
+#: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866
+#: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877
+#: g10/keylist.c:898 g10/keyserver.c:531 g10/mainproc.c:968
#, c-format
msgid "expires: %s"
msgstr "有效至：%s"
-#: g10/keyedit.c:2690
+#: g10/keyedit.c:2741
#, c-format
msgid "usage: %s"
msgstr "可用于：%s"
-#: g10/keyedit.c:2705
+#: g10/keyedit.c:2756
#, c-format
msgid "trust: %s"
msgstr "信任度：%s"
-#: g10/keyedit.c:2709
+#: g10/keyedit.c:2760
#, c-format
msgid "validity: %s"
msgstr "有效性：%s"
-#: g10/keyedit.c:2716
+#: g10/keyedit.c:2767
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
-#: g10/keyedit.c:2744 g10/keylist.c:200
+#: g10/keyedit.c:2795 g10/keylist.c:200
msgid "card-no: "
msgstr "卡号："
-#: g10/keyedit.c:2768
+#: g10/keyedit.c:2819
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
-#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:535
+#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
-#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:539
+#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "已过期"
-#: g10/keyedit.c:2899
+#: g10/keyedit.c:2950
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:2960
+#: g10/keyedit.c:3011
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
@@ -3361,55 +3364,55 @@ msgstr ""
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
-#: g10/keyedit.c:2965 g10/keyedit.c:3295
+#: g10/keyedit.c:3016 g10/keyedit.c:3346
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗？(y/N)"
-#: g10/keyedit.c:2971
+#: g10/keyedit.c:3022
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
-#: g10/keyedit.c:3111
+#: g10/keyedit.c:3162
msgid "Delete this good signature? (y/N/q)"
msgstr "删除这个完好的签字吗？(y/N/q)"
-#: g10/keyedit.c:3121
+#: g10/keyedit.c:3172
msgid "Delete this invalid signature? (y/N/q)"
msgstr "删除这个无效的签字吗？(y/N/q)"
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3176
msgid "Delete this unknown signature? (y/N/q)"
msgstr "删除这个未知的签字吗？(y/N/q)"
-#: g10/keyedit.c:3131
+#: g10/keyedit.c:3182
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要删除这个自身签字吗？(y/N)"
-#: g10/keyedit.c:3145
+#: g10/keyedit.c:3196
#, c-format
msgid "Deleted %d signature.\n"
msgstr "已经删除了 %d 个签字。\n"
-#: g10/keyedit.c:3146
+#: g10/keyedit.c:3197
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "已经删除了 %d 个签字。\n"
-#: g10/keyedit.c:3149
+#: g10/keyedit.c:3200
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
-#: g10/keyedit.c:3182 g10/trustdb.c:1708
+#: g10/keyedit.c:3233 g10/trustdb.c:1703
#, fuzzy
msgid "invalid"
msgstr "无效的 ASCII 封装格式"
-#: g10/keyedit.c:3198
+#: g10/keyedit.c:3249
#, fuzzy, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:3290
+#: g10/keyedit.c:3341
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3418,175 +3421,185 @@ msgstr ""
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
-#: g10/keyedit.c:3301
+#: g10/keyedit.c:3352
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
-#: g10/keyedit.c:3321
+#: g10/keyedit.c:3372
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识："
-#: g10/keyedit.c:3346
+#: g10/keyedit.c:3397
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:3361
+#: g10/keyedit.c:3412
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:3383
+#: g10/keyedit.c:3434
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
-#: g10/keyedit.c:3402
+#: g10/keyedit.c:3453
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
-#: g10/keyedit.c:3408
+#: g10/keyedit.c:3459
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
-#: g10/keyedit.c:3469
+#: g10/keyedit.c:3520
msgid "Please remove selections from the secret keys.\n"
msgstr "请从私钥中删除选择。\n"
-#: g10/keyedit.c:3475
+#: g10/keyedit.c:3526
msgid "Please select at most one subkey.\n"
msgstr "请至多选择一个子钥。\n"
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3530
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
-#: g10/keyedit.c:3482
+#: g10/keyedit.c:3533
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3579
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
-#: g10/keyedit.c:3544
+#: g10/keyedit.c:3595
msgid "No corresponding signature in secret ring\n"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/keyedit.c:3769
+#: g10/keyedit.c:3820
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
-#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
+#: g10/keyedit.c:3859 g10/keyedit.c:3969 g10/keyedit.c:4089 g10/keyedit.c:4229
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签字\n"
-#: g10/keyedit.c:3979
+#: g10/keyedit.c:4030
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL："
-#: g10/keyedit.c:4059
+#: g10/keyedit.c:4110
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗？(y/N)"
-#: g10/keyedit.c:4060
+#: g10/keyedit.c:4111
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗？(y/N)"
-#: g10/keyedit.c:4122
+#: g10/keyedit.c:4173
+#, fuzzy
+msgid "Enter the notation: "
+msgstr "签字标记："
+
+#: g10/keyedit.c:4299
+#, fuzzy
+msgid "Proceed? (y/N) "
+msgstr "是否覆盖？(y/N)"
+
+#: g10/keyedit.c:4363
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4180
+#: g10/keyedit.c:4421
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4207
+#: g10/keyedit.c:4448
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
-#: g10/keyedit.c:4342
+#: g10/keyedit.c:4583
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识：“%s”\n"
-#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
+#: g10/keyedit.c:4586 g10/keyedit.c:4650 g10/keyedit.c:4693
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签字\n"
-#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
+#: g10/keyedit.c:4588 g10/keyedit.c:4652 g10/keyedit.c:4695
msgid " (non-exportable)"
msgstr " (不可导出)"
-#: g10/keyedit.c:4351
+#: g10/keyedit.c:4592
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签字已在 %s 过期。\n"
-#: g10/keyedit.c:4355
+#: g10/keyedit.c:4596
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗？(y/N)"
-#: g10/keyedit.c:4359
+#: g10/keyedit.c:4600
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
-#: g10/keyedit.c:4386
+#: g10/keyedit.c:4627
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4653
msgid " (non-revocable)"
msgstr " (不可吊销)"
-#: g10/keyedit.c:4419
+#: g10/keyedit.c:4660
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4682
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签字：\n"
-#: g10/keyedit.c:4461
+#: g10/keyedit.c:4702
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗？(y/N)"
-#: g10/keyedit.c:4491
+#: g10/keyedit.c:4732
msgid "no secret key\n"
msgstr "没有私钥\n"
-#: g10/keyedit.c:4561
+#: g10/keyedit.c:4802
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:4578
+#: g10/keyedit.c:4819
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
-#: g10/keyedit.c:4642
+#: g10/keyedit.c:4883
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
-#: g10/keyedit.c:4704
+#: g10/keyedit.c:4945
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
-#: g10/keyedit.c:4799
+#: g10/keyedit.c:5040
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -3613,147 +3626,147 @@ msgstr "太多首选压缩算法\n"
msgid "invalid item `%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
-#: g10/keygen.c:815
+#: g10/keygen.c:864
msgid "writing direct signature\n"
msgstr "正在写入直接签字\n"
-#: g10/keygen.c:854
+#: g10/keygen.c:903
msgid "writing self signature\n"
msgstr "正在写入自身签字\n"
-#: g10/keygen.c:905
+#: g10/keygen.c:954
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签字\n"
-#: g10/keygen.c:966 g10/keygen.c:1046 g10/keygen.c:1134 g10/keygen.c:2651
+#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效：改用 %u 位\n"
-#: g10/keygen.c:971 g10/keygen.c:1051 g10/keygen.c:1139 g10/keygen.c:2657
+#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
-#: g10/keygen.c:1232
+#: g10/keygen.c:1281
msgid "Sign"
msgstr "签字"
-#: g10/keygen.c:1235
+#: g10/keygen.c:1284
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1238
+#: g10/keygen.c:1287
msgid "Encrypt"
msgstr "加密"
-#: g10/keygen.c:1241
+#: g10/keygen.c:1290
msgid "Authenticate"
msgstr "认证"
-#: g10/keygen.c:1249
+#: g10/keygen.c:1298
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1268
+#: g10/keygen.c:1317
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 密钥可能的操作："
-#: g10/keygen.c:1272
+#: g10/keygen.c:1321
msgid "Current allowed actions: "
msgstr "目前允许的操作："
-#: g10/keygen.c:1277
+#: g10/keygen.c:1326
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 选择是否用于签字\n"
-#: g10/keygen.c:1280
+#: g10/keygen.c:1329
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 选择是否用于加密\n"
-#: g10/keygen.c:1283
+#: g10/keygen.c:1332
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 选择是否用于认证\n"
-#: g10/keygen.c:1286
+#: g10/keygen.c:1335
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
-#: g10/keygen.c:1342
+#: g10/keygen.c:1391
msgid "Please select what kind of key you want:\n"
msgstr "请选择您要使用的密钥种类：\n"
-#: g10/keygen.c:1344
+#: g10/keygen.c:1393
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1345
+#: g10/keygen.c:1394
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (仅用于签字)\n"
-#: g10/keygen.c:1347
+#: g10/keygen.c:1396
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
-#: g10/keygen.c:1349
+#: g10/keygen.c:1398
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (仅用于加密)\n"
-#: g10/keygen.c:1350
+#: g10/keygen.c:1399
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (仅用于签字)\n"
-#: g10/keygen.c:1352
+#: g10/keygen.c:1401
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
-#: g10/keygen.c:1354
+#: g10/keygen.c:1403
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
-#: g10/keygen.c:1423 g10/keygen.c:2528
+#: g10/keygen.c:1472 g10/keygen.c:2577
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA 密钥对会有 %u 位。\n"
-#: g10/keygen.c:1433
+#: g10/keygen.c:1482
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
-#: g10/keygen.c:1440
+#: g10/keygen.c:1489
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
-#: g10/keygen.c:1454
+#: g10/keygen.c:1503
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
-#: g10/keygen.c:1460
+#: g10/keygen.c:1509
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "您所要求的密钥尺寸是 %u 位\n"
-#: g10/keygen.c:1465 g10/keygen.c:1470
+#: g10/keygen.c:1514 g10/keygen.c:1519
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
-#: g10/keygen.c:1519
+#: g10/keygen.c:1568
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -3769,7 +3782,7 @@ msgstr ""
" <n>m = 密钥在 n 月后过期\n"
" <n>y = 密钥在 n 年后过期\n"
-#: g10/keygen.c:1530
+#: g10/keygen.c:1579
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -3785,38 +3798,38 @@ msgstr ""
" <n>m = 签字在 n 月后过期\n"
" <n>y = 签字在 n 年后过期\n"
-#: g10/keygen.c:1553
+#: g10/keygen.c:1602
msgid "Key is valid for? (0) "
msgstr "密钥的有效期限是？(0) "
-#: g10/keygen.c:1558
+#: g10/keygen.c:1607
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "签字的有效期限是多久？(0) "
-#: g10/keygen.c:1576
+#: g10/keygen.c:1625
msgid "invalid value\n"
msgstr "无效的数值\n"
-#: g10/keygen.c:1583
+#: g10/keygen.c:1632
msgid "Key does not expire at all\n"
msgstr "密钥永远不会过期\n"
-#: g10/keygen.c:1584
+#: g10/keygen.c:1633
msgid "Signature does not expire at all\n"
msgstr "签字永远不会过期\n"
-#: g10/keygen.c:1589
+#: g10/keygen.c:1638
#, c-format
msgid "Key expires at %s\n"
msgstr "密钥于 %s 过期\n"
-#: g10/keygen.c:1590
+#: g10/keygen.c:1639
#, c-format
msgid "Signature expires at %s\n"
msgstr "签字于 %s 过期\n"
-#: g10/keygen.c:1596
+#: g10/keygen.c:1645
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -3824,11 +3837,11 @@ msgstr ""
"您的系统无法显示 2038 年以后的日期。\n"
"不过，它可以正确处理 2106 年之前的年份。\n"
-#: g10/keygen.c:1601
+#: g10/keygen.c:1650
msgid "Is this correct? (y/N) "
msgstr "以上正确吗？(y/n)"
-#: g10/keygen.c:1624
+#: g10/keygen.c:1673
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3844,44 +3857,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <[email protected]>”\n"
"\n"
-#: g10/keygen.c:1637
+#: g10/keygen.c:1686
msgid "Real name: "
msgstr "真实姓名："
-#: g10/keygen.c:1645
+#: g10/keygen.c:1694
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:1647
+#: g10/keygen.c:1696
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:1649
+#: g10/keygen.c:1698
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:1657
+#: g10/keygen.c:1706
msgid "Email address: "
msgstr "电子邮件地址："
-#: g10/keygen.c:1663
+#: g10/keygen.c:1712
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:1671
+#: g10/keygen.c:1720
msgid "Comment: "
msgstr "注释："
-#: g10/keygen.c:1677
+#: g10/keygen.c:1726
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:1700
+#: g10/keygen.c:1749
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:1706
+#: g10/keygen.c:1755
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3892,7 +3905,7 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:1711
+#: g10/keygen.c:1760
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@ -3907,23 +3920,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1727
+#: g10/keygen.c:1776
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1737
+#: g10/keygen.c:1786
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
-#: g10/keygen.c:1738
+#: g10/keygen.c:1787
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
-#: g10/keygen.c:1757
+#: g10/keygen.c:1806
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:1797
+#: g10/keygen.c:1846
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3931,12 +3944,12 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:1807 g10/passphrase.c:810
+#: g10/keygen.c:1856 g10/passphrase.c:810
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1813
+#: g10/keygen.c:1862
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"
@@ -3948,7 +3961,7 @@ msgstr ""
"再次执行这个程序，并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:1835
+#: g10/keygen.c:1884
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"
@@ -3958,50 +3971,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:2597
+#: g10/keygen.c:2646
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:2796 g10/keygen.c:2940
+#: g10/keygen.c:2845 g10/keygen.c:2989
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:2798 g10/keygen.c:2943
+#: g10/keygen.c:2847 g10/keygen.c:2992
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:2801 g10/keygen.c:2946
+#: g10/keygen.c:2850 g10/keygen.c:2995
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:2929
+#: g10/keygen.c:2978
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环：%s\n"
-#: g10/keygen.c:2935
+#: g10/keygen.c:2984
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环：%s\n"
-#: g10/keygen.c:2953
+#: g10/keygen.c:3002
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
-#: g10/keygen.c:2960
+#: g10/keygen.c:3009
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
-#: g10/keygen.c:2983
+#: g10/keygen.c:3032
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签字。\n"
-#: g10/keygen.c:2994
+#: g10/keygen.c:3043
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"
@@ -4009,42 +4022,42 @@ msgstr ""
"请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3006 g10/keygen.c:3135 g10/keygen.c:3250
+#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败：%s\n"
-#: g10/keygen.c:3058 g10/keygen.c:3186 g10/sign.c:291
+#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3060 g10/keygen.c:3188 g10/sign.c:293
+#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3069 g10/keygen.c:3199
+#: g10/keygen.c:3118 g10/keygen.c:3248
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3108 g10/keygen.c:3232
+#: g10/keygen.c:3157 g10/keygen.c:3281
msgid "Really create? (y/N) "
msgstr "真的要建立吗？(y/N)"
-#: g10/keygen.c:3391
+#: g10/keygen.c:3440
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败：%s\n"
-#: g10/keygen.c:3438
+#: g10/keygen.c:3487
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
-#: g10/keygen.c:3464
+#: g10/keygen.c:3513
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -4065,50 +4078,42 @@ msgstr "签字策略："
msgid "Critical preferred keyserver: "
msgstr "关键首选公钥服务器："
-#: g10/keylist.c:355 g10/keylist.c:399
-msgid "WARNING: invalid notation data found\n"
-msgstr "警告：找到无效的标记数据\n"
-
-#: g10/keylist.c:373
+#: g10/keylist.c:359
msgid "Critical signature notation: "
msgstr "关键签字标记："
-#: g10/keylist.c:375
+#: g10/keylist.c:361
msgid "Signature notation: "
msgstr "签字标记："
-#: g10/keylist.c:386
-msgid "not human readable"
-msgstr "不是人类能读懂的"
-
-#: g10/keylist.c:487
+#: g10/keylist.c:471
msgid "Keyring"
msgstr "钥匙环"
-#: g10/keylist.c:1521
+#: g10/keylist.c:1505
msgid "Primary key fingerprint:"
msgstr "主钥指纹："
-#: g10/keylist.c:1523
+#: g10/keylist.c:1507
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:1530
+#: g10/keylist.c:1514
msgid " Primary key fingerprint:"
msgstr " 主钥指纹："
-#: g10/keylist.c:1532
+#: g10/keylist.c:1516
msgid " Subkey fingerprint:"
msgstr " 子钥指纹："
# use tty
-#: g10/keylist.c:1536 g10/keylist.c:1540
+#: g10/keylist.c:1520 g10/keylist.c:1524
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
-#: g10/keylist.c:1607
+#: g10/keylist.c:1591
msgid " Card serial no. ="
msgstr "卡序列号 ="
@@ -4419,118 +4424,118 @@ msgstr "注意：发件者要求您“只阅读不存盘”\n"
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
-#: g10/mainproc.c:815
+#: g10/mainproc.c:817
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1163
#, fuzzy
msgid "no signature found\n"
msgstr "完好的签字，来自于“%s”"
-#: g10/mainproc.c:1419
+#: g10/mainproc.c:1406
msgid "signature verification suppressed\n"
msgstr "签字验证已被抑制\n"
-#: g10/mainproc.c:1519
+#: g10/mainproc.c:1506
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些多重签字\n"
-#: g10/mainproc.c:1530
+#: g10/mainproc.c:1517
#, c-format
msgid "Signature made %s\n"
msgstr "签字建立于 %s\n"
-#: g10/mainproc.c:1531
+#: g10/mainproc.c:1518
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
-#: g10/mainproc.c:1535
+#: g10/mainproc.c:1522
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签字，使用 %s，钥匙号 %s\n"
-#: g10/mainproc.c:1555
+#: g10/mainproc.c:1542
msgid "Key available at: "
msgstr "可用的密钥在："
-#: g10/mainproc.c:1688 g10/mainproc.c:1736
+#: g10/mainproc.c:1675 g10/mainproc.c:1723
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签字，来自于“%s”"
-#: g10/mainproc.c:1690 g10/mainproc.c:1738
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签字，来自于“%s”"
-#: g10/mainproc.c:1692 g10/mainproc.c:1740
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签字，来自于“%s”"
-#: g10/mainproc.c:1744
+#: g10/mainproc.c:1731
msgid "[uncertain]"
msgstr "[不确定]"
-#: g10/mainproc.c:1776
+#: g10/mainproc.c:1763
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
-#: g10/mainproc.c:1873
+#: g10/mainproc.c:1861
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签字已于 %s 过期。\n"
-#: g10/mainproc.c:1878
+#: g10/mainproc.c:1866
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签字在 %s 过期。\n"
-#: g10/mainproc.c:1881
+#: g10/mainproc.c:1869
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s 签字，散列算法 %s\n"
-#: g10/mainproc.c:1882
+#: g10/mainproc.c:1870
msgid "binary"
msgstr "二进制"
-#: g10/mainproc.c:1883
+#: g10/mainproc.c:1871
msgid "textmode"
msgstr "文本模式"
-#: g10/mainproc.c:1883 g10/trustdb.c:536
+#: g10/mainproc.c:1871 g10/trustdb.c:531
msgid "unknown"
msgstr "未知"
-#: g10/mainproc.c:1903
+#: g10/mainproc.c:1891
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签字：%s\n"
-#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
+#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
msgid "not a detached signature\n"
msgstr "不是一份分离的签字\n"
-#: g10/mainproc.c:2015
+#: g10/mainproc.c:2003
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告：检测到多重签字。只检查第一个签字。\n"
-#: g10/mainproc.c:2023
+#: g10/mainproc.c:2011
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签字\n"
-#: g10/mainproc.c:2080
+#: g10/mainproc.c:2068
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签字\n"
-#: g10/mainproc.c:2090
+#: g10/mainproc.c:2078
msgid "invalid root packet detected in proc_tree()\n"
msgstr "在 proc_tree() 中检测到无效的根包\n"
@@ -5335,69 +5340,69 @@ msgstr "密钥 %s：没有子钥吊销签字所需的子钥\n"
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "密钥 %s：没有子钥绑定签字所需的子钥\n"
-#: g10/sign.c:86
+#: g10/sign.c:85
msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
msgstr "无法在 v3 (PGP 2.x样式)的签字内放入标记数据\n"
-#: g10/sign.c:94
+#: g10/sign.c:93
msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
msgstr "无法在 v3 (PGP 2.x样式)的密钥签字内放入标记数据\n"
-#: g10/sign.c:113
+#: g10/sign.c:107
#, c-format
msgid "WARNING: unable to %%-expand notation (too large). Using unexpanded.\n"
msgstr "警告：标记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
-#: g10/sign.c:139
+#: g10/sign.c:124
msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
msgstr "无法在 v3 (PGP 2.x样式)的签字内放入策略 URL\n"
-#: g10/sign.c:147
+#: g10/sign.c:132
msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
msgstr "无法在 v3 (PGP 2.x样式)的密钥签字内放入策略 URL\n"
-#: g10/sign.c:160
+#: g10/sign.c:145
#, c-format
msgid ""
"WARNING: unable to %%-expand policy URL (too large). Using unexpanded.\n"
msgstr "警告：无法 %%-扩展策略 URL (太大了)。现在使用未扩展的。\n"
-#: g10/sign.c:188
+#: g10/sign.c:173
#, c-format
msgid ""
"WARNING: unable to %%-expand preferred keyserver URL (too large). Using "
"unexpanded.\n"
msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
-#: g10/sign.c:365
+#: g10/sign.c:350
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "检查已建立的签字时发生错误： %s\n"
-#: g10/sign.c:374
+#: g10/sign.c:359
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 签字来自：“%s”\n"
-#: g10/sign.c:767
+#: g10/sign.c:752
msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签字\n"
-#: g10/sign.c:836
+#: g10/sign.c:821
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
-#: g10/sign.c:934
+#: g10/sign.c:919
msgid "signing:"
msgstr "正在签字："
-#: g10/sign.c:1046
+#: g10/sign.c:1031
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:1224
+#: g10/sign.c:1209
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
@@ -5652,126 +5657,122 @@ msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
-#: g10/trustdb.c:454
+#: g10/trustdb.c:453
#, c-format
msgid "using %s trust model\n"
msgstr "使用 %s 信任模型\n"
-#: g10/trustdb.c:456
-msgid "PKA verification is allowed to leverage trust to full\n"
-msgstr ""
-
-#: g10/trustdb.c:510
+#: g10/trustdb.c:505
msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
-#: g10/trustdb.c:512
+#: g10/trustdb.c:507
msgid "[ revoked]"
msgstr "[已吊销]"
-#: g10/trustdb.c:514 g10/trustdb.c:519
+#: g10/trustdb.c:509 g10/trustdb.c:514
msgid "[ expired]"
msgstr "[已过期]"
-#: g10/trustdb.c:518
+#: g10/trustdb.c:513
msgid "[ unknown]"
msgstr "[ 未知 ]"
-#: g10/trustdb.c:520
+#: g10/trustdb.c:515
msgid "[ undef ]"
msgstr "[未定义]"
-#: g10/trustdb.c:521
+#: g10/trustdb.c:516
msgid "[marginal]"
msgstr "[ 勉强 ]"
-#: g10/trustdb.c:522
+#: g10/trustdb.c:517
msgid "[ full ]"
msgstr "[ 完全 ]"
-#: g10/trustdb.c:523
+#: g10/trustdb.c:518
msgid "[ultimate]"
msgstr "[ 绝对 ]"
-#: g10/trustdb.c:538
+#: g10/trustdb.c:533
msgid "undefined"
msgstr "未定义"
-#: g10/trustdb.c:539
+#: g10/trustdb.c:534
msgid "never"
msgstr "从不"
-#: g10/trustdb.c:540
+#: g10/trustdb.c:535
msgid "marginal"
msgstr "勉强"
-#: g10/trustdb.c:541
+#: g10/trustdb.c:536
msgid "full"
msgstr "完全"
-#: g10/trustdb.c:542
+#: g10/trustdb.c:537
msgid "ultimate"
msgstr "绝对"
-#: g10/trustdb.c:582
+#: g10/trustdb.c:577
msgid "no need for a trustdb check\n"
msgstr "不需要检查信任度数据库\n"
-#: g10/trustdb.c:588 g10/trustdb.c:2357
+#: g10/trustdb.c:583 g10/trustdb.c:2352
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任度数据库检查将于 %s 进行\n"
-#: g10/trustdb.c:597
+#: g10/trustdb.c:592
#, c-format
msgid "no need for a trustdb check with `%s' trust model\n"
msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
-#: g10/trustdb.c:612
+#: g10/trustdb.c:607
#, c-format
msgid "no need for a trustdb update with `%s' trust model\n"
msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
-#: g10/trustdb.c:844 g10/trustdb.c:1282
+#: g10/trustdb.c:839 g10/trustdb.c:1277
#, c-format
msgid "public key %s not found: %s\n"
msgstr "找不到公钥 %s：%s\n"
-#: g10/trustdb.c:1039
+#: g10/trustdb.c:1034
msgid "please do a --check-trustdb\n"
msgstr "请执行一次 --check-trustdb\n"
-#: g10/trustdb.c:1043
+#: g10/trustdb.c:1038
msgid "checking the trustdb\n"
msgstr "正在检查信任度数据库\n"
-#: g10/trustdb.c:2100
+#: g10/trustdb.c:2095
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
-#: g10/trustdb.c:2165
+#: g10/trustdb.c:2160
msgid "no ultimately trusted keys found\n"
msgstr "没有找到任何绝对信任的密钥\n"
-#: g10/trustdb.c:2179
+#: g10/trustdb.c:2174
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
-#: g10/trustdb.c:2202
+#: g10/trustdb.c:2197
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
-#: g10/trustdb.c:2288
+#: g10/trustdb.c:2283
#, c-format
msgid ""
"depth: %d valid: %3d signed: %3d trust: %d-, %dq, %dn, %dm, %df, %du\n"
msgstr ""
"深度：%d 有效性：%3d 已签字：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2358
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -6086,6 +6087,27 @@ msgstr "安全内存未初始化，不能进行操作\n"
msgid "(you may have used the wrong program for this task)\n"
msgstr "(您可能使用了错误的程序来完成此项任务)\n"
+#~ msgid ""
+#~ "a notation name must have only printable characters or spaces, and end "
+#~ "with an '='\n"
+#~ msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
+
+#~ msgid "a user notation name must contain the '@' character\n"
+#~ msgstr "用户标记名称一定要含有“@”字符\n"
+
+#, fuzzy
+#~ msgid "a notation name must not contain more than one '@' character\n"
+#~ msgstr "用户标记名称一定要含有“@”字符\n"
+
+#~ msgid "a notation value must not use any control characters\n"
+#~ msgstr "标记值一定不能使用任何的控制字符\n"
+
+#~ msgid "WARNING: invalid notation data found\n"
+#~ msgstr "警告：找到无效的标记数据\n"
+
+#~ msgid "not human readable"
+#~ msgstr "不是人类能读懂的"
+
#~ msgid "expired: %s)"
#~ msgstr "已过期：%s)"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 15:36:35 +0000