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.po1012
1 files changed, 526 insertions, 486 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c9619c08d..cc34c50ac 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: 2009-12-03 18:46+0100\n"
+"POT-Creation-Date: 2009-12-21 15:13+0100\n"
"PO-Revision-Date: 2009-07-09 10:03+0200\n"
"Last-Translator: Meng Jie <[email protected]>\n"
"Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -98,22 +98,22 @@ msgstr "错误的密码"
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
-#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1116
-#: g10/keygen.c:3362 g10/keygen.c:3395 g10/keyring.c:1237 g10/keyring.c:1569
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1121
+#: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107
-#: g10/tdbio.c:547 jnlib/dotlock.c:310
+#: g10/tdbio.c:548 jnlib/dotlock.c:310
#, c-format
msgid "can't create `%s': %s\n"
msgstr "无法建立‘%s’:%s\n"
#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1117 g10/import.c:193 g10/keygen.c:2845
+#: g10/encode.c:504 g10/gpg.c:1122 g10/import.c:193 g10/keygen.c:2877
#: g10/keyring.c:1595 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
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2027
-#: sm/gpgsm.c:2057 sm/gpgsm.c:2095 sm/gpgsm.c:2133 sm/qualified.c:66
+#: g10/sign.c:1247 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
+#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’: %s\n"
@@ -341,14 +341,14 @@ msgstr ""
msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:123 g10/gpg.c:484 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:110 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: agent/gpg-agent.c:123 g10/gpg.c:486 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:110 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:80 tools/symcryptrun.c:164
msgid "verbose"
msgstr "详细模式"
#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:111
-#: sm/gpgsm.c:280
+#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
@@ -360,7 +360,7 @@ msgstr ""
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:309
+#: agent/gpg-agent.c:127 scd/scdaemon.c:114 sm/gpgsm.c:312
#: tools/symcryptrun.c:167
#, fuzzy
msgid "|FILE|read options from FILE"
@@ -433,9 +433,9 @@ msgstr ""
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
-#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:160
-#: g10/gpg.c:808 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
-#: sm/gpgsm.c:515 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:813 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:245
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:180 tools/gpgconf.c:102
#: tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
@@ -453,30 +453,30 @@ msgid ""
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:389 g10/gpg.c:1001 scd/scdaemon.c:317 sm/gpgsm.c:665
+#: agent/gpg-agent.c:389 g10/gpg.c:1006 scd/scdaemon.c:317 sm/gpgsm.c:669
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:609 agent/protect-tool.c:1030 kbx/kbxutil.c:428
-#: scd/scdaemon.c:423 sm/gpgsm.c:905 sm/gpgsm.c:908 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:609 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:423 sm/gpgsm.c:911 sm/gpgsm.c:914 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:720 g10/gpg.c:2126 scd/scdaemon.c:505 sm/gpgsm.c:1002
+#: agent/gpg-agent.c:720 g10/gpg.c:2109 scd/scdaemon.c:505 sm/gpgsm.c:1008
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意:没有默认配置文件‘%s’\n"
-#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2130
-#: scd/scdaemon.c:510 sm/gpgsm.c:1006 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:725 agent/gpg-agent.c:1326 g10/gpg.c:2113
+#: scd/scdaemon.c:510 sm/gpgsm.c:1012 tools/symcryptrun.c:929
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’:%s\n"
-#: agent/gpg-agent.c:733 g10/gpg.c:2137 scd/scdaemon.c:518 sm/gpgsm.c:1013
+#: agent/gpg-agent.c:733 g10/gpg.c:2120 scd/scdaemon.c:518 sm/gpgsm.c:1019
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
@@ -610,7 +610,7 @@ msgid ""
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: agent/protect-tool.c:113 g10/gpg.c:372 kbx/kbxutil.c:71 sm/gpgsm.c:186
#: tools/gpgconf.c:60
msgid ""
"@Commands:\n"
@@ -619,8 +619,8 @@ msgstr ""
"@指令:\n"
" "
-#: agent/protect-tool.c:124 g10/gpg.c:437 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
+#: agent/protect-tool.c:127 g10/gpg.c:439 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
#: tools/symcryptrun.c:157
msgid ""
"@\n"
@@ -631,51 +631,51 @@ msgstr ""
"选项:\n"
" "
-#: agent/protect-tool.c:163
+#: agent/protect-tool.c:166
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: agent/protect-tool.c:165
+#: agent/protect-tool.c:168
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1151
+#: agent/protect-tool.c:1162
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1156
+#: agent/protect-tool.c:1167
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1162
+#: agent/protect-tool.c:1173
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1167
+#: agent/protect-tool.c:1178
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:435
#, fuzzy
msgid "Passphrase:"
msgstr "错误的密码"
-#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:446
#, fuzzy
msgid "cancelled\n"
msgstr "已取消"
-#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:442
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "生成密码的时候发生错误:%s\n"
@@ -974,138 +974,178 @@ msgstr "证书已损坏"
msgid "|audit-log-result|Error"
msgstr ""
-#: common/audit.c:718
+#: common/audit.c:487
+#, fuzzy
+msgid "|audit-log-result|Not used"
+msgstr "证书已损坏"
+
+#: common/audit.c:489
+#, fuzzy
+msgid "|audit-log-result|Okay"
+msgstr "证书已损坏"
+
+#: common/audit.c:491
+#, fuzzy
+msgid "|audit-log-result|Skipped"
+msgstr "证书已损坏"
+
+#: common/audit.c:493
+#, fuzzy
+msgid "|audit-log-result|Some"
+msgstr "证书已损坏"
+
+#: common/audit.c:726
#, fuzzy
msgid "Certificate chain available"
msgstr "证书已损坏"
-#: common/audit.c:725
+#: common/audit.c:733
#, fuzzy
msgid "root certificate missing"
msgstr "证书已损坏"
-#: common/audit.c:751
+#: common/audit.c:759
msgid "Data encryption succeeded"
msgstr ""
-#: common/audit.c:756 common/audit.c:817 common/audit.c:837 common/audit.c:861
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
#, fuzzy
msgid "Data available"
msgstr "列出所有可用数据"
-#: common/audit.c:759
+#: common/audit.c:767
#, fuzzy
msgid "Session key created"
msgstr "%s:钥匙环已建立\n"
-#: common/audit.c:764
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
#, fuzzy, c-format
msgid "algorithm: %s"
msgstr "有效性:%s"
-#: common/audit.c:766 common/audit.c:768
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
#, fuzzy, c-format
msgid "unsupported algorithm: %s"
msgstr ""
"\n"
"支持的算法:\n"
-#: common/audit.c:770
+#: common/audit.c:778 common/audit.c:925
#, fuzzy
msgid "seems to be not encrypted"
msgstr "未被加密"
-#: common/audit.c:776
+#: common/audit.c:784 common/audit.c:933
#, fuzzy
msgid "Number of recipients"
msgstr "当前收件人:\n"
-#: common/audit.c:784
+#: common/audit.c:792 common/audit.c:956
#, c-format
msgid "Recipient %d"
msgstr ""
-#: common/audit.c:812
+#: common/audit.c:825
msgid "Data signing succeeded"
msgstr ""
-#: common/audit.c:832
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
+#, fuzzy, c-format
+msgid "data hash algorithm: %s"
+msgstr "无效的‘%s’散列算法\n"
+
+#: common/audit.c:862
+#, fuzzy, c-format
+msgid "Signer %d"
+msgstr "签名建立于 %s\n"
+
+#: common/audit.c:866 common/audit.c:1065
+#, fuzzy, c-format
+msgid "attr hash algorithm: %s"
+msgstr "无效的‘%s’散列算法\n"
+
+#: common/audit.c:901
msgid "Data decryption succeeded"
msgstr ""
-#: common/audit.c:857
+#: common/audit.c:910
+#, fuzzy
+msgid "Encryption algorithm supported"
+msgstr "保护算法 %d%s 未被支持\n"
+
+#: common/audit.c:993
#, fuzzy
msgid "Data verification succeeded"
msgstr "签名验证已被抑制\n"
-#: common/audit.c:866
+#: common/audit.c:1002
#, fuzzy
msgid "Signature available"
msgstr "签名建立于 %s\n"
-#: common/audit.c:871
+#: common/audit.c:1024
#, fuzzy
-msgid "Parsing signature succeeded"
+msgid "Parsing data succeeded"
msgstr "未找到签名\n"
-#: common/audit.c:876
+#: common/audit.c:1036
#, fuzzy, c-format
-msgid "Bad hash algorithm: %s"
+msgid "bad data hash algorithm: %s"
msgstr "无效的‘%s’散列算法\n"
-#: common/audit.c:891
+#: common/audit.c:1051
#, fuzzy, c-format
msgid "Signature %d"
msgstr "签名建立于 %s\n"
-#: common/audit.c:907
+#: common/audit.c:1079
#, fuzzy
msgid "Certificate chain valid"
msgstr "这把密钥已经过期!"
-#: common/audit.c:918
+#: common/audit.c:1090
#, fuzzy
msgid "Root certificate trustworthy"
msgstr "证书已损坏"
-#: common/audit.c:939 sm/certchain.c:920
+#: common/audit.c:1111 sm/certchain.c:935
#, fuzzy
msgid "no CRL found for certificate"
msgstr "证书已损坏"
-#: common/audit.c:942 sm/certchain.c:930
+#: common/audit.c:1114 sm/certchain.c:945
#, fuzzy
msgid "the available CRL is too old"
msgstr "可用的密钥在:"
-#: common/audit.c:947
+#: common/audit.c:1119
#, fuzzy
msgid "CRL/OCSP check of certificates"
msgstr "证书已损坏"
-#: common/audit.c:967
+#: common/audit.c:1139
#, fuzzy
msgid "Included certificates"
msgstr "证书已损坏"
-#: common/audit.c:1026
+#: common/audit.c:1194
msgid "No audit log entries."
msgstr ""
-#: common/audit.c:1075
+#: common/audit.c:1243
#, fuzzy
msgid "Unknown operation"
msgstr "未知的版本"
-#: common/audit.c:1093
+#: common/audit.c:1261
msgid "Gpg-Agent usable"
msgstr ""
-#: common/audit.c:1103
+#: common/audit.c:1271
msgid "Dirmngr usable"
msgstr ""
-#: common/audit.c:1139
+#: common/audit.c:1307
#, fuzzy, c-format
msgid "No help available for `%s'."
msgstr "‘%s’没有可用的帮助"
@@ -1236,7 +1276,7 @@ msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:3036 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
@@ -1251,8 +1291,8 @@ msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\n"
#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1621
-#: g10/keygen.c:1702 sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:249
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1630
+#: g10/keygen.c:1711 sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:249
#: sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "您的选择? "
@@ -1416,13 +1456,13 @@ msgstr "您想要用多大的密钥尺寸?(%u)"
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "您想要用多大的密钥尺寸?(%u)"
-#: g10/card-util.c:1306 g10/keygen.c:1835 g10/keygen.c:1841
+#: g10/card-util.c:1306 g10/keygen.c:1844 g10/keygen.c:1850
#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
-#: g10/card-util.c:1314 g10/keygen.c:1822 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1314 g10/keygen.c:1831 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
@@ -1478,7 +1518,7 @@ msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:945
-#: g10/keygen.c:1625 g10/keygen.c:1653 g10/keygen.c:1755 g10/revoke.c:683
+#: g10/keygen.c:1634 g10/keygen.c:1662 g10/keygen.c:1764 g10/revoke.c:683
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
@@ -1591,7 +1631,7 @@ msgstr "无效的指令(尝试“help”)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/decrypt.c:166 g10/gpg.c:4013 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4005 g10/keyring.c:387 g10/keyring.c:698
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
@@ -1887,174 +1927,174 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s:无相应公钥的私钥――已跳过\n"
-#: g10/gpg.c:372 sm/gpgsm.c:186
+#: g10/gpg.c:374 sm/gpgsm.c:188
#, fuzzy
msgid "make a signature"
msgstr "|[文件名]|生成一份签名"
-#: g10/gpg.c:373 sm/gpgsm.c:187
+#: g10/gpg.c:375 sm/gpgsm.c:189
#, fuzzy
msgid "make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
-#: g10/gpg.c:374 sm/gpgsm.c:188
+#: g10/gpg.c:376 sm/gpgsm.c:190
msgid "make a detached signature"
msgstr "生成一份分离的签名"
-#: g10/gpg.c:375 sm/gpgsm.c:189
+#: g10/gpg.c:377 sm/gpgsm.c:191
msgid "encrypt data"
msgstr "加密数据"
-#: g10/gpg.c:377 sm/gpgsm.c:190
+#: g10/gpg.c:379 sm/gpgsm.c:192
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:379 sm/gpgsm.c:191
+#: g10/gpg.c:381 sm/gpgsm.c:193
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/gpg.c:381 sm/gpgsm.c:192
+#: g10/gpg.c:383 sm/gpgsm.c:194
msgid "verify a signature"
msgstr "验证签名"
-#: g10/gpg.c:383 sm/gpgsm.c:193
+#: g10/gpg.c:385 sm/gpgsm.c:195
msgid "list keys"
msgstr "列出密钥"
-#: g10/gpg.c:385
+#: g10/gpg.c:387
msgid "list keys and signatures"
msgstr "列出密钥和签名"
-#: g10/gpg.c:386
+#: g10/gpg.c:388
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
-#: g10/gpg.c:387 sm/gpgsm.c:198
+#: g10/gpg.c:389 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:388 sm/gpgsm.c:196
+#: g10/gpg.c:390 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "列出私钥"
-#: g10/gpg.c:389 sm/gpgsm.c:199
+#: g10/gpg.c:391 sm/gpgsm.c:201
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
-#: g10/gpg.c:391 sm/gpgsm.c:201
+#: g10/gpg.c:393 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: g10/gpg.c:393
+#: g10/gpg.c:395
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
-#: g10/gpg.c:394
+#: g10/gpg.c:396
msgid "sign a key"
msgstr "为某把密钥添加签名"
-#: g10/gpg.c:395
+#: g10/gpg.c:397
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
-#: g10/gpg.c:396
+#: g10/gpg.c:398
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
-#: g10/gpg.c:398
+#: g10/gpg.c:400
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/gpg.c:400
+#: g10/gpg.c:402
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:401 sm/gpgsm.c:202
+#: g10/gpg.c:403 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:402 sm/gpgsm.c:203
+#: g10/gpg.c:404 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/gpg.c:404
+#: g10/gpg.c:406
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/gpg.c:406
+#: g10/gpg.c:408
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
-#: g10/gpg.c:411
+#: g10/gpg.c:413
msgid "import/merge keys"
msgstr "导入/合并密钥"
-#: g10/gpg.c:414
+#: g10/gpg.c:416
msgid "print the card status"
msgstr "打印卡状态"
-#: g10/gpg.c:415
+#: g10/gpg.c:417
msgid "change data on a card"
msgstr "更改卡上的数据"
-#: g10/gpg.c:416
+#: g10/gpg.c:418
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
-#: g10/gpg.c:425
+#: g10/gpg.c:427
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/gpg.c:432
+#: g10/gpg.c:434
#, fuzzy
msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:435 sm/gpgsm.c:208
+#: g10/gpg.c:437 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:439 sm/gpgsm.c:226
+#: g10/gpg.c:441 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:442 sm/gpgsm.c:239
+#: g10/gpg.c:444 sm/gpgsm.c:241
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:455 sm/gpgsm.c:276
+#: g10/gpg.c:457 sm/gpgsm.c:278
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
-#: g10/gpg.c:458
+#: g10/gpg.c:460
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:464
+#: g10/gpg.c:466
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:481 sm/gpgsm.c:278
+#: g10/gpg.c:483 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
-#: g10/gpg.c:497 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
+#: g10/gpg.c:499 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/gpg.c:498
+#: g10/gpg.c:500
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/gpg.c:550
+#: g10/gpg.c:552
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/gpg.c:581 sm/gpgsm.c:333
+#: g10/gpg.c:583 sm/gpgsm.c:336
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
@@ -2062,7 +2102,7 @@ msgstr ""
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/gpg.c:584 sm/gpgsm.c:336
+#: g10/gpg.c:586 sm/gpgsm.c:339
msgid ""
"@\n"
"Examples:\n"
@@ -2082,11 +2122,11 @@ msgstr ""
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/gpg.c:830
+#: g10/gpg.c:835
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: g10/gpg.c:833
+#: g10/gpg.c:838
msgid ""
"Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n"
@@ -2096,7 +2136,7 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:844 sm/gpgsm.c:539
+#: g10/gpg.c:849 sm/gpgsm.c:543
msgid ""
"\n"
"Supported algorithms:\n"
@@ -2104,540 +2144,540 @@ msgstr ""
"\n"
"支持的算法:\n"
-#: g10/gpg.c:847
+#: g10/gpg.c:852
msgid "Pubkey: "
msgstr "公钥:"
-#: g10/gpg.c:854 g10/keyedit.c:2356
+#: g10/gpg.c:859 g10/keyedit.c:2356
msgid "Cipher: "
msgstr "对称加密:"
-#: g10/gpg.c:861
+#: g10/gpg.c:866
msgid "Hash: "
msgstr "散列:"
-#: g10/gpg.c:868 g10/keyedit.c:2401
+#: g10/gpg.c:873 g10/keyedit.c:2401
msgid "Compression: "
msgstr "压缩:"
-#: g10/gpg.c:938
+#: g10/gpg.c:943
msgid "usage: gpg [options] "
msgstr "用法:gpg [选项] "
-#: g10/gpg.c:1152 sm/gpgsm.c:712
+#: g10/gpg.c:1157 sm/gpgsm.c:716
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1170
+#: g10/gpg.c:1175
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1367
+#: g10/gpg.c:1372
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1370
+#: g10/gpg.c:1375
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1373
+#: g10/gpg.c:1378
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1379
+#: g10/gpg.c:1384
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1382
+#: g10/gpg.c:1387
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1385
+#: g10/gpg.c:1390
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1391
+#: g10/gpg.c:1396
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1394
+#: g10/gpg.c:1399
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1397
+#: g10/gpg.c:1402
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1403
+#: g10/gpg.c:1408
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告:用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1406
+#: g10/gpg.c:1411
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告:配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1409
+#: g10/gpg.c:1414
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告:扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1588
+#: g10/gpg.c:1593
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1687
+#: g10/gpg.c:1697
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
-#: g10/gpg.c:1689
+#: g10/gpg.c:1699
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
-#: g10/gpg.c:1691
+#: g10/gpg.c:1701
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1693
+#: g10/gpg.c:1703
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1697
+#: g10/gpg.c:1707
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
-#: g10/gpg.c:1699
+#: g10/gpg.c:1709
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
-#: g10/gpg.c:1701
+#: g10/gpg.c:1711
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
-#: g10/gpg.c:1703
+#: g10/gpg.c:1713
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
-#: g10/gpg.c:1705
+#: g10/gpg.c:1715
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:1707
+#: g10/gpg.c:1717
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
-#: g10/gpg.c:1709
+#: g10/gpg.c:1719
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
-#: g10/gpg.c:1870
+#: g10/gpg.c:1853
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意:旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1962
+#: g10/gpg.c:1945
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2354 g10/gpg.c:3042 g10/gpg.c:3054
+#: g10/gpg.c:2343 g10/gpg.c:3034 g10/gpg.c:3046
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意:一般情况下不会用到 %s!\n"
-#: g10/gpg.c:2535 g10/gpg.c:2547
+#: g10/gpg.c:2527 g10/gpg.c:2539
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
-#: g10/gpg.c:2629
+#: g10/gpg.c:2621
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2652 g10/gpg.c:2847 g10/keyedit.c:4131
+#: g10/gpg.c:2644 g10/gpg.c:2839 g10/keyedit.c:4131
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2664
+#: g10/gpg.c:2656
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s:%d:无效的公钥服务器选项\n"
-#: g10/gpg.c:2667
+#: g10/gpg.c:2659
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2674
+#: g10/gpg.c:2666
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s:%d:无效的导入选项\n"
-#: g10/gpg.c:2677
+#: g10/gpg.c:2669
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2684
+#: g10/gpg.c:2676
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s:%d:无效的导出选项\n"
-#: g10/gpg.c:2687
+#: g10/gpg.c:2679
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2694
+#: g10/gpg.c:2686
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s:%d:无效的列表选项\n"
-#: g10/gpg.c:2697
+#: g10/gpg.c:2689
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2705
+#: g10/gpg.c:2697
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
-#: g10/gpg.c:2707
+#: g10/gpg.c:2699
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
-#: g10/gpg.c:2709
+#: g10/gpg.c:2701
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
-#: g10/gpg.c:2711
+#: g10/gpg.c:2703
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
-#: g10/gpg.c:2715
+#: g10/gpg.c:2707
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
-#: g10/gpg.c:2717
+#: g10/gpg.c:2709
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
-#: g10/gpg.c:2719
+#: g10/gpg.c:2711
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
-#: g10/gpg.c:2721
+#: g10/gpg.c:2713
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2723
+#: g10/gpg.c:2715
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2725
+#: g10/gpg.c:2717
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
-#: g10/gpg.c:2727
+#: g10/gpg.c:2719
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
-#: g10/gpg.c:2734
+#: g10/gpg.c:2726
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s:%d:无效的校验选项\n"
-#: g10/gpg.c:2737
+#: g10/gpg.c:2729
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2744
+#: g10/gpg.c:2736
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2930
+#: g10/gpg.c:2922
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s:%d:无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2933
+#: g10/gpg.c:2925
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:3031 sm/gpgsm.c:1431
+#: g10/gpg.c:3023 sm/gpgsm.c:1437
msgid "WARNING: program may create a core file!\n"
msgstr "警告:程序可能会创建核心内存转储!\n"
-#: g10/gpg.c:3035
+#: g10/gpg.c:3027
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告:%s 会使得 %s 失效\n"
-#: g10/gpg.c:3044
+#: g10/gpg.c:3036
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:3047
+#: g10/gpg.c:3039
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义!\n"
-#: g10/gpg.c:3062
+#: g10/gpg.c:3054
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行,原因是 %s\n"
-#: g10/gpg.c:3076
+#: g10/gpg.c:3068
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
-#: g10/gpg.c:3082
+#: g10/gpg.c:3074
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时,不能同时签名和加密\n"
-#: g10/gpg.c:3088
+#: g10/gpg.c:3080
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件,而非管道\n"
-#: g10/gpg.c:3101
+#: g10/gpg.c:3093
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:3168 g10/gpg.c:3192 sm/gpgsm.c:1503
+#: g10/gpg.c:3160 g10/gpg.c:3184 sm/gpgsm.c:1509
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:3174 g10/gpg.c:3198 sm/gpgsm.c:1509 sm/gpgsm.c:1515
+#: g10/gpg.c:3166 g10/gpg.c:3190 sm/gpgsm.c:1515 sm/gpgsm.c:1521
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:3180
+#: g10/gpg.c:3172
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:3186
+#: g10/gpg.c:3178
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:3201
+#: g10/gpg.c:3193
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
-#: g10/gpg.c:3203
+#: g10/gpg.c:3195
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
-#: g10/gpg.c:3205
+#: g10/gpg.c:3197
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:3207
+#: g10/gpg.c:3199
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别;一定要是 0,1,2 或 3\n"
-#: g10/gpg.c:3209
+#: g10/gpg.c:3201
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别;一定要是 1,2 或 3\n"
-#: g10/gpg.c:3212
+#: g10/gpg.c:3204
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意:强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:3216
+#: g10/gpg.c:3208
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式;必须是 0,1 或 3\n"
-#: g10/gpg.c:3223
+#: g10/gpg.c:3215
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:3227
+#: g10/gpg.c:3219
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:3231
+#: g10/gpg.c:3223
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:3235
+#: g10/gpg.c:3227
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:3268
+#: g10/gpg.c:3260
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3315
+#: g10/gpg.c:3307
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3320
+#: g10/gpg.c:3312
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3325
+#: g10/gpg.c:3317
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3411
+#: g10/gpg.c:3403
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败:%s\n"
-#: g10/gpg.c:3422
+#: g10/gpg.c:3414
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告:给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3443
+#: g10/gpg.c:3435
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3450
+#: g10/gpg.c:3442
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3452
+#: g10/gpg.c:3444
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败:%s\n"
-#: g10/gpg.c:3462
+#: g10/gpg.c:3454
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3475
+#: g10/gpg.c:3467
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3477
+#: g10/gpg.c:3469
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3480
+#: g10/gpg.c:3472
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3498
+#: g10/gpg.c:3490
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3511
+#: g10/gpg.c:3503
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3526
+#: g10/gpg.c:3518
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3528
+#: g10/gpg.c:3520
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3531
+#: g10/gpg.c:3523
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3551
+#: g10/gpg.c:3543
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3560
+#: g10/gpg.c:3552
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3585
+#: g10/gpg.c:3577
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3593
+#: g10/gpg.c:3585
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3597
+#: g10/gpg.c:3589
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3618
+#: g10/gpg.c:3610
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3710
+#: g10/gpg.c:3702
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败:%s\n"
-#: g10/gpg.c:3712
+#: g10/gpg.c:3704
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败:%s\n"
-#: g10/gpg.c:3714
+#: g10/gpg.c:3706
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败:%s\n"
-#: g10/gpg.c:3725
+#: g10/gpg.c:3717
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败:%s\n"
-#: g10/gpg.c:3735
+#: g10/gpg.c:3727
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败:%s\n"
-#: g10/gpg.c:3786
+#: g10/gpg.c:3778
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3794
+#: g10/gpg.c:3786
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败:%s\n"
-#: g10/gpg.c:3884
+#: g10/gpg.c:3876
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:3999
+#: g10/gpg.c:3991
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:4003
+#: g10/gpg.c:3995
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4317
+#: g10/gpg.c:4309
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4319
+#: g10/gpg.c:4311
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
-#: g10/gpg.c:4352
+#: g10/gpg.c:4344
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -2650,7 +2690,7 @@ msgstr "从这个钥匙环里取用密钥"
msgid "make timestamp conflicts only a warning"
msgstr "把时间戳矛盾仅视为警告"
-#: g10/gpgv.c:78 sm/gpgsm.c:323
+#: g10/gpgv.c:78 sm/gpgsm.c:326
msgid "|FD|write status info to this FD"
msgstr "|FD|把状态信息写入文件描述符 FD"
@@ -3416,19 +3456,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:3741
+#: g10/keyedit.c:1142 g10/keygen.c:3774
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3728 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3761 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3744
+#: g10/keyedit.c:1150 g10/keygen.c:3777
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3748
+#: g10/keyedit.c:1156 g10/keygen.c:3781
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
@@ -3445,7 +3485,7 @@ msgstr ""
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2282
+#: g10/keyedit.c:1207 g10/keygen.c:2291
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符;请再试一次"
@@ -4165,70 +4205,70 @@ msgstr "子钥 %s 已被吊销。\n"
msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
msgstr "正在显示 %s 照片标识(大小为 %ld,属于密钥 %s,用户标识 %d)\n"
-#: g10/keygen.c:269
+#: g10/keygen.c:275
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "首选项‘%s’重复\n"
-#: g10/keygen.c:276
+#: g10/keygen.c:282
msgid "too many cipher preferences\n"
msgstr "太多对称加密算法首选项\n"
-#: g10/keygen.c:278
+#: g10/keygen.c:284
msgid "too many digest preferences\n"
msgstr "太多散列算法首选项\n"
-#: g10/keygen.c:280
+#: g10/keygen.c:286
msgid "too many compression preferences\n"
msgstr "太多首选压缩算法\n"
-#: g10/keygen.c:420
+#: g10/keygen.c:426
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
-#: g10/keygen.c:904
+#: g10/keygen.c:910
msgid "writing direct signature\n"
msgstr "正在写入直接签名\n"
-#: g10/keygen.c:946
+#: g10/keygen.c:952
msgid "writing self signature\n"
msgstr "正在写入自身签名\n"
-#: g10/keygen.c:1003
+#: g10/keygen.c:1009
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
-#: g10/keygen.c:1173 g10/keygen.c:1284 g10/keygen.c:1289 g10/keygen.c:1432
-#: g10/keygen.c:3237
+#: g10/keygen.c:1179 g10/keygen.c:1290 g10/keygen.c:1295 g10/keygen.c:1441
+#: g10/keygen.c:3269
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效:改用 %u 位\n"
-#: g10/keygen.c:1179 g10/keygen.c:1295 g10/keygen.c:1303 g10/keygen.c:1438
-#: g10/keygen.c:3243
+#: g10/keygen.c:1185 g10/keygen.c:1301 g10/keygen.c:1309 g10/keygen.c:1447
+#: g10/keygen.c:3275
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
-#: g10/keygen.c:1329
+#: g10/keygen.c:1335
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1549
+#: g10/keygen.c:1558
msgid "Sign"
msgstr "签名"
-#: g10/keygen.c:1552
+#: g10/keygen.c:1561
msgid "Certify"
msgstr "验证"
-#: g10/keygen.c:1555
+#: g10/keygen.c:1564
msgid "Encrypt"
msgstr "加密"
-#: g10/keygen.c:1558
+#: g10/keygen.c:1567
msgid "Authenticate"
msgstr "认证"
@@ -4242,104 +4282,104 @@ msgstr "认证"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1576
+#: g10/keygen.c:1585
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1599
+#: g10/keygen.c:1608
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 密钥可能的操作:"
-#: g10/keygen.c:1603
+#: g10/keygen.c:1612
msgid "Current allowed actions: "
msgstr "目前允许的操作:"
-#: g10/keygen.c:1608
+#: g10/keygen.c:1617
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 选择是否用于签名\n"
-#: g10/keygen.c:1611
+#: g10/keygen.c:1620
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 选择是否用于加密\n"
-#: g10/keygen.c:1614
+#: g10/keygen.c:1623
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 选择是否用于认证\n"
-#: g10/keygen.c:1617
+#: g10/keygen.c:1626
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
-#: g10/keygen.c:1677 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1686 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "请选择您要使用的密钥种类:\n"
-#: g10/keygen.c:1680
+#: g10/keygen.c:1689
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1682
+#: g10/keygen.c:1691
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1684
+#: g10/keygen.c:1693
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (仅用于签名)\n"
-#: g10/keygen.c:1685
+#: g10/keygen.c:1694
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (仅用于签名)\n"
-#: g10/keygen.c:1689
+#: g10/keygen.c:1698
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (仅用于加密)\n"
-#: g10/keygen.c:1690
+#: g10/keygen.c:1699
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
-#: g10/keygen.c:1694
+#: g10/keygen.c:1703
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
-#: g10/keygen.c:1695
+#: g10/keygen.c:1704
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
-#: g10/keygen.c:1803
+#: g10/keygen.c:1812
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
-#: g10/keygen.c:1811
+#: g10/keygen.c:1820
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "您想要用多大的密钥尺寸?(%u)"
-#: g10/keygen.c:1814 sm/certreqgen-ui.c:179
+#: g10/keygen.c:1823 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "您想要用多大的密钥尺寸?(%u)"
-#: g10/keygen.c:1828 sm/certreqgen-ui.c:189
+#: g10/keygen.c:1837 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "您所要求的密钥尺寸是 %u 位\n"
-#: g10/keygen.c:1916
+#: g10/keygen.c:1925
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
@@ -4355,7 +4395,7 @@ msgstr ""
" <n>m = 密钥在 n 月后过期\n"
" <n>y = 密钥在 n 年后过期\n"
-#: g10/keygen.c:1927
+#: g10/keygen.c:1936
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
@@ -4371,38 +4411,38 @@ msgstr ""
" <n>m = 签名在 n 月后过期\n"
" <n>y = 签名在 n 年后过期\n"
-#: g10/keygen.c:1950
+#: g10/keygen.c:1959
msgid "Key is valid for? (0) "
msgstr "密钥的有效期限是?(0) "
-#: g10/keygen.c:1955
+#: g10/keygen.c:1964
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "签名的有效期限是多久?(%s) "
-#: g10/keygen.c:1973 g10/keygen.c:1998
+#: g10/keygen.c:1982 g10/keygen.c:2007
msgid "invalid value\n"
msgstr "无效的数值\n"
-#: g10/keygen.c:1980
+#: g10/keygen.c:1989
msgid "Key does not expire at all\n"
msgstr "密钥永远不会过期\n"
-#: g10/keygen.c:1981
+#: g10/keygen.c:1990
msgid "Signature does not expire at all\n"
msgstr "签名永远不会过期\n"
-#: g10/keygen.c:1986
+#: g10/keygen.c:1995
#, c-format
msgid "Key expires at %s\n"
msgstr "密钥于 %s 过期\n"
-#: g10/keygen.c:1987
+#: g10/keygen.c:1996
#, c-format
msgid "Signature expires at %s\n"
msgstr "签名于 %s 过期\n"
-#: g10/keygen.c:1991
+#: g10/keygen.c:2000
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
@@ -4410,11 +4450,11 @@ msgstr ""
"您的系统无法显示 2038 年以后的日期。\n"
"不过,它可以正确处理 2106 年之前的年份。\n"
-#: g10/keygen.c:2004
+#: g10/keygen.c:2013
msgid "Is this correct? (y/N) "
msgstr "以上正确吗?(y/n)"
-#: g10/keygen.c:2054
+#: g10/keygen.c:2063
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
@@ -4425,7 +4465,7 @@ msgstr ""
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2069
+#: g10/keygen.c:2078
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
@@ -4441,44 +4481,44 @@ msgstr ""
" “Heinrich Heine (Der Dichter) <[email protected]>”\n"
"\n"
-#: g10/keygen.c:2088
+#: g10/keygen.c:2097
msgid "Real name: "
msgstr "真实姓名:"
-#: g10/keygen.c:2096
+#: g10/keygen.c:2105
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:2098
+#: g10/keygen.c:2107
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:2100
+#: g10/keygen.c:2109
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:2108
+#: g10/keygen.c:2117
msgid "Email address: "
msgstr "电子邮件地址:"
-#: g10/keygen.c:2114
+#: g10/keygen.c:2123
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:2122
+#: g10/keygen.c:2131
msgid "Comment: "
msgstr "注释:"
-#: g10/keygen.c:2128
+#: g10/keygen.c:2137
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:2150
+#: g10/keygen.c:2159
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:2156
+#: g10/keygen.c:2165
#, c-format
msgid ""
"You selected this USER-ID:\n"
@@ -4489,11 +4529,11 @@ msgstr ""
" “%s”\n"
"\n"
-#: g10/keygen.c:2161
+#: g10/keygen.c:2170
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
-#: g10/keygen.c:2176
+#: g10/keygen.c:2185
msgid "Such a user ID already exists on this key!\n"
msgstr ""
@@ -4508,23 +4548,23 @@ msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2192
+#: g10/keygen.c:2201
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2202
+#: g10/keygen.c:2211
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)?"
-#: g10/keygen.c:2203
+#: g10/keygen.c:2212
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)?"
-#: g10/keygen.c:2222
+#: g10/keygen.c:2231
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:2264
+#: g10/keygen.c:2273
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
@@ -4532,19 +4572,19 @@ msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:2267
+#: g10/keygen.c:2276
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "请输入密码:这是一个秘密的句子 \n"
-#: g10/keygen.c:2283
+#: g10/keygen.c:2292
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2289
+#: g10/keygen.c:2298
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
@@ -4556,7 +4596,7 @@ msgstr ""
"再次执行这个程序,并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:2313
+#: g10/keygen.c:2322
msgid ""
"We need to generate a lot of random bytes. It is a good idea to perform\n"
"some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4566,50 +4606,50 @@ msgstr ""
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的),这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:3177 g10/keygen.c:3204
+#: g10/keygen.c:3209 g10/keygen.c:3236
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:3409 g10/keygen.c:3579
+#: g10/keygen.c:3441 g10/keygen.c:3611
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:3411 g10/keygen.c:3582
+#: g10/keygen.c:3443 g10/keygen.c:3614
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:3414 g10/keygen.c:3585
+#: g10/keygen.c:3446 g10/keygen.c:3617
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:3566
+#: g10/keygen.c:3598
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环:%s\n"
-#: g10/keygen.c:3573
+#: g10/keygen.c:3605
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环:%s\n"
-#: g10/keygen.c:3593
+#: g10/keygen.c:3625
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3601
+#: g10/keygen.c:3633
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误: %s\n"
-#: g10/keygen.c:3628
+#: g10/keygen.c:3661
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
-#: g10/keygen.c:3639
+#: g10/keygen.c:3672
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"
@@ -4617,42 +4657,42 @@ msgstr ""
"请注意这把密钥还不能用来加密,您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3652 g10/keygen.c:3798 g10/keygen.c:3919
+#: g10/keygen.c:3685 g10/keygen.c:3831 g10/keygen.c:3952
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败:%s\n"
-#: g10/keygen.c:3708 g10/keygen.c:3849 g10/sign.c:241
+#: g10/keygen.c:3741 g10/keygen.c:3882 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:3710 g10/keygen.c:3851 g10/sign.c:243
+#: g10/keygen.c:3743 g10/keygen.c:3884 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:3721 g10/keygen.c:3862
+#: g10/keygen.c:3754 g10/keygen.c:3895
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意:为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3762 g10/keygen.c:3895
+#: g10/keygen.c:3795 g10/keygen.c:3928
msgid "Really create? (y/N) "
msgstr "真的要建立吗?(y/N)"
-#: g10/keygen.c:4083
+#: g10/keygen.c:4116
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败:%s\n"
-#: g10/keygen.c:4132
+#: g10/keygen.c:4165
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’:%s\n"
-#: g10/keygen.c:4158
+#: g10/keygen.c:4191
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意:卡密钥的备份已保存到‘%s’\n"
@@ -5289,12 +5329,17 @@ msgstr "警告:潜在不安全的对称加密会话密钥\n"
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
-#: g10/passphrase.c:292 g10/passphrase.c:553
+#: g10/passphrase.c:75 g10/passphrase.c:418 g10/passphrase.c:481
+#, fuzzy, c-format
+msgid "problem with the agent: %s\n"
+msgstr "代理程序有问题――正在停用代理程序\n"
+
+#: g10/passphrase.c:344 g10/passphrase.c:613
#, c-format
msgid " (main key ID %s)"
msgstr " (主钥匙号 %s)"
-#: g10/passphrase.c:306
+#: g10/passphrase.c:358
#, fuzzy, c-format
msgid ""
"Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5307,32 +5352,27 @@ msgstr ""
"“%.*s”\n"
"%u 位的 %s 密钥,钥匙号 %s,建立于 %s%s\n"
-#: g10/passphrase.c:332
+#: g10/passphrase.c:384
msgid "Enter passphrase\n"
msgstr "请输入密码\n"
-#: g10/passphrase.c:360
+#: g10/passphrase.c:412
msgid "cancelled by user\n"
msgstr "用户取消\n"
-#: g10/passphrase.c:366 g10/passphrase.c:429
-#, fuzzy, c-format
-msgid "problem with the agent: %s\n"
-msgstr "代理程序有问题――正在停用代理程序\n"
-
-#: g10/passphrase.c:532
+#: g10/passphrase.c:592
#, c-format
msgid ""
"You need a passphrase to unlock the secret key for\n"
"user: \"%s\"\n"
msgstr "您需要输入密码,才能解开这个用户的私钥:“%s”\n"
-#: g10/passphrase.c:540
+#: g10/passphrase.c:600
#, c-format
msgid "%u-bit %s key, ID %s, created %s"
msgstr "%u 位的 %s 密钥,钥匙号 %s,建立于 %s"
-#: g10/passphrase.c:549
+#: g10/passphrase.c:609
#, c-format
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
@@ -5916,27 +5956,27 @@ msgid ""
"key %s was created %lu seconds in the future (time warp or clock problem)\n"
msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/sig-check.c:235
+#: g10/sig-check.c:239
#, c-format
msgid "NOTE: signature key %s expired %s\n"
msgstr "注意:签名密钥 %s 已于 %s 过期\n"
-#: g10/sig-check.c:248
+#: g10/sig-check.c:252
#, fuzzy, c-format
msgid "NOTE: signature key %s has been revoked\n"
msgstr "注意:密钥已被吊销"
-#: g10/sig-check.c:324
+#: g10/sig-check.c:328
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
-#: g10/sig-check.c:590
+#: g10/sig-check.c:594
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "密钥 %s:没有子钥吊销签名所需的子钥\n"
-#: g10/sig-check.c:617
+#: g10/sig-check.c:621
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "密钥 %s:没有子钥绑定签名所需的子钥\n"
@@ -6064,12 +6104,12 @@ msgstr "读取‘%s’错误:%s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "信任度数据库:同步失败:%s\n"
-#: g10/tdbio.c:128 g10/tdbio.c:1449
+#: g10/tdbio.c:128 g10/tdbio.c:1450
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任度数据库记录 %lu:lseek 失败:%s\n"
-#: g10/tdbio.c:135 g10/tdbio.c:1456
+#: g10/tdbio.c:135 g10/tdbio.c:1457
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信任度数据库记录 %lu:write 失败 (n=%d): %s\n"
@@ -6083,112 +6123,112 @@ msgstr "信任度数据库处理量过大\n"
msgid "can't access `%s': %s\n"
msgstr "无法存取‘%s’:%s\n"
-#: g10/tdbio.c:524
+#: g10/tdbio.c:525
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s:目录不存在!\n"
-#: g10/tdbio.c:534 g10/tdbio.c:557 g10/tdbio.c:598 sm/keydb.c:221
+#: g10/tdbio.c:535 g10/tdbio.c:558 g10/tdbio.c:599 sm/keydb.c:221
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "不能为‘%s’创建锁定\n"
-#: g10/tdbio.c:536 g10/tdbio.c:601
+#: g10/tdbio.c:537 g10/tdbio.c:602
#, c-format
msgid "can't lock `%s'\n"
msgstr "无法锁定‘%s’\n"
-#: g10/tdbio.c:562
+#: g10/tdbio.c:563
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s:建立版本记录失败:%s"
-#: g10/tdbio.c:566
+#: g10/tdbio.c:567
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s:建立了无效的信任度数据库\n"
-#: g10/tdbio.c:569
+#: g10/tdbio.c:570
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s:建立了信任度数据库\n"
-#: g10/tdbio.c:612
+#: g10/tdbio.c:613
msgid "NOTE: trustdb not writable\n"
msgstr "注意:信任度数据库不可写入\n"
-#: g10/tdbio.c:620
+#: g10/tdbio.c:621
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s:无效的信任度数据库\n"
-#: g10/tdbio.c:652
+#: g10/tdbio.c:653
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s:建立散列表失败:%s\n"
-#: g10/tdbio.c:660
+#: g10/tdbio.c:661
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s:更新版本记录时出错: %s\n"
-#: g10/tdbio.c:677 g10/tdbio.c:697 g10/tdbio.c:713 g10/tdbio.c:727
-#: g10/tdbio.c:757 g10/tdbio.c:1381 g10/tdbio.c:1408
+#: g10/tdbio.c:678 g10/tdbio.c:698 g10/tdbio.c:714 g10/tdbio.c:728
+#: g10/tdbio.c:758 g10/tdbio.c:1382 g10/tdbio.c:1409
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s:读取版本记录时出错: %s\n"
-#: g10/tdbio.c:736
+#: g10/tdbio.c:737
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s:写入版本记录时出错:%s\n"
-#: g10/tdbio.c:1176
+#: g10/tdbio.c:1177
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信任度数据库:lseek 失败:%s\n"
-#: g10/tdbio.c:1185
+#: g10/tdbio.c:1186
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信任度数据库:read 失败(n=%d):%s\n"
-#: g10/tdbio.c:1206
+#: g10/tdbio.c:1207
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s:不是一个信任度数据库文件\n"
-#: g10/tdbio.c:1224
+#: g10/tdbio.c:1225
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s:记录编号为%lu的版本记录\n"
-#: g10/tdbio.c:1229
+#: g10/tdbio.c:1230
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s:无效的文件版本%d\n"
-#: g10/tdbio.c:1414
+#: g10/tdbio.c:1415
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s:读取自由记录时出错:%s\n"
-#: g10/tdbio.c:1422
+#: g10/tdbio.c:1423
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s:写入目录记录时出错:%s\n"
-#: g10/tdbio.c:1432
+#: g10/tdbio.c:1433
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s:记录归零时失败:%s\n"
-#: g10/tdbio.c:1462
+#: g10/tdbio.c:1463
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s:附加记录时失败:%s\n"
-#: g10/tdbio.c:1505
+#: g10/tdbio.c:1506
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s:建立了信任度数据库\n"
@@ -6819,7 +6859,7 @@ msgstr "新的 PIN"
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:118 sm/gpgsm.c:313
+#: scd/scdaemon.c:118 sm/gpgsm.c:316
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
@@ -6916,244 +6956,244 @@ msgstr ""
msgid "validation model requested by certificate: %s"
msgstr ""
-#: sm/certchain.c:197 sm/certchain.c:1813
+#: sm/certchain.c:197 sm/certchain.c:1828
msgid "chain"
msgstr ""
-#: sm/certchain.c:198 sm/certchain.c:1813
+#: sm/certchain.c:198 sm/certchain.c:1828
msgid "shell"
msgstr ""
-#: sm/certchain.c:243
+#: sm/certchain.c:258
#, fuzzy, c-format
msgid "critical certificate extension %s is not supported"
msgstr "不支持 gpg-agent 协议版本 %d\n"
-#: sm/certchain.c:282
+#: sm/certchain.c:297
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: sm/certchain.c:320
+#: sm/certchain.c:335
msgid "critical marked policy without configured policies"
msgstr ""
-#: sm/certchain.c:330
+#: sm/certchain.c:345
#, fuzzy, c-format
msgid "failed to open `%s': %s\n"
msgstr "无法打开‘%s’:%s\n"
-#: sm/certchain.c:338 sm/certchain.c:367
+#: sm/certchain.c:353 sm/certchain.c:382
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: sm/certchain.c:342 sm/certchain.c:371
+#: sm/certchain.c:357 sm/certchain.c:386
#, fuzzy
msgid "certificate policy not allowed"
msgstr "不允许导出私钥\n"
-#: sm/certchain.c:483
+#: sm/certchain.c:498
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:502
+#: sm/certchain.c:517
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:546
+#: sm/certchain.c:561
msgid "looking up issuer from the Dirmngr cache\n"
msgstr ""
-#: sm/certchain.c:570
+#: sm/certchain.c:585
#, fuzzy, c-format
msgid "number of matching certificates: %d\n"
msgstr "生成密码的时候发生错误:%s\n"
-#: sm/certchain.c:572
+#: sm/certchain.c:587
#, fuzzy, c-format
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "无法读出公钥:%s\n"
-#: sm/certchain.c:744 sm/certchain.c:1237 sm/certchain.c:1841 sm/decrypt.c:259
-#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
+#: sm/certchain.c:759 sm/certchain.c:1252 sm/certchain.c:1856 sm/decrypt.c:261
+#: sm/encrypt.c:335 sm/sign.c:335 sm/verify.c:113
#, fuzzy
msgid "failed to allocated keyDB handle\n"
msgstr "无法存储密钥:%s\n"
-#: sm/certchain.c:910
+#: sm/certchain.c:925
#, fuzzy
msgid "certificate has been revoked"
msgstr "注意:密钥已被吊销"
-#: sm/certchain.c:925
+#: sm/certchain.c:940
msgid "the status of the certificate is unknown"
msgstr ""
-#: sm/certchain.c:932
+#: sm/certchain.c:947
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:938
+#: sm/certchain.c:953
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:967 sm/certchain.c:1035
+#: sm/certchain.c:982 sm/certchain.c:1050
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:982 sm/certchain.c:1067
+#: sm/certchain.c:997 sm/certchain.c:1082
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:983 sm/certchain.c:1068
+#: sm/certchain.c:998 sm/certchain.c:1083
#, fuzzy
msgid "root certificate not yet valid"
msgstr "不允许导出私钥\n"
-#: sm/certchain.c:984 sm/certchain.c:1069
+#: sm/certchain.c:999 sm/certchain.c:1084
msgid "intermediate certificate not yet valid"
msgstr ""
-#: sm/certchain.c:997
+#: sm/certchain.c:1012
#, fuzzy
msgid "certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:998
+#: sm/certchain.c:1013
#, fuzzy
msgid "root certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:999
+#: sm/certchain.c:1014
#, fuzzy
msgid "intermediate certificate has expired"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:1041
+#: sm/certchain.c:1056
#, c-format
msgid "required certificate attributes missing: %s%s%s"
msgstr ""
-#: sm/certchain.c:1050
+#: sm/certchain.c:1065
#, fuzzy
msgid "certificate with invalid validity"
msgstr "这把密钥已经过期!"
-#: sm/certchain.c:1087
+#: sm/certchain.c:1102
msgid "signature not created during lifetime of certificate"
msgstr ""
-#: sm/certchain.c:1089
+#: sm/certchain.c:1104
msgid "certificate not created during lifetime of issuer"
msgstr ""
-#: sm/certchain.c:1090
+#: sm/certchain.c:1105
msgid "intermediate certificate not created during lifetime of issuer"
msgstr ""
-#: sm/certchain.c:1094
+#: sm/certchain.c:1109
#, fuzzy
msgid " ( signature created at "
msgstr " 清除的签名:%lu\n"
-#: sm/certchain.c:1095
+#: sm/certchain.c:1110
#, fuzzy
msgid " (certificate created at "
msgstr "已建立吊销证书。\n"
-#: sm/certchain.c:1098
+#: sm/certchain.c:1113
#, fuzzy
msgid " (certificate valid from "
msgstr "证书已损坏"
-#: sm/certchain.c:1099
+#: sm/certchain.c:1114
#, fuzzy
msgid " ( issuer valid from "
msgstr "卡序列号 ="
-#: sm/certchain.c:1129
+#: sm/certchain.c:1144
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA 指纹:"
-#: sm/certchain.c:1138
+#: sm/certchain.c:1153
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:1151
+#: sm/certchain.c:1166
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:1157
+#: sm/certchain.c:1172
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:1214
+#: sm/certchain.c:1229
msgid "WARNING: creation time of signature not known - assuming current time"
msgstr ""
-#: sm/certchain.c:1278
+#: sm/certchain.c:1293
#, fuzzy
msgid "no issuer found in certificate"
msgstr "生成一份吊销证书"
-#: sm/certchain.c:1351
+#: sm/certchain.c:1366
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:1420
+#: sm/certchain.c:1435
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:1433
+#: sm/certchain.c:1448
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/certchain.c:1462 sm/import.c:160
+#: sm/certchain.c:1477 sm/import.c:160
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1474
+#: sm/certchain.c:1489
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1507
+#: sm/certchain.c:1522
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "验证签名"
-#: sm/certchain.c:1538
+#: sm/certchain.c:1553
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1589
+#: sm/certchain.c:1604
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certchain.c:1629 sm/certchain.c:1912
+#: sm/certchain.c:1644 sm/certchain.c:1927
#, fuzzy
msgid "certificate is good\n"
msgstr "首选项‘%s’重复\n"
-#: sm/certchain.c:1630
+#: sm/certchain.c:1645
#, fuzzy
msgid "intermediate certificate is good\n"
msgstr "已建立吊销证书。\n"
-#: sm/certchain.c:1631
+#: sm/certchain.c:1646
#, fuzzy
msgid "root certificate is good\n"
msgstr "证书已损坏"
-#: sm/certchain.c:1802
+#: sm/certchain.c:1817
msgid "switching to chain model"
msgstr ""
-#: sm/certchain.c:1811
+#: sm/certchain.c:1826
#, c-format
msgid "validation model used: %s"
msgstr ""
@@ -7427,11 +7467,11 @@ msgstr ""
msgid "resource problem: out of core\n"
msgstr ""
-#: sm/decrypt.c:324
+#: sm/decrypt.c:330
msgid "(this is the RC2 algorithm)\n"
msgstr ""
-#: sm/decrypt.c:326
+#: sm/decrypt.c:332
msgid "(this does not seem to be an encrypted message)\n"
msgstr ""
@@ -7465,143 +7505,143 @@ msgstr "删除密钥区块时失败:%s\n"
msgid "no valid recipients given\n"
msgstr "(不给定描述)\n"
-#: sm/gpgsm.c:195
+#: sm/gpgsm.c:197
#, fuzzy
msgid "list external keys"
msgstr "列出私钥"
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:199
#, fuzzy
msgid "list certificate chain"
msgstr "证书已损坏"
-#: sm/gpgsm.c:204
+#: sm/gpgsm.c:206
#, fuzzy
msgid "import certificates"
msgstr "证书已损坏"
-#: sm/gpgsm.c:205
+#: sm/gpgsm.c:207
#, fuzzy
msgid "export certificates"
msgstr "证书已损坏"
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:209
#, fuzzy
msgid "register a smartcard"
msgstr "在智能卡上添加一把密钥"
-#: sm/gpgsm.c:210
+#: sm/gpgsm.c:212
msgid "pass a command to the dirmngr"
msgstr ""
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:214
msgid "invoke gpg-protect-tool"
msgstr ""
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
-#: sm/gpgsm.c:228
+#: sm/gpgsm.c:230
#, fuzzy
msgid "create base-64 encoded output"
msgstr "输出经 ASCII 封装"
-#: sm/gpgsm.c:233
+#: sm/gpgsm.c:235
msgid "assume input is in PEM format"
msgstr ""
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
msgid "assume input is in base-64 format"
msgstr ""
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:239
msgid "assume input is in binary format"
msgstr ""
-#: sm/gpgsm.c:242
+#: sm/gpgsm.c:244
msgid "use system's dirmngr if available"
msgstr ""
-#: sm/gpgsm.c:245
+#: sm/gpgsm.c:247
msgid "never consult a CRL"
msgstr ""
-#: sm/gpgsm.c:255
+#: sm/gpgsm.c:257
msgid "check validity using OCSP"
msgstr ""
-#: sm/gpgsm.c:260
+#: sm/gpgsm.c:262
msgid "|N|number of certificates to include"
msgstr ""
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
msgid "|FILE|take policy information from FILE"
msgstr ""
-#: sm/gpgsm.c:266
+#: sm/gpgsm.c:268
msgid "do not check certificate policies"
msgstr ""
-#: sm/gpgsm.c:270
+#: sm/gpgsm.c:272
msgid "fetch missing issuer certificates"
msgstr ""
-#: sm/gpgsm.c:281
+#: sm/gpgsm.c:283
msgid "don't use the terminal at all"
msgstr ""
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:285
msgid "|FILE|write a server mode log to FILE"
msgstr ""
-#: sm/gpgsm.c:288
+#: sm/gpgsm.c:290
#, fuzzy
msgid "|FILE|write an audit log to FILE"
msgstr "从‘%s’读取选项\n"
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:293
msgid "batch mode: never ask"
msgstr ""
-#: sm/gpgsm.c:291
+#: sm/gpgsm.c:294
msgid "assume yes on most questions"
msgstr ""
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:295
msgid "assume no on most questions"
msgstr ""
-#: sm/gpgsm.c:295
+#: sm/gpgsm.c:298
#, fuzzy
msgid "|FILE|add keyring to the list of keyrings"
msgstr "从这个钥匙环里取用密钥"
-#: sm/gpgsm.c:298
+#: sm/gpgsm.c:301
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
-#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:311 tools/gpgconf-comp.c:745
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:329
#, fuzzy
msgid "|NAME|use cipher algorithm NAME"
msgstr "未知的对称加密算法"
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:331
#, fuzzy
msgid "|NAME|use message digest algorithm NAME"
msgstr "%s 签名,散列算法 %s\n"
-#: sm/gpgsm.c:518
+#: sm/gpgsm.c:522
#, fuzzy
msgid "Usage: gpgsm [options] [files] (-h for help)"
msgstr "用法: gpg [选项] [文件] (用 -h 求助)"
-#: sm/gpgsm.c:521
+#: sm/gpgsm.c:525
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
@@ -7612,56 +7652,56 @@ msgstr ""
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: sm/gpgsm.c:613
+#: sm/gpgsm.c:617
#, fuzzy
msgid "usage: gpgsm [options] "
msgstr "用法:gpg [选项] "
-#: sm/gpgsm.c:735
+#: sm/gpgsm.c:739
#, fuzzy, c-format
msgid "NOTE: won't be able to encrypt to `%s': %s\n"
msgstr "无法连接至‘%s’:%s\n"
-#: sm/gpgsm.c:746
+#: sm/gpgsm.c:750
#, fuzzy, c-format
msgid "unknown validation model `%s'\n"
msgstr "未知的选项 '%s'\n"
-#: sm/gpgsm.c:797
+#: sm/gpgsm.c:801
#, fuzzy, c-format
msgid "%s:%u: no hostname given\n"
msgstr "(不给定描述)\n"
-#: sm/gpgsm.c:816
+#: sm/gpgsm.c:820
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: sm/gpgsm.c:837
+#: sm/gpgsm.c:841
#, fuzzy, c-format
msgid "%s:%u: skipping this line\n"
msgstr " s = 跳过这把密钥\n"
-#: sm/gpgsm.c:1367
+#: sm/gpgsm.c:1374
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "无法解析公钥服务器 URL\n"
-#: sm/gpgsm.c:1448
+#: sm/gpgsm.c:1454
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1548
+#: sm/gpgsm.c:1554
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1586
+#: sm/gpgsm.c:1595
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "无法存取‘%s’:%s\n"
-#: sm/gpgsm.c:1918
+#: sm/gpgsm.c:1931
msgid "invalid command (there is no implicit command)\n"
msgstr ""
@@ -7772,7 +7812,7 @@ msgid ""
"%s%sAre you really sure that you want to do this?"
msgstr ""
-#: sm/qualified.c:211 sm/verify.c:612
+#: sm/qualified.c:211 sm/verify.c:616
msgid ""
"Note, that this software is not officially approved to create or verify such "
"signatures.\n"
@@ -7786,51 +7826,51 @@ msgid ""
"Note, that this certificate will NOT create a qualified signature!"
msgstr ""
-#: sm/sign.c:441
+#: sm/sign.c:449
#, fuzzy, c-format
msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
msgstr "保护算法 %d%s 未被支持\n"
-#: sm/sign.c:455
+#: sm/sign.c:463
#, c-format
msgid "hash algorithm used for signer %d: %s (%s)\n"
msgstr ""
-#: sm/sign.c:505
+#: sm/sign.c:513
#, fuzzy, c-format
msgid "checking for qualified certificate failed: %s\n"
msgstr "检查已建立的签名时发生错误: %s\n"
-#: sm/verify.c:447
+#: sm/verify.c:449
#, fuzzy
msgid "Signature made "
msgstr "签名建立于 %s\n"
-#: sm/verify.c:451
+#: sm/verify.c:453
msgid "[date not given]"
msgstr ""
-#: sm/verify.c:452
+#: sm/verify.c:454
#, fuzzy, c-format
msgid " using certificate ID 0x%08lX\n"
msgstr "取得当前密钥信息时出错:%s\n"
-#: sm/verify.c:470
+#: sm/verify.c:473
msgid ""
"invalid signature: message digest attribute does not match computed one\n"
msgstr ""
-#: sm/verify.c:590
+#: sm/verify.c:594
#, fuzzy
msgid "Good signature from"
msgstr "完好的签名,来自于“%s”"
-#: sm/verify.c:591
+#: sm/verify.c:595
#, fuzzy
msgid " aka"
msgstr " 亦即“%s”"
-#: sm/verify.c:609
+#: sm/verify.c:613
#, fuzzy
msgid "This is a qualified signature\n"
msgstr "这将是一个自身签名。\n"