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.po636
1 files changed, 321 insertions, 315 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 352d1f2b4..6c7a959fe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2008-12-03 09:59+0100\n"
+"POT-Creation-Date: 2008-12-09 11:57+0100\n"
"PO-Revision-Date: 2006-07-02 10:58+0800\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -98,8 +98,8 @@ msgstr "错误的密码"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1073 g10/keygen.c:3226
-#: g10/keygen.c:3259 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3248
+#: g10/keygen.c:3281 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
#: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
#: jnlib/dotlock.c:311
#, c-format
@@ -108,7 +108,7 @@ msgstr "无法建立‘%s’:%s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:733
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1074 g10/import.c:193 g10/keygen.c:2711
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2733
#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:503 g10/sign.c:780 g10/sign.c:975 g10/sign.c:1091
#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:551
@@ -154,7 +154,7 @@ msgid "Please enter the passphrase for the ssh key%0A %c"
msgstr "请输入密码:这是一个秘密的句子 \n"
#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1198
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "更改密码"
@@ -167,7 +167,7 @@ msgid ""
msgstr ""
#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:434
+#: agent/protect-tool.c:1204 tools/symcryptrun.c:434
msgid "does not match - try again"
msgstr ""
@@ -308,7 +308,7 @@ msgid "run in daemon mode (background)"
msgstr ""
#: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:66
+#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:77 tools/symcryptrun.c:164
msgid "verbose"
msgstr "详细模式"
@@ -397,7 +397,7 @@ msgid "|FILE|write environment settings also to FILE"
msgstr ""
#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:173
+#: scd/scdaemon.c:241 sm/gpgsm.c:512 tools/gpg-connect-agent.c:180
#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
#, fuzzy
msgid "Please report bugs to <"
@@ -421,25 +421,25 @@ msgstr ""
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:557 agent/protect-tool.c:1068 kbx/kbxutil.c:430
-#: scd/scdaemon.c:385 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:997
-#: tools/gpg-check-pattern.c:178
+#: agent/gpg-agent.c:557 agent/protect-tool.c:1067 kbx/kbxutil.c:429
+#: scd/scdaemon.c:385 sm/gpgsm.c:878 sm/gpgsm.c:881 tools/symcryptrun.c:996
+#: tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:656 g10/gpg.c:2080 scd/scdaemon.c:466 sm/gpgsm.c:968
+#: agent/gpg-agent.c:656 g10/gpg.c:2086 scd/scdaemon.c:466 sm/gpgsm.c:968
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2084
-#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:930
+#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2090
+#: scd/scdaemon.c:471 sm/gpgsm.c:972 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:669 g10/gpg.c:2091 scd/scdaemon.c:479 sm/gpgsm.c:979
+#: agent/gpg-agent.c:669 g10/gpg.c:2097 scd/scdaemon.c:479 sm/gpgsm.c:979
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
@@ -536,28 +536,28 @@ msgstr ""
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1833 scd/scdaemon.c:1186
+#: agent/gpg-agent.c:1843 scd/scdaemon.c:1200
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "更新私钥失败:%s\n"
-#: agent/gpg-agent.c:1946 scd/scdaemon.c:1253
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1267
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s:已跳过:%s\n"
-#: agent/gpg-agent.c:2074
+#: agent/gpg-agent.c:2084
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:2085 common/simple-pwquery.c:349 common/asshelp.c:326
-#: tools/gpg-connect-agent.c:2094
+#: agent/gpg-agent.c:2095 common/simple-pwquery.c:349 common/asshelp.c:326
+#: tools/gpg-connect-agent.c:2133
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-#: agent/gpg-agent.c:2098 common/simple-pwquery.c:361 common/asshelp.c:338
-#: tools/gpg-connect-agent.c:2105
+#: agent/gpg-agent.c:2108 common/simple-pwquery.c:361 common/asshelp.c:338
+#: tools/gpg-connect-agent.c:2144
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "不支持 gpg-agent 协议版本 %d\n"
@@ -584,40 +584,40 @@ msgid ""
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1190
+#: agent/protect-tool.c:1189
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1193
+#: agent/protect-tool.c:1192
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1195
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1201
+#: agent/protect-tool.c:1200
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1206 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1205 tools/symcryptrun.c:435
#, fuzzy
msgid "Passphrase:"
msgstr "错误的密码"
-#: agent/protect-tool.c:1214 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1213 tools/symcryptrun.c:442
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
-#: agent/protect-tool.c:1217 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1216 tools/symcryptrun.c:446
#, fuzzy
msgid "cancelled\n"
msgstr "已取消"
@@ -877,7 +877,7 @@ msgstr ""
msgid "out of core while allocating %lu bytes"
msgstr ""
-#: common/asshelp.c:244
+#: common/asshelp.c:244 tools/gpg-connect-agent.c:2101
msgid "no running gpg-agent - starting one\n"
msgstr ""
@@ -1132,7 +1132,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
#: g10/card-util.c:75 g10/card-util.c:1485 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2902 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2924 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@ -1141,7 +1141,7 @@ msgstr "在批处理模式中无法完成此操作\n"
msgid "This command is only available for version 2 cards\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
-#: g10/card-util.c:85 scd/app-openpgp.c:1848
+#: g10/card-util.c:85 scd/app-openpgp.c:1849
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\n"
@@ -1428,18 +1428,18 @@ msgstr "无效的指令(尝试“help”)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/decrypt.c:166 g10/gpg.c:3963 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3424 g10/keyserver.c:1727
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3424 g10/keyserver.c:1729
#: g10/revoke.c:226
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到:%s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1741
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
@@ -1860,7 +1860,7 @@ msgid "run in server mode"
msgstr ""
#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:74 tools/symcryptrun.c:157
msgid ""
"@\n"
"Options:\n"
@@ -1986,520 +1986,520 @@ msgstr "压缩:"
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1109 sm/gpgsm.c:675
+#: g10/gpg.c:1115 sm/gpgsm.c:675
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1127
+#: g10/gpg.c:1133
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1324
+#: g10/gpg.c:1330
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1327
+#: g10/gpg.c:1333
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1330
+#: g10/gpg.c:1336
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1336
+#: g10/gpg.c:1342
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1339
+#: g10/gpg.c:1345
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1342
+#: g10/gpg.c:1348
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1348
+#: g10/gpg.c:1354
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1351
+#: g10/gpg.c:1357
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1354
+#: g10/gpg.c:1360
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1360
+#: g10/gpg.c:1366
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1363
+#: g10/gpg.c:1369
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1366
+#: g10/gpg.c:1372
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1545
+#: g10/gpg.c:1551
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1645
+#: g10/gpg.c:1651
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
-#: g10/gpg.c:1647
+#: g10/gpg.c:1653
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
-#: g10/gpg.c:1649
+#: g10/gpg.c:1655
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1651
+#: g10/gpg.c:1657
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1655
+#: g10/gpg.c:1661
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
-#: g10/gpg.c:1657
+#: g10/gpg.c:1663
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
-#: g10/gpg.c:1659
+#: g10/gpg.c:1665
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
-#: g10/gpg.c:1661
+#: g10/gpg.c:1667
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
-#: g10/gpg.c:1663
+#: g10/gpg.c:1669
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:1665
+#: g10/gpg.c:1671
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
-#: g10/gpg.c:1667
+#: g10/gpg.c:1673
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
-#: g10/gpg.c:1828
+#: g10/gpg.c:1834
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1919
+#: g10/gpg.c:1926
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2303 g10/gpg.c:2989 g10/gpg.c:3001
+#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意:一般情况下不会用到 %s!\n"
-#: g10/gpg.c:2484 g10/gpg.c:2496
+#: g10/gpg.c:2490 g10/gpg.c:2502
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
-#: g10/gpg.c:2578
+#: g10/gpg.c:2584
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2601 g10/gpg.c:2796 g10/keyedit.c:4107
+#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4107
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2613
+#: g10/gpg.c:2619
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
-#: g10/gpg.c:2616
+#: g10/gpg.c:2622
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2623
+#: g10/gpg.c:2629
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
-#: g10/gpg.c:2626
+#: g10/gpg.c:2632
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2633
+#: g10/gpg.c:2639
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
-#: g10/gpg.c:2636
+#: g10/gpg.c:2642
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2643
+#: g10/gpg.c:2649
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
-#: g10/gpg.c:2646
+#: g10/gpg.c:2652
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2654
+#: g10/gpg.c:2660
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
-#: g10/gpg.c:2656
+#: g10/gpg.c:2662
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
-#: g10/gpg.c:2658
+#: g10/gpg.c:2664
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
-#: g10/gpg.c:2660
+#: g10/gpg.c:2666
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
-#: g10/gpg.c:2664
+#: g10/gpg.c:2670
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
-#: g10/gpg.c:2666
+#: g10/gpg.c:2672
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
-#: g10/gpg.c:2668
+#: g10/gpg.c:2674
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
-#: g10/gpg.c:2670
+#: g10/gpg.c:2676
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2672
+#: g10/gpg.c:2678
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2674
+#: g10/gpg.c:2680
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
-#: g10/gpg.c:2676
+#: g10/gpg.c:2682
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
-#: g10/gpg.c:2683
+#: g10/gpg.c:2689
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
-#: g10/gpg.c:2686
+#: g10/gpg.c:2692
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2693
+#: g10/gpg.c:2699
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2868
+#: g10/gpg.c:2874
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d:无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2871
+#: g10/gpg.c:2877
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2978 sm/gpgsm.c:1386
+#: g10/gpg.c:2984 sm/gpgsm.c:1386
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
-#: g10/gpg.c:2982
+#: g10/gpg.c:2988
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
-#: g10/gpg.c:2991
+#: g10/gpg.c:2997
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:2994
+#: g10/gpg.c:3000
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
-#: g10/gpg.c:3009
+#: g10/gpg.c:3015
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
-#: g10/gpg.c:3023
+#: g10/gpg.c:3029
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
-#: g10/gpg.c:3029
+#: g10/gpg.c:3035
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时,不能同时签名和加密\n"
-#: g10/gpg.c:3035
+#: g10/gpg.c:3041
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
-#: g10/gpg.c:3048
+#: g10/gpg.c:3054
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:3114 g10/gpg.c:3138 sm/gpgsm.c:1458
+#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1458
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1466 sm/gpgsm.c:1472
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1466 sm/gpgsm.c:1472
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:3126
+#: g10/gpg.c:3132
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:3132
+#: g10/gpg.c:3138
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:3147
+#: g10/gpg.c:3153
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
-#: g10/gpg.c:3149
+#: g10/gpg.c:3155
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
-#: g10/gpg.c:3151
+#: g10/gpg.c:3157
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:3153
+#: g10/gpg.c:3159
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
-#: g10/gpg.c:3155
+#: g10/gpg.c:3161
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
-#: g10/gpg.c:3158
+#: g10/gpg.c:3164
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:3162
+#: g10/gpg.c:3168
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
-#: g10/gpg.c:3169
+#: g10/gpg.c:3175
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:3178
+#: g10/gpg.c:3184
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:3182
+#: g10/gpg.c:3188
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:3186
+#: g10/gpg.c:3192
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:3219
+#: g10/gpg.c:3225
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3266
+#: g10/gpg.c:3272
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3271
+#: g10/gpg.c:3277
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3276
+#: g10/gpg.c:3282
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3359
+#: g10/gpg.c:3365
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/gpg.c:3370
+#: g10/gpg.c:3376
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3391
+#: g10/gpg.c:3397
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3398
+#: g10/gpg.c:3404
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3400
+#: g10/gpg.c:3406
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/gpg.c:3410
+#: g10/gpg.c:3416
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3423
+#: g10/gpg.c:3429
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3425
+#: g10/gpg.c:3431
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3428
+#: g10/gpg.c:3434
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3446
+#: g10/gpg.c:3452
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3459
+#: g10/gpg.c:3465
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3474
+#: g10/gpg.c:3480
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3476
+#: g10/gpg.c:3482
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3479
+#: g10/gpg.c:3485
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3499
+#: g10/gpg.c:3505
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3508
+#: g10/gpg.c:3514
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3533
+#: g10/gpg.c:3539
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3541
+#: g10/gpg.c:3547
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3545
+#: g10/gpg.c:3551
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3566
+#: g10/gpg.c:3572
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3658
+#: g10/gpg.c:3664
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/gpg.c:3660
+#: g10/gpg.c:3666
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/gpg.c:3662
+#: g10/gpg.c:3668
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/gpg.c:3673
+#: g10/gpg.c:3679
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/gpg.c:3683
+#: g10/gpg.c:3689
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/gpg.c:3734
+#: g10/gpg.c:3740
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3742
+#: g10/gpg.c:3748
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3832
+#: g10/gpg.c:3838
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3949
+#: g10/gpg.c:3955
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:3953
+#: g10/gpg.c:3959
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4265
+#: g10/gpg.c:4271
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4267
+#: g10/gpg.c:4273
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
-#: g10/gpg.c:4300
+#: g10/gpg.c:4306
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -3008,29 +3008,29 @@ msgstr "[吊销]"
msgid "[self-signature]"
msgstr "[自身签名]"
-#: g10/keyedit.c:344 g10/keylist.c:392
+#: g10/keyedit.c:344 g10/keylist.c:396
msgid "1 bad signature\n"
msgstr "1 个损坏的签名\n"
-#: g10/keyedit.c:346 g10/keylist.c:394
+#: g10/keyedit.c:346 g10/keylist.c:398
#, c-format
msgid "%d bad signatures\n"
msgstr "%d 个损坏的签名\n"
-#: g10/keyedit.c:348 g10/keylist.c:396
+#: g10/keyedit.c:348 g10/keylist.c:400
msgid "1 signature not checked due to a missing key\n"
msgstr "有 1 份签名因为遗失密钥而未被检查\n"
-#: g10/keyedit.c:350 g10/keylist.c:398
+#: g10/keyedit.c:350 g10/keylist.c:402
#, c-format
msgid "%d signatures not checked due to missing keys\n"
msgstr "有 %d 份签名因为遗失密钥而未被检查\n"
-#: g10/keyedit.c:352 g10/keylist.c:400
+#: g10/keyedit.c:352 g10/keylist.c:404
msgid "1 signature not checked due to an error\n"
msgstr "有 1 份签名因为某个错误而未被检查\n"
-#: g10/keyedit.c:354 g10/keylist.c:402
+#: g10/keyedit.c:354 g10/keylist.c:406
#, c-format
msgid "%d signatures not checked due to errors\n"
msgstr "有 %d 份签名因为某些错误而未被检查\n"
@@ -3277,19 +3277,19 @@ msgstr "签名时失败: %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥,或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3601
+#: g10/keyedit.c:1142 g10/keygen.c:3623
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3588 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3610 g10/revoke.c:538
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3604
+#: g10/keyedit.c:1150 g10/keygen.c:3626
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3608
+#: g10/keyedit.c:1156 g10/keygen.c:3630
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
@@ -3648,7 +3648,7 @@ msgstr "特点:"
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
-#: g10/keyedit.c:2443 g10/keylist.c:310
+#: g10/keyedit.c:2443 g10/keylist.c:314
msgid "Preferred keyserver: "
msgstr "首选公钥服务器:"
@@ -3675,24 +3675,24 @@ msgid "(sensitive)"
msgstr " (敏感的)"
#: g10/keyedit.c:2764 g10/keyedit.c:2820 g10/keyedit.c:2881 g10/keyedit.c:2896
-#: g10/keylist.c:196 g10/keyserver.c:529
+#: g10/keylist.c:200 g10/keyserver.c:529
#, c-format
msgid "created: %s"
msgstr "创建于:%s"
-#: g10/keyedit.c:2767 g10/keylist.c:812 g10/keylist.c:906 g10/mainproc.c:989
+#: g10/keyedit.c:2767 g10/keylist.c:817 g10/keylist.c:911 g10/mainproc.c:989
#, c-format
msgid "revoked: %s"
msgstr "已吊销:%s"
-#: g10/keyedit.c:2769 g10/keylist.c:783 g10/keylist.c:818 g10/keylist.c:912
+#: g10/keyedit.c:2769 g10/keylist.c:788 g10/keylist.c:823 g10/keylist.c:917
#, c-format
msgid "expired: %s"
msgstr "已过期:%s"
#: g10/keyedit.c:2771 g10/keyedit.c:2822 g10/keyedit.c:2883 g10/keyedit.c:2898
-#: g10/keylist.c:198 g10/keylist.c:789 g10/keylist.c:824 g10/keylist.c:918
-#: g10/keylist.c:939 g10/keyserver.c:535 g10/mainproc.c:995
+#: g10/keylist.c:202 g10/keylist.c:794 g10/keylist.c:829 g10/keylist.c:923
+#: g10/keylist.c:944 g10/keyserver.c:535 g10/mainproc.c:995
#, c-format
msgid "expires: %s"
msgstr "有效至:%s"
@@ -3716,7 +3716,7 @@ msgstr "有效性:%s"
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
-#: g10/keyedit.c:2827 g10/keylist.c:202
+#: g10/keyedit.c:2827 g10/keylist.c:206
msgid "card-no: "
msgstr "卡号:"
@@ -4054,12 +4054,12 @@ msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
#: g10/keygen.c:1157 g10/keygen.c:1268 g10/keygen.c:1273 g10/keygen.c:1408
-#: g10/keygen.c:3101
+#: g10/keygen.c:3123
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效:改用 %u 位\n"
-#: g10/keygen.c:1163 g10/keygen.c:1279 g10/keygen.c:1414 g10/keygen.c:3107
+#: g10/keygen.c:1163 g10/keygen.c:1279 g10/keygen.c:1414 g10/keygen.c:3129
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
@@ -4409,50 +4409,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:3041 g10/keygen.c:3068
+#: g10/keygen.c:3063 g10/keygen.c:3090
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:3273 g10/keygen.c:3440
+#: g10/keygen.c:3295 g10/keygen.c:3462
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:3275 g10/keygen.c:3443
+#: g10/keygen.c:3297 g10/keygen.c:3465
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:3278 g10/keygen.c:3446
+#: g10/keygen.c:3300 g10/keygen.c:3468
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:3427
+#: g10/keygen.c:3449
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环:%s\n"
-#: g10/keygen.c:3434
+#: g10/keygen.c:3456
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环:%s\n"
-#: g10/keygen.c:3454
+#: g10/keygen.c:3476
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3462
+#: g10/keygen.c:3484
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3489
+#: g10/keygen.c:3511
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
-#: g10/keygen.c:3500
+#: g10/keygen.c:3522
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"
@@ -4460,42 +4460,42 @@ msgstr ""
"请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3513 g10/keygen.c:3658 g10/keygen.c:3779
+#: g10/keygen.c:3535 g10/keygen.c:3680 g10/keygen.c:3801
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
-#: g10/keygen.c:3568 g10/keygen.c:3709 g10/sign.c:241
+#: g10/keygen.c:3590 g10/keygen.c:3731 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3570 g10/keygen.c:3711 g10/sign.c:243
+#: g10/keygen.c:3592 g10/keygen.c:3733 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3581 g10/keygen.c:3722
+#: g10/keygen.c:3603 g10/keygen.c:3744
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3622 g10/keygen.c:3755
+#: g10/keygen.c:3644 g10/keygen.c:3777
msgid "Really create? (y/N) "
msgstr "真的要建立吗?(y/N)"
-#: g10/keygen.c:3928
+#: g10/keygen.c:3950
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败:%s\n"
-#: g10/keygen.c:3976
+#: g10/keygen.c:3998
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
-#: g10/keygen.c:4002
+#: g10/keygen.c:4024
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意:卡密钥的备份已保存到‘%s’\n"
@@ -4504,54 +4504,54 @@ msgstr "注意:卡密钥的备份已保存到‘%s’\n"
msgid "never "
msgstr "永不过期"
-#: g10/keylist.c:267
+#: g10/keylist.c:271
msgid "Critical signature policy: "
msgstr "关键签名策略:"
-#: g10/keylist.c:269
+#: g10/keylist.c:273
msgid "Signature policy: "
msgstr "签名策略:"
-#: g10/keylist.c:308
+#: g10/keylist.c:312
msgid "Critical preferred keyserver: "
msgstr "关键首选公钥服务器:"
-#: g10/keylist.c:361
+#: g10/keylist.c:365
msgid "Critical signature notation: "
msgstr "关键签名注记:"
-#: g10/keylist.c:363
+#: g10/keylist.c:367
msgid "Signature notation: "
msgstr "签名注记:"
-#: g10/keylist.c:473
+#: g10/keylist.c:477
msgid "Keyring"
msgstr "钥匙环"
-#: g10/keylist.c:1504
+#: g10/keylist.c:1509
msgid "Primary key fingerprint:"
msgstr "主钥指纹:"
-#: g10/keylist.c:1506
+#: g10/keylist.c:1511
msgid " Subkey fingerprint:"
msgstr "子钥指纹:"
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1513
+#: g10/keylist.c:1518
msgid " Primary key fingerprint:"
msgstr " 主钥指纹:"
-#: g10/keylist.c:1515
+#: g10/keylist.c:1520
msgid " Subkey fingerprint:"
msgstr " 子钥指纹:"
# use tty
-#: g10/keylist.c:1519 g10/keylist.c:1523
+#: g10/keylist.c:1524 g10/keylist.c:1528
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
-#: g10/keylist.c:1590
+#: g10/keylist.c:1595
msgid " Card serial no. ="
msgstr "卡序列号 ="
@@ -4635,139 +4635,139 @@ msgstr "警告:公钥服务器选项‘%s’在此平台上没有被使用\n"
msgid "disabled"
msgstr "已禁用"
-#: g10/keyserver.c:742
+#: g10/keyserver.c:744
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择,输入 N 翻页,输入 Q 退出 >"
-#: g10/keyserver.c:826 g10/keyserver.c:1448
+#: g10/keyserver.c:828 g10/keyserver.c:1450
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
-#: g10/keyserver.c:924
+#: g10/keyserver.c:926
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
-#: g10/keyserver.c:926
+#: g10/keyserver.c:928
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
-#: g10/keyserver.c:1167
+#: g10/keyserver.c:1169
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’,从 %s 服务器 %s\n"
-#: g10/keyserver.c:1171
+#: g10/keyserver.c:1173
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s,从 %s\n"
-#: g10/keyserver.c:1195
+#: g10/keyserver.c:1197
#, c-format
msgid "searching for names from %s server %s\n"
msgstr "在 %s 服务器 %s 上搜索名字\n"
-#: g10/keyserver.c:1198
+#: g10/keyserver.c:1200
#, c-format
msgid "searching for names from %s\n"
msgstr "在 %s 上搜索名字\n"
-#: g10/keyserver.c:1351
+#: g10/keyserver.c:1353
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
-#: g10/keyserver.c:1355
+#: g10/keyserver.c:1357
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1398
+#: g10/keyserver.c:1400
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”,在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1401
+#: g10/keyserver.c:1403
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”,在 %s 上\n"
-#: g10/keyserver.c:1408 g10/keyserver.c:1504
+#: g10/keyserver.c:1410 g10/keyserver.c:1506
msgid "no keyserver action!\n"
msgstr "公钥服务器无动作!\n"
-#: g10/keyserver.c:1456
+#: g10/keyserver.c:1458
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告:处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1465
+#: g10/keyserver.c:1467
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1527 g10/keyserver.c:2056
+#: g10/keyserver.c:1529 g10/keyserver.c:2058
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1533
+#: g10/keyserver.c:1535
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n"
-#: g10/keyserver.c:1545
+#: g10/keyserver.c:1547
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n"
-#: g10/keyserver.c:1550
+#: g10/keyserver.c:1552
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
-#: g10/keyserver.c:1558
+#: g10/keyserver.c:1560
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s 不支持对版本 %d 的处理\n"
-#: g10/keyserver.c:1565
+#: g10/keyserver.c:1567
msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n"
-#: g10/keyserver.c:1570
+#: g10/keyserver.c:1572
msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n"
-#: g10/keyserver.c:1579
+#: g10/keyserver.c:1581
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误:%s\n"
-#: g10/keyserver.c:1604 g10/keyserver.c:1638
+#: g10/keyserver.c:1606 g10/keyserver.c:1640
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识:跳过\n"
-#: g10/keyserver.c:1897
+#: g10/keyserver.c:1899
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告:无法更新密钥 %s,通过 %s:%s\n"
-#: g10/keyserver.c:1919
+#: g10/keyserver.c:1921
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1977
+#: g10/keyserver.c:1979
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告:无法获取 URI %s:%s\n"
-#: g10/keyserver.c:1983
+#: g10/keyserver.c:1985
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "不能解析 URI %s\n"
@@ -6145,7 +6145,7 @@ msgstr "绝对"
msgid "no need for a trustdb check\n"
msgstr "不需要检查信任度数据库\n"
-#: g10/trustdb.c:577 g10/trustdb.c:2432
+#: g10/trustdb.c:577 g10/trustdb.c:2456
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任度数据库检查将于 %s 进行\n"
@@ -6173,33 +6173,33 @@ msgstr "请执行一次 --check-trustdb\n"
msgid "checking the trustdb\n"
msgstr "正在检查信任度数据库\n"
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2199
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
-#: g10/trustdb.c:2240
+#: g10/trustdb.c:2264
msgid "no ultimately trusted keys found\n"
msgstr "没有找到任何绝对信任的密钥\n"
-#: g10/trustdb.c:2254
+#: g10/trustdb.c:2278
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
-#: g10/trustdb.c:2277
+#: g10/trustdb.c:2301
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "需要 %d 份勉强信任和 %d 份完全信任,%s 信任模型\n"
-#: g10/trustdb.c:2363
+#: g10/trustdb.c:2387
#, 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:2438
+#: g10/trustdb.c:2462
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录:写入失败:%s\n"
@@ -6388,12 +6388,12 @@ msgid ""
"list, export, import Keybox data\n"
msgstr ""
-#: scd/app-nks.c:325 scd/app-openpgp.c:1456 scd/app-dinsig.c:297
+#: scd/app-nks.c:325 scd/app-openpgp.c:1457 scd/app-dinsig.c:297
msgid "||Please enter your PIN at the reader's keypad"
msgstr ""
-#: scd/app-nks.c:329 scd/app-openpgp.c:1460 scd/app-openpgp.c:1492
-#: scd/app-openpgp.c:1639 scd/app-openpgp.c:1657 scd/app-openpgp.c:1857
+#: scd/app-nks.c:329 scd/app-openpgp.c:1461 scd/app-openpgp.c:1493
+#: scd/app-openpgp.c:1640 scd/app-openpgp.c:1658 scd/app-openpgp.c:1858
#: scd/app-dinsig.c:301
#, c-format
msgid "PIN callback returned error: %s\n"
@@ -6406,103 +6406,103 @@ msgstr ""
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
#. to get some infos on the string.
-#: scd/app-nks.c:557 scd/app-openpgp.c:1897
+#: scd/app-nks.c:557 scd/app-openpgp.c:1898
msgid "|N|New PIN"
msgstr "新的 PIN"
-#: scd/app-nks.c:560 scd/app-openpgp.c:1901 scd/app-dinsig.c:529
+#: scd/app-nks.c:560 scd/app-openpgp.c:1902 scd/app-dinsig.c:529
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错:%s\n"
-#: scd/app-openpgp.c:667
+#: scd/app-openpgp.c:668
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "无法存储指纹:%s\n"
-#: scd/app-openpgp.c:680
+#: scd/app-openpgp.c:681
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "无法存储创建日期:%s\n"
-#: scd/app-openpgp.c:1075
+#: scd/app-openpgp.c:1076
#, c-format
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: scd/app-openpgp.c:1083 scd/app-openpgp.c:2551
+#: scd/app-openpgp.c:1084 scd/app-openpgp.c:2552
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1091 scd/app-openpgp.c:2559
+#: scd/app-openpgp.c:1092 scd/app-openpgp.c:2560
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1100 scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:1101 scd/app-openpgp.c:2570
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
-#: scd/app-openpgp.c:1416
+#: scd/app-openpgp.c:1417
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1423
+#: scd/app-openpgp.c:1424
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1442
+#: scd/app-openpgp.c:1443
#, fuzzy, c-format
msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1476
+#: scd/app-openpgp.c:1477
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1488
+#: scd/app-openpgp.c:1489
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1499 scd/app-openpgp.c:1664
+#: scd/app-openpgp.c:1500 scd/app-openpgp.c:1665
#, c-format
msgid "PIN for CHV%d is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
-#: scd/app-openpgp.c:1512 scd/app-openpgp.c:1552 scd/app-openpgp.c:1676
-#: scd/app-openpgp.c:2868
+#: scd/app-openpgp.c:1513 scd/app-openpgp.c:1553 scd/app-openpgp.c:1677
+#: scd/app-openpgp.c:2869
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败:%s\n"
-#: scd/app-openpgp.c:1575
+#: scd/app-openpgp.c:1576
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:1596 scd/app-openpgp.c:1839 scd/app-openpgp.c:3119
+#: scd/app-openpgp.c:1597 scd/app-openpgp.c:1840 scd/app-openpgp.c:3120
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1602 scd/app-openpgp.c:3128
+#: scd/app-openpgp.c:1603 scd/app-openpgp.c:3129
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定!\n"
-#: scd/app-openpgp.c:1609
+#: scd/app-openpgp.c:1610
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "尝试管理员 PIN %d 次后,卡将被永久锁定!\n"
-#: scd/app-openpgp.c:1619
+#: scd/app-openpgp.c:1620
#, fuzzy, c-format
msgid ""
"|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: "
"%d]"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1635
#, fuzzy
msgid "|A|Please enter the Admin PIN at the reader's keypad"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
@@ -6510,109 +6510,109 @@ msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
#. TRANSLATORS: Do not translate the "|A|" prefix but keep
#. it at the start of the string. We need this elsewhere to
#. get some infos on the string.
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1655
msgid "|A|Admin PIN"
msgstr "|A|管理员 PIN"
-#: scd/app-openpgp.c:1853
+#: scd/app-openpgp.c:1854
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||请输入 PIN%%0A[完成的签字:%lu]"
-#: scd/app-openpgp.c:1862 scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:1863 scd/app-openpgp.c:1926
#, fuzzy, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短;最小长度为 %d\n"
-#: scd/app-openpgp.c:1896
+#: scd/app-openpgp.c:1897
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:1897
+#: scd/app-openpgp.c:1898
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:1987 scd/app-openpgp.c:2637
+#: scd/app-openpgp.c:1988 scd/app-openpgp.c:2638
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:1993 scd/app-openpgp.c:2644
+#: scd/app-openpgp.c:1994 scd/app-openpgp.c:2645
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:2003
+#: scd/app-openpgp.c:2004
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:2007
+#: scd/app-openpgp.c:2008
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:2009
+#: scd/app-openpgp.c:2010
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:2335
+#: scd/app-openpgp.c:2336
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:2344
+#: scd/app-openpgp.c:2345
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2356
+#: scd/app-openpgp.c:2357
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-openpgp.c:2366 scd/app-openpgp.c:2374
+#: scd/app-openpgp.c:2367 scd/app-openpgp.c:2375
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2468
+#: scd/app-openpgp.c:2469
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥:%s\n"
-#: scd/app-openpgp.c:2528
+#: scd/app-openpgp.c:2529
msgid "please wait while key is being generated ...\n"
msgstr "请稍候,正在生成密钥……\n"
-#: scd/app-openpgp.c:2542
+#: scd/app-openpgp.c:2543
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:2545
+#: scd/app-openpgp.c:2546
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:2602
+#: scd/app-openpgp.c:2603
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2652
+#: scd/app-openpgp.c:2653
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:2767
+#: scd/app-openpgp.c:2768
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2844
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名:%lu\n"
-#: scd/app-openpgp.c:3133
+#: scd/app-openpgp.c:3134
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:3357 scd/app-openpgp.c:3368
+#: scd/app-openpgp.c:3359 scd/app-openpgp.c:3370
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡?\n"
@@ -7020,7 +7020,7 @@ msgstr ""
msgid "[Error - invalid DN]"
msgstr "错误:无效的响应。\n"
-#: sm/certdump.c:964
+#: sm/certdump.c:961
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the X.509 "
@@ -7111,6 +7111,12 @@ msgstr "建立钥匙环‘%s’时发生错误:%s\n"
msgid "line %d: key generation failed: %s <%s>\n"
msgstr "生成密钥失败:%s\n"
+#: sm/certreqgen.c:806
+msgid ""
+"To complete this certificate request please enter the passphrase for the key "
+"you just created once more.\n"
+msgstr ""
+
#: sm/certreqgen-ui.c:122
#, fuzzy, c-format
msgid " (%d) RSA\n"
@@ -7478,7 +7484,7 @@ msgstr ""
msgid "error importing certificate: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
-#: sm/import.c:548 tools/gpg-connect-agent.c:1322
+#: sm/import.c:548 tools/gpg-connect-agent.c:1329
#, fuzzy, c-format
msgid "error reading input: %s\n"
msgstr "读取‘%s’时出错:%s\n"
@@ -7629,91 +7635,91 @@ msgstr " 亦即“%s”"
msgid "This is a qualified signature\n"
msgstr "这将是一个自身签名。\n"
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:78 tools/symcryptrun.c:165
#, fuzzy
msgid "quiet"
msgstr "quit"
-#: tools/gpg-connect-agent.c:68
+#: tools/gpg-connect-agent.c:71
msgid "print data out hex encoded"
msgstr ""
-#: tools/gpg-connect-agent.c:69
+#: tools/gpg-connect-agent.c:72
msgid "decode received data lines"
msgstr ""
-#: tools/gpg-connect-agent.c:70
+#: tools/gpg-connect-agent.c:74
msgid "|NAME|connect to Assuan socket NAME"
msgstr ""
-#: tools/gpg-connect-agent.c:71
+#: tools/gpg-connect-agent.c:76
msgid "run the Assuan server given on the command line"
msgstr ""
-#: tools/gpg-connect-agent.c:73
+#: tools/gpg-connect-agent.c:78
msgid "do not use extended connect mode"
msgstr ""
-#: tools/gpg-connect-agent.c:74
+#: tools/gpg-connect-agent.c:80
#, fuzzy
msgid "|FILE|run commands from FILE on startup"
msgstr "从‘%s’读取选项\n"
-#: tools/gpg-connect-agent.c:75
+#: tools/gpg-connect-agent.c:81
msgid "run /subst on startup"
msgstr ""
-#: tools/gpg-connect-agent.c:176
+#: tools/gpg-connect-agent.c:183
#, fuzzy
msgid "Usage: gpg-connect-agent [options] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: tools/gpg-connect-agent.c:179
+#: tools/gpg-connect-agent.c:186
msgid ""
"Syntax: gpg-connect-agent [options]\n"
"Connect to a running agent and send commands\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1193
+#: tools/gpg-connect-agent.c:1200
#, c-format
msgid "option \"%s\" requires a program and optional arguments\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1202
+#: tools/gpg-connect-agent.c:1209
#, c-format
msgid "option \"%s\" ignored due to \"%s\"\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1257 tools/gpg-connect-agent.c:1745
+#: tools/gpg-connect-agent.c:1264 tools/gpg-connect-agent.c:1752
#, fuzzy, c-format
msgid "receiving line failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: tools/gpg-connect-agent.c:1347
+#: tools/gpg-connect-agent.c:1354
#, fuzzy
msgid "line too long - skipped\n"
msgstr "列太长"
-#: tools/gpg-connect-agent.c:1351
+#: tools/gpg-connect-agent.c:1358
msgid "line shortened due to embedded Nul character\n"
msgstr ""
-#: tools/gpg-connect-agent.c:1719
+#: tools/gpg-connect-agent.c:1726
#, fuzzy, c-format
msgid "unknown command `%s'\n"
msgstr "未知的选项 '%s'\n"
-#: tools/gpg-connect-agent.c:1737
+#: tools/gpg-connect-agent.c:1744
#, fuzzy, c-format
msgid "sending line failed: %s\n"
msgstr "签名时失败: %s\n"
-#: tools/gpg-connect-agent.c:2127
+#: tools/gpg-connect-agent.c:2166
#, fuzzy, c-format
msgid "error sending %s command: %s\n"
msgstr "读取‘%s’时出错:%s\n"
-#: tools/gpg-connect-agent.c:2136
+#: tools/gpg-connect-agent.c:2175
#, fuzzy, c-format
msgid "error sending standard options: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错:%s\n"
@@ -7920,21 +7926,21 @@ msgid ""
"Manage configuration options for tools of the GnuPG system\n"
msgstr ""
-#: tools/gpgconf.c:210 tools/gpgconf.c:250
+#: tools/gpgconf.c:209 tools/gpgconf.c:249
#, fuzzy
msgid "usage: gpgconf [options] "
msgstr "用法:gpg [选项] "
-#: tools/gpgconf.c:212
+#: tools/gpgconf.c:211
msgid "Need one component argument"
msgstr ""
-#: tools/gpgconf.c:221
+#: tools/gpgconf.c:220
#, fuzzy
msgid "Component not found"
msgstr "找不到公钥"
-#: tools/gpgconf.c:252
+#: tools/gpgconf.c:251
#, fuzzy
msgid "No argument allowed"
msgstr "不允许使用管理员命令\n"
@@ -8095,16 +8101,16 @@ msgstr "不能创建备份文件‘%s’:%s\n"
msgid "cannot allocate outfile string: %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
-#: tools/symcryptrun.c:985
+#: tools/symcryptrun.c:984
#, c-format
msgid "either %s or %s must be given\n"
msgstr ""
-#: tools/symcryptrun.c:1012
+#: tools/symcryptrun.c:1011
msgid "no class provided\n"
msgstr ""
-#: tools/symcryptrun.c:1021
+#: tools/symcryptrun.c:1020
#, fuzzy, c-format
msgid "class %s is not supported\n"
msgstr "不支持保护散列 %d\n"