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.po875
1 files changed, 453 insertions, 422 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 91c8d264a..3ada61956 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.1\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+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"
@@ -35,7 +35,7 @@ msgstr "检测不到熵搜集模块\n"
#: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
#: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
#: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
#: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -71,7 +71,7 @@ msgstr "无法读取‘%s’：%s\n"
msgid "note: random_seed file not updated\n"
msgstr "注意：随机数种子文件未被更新\n"
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
#: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
#: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
#, c-format
@@ -240,7 +240,7 @@ msgstr ""
#: g10/app-openpgp.c:1749
#, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "公钥指数太大(超过 32 位)\n"
#: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -379,7 +379,7 @@ msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
#: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
#: g10/keygen.c:1355
msgid "Your selection? "
msgstr "您的选择？ "
@@ -442,7 +442,7 @@ msgstr "获取公钥的 URL："
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误：URL 太长(至多 %d 个字符)\n"
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
#, c-format
msgid "error reading `%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
@@ -546,7 +546,7 @@ msgstr " (2) 加密密钥\n"
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
#: g10/keygen.c:1394 g10/revoke.c:643
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
@@ -567,7 +567,7 @@ msgstr "私钥部分不可用\n"
msgid "secret key already stored on a card\n"
msgstr "私钥已存储在卡上\n"
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
msgid "quit this menu"
msgstr "离开这个菜单"
@@ -575,7 +575,7 @@ msgstr "离开这个菜单"
msgid "show admin commands"
msgstr "显示管理员命令"
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
msgid "show this help"
msgstr "显示这份在线说明"
@@ -647,11 +647,11 @@ msgstr "不允许使用管理员命令\n"
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
msgid "Please insert the card and hit return or enter 'c' to cancel: "
msgstr "请插入卡并回车，或输入‘c’来取消："
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
#, c-format
msgid ""
"Please remove the current card and insert the one with serial number:\n"
@@ -660,35 +660,35 @@ msgstr ""
"请取出当前的卡，并插入有下列序列号的卡：\n"
" %.*s\n"
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
msgid "Hit return when ready or enter 'c' to cancel: "
msgstr "就绪后请回车，或输入‘c’取消"
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
msgid "Enter New Admin PIN: "
msgstr "输入新的管理员 PIN："
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
msgid "Enter New PIN: "
msgstr "输入新的 PIN："
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
msgid "Enter Admin PIN: "
msgstr "输入管理员 PIN："
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
msgid "Enter PIN: "
msgstr "输入 PIN："
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
msgid "Repeat this PIN: "
msgstr "再次输入此 PIN："
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
msgid "PIN not correctly repeated; try again"
msgstr "PIN 再次输入时与首次输入不符；请再试一次"
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
#: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
#, c-format
msgid "can't open `%s'\n"
@@ -698,13 +698,13 @@ msgstr "无法打开‘%s’\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
#: g10/revoke.c:227
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到：%s\n"
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
#: g10/revoke.c:233 g10/revoke.c:440
#, c-format
msgid "error reading keyblock: %s\n"
@@ -885,27 +885,27 @@ msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "警告：无法删除临时目录‘%s’：%s\n"
-#: g10/export.c:184
+#: g10/export.c:189
msgid "exporting secret keys not allowed\n"
msgstr "不允许导出私钥\n"
-#: g10/export.c:213
+#: g10/export.c:218
#, c-format
msgid "key %s: not protected - skipped\n"
msgstr "密钥 %s：未被保护――已跳过\n"
-#: g10/export.c:221
+#: g10/export.c:226
#, c-format
msgid "key %s: PGP 2.x style key - skipped\n"
msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
# I hope this warning doesn't confuse people.
-#: g10/export.c:398
+#: g10/export.c:404
#, c-format
msgid "WARNING: secret key %s does not have a simple SK checksum\n"
msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
-#: g10/export.c:430
+#: g10/export.c:436
msgid "WARNING: nothing exported\n"
msgstr "警告：没有导出任何东西\n"
@@ -1119,17 +1119,17 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
msgid "Please report bugs to <[email protected]>.\n"
msgstr ""
"请向 <[email protected]> 报告程序缺陷。\n"
"请向 <[email protected]> 反映简体中文翻译的问题。\n"
-#: g10/g10.c:741
+#: g10/g10.c:742
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
-#: g10/g10.c:744
+#: g10/g10.c:745
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -1139,7 +1139,7 @@ msgstr ""
"签字、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/g10.c:755
+#: g10/g10.c:756
msgid ""
"\n"
"Supported algorithms:\n"
@@ -1147,485 +1147,485 @@ msgstr ""
"\n"
"支持的算法：\n"
-#: g10/g10.c:758
+#: g10/g10.c:759
msgid "Pubkey: "
msgstr "公钥："
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
msgid "Cipher: "
msgstr "对称加密："
-#: g10/g10.c:770
+#: g10/g10.c:771
msgid "Hash: "
msgstr "散列："
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
msgid "Compression: "
msgstr "压缩："
-#: g10/g10.c:859
+#: g10/g10.c:860
msgid "usage: gpg [options] "
msgstr "用法：gpg [选项] "
-#: g10/g10.c:1007
+#: g10/g10.c:1008
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/g10.c:1025
+#: g10/g10.c:1026
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/g10.c:1222
+#: g10/g10.c:1223
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告：用户目录‘%s’所有权不安全\n"
-#: g10/g10.c:1225
+#: g10/g10.c:1226
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’所有权不安全\n"
-#: g10/g10.c:1228
+#: g10/g10.c:1229
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告：扩展模块‘%s’所有权不安全\n"
-#: g10/g10.c:1234
+#: g10/g10.c:1235
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告：用户目录‘%s’权限不安全\n"
-#: g10/g10.c:1237
+#: g10/g10.c:1238
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’权限不安全\n"
-#: g10/g10.c:1240
+#: g10/g10.c:1241
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告：扩展模块‘%s’权限不安全\n"
-#: g10/g10.c:1246
+#: g10/g10.c:1247
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/g10.c:1249
+#: g10/g10.c:1250
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/g10.c:1252
+#: g10/g10.c:1253
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/g10.c:1258
+#: g10/g10.c:1259
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/g10.c:1261
+#: g10/g10.c:1262
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/g10.c:1264
+#: g10/g10.c:1265
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/g10.c:1405
+#: g10/g10.c:1406
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/g10.c:1802
+#: g10/g10.c:1803
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/g10.c:1844
+#: g10/g10.c:1845
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意：没有默认配置文件‘%s’\n"
-#: g10/g10.c:1848
+#: g10/g10.c:1849
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’：%s\n"
-#: g10/g10.c:1855
+#: g10/g10.c:1856
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意：一般情况下不会用到 %s！\n"
-#: g10/g10.c:2082
+#: g10/g10.c:2083
#, c-format
msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
#, fuzzy, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/g10.c:2321
+#: g10/g10.c:2322
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/g10.c:2346
+#: g10/g10.c:2347
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
-#: g10/g10.c:2349
+#: g10/g10.c:2350
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/g10.c:2356
+#: g10/g10.c:2357
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
-#: g10/g10.c:2359
+#: g10/g10.c:2360
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/g10.c:2366
+#: g10/g10.c:2367
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
-#: g10/g10.c:2369
+#: g10/g10.c:2370
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/g10.c:2376
+#: g10/g10.c:2377
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
-#: g10/g10.c:2379
+#: g10/g10.c:2380
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/g10.c:2401
+#: g10/g10.c:2402
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
-#: g10/g10.c:2404
+#: g10/g10.c:2405
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/g10.c:2411
+#: g10/g10.c:2412
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/g10.c:2602
+#: g10/g10.c:2607
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
-#: g10/g10.c:2606
+#: g10/g10.c:2611
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
-#: g10/g10.c:2615
+#: g10/g10.c:2620
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/g10.c:2618
+#: g10/g10.c:2623
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
-#: g10/g10.c:2625
+#: g10/g10.c:2630
#, fuzzy, c-format
msgid "NOTE: %s is not available in this version\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: g10/g10.c:2640
+#: g10/g10.c:2645
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
-#: g10/g10.c:2654
+#: g10/g10.c:2659
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
-#: g10/g10.c:2660
+#: g10/g10.c:2665
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
-#: g10/g10.c:2666
+#: g10/g10.c:2671
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
-#: g10/g10.c:2679
+#: g10/g10.c:2684
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/g10.c:2758
+#: g10/g10.c:2763
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/g10.c:2764
+#: g10/g10.c:2769
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/g10.c:2779
+#: g10/g10.c:2784
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签字数一定要大于 0\n"
-#: g10/g10.c:2781
+#: g10/g10.c:2786
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签字数一定要大于 1\n"
-#: g10/g10.c:2783
+#: g10/g10.c:2788
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/g10.c:2785
+#: g10/g10.c:2790
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
-#: g10/g10.c:2787
+#: g10/g10.c:2792
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
-#: g10/g10.c:2790
+#: g10/g10.c:2795
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/g10.c:2794
+#: g10/g10.c:2799
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
-#: g10/g10.c:2801
+#: g10/g10.c:2806
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/g10.c:2810
+#: g10/g10.c:2815
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/g10.c:2814
+#: g10/g10.c:2819
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/g10.c:2818
+#: g10/g10.c:2823
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/g10.c:2851
+#: g10/g10.c:2856
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/g10.c:2898
+#: g10/g10.c:2903
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/g10.c:2903
+#: g10/g10.c:2908
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/g10.c:2908
+#: g10/g10.c:2913
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/g10.c:3004
+#: g10/g10.c:3009
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
-#: g10/g10.c:3015
+#: g10/g10.c:3020
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/g10.c:3026
+#: g10/g10.c:3031
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/g10.c:3033
+#: g10/g10.c:3038
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/g10.c:3035
+#: g10/g10.c:3040
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败：%s\n"
-#: g10/g10.c:3045
+#: g10/g10.c:3050
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/g10.c:3058
+#: g10/g10.c:3063
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/g10.c:3060
+#: g10/g10.c:3065
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/g10.c:3063
+#: g10/g10.c:3068
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/g10.c:3081
+#: g10/g10.c:3086
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/g10.c:3094
+#: g10/g10.c:3099
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/g10.c:3109
+#: g10/g10.c:3114
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/g10.c:3111
+#: g10/g10.c:3116
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/g10.c:3114
+#: g10/g10.c:3119
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/g10.c:3134
+#: g10/g10.c:3139
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/g10.c:3143
+#: g10/g10.c:3148
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/g10.c:3168
+#: g10/g10.c:3173
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/g10.c:3176
+#: g10/g10.c:3181
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/g10.c:3180
+#: g10/g10.c:3185
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/g10.c:3201
+#: g10/g10.c:3206
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/g10.c:3272
+#: g10/g10.c:3277
msgid "-k[v][v][v][c] [user-id] [keyring]"
msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
-#: g10/g10.c:3309
+#: g10/g10.c:3314
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
-#: g10/g10.c:3311
+#: g10/g10.c:3316
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
-#: g10/g10.c:3313
+#: g10/g10.c:3318
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
-#: g10/g10.c:3324
+#: g10/g10.c:3329
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
-#: g10/g10.c:3334
+#: g10/g10.c:3339
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
-#: g10/g10.c:3375
+#: g10/g10.c:3380
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
-#: g10/g10.c:3383
+#: g10/g10.c:3388
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
-#: g10/g10.c:3470
+#: g10/g10.c:3475
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/g10.c:3593
+#: g10/g10.c:3598
msgid "[filename]"
msgstr "[文件名]"
-#: g10/g10.c:3597
+#: g10/g10.c:3602
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/g10.c:3887
+#: g10/g10.c:3892
msgid ""
"a notation name must have only printable characters or spaces, and end with "
"an '='\n"
msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
-#: g10/g10.c:3895
+#: g10/g10.c:3900
msgid "a user notation name must contain the '@' character\n"
msgstr "用户标记名称一定要含有“@”字符\n"
-#: g10/g10.c:3900
+#: g10/g10.c:3905
#, fuzzy
msgid "a notation name must not contain more than one '@' character\n"
msgstr "用户标记名称一定要含有“@”字符\n"
-#: g10/g10.c:3911
+#: g10/g10.c:3916
msgid "a notation value must not use any control characters\n"
msgstr "标记值一定不能使用任何的控制字符\n"
-#: g10/g10.c:3945
+#: g10/g10.c:3950
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/g10.c:3947
+#: g10/g10.c:3952
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签字策略 URL 无效\n"
-#: g10/g10.c:3980
+#: g10/g10.c:3985
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -1633,26 +1633,26 @@ msgstr "给定的首选公钥服务器 URL 无效\n"
msgid "too many entries in pk cache - disabled\n"
msgstr "pk 缓存里项目太多――已禁用\n"
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
msgid "[User ID not found]"
msgstr "[找不到用户标识]"
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的私钥――忽略\n"
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
#, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
@@ -1992,323 +1992,353 @@ msgstr "没有可用的帮助"
msgid "No help available for `%s'"
msgstr "‘%s’没有可用的帮助"
-#: g10/import.c:248
+#: g10/import.c:254
#, c-format
msgid "skipping block of type %d\n"
msgstr "跳过 %d 样式的区块\n"
-#: g10/import.c:257
+#: g10/import.c:263
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已处理 %lu 把密钥\n"
-#: g10/import.c:274
+#: g10/import.c:280
#, c-format
msgid "Total number processed: %lu\n"
msgstr "合计被处理的数量：%lu\n"
-#: g10/import.c:276
+#: g10/import.c:282
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳过的新密钥：%lu\n"
-#: g10/import.c:279
+#: g10/import.c:285
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 遗失用户标识：%lu\n"
-#: g10/import.c:281
+#: g10/import.c:287
#, c-format
msgid " imported: %lu"
msgstr " 已导入：%lu"
-#: g10/import.c:287
+#: g10/import.c:293
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改变：%lu\n"
-#: g10/import.c:289
+#: g10/import.c:295
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新用户标识：%lu\n"
-#: g10/import.c:291
+#: g10/import.c:297
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子钥：%lu\n"
-#: g10/import.c:293
+#: g10/import.c:299
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的签字：%lu\n"
-#: g10/import.c:295
+#: g10/import.c:301
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的密钥吊销：%lu\n"
-#: g10/import.c:297
+#: g10/import.c:303
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 读取的私钥：%lu\n"
-#: g10/import.c:299
+#: g10/import.c:305
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 导入的私钥：%lu\n"
-#: g10/import.c:301
+#: g10/import.c:307
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改变的私钥：%lu\n"
-#: g10/import.c:303
+#: g10/import.c:309
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被导入：%lu\n"
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid " signatures cleaned: %lu\n"
+msgstr "目前已创建的签字：%lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid " user IDs cleaned: %lu\n"
+msgstr " 读取的私钥：%lu\n"
+
+#: g10/import.c:554
#, c-format
msgid "WARNING: key %s contains preferences for unavailable\n"
msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的\n"
-#: g10/import.c:546
+#: g10/import.c:556
msgid "algorithms on these user IDs:\n"
msgstr "算法：\n"
-#: g10/import.c:583
+#: g10/import.c:593
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”：对称加密算法 %s 对应首选项\n"
-#: g10/import.c:595
+#: g10/import.c:605
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”：散列算法 %s 对应首选项\n"
-#: g10/import.c:607
+#: g10/import.c:617
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”：压缩算法 %s 对应首选项\n"
-#: g10/import.c:620
+#: g10/import.c:630
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
-#: g10/import.c:622
+#: g10/import.c:632
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "以避免可能的算法不匹配问题\n"
-#: g10/import.c:646
+#: g10/import.c:656
#, c-format
msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s：没有用户标识\n"
-#: g10/import.c:714
+#: g10/import.c:748
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s：PKS 子钥破损已修复\n"
-#: g10/import.c:729
+#: g10/import.c:763
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n"
-#: g10/import.c:735
+#: g10/import.c:769
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s：没有有效的用户标识\n"
-#: g10/import.c:737
+#: g10/import.c:771
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签字所致\n"
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s：找不到公钥：%s\n"
-#: g10/import.c:753
+#: g10/import.c:787
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s：新密钥――已跳过\n"
-#: g10/import.c:762
+#: g10/import.c:796
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环：%s\n"
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
#, c-format
msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
-#: g10/import.c:792
+#: g10/import.c:826
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s：公钥“%s”已导入\n"
-#: g10/import.c:816
+#: g10/import.c:850
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s：与我们的副本不吻合\n"
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
-#: g10/import.c:873
+#: g10/import.c:915
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s：“%s”一个新的用户标识\n"
-#: g10/import.c:876
+#: g10/import.c:918
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
-#: g10/import.c:879
+#: g10/import.c:921
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s：“%s”1 个新的签字\n"
-#: g10/import.c:882
+#: g10/import.c:924
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s：“%s”%d 个新的签字\n"
-#: g10/import.c:885
+#: g10/import.c:927
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s：“%s”1 个新的子钥\n"
-#: g10/import.c:888
+#: g10/import.c:930
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s：“%s”%d 个新的子钥\n"
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "密钥 %s：“%s”%d 个新的签字\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "密钥 %s：“%s”%d 个新的签字\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
+
+#: g10/import.c:965
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s：“%s”未改变\n"
-#: g10/import.c:1054
+#: g10/import.c:1110
#, c-format
msgid "key %s: secret key with invalid cipher %d - skipped\n"
msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
-#: g10/import.c:1065
+#: g10/import.c:1121
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "没有默认的私钥钥匙环： %s\n"
-#: g10/import.c:1093
+#: g10/import.c:1149
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s：私钥已导入\n"
-#: g10/import.c:1122
+#: g10/import.c:1178
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "密钥 %s：已在私钥钥匙环中\n"
-#: g10/import.c:1132
+#: g10/import.c:1188
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "密钥 %s：找不到私钥：%s\n"
-#: g10/import.c:1162
+#: g10/import.c:1218
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
-#: g10/import.c:1205
+#: g10/import.c:1261
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
-#: g10/import.c:1237
+#: g10/import.c:1293
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s：“%s”吊销证书已被导入\n"
-#: g10/import.c:1302
+#: g10/import.c:1358
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s：签字没有用户标识\n"
-#: g10/import.c:1317
+#: g10/import.c:1373
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
-#: g10/import.c:1319
+#: g10/import.c:1375
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”自身签字无效\n"
-#: g10/import.c:1337
+#: g10/import.c:1393
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s：没有可供绑定的子钥\n"
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s：不支持的公钥算法\n"
-#: g10/import.c:1350
+#: g10/import.c:1406
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s：无效的子钥绑定\n"
-#: g10/import.c:1365
+#: g10/import.c:1421
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s：已删除多重子钥绑定\n"
-#: g10/import.c:1387
+#: g10/import.c:1443
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
-#: g10/import.c:1400
+#: g10/import.c:1456
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s：无效的子钥吊销\n"
-#: g10/import.c:1415
+#: g10/import.c:1471
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s：已删除多重子钥吊销\n"
-#: g10/import.c:1457
+#: g10/import.c:1513
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s：已跳过用户标识“%s”\n"
-#: g10/import.c:1478
+#: g10/import.c:1534
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s：已跳过子钥\n"
@@ -2317,70 +2347,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:1505
+#: g10/import.c:1561
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n"
-#: g10/import.c:1515
+#: g10/import.c:1571
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
-#: g10/import.c:1532
+#: g10/import.c:1588
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
-#: g10/import.c:1546
+#: g10/import.c:1602
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
-#: g10/import.c:1554
+#: g10/import.c:1610
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
-#: g10/import.c:1575
-#, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "密钥 %s：来自密钥 %s 的已过期签字――已跳过\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
-#: g10/import.c:1740
+#: g10/import.c:1772
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
-#: g10/import.c:1754
+#: g10/import.c:1786
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
-#: g10/import.c:1813
+#: g10/import.c:1845
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s：已新增吊销证书“%s”\n"
-#: g10/import.c:1847
+#: g10/import.c:1879
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s：已新增直接密钥签字\n"
-#: g10/import.c:2236
+#: g10/import.c:2268
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "注意：密钥的序列号与卡的不符\n"
-#: g10/import.c:2244
+#: g10/import.c:2276
msgid "NOTE: primary key is online and stored on card\n"
msgstr "注意：主钥在线，存储在卡上\n"
-#: g10/import.c:2246
+#: g10/import.c:2278
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "注意：子钥在线，存储在卡上\n"
@@ -2404,51 +2429,51 @@ msgstr "建立‘%s’时发生错误：%s\n"
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立钥匙环缓存失败： %s\n"
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
msgid "[revocation]"
msgstr "[吊销]"
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
msgid "[self-signature]"
msgstr "[自身签字]"
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
msgid "1 bad signature\n"
msgstr "1 个损坏的签字\n"
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
#, c-format
msgid "%d bad signatures\n"
msgstr "%d 个损坏的签字\n"
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
msgid "1 signature not checked due to a missing key\n"
msgstr "有 1 份签字因为遗失密钥而未被检查\n"
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
msgid "1 signature not checked due to an error\n"
msgstr "有 1 份签字因为某个错误而未被检查\n"
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "有 %d 份签字因为某些错误而未被检查\n"
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
msgid "1 user ID without valid self-signature detected\n"
msgstr "检测到 1 个没有有效自身签字的用户标识\n"
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
#, c-format
msgid "%d user IDs without valid self-signatures detected\n"
msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
msgid ""
"Please decide how far you trust this user to correctly verify other users' "
"keys\n"
@@ -2459,17 +2484,17 @@ msgstr ""
"查\n"
"指纹等)？\n"
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
#, c-format
msgid " %d = I trust marginally\n"
msgstr " %d = 我勉强相信\n"
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
#, c-format
msgid " %d = I trust fully\n"
msgstr " %d = 我完全相信\n"
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
msgid ""
"Please enter the depth of this trust signature.\n"
"A depth greater than 1 allows the key you are signing to make\n"
@@ -2478,46 +2503,46 @@ msgstr ""
"请输入这份信任签字的深度。\n"
"深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
msgid "Please enter a domain to restrict this signature, or enter for none.\n"
msgstr "请输入这份签字的限制域，如果没有请按回车。\n"
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
#, c-format
msgid "User ID \"%s\" is revoked."
msgstr "用户标识“%s”已被吊销。"
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "您仍然想要为它签字吗？(y/N)"
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
#: g10/keyedit.c:1735
msgid " Unable to sign.\n"
msgstr " 无法添加签字。\n"
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
#, c-format
msgid "User ID \"%s\" is expired."
msgstr "用户标识“%s”已过期。"
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
#, c-format
msgid "User ID \"%s\" is not self-signed."
msgstr "警告：用户标识“%s”不含自身签字。"
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
#, fuzzy, c-format
msgid "User ID \"%s\" is signable. "
msgstr "警告：用户标识“%s”不含自身签字。"
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
#, fuzzy
msgid "Sign it? (y/N) "
msgstr "真的要签字吗？(y/N)"
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
#, c-format
msgid ""
"The self-signature on \"%s\"\n"
@@ -2526,75 +2551,75 @@ msgstr ""
"“%s”的自身签字是 PGP 2.x 样\n"
"式的签字。\n"
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)"
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"has expired.\n"
msgstr "您目前为“%s”的签字已经过期了。\n"
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)"
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
#, c-format
msgid ""
"Your current signature on \"%s\"\n"
"is a local signature.\n"
msgstr "您目前为“%s”的签字是一份本地签字。\n"
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
msgid "Do you want to promote it to a full exportable signature? (y/N) "
msgstr "您是否想要把它升级成可以完全导出的签字？(y/N)"
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
#, c-format
msgid "\"%s\" was already locally signed by key %s\n"
msgstr "“%s”已由密钥 %s 在本地签字\n"
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
#, c-format
msgid "\"%s\" was already signed by key %s\n"
msgstr "“%s”已由密钥 %s 签字\n"
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
msgid "Do you want to sign it again anyway? (y/N) "
msgstr "您仍然想要为它再次签字吗？(y/N)"
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
#, c-format
msgid "Nothing to sign with key %s\n"
msgstr "没有东西可以让密钥 %s 签字\n"
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
msgid "This key has expired!"
msgstr "这把密钥已经过期！"
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
#, c-format
msgid "This key is due to expire on %s.\n"
msgstr "这把密钥将在 %s 过期。\n"
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
msgid "Do you want your signature to expire at the same time? (Y/n) "
msgstr "您想要让您的签字也同时过期吗？ (Y/n) "
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
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:885
+#: g10/keyedit.c:884
msgid "This would make the key unusable in PGP 2.x.\n"
msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
msgid ""
"How carefully have you verified the key you are about to sign actually "
"belongs\n"
@@ -2603,31 +2628,31 @@ msgstr ""
"您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n"
"如果您不知道这个问题的答案，请输入“0”。\n"
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
#, c-format
msgid " (0) I will not answer.%s\n"
msgstr " (0) 我不作答。 %s\n"
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
#, c-format
msgid " (1) I have not checked at all.%s\n"
msgstr " (1) 我根本没有检查过。 %s\n"
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
#, c-format
msgid " (2) I have done casual checking.%s\n"
msgstr " (2) 我随意检查过。 %s\n"
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
#, c-format
msgid " (3) I have done very careful checking.%s\n"
msgstr " (3) 我非常小心地检查过。 %s\n"
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
msgid "Your selection? (enter `?' for more information): "
msgstr "您的选择？(输入‘?’以获得更多的信息)："
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
#, c-format
msgid ""
"Are you sure that you want to sign this key with your\n"
@@ -2636,74 +2661,74 @@ msgstr ""
"您真的确定要签字这把密钥，使用您的密钥\n"
"“%s”(%s)\n"
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
msgid "This will be a self-signature.\n"
msgstr "这将是一个自身签字。\n"
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
msgid "WARNING: the signature will not be marked as non-exportable.\n"
msgstr "警告：这份签字不会被标记为不可导出。\n"
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
msgid "WARNING: the signature will not be marked as non-revocable.\n"
msgstr "警告：这份签字不会被标记成不可吊销。\n"
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
msgid "The signature will be marked as non-exportable.\n"
msgstr "这份签字会被标记成不可导出。\n"
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
msgid "The signature will be marked as non-revocable.\n"
msgstr "这份签字会被标记成不可吊销。\n"
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
msgid "I have not checked this key at all.\n"
msgstr "我根本没有检查过这把密钥。\n"
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
msgid "I have checked this key casually.\n"
msgstr "我随意检查过这把密钥。\n"
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
msgid "I have checked this key very carefully.\n"
msgstr "我非常小心地检查过这把密钥。\n"
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
msgid "Really sign? (y/N) "
msgstr "真的要签字吗？(y/N)"
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
#, c-format
msgid "signing failed: %s\n"
msgstr "签字时失败： %s\n"
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
#, c-format
msgid "Can't edit this key: %s\n"
msgstr "无法编辑这把密钥： %s\n"
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
msgid ""
"Enter the new passphrase for this secret key.\n"
"\n"
@@ -2711,11 +2736,11 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符；请再试一次"
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"\n"
@@ -2723,154 +2748,159 @@ msgstr ""
"您不想要用密码――这大概是个坏主意！\n"
"\n"
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
msgid "Do you really want to do this? (y/N) "
msgstr "您真的想要这么做吗？(y/N)"
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
msgid "moving a key signature to the correct place\n"
msgstr "正在把密钥的签字移动到正确的位置去\n"
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
msgid "save and quit"
msgstr "保存并离开"
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
msgid "show key fingerprint"
msgstr "显示密钥指纹"
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
msgid "list key and user IDs"
msgstr "列出密钥和用户标识"
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
msgid "select user ID N"
msgstr "选择用户标识 N"
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
msgid "select subkey N"
msgstr "选择子钥 N"
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
msgid "check signatures"
msgstr "检查签字"
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
msgid "sign selected user IDs [* see below for related commands]"
msgstr "为所选用户标识添加签字[* 参见下面的相关命令]"
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
msgid "sign selected user IDs locally"
msgstr "为所选用户标识添加本地签字"
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
msgid "sign selected user IDs with a trust signature"
msgstr "为所选用户标识添加信任签字"
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
msgid "sign selected user IDs with a non-revocable signature"
msgstr "为所选用户标识添加不可吊销签字"
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
msgid "add a user ID"
msgstr "增加一个用户标识"
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
msgid "add a photo ID"
msgstr "增加一个照片标识"
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
msgid "delete selected user IDs"
msgstr "删除选定的用户标识"
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
msgid "add a subkey"
msgstr "添加一个子钥"
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
msgid "add a key to a smartcard"
msgstr "在智能卡上添加一把密钥"
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
msgid "move a key to a smartcard"
msgstr "将一把密钥移动到智能卡上"
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
msgid "move a backup key to a smartcard"
msgstr "将备份密钥转移到卡上"
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
msgid "delete selected subkeys"
msgstr "删除选定的子钥"
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
msgid "add a revocation key"
msgstr "增加一把吊销密钥"
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
msgid "delete signatures from the selected user IDs"
msgstr "删除所选用户标识上的签字"
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
msgid "change the expiration date for the key or selected subkeys"
msgstr "变更密钥或所选子钥的使用期限"
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
msgid "flag the selected user ID as primary"
msgstr "将所选的用户标识设为首选用户标识"
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
msgid "toggle between the secret and public key listings"
msgstr "在私钥和公钥清单间切换"
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
msgid "list preferences (expert)"
msgstr "列出首选项(专家模式)"
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
msgid "list preferences (verbose)"
msgstr "列出首选项(详细模式)"
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
msgid "set preference list for the selected user IDs"
msgstr "设定所选用户标识的首选项"
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
msgid "set preferred keyserver URL for the selected user IDs"
msgstr "设定所选用户标识的首选公钥服务器的 URL"
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
msgid "change the passphrase"
msgstr "更改密码"
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
msgid "change the ownertrust"
msgstr "更改信任度"
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
msgid "revoke signatures on the selected user IDs"
msgstr "吊销所选用户标识上的签字"
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
msgid "revoke selected user IDs"
msgstr "吊销选定的用户标识"
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
msgid "revoke key or selected subkeys"
msgstr "吊销密钥或选定的子钥"
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
msgid "enable key"
msgstr "启用密钥"
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
msgid "disable key"
msgstr "禁用密钥"
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
msgid "show selected photo IDs"
msgstr "显示选定的照片标识"
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "不可用的私钥"
+
#: g10/keyedit.c:1557
#, c-format
msgid "error reading secret keyblock \"%s\": %s\n"
@@ -2907,100 +2937,100 @@ msgstr "密钥已被吊销。"
msgid "Really sign all user IDs? (y/N) "
msgstr "真的为所有的用户标识签字吗？(y/N)"
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
#, c-format
msgid "Unknown signature type `%s'\n"
msgstr "未知的签字类型‘%s’\n"
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
msgid "You must select at least one user ID.\n"
msgstr "您至少得选择一个用户标识。\n"
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
msgid "You can't delete the last user ID!\n"
msgstr "您不能删除最后一个用户标识！\n"
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要删除所有选定的用户标识吗？(y/N)"
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
msgid "Really remove this user ID? (y/N) "
msgstr "真的要删除这个用户标识吗？(y/N)"
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
msgid "Really move the primary key? (y/N) "
msgstr "真的要删除主钥吗？(y/N)"
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
msgid "You must select exactly one key.\n"
msgstr "您必须指定一把密钥。\n"
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
msgid "Command expects a filename argument\n"
msgstr "命令需要一个文件名作为参数\n"
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
#, c-format
msgid "Can't open `%s': %s\n"
msgstr "无法打开‘%s’：%s\n"
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
#, c-format
msgid "Error reading backup key from `%s': %s\n"
msgstr "从‘%s’读取备份密钥时出错：%s\n"
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
msgid "You must select at least one key.\n"
msgstr "您必须选择至少一把密钥。\n"
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "您真的想要删除选定的密钥吗？(y/N)"
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
msgid "Do you really want to delete this key? (y/N) "
msgstr "您真的要删除这把密钥吗？(y/N)"
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要吊销这个用户标识吗？(y/N)"
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "您真的要吊销整把密钥吗？(y/N)"
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "您真的要吊销选定的子钥吗？(y/N)"
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "您真的要吊销这把子钥吗？(y/N)"
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
msgid ""
"Owner trust may not be set while using an user provided trust database\n"
msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
msgid "Set preference list to:\n"
msgstr "设为首选项列表为：\n"
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗？(y/N)"
@@ -3112,15 +3142,13 @@ msgid ""
"unless you restart the program.\n"
msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
msgid "expired"
msgstr "已过期"
@@ -3140,7 +3168,7 @@ msgstr ""
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗？(y/N)"
@@ -3183,12 +3211,12 @@ msgstr "没有东西被删除。\n"
msgid "User ID \"%s\": already clean.\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
#, fuzzy
msgid "invalid"
msgstr "无效的 ASCII 封装格式"
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
@@ -3197,175 +3225,175 @@ msgstr ""
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识："
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
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:3406
+#: g10/keyedit.c:3380
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:3428
+#: g10/keyedit.c:3402
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
msgid "Please remove selections from the secret keys.\n"
msgstr "请从私钥中删除选择。\n"
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
msgid "Please select at most one subkey.\n"
msgstr "请至多选择一个子钥。\n"
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
msgid "No corresponding signature in secret ring\n"
msgstr "在私钥环里没有相应的签字\n"
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签字\n"
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL："
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗？(y/N)"
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗？(y/N)"
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
#, fuzzy, c-format
msgid "No user ID with hash %s\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识：“%s”\n"
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签字\n"
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
msgid " (non-exportable)"
msgstr " (不可导出)"
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签字已在 %s 过期。\n"
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗？(y/N)"
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
msgid " (non-revocable)"
msgstr " (不可吊销)"
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签字：\n"
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗？(y/N)"
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
msgid "no secret key\n"
msgstr "没有私钥\n"
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
#, c-format
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -3706,7 +3734,7 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
@@ -4402,34 +4430,34 @@ msgstr "警告：潜在不安全的对称加密会话密钥\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
msgid "gpg-agent is not available in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "不支持 gpg-agent 协议版本 %d\n"
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
#, c-format
msgid "can't connect to `%s': %s\n"
msgstr "无法连接至‘%s’：%s\n"
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
msgid "problem with the agent - disabling agent use\n"
msgstr "代理程序有问题――正在停用代理程序\n"
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
#, c-format
msgid " (main key ID %s)"
msgstr " (主钥匙号 %s)"
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for user:\n"
@@ -4440,44 +4468,44 @@ msgstr ""
"“%.*s”\n"
"%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
msgid "Repeat passphrase\n"
msgstr "请再输入一次密码\n"
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
msgid "Enter passphrase\n"
msgstr "请输入密码\n"
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
msgid "cancelled by user\n"
msgstr "用户取消\n"
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
msgid "can't query passphrase in batch mode\n"
msgstr "在批处理模式中无法查询密码\n"
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
msgid "Enter passphrase: "
msgstr "请输入密码："
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
msgid "Repeat passphrase: "
msgstr "请再输入一次密码："
@@ -5420,7 +5448,7 @@ msgstr "绝对"
msgid "no need for a trustdb check\n"
msgstr "不需要检查信任度数据库\n"
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任度数据库检查将于 %s 进行\n"
@@ -5448,33 +5476,33 @@ msgstr "请执行一次 --check-trustdb\n"
msgid "checking the trustdb\n"
msgstr "正在检查信任度数据库\n"
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
msgid "no ultimately trusted keys found\n"
msgstr "没有找到任何绝对信任的密钥\n"
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
#, 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:2375
+#: g10/trustdb.c:2340
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -5784,6 +5812,9 @@ msgstr "安全内存未初始化，不能进行操作\n"
msgid "(you may have used the wrong program for this task)\n"
msgstr "(您可能使用了错误的程序来完成此项任务)\n"
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "密钥 %s：来自密钥 %s 的已过期签字――已跳过\n"
+
#, fuzzy
#~ msgid "Unable to clean `%s'\n"
#~ msgstr "无法执行程序‘%s’：%s\n"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 05:50:43 +0000