aboutsummaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--po/zh_CN.po1020
1 files changed, 520 insertions, 500 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2f87d58e8..44930474f 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-04-03 11:40+0200\n"
+"POT-Creation-Date: 2006-06-25 13:35+0200\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"
@@ -44,11 +44,11 @@ msgid "waiting for lock on `%s'...\n"
msgstr "正在将私钥写至`%s'\n"
#: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747
-#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:997 g10/gpg.c:3365 g10/import.c:195 g10/keygen.c:2323
+#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474
+#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385
#: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342
-#: g10/plaintext.c:482 g10/sign.c:779 g10/sign.c:941 g10/sign.c:1054
-#: g10/sign.c:1204 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:481 g10/sign.c:830 g10/sign.c:1005 g10/sign.c:1118
+#: g10/sign.c:1268 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:2802
-#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
-#: g10/openfile.c:357 g10/sign.c:797 g10/sign.c:1070 g10/tdbio.c:536
+#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864
+#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263
+#: g10/openfile.c:357 g10/sign.c:848 g10/sign.c:1134 g10/tdbio.c:536
#, c-format
msgid "can't create `%s': %s\n"
msgstr "无法建立‘%s’：%s\n"
@@ -305,75 +305,75 @@ msgstr ""
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
-#: g10/armor.c:318
+#: g10/armor.c:320
#, c-format
msgid "armor: %s\n"
msgstr "ASCII 封装：%s\n"
-#: g10/armor.c:357
+#: g10/armor.c:359
msgid "invalid armor header: "
msgstr "无效的 ASCII 封装头："
-#: g10/armor.c:368
+#: g10/armor.c:370
msgid "armor header: "
msgstr "ASCII 封装头："
-#: g10/armor.c:379
+#: g10/armor.c:381
msgid "invalid clearsig header\n"
msgstr "无效的明文签字头\n"
-#: g10/armor.c:431
+#: g10/armor.c:433
msgid "nested clear text signatures\n"
msgstr "多层明文签字\n"
-#: g10/armor.c:566
+#: g10/armor.c:568
msgid "unexpected armor: "
msgstr "与预期不符的 ASCII 封装："
-#: g10/armor.c:578
+#: g10/armor.c:580
msgid "invalid dash escaped line: "
msgstr "以连字符开头的行格式错误："
-#: g10/armor.c:730 g10/armor.c:1337
+#: g10/armor.c:734 g10/armor.c:1343
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "跳过无效的 64 进制字符 %02x\n"
-#: g10/armor.c:773
+#: g10/armor.c:777
msgid "premature eof (no CRC)\n"
msgstr "文件先于预期结束(没有 CRC 部分)\n"
-#: g10/armor.c:807
+#: g10/armor.c:811
msgid "premature eof (in CRC)\n"
msgstr "文件先于预期结束(CRC 部分未结束)\n"
-#: g10/armor.c:815
+#: g10/armor.c:819
msgid "malformed CRC\n"
msgstr "异常的 CRC\n"
-#: g10/armor.c:819 g10/armor.c:1374
+#: g10/armor.c:823 g10/armor.c:1380
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC 错误：%06lx - %06lx\n"
-#: g10/armor.c:839
+#: g10/armor.c:843
msgid "premature eof (in trailer)\n"
msgstr "文件先于预期结束(于结尾处)\n"
-#: g10/armor.c:843
+#: g10/armor.c:847
msgid "error in trailer line\n"
msgstr "结尾行有问题\n"
-#: g10/armor.c:1152
+#: g10/armor.c:1158
msgid "no valid OpenPGP data found.\n"
msgstr "找不到有效的 OpenPGP 数据。\n"
-#: g10/armor.c:1157
+#: g10/armor.c:1163
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
-#: g10/armor.c:1161
+#: g10/armor.c:1167
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
@@ -389,13 +389,13 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
#: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524
-#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456
+#: g10/keygen.c:2569 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:1132 g10/card-util.c:1215
-#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339
-#: g10/keygen.c:1406
+#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381
+#: g10/keygen.c:1448
msgid "Your selection? "
msgstr "您的选择？ "
@@ -562,7 +562,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
#: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946
-#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685
+#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
@@ -703,23 +703,23 @@ msgstr "再次输入此 PIN："
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符；请再试一次"
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3725 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 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:853
+#: g10/decrypt.c:105 g10/encode.c:839
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700
#: g10/revoke.c:228
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到：%s\n"
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2330 g10/keyserver.c:1718
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2346 g10/keyserver.c:1714
#: g10/revoke.c:234 g10/revoke.c:478
#, c-format
msgid "error reading keyblock: %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:1224
+#: g10/encode.c:213 g10/sign.c:1288
#, c-format
msgid "error creating passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
@@ -773,54 +773,54 @@ msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
msgid "using cipher %s\n"
msgstr "使用对称加密算法 %s\n"
-#: g10/encode.c:241 g10/encode.c:550
+#: g10/encode.c:241 g10/encode.c:536
#, c-format
msgid "`%s' already compressed\n"
msgstr "‘%s’已被压缩\n"
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:564
+#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:615
#, c-format
msgid "WARNING: `%s' is an empty file\n"
msgstr "警告：‘%s’是一个空文件\n"
-#: g10/encode.c:470
+#: g10/encode.c:456
msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
msgstr "在 --pgp2 模式中，您只能使用 2048 位及以下的 RSA 密钥加密\n"
-#: g10/encode.c:494
+#: g10/encode.c:480
#, c-format
msgid "reading from `%s'\n"
msgstr "正在从‘%s’读取\n"
-#: g10/encode.c:522
+#: g10/encode.c:508
msgid ""
"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
msgstr "您正要用来加密的所有密钥都不能使用 IDEA 算法。\n"
-#: g10/encode.c:532
+#: g10/encode.c:518
#, c-format
msgid ""
"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:642 g10/sign.c:903
+#: g10/encode.c:628 g10/sign.c:967
#, c-format
msgid ""
"WARNING: forcing compression algorithm %s (%d) violates recipient "
"preferences\n"
msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
-#: g10/encode.c:729
+#: g10/encode.c:715
#, c-format
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
+#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "您不该将 %s 用于 %s 模式中\n"
-#: g10/encode.c:826
+#: g10/encode.c:812
#, c-format
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给：“%s”\n"
@@ -848,54 +848,54 @@ msgstr "处理加密包有问题\n"
msgid "no remote program execution supported\n"
msgstr "不支持远程调用\n"
-#: g10/exec.c:173 g10/openfile.c:415
+#: g10/exec.c:176 g10/openfile.c:415
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "无法建立目录‘%s’：%s\n"
-#: g10/exec.c:314
+#: g10/exec.c:317
msgid ""
"external program calls are disabled due to unsafe options file permissions\n"
msgstr "由于配置文件权限不安全，外部程序调用被禁用\n"
-#: g10/exec.c:344
+#: g10/exec.c:347
msgid "this platform requires temporary files when calling external programs\n"
msgstr "在这个操作平台上调用外部程序时需要临时文件\n"
-#: g10/exec.c:422
+#: g10/exec.c:425
#, c-format
msgid "unable to execute program `%s': %s\n"
msgstr "无法执行程序‘%s’：%s\n"
-#: g10/exec.c:425
+#: g10/exec.c:428
#, c-format
msgid "unable to execute shell `%s': %s\n"
msgstr "无法在命令解释环境中执行‘%s’：%s\n"
-#: g10/exec.c:510
+#: g10/exec.c:513
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "调用外部程序时发生系统错误：%s\n"
-#: g10/exec.c:521 g10/exec.c:587
+#: g10/exec.c:524 g10/exec.c:590
msgid "unnatural exit of external program\n"
msgstr "外部程序异常退出\n"
-#: g10/exec.c:536
+#: g10/exec.c:539
msgid "unable to execute external program\n"
msgstr "无法执行外部程序\n"
-#: g10/exec.c:552
+#: g10/exec.c:555
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "无法读取外部程序响应：%s\n"
-#: g10/exec.c:598 g10/exec.c:605
+#: g10/exec.c:601 g10/exec.c:608
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
-#: g10/exec.c:610
+#: g10/exec.c:613
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "警告：无法删除临时目录‘%s’：%s\n"
@@ -966,7 +966,7 @@ msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
msgid "WARNING: nothing exported\n"
msgstr "警告：没有导出任何东西\n"
-#: g10/gpg.c:372
+#: g10/gpg.c:375
msgid ""
"@Commands:\n"
" "
@@ -974,127 +974,127 @@ msgstr ""
"@指令：\n"
" "
-#: g10/gpg.c:374
+#: g10/gpg.c:377
msgid "|[file]|make a signature"
msgstr "|[文件名]|生成一份签字"
-#: g10/gpg.c:375
+#: g10/gpg.c:378
msgid "|[file]|make a clear text signature"
msgstr "|[文件名]|生成一份明文签字"
-#: g10/gpg.c:376
+#: g10/gpg.c:379
msgid "make a detached signature"
msgstr "生成一份分离的签字"
-#: g10/gpg.c:377
+#: g10/gpg.c:380
msgid "encrypt data"
msgstr "加密数据"
-#: g10/gpg.c:379
+#: g10/gpg.c:382
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:381
+#: g10/gpg.c:384
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/gpg.c:383
+#: g10/gpg.c:386
msgid "verify a signature"
msgstr "验证签字"
-#: g10/gpg.c:385
+#: g10/gpg.c:388
msgid "list keys"
msgstr "列出密钥"
-#: g10/gpg.c:387
+#: g10/gpg.c:390
msgid "list keys and signatures"
msgstr "列出密钥和签字"
-#: g10/gpg.c:388
+#: g10/gpg.c:391
msgid "list and check key signatures"
msgstr "列出并检查密钥签字"
-#: g10/gpg.c:389
+#: g10/gpg.c:392
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:390
+#: g10/gpg.c:393
msgid "list secret keys"
msgstr "列出私钥"
-#: g10/gpg.c:391
+#: g10/gpg.c:394
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
-#: g10/gpg.c:392
+#: g10/gpg.c:395
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: g10/gpg.c:394
+#: g10/gpg.c:397
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
-#: g10/gpg.c:395
+#: g10/gpg.c:398
msgid "sign a key"
msgstr "为某把密钥添加签字"
-#: g10/gpg.c:396
+#: g10/gpg.c:399
msgid "sign a key locally"
msgstr "为某把密钥添加本地签字"
-#: g10/gpg.c:397
+#: g10/gpg.c:400
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签字"
-#: g10/gpg.c:398
+#: g10/gpg.c:401
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/gpg.c:400
+#: g10/gpg.c:403
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:401
+#: g10/gpg.c:404
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:402
+#: g10/gpg.c:405
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/gpg.c:404
+#: g10/gpg.c:407
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/gpg.c:406
+#: g10/gpg.c:409
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
-#: g10/gpg.c:410
+#: g10/gpg.c:413
msgid "import/merge keys"
msgstr "导入/合并密钥"
-#: g10/gpg.c:413
+#: g10/gpg.c:416
msgid "print the card status"
msgstr "打印卡状态"
-#: g10/gpg.c:414
+#: g10/gpg.c:417
msgid "change data on a card"
msgstr "更改卡上的数据"
-#: g10/gpg.c:415
+#: g10/gpg.c:418
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
-#: g10/gpg.c:423
+#: g10/gpg.c:426
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/gpg.c:430
+#: g10/gpg.c:433
msgid "|algo [files]|print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:437 g10/gpgv.c:71
msgid ""
"@\n"
"Options:\n"
@@ -1104,51 +1104,51 @@ msgstr ""
"选项：\n"
" "
-#: g10/gpg.c:436
+#: g10/gpg.c:439
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:438
+#: g10/gpg.c:441
msgid "|NAME|encrypt for NAME"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:449
+#: g10/gpg.c:452
msgid "use this user-id to sign or decrypt"
msgstr "使用这个用户标识来签字或解密"
-#: g10/gpg.c:450
+#: g10/gpg.c:453
msgid "|N|set compress level N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:455
+#: g10/gpg.c:458
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:469
+#: g10/gpg.c:472
msgid "use as output file"
msgstr "指定输出文件"
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:474 g10/gpgv.c:73
msgid "verbose"
msgstr "详细模式"
-#: g10/gpg.c:482
+#: g10/gpg.c:485
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/gpg.c:483
+#: g10/gpg.c:486
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/gpg.c:524
+#: g10/gpg.c:527
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/gpg.c:525
+#: g10/gpg.c:528
msgid "generate PGP 2.x compatible messages"
msgstr "生成与 PGP 2.x 兼容的报文"
-#: g10/gpg.c:553
+#: g10/gpg.c:556
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:556
+#: g10/gpg.c:559
msgid ""
"@\n"
"Examples:\n"
@@ -1176,17 +1176,17 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/gpg.c:751 g10/gpgv.c:98
+#: g10/gpg.c:757 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"请向 <[email protected]> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: g10/gpg.c:768
+#: g10/gpg.c:774
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
-#: g10/gpg.c:771
+#: g10/gpg.c:777
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1196,7 +1196,7 @@ msgstr ""
"签字、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:782
+#: g10/gpg.c:788
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1204,566 +1204,566 @@ msgstr ""
"\n"
"支持的算法：\n"
-#: g10/gpg.c:785
+#: g10/gpg.c:791
msgid "Pubkey: "
msgstr "公钥："
-#: g10/gpg.c:791 g10/keyedit.c:2310
+#: g10/gpg.c:797 g10/keyedit.c:2310
msgid "Cipher: "
msgstr "对称加密："
-#: g10/gpg.c:797
+#: g10/gpg.c:803
msgid "Hash: "
msgstr "散列："
-#: g10/gpg.c:803 g10/keyedit.c:2356
+#: g10/gpg.c:809 g10/keyedit.c:2356
msgid "Compression: "
msgstr "压缩："
-#: g10/gpg.c:886
+#: g10/gpg.c:892
msgid "usage: gpg [options] "
msgstr "用法：gpg [选项] "
-#: g10/gpg.c:1034
+#: g10/gpg.c:1040
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1052
+#: g10/gpg.c:1058
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1249
+#: g10/gpg.c:1255
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告：用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1252
+#: g10/gpg.c:1258
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1255
+#: g10/gpg.c:1261
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告：扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1261
+#: g10/gpg.c:1267
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告：用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1264
+#: g10/gpg.c:1270
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1267
+#: g10/gpg.c:1273
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告：扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1273
+#: g10/gpg.c:1279
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1276
+#: g10/gpg.c:1282
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1279
+#: g10/gpg.c:1285
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1285
+#: g10/gpg.c:1291
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1288
+#: g10/gpg.c:1294
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1291
+#: g10/gpg.c:1297
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1432
+#: g10/gpg.c:1438
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1525
+#: g10/gpg.c:1531
msgid "display photo IDs during key listings"
msgstr ""
-#: g10/gpg.c:1527
+#: g10/gpg.c:1533
msgid "show policy URLs during signature listings"
msgstr ""
-#: g10/gpg.c:1529
+#: g10/gpg.c:1535
#, fuzzy
msgid "show all notations during signature listings"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/gpg.c:1531
+#: g10/gpg.c:1537
msgid "show IETF standard notations during signature listings"
msgstr ""
-#: g10/gpg.c:1535
+#: g10/gpg.c:1541
msgid "show user-supplied notations during signature listings"
msgstr ""
-#: g10/gpg.c:1537
+#: g10/gpg.c:1543
#, fuzzy
msgid "show preferred keyserver URLs during signature listings"
msgstr "给定的首选公钥服务器 URL 无效\n"
-#: g10/gpg.c:1539
+#: g10/gpg.c:1545
msgid "show user ID validity during key listings"
msgstr ""
-#: g10/gpg.c:1541
+#: g10/gpg.c:1547
msgid "show revoked and expired user IDs in key listings"
msgstr ""
-#: g10/gpg.c:1543
+#: g10/gpg.c:1549
msgid "show revoked and expired subkeys in key listings"
msgstr ""
-#: g10/gpg.c:1545
+#: g10/gpg.c:1551
#, fuzzy
msgid "show the keyring name in key listings"
msgstr "在私钥和公钥清单间切换"
-#: g10/gpg.c:1547
+#: g10/gpg.c:1553
#, fuzzy
msgid "show expiration dates during signature listings"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/gpg.c:1852
+#: g10/gpg.c:1920
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1894
+#: g10/gpg.c:1962
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意：没有默认配置文件‘%s’\n"
-#: g10/gpg.c:1898
+#: g10/gpg.c:1966
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’：%s\n"
-#: g10/gpg.c:1905
+#: g10/gpg.c:1973
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: g10/gpg.c:2120 g10/gpg.c:2721 g10/gpg.c:2740
+#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意：一般情况下不会用到 %s！\n"
-#: g10/gpg.c:2133
+#: g10/gpg.c:2201
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
-#: g10/gpg.c:2287 g10/gpg.c:2299
+#: g10/gpg.c:2364 g10/gpg.c:2376
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2375
+#: g10/gpg.c:2452
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2399 g10/keyedit.c:4049
+#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2411
+#: g10/gpg.c:2488
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
-#: g10/gpg.c:2414
+#: g10/gpg.c:2491
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2421
+#: g10/gpg.c:2498
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
-#: g10/gpg.c:2424
+#: g10/gpg.c:2501
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2431
+#: g10/gpg.c:2508
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
-#: g10/gpg.c:2434
+#: g10/gpg.c:2511
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2441
+#: g10/gpg.c:2518
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
-#: g10/gpg.c:2444
+#: g10/gpg.c:2521
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2452
+#: g10/gpg.c:2529
msgid "display photo IDs during signature verification"
msgstr ""
-#: g10/gpg.c:2454
+#: g10/gpg.c:2531
msgid "show policy URLs during signature verification"
msgstr ""
-#: g10/gpg.c:2456
+#: g10/gpg.c:2533
#, fuzzy
msgid "show all notations during signature verification"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2458
+#: g10/gpg.c:2535
msgid "show IETF standard notations during signature verification"
msgstr ""
-#: g10/gpg.c:2462
+#: g10/gpg.c:2539
msgid "show user-supplied notations during signature verification"
msgstr ""
-#: g10/gpg.c:2464
+#: g10/gpg.c:2541
#, fuzzy
msgid "show preferred keyserver URLs during signature verification"
msgstr "给定的首选公钥服务器 URL 无效\n"
-#: g10/gpg.c:2466
+#: g10/gpg.c:2543
#, fuzzy
msgid "show user ID validity during signature verification"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2468
+#: g10/gpg.c:2545
msgid "show revoked and expired user IDs in signature verification"
msgstr ""
-#: g10/gpg.c:2470
+#: g10/gpg.c:2547
msgid "validate signatures with PKA data"
msgstr ""
-#: g10/gpg.c:2472
+#: g10/gpg.c:2549
msgid "elevate the trust of signatures with valid PKA data"
msgstr ""
-#: g10/gpg.c:2479
+#: g10/gpg.c:2556
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
-#: g10/gpg.c:2482
+#: g10/gpg.c:2559
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2489
+#: g10/gpg.c:2566
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2639
+#: g10/gpg.c:2729
#, fuzzy, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s：%d：无效的校验选项\n"
-#: g10/gpg.c:2642
+#: g10/gpg.c:2732
msgid "invalid auto-key-locate list\n"
msgstr ""
-#: g10/gpg.c:2710
+#: g10/gpg.c:2803
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
-#: g10/gpg.c:2714
+#: g10/gpg.c:2807
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
-#: g10/gpg.c:2723
+#: g10/gpg.c:2816
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:2726
+#: g10/gpg.c:2819
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
-#: g10/gpg.c:2733
+#: g10/gpg.c:2826
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: g10/gpg.c:2748
+#: g10/gpg.c:2841
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
-#: g10/gpg.c:2762
+#: g10/gpg.c:2855
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
-#: g10/gpg.c:2768
+#: g10/gpg.c:2861
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
-#: g10/gpg.c:2774
+#: g10/gpg.c:2867
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
-#: g10/gpg.c:2787
+#: g10/gpg.c:2880
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:2854 g10/gpg.c:2878
+#: g10/gpg.c:2947 g10/gpg.c:2971
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:2860 g10/gpg.c:2884
+#: g10/gpg.c:2953 g10/gpg.c:2977
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:2866
+#: g10/gpg.c:2959
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:2872
+#: g10/gpg.c:2965
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:2887
+#: g10/gpg.c:2980
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签字数一定要大于 0\n"
-#: g10/gpg.c:2889
+#: g10/gpg.c:2982
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签字数一定要大于 1\n"
-#: g10/gpg.c:2891
+#: g10/gpg.c:2984
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:2893
+#: g10/gpg.c:2986
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
-#: g10/gpg.c:2895
+#: g10/gpg.c:2988
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
-#: g10/gpg.c:2898
+#: g10/gpg.c:2991
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:2902
+#: g10/gpg.c:2995
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
-#: g10/gpg.c:2909
+#: g10/gpg.c:3002
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:2918
+#: g10/gpg.c:3011
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:2922
+#: g10/gpg.c:3015
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:2926
+#: g10/gpg.c:3019
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:2959
+#: g10/gpg.c:3052
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3006
+#: g10/gpg.c:3099
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3011
+#: g10/gpg.c:3104
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3016
+#: g10/gpg.c:3109
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3112
+#: g10/gpg.c:3208
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
-#: g10/gpg.c:3123
+#: g10/gpg.c:3219
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3134
+#: g10/gpg.c:3230
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3141
+#: g10/gpg.c:3237
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3143
+#: g10/gpg.c:3239
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败：%s\n"
-#: g10/gpg.c:3153
+#: g10/gpg.c:3249
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3166
+#: g10/gpg.c:3262
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3168
+#: g10/gpg.c:3264
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3171
+#: g10/gpg.c:3267
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3189
+#: g10/gpg.c:3285
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3202
+#: g10/gpg.c:3298
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3217
+#: g10/gpg.c:3313
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3219
+#: g10/gpg.c:3315
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3222
+#: g10/gpg.c:3318
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3242
+#: g10/gpg.c:3338
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3251
+#: g10/gpg.c:3347
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3276
+#: g10/gpg.c:3372
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3284
+#: g10/gpg.c:3380
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3288
+#: g10/gpg.c:3384
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3309
+#: g10/gpg.c:3405
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3380
+#: g10/gpg.c:3476
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3518
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
-#: g10/gpg.c:3419
+#: g10/gpg.c:3520
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
-#: g10/gpg.c:3421
+#: g10/gpg.c:3522
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
-#: g10/gpg.c:3432
+#: g10/gpg.c:3533
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
-#: g10/gpg.c:3442
+#: g10/gpg.c:3543
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
-#: g10/gpg.c:3493
+#: g10/gpg.c:3594
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
-#: g10/gpg.c:3501
+#: g10/gpg.c:3602
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
-#: g10/gpg.c:3588
+#: g10/gpg.c:3689
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3711
+#: g10/gpg.c:3812
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3715
+#: g10/gpg.c:3816
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4016
+#: g10/gpg.c:4120
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4018
+#: g10/gpg.c:4122
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签字策略 URL 无效\n"
-#: g10/gpg.c:4051
+#: g10/gpg.c:4155
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -1771,32 +1771,32 @@ msgstr "给定的首选公钥服务器 URL 无效\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk 缓存里项目太多――已禁用\n"
-#: g10/getkey.c:188 g10/getkey.c:2889
+#: g10/getkey.c:175
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
-#: g10/getkey.c:935 g10/getkey.c:945 g10/getkey.c:955 g10/getkey.c:971
-#: g10/getkey.c:986
+#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984
+#: g10/getkey.c:999
#, c-format
msgid "automatically retrieved `%s' via %s\n"
msgstr ""
-#: g10/getkey.c:1813
+#: g10/getkey.c:1826
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2367
+#: g10/getkey.c:2380 g10/keyedit.c:3707
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的私钥――忽略\n"
-#: g10/getkey.c:2598
+#: g10/getkey.c:2611
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
-#: g10/getkey.c:2645
+#: g10/getkey.c:2658
#, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
@@ -2287,231 +2287,231 @@ msgstr "以避免可能的算法不匹配问题\n"
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
-#: g10/import.c:719 g10/import.c:1099
+#: g10/import.c:717 g10/import.c:1115
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s：没有用户标识\n"
-#: g10/import.c:748
+#: g10/import.c:746
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s：PKS 子钥破损已修复\n"
-#: g10/import.c:763
+#: g10/import.c:761
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n"
-#: g10/import.c:769
+#: g10/import.c:767
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s：没有有效的用户标识\n"
-#: g10/import.c:771
+#: g10/import.c:769
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签字所致\n"
-#: g10/import.c:781 g10/import.c:1221
+#: g10/import.c:779 g10/import.c:1237
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s：找不到公钥：%s\n"
-#: g10/import.c:787
+#: g10/import.c:785
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s：新密钥――已跳过\n"
-#: g10/import.c:796
+#: g10/import.c:794
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环：%s\n"
-#: g10/import.c:801 g10/openfile.c:267 g10/sign.c:802 g10/sign.c:1075
+#: g10/import.c:799 g10/openfile.c:267 g10/sign.c:853 g10/sign.c:1139
#, c-format
msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1139 g10/import.c:1282
-#: g10/import.c:2344 g10/import.c:2366
+#: g10/import.c:803 g10/import.c:898 g10/import.c:1155 g10/import.c:1298
+#: g10/import.c:2360 g10/import.c:2382
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
-#: g10/import.c:824
+#: g10/import.c:822
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s：公钥“%s”已导入\n"
-#: g10/import.c:848
+#: g10/import.c:846
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s：与我们的副本不吻合\n"
-#: g10/import.c:865 g10/import.c:1239
+#: g10/import.c:863 g10/import.c:1255
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
-#: g10/import.c:873 g10/import.c:1246
+#: g10/import.c:871 g10/import.c:1262
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
-#: g10/import.c:910
+#: g10/import.c:908
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s：“%s”一个新的用户标识\n"
-#: g10/import.c:913
+#: g10/import.c:911
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
-#: g10/import.c:916
+#: g10/import.c:914
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s：“%s”1 个新的签字\n"
-#: g10/import.c:919
+#: g10/import.c:917
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s：“%s”%d 个新的签字\n"
-#: g10/import.c:922
+#: g10/import.c:920
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s：“%s”1 个新的子钥\n"
-#: g10/import.c:925
+#: g10/import.c:923
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s：“%s”%d 个新的子钥\n"
-#: g10/import.c:928
+#: g10/import.c:926
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s：“%s”%d 个新的签字\n"
-#: g10/import.c:931
+#: g10/import.c:929
#, fuzzy, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s：“%s”%d 个新的签字\n"
-#: g10/import.c:934
+#: g10/import.c:932
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
-#: g10/import.c:937
+#: g10/import.c:935
#, fuzzy, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
-#: g10/import.c:960
+#: g10/import.c:958
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s：“%s”未改变\n"
-#: g10/import.c:1105
+#: g10/import.c:1121
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
-#: g10/import.c:1116
+#: g10/import.c:1132
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
-#: g10/import.c:1133 g10/import.c:2359
+#: g10/import.c:1149 g10/import.c:2375
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "没有默认的私钥钥匙环： %s\n"
-#: g10/import.c:1144
+#: g10/import.c:1160
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s：私钥已导入\n"
-#: g10/import.c:1174
+#: g10/import.c:1190
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "密钥 %s：已在私钥钥匙环中\n"
-#: g10/import.c:1184
+#: g10/import.c:1200
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "密钥 %s：找不到私钥：%s\n"
-#: g10/import.c:1214
+#: g10/import.c:1230
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
-#: g10/import.c:1257
+#: g10/import.c:1273
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
-#: g10/import.c:1289
+#: g10/import.c:1305
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s：“%s”吊销证书已被导入\n"
-#: g10/import.c:1355
+#: g10/import.c:1371
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s：签字没有用户标识\n"
-#: g10/import.c:1370
+#: g10/import.c:1386
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
-#: g10/import.c:1372
+#: g10/import.c:1388
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”自身签字无效\n"
-#: g10/import.c:1390
+#: g10/import.c:1406
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s：没有可供绑定的子钥\n"
-#: g10/import.c:1401 g10/import.c:1451
+#: g10/import.c:1417 g10/import.c:1467
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s：不支持的公钥算法\n"
-#: g10/import.c:1403
+#: g10/import.c:1419
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s：无效的子钥绑定\n"
-#: g10/import.c:1418
+#: g10/import.c:1434
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s：已删除多重子钥绑定\n"
-#: g10/import.c:1440
+#: g10/import.c:1456
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
-#: g10/import.c:1453
+#: g10/import.c:1469
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s：无效的子钥吊销\n"
-#: g10/import.c:1468
+#: g10/import.c:1484
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s：已删除多重子钥吊销\n"
-#: g10/import.c:1510
+#: g10/import.c:1526
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s：已跳过用户标识“%s”\n"
-#: g10/import.c:1531
+#: g10/import.c:1547
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s：已跳过子钥\n"
@@ -2520,65 +2520,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:1558
+#: g10/import.c:1574
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n"
-#: g10/import.c:1568
+#: g10/import.c:1584
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
-#: g10/import.c:1585
+#: g10/import.c:1601
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
-#: g10/import.c:1599
+#: g10/import.c:1615
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
-#: g10/import.c:1607
+#: g10/import.c:1623
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
-#: g10/import.c:1707
+#: g10/import.c:1723
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
-#: g10/import.c:1769
+#: g10/import.c:1785
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
-#: g10/import.c:1783
+#: g10/import.c:1799
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
-#: g10/import.c:1842
+#: g10/import.c:1858
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s：已新增吊销证书“%s”\n"
-#: g10/import.c:1876
+#: g10/import.c:1892
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s：已新增直接密钥签字\n"
-#: g10/import.c:2265
+#: g10/import.c:2281
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "注意：密钥的序列号与卡的不符\n"
-#: g10/import.c:2273
+#: g10/import.c:2289
msgid "NOTE: primary key is online and stored on card\n"
msgstr "注意：主钥在线，存储在卡上\n"
-#: g10/import.c:2275
+#: g10/import.c:2291
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "注意：子钥在线，存储在卡上\n"
@@ -2870,8 +2870,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
msgid "Really sign? (y/N) "
msgstr "真的要签字吗？(y/N)"
-#: g10/keyedit.c:1067 g10/keyedit.c:4768 g10/keyedit.c:4859 g10/keyedit.c:4923
-#: g10/keyedit.c:4984 g10/sign.c:362
+#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938
+#: g10/keyedit.c:4999 g10/sign.c:374
#, c-format
msgid "signing failed: %s\n"
msgstr "签字时失败： %s\n"
@@ -2880,19 +2880,19 @@ msgstr "签字时失败： %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1143 g10/keygen.c:3136
+#: g10/keyedit.c:1143 g10/keygen.c:3199
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539
+#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1151 g10/keygen.c:3139
+#: g10/keyedit.c:1151 g10/keygen.c:3202
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1155 g10/keygen.c:3143
+#: g10/keyedit.c:1155 g10/keygen.c:3206
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
@@ -2909,7 +2909,7 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1194 g10/keygen.c:1855
+#: g10/keyedit.c:1194 g10/keygen.c:1897
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符；请再试一次"
@@ -3285,12 +3285,12 @@ msgid "(sensitive)"
msgstr " (敏感的)"
#: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864
-#: g10/keylist.c:194 g10/keyserver.c:526
+#: g10/keylist.c:194 g10/keyserver.c:511
#, c-format
msgid "created: %s"
msgstr "创建于：%s"
-#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962
+#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964
#, c-format
msgid "revoked: %s"
msgstr "已吊销：%s"
@@ -3302,7 +3302,7 @@ msgstr "已过期：%s"
#: 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:532 g10/mainproc.c:968
+#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970
#, c-format
msgid "expires: %s"
msgstr "有效至：%s"
@@ -3336,13 +3336,13 @@ msgid ""
"unless you restart the program.\n"
msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
-#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:536
-#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699
+#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521
+#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:540
-#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701
+#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525
+#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701
msgid "expired"
msgstr "已过期"
@@ -3478,293 +3478,304 @@ msgstr "您不能变更 v3 密钥的使用期限\n"
msgid "No corresponding signature in secret ring\n"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/keyedit.c:3821
+#: g10/keyedit.c:3668
+#, fuzzy, c-format
+msgid "signing subkey %s is already cross-certified\n"
+msgstr "警告：正要签字的子钥 %s 未经交叉验证\n"
+
+#: g10/keyedit.c:3674
+#, c-format
+msgid "subkey %s does not sign and so does not need to be cross-certified\n"
+msgstr ""
+
+#: g10/keyedit.c:3836
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
-#: g10/keyedit.c:3860 g10/keyedit.c:3970 g10/keyedit.c:4090 g10/keyedit.c:4231
+#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签字\n"
-#: g10/keyedit.c:4031
+#: g10/keyedit.c:4046
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL："
-#: g10/keyedit.c:4111
+#: g10/keyedit.c:4126
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗？(y/N)"
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4127
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗？(y/N)"
-#: g10/keyedit.c:4174
+#: g10/keyedit.c:4189
#, fuzzy
msgid "Enter the notation: "
msgstr "签字标记："
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4338
#, fuzzy
msgid "Proceed? (y/N) "
msgstr "是否覆盖？(y/N)"
-#: g10/keyedit.c:4387
+#: g10/keyedit.c:4402
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4445
+#: g10/keyedit.c:4460
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4487
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4622
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识：“%s”\n"
-#: g10/keyedit.c:4610 g10/keyedit.c:4674 g10/keyedit.c:4717
+#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签字\n"
-#: g10/keyedit.c:4612 g10/keyedit.c:4676 g10/keyedit.c:4719
+#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734
msgid " (non-exportable)"
msgstr " (不可导出)"
-#: g10/keyedit.c:4616
+#: g10/keyedit.c:4631
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签字已在 %s 过期。\n"
-#: g10/keyedit.c:4620
+#: g10/keyedit.c:4635
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗？(y/N)"
-#: g10/keyedit.c:4624
+#: g10/keyedit.c:4639
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
-#: g10/keyedit.c:4651
+#: g10/keyedit.c:4666
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
-#: g10/keyedit.c:4677
+#: g10/keyedit.c:4692
msgid " (non-revocable)"
msgstr " (不可吊销)"
-#: g10/keyedit.c:4684
+#: g10/keyedit.c:4699
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
-#: g10/keyedit.c:4706
+#: g10/keyedit.c:4721
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签字：\n"
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4741
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗？(y/N)"
-#: g10/keyedit.c:4756
+#: g10/keyedit.c:4771
msgid "no secret key\n"
msgstr "没有私钥\n"
-#: g10/keyedit.c:4826
+#: g10/keyedit.c:4841
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:4843
+#: g10/keyedit.c:4858
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
-#: g10/keyedit.c:4907
+#: g10/keyedit.c:4922
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
-#: g10/keyedit.c:4969
+#: g10/keyedit.c:4984
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
-#: g10/keyedit.c:5064
+#: g10/keyedit.c:5079
#, 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:259
+#: g10/keygen.c:262
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "首选项‘%s’重复\n"
-#: g10/keygen.c:266
+#: g10/keygen.c:269
msgid "too many cipher preferences\n"
msgstr "太多对称加密算法首选项\n"
-#: g10/keygen.c:268
+#: g10/keygen.c:271
msgid "too many digest preferences\n"
msgstr "太多散列算法首选项\n"
-#: g10/keygen.c:270
+#: g10/keygen.c:273
msgid "too many compression preferences\n"
msgstr "太多首选压缩算法\n"
-#: g10/keygen.c:395
+#: g10/keygen.c:398
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
-#: g10/keygen.c:864
+#: g10/keygen.c:872
msgid "writing direct signature\n"
msgstr "正在写入直接签字\n"
-#: g10/keygen.c:903
+#: g10/keygen.c:911
msgid "writing self signature\n"
msgstr "正在写入自身签字\n"
-#: g10/keygen.c:954
+#: g10/keygen.c:961
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签字\n"
-#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700
+#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225
+#: g10/keygen.c:2762
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效：改用 %u 位\n"
-#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706
+#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
-#: g10/keygen.c:1281
+#: g10/keygen.c:1323
msgid "Sign"
msgstr "签字"
-#: g10/keygen.c:1284
+#: g10/keygen.c:1326
msgid "Certify"
msgstr ""
-#: g10/keygen.c:1287
+#: g10/keygen.c:1329
msgid "Encrypt"
msgstr "加密"
-#: g10/keygen.c:1290
+#: g10/keygen.c:1332
msgid "Authenticate"
msgstr "认证"
-#: g10/keygen.c:1298
+#: g10/keygen.c:1340
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1317
+#: g10/keygen.c:1359
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 密钥可能的操作："
-#: g10/keygen.c:1321
+#: g10/keygen.c:1363
msgid "Current allowed actions: "
msgstr "目前允许的操作："
-#: g10/keygen.c:1326
+#: g10/keygen.c:1368
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 选择是否用于签字\n"
-#: g10/keygen.c:1329
+#: g10/keygen.c:1371
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 选择是否用于加密\n"
-#: g10/keygen.c:1332
+#: g10/keygen.c:1374
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 选择是否用于认证\n"
-#: g10/keygen.c:1335
+#: g10/keygen.c:1377
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
-#: g10/keygen.c:1391
+#: g10/keygen.c:1433
msgid "Please select what kind of key you want:\n"
msgstr "请选择您要使用的密钥种类：\n"
-#: g10/keygen.c:1393
+#: g10/keygen.c:1435
#, c-format
msgid " (%d) DSA and Elgamal (default)\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1394
+#: g10/keygen.c:1436
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (仅用于签字)\n"
-#: g10/keygen.c:1396
+#: g10/keygen.c:1438
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
-#: g10/keygen.c:1398
+#: g10/keygen.c:1440
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (仅用于加密)\n"
-#: g10/keygen.c:1399
+#: g10/keygen.c:1441
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (仅用于签字)\n"
-#: g10/keygen.c:1401
+#: g10/keygen.c:1443
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
-#: g10/keygen.c:1403
+#: g10/keygen.c:1445
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
-#: g10/keygen.c:1472 g10/keygen.c:2577
+#: g10/keygen.c:1514
#, c-format
msgid "DSA keypair will have %u bits.\n"
msgstr "DSA 密钥对会有 %u 位。\n"
-#: g10/keygen.c:1482
+#: g10/keygen.c:1524
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
-#: g10/keygen.c:1489
+#: g10/keygen.c:1531
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
-#: g10/keygen.c:1503
+#: g10/keygen.c:1545
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
-#: g10/keygen.c:1509
+#: g10/keygen.c:1551
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "您所要求的密钥尺寸是 %u 位\n"
-#: g10/keygen.c:1514 g10/keygen.c:1519
+#: g10/keygen.c:1556 g10/keygen.c:1561
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
-#: g10/keygen.c:1568
+#: g10/keygen.c:1610
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -3780,7 +3791,7 @@ msgstr ""
" <n>m = 密钥在 n 月后过期\n"
" <n>y = 密钥在 n 年后过期\n"
-#: g10/keygen.c:1579
+#: g10/keygen.c:1621
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -3796,38 +3807,38 @@ msgstr ""
" <n>m = 签字在 n 月后过期\n"
" <n>y = 签字在 n 年后过期\n"
-#: g10/keygen.c:1602
+#: g10/keygen.c:1644
msgid "Key is valid for? (0) "
msgstr "密钥的有效期限是？(0) "
-#: g10/keygen.c:1607
+#: g10/keygen.c:1649
#, fuzzy, c-format
msgid "Signature is valid for? (%s) "
msgstr "签字的有效期限是多久？(0) "
-#: g10/keygen.c:1625
+#: g10/keygen.c:1667
msgid "invalid value\n"
msgstr "无效的数值\n"
-#: g10/keygen.c:1632
+#: g10/keygen.c:1674
msgid "Key does not expire at all\n"
msgstr "密钥永远不会过期\n"
-#: g10/keygen.c:1633
+#: g10/keygen.c:1675
msgid "Signature does not expire at all\n"
msgstr "签字永远不会过期\n"
-#: g10/keygen.c:1638
+#: g10/keygen.c:1680
#, c-format
msgid "Key expires at %s\n"
msgstr "密钥于 %s 过期\n"
-#: g10/keygen.c:1639
+#: g10/keygen.c:1681
#, c-format
msgid "Signature expires at %s\n"
msgstr "签字于 %s 过期\n"
-#: g10/keygen.c:1645
+#: g10/keygen.c:1687
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -3835,11 +3846,11 @@ msgstr ""
"您的系统无法显示 2038 年以后的日期。\n"
"不过，它可以正确处理 2106 年之前的年份。\n"
-#: g10/keygen.c:1650
+#: g10/keygen.c:1692
msgid "Is this correct? (y/N) "
msgstr "以上正确吗？(y/n)"
-#: g10/keygen.c:1673
+#: g10/keygen.c:1715
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -3855,44 +3866,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <[email protected]>”\n"
"\n"
-#: g10/keygen.c:1686
+#: g10/keygen.c:1728
msgid "Real name: "
msgstr "真实姓名："
-#: g10/keygen.c:1694
+#: g10/keygen.c:1736
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:1696
+#: g10/keygen.c:1738
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:1698
+#: g10/keygen.c:1740
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:1706
+#: g10/keygen.c:1748
msgid "Email address: "
msgstr "电子邮件地址："
-#: g10/keygen.c:1712
+#: g10/keygen.c:1754
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:1720
+#: g10/keygen.c:1762
msgid "Comment: "
msgstr "注释："
-#: g10/keygen.c:1726
+#: g10/keygen.c:1768
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:1749
+#: g10/keygen.c:1791
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:1755
+#: g10/keygen.c:1797
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -3903,7 +3914,7 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:1760
+#: g10/keygen.c:1802
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@ -3918,23 +3929,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:1776
+#: g10/keygen.c:1818
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:1786
+#: g10/keygen.c:1828
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
-#: g10/keygen.c:1787
+#: g10/keygen.c:1829
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
-#: g10/keygen.c:1806
+#: g10/keygen.c:1848
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:1846
+#: g10/keygen.c:1888
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -3942,12 +3953,12 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:1856 g10/passphrase.c:810
+#: g10/keygen.c:1898 g10/passphrase.c:810
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:1862
+#: g10/keygen.c:1904
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"
@@ -3959,7 +3970,7 @@ msgstr ""
"再次执行这个程序，并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:1884
+#: g10/keygen.c:1926
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"
@@ -3969,50 +3980,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:2646
+#: g10/keygen.c:2708
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:2845 g10/keygen.c:2989
+#: g10/keygen.c:2907 g10/keygen.c:3052
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:2847 g10/keygen.c:2992
+#: g10/keygen.c:2909 g10/keygen.c:3055
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:2850 g10/keygen.c:2995
+#: g10/keygen.c:2912 g10/keygen.c:3058
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:2978
+#: g10/keygen.c:3041
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环：%s\n"
-#: g10/keygen.c:2984
+#: g10/keygen.c:3047
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环：%s\n"
-#: g10/keygen.c:3002
+#: g10/keygen.c:3065
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
-#: g10/keygen.c:3009
+#: g10/keygen.c:3072
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
-#: g10/keygen.c:3032
+#: g10/keygen.c:3095
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签字。\n"
-#: g10/keygen.c:3043
+#: g10/keygen.c:3106
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"
@@ -4020,42 +4031,42 @@ msgstr ""
"请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299
+#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败：%s\n"
-#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276
+#: g10/keygen.c:3170 g10/keygen.c:3298 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:3109 g10/keygen.c:3237 g10/sign.c:278
+#: g10/keygen.c:3172 g10/keygen.c:3300 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:3118 g10/keygen.c:3248
+#: g10/keygen.c:3181 g10/keygen.c:3311
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3157 g10/keygen.c:3281
+#: g10/keygen.c:3220 g10/keygen.c:3344
msgid "Really create? (y/N) "
msgstr "真的要建立吗？(y/N)"
-#: g10/keygen.c:3440
+#: g10/keygen.c:3507
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败：%s\n"
-#: g10/keygen.c:3487
+#: g10/keygen.c:3554
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
-#: g10/keygen.c:3513
+#: g10/keygen.c:3580
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -4158,177 +4169,177 @@ msgstr "缓存了 %lu 把密钥(%lu 份签字)\n"
msgid "%s: keyring created\n"
msgstr "%s：钥匙环已建立\n"
-#: g10/keyserver.c:76
+#: g10/keyserver.c:61
msgid "include revoked keys in search results"
msgstr ""
-#: g10/keyserver.c:77
+#: g10/keyserver.c:62
msgid "include subkeys when searching by key ID"
msgstr ""
-#: g10/keyserver.c:79
+#: g10/keyserver.c:64
msgid "use temporary files to pass data to keyserver helpers"
msgstr ""
-#: g10/keyserver.c:81
+#: g10/keyserver.c:66
msgid "do not delete temporary files after using them"
msgstr ""
-#: g10/keyserver.c:85
+#: g10/keyserver.c:70
msgid "automatically retrieve keys when verifying signatures"
msgstr ""
-#: g10/keyserver.c:87
+#: g10/keyserver.c:72
#, fuzzy
msgid "honor the preferred keyserver URL set on the key"
msgstr "输入您首选的公钥服务器的 URL："
-#: g10/keyserver.c:89
+#: g10/keyserver.c:74
msgid "honor the PKA record set on a key when retrieving keys"
msgstr ""
-#: g10/keyserver.c:155
+#: g10/keyserver.c:140
#, c-format
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
-#: g10/keyserver.c:538
+#: g10/keyserver.c:523
msgid "disabled"
msgstr "已禁用"
-#: g10/keyserver.c:739
+#: g10/keyserver.c:724
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
-#: g10/keyserver.c:823 g10/keyserver.c:1425
+#: g10/keyserver.c:808 g10/keyserver.c:1421
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
-#: g10/keyserver.c:921
+#: g10/keyserver.c:906
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
-#: g10/keyserver.c:923
+#: g10/keyserver.c:908
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
-#: g10/keyserver.c:1149
+#: g10/keyserver.c:1145
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
-#: g10/keyserver.c:1153
+#: g10/keyserver.c:1149
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s，从 %s\n"
-#: g10/keyserver.c:1177
+#: g10/keyserver.c:1173
#, fuzzy, c-format
msgid "searching for names from %s server %s\n"
msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1180
+#: g10/keyserver.c:1176
#, fuzzy, c-format
msgid "searching for names from %s\n"
msgstr "搜索“%s”，在 %s 上\n"
-#: g10/keyserver.c:1328
+#: g10/keyserver.c:1324
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
-#: g10/keyserver.c:1332
+#: g10/keyserver.c:1328
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1375
+#: g10/keyserver.c:1371
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1378
+#: g10/keyserver.c:1374
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”，在 %s 上\n"
-#: g10/keyserver.c:1385 g10/keyserver.c:1481
+#: g10/keyserver.c:1381 g10/keyserver.c:1477
msgid "no keyserver action!\n"
msgstr "公钥服务器无动作！\n"
-#: g10/keyserver.c:1433
+#: g10/keyserver.c:1429
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1442
+#: g10/keyserver.c:1438
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1504
+#: g10/keyserver.c:1500 g10/keyserver.c:2028
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1510
+#: g10/keyserver.c:1506
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n"
-#: g10/keyserver.c:1522
+#: g10/keyserver.c:1518
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n"
-#: g10/keyserver.c:1527
+#: g10/keyserver.c:1523
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1531
#, fuzzy, c-format
msgid "%s does not support handler version %d\n"
msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
-#: g10/keyserver.c:1542
+#: g10/keyserver.c:1538
msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n"
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1543
msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n"
-#: g10/keyserver.c:1556
+#: g10/keyserver.c:1552
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误：%s\n"
-#: g10/keyserver.c:1581 g10/keyserver.c:1615
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识：跳过\n"
-#: g10/keyserver.c:1874
+#: g10/keyserver.c:1870
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
-#: g10/keyserver.c:1896
+#: g10/keyserver.c:1892
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1898
+#: g10/keyserver.c:1894
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1963
+#: g10/keyserver.c:1950
#, fuzzy, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
-#: g10/keyserver.c:1969
+#: g10/keyserver.c:1956
#, fuzzy, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
@@ -4426,114 +4437,114 @@ msgstr "原始文件名 =‘%.*s’\n"
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
-#: g10/mainproc.c:1163
+#: g10/mainproc.c:1165
#, fuzzy
msgid "no signature found\n"
msgstr "完好的签字，来自于“%s”"
-#: g10/mainproc.c:1406
+#: g10/mainproc.c:1408
msgid "signature verification suppressed\n"
msgstr "签字验证已被抑制\n"
-#: g10/mainproc.c:1506
+#: g10/mainproc.c:1508
#, fuzzy
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些多重签字\n"
-#: g10/mainproc.c:1517
+#: g10/mainproc.c:1519
#, c-format
msgid "Signature made %s\n"
msgstr "签字建立于 %s\n"
-#: g10/mainproc.c:1518
+#: g10/mainproc.c:1520
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
-#: g10/mainproc.c:1522
+#: g10/mainproc.c:1524
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签字，使用 %s，钥匙号 %s\n"
-#: g10/mainproc.c:1542
+#: g10/mainproc.c:1544
msgid "Key available at: "
msgstr "可用的密钥在："
-#: g10/mainproc.c:1675 g10/mainproc.c:1723
+#: g10/mainproc.c:1677 g10/mainproc.c:1725
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签字，来自于“%s”"
-#: g10/mainproc.c:1677 g10/mainproc.c:1725
+#: g10/mainproc.c:1679 g10/mainproc.c:1727
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签字，来自于“%s”"
-#: g10/mainproc.c:1679 g10/mainproc.c:1727
+#: g10/mainproc.c:1681 g10/mainproc.c:1729
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签字，来自于“%s”"
-#: g10/mainproc.c:1731
+#: g10/mainproc.c:1733
msgid "[uncertain]"
msgstr "[不确定]"
-#: g10/mainproc.c:1763
+#: g10/mainproc.c:1765
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
-#: g10/mainproc.c:1861
+#: g10/mainproc.c:1863
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签字已于 %s 过期。\n"
-#: g10/mainproc.c:1866
+#: g10/mainproc.c:1868
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签字在 %s 过期。\n"
-#: g10/mainproc.c:1869
+#: g10/mainproc.c:1871
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s 签字，散列算法 %s\n"
-#: g10/mainproc.c:1870
+#: g10/mainproc.c:1872
msgid "binary"
msgstr "二进制"
-#: g10/mainproc.c:1871
+#: g10/mainproc.c:1873
msgid "textmode"
msgstr "文本模式"
-#: g10/mainproc.c:1871 g10/trustdb.c:531
+#: g10/mainproc.c:1873 g10/trustdb.c:531
msgid "unknown"
msgstr "未知"
-#: g10/mainproc.c:1891
+#: g10/mainproc.c:1893
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签字：%s\n"
-#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062
+#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064
msgid "not a detached signature\n"
msgstr "不是一份分离的签字\n"
-#: g10/mainproc.c:2003
+#: g10/mainproc.c:2005
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告：检测到多重签字。只检查第一个签字。\n"
-#: g10/mainproc.c:2011
+#: g10/mainproc.c:2013
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签字\n"
-#: g10/mainproc.c:2068
+#: g10/mainproc.c:2070
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签字\n"
-#: g10/mainproc.c:2078
+#: g10/mainproc.c:2080
msgid "invalid root packet detected in proc_tree()\n"
msgstr "在 proc_tree() 中检测到无效的根包\n"
@@ -4675,7 +4686,7 @@ msgstr "无法操作公钥算法 %d\n"
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告：潜在不安全的对称加密会话密钥\n"
-#: g10/parse-packet.c:1147
+#: g10/parse-packet.c:1157
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
@@ -4799,7 +4810,11 @@ msgstr "“%s”不是一个 JPEG 文件\n"
msgid "Is this photo correct (y/N/q)? "
msgstr "这张照片正确吗？(y/N/q)"
-#: g10/photoid.c:369
+#: g10/photoid.c:329
+msgid "no photo viewer set\n"
+msgstr ""
+
+#: g10/photoid.c:383
msgid "unable to display photo ID!\n"
msgstr "无法显示照片标识！\n"
@@ -5065,28 +5080,28 @@ msgstr "没有有效的地址\n"
msgid "data not saved; use option \"--output\" to save it\n"
msgstr "数据未被保存；请用“--output”选项来保存它们\n"
-#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立‘%s’时发生错误：%s\n"
-#: g10/plaintext.c:453
+#: g10/plaintext.c:452
msgid "Detached signature.\n"
msgstr "分离的签字。\n"
-#: g10/plaintext.c:459
+#: g10/plaintext.c:458
msgid "Please enter name of data file: "
msgstr "请输入数据文件的名称： "
-#: g10/plaintext.c:491
+#: g10/plaintext.c:490
msgid "reading stdin ...\n"
msgstr "正在从标准输入读取 ...\n"
-#: g10/plaintext.c:525
+#: g10/plaintext.c:524
msgid "no signed data\n"
msgstr "不含签字的数据\n"
-#: g10/plaintext.c:539
+#: g10/plaintext.c:538
#, c-format
msgid "can't open signed data `%s'\n"
msgstr "无法打开有签字的数据‘%s’\n"
@@ -5382,39 +5397,39 @@ msgid ""
"unexpanded.\n"
msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
-#: g10/sign.c:328
+#: g10/sign.c:339
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr "DSA 要求使用 160 位的散列算法\n"
-#: g10/sign.c:357
+#: g10/sign.c:369
#, c-format
msgid "checking created signature failed: %s\n"
msgstr "检查已建立的签字时发生错误： %s\n"
-#: g10/sign.c:366
+#: g10/sign.c:378
#, c-format
msgid "%s/%s signature from: \"%s\"\n"
msgstr "%s/%s 签字来自：“%s”\n"
-#: g10/sign.c:759
+#: g10/sign.c:810
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:828
+#: g10/sign.c:879
#, c-format
msgid ""
"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
-#: g10/sign.c:928
+#: g10/sign.c:992
msgid "signing:"
msgstr "正在签字："
-#: g10/sign.c:1040
+#: g10/sign.c:1104
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:1218
+#: g10/sign.c:1282
#, c-format
msgid "%s encryption will be used\n"
msgstr "%s 加密将被采用\n"
@@ -6043,6 +6058,7 @@ msgstr "……这是个程序缺陷(%s:%d:%s)\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "您找到一个程序缺陷了……(%s:%d)\n"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
#: util/miscutil.c:330 util/miscutil.c:367
msgid "yes"
msgstr "yes"
@@ -6051,6 +6067,7 @@ msgstr "yes"
msgid "yY"
msgstr "yY"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
#: util/miscutil.c:333 util/miscutil.c:369
msgid "no"
msgstr "no"
@@ -6059,6 +6076,7 @@ msgstr "no"
msgid "nN"
msgstr "nN"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
#: util/miscutil.c:371
msgid "quit"
msgstr "quit"
@@ -6067,10 +6085,12 @@ msgstr "quit"
msgid "qQ"
msgstr "qQ"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
#: util/miscutil.c:407
msgid "okay|okay"
msgstr "okay|ok"
+#. TRANSLATORS: See doc/TRANSLATE about this string.
#: util/miscutil.c:409
msgid "cancel|cancel"
msgstr "cancel|cancel"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 12:32:03 +0000