diff options
Diffstat (limited to 'po/zh_CN.po')
| -rw-r--r-- | po/zh_CN.po | 3237 |
1 files changed, 1646 insertions, 1591 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index dca014c..bf70020 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnupg 2.2.28\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2022-10-10 11:58+0200\n" -"PO-Revision-Date: 2022-04-26 13:27+0800\n" +"POT-Creation-Date: 2024-04-16 10:11+0200\n" +"PO-Revision-Date: 2024-04-09 13:35+0200\n" "Last-Translator: bobwxc <bobwxc@yeah.net>\n" "Language-Team: None\n" "Language: zh_CN\n" @@ -22,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.4.2\n" -#: agent/call-pinentry.c:338 +#: agent/call-pinentry.c:340 #, c-format msgid "failed to acquire the pinentry lock: %s\n" msgstr "获取 pinentry 锁失败: %s\n" @@ -33,45 +33,49 @@ msgstr "获取 pinentry 锁失败: %s\n" #. a literal one. The actual to be translated text starts after #. the second vertical bar. Note that gpg-agent has been set to #. utf-8 so that the strings are in the expected encoding. -#: agent/call-pinentry.c:544 +#: agent/call-pinentry.c:546 msgid "|pinentry-label|_OK" msgstr "|pinentry-label|确认(_O)" -#: agent/call-pinentry.c:545 +#: agent/call-pinentry.c:547 msgid "|pinentry-label|_Cancel" msgstr "|pinentry-label|取消(_C)" -#: agent/call-pinentry.c:546 +#: agent/call-pinentry.c:548 msgid "|pinentry-label|_Yes" msgstr "|pinentry-label|是(_Y)" -#: agent/call-pinentry.c:547 +#: agent/call-pinentry.c:549 msgid "|pinentry-label|_No" msgstr "|pinentry-label|否(_N)" -#: agent/call-pinentry.c:548 +#: agent/call-pinentry.c:550 msgid "|pinentry-label|PIN:" msgstr "|pinentry-label|PIN：" -#: agent/call-pinentry.c:549 +#: agent/call-pinentry.c:551 msgid "|pinentry-label|_Save in password manager" msgstr "|pinentry-label|在密码管理器中保存(_S)" -#: agent/call-pinentry.c:550 +#: agent/call-pinentry.c:552 msgid "Do you really want to make your passphrase visible on the screen?" msgstr "您真的想要使您的密码在屏幕上可见吗？" -#: agent/call-pinentry.c:552 +#: agent/call-pinentry.c:554 msgid "|pinentry-tt|Make passphrase visible" msgstr "|pinentry-tt|使密码可见" -#: agent/call-pinentry.c:553 +#: agent/call-pinentry.c:555 msgid "|pinentry-tt|Hide passphrase" msgstr "|pinentry-tt|隐藏密码" +#: agent/call-pinentry.c:556 +msgid "Caps Lock is on" +msgstr "" + #. TRANSLATORS: This string is displayed by Pinentry as the label #. for generating a passphrase. -#: agent/call-pinentry.c:1007 +#: agent/call-pinentry.c:1009 msgid "Suggest" msgstr "建议" @@ -82,24 +86,24 @@ msgstr "建议" #. translate this entry, a default English text (see source) #. will be used. The strcmp thingy is there to detect a #. non-translated string. -#: agent/call-pinentry.c:1029 +#: agent/call-pinentry.c:1031 msgid "pinentry.genpin.tooltip" msgstr "使用随机生成的密码" -#: agent/call-pinentry.c:1057 +#: agent/call-pinentry.c:1059 msgid "Note: The blanks are not part of the passphrase." msgstr "注意：密码不允许含有空格。" #. TRANSLATORS: This is a text shown by pinentry as title of a dialog #. telling the user that the entered new passphrase does not satisfy #. the passphrase constraints. Please keep it short. -#: agent/call-pinentry.c:1116 +#: agent/call-pinentry.c:1118 msgid "Passphrase Not Allowed" msgstr "不允许的密码" #. TRANSLATORS: This string is displayed by Pinentry as the label #. for the quality bar. -#: agent/call-pinentry.c:1183 +#: agent/call-pinentry.c:1185 msgid "Quality:" msgstr "强度：" @@ -109,35 +113,35 @@ msgstr "强度：" #. tooltip is limited to about 900 characters. If you do not #. translate this entry, a default english text (see source) #. will be used. -#: agent/call-pinentry.c:1204 +#: agent/call-pinentry.c:1206 msgid "pinentry.qualitybar.tooltip" msgstr "" "上方输入的文本的质量。\n" "请向管理员咨询详细相关准则。" -#: agent/call-pinentry.c:1367 +#: agent/call-pinentry.c:1369 msgid "" "Please enter your PIN, so that the secret key can be unlocked for this " "session" msgstr "请输入您的 PIN，从而为此会话解锁私钥" -#: agent/call-pinentry.c:1370 +#: agent/call-pinentry.c:1372 msgid "" "Please enter your passphrase, so that the secret key can be unlocked for " "this session" msgstr "请输入您的密码，从而为此会话解锁私钥" -#: agent/call-pinentry.c:1407 agent/call-pinentry.c:1615 +#: agent/call-pinentry.c:1409 agent/call-pinentry.c:1617 msgid "PIN:" msgstr "PIN：" -#: agent/call-pinentry.c:1407 agent/call-pinentry.c:1615 -#: agent/protect-tool.c:724 +#: agent/call-pinentry.c:1409 agent/call-pinentry.c:1617 +#: agent/protect-tool.c:722 msgid "Passphrase:" msgstr "密码：" -#: agent/call-pinentry.c:1434 agent/call-pinentry.c:1693 agent/command.c:1676 -#: agent/command.c:1735 agent/command-ssh.c:3151 agent/genkey.c:447 +#: agent/call-pinentry.c:1436 agent/call-pinentry.c:1695 agent/command.c:1666 +#: agent/command.c:1725 agent/command-ssh.c:3151 agent/genkey.c:447 msgid "does not match - try again" msgstr "不匹配 - 请重试" @@ -148,37 +152,37 @@ msgstr "不匹配 - 请重试" #. TRANSLATORS: The string is appended to an error message in #. the pinentry. The %s is the actual error message, the #. two %d give the current and maximum number of tries. -#: agent/call-pinentry.c:1457 agent/call-pinentry.c:1721 +#: agent/call-pinentry.c:1459 agent/call-pinentry.c:1723 #, c-format msgid "SETERROR %s (try %d of %d)" msgstr "SETERROR %s（尝试第%d个，共%d个）" -#: agent/call-pinentry.c:1468 agent/call-pinentry.c:1732 +#: agent/call-pinentry.c:1470 agent/call-pinentry.c:1734 msgid "Repeat:" msgstr "重复：" -#: agent/call-pinentry.c:1480 agent/call-pinentry.c:1492 -#: agent/call-pinentry.c:1744 agent/call-pinentry.c:1756 +#: agent/call-pinentry.c:1482 agent/call-pinentry.c:1494 +#: agent/call-pinentry.c:1746 agent/call-pinentry.c:1758 msgid "PIN too long" msgstr "PIN 太长" -#: agent/call-pinentry.c:1481 agent/call-pinentry.c:1745 +#: agent/call-pinentry.c:1483 agent/call-pinentry.c:1747 msgid "Passphrase too long" msgstr "密码太长" -#: agent/call-pinentry.c:1489 agent/call-pinentry.c:1753 +#: agent/call-pinentry.c:1491 agent/call-pinentry.c:1755 msgid "Invalid characters in PIN" msgstr "PIN 中含有无效字符" -#: agent/call-pinentry.c:1494 agent/call-pinentry.c:1758 +#: agent/call-pinentry.c:1496 agent/call-pinentry.c:1760 msgid "PIN too short" msgstr "PIN 太短" -#: agent/call-pinentry.c:1513 agent/call-pinentry.c:1776 +#: agent/call-pinentry.c:1515 agent/call-pinentry.c:1778 msgid "Bad PIN" msgstr "错误的 PIN" -#: agent/call-pinentry.c:1513 agent/call-pinentry.c:1776 +#: agent/call-pinentry.c:1515 agent/call-pinentry.c:1778 msgid "Bad Passphrase" msgstr "错误的密码" @@ -190,26 +194,26 @@ msgstr "注意：来自网络浏览器的请求。" msgid "Note: Request from a remote site." msgstr "注意：来自远程站点的请求。" -#: agent/command.c:1014 agent/command-ssh.c:2391 agent/command-ssh.c:2437 +#: agent/command.c:1013 agent/command-ssh.c:2391 agent/command-ssh.c:2437 #: agent/command-ssh.c:2455 agent/command-ssh.c:2612 g10/card-util.c:697 #: g10/card-util.c:718 g10/skclist.c:435 #, c-format msgid "error getting serial number of card: %s\n" msgstr "获取卡的序列号时出现错误： %s\n" -#: agent/command.c:1503 agent/command.c:1668 agent/command-ssh.c:3079 +#: agent/command.c:1493 agent/command.c:1658 agent/command-ssh.c:3079 #: agent/genkey.c:382 msgid "Please re-enter this passphrase" msgstr "请重新输入此密码" -#: agent/command.c:2423 +#: agent/command.c:2415 #, c-format msgid "" "Please enter the passphrase to protect the imported object within the %s " "system." msgstr "请输入密码以在 %s 系统内部保护已导入的对象。" -#: agent/command.c:2553 +#: agent/command.c:2545 msgid "" "This key (or subkey) is not protected with a passphrase. Please enter a new " "passphrase to export it." @@ -220,25 +224,25 @@ msgstr "此密钥（或子密钥）未受密码保护。请输入新的密码以 msgid "ssh keys greater than %d bits are not supported\n" msgstr "长度超过 %d 位的 ssh 密钥不被支持\n" -#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:947 -#: g10/exec.c:554 g10/export.c:1320 g10/gpg.c:1400 g10/keygen.c:4998 -#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1008 -#: g10/sign.c:1322 g10/tdbio.c:753 +#: agent/command-ssh.c:862 common/dotlock.c:856 g10/card-util.c:946 +#: g10/exec.c:554 g10/export.c:1335 g10/gpg.c:1420 g10/keygen.c:5279 +#: g10/keyring.c:1322 g10/keyring.c:1637 g10/openfile.c:291 g10/sign.c:1025 +#: g10/sign.c:1353 g10/tdbio.c:753 #, c-format msgid "can't create '%s': %s\n" msgstr "无法创建 ‘%s’： %s\n" -#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:904 +#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:903 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136 -#: g10/decrypt.c:153 g10/encrypt.c:239 g10/encrypt.c:678 g10/gpg.c:1401 -#: g10/import.c:364 g10/import.c:548 g10/import.c:776 g10/keygen.c:4036 +#: g10/decrypt.c:153 g10/encrypt.c:366 g10/encrypt.c:853 g10/gpg.c:1421 +#: g10/import.c:365 g10/import.c:549 g10/import.c:777 g10/keygen.c:4290 #: g10/keyring.c:1663 g10/openfile.c:195 g10/openfile.c:209 g10/plaintext.c:128 -#: g10/plaintext.c:649 g10/sign.c:990 g10/sign.c:1201 g10/sign.c:1306 -#: g10/sign.c:1451 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758 -#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2160 -#: sm/gpgsm.c:2190 sm/gpgsm.c:2228 sm/qualified.c:66 dirmngr/certcache.c:420 -#: dirmngr/certcache.c:502 dirmngr/certcache.c:504 dirmngr/crlcache.c:2588 -#: dirmngr/dirmngr.c:1812 +#: g10/plaintext.c:654 g10/sign.c:997 g10/sign.c:1230 g10/sign.c:1337 +#: g10/sign.c:1482 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758 +#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2194 +#: sm/gpgsm.c:2224 sm/gpgsm.c:2262 sm/qualified.c:66 dirmngr/certcache.c:420 +#: dirmngr/certcache.c:502 dirmngr/certcache.c:504 dirmngr/crlcache.c:2661 +#: dirmngr/dirmngr.c:1851 #, c-format msgid "can't open '%s': %s\n" msgstr "无法打开 ‘%s’： %s\n" @@ -419,207 +423,207 @@ msgstr "请输入密码以%0A保护您的新密钥" msgid "Please enter the new passphrase" msgstr "请输入新的密码" -#: agent/gpg-agent.c:167 scd/scdaemon.c:116 dirmngr/dirmngr.c:185 +#: agent/gpg-agent.c:165 scd/scdaemon.c:116 dirmngr/dirmngr.c:187 msgid "Options used for startup" msgstr "启动选项" -#: agent/gpg-agent.c:169 scd/scdaemon.c:121 dirmngr/dirmngr.c:174 +#: agent/gpg-agent.c:167 scd/scdaemon.c:121 dirmngr/dirmngr.c:176 msgid "run in daemon mode (background)" msgstr "以守护进程模式运行 （后台）" -#: agent/gpg-agent.c:170 scd/scdaemon.c:118 dirmngr/dirmngr.c:173 +#: agent/gpg-agent.c:168 scd/scdaemon.c:118 dirmngr/dirmngr.c:175 msgid "run in server mode (foreground)" msgstr "以服务进程模式运行 （前台）" -#: agent/gpg-agent.c:172 dirmngr/dirmngr.c:176 +#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:178 msgid "run in supervised mode" msgstr "以管理进程模式运行" -#: agent/gpg-agent.c:174 scd/scdaemon.c:122 dirmngr/dirmngr.c:187 +#: agent/gpg-agent.c:172 scd/scdaemon.c:122 dirmngr/dirmngr.c:189 msgid "do not detach from the console" msgstr "请勿离开控制台" -#: agent/gpg-agent.c:175 scd/scdaemon.c:123 dirmngr/dirmngr.c:188 +#: agent/gpg-agent.c:173 scd/scdaemon.c:123 dirmngr/dirmngr.c:190 msgid "sh-style command output" msgstr "sh 风格的命令行输出" -#: agent/gpg-agent.c:176 scd/scdaemon.c:124 dirmngr/dirmngr.c:189 +#: agent/gpg-agent.c:174 scd/scdaemon.c:124 dirmngr/dirmngr.c:191 msgid "csh-style command output" msgstr "csh 风格的命令行输出" -#: agent/gpg-agent.c:185 g10/gpg.c:579 scd/scdaemon.c:126 sm/gpgsm.c:410 -#: dirmngr/dirmngr.c:192 +#: agent/gpg-agent.c:183 g10/gpg.c:587 scd/scdaemon.c:126 sm/gpgsm.c:415 +#: dirmngr/dirmngr.c:194 msgid "|FILE|read options from FILE" msgstr "|FILE|从 FILE 中读取选项" -#: agent/gpg-agent.c:189 g10/gpg.c:566 scd/scdaemon.c:130 sm/gpgsm.c:259 -#: dirmngr/dirmngr.c:196 +#: agent/gpg-agent.c:187 g10/gpg.c:574 scd/scdaemon.c:130 sm/gpgsm.c:262 +#: dirmngr/dirmngr.c:198 msgid "Options controlling the diagnostic output" msgstr "控制诊断输出的选项" -#: agent/gpg-agent.c:191 g10/gpg.c:568 g10/gpgv.c:78 kbx/kbxutil.c:88 -#: scd/scdaemon.c:132 sm/gpgsm.c:261 dirmngr/dirmngr-client.c:70 -#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:78 tools/gpgconf.c:110 +#: agent/gpg-agent.c:189 g10/gpg.c:576 g10/gpgv.c:78 kbx/kbxutil.c:88 +#: scd/scdaemon.c:132 sm/gpgsm.c:264 dirmngr/dirmngr-client.c:70 +#: dirmngr/dirmngr.c:200 tools/gpg-connect-agent.c:78 tools/gpgconf.c:111 msgid "verbose" msgstr "详细模式" -#: agent/gpg-agent.c:192 g10/gpg.c:570 g10/gpgv.c:79 kbx/kbxutil.c:89 -#: scd/scdaemon.c:133 sm/gpgsm.c:263 dirmngr/dirmngr-client.c:71 -#: dirmngr/dirmngr.c:199 +#: agent/gpg-agent.c:190 g10/gpg.c:578 g10/gpgv.c:79 kbx/kbxutil.c:89 +#: scd/scdaemon.c:133 sm/gpgsm.c:266 dirmngr/dirmngr-client.c:71 +#: dirmngr/dirmngr.c:201 msgid "be somewhat more quiet" msgstr "尽量减少提示信息" -#: agent/gpg-agent.c:200 g10/gpg.c:583 sm/gpgsm.c:276 dirmngr/dirmngr.c:209 +#: agent/gpg-agent.c:198 g10/gpg.c:591 sm/gpgsm.c:279 dirmngr/dirmngr.c:211 msgid "|FILE|write server mode logs to FILE" msgstr "|FILE|将服务器模式的日志写入到 FILE" -#: agent/gpg-agent.c:204 g10/gpg.c:589 scd/scdaemon.c:147 sm/gpgsm.c:283 -#: dirmngr/dirmngr.c:213 +#: agent/gpg-agent.c:202 g10/gpg.c:597 scd/scdaemon.c:147 sm/gpgsm.c:286 +#: dirmngr/dirmngr.c:215 msgid "Options controlling the configuration" msgstr "控制配置的选项" -#: agent/gpg-agent.c:207 +#: agent/gpg-agent.c:205 msgid "do not use the SCdaemon" msgstr "不使用 SCdaemon" -#: agent/gpg-agent.c:209 +#: agent/gpg-agent.c:207 msgid "|PGM|use PGM as the SCdaemon program" msgstr "|PGM|使用 PGM 作为 SCdaemon 程序" -#: agent/gpg-agent.c:213 +#: agent/gpg-agent.c:211 msgid "|NAME|accept some commands via NAME" msgstr "|NAME|通过 NAME 接收一些命令" -#: agent/gpg-agent.c:217 +#: agent/gpg-agent.c:215 msgid "ignore requests to change the TTY" msgstr "忽略改变 TTY 的请求" -#: agent/gpg-agent.c:219 +#: agent/gpg-agent.c:217 msgid "ignore requests to change the X display" msgstr "忽略改变 X display 的请求" -#: agent/gpg-agent.c:220 +#: agent/gpg-agent.c:218 msgid "enable ssh support" msgstr "启用 ssh 支持" -#: agent/gpg-agent.c:222 +#: agent/gpg-agent.c:220 msgid "|ALGO|use ALGO to show ssh fingerprints" msgstr "|ALGO|使用 ALGO 显示 ssh 指纹" -#: agent/gpg-agent.c:225 +#: agent/gpg-agent.c:223 msgid "enable putty support" msgstr "启用 putty 支持" -#: agent/gpg-agent.c:237 g10/gpg.c:831 scd/scdaemon.c:175 sm/gpgsm.c:369 +#: agent/gpg-agent.c:233 g10/gpg.c:841 scd/scdaemon.c:175 sm/gpgsm.c:373 msgid "Options controlling the security" msgstr "控制安全的选项" -#: agent/gpg-agent.c:240 +#: agent/gpg-agent.c:236 msgid "|N|expire cached PINs after N seconds" msgstr "|N|使被缓存的 PIN 在 N 秒后过期" -#: agent/gpg-agent.c:242 +#: agent/gpg-agent.c:238 msgid "|N|expire SSH keys after N seconds" msgstr "|N|在 N 秒后使 SSH 密钥过期" -#: agent/gpg-agent.c:244 +#: agent/gpg-agent.c:240 msgid "|N|set maximum PIN cache lifetime to N seconds" msgstr "|N|设置 PIN 缓存的生命周期为 N 秒" -#: agent/gpg-agent.c:246 +#: agent/gpg-agent.c:242 msgid "|N|set maximum SSH key lifetime to N seconds" msgstr "|N|设置 SSH 缓存的生命周期为 N 秒" -#: agent/gpg-agent.c:248 +#: agent/gpg-agent.c:244 msgid "do not use the PIN cache when signing" msgstr "在签名时不使用 PIN 缓存" -#: agent/gpg-agent.c:250 +#: agent/gpg-agent.c:246 msgid "disallow the use of an external password cache" msgstr "禁止使用外部的密码缓存" -#: agent/gpg-agent.c:252 +#: agent/gpg-agent.c:248 msgid "disallow clients to mark keys as \"trusted\"" msgstr "禁止客户端将密钥标记为“信任”" -#: agent/gpg-agent.c:257 +#: agent/gpg-agent.c:253 msgid "allow presetting passphrase" msgstr "允许预设置的密码" -#: agent/gpg-agent.c:262 +#: agent/gpg-agent.c:258 msgid "Options enforcing a passphrase policy" msgstr "选项强制要求一个密码策略" -#: agent/gpg-agent.c:265 +#: agent/gpg-agent.c:261 msgid "do not allow bypassing the passphrase policy" msgstr "不允许绕过密码的策略" -#: agent/gpg-agent.c:267 +#: agent/gpg-agent.c:263 msgid "|N|set minimal required length for new passphrases to N" msgstr "|N|设置要求新密码的最短长度为 N" -#: agent/gpg-agent.c:269 +#: agent/gpg-agent.c:265 msgid "|N|require at least N non-alpha characters for a new passphrase" msgstr "|N|要求新密码至少有 N 个非字母字符" -#: agent/gpg-agent.c:272 +#: agent/gpg-agent.c:268 msgid "|FILE|check new passphrases against pattern in FILE" msgstr "|FILE|按 FILE 中的样式检查新密码" -#: agent/gpg-agent.c:276 +#: agent/gpg-agent.c:272 msgid "|N|expire the passphrase after N days" msgstr "|N|在 N 天后使密码过期" -#: agent/gpg-agent.c:278 +#: agent/gpg-agent.c:274 msgid "do not allow the reuse of old passphrases" msgstr "不允许再次使用旧的密码" -#: agent/gpg-agent.c:281 +#: agent/gpg-agent.c:277 msgid "Options controlling the PIN-Entry" msgstr "PIN-Entry 控制选项" -#: agent/gpg-agent.c:283 +#: agent/gpg-agent.c:279 msgid "never use the PIN-entry" msgstr "不使用 PIN-entry" -#: agent/gpg-agent.c:285 +#: agent/gpg-agent.c:281 msgid "disallow caller to override the pinentry" msgstr "禁止调用者覆盖 pinentry" -#: agent/gpg-agent.c:287 +#: agent/gpg-agent.c:283 msgid "let PIN-Entry grab keyboard and mouse" msgstr "允许 PIN-Entry 抓取键盘与鼠标" -#: agent/gpg-agent.c:290 +#: agent/gpg-agent.c:286 msgid "|PGM|use PGM as the PIN-Entry program" msgstr "|PGM|使用 PGM 作为 PIN-Entry 程序" -#: agent/gpg-agent.c:294 +#: agent/gpg-agent.c:290 msgid "|N|set the Pinentry timeout to N seconds" msgstr "|N|设置 Pinentry 的超时时间为 N 秒" -#: agent/gpg-agent.c:298 +#: agent/gpg-agent.c:294 msgid "allow passphrase to be prompted through Emacs" msgstr "运行密码通过 Emacs 回显" #. 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:563 agent/preset-passphrase.c:100 agent/protect-tool.c:155 -#: g10/gpg.c:1108 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313 -#: sm/gpgsm.c:600 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:458 -#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:154 +#: agent/gpg-agent.c:560 agent/preset-passphrase.c:100 agent/protect-tool.c:154 +#: g10/gpg.c:1128 g10/gpgv.c:149 kbx/kbxutil.c:113 scd/scdaemon.c:313 +#: sm/gpgsm.c:608 dirmngr/dirmngr-client.c:168 dirmngr/dirmngr.c:469 +#: tools/gpg-connect-agent.c:205 tools/gpgconf.c:158 #: tools/gpg-check-pattern.c:143 msgid "Please report bugs to <@EMAIL@>.\n" msgstr "" "请向 <@EMAIL@> 报告程序缺陷。\n" "请向 <i18n-zh@googlegroups.com> 邮件列表反映简体中文的翻译问题或建议。\n" -#: agent/gpg-agent.c:572 +#: agent/gpg-agent.c:569 msgid "Usage: @GPG_AGENT@ [options] (-h for help)" msgstr "用法： @GPG_AGENT@ [选项] （-h 获取帮助）" -#: agent/gpg-agent.c:574 +#: agent/gpg-agent.c:571 msgid "" "Syntax: @GPG_AGENT@ [options] [command [args]]\n" "Secret key management for @GNUPG@\n" @@ -627,130 +631,130 @@ msgstr "" "语法： @GPG_AGENT@ [选项] [命令 [参数]]\n" "@GNUPG@ 私钥管理器\n" -#: agent/gpg-agent.c:619 g10/gpg.c:1304 scd/scdaemon.c:385 sm/gpgsm.c:748 -#: dirmngr/dirmngr.c:542 +#: agent/gpg-agent.c:616 g10/gpg.c:1324 scd/scdaemon.c:385 sm/gpgsm.c:756 +#: dirmngr/dirmngr.c:553 #, c-format msgid "invalid debug-level '%s' given\n" msgstr "无效的调试级别‘%s’\n" -#: agent/gpg-agent.c:988 g10/gpg.c:3810 g10/gpg.c:3834 sm/gpgsm.c:1585 -#: sm/gpgsm.c:1591 +#: agent/gpg-agent.c:976 g10/gpg.c:3865 g10/gpg.c:3889 sm/gpgsm.c:1611 +#: sm/gpgsm.c:1617 #, c-format msgid "selected digest algorithm is invalid\n" msgstr "所选的散列算法无效\n" -#: agent/gpg-agent.c:1216 agent/gpg-agent.c:2029 common/argparse.c:1766 -#: common/argparse.c:1858 g10/gpg.c:2517 scd/scdaemon.c:547 sm/gpgsm.c:1007 -#: dirmngr/dirmngr.c:1081 dirmngr/dirmngr.c:1937 +#: agent/gpg-agent.c:1204 agent/gpg-agent.c:2017 common/argparse.c:1766 +#: common/argparse.c:1858 g10/gpg.c:2548 scd/scdaemon.c:547 sm/gpgsm.c:1015 +#: dirmngr/dirmngr.c:1118 dirmngr/dirmngr.c:1976 #, c-format msgid "reading options from '%s'\n" msgstr "从‘%s’读取选项\n" -#: agent/gpg-agent.c:1332 g10/gpg.c:3751 scd/scdaemon.c:671 sm/gpgsm.c:1522 -#: dirmngr/dirmngr.c:1190 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:677 +#: agent/gpg-agent.c:1320 g10/gpg.c:3809 scd/scdaemon.c:671 sm/gpgsm.c:1548 +#: dirmngr/dirmngr.c:1227 tools/gpg-connect-agent.c:1244 tools/gpgconf.c:709 #, c-format msgid "Note: '%s' is not considered an option\n" msgstr "注意：‘%s’不被认为是一个选项\n" -#: agent/gpg-agent.c:2165 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1344 +#: agent/gpg-agent.c:2153 scd/scdaemon.c:1112 dirmngr/dirmngr.c:1381 #, c-format msgid "can't create socket: %s\n" msgstr "无法创建套接字： %s\n" -#: agent/gpg-agent.c:2182 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1357 +#: agent/gpg-agent.c:2170 scd/scdaemon.c:1125 dirmngr/dirmngr.c:1394 #, c-format msgid "socket name '%s' is too long\n" msgstr "套接字名称‘%s’太长\n" -#: agent/gpg-agent.c:2220 +#: agent/gpg-agent.c:2208 #, c-format msgid "trying to steal socket from running %s\n" msgstr "正尝试从运行的 %s 处夺取套接字\\n\n" -#: agent/gpg-agent.c:2226 +#: agent/gpg-agent.c:2214 #, c-format msgid "a gpg-agent is already running - not starting a new one\n" msgstr "有一个 gpg-agent 实例正在运行 - 无须启动新的实例\n" -#: agent/gpg-agent.c:2238 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1393 +#: agent/gpg-agent.c:2226 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1430 #, c-format msgid "error getting nonce for the socket\n" msgstr "获取套接字 nonce 时出现错误\n" -#: agent/gpg-agent.c:2243 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1396 +#: agent/gpg-agent.c:2231 scd/scdaemon.c:1152 dirmngr/dirmngr.c:1433 #, c-format msgid "error binding socket to '%s': %s\n" msgstr "绑定套接字到 '%s' 时出现错误： %s\n" -#: agent/gpg-agent.c:2254 agent/gpg-agent.c:2294 agent/gpg-agent.c:2303 -#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1405 +#: agent/gpg-agent.c:2242 agent/gpg-agent.c:2282 agent/gpg-agent.c:2291 +#: scd/scdaemon.c:1160 dirmngr/dirmngr.c:1442 #, c-format msgid "can't set permissions of '%s': %s\n" msgstr "无法设置‘%s’的权限： %s\n" -#: agent/gpg-agent.c:2268 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1417 +#: agent/gpg-agent.c:2256 scd/scdaemon.c:1172 dirmngr/dirmngr.c:1454 #, c-format msgid "listening on socket '%s'\n" msgstr "正在监听套接字‘%s’\n" -#: agent/gpg-agent.c:2288 agent/gpg-agent.c:2341 common/homedir.c:741 +#: agent/gpg-agent.c:2276 agent/gpg-agent.c:2329 common/homedir.c:768 #: g10/exec.c:269 g10/openfile.c:397 #, c-format msgid "can't create directory '%s': %s\n" msgstr "无法创建目录‘%s’：%s\n" -#: agent/gpg-agent.c:2291 agent/gpg-agent.c:2346 common/homedir.c:744 +#: agent/gpg-agent.c:2279 agent/gpg-agent.c:2334 common/homedir.c:771 #: g10/openfile.c:400 #, c-format msgid "directory '%s' created\n" msgstr "目录‘%s’已创建\n" -#: agent/gpg-agent.c:2352 +#: agent/gpg-agent.c:2340 #, c-format msgid "stat() failed for '%s': %s\n" msgstr "‘%s’的 stat() 方法失败：%s\n" -#: agent/gpg-agent.c:2356 +#: agent/gpg-agent.c:2344 #, c-format msgid "can't use '%s' as home directory\n" msgstr "无法使用‘%s’作为家目录\n" -#: agent/gpg-agent.c:2514 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2143 +#: agent/gpg-agent.c:2502 scd/scdaemon.c:1188 dirmngr/dirmngr.c:2183 #, c-format msgid "error reading nonce on fd %d: %s\n" msgstr "在读取 fd %d 上的 nonce 时出现错误： %s\n" -#: agent/gpg-agent.c:2721 +#: agent/gpg-agent.c:2709 #, c-format msgid "handler 0x%lx for fd %d started\n" msgstr "句柄 0x%lx 于文件描述符 %d 启动\n" -#: agent/gpg-agent.c:2726 +#: agent/gpg-agent.c:2714 #, c-format msgid "handler 0x%lx for fd %d terminated\n" msgstr "句柄 0x%lx 于文件描述符 %d 终止\n" -#: agent/gpg-agent.c:2801 +#: agent/gpg-agent.c:2789 #, c-format msgid "ssh handler 0x%lx for fd %d started\n" msgstr "ssh 句柄 0x%lx 于文件描述符 %d 启动\n" -#: agent/gpg-agent.c:2806 +#: agent/gpg-agent.c:2794 #, c-format msgid "ssh handler 0x%lx for fd %d terminated\n" msgstr "ssh 句柄 0x%lx 于文件描述符 %d 终止\n" -#: agent/gpg-agent.c:3028 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2357 +#: agent/gpg-agent.c:3016 scd/scdaemon.c:1380 dirmngr/dirmngr.c:2397 #, c-format msgid "npth_pselect failed: %s - waiting 1s\n" msgstr "npth_pselect 方法失败：%s - 等待 1s\n" -#: agent/gpg-agent.c:3116 scd/scdaemon.c:1445 +#: agent/gpg-agent.c:3104 scd/scdaemon.c:1445 #, c-format msgid "%s %s stopped\n" msgstr "%s %s 已停止\n" -#: agent/gpg-agent.c:3254 common/simple-pwquery.c:247 g10/call-agent.c:260 +#: agent/gpg-agent.c:3242 common/simple-pwquery.c:247 g10/call-agent.c:262 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2254 #, c-format msgid "no gpg-agent running in this session\n" @@ -776,8 +780,8 @@ msgstr "" "语法： gpg-preset-passphrase [选项] KEYGRIP\n" "密码缓存管理\n" -#: agent/protect-tool.c:108 g10/gpg.c:441 kbx/kbxutil.c:71 sm/gpgsm.c:210 -#: dirmngr/dirmngr.c:171 tools/gpgconf.c:80 +#: agent/protect-tool.c:107 g10/gpg.c:448 kbx/kbxutil.c:71 sm/gpgsm.c:213 +#: dirmngr/dirmngr.c:173 tools/gpgconf.c:80 msgid "" "@Commands:\n" " " @@ -785,8 +789,8 @@ msgstr "" "@命令：\n" " " -#: agent/protect-tool.c:117 g10/gpgv.c:76 kbx/kbxutil.c:81 -#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:107 +#: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:81 +#: tools/gpg-connect-agent.c:76 tools/gpgconf.c:108 msgid "" "@\n" "Options:\n" @@ -796,11 +800,11 @@ msgstr "" "选项：\n" " " -#: agent/protect-tool.c:158 +#: agent/protect-tool.c:157 msgid "Usage: gpg-protect-tool [options] (-h for help)\n" msgstr "用法： gpg-protect-tool [选项] (-h 获取帮助)\n" -#: agent/protect-tool.c:160 +#: agent/protect-tool.c:159 msgid "" "Syntax: gpg-protect-tool [options] [args]\n" "Secret key maintenance tool\n" @@ -808,21 +812,21 @@ msgstr "" "语法：gpg-protect-tool [选项] [参数]\n" "私钥管理工具\n" -#: agent/protect-tool.c:703 sm/import.c:774 +#: agent/protect-tool.c:701 sm/import.c:776 msgid "Please enter the passphrase to unprotect the PKCS#12 object." msgstr "请输入密码以解密 PKCS#12 对象。" -#: agent/protect-tool.c:708 sm/export.c:710 +#: agent/protect-tool.c:706 sm/export.c:710 msgid "Please enter the passphrase to protect the new PKCS#12 object." msgstr "请输入密码以保护新的 PKCS#12 对象。" -#: agent/protect-tool.c:714 +#: agent/protect-tool.c:712 msgid "" "Please enter the passphrase to protect the imported object within the GnuPG " "system." msgstr "请输入密码以在 GnuPG 系统内部保护已导入的对象。" -#: agent/protect-tool.c:719 +#: agent/protect-tool.c:717 msgid "" "Please enter the passphrase or the PIN\n" "needed to complete this operation." @@ -830,53 +834,53 @@ msgstr "" "请输入所需的密码或者 PIN\n" "以完成此操作。" -#: agent/protect-tool.c:730 +#: agent/protect-tool.c:728 #, c-format msgid "cancelled\n" msgstr "已取消\n" -#: agent/protect-tool.c:732 +#: agent/protect-tool.c:730 #, c-format msgid "error while asking for the passphrase: %s\n" msgstr "请求密码时出现错误： %s\n" -#: agent/trustlist.c:172 agent/trustlist.c:389 dirmngr/dirmngr.c:1709 -#: tools/gpgconf.c:470 +#: agent/trustlist.c:174 agent/trustlist.c:395 dirmngr/dirmngr.c:1748 +#: tools/gpgconf.c:502 #, c-format msgid "error opening '%s': %s\n" msgstr "打开‘%s’时出现错误：%s\n" -#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89 +#: agent/trustlist.c:190 common/helpfile.c:73 common/helpfile.c:89 #, c-format msgid "file '%s', line %d: %s\n" msgstr "文件‘%s’ 的第 %d 行：%s\n" -#: agent/trustlist.c:211 agent/trustlist.c:219 +#: agent/trustlist.c:213 agent/trustlist.c:221 #, c-format msgid "statement \"%s\" ignored in '%s', line %d\n" msgstr "已忽略声明 “%s” ，其位于‘%s’的第 %d 行\n" -#: agent/trustlist.c:225 +#: agent/trustlist.c:227 #, c-format msgid "system trustlist '%s' not available\n" msgstr "系统信任列表 ‘%s’ 不可用\n" -#: agent/trustlist.c:269 +#: agent/trustlist.c:271 #, c-format msgid "bad fingerprint in '%s', line %d\n" msgstr "错误的指纹，其位于 ‘%s’ 的第 %d 行\n" -#: agent/trustlist.c:294 agent/trustlist.c:301 +#: agent/trustlist.c:296 agent/trustlist.c:303 #, c-format msgid "invalid keyflag in '%s', line %d\n" msgstr "无效的密钥标记，其位于 ‘%s’ 的第 %d 行\n" -#: agent/trustlist.c:335 common/helpfile.c:136 +#: agent/trustlist.c:341 common/helpfile.c:136 #, c-format msgid "error reading '%s', line %d: %s\n" msgstr "读取 ‘%s’ 的第 %d 行时出现错误：%s\n" -#: agent/trustlist.c:460 agent/trustlist.c:529 +#: agent/trustlist.c:466 agent/trustlist.c:538 #, c-format msgid "error reading list of trusted root certificates\n" msgstr "读取受信任的根证书列表时出现错误\n" @@ -889,18 +893,18 @@ msgstr "读取受信任的根证书列表时出现错误\n" #. plain % sign, you need to encode it as "%%25". The #. "%s" gets replaced by the name as stored in the #. certificate. -#: agent/trustlist.c:691 +#: agent/trustlist.c:700 #, c-format msgid "" "Do you ultimately trust%%0A \"%s\"%%0Ato correctly certify user " "certificates?" msgstr "您要无限地信任%%0A “%s”%%0A为正确的认证用户证书吗?" -#: agent/trustlist.c:700 common/audit.c:467 +#: agent/trustlist.c:709 common/audit.c:467 msgid "Yes" msgstr "是" -#: agent/trustlist.c:700 agent/findkey.c:1680 agent/findkey.c:1694 +#: agent/trustlist.c:709 agent/findkey.c:1663 agent/findkey.c:1677 #: common/audit.c:469 msgid "No" msgstr "否" @@ -913,7 +917,7 @@ msgstr "否" #. "%%25". The second "%s" gets replaced by a hexdecimal #. fingerprint string whereas the first one receives the name #. as stored in the certificate. -#: agent/trustlist.c:734 +#: agent/trustlist.c:743 #, c-format msgid "" "Please verify that the certificate identified as:%%0A \"%s\"%%0Ahas the " @@ -923,35 +927,35 @@ msgstr "请确认被识别为%%0A “%s”%%0A的证书具有以下的指纹：% #. TRANSLATORS: "Correct" is the label of a button and intended #. to be hit if the fingerprint matches the one of the CA. The #. other button is "the default "Cancel" of the Pinentry. -#: agent/trustlist.c:748 +#: agent/trustlist.c:757 msgid "Correct" msgstr "正确" -#: agent/trustlist.c:748 +#: agent/trustlist.c:757 msgid "Wrong" msgstr "错误" -#: agent/findkey.c:411 +#: agent/findkey.c:349 #, c-format msgid "Note: This passphrase has never been changed.%0APlease change it now." msgstr "注意：此密码从未被修改过。%0A请立即修改。" -#: agent/findkey.c:427 +#: agent/findkey.c:365 #, c-format msgid "" "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s. Please change " "it now." msgstr "此密码自从 %.4s-%.2s-%.2s 起未被修改过。%%0A请立即修改。" -#: agent/findkey.c:441 agent/findkey.c:448 +#: agent/findkey.c:379 agent/findkey.c:386 msgid "Change passphrase" msgstr "更改密码" -#: agent/findkey.c:449 +#: agent/findkey.c:387 msgid "I'll change it later" msgstr "稍后修改" -#: agent/findkey.c:1656 +#: agent/findkey.c:1639 #, c-format msgid "" "Do you really want to delete the key identified by keygrip%%0A %s%%0A %%C" @@ -959,11 +963,11 @@ msgid "" msgstr "" "您真的想要删除这个被以下的 keygrip 所标识的密钥吗 %%0A %s%%0A %%C%%0A？" -#: agent/findkey.c:1680 agent/findkey.c:1694 +#: agent/findkey.c:1663 agent/findkey.c:1677 msgid "Delete key" msgstr "删除密钥" -#: agent/findkey.c:1691 +#: agent/findkey.c:1674 msgid "" "Warning: This key is also listed for use with SSH!\n" "Deleting the key might remove your ability to access remote machines." @@ -971,12 +975,13 @@ msgstr "" "警告：这个密钥也被列为用于 SSH！\n" "删除这个密钥可能使您失去访问远程主机的能力。" -#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:88 +#: agent/pksign.c:176 g10/seskey.c:293 sm/certcheck.c:91 #, c-format msgid "DSA requires the hash length to be a multiple of 8 bits\n" msgstr "DSA 要求散列值长度为 8 位的倍数\n" -#: agent/pksign.c:187 sm/certcheck.c:100 +#: agent/pksign.c:187 sm/certcheck.c:103 dirmngr/crlcache.c:1819 +#: dirmngr/ocsp.c:455 dirmngr/validate.c:1139 #, c-format msgid "%s key uses an unsafe (%u bit) hash\n" msgstr "%s 密钥使用了一个不安全的（%u 位）散列\n" @@ -996,7 +1001,7 @@ msgstr "检查已建立的签名时发生错误： %s\n" msgid "secret key parts are not available\n" msgstr "私钥部分不可用\n" -#: agent/cvt-openpgp.c:344 g10/card-util.c:1556 +#: agent/cvt-openpgp.c:344 g10/card-util.c:1555 #, c-format msgid "public key algorithm %d (%s) is not supported\n" msgstr "不支持的公钥算法: %d (%s)\n" @@ -1025,7 +1030,7 @@ msgid "error creating a stream for a pipe: %s\n" msgstr "为管道创建流时出现错误： %s\n" #: common/exechelp-posix.c:504 common/exechelp-posix.c:579 -#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1435 +#: common/exechelp-posix.c:865 dirmngr/dirmngr.c:1472 #, c-format msgid "error forking process: %s\n" msgstr "在 fork 进程时出现错误： %s\n" @@ -1076,22 +1081,22 @@ msgstr "gpg-agent 的选项设置存在问题\n" msgid "can't disable core dumps: %s\n" msgstr "无法禁用核心内存转储：%s\n" -#: common/sysutils.c:408 +#: common/sysutils.c:413 #, c-format msgid "Warning: unsafe ownership on %s \"%s\"\n" msgstr "警告： %s 具有不安全的文件所有权 “%s”\n" -#: common/sysutils.c:440 +#: common/sysutils.c:445 #, c-format msgid "Warning: unsafe permissions on %s \"%s\"\n" msgstr "警告：%s 具有不安全的文件权限位 “%s”\n" -#: common/sysutils.c:885 +#: common/sysutils.c:895 #, c-format msgid "waiting for file '%s' to become accessible ...\n" msgstr "等待 ‘%s’ 可被访问...\n" -#: common/sysutils.c:911 +#: common/sysutils.c:921 #, c-format msgid "renaming '%s' to '%s' failed: %s\n" msgstr "将 ‘%s’ 重命名为 ‘%s’ 时失败：%s\n" @@ -1154,7 +1159,7 @@ msgstr "分配 %lu 字节时安全内存不足" msgid "out of core while allocating %lu bytes" msgstr "分配 %lu 字节时内存不足" -#: common/miscellaneous.c:115 g10/card-util.c:911 tools/no-libgcrypt.c:30 +#: common/miscellaneous.c:115 g10/card-util.c:910 tools/no-libgcrypt.c:30 #, c-format msgid "error allocating enough memory: %s\n" msgstr "在分配足够的内存时出现错误： %s\n" @@ -1169,7 +1174,7 @@ msgstr "%s:%u: 废弃的选项 \"%s\" - 此选项不会产生作用\n" msgid "WARNING: \"%s%s\" is an obsolete option - it has no effect\n" msgstr "警告： “%s%s” 是一个废弃的选项 - 此选项不会产生作用\n" -#: common/miscellaneous.c:753 +#: common/miscellaneous.c:754 #, c-format msgid "unknown debug flag '%s' ignored\n" msgstr "未知的调试选项 ‘%s’ 已被忽略\n" @@ -1267,7 +1272,7 @@ msgid "algorithm: %s" msgstr "算法：%s" #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923 -#: scd/app-openpgp.c:3557 +#: scd/app-openpgp.c:4081 #, c-format msgid "unsupported algorithm: %s" msgstr "不支持的算法：%s" @@ -1342,11 +1347,11 @@ msgstr "证书链条有效" msgid "Root certificate trustworthy" msgstr "根证书可靠" -#: common/audit.c:1112 sm/certchain.c:1235 +#: common/audit.c:1112 sm/certchain.c:1255 msgid "no CRL found for certificate" msgstr "未找到该证书的证书吊销列表（CRL）" -#: common/audit.c:1115 sm/certchain.c:1245 +#: common/audit.c:1115 sm/certchain.c:1265 msgid "the available CRL is too old" msgstr "可用的证书吊销列表（CRL）太旧" @@ -1383,11 +1388,11 @@ msgstr "没有关于 ‘%s’ 的可用帮助。" msgid "ignoring garbage line" msgstr "忽略无用行" -#: common/gettime.c:958 +#: common/gettime.c:1080 msgid "[none]" msgstr "[未有]" -#: common/ksba-io-support.c:347 +#: common/ksba-io-support.c:365 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "无效的 radix64 字符 %02x 已被跳过\n" @@ -1469,7 +1474,7 @@ msgstr "无效的选项" msgid "missing argument for option \"%.50s\"\n" msgstr "选项 “%.50s” 的参数缺失\n" -#: common/argparse.c:558 g10/gpg.c:3525 +#: common/argparse.c:558 g10/gpg.c:3580 #, c-format msgid "invalid argument for option \"%.50s\"\n" msgstr "选项 “%.50s” 的参数无效\n" @@ -1539,165 +1544,166 @@ msgstr "创建临时文件 ‘%s’ 失败： %s\n" msgid "error writing to '%s': %s\n" msgstr "写入 ‘%s’ 时出现错误： %s\n" -#: common/dotlock.c:1173 +#: common/dotlock.c:1207 #, c-format msgid "removing stale lockfile (created by %d)\n" msgstr "移除旧的锁文件 （由 %d 创建）\n" -#: common/dotlock.c:1210 +#: common/dotlock.c:1231 #, c-format msgid "waiting for lock (held by %d%s) %s...\n" msgstr "等待锁（由 %d%s 持有） %s...\n" -#: common/dotlock.c:1211 +#: common/dotlock.c:1232 msgid "(deadlock?) " msgstr "（死锁？） " -#: common/dotlock.c:1250 +#: common/dotlock.c:1270 #, c-format msgid "lock '%s' not made: %s\n" msgstr "锁 ‘%s’ 未被建立： %s\n" -#: common/dotlock.c:1277 +#: common/dotlock.c:1283 #, c-format msgid "waiting for lock %s...\n" msgstr "等待锁 %s...\n" -#: common/init.c:191 sm/gpgsm.c:893 dirmngr/dirmngr.c:987 dirmngr/dirmngr.c:996 +#: common/init.c:194 sm/gpgsm.c:901 dirmngr/dirmngr.c:1024 +#: dirmngr/dirmngr.c:1033 #, c-format msgid "%s is too old (need %s, have %s)\n" msgstr "%s 太旧 （需要 %s，拥有 %s）\n" -#: g10/armor.c:423 +#: g10/armor.c:424 #, c-format msgid "armor: %s\n" msgstr "字符封装：%s\n" -#: g10/armor.c:462 +#: g10/armor.c:463 #, c-format msgid "invalid armor header: " msgstr "无效的字符封装头： " -#: g10/armor.c:473 +#: g10/armor.c:474 #, c-format msgid "armor header: " msgstr "字符封装头： " -#: g10/armor.c:486 +#: g10/armor.c:487 #, c-format msgid "invalid clearsig header\n" msgstr "无效的明文签名头\n" -#: g10/armor.c:499 +#: g10/armor.c:500 #, c-format msgid "unknown armor header: " msgstr "未知的字符封装头： " -#: g10/armor.c:552 +#: g10/armor.c:553 #, c-format msgid "nested clear text signatures\n" msgstr "嵌套明文签名\n" -#: g10/armor.c:687 +#: g10/armor.c:688 #, c-format msgid "unexpected armor: " msgstr "与预期不符的字符封装： " -#: g10/armor.c:700 +#: g10/armor.c:701 #, c-format msgid "invalid dash escaped line: " msgstr "无效的连字符转义行： " -#: g10/armor.c:872 g10/armor.c:1492 +#: g10/armor.c:873 g10/armor.c:1493 #, c-format msgid "invalid radix64 character %02X skipped\n" msgstr "无效的 radix64 字符 %02X 已被跳过\n" -#: g10/armor.c:915 +#: g10/armor.c:916 #, c-format msgid "premature eof (no CRC)\n" msgstr "文件过早结束（没有 CRC 部分）\n" -#: g10/armor.c:949 +#: g10/armor.c:950 #, c-format msgid "premature eof (in CRC)\n" msgstr "文件过早结束（CRC 部分未结束）\n" -#: g10/armor.c:957 +#: g10/armor.c:958 #, c-format msgid "malformed CRC\n" msgstr "异常的 CRC\n" -#: g10/armor.c:961 g10/armor.c:1529 +#: g10/armor.c:962 g10/armor.c:1530 #, c-format msgid "CRC error; %06lX - %06lX\n" msgstr "CRC 错误；%06lX - %06lX\n" -#: g10/armor.c:981 +#: g10/armor.c:982 #, c-format msgid "premature eof (in trailer)\n" msgstr "文件过早结束（于结尾处）\n" -#: g10/armor.c:985 +#: g10/armor.c:986 #, c-format msgid "error in trailer line\n" msgstr "结尾行出现错误\n" -#: g10/armor.c:1305 +#: g10/armor.c:1306 #, c-format msgid "no valid OpenPGP data found.\n" msgstr "找不到有效的 OpenPGP 数据。\n" -#: g10/armor.c:1310 +#: g10/armor.c:1311 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "无效的字符封装：一行超过 %d 字符\n" -#: g10/armor.c:1314 +#: g10/armor.c:1315 #, c-format msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" "字符封装中出现引号包裹起来的可打印字符 - 可能使用了有缺陷的邮件传输代理\n" -#: g10/build-packet.c:1219 +#: g10/build-packet.c:1258 #, c-format msgid "[ not human readable (%zu bytes: %s%s) ]" msgstr "[ 非人类可读（%zu 字节：%s%s） ]" -#: g10/build-packet.c:1271 +#: g10/build-packet.c:1310 #, c-format msgid "" "a notation name must have only printable characters or spaces, and end with " "an '='\n" msgstr "一个记号的名称必须只含有可打印字符或者空格，并且以一个‘=’结尾\n" -#: g10/build-packet.c:1283 g10/build-packet.c:1379 +#: g10/build-packet.c:1322 g10/build-packet.c:1418 #, c-format msgid "a user notation name must contain the '@' character\n" msgstr "一个用户记号名称必须包含‘@’字符\n" -#: g10/build-packet.c:1289 g10/build-packet.c:1385 +#: g10/build-packet.c:1328 g10/build-packet.c:1424 #, c-format msgid "a notation name must not contain more than one '@' character\n" msgstr "一个记号名称必须不包含多于一个的‘@’字符\n" -#: g10/build-packet.c:1307 +#: g10/build-packet.c:1346 #, c-format msgid "a notation value must not use any control characters\n" msgstr "一个记号的值必须不能使用任何的控制字符\n" -#: g10/build-packet.c:1363 +#: g10/build-packet.c:1402 #, c-format msgid "a notation name may not contain an '=' character\n" msgstr "一个记号的名称可能不能包含‘=’字符\n" -#: g10/build-packet.c:1369 +#: g10/build-packet.c:1408 #, c-format msgid "a notation name must have only printable characters or spaces\n" msgstr "一个记号的名称必须只含有可打印字符或者空格\n" -#: g10/build-packet.c:1428 g10/build-packet.c:1439 +#: g10/build-packet.c:1467 g10/build-packet.c:1478 #, c-format msgid "WARNING: invalid notation data found\n" msgstr "警告： 找到的记号数据无效\n" @@ -1707,42 +1713,42 @@ msgstr "警告： 找到的记号数据无效\n" msgid "failed to proxy %s inquiry to client\n" msgstr "代理 %s 到客户端的查询失败\n" -#: g10/call-agent.c:170 +#: g10/call-agent.c:171 msgid "Enter passphrase: " msgstr "输入密码： " -#: g10/call-agent.c:199 g10/call-dirmngr.c:153 sm/call-agent.c:98 +#: g10/call-agent.c:201 g10/call-dirmngr.c:153 sm/call-agent.c:98 #: sm/call-dirmngr.c:165 #, c-format msgid "error getting version from '%s': %s\n" msgstr "从 ‘%s’ 获取版本时出现错误: %s\n" -#: g10/call-agent.c:205 g10/call-dirmngr.c:159 sm/call-agent.c:104 +#: g10/call-agent.c:207 g10/call-dirmngr.c:159 sm/call-agent.c:104 #: sm/call-dirmngr.c:171 #, c-format msgid "server '%s' is older than us (%s < %s)" msgstr "服务器 ‘%s’ 比我们的版本更老 （%s < %s）" -#: g10/call-agent.c:211 g10/call-dirmngr.c:165 g10/call-dirmngr.c:464 +#: g10/call-agent.c:213 g10/call-dirmngr.c:165 g10/call-dirmngr.c:464 #: sm/call-agent.c:110 sm/call-dirmngr.c:177 #, c-format msgid "WARNING: %s\n" msgstr "警告：%s\n" -#: g10/call-agent.c:214 g10/call-dirmngr.c:168 sm/call-agent.c:113 +#: g10/call-agent.c:216 g10/call-dirmngr.c:168 sm/call-agent.c:113 #: sm/call-dirmngr.c:180 #, c-format msgid "Note: Outdated servers may lack important security fixes.\n" msgstr "注意： 过时的服务器可能缺少重要的安全修复。\n" -#: g10/call-agent.c:216 g10/call-dirmngr.c:170 sm/call-agent.c:115 +#: g10/call-agent.c:218 g10/call-dirmngr.c:170 sm/call-agent.c:115 #: sm/call-dirmngr.c:182 #, c-format msgid "Note: Use the command \"%s\" to restart them.\n" msgstr "注意： 使用 “%s” 来重启他们。\n" -#: g10/call-agent.c:318 g10/encrypt.c:213 g10/encrypt.c:531 g10/sign.c:412 -#: sm/call-agent.c:205 sm/encrypt.c:426 sm/sign.c:345 +#: g10/call-agent.c:320 g10/encrypt.c:340 g10/encrypt.c:704 g10/sign.c:414 +#: sm/call-agent.c:205 sm/encrypt.c:717 sm/sign.c:561 #, c-format msgid "%s is not compliant with %s mode\n" msgstr "%s 与 %s 模式不兼容\n" @@ -1787,23 +1793,23 @@ msgstr "已清除来自服务器的不可接受的 HTTP 重定向" msgid "server uses an invalid certificate" msgstr "服务器证书无效" -#: g10/call-dirmngr.c:462 g10/gpg.c:4458 +#: g10/call-dirmngr.c:462 g10/gpg.c:4514 #, c-format msgid "Note: %s\n" msgstr "注意：%s\n" -#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1918 +#: g10/card-util.c:86 g10/card-util.c:366 g10/card-util.c:1933 #, c-format msgid "OpenPGP card not available: %s\n" msgstr "OpenPGP 卡不可用：%s\n" -#: g10/card-util.c:91 g10/card-util.c:1924 +#: g10/card-util.c:91 g10/card-util.c:1939 #, c-format msgid "OpenPGP card no. %s detected\n" msgstr "检测到 OpenPGP 卡，号码为 %s\n" -#: g10/card-util.c:97 g10/card-util.c:2253 g10/delkey.c:160 g10/keyedit.c:1423 -#: g10/keygen.c:4466 g10/revoke.c:214 g10/revoke.c:636 +#: g10/card-util.c:97 g10/card-util.c:2268 g10/delkey.c:160 g10/keyedit.c:1426 +#: g10/keygen.c:4723 g10/revoke.c:214 g10/revoke.c:635 #, c-format msgid "can't do this in batch mode\n" msgstr "在批处理模式中无法完成此操作\n" @@ -1813,15 +1819,15 @@ msgstr "在批处理模式中无法完成此操作\n" msgid "This command is only available for version 2 cards\n" msgstr "这一命令只在版本 2 的卡上可用\n" -#: g10/card-util.c:107 scd/app-openpgp.c:2866 +#: g10/card-util.c:107 scd/app-openpgp.c:3243 #, c-format msgid "Reset Code not or not anymore available\n" msgstr "重置码不可用或不再可用\n" -#: g10/card-util.c:140 g10/card-util.c:1442 g10/card-util.c:1704 -#: g10/card-util.c:1796 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429 -#: g10/keygen.c:1808 g10/keygen.c:1980 g10/keygen.c:2186 g10/keygen.c:2477 -#: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325 +#: g10/card-util.c:140 g10/card-util.c:1441 g10/card-util.c:1703 +#: g10/card-util.c:1797 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430 +#: g10/keygen.c:1943 g10/keygen.c:2121 g10/keygen.c:2327 g10/keygen.c:2618 +#: sm/certreqgen-ui.c:167 sm/certreqgen-ui.c:293 sm/certreqgen-ui.c:327 msgid "Your selection? " msgstr "您的选择是？ " @@ -1870,79 +1876,79 @@ msgstr "卡片持有人的名： " msgid "Error: Combined name too long (limit is %d characters).\n" msgstr "错误：合成后的姓名太长（至多 %d 个字符）。\n" -#: g10/card-util.c:826 +#: g10/card-util.c:825 msgid "URL to retrieve public key: " msgstr "拉取公钥的 URL： " -#: g10/card-util.c:920 g10/decrypt-data.c:509 g10/import.c:399 g10/import.c:746 -#: g10/import.c:798 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660 -#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1748 -#: tools/gpgconf.c:483 tools/gpgconf.c:529 +#: g10/card-util.c:919 g10/decrypt-data.c:510 g10/import.c:400 g10/import.c:747 +#: g10/import.c:799 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660 +#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1787 +#: tools/gpgconf.c:515 tools/gpgconf.c:561 #, c-format msgid "error reading '%s': %s\n" msgstr "读取 ‘%s’ 时出现错误：%s\n" -#: g10/card-util.c:953 g10/decrypt-data.c:512 g10/export.c:2467 +#: g10/card-util.c:952 g10/decrypt-data.c:513 g10/export.c:2595 #: dirmngr/crlcache.c:925 #, c-format msgid "error writing '%s': %s\n" msgstr "写入 ‘%s’ 时出现错误： %s\n" -#: g10/card-util.c:980 +#: g10/card-util.c:979 msgid "Login data (account name): " msgstr "登录数据（帐户名）： " -#: g10/card-util.c:1018 +#: g10/card-util.c:1017 msgid "Private DO data: " msgstr "个人 DO 数据： " -#: g10/card-util.c:1103 +#: g10/card-util.c:1102 msgid "Language preferences: " msgstr "语言偏好： " -#: g10/card-util.c:1111 +#: g10/card-util.c:1110 msgid "Error: invalid length of preference string.\n" msgstr "错误：偏好字符串长度无效。\n" -#: g10/card-util.c:1120 +#: g10/card-util.c:1119 msgid "Error: invalid characters in preference string.\n" msgstr "错误：偏好字符串中存在无效字符。\n" -#: g10/card-util.c:1142 +#: g10/card-util.c:1141 msgid "Salutation (M = Mr., F = Ms., or space): " msgstr "称呼（M = 先生，F = 女士，或者留空)： " -#: g10/card-util.c:1156 +#: g10/card-util.c:1155 msgid "Error: invalid response.\n" msgstr "错误：无效的响应。\n" -#: g10/card-util.c:1178 +#: g10/card-util.c:1177 msgid "CA fingerprint: " msgstr "CA 指纹： " -#: g10/card-util.c:1201 +#: g10/card-util.c:1200 msgid "Error: invalid formatted fingerprint.\n" msgstr "错误：指纹格式无效。\n" -#: g10/card-util.c:1252 +#: g10/card-util.c:1251 #, c-format msgid "key operation not possible: %s\n" msgstr "密钥操作无法实现：%s\n" -#: g10/card-util.c:1253 +#: g10/card-util.c:1252 msgid "not an OpenPGP card" msgstr "不是一个 OpenPGP 卡" -#: g10/card-util.c:1266 g10/keygen.c:4486 g10/keygen.c:5562 +#: g10/card-util.c:1265 g10/keygen.c:4743 g10/keygen.c:5846 #, c-format msgid "error getting current key info: %s\n" msgstr "取得当前密钥信息时出错：%s\n" -#: g10/card-util.c:1351 +#: g10/card-util.c:1350 msgid "Replace existing key? (y/N) " msgstr "替换现存的密钥？(y/N) " -#: g10/card-util.c:1368 +#: g10/card-util.c:1367 msgid "" "Note: There is no guarantee that the card supports the requested size.\n" " If the key generation does not succeed, please check the\n" @@ -1952,97 +1958,97 @@ msgstr "" " 如果密钥生成不成功，请检查\n" " 卡的允许密钥长度。\n" -#: g10/card-util.c:1390 g10/keygen.c:2363 sm/certreqgen-ui.c:179 +#: g10/card-util.c:1389 g10/keygen.c:2504 sm/certreqgen-ui.c:181 #, c-format msgid "What keysize do you want? (%u) " msgstr "您想要使用的密钥长度？(%u) " -#: g10/card-util.c:1400 g10/keygen.c:2286 g10/keygen.c:2318 -#: sm/certreqgen-ui.c:194 +#: g10/card-util.c:1399 g10/keygen.c:2427 g10/keygen.c:2459 +#: sm/certreqgen-ui.c:196 #, c-format msgid "rounded up to %u bits\n" msgstr "舍入到 %u 位\n" -#: g10/card-util.c:1408 g10/keygen.c:2371 sm/certreqgen-ui.c:184 +#: g10/card-util.c:1407 g10/keygen.c:2512 sm/certreqgen-ui.c:186 #, c-format msgid "%s keysizes must be in the range %u-%u\n" msgstr "%s 密钥长度必须在 %u 与 %u 间\n" -#: g10/card-util.c:1427 +#: g10/card-util.c:1426 msgid "Changing card key attribute for: " msgstr "正在改变卡片的密钥属性： " -#: g10/card-util.c:1429 +#: g10/card-util.c:1428 msgid "Signature key\n" msgstr "签名密钥\n" -#: g10/card-util.c:1431 +#: g10/card-util.c:1430 msgid "Encryption key\n" msgstr "加密密钥\n" -#: g10/card-util.c:1433 +#: g10/card-util.c:1432 msgid "Authentication key\n" msgstr "身份验证密钥\n" -#: g10/card-util.c:1435 g10/keygen.c:1926 sm/certreqgen-ui.c:157 +#: g10/card-util.c:1434 g10/keygen.c:2067 sm/certreqgen-ui.c:159 msgid "Please select what kind of key you want:\n" msgstr "请选择您要使用的密钥类型：\n" -#: g10/card-util.c:1436 sm/certreqgen-ui.c:158 +#: g10/card-util.c:1435 sm/certreqgen-ui.c:160 #, c-format msgid " (%d) RSA\n" msgstr " (%d) RSA\n" -#: g10/card-util.c:1437 +#: g10/card-util.c:1436 #, c-format msgid " (%d) ECC\n" msgstr " (%d) ECC\n" -#: g10/card-util.c:1449 g10/card-util.c:1716 g10/card-util.c:1816 -#: g10/keyedit.c:900 g10/keygen.c:1834 g10/keygen.c:1862 g10/keygen.c:1987 -#: g10/keygen.c:2222 g10/keygen.c:2505 g10/revoke.c:838 +#: g10/card-util.c:1448 g10/card-util.c:1715 g10/card-util.c:1817 +#: g10/keyedit.c:901 g10/keygen.c:1975 g10/keygen.c:2003 g10/keygen.c:2128 +#: g10/keygen.c:2363 g10/keygen.c:2646 g10/revoke.c:837 msgid "Invalid selection.\n" msgstr "无效的选择。\n" -#: g10/card-util.c:1522 +#: g10/card-util.c:1521 #, c-format msgid "The card will now be re-configured to generate a key of %u bits\n" msgstr "此卡片将会被重新配置以生成一个 %u 位的新密钥\n" -#: g10/card-util.c:1527 +#: g10/card-util.c:1526 #, c-format msgid "The card will now be re-configured to generate a key of type: %s\n" msgstr "此卡片将会被重新配置以生成一个以下类型的密钥： %s\n" -#: g10/card-util.c:1563 +#: g10/card-util.c:1562 #, c-format msgid "error changing key attribute for key %d: %s\n" msgstr "改变密钥 %d 的密钥属性时出现错误： %s\n" -#: g10/card-util.c:1579 g10/card-util.c:2106 +#: g10/card-util.c:1578 g10/card-util.c:2121 #, c-format msgid "error getting card info: %s\n" msgstr "获取卡片信息时出现错： %s\n" -#: g10/card-util.c:1585 g10/card-util.c:1930 g10/card-util.c:2112 +#: g10/card-util.c:1584 g10/card-util.c:1945 g10/card-util.c:2127 #, c-format msgid "This command is not supported by this card\n" msgstr "此命令不被此卡片支持\n" -#: g10/card-util.c:1631 +#: g10/card-util.c:1630 msgid "Make off-card backup of encryption key? (Y/n) " msgstr "创建加密密钥的离卡备份？ (Y/n) " -#: g10/card-util.c:1645 +#: g10/card-util.c:1644 #, c-format msgid "Note: keys are already stored on the card!\n" msgstr "注意： 已有私钥被存储于卡片上！\n" -#: g10/card-util.c:1648 +#: g10/card-util.c:1647 msgid "Replace existing keys? (y/N) " msgstr "替换现存的密钥？(y/N) " -#: g10/card-util.c:1660 +#: g10/card-util.c:1659 #, c-format msgid "" "Please note that the factory settings of the PINs are\n" @@ -2053,166 +2059,166 @@ msgstr "" " PIN = ‘%s’ 管理员 PIN = ‘%s’\n" "您应当使用 --change-pin 命令来更改它们\n" -#: g10/card-util.c:1695 +#: g10/card-util.c:1694 msgid "Please select the type of key to generate:\n" msgstr "请选择您要生成的密钥类型：\n" -#: g10/card-util.c:1697 g10/card-util.c:1787 +#: g10/card-util.c:1696 g10/card-util.c:1788 msgid " (1) Signature key\n" msgstr " (1) 签名密钥\n" -#: g10/card-util.c:1698 g10/card-util.c:1789 +#: g10/card-util.c:1697 g10/card-util.c:1790 msgid " (2) Encryption key\n" msgstr " (2) 加密密钥\n" -#: g10/card-util.c:1699 g10/card-util.c:1791 +#: g10/card-util.c:1698 g10/card-util.c:1792 msgid " (3) Authentication key\n" msgstr " (3) 身份验证密钥\n" -#: g10/card-util.c:1784 +#: g10/card-util.c:1785 msgid "Please select where to store the key:\n" msgstr "请选择在哪里存储密钥：\n" -#: g10/card-util.c:1830 +#: g10/card-util.c:1840 #, c-format msgid "KEYTOCARD failed: %s\n" msgstr "KEYTOCARD 失败： %s\n" -#: g10/card-util.c:1935 +#: g10/card-util.c:1950 #, c-format msgid "Note: This command destroys all keys stored on the card!\n" msgstr "注意： 这一命令将会销毁所有储存于卡片上的私钥！\n" -#: g10/card-util.c:1938 +#: g10/card-util.c:1953 msgid "Continue? (y/N) " msgstr "继续？ (y/N) " -#: g10/card-util.c:1943 +#: g10/card-util.c:1958 msgid "Really do a factory reset? (enter \"yes\") " msgstr "真的要执行恢复出厂设置吗？ (输入“yes”) " -#: g10/card-util.c:2129 +#: g10/card-util.c:2144 #, c-format msgid "error for setup KDF: %s\n" msgstr "设置 KDF 时出现错误： %s\n" -#: g10/card-util.c:2158 g10/keyedit.c:1260 +#: g10/card-util.c:2173 g10/keyedit.c:1261 msgid "quit this menu" msgstr "退出此菜单" -#: g10/card-util.c:2160 +#: g10/card-util.c:2175 msgid "show admin commands" msgstr "显示管理员命令" -#: g10/card-util.c:2161 g10/keyedit.c:1263 +#: g10/card-util.c:2176 g10/keyedit.c:1264 msgid "show this help" msgstr "显示此帮助" -#: g10/card-util.c:2163 +#: g10/card-util.c:2178 msgid "list all available data" msgstr "列出所有可用数据" -#: g10/card-util.c:2166 +#: g10/card-util.c:2181 msgid "change card holder's name" msgstr "更改卡持有人的姓名" -#: g10/card-util.c:2167 +#: g10/card-util.c:2182 msgid "change URL to retrieve key" msgstr "更改拉取密钥的 URL" -#: g10/card-util.c:2168 +#: g10/card-util.c:2183 msgid "fetch the key specified in the card URL" msgstr "根据卡中指定的 URL 获取密钥" -#: g10/card-util.c:2169 +#: g10/card-util.c:2184 msgid "change the login name" msgstr "更改登录名" -#: g10/card-util.c:2170 +#: g10/card-util.c:2185 msgid "change the language preferences" msgstr "更改语言偏好" -#: g10/card-util.c:2171 +#: g10/card-util.c:2186 msgid "change card holder's salutation" msgstr "变更卡片持有人的称呼" -#: g10/card-util.c:2173 +#: g10/card-util.c:2188 msgid "change a CA fingerprint" msgstr "更改一个 CA 指纹" -#: g10/card-util.c:2174 +#: g10/card-util.c:2189 msgid "toggle the signature force PIN flag" msgstr "切换签名强制使用 PIN 标志" -#: g10/card-util.c:2175 +#: g10/card-util.c:2190 msgid "generate new keys" msgstr "生成新的密钥" -#: g10/card-util.c:2176 +#: g10/card-util.c:2191 msgid "menu to change or unblock the PIN" msgstr "更改或解锁 PIN 的菜单" -#: g10/card-util.c:2177 +#: g10/card-util.c:2192 msgid "verify the PIN and list all data" msgstr "验证 PIN 并列出所有数据" -#: g10/card-util.c:2178 +#: g10/card-util.c:2193 msgid "unblock the PIN using a Reset Code" msgstr "使用重置码解锁 PIN" -#: g10/card-util.c:2179 +#: g10/card-util.c:2194 msgid "destroy all keys and data" msgstr "销毁所有密钥和数据" -#: g10/card-util.c:2180 +#: g10/card-util.c:2195 msgid "setup KDF for PIN authentication" msgstr "针对 PIN 身份验证设置 KDF" -#: g10/card-util.c:2181 +#: g10/card-util.c:2196 msgid "change the key attribute" msgstr "更改密钥属性" -#: g10/card-util.c:2305 +#: g10/card-util.c:2320 msgid "gpg/card> " msgstr "gpg/card> " -#: g10/card-util.c:2346 +#: g10/card-util.c:2361 msgid "Admin-only command\n" msgstr "仅供管理员使用的命令\n" -#: g10/card-util.c:2377 +#: g10/card-util.c:2392 msgid "Admin commands are allowed\n" msgstr "管理员命令可用\n" -#: g10/card-util.c:2379 +#: g10/card-util.c:2394 msgid "Admin commands are not allowed\n" msgstr "管理员命令不可用\n" -#: g10/card-util.c:2482 g10/keyedit.c:2229 +#: g10/card-util.c:2497 g10/keyedit.c:2263 msgid "Invalid command (try \"help\")\n" msgstr "无效的命令 （尝试“help”）\n" -#: g10/decrypt.c:191 g10/encrypt.c:1023 +#: g10/decrypt.c:191 g10/encrypt.c:1227 #, c-format msgid "--output doesn't work for this command\n" msgstr "--output 在这个命令中不起作用\n" -#: g10/decrypt.c:247 g10/gpg.c:5155 g10/keyring.c:399 g10/keyring.c:750 +#: g10/decrypt.c:247 g10/gpg.c:5251 g10/keyring.c:399 g10/keyring.c:750 #, c-format msgid "can't open '%s'\n" msgstr "无法打开 ‘%s’\n" -#: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351 -#: g10/getkey.c:2108 g10/gpg.c:5100 g10/keyedit.c:1445 g10/keyedit.c:2335 -#: g10/keyedit.c:2637 g10/keyedit.c:4600 g10/keylist.c:693 g10/keyserver.c:1092 +#: g10/delkey.c:83 g10/export.c:2044 g10/export.c:2358 g10/export.c:2479 +#: g10/getkey.c:2118 g10/gpg.c:5196 g10/keyedit.c:1448 g10/keyedit.c:2371 +#: g10/keyedit.c:2712 g10/keyedit.c:4535 g10/keylist.c:860 g10/keyserver.c:1092 #: g10/revoke.c:230 g10/tofu.c:2165 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "未找到密钥 ‘%s’：%s\n" -#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:2116 g10/getkey.c:4517 -#: g10/gpg.c:5109 g10/keyedit.c:2308 g10/keyserver.c:1110 g10/revoke.c:236 -#: g10/revoke.c:663 g10/tofu.c:2173 +#: g10/delkey.c:92 g10/export.c:2112 g10/getkey.c:2126 g10/getkey.c:4558 +#: g10/gpg.c:5205 g10/keyedit.c:2343 g10/keyserver.c:1110 g10/revoke.c:236 +#: g10/revoke.c:662 g10/tofu.c:2173 #, c-format msgid "error reading keyblock: %s\n" msgstr "读取密钥块时出现错误： %s\n" @@ -2269,9 +2275,9 @@ msgstr "密钥" msgid "subkey" msgstr "子密钥" -#: g10/delkey.c:299 g10/keyedit.c:2201 g10/keyedit.c:2211 g10/keyedit.c:2388 -#: g10/keyedit.c:2519 g10/keyedit.c:2589 g10/keyedit.c:2814 g10/keyedit.c:3044 -#: g10/keyedit.c:3113 g10/keyedit.c:3264 +#: g10/delkey.c:299 g10/keyedit.c:2214 g10/keyedit.c:2245 g10/keyedit.c:2424 +#: g10/keyedit.c:2555 g10/keyedit.c:2625 g10/keyedit.c:2669 g10/keyedit.c:2891 +#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3342 #, c-format msgid "update failed: %s\n" msgstr "更新失败：%s\n" @@ -2296,93 +2302,96 @@ msgstr "存在一个私钥对应于公钥 “%s”！\n" msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "请先使用“--delete-secret-keys”选项来删除它。\n" -#: g10/encrypt.c:116 +#: g10/encrypt.c:117 #, c-format msgid "" "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" msgstr "警告： 强制对称密文 %s (%d) 与接收者的偏好设置冲突\n" -#: g10/encrypt.c:261 g10/sign.c:1470 +#: g10/encrypt.c:398 g10/sign.c:1501 #, c-format msgid "error creating passphrase: %s\n" msgstr "创建密码时出现错误：%s\n" -#: g10/encrypt.c:268 -#, c-format -msgid "can't use a symmetric ESK packet due to the S2K mode\n" +#: g10/encrypt.c:405 +#, fuzzy, c-format +#| msgid "can't use a symmetric ESK packet due to the S2K mode\n" +msgid "can't use a SKESK packet due to the S2K mode\n" msgstr "由于在 S2K 模式，不能使用一个对称的 ESK 封包\n" -#: g10/encrypt.c:282 -#, c-format -msgid "using cipher %s\n" +#: g10/encrypt.c:435 +#, fuzzy, c-format +#| msgid "using cipher %s\n" +msgid "using cipher %s.%s\n" msgstr "使用加密 %s\n" -#: g10/encrypt.c:292 g10/encrypt.c:719 +#: g10/encrypt.c:448 g10/encrypt.c:907 g10/sign.c:1165 #, c-format msgid "'%s' already compressed\n" msgstr "‘%s’已被压缩\n" -#: g10/encrypt.c:349 g10/encrypt.c:755 g10/sign.c:760 +#: g10/encrypt.c:507 g10/encrypt.c:943 g10/sign.c:761 #, c-format msgid "WARNING: '%s' is an empty file\n" msgstr "警告：‘%s’是一个空文件\n" -#: g10/encrypt.c:446 g10/encrypt.c:521 g10/decrypt-data.c:266 g10/gpg.c:3959 -#: g10/gpg.c:3999 sm/decrypt.c:826 sm/encrypt.c:416 sm/gpgsm.c:1609 +#: g10/encrypt.c:609 g10/encrypt.c:694 g10/decrypt-data.c:267 g10/gpg.c:4014 +#: g10/gpg.c:4054 sm/decrypt.c:1188 sm/encrypt.c:707 sm/gpgsm.c:1635 #, c-format msgid "cipher algorithm '%s' may not be used in %s mode\n" msgstr "密文算法 ‘%s’ 可能不能被用于 %s 模式\n" -#: g10/encrypt.c:455 g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:175 -#: g10/sign.c:391 sm/gpgsm.c:1619 sm/gpgsm.c:1629 sm/sign.c:478 sm/verify.c:506 +#: g10/encrypt.c:618 g10/gpg.c:4020 g10/gpg.c:4066 g10/sig-check.c:168 +#: g10/sign.c:392 sm/gpgsm.c:1645 sm/gpgsm.c:1655 sm/sign.c:728 sm/verify.c:522 #, c-format msgid "digest algorithm '%s' may not be used in %s mode\n" msgstr "摘要算法‘%s’不能在 %s 模式下使用\n" -#: g10/encrypt.c:553 sm/encrypt.c:491 +#: g10/encrypt.c:726 sm/encrypt.c:782 #, c-format msgid "WARNING: key %s is not suitable for encryption in %s mode\n" msgstr "警告： 密钥 %s 在 %s 模式下不适用于加密\n" -#: g10/encrypt.c:684 +#: g10/encrypt.c:859 #, c-format msgid "reading from '%s'\n" msgstr "正在从‘%s’读取\n" -#: g10/encrypt.c:802 g10/sign.c:1162 +#: g10/encrypt.c:993 g10/sign.c:1186 #, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " "preferences\n" msgstr "警告： 强制压缩算法 %s (%d) 与接收者的偏好设置冲突\n" -#: g10/encrypt.c:970 -#, c-format -msgid "%s/%s encrypted for: \"%s\"\n" +#: g10/encrypt.c:1172 +#, fuzzy, c-format +#| msgid "%s/%s encrypted for: \"%s\"\n" +msgid "%s/%s.%s encrypted for: \"%s\"\n" msgstr "%s/%s 已经加密给：“%s”\n" -#: g10/encrypt.c:998 g10/pkclist.c:1028 g10/pkclist.c:1079 +#: g10/encrypt.c:1202 g10/pkclist.c:1044 g10/pkclist.c:1095 #, c-format msgid "option '%s' may not be used in %s mode\n" msgstr "选项 ‘%s’ 可能不能用于 %s 模式\n" -#: g10/decrypt-data.c:246 g10/mainproc.c:410 +#: g10/decrypt-data.c:247 g10/mainproc.c:410 #, c-format msgid "%s encrypted data\n" msgstr "%s 加密过的数据\n" -#: g10/decrypt-data.c:249 g10/mainproc.c:416 +#: g10/decrypt-data.c:250 g10/mainproc.c:416 #, c-format msgid "encrypted with unknown algorithm %d\n" msgstr "以未知的算法 %d 加密\n" -#: g10/decrypt-data.c:372 g10/decrypt-data.c:425 sm/decrypt.c:550 +#: g10/decrypt-data.c:373 g10/decrypt-data.c:426 sm/decrypt.c:907 #, c-format msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "警告： 消息使用了一个弱密钥以对称密文的形式加密\n" -#: g10/decrypt-data.c:384 g10/decrypt-data.c:437 +#: g10/decrypt-data.c:385 g10/decrypt-data.c:438 #, c-format msgid "problem handling encrypted packet\n" msgstr "处理加密封包时出现问题\n" @@ -2443,61 +2452,67 @@ msgstr "警告：无法删除临时文件（%s）‘%s’：%s\n" msgid "WARNING: unable to remove temp directory '%s': %s\n" msgstr "警告：无法删除临时目录‘%s’：%s\n" -#: g10/export.c:119 +#: g10/export.c:124 msgid "export signatures that are marked as local-only" msgstr "导出被标记为“仅限本地”的签名" -#: g10/export.c:121 +#: g10/export.c:126 msgid "export attribute user IDs (generally photo IDs)" msgstr "导出附属用户标识（一般为照片标识）" -#: g10/export.c:123 +#: g10/export.c:128 msgid "export revocation keys marked as \"sensitive\"" msgstr "导出被标记为“敏感”的吊销用密钥" -#: g10/export.c:125 +#: g10/export.c:130 msgid "remove unusable parts from key during export" msgstr "导出时移除密钥中未使用的部分" -#: g10/export.c:127 +#: g10/export.c:132 msgid "remove as much as possible from key during export" msgstr "导出时尽可能移除密钥中的可选部分" -#: g10/export.c:133 +#: g10/export.c:138 +#, fuzzy +#| msgid "generate a revocation certificate" +msgid "export only revocation certificates" +msgstr "生成一份吊销证书" + +#: g10/export.c:141 msgid "use the GnuPG key backup format" msgstr "使用 GnuPG 密钥备份格式" -#: g10/export.c:1291 +#: g10/export.c:1306 msgid " - skipped" msgstr " - 已跳过" -#: g10/export.c:1324 g10/import.c:2085 g10/openfile.c:200 g10/openfile.c:294 -#: g10/sign.c:1012 g10/sign.c:1326 +#: g10/export.c:1339 g10/import.c:2089 g10/openfile.c:200 g10/openfile.c:294 +#: g10/sign.c:1029 g10/sign.c:1357 #, c-format msgid "writing to '%s'\n" msgstr "正在写入‘%s’\n" -#: g10/export.c:1769 +#: g10/export.c:1784 #, c-format msgid "key %s: key material on-card - skipped\n" msgstr "密钥 %s：密钥在卡片上 - 已跳过\n" -#: g10/export.c:1964 +#: g10/export.c:2061 #, c-format msgid "exporting secret keys not allowed\n" msgstr "不允许导出私钥\n" -#: g10/export.c:2041 +#: g10/export.c:2138 #, c-format msgid "key %s: PGP 2.x style key - skipped\n" msgstr "密钥 %s：PGP 2.x 样式的密钥 - 已跳过\n" -#: g10/export.c:2135 +#: g10/export.c:2263 #, c-format msgid "WARNING: nothing exported\n" msgstr "警告：没有导出任何东西\n" -#: g10/export.c:2432 g10/plaintext.c:153 g10/plaintext.c:162 +#: g10/export.c:2560 g10/plaintext.c:153 g10/plaintext.c:162 #: g10/plaintext.c:168 g10/plaintext.c:191 #, c-format msgid "error creating '%s': %s\n" @@ -2507,322 +2522,322 @@ msgstr "创建‘%s’时出现错误：%s\n" msgid "[User ID not found]" msgstr "[用户标识未找到]" -#: g10/getkey.c:1441 +#: g10/getkey.c:1443 #, c-format msgid "automatically retrieved '%s' via %s\n" msgstr "自动拉取‘%s’，通过 %s\n" -#: g10/getkey.c:1447 +#: g10/getkey.c:1449 #, c-format msgid "error retrieving '%s' via %s: %s\n" msgstr "拉取‘%s’通过 %s 时出现错误： %s\n" -#: g10/getkey.c:1449 +#: g10/getkey.c:1451 msgid "No fingerprint" msgstr "无指纹" -#: g10/getkey.c:1670 +#: g10/getkey.c:1672 #, c-format msgid "checking for a fresh copy of an expired key via %s\n" msgstr "正在通过 %s 检查一个已过期密钥的新拷贝\n" -#: g10/getkey.c:2085 g10/revoke.c:655 g10/revoke.c:720 +#: g10/getkey.c:2095 g10/revoke.c:654 g10/revoke.c:719 #, c-format msgid "secret key \"%s\" not found: %s\n" msgstr "找不到私钥 “%s”：%s\n" -#: g10/getkey.c:2088 g10/pkclist.c:988 +#: g10/getkey.c:2098 g10/pkclist.c:1004 #, c-format msgid "(check argument of option '%s')\n" msgstr "（检查选项 ‘%s’ 的参数）\n" -#: g10/getkey.c:2164 +#: g10/getkey.c:2176 #, c-format msgid "Warning: not using '%s' as default key: %s\n" msgstr "警告：未使用‘%s’作为默认密钥：%s\n" -#: g10/getkey.c:2172 +#: g10/getkey.c:2184 #, c-format msgid "using \"%s\" as default secret key for signing\n" msgstr "使用 “%s” 作为默认签名用私钥\n" -#: g10/getkey.c:2179 +#: g10/getkey.c:2191 #, c-format msgid "all values passed to '%s' ignored\n" msgstr "传递给‘%s’的所有值被忽略\n" -#: g10/getkey.c:3024 +#: g10/getkey.c:3055 #, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "无效的密钥 %s 通过 --allow-non-selfsigned-uid 生效\n" -#: g10/getkey.c:3874 +#: g10/getkey.c:3915 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "使用子密钥 %s 而非主密钥 %s\n" -#: g10/getkey.c:4446 g10/gpg.c:2137 +#: g10/getkey.c:4487 g10/gpg.c:2168 #, c-format msgid "valid values for option '%s':\n" msgstr "选项 ‘%s’ 的有效值:\n" -#: g10/gpg.c:443 sm/gpgsm.c:212 +#: g10/gpg.c:450 sm/gpgsm.c:215 msgid "make a signature" msgstr "生成一份签名" -#: g10/gpg.c:444 +#: g10/gpg.c:451 msgid "make a clear text signature" msgstr "生成一份明文签名" -#: g10/gpg.c:446 sm/gpgsm.c:214 +#: g10/gpg.c:453 sm/gpgsm.c:217 msgid "make a detached signature" msgstr "生成一份分离的签名" -#: g10/gpg.c:447 sm/gpgsm.c:215 +#: g10/gpg.c:454 sm/gpgsm.c:218 msgid "encrypt data" msgstr "加密数据" -#: g10/gpg.c:449 +#: g10/gpg.c:456 msgid "encryption only with symmetric cipher" msgstr "仅使用对称密文加密" -#: g10/gpg.c:451 sm/gpgsm.c:217 +#: g10/gpg.c:458 sm/gpgsm.c:220 msgid "decrypt data (default)" msgstr "解密数据（默认）" -#: g10/gpg.c:453 sm/gpgsm.c:218 +#: g10/gpg.c:460 sm/gpgsm.c:221 msgid "verify a signature" msgstr "验证签名" -#: g10/gpg.c:455 sm/gpgsm.c:219 +#: g10/gpg.c:462 sm/gpgsm.c:222 msgid "list keys" msgstr "列出密钥" -#: g10/gpg.c:457 +#: g10/gpg.c:464 msgid "list keys and signatures" msgstr "列出密钥和签名" -#: g10/gpg.c:460 +#: g10/gpg.c:467 msgid "list and check key signatures" msgstr "列出并检查密钥签名" -#: g10/gpg.c:462 sm/gpgsm.c:224 +#: g10/gpg.c:469 sm/gpgsm.c:227 msgid "list keys and fingerprints" msgstr "列出密钥和指纹" -#: g10/gpg.c:463 sm/gpgsm.c:222 +#: g10/gpg.c:470 sm/gpgsm.c:225 msgid "list secret keys" msgstr "列出私钥" -#: g10/gpg.c:465 sm/gpgsm.c:225 +#: g10/gpg.c:472 sm/gpgsm.c:228 msgid "generate a new key pair" msgstr "生成一个新的密钥对" -#: g10/gpg.c:468 +#: g10/gpg.c:475 msgid "quickly generate a new key pair" msgstr "快速生成一个新的密钥对" -#: g10/gpg.c:471 +#: g10/gpg.c:478 msgid "quickly add a new user-id" msgstr "快速添加一个新的用户标识" -#: g10/gpg.c:476 +#: g10/gpg.c:483 msgid "quickly revoke a user-id" msgstr "快速吊销一个用户标识" -#: g10/gpg.c:479 +#: g10/gpg.c:486 msgid "quickly set a new expiration date" msgstr "快速设置一个过期日期" -#: g10/gpg.c:482 +#: g10/gpg.c:490 msgid "full featured key pair generation" msgstr "完整功能的密钥对生成" -#: g10/gpg.c:485 +#: g10/gpg.c:493 msgid "generate a revocation certificate" msgstr "生成一份吊销证书" -#: g10/gpg.c:488 sm/gpgsm.c:228 +#: g10/gpg.c:496 sm/gpgsm.c:231 msgid "remove keys from the public keyring" msgstr "从公钥钥匙环里删除密钥" -#: g10/gpg.c:490 +#: g10/gpg.c:498 msgid "remove keys from the secret keyring" msgstr "从私钥钥匙环里删除密钥" -#: g10/gpg.c:492 +#: g10/gpg.c:500 msgid "quickly sign a key" msgstr "快速签名一个密钥" -#: g10/gpg.c:494 +#: g10/gpg.c:502 msgid "quickly sign a key locally" msgstr "快速本地签名一个密钥" -#: g10/gpg.c:496 +#: g10/gpg.c:504 msgid "quickly revoke a key signature" msgstr "快速吊销一个密钥签名" -#: g10/gpg.c:497 +#: g10/gpg.c:505 msgid "sign a key" msgstr "签名一个密钥" -#: g10/gpg.c:498 +#: g10/gpg.c:506 msgid "sign a key locally" msgstr "本地签名一个密钥" -#: g10/gpg.c:499 +#: g10/gpg.c:507 msgid "sign or edit a key" msgstr "签名或编辑一个密钥" -#: g10/gpg.c:501 sm/gpgsm.c:246 +#: g10/gpg.c:509 sm/gpgsm.c:249 msgid "change a passphrase" msgstr "更改密码" -#: g10/gpg.c:505 +#: g10/gpg.c:513 msgid "export keys" msgstr "导出密钥" -#: g10/gpg.c:506 +#: g10/gpg.c:514 msgid "export keys to a keyserver" msgstr "将密钥导出到一个公钥服务器上" -#: g10/gpg.c:507 +#: g10/gpg.c:515 msgid "import keys from a keyserver" msgstr "从公钥服务器上导入密钥" -#: g10/gpg.c:510 +#: g10/gpg.c:518 msgid "search for keys on a keyserver" msgstr "在公钥服务器上搜索密钥" -#: g10/gpg.c:512 +#: g10/gpg.c:520 msgid "update all keys from a keyserver" msgstr "从公钥服务器更新所有密钥" -#: g10/gpg.c:520 +#: g10/gpg.c:528 msgid "import/merge keys" msgstr "导入/合并密钥" -#: g10/gpg.c:523 +#: g10/gpg.c:531 msgid "print the card status" msgstr "打印卡片状态" -#: g10/gpg.c:524 +#: g10/gpg.c:532 msgid "change data on a card" msgstr "更改卡片上的数据" -#: g10/gpg.c:526 +#: g10/gpg.c:534 msgid "change a card's PIN" msgstr "更改卡片的 PIN" -#: g10/gpg.c:538 +#: g10/gpg.c:546 msgid "update the trust database" msgstr "更新信任数据库" -#: g10/gpg.c:548 +#: g10/gpg.c:556 msgid "print message digests" msgstr "打印消息摘要" -#: g10/gpg.c:552 sm/gpgsm.c:241 +#: g10/gpg.c:560 sm/gpgsm.c:244 msgid "run in server mode" msgstr "以服务器模式运行" -#: g10/gpg.c:554 +#: g10/gpg.c:562 msgid "|VALUE|set the TOFU policy for a key" msgstr "|VALUE|设置一个密钥的 TOFU 政策" -#: g10/gpg.c:594 +#: g10/gpg.c:602 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|使用 NAME 作为默认的私钥" -#: g10/gpg.c:596 sm/gpgsm.c:332 +#: g10/gpg.c:604 sm/gpgsm.c:336 msgid "|NAME|encrypt to user ID NAME as well" msgstr "|NAME|同时给以 NAME 为名称的用户标识加密" -#: g10/gpg.c:604 +#: g10/gpg.c:612 msgid "|SPEC|set up email aliases" msgstr "|SPEC|设置电子邮件别名" -#: g10/gpg.c:616 +#: g10/gpg.c:624 msgid "use strict OpenPGP behavior" msgstr "使用严格的 OpenPGP 行为" -#: g10/gpg.c:641 kbx/kbxutil.c:90 sm/gpgsm.c:412 tools/gpgconf.c:112 +#: g10/gpg.c:649 kbx/kbxutil.c:90 sm/gpgsm.c:417 tools/gpgconf.c:113 msgid "do not make any changes" msgstr "不做任何更改" -#: g10/gpg.c:642 +#: g10/gpg.c:650 msgid "prompt before overwriting" msgstr "覆盖前提示" -#: g10/gpg.c:689 sm/gpgsm.c:304 +#: g10/gpg.c:699 sm/gpgsm.c:307 msgid "Options controlling the input" msgstr "输入控制选项" -#: g10/gpg.c:707 sm/gpgsm.c:314 +#: g10/gpg.c:717 sm/gpgsm.c:318 msgid "Options controlling the output" msgstr "输出控制选项" -#: g10/gpg.c:709 sm/gpgsm.c:316 +#: g10/gpg.c:719 sm/gpgsm.c:320 msgid "create ascii armored output" msgstr "创建 ASCII 字符封装的输出" -#: g10/gpg.c:713 g10/gpgv.c:82 sm/gpgsm.c:321 +#: g10/gpg.c:723 g10/gpgv.c:82 sm/gpgsm.c:325 msgid "|FILE|write output to FILE" msgstr "|FILE|写输出到 FILE" -#: g10/gpg.c:726 +#: g10/gpg.c:736 msgid "use canonical text mode" msgstr "使用规范的文本模式" -#: g10/gpg.c:743 +#: g10/gpg.c:753 msgid "|N|set compress level to N (0 disables)" msgstr "|N|设置压缩等级为 N （0 为禁用）" -#: g10/gpg.c:750 sm/gpgsm.c:347 +#: g10/gpg.c:760 sm/gpgsm.c:351 msgid "Options controlling key import and export" msgstr "密钥导入导出控制选项" -#: g10/gpg.c:753 +#: g10/gpg.c:763 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address" msgstr "|MECHANISMS|通过邮件地址定位密钥时使用机制 MECHANISMS" -#: g10/gpg.c:756 +#: g10/gpg.c:766 msgid "import missing key from a signature" msgstr "从签名导入缺少的密钥" -#: g10/gpg.c:761 +#: g10/gpg.c:771 msgid "include the public key in signatures" msgstr "在签名中包含公钥" -#: g10/gpg.c:764 sm/gpgsm.c:350 +#: g10/gpg.c:774 sm/gpgsm.c:354 msgid "disable all access to the dirmngr" msgstr "禁用对 dirmngr 的所有访问" -#: g10/gpg.c:776 sm/gpgsm.c:357 +#: g10/gpg.c:786 sm/gpgsm.c:361 msgid "Options controlling key listings" msgstr "密钥列出控制选项" -#: g10/gpg.c:805 sm/gpgsm.c:324 +#: g10/gpg.c:815 sm/gpgsm.c:328 msgid "Options to specify keys" msgstr "指定密钥选项" -#: g10/gpg.c:807 sm/gpgsm.c:326 +#: g10/gpg.c:817 sm/gpgsm.c:330 msgid "|USER-ID|encrypt for USER-ID" msgstr "|USER-ID|为 USER-ID 加密" -#: g10/gpg.c:815 sm/gpgsm.c:328 +#: g10/gpg.c:825 sm/gpgsm.c:332 msgid "|USER-ID|use USER-ID to sign or decrypt" msgstr "|USER-ID|使用 USER-ID 来签名或者解密" -#: g10/gpg.c:866 sm/gpgsm.c:396 +#: g10/gpg.c:876 sm/gpgsm.c:401 msgid "Options for unattended use" msgstr "无人值守选项" -#: g10/gpg.c:885 sm/gpgsm.c:408 dirmngr/dirmngr.c:294 +#: g10/gpg.c:895 sm/gpgsm.c:413 dirmngr/dirmngr.c:297 msgid "Other options" msgstr "其他选项" -#: g10/gpg.c:953 sm/gpgsm.c:440 +#: g10/gpg.c:965 sm/gpgsm.c:446 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -2830,7 +2845,7 @@ msgstr "" "@\n" "（请参考手册页以获得所有命令和选项的完整列表）\n" -#: g10/gpg.c:956 +#: g10/gpg.c:968 msgid "" "@\n" "Examples:\n" @@ -2850,11 +2865,11 @@ msgstr "" " --list-keys [名字] 列出密钥\n" " --fingerprint [名字] 显示指纹\n" -#: g10/gpg.c:1130 +#: g10/gpg.c:1150 msgid "Usage: @GPG@ [options] [files] (-h for help)" msgstr "用法： @GPG@ [选项] [文件] (-h 获取帮助)" -#: g10/gpg.c:1133 +#: g10/gpg.c:1153 msgid "" "Syntax: @GPG@ [options] [files]\n" "Sign, check, encrypt or decrypt\n" @@ -2864,7 +2879,7 @@ msgstr "" "签名、检查、加密或解密\n" "默认的操作依输入数据而定\n" -#: g10/gpg.c:1144 sm/gpgsm.c:624 +#: g10/gpg.c:1164 sm/gpgsm.c:632 msgid "" "\n" "Supported algorithms:\n" @@ -2872,537 +2887,543 @@ msgstr "" "\n" "支持的算法：\n" -#: g10/gpg.c:1147 +#: g10/gpg.c:1167 msgid "Pubkey: " msgstr "公钥： " -#: g10/gpg.c:1154 g10/keyedit.c:3338 +#: g10/gpg.c:1174 g10/keylist.c:317 msgid "Cipher: " msgstr "密文： " -#: g10/gpg.c:1161 +#: g10/gpg.c:1181 msgid "Hash: " msgstr "散列： " -#: g10/gpg.c:1168 g10/keyedit.c:3404 +#: g10/gpg.c:1188 g10/keylist.c:380 msgid "Compression: " msgstr "压缩： " -#: g10/gpg.c:1241 sm/gpgsm.c:698 +#: g10/gpg.c:1261 sm/gpgsm.c:706 #, c-format msgid "usage: %s [options] %s\n" msgstr "用法： %s [选项] %s\n" -#: g10/gpg.c:1436 sm/gpgsm.c:791 +#: g10/gpg.c:1456 sm/gpgsm.c:799 #, c-format msgid "conflicting commands\n" msgstr "冲突的指令\n" -#: g10/gpg.c:1454 +#: g10/gpg.c:1474 #, c-format msgid "no = sign found in group definition '%s'\n" msgstr "群组定义 ‘%s’ 中找不到 = 标志\n" -#: g10/gpg.c:1652 +#: g10/gpg.c:1672 #, c-format msgid "WARNING: unsafe ownership on homedir '%s'\n" msgstr "警告：家目录‘%s’的所有权不安全\n" -#: g10/gpg.c:1655 +#: g10/gpg.c:1675 #, c-format msgid "WARNING: unsafe ownership on configuration file '%s'\n" msgstr "警告：配置文件‘%s’的所有权不安全\n" -#: g10/gpg.c:1658 +#: g10/gpg.c:1678 #, c-format msgid "WARNING: unsafe ownership on extension '%s'\n" msgstr "警告：扩展模块‘%s’的所有权不安全\n" -#: g10/gpg.c:1664 +#: g10/gpg.c:1684 #, c-format msgid "WARNING: unsafe permissions on homedir '%s'\n" msgstr "警告：家目录‘%s’的权限位不安全\n" -#: g10/gpg.c:1667 +#: g10/gpg.c:1687 #, c-format msgid "WARNING: unsafe permissions on configuration file '%s'\n" msgstr "警告：配置文件‘%s’的权限位不安全\n" -#: g10/gpg.c:1670 +#: g10/gpg.c:1690 #, c-format msgid "WARNING: unsafe permissions on extension '%s'\n" msgstr "警告：扩展模块‘%s’的权限位不安全\n" -#: g10/gpg.c:1676 +#: g10/gpg.c:1696 #, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n" msgstr "警告：家目录‘%s’的上级目录所有权不安全\n" -#: g10/gpg.c:1679 +#: g10/gpg.c:1699 #, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n" msgstr "警告：配置文件‘%s’的上级目录所有权不安全\n" -#: g10/gpg.c:1682 +#: g10/gpg.c:1702 #, c-format msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n" msgstr "警告：扩展模块‘%s’的上级目录所有权不安全\n" -#: g10/gpg.c:1688 +#: g10/gpg.c:1708 #, c-format msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n" msgstr "警告：家目录‘%s’的上级目录权限位不安全\n" -#: g10/gpg.c:1691 +#: g10/gpg.c:1711 #, c-format msgid "" "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n" msgstr "警告：配置文件‘%s’的上级目录权限不安全\n" -#: g10/gpg.c:1694 +#: g10/gpg.c:1714 #, c-format msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n" msgstr "警告：扩展模块‘%s’的上级目录权限位不安全\n" -#: g10/gpg.c:1910 +#: g10/gpg.c:1930 #, c-format msgid "unknown configuration item '%s'\n" msgstr "未知的配置项‘%s’\n" -#: g10/gpg.c:2009 +#: g10/gpg.c:2031 msgid "display photo IDs during key listings" msgstr "列出密钥时显示照片标识" -#: g10/gpg.c:2011 +#: g10/gpg.c:2033 msgid "show key usage information during key listings" msgstr "列出密钥时显示用途信息" -#: g10/gpg.c:2013 +#: g10/gpg.c:2035 msgid "show policy URLs during signature listings" msgstr "列出签名时显示策略 URL" -#: g10/gpg.c:2015 +#: g10/gpg.c:2037 msgid "show all notations during signature listings" msgstr "列出签名时显示所有注记" -#: g10/gpg.c:2017 +#: g10/gpg.c:2039 msgid "show IETF standard notations during signature listings" msgstr "列出签名时显示 IETF 标准注记" -#: g10/gpg.c:2021 +#: g10/gpg.c:2043 msgid "show user-supplied notations during signature listings" msgstr "列出签名时显示用户提供的注记" -#: g10/gpg.c:2023 +#: g10/gpg.c:2045 msgid "show preferred keyserver URLs during signature listings" msgstr "列出签名时显示首选公钥服务器 URL" -#: g10/gpg.c:2025 +#: g10/gpg.c:2047 msgid "show user ID validity during key listings" msgstr "列出密钥时显示用户标识的有效性" -#: g10/gpg.c:2027 +#: g10/gpg.c:2049 msgid "show revoked and expired user IDs in key listings" msgstr "列出密钥时显示已吊销或已过期的用户标识" -#: g10/gpg.c:2029 +#: g10/gpg.c:2051 msgid "show revoked and expired subkeys in key listings" msgstr "列出密钥时显示已吊销或已过期的子密钥" -#: g10/gpg.c:2031 +#: g10/gpg.c:2053 msgid "show the keyring name in key listings" msgstr "列出密钥时显示钥匙环的名称" -#: g10/gpg.c:2033 +#: g10/gpg.c:2055 msgid "show expiration dates during signature listings" msgstr "列出签名时显示过期日期" -#: g10/gpg.c:2148 +#: g10/gpg.c:2057 g10/gpg.c:2059 +#, fuzzy +#| msgid "list preferences (expert)" +msgid "show preferences" +msgstr "列出偏好设置（专家模式）" + +#: g10/gpg.c:2179 #, c-format msgid "unknown TOFU policy '%s'\n" msgstr "未知的 TOFU 政策‘%s’\n" -#: g10/gpg.c:2150 +#: g10/gpg.c:2181 #, c-format msgid "(use \"help\" to list choices)\n" msgstr "（使用“help”来列出选择）\n" -#: g10/gpg.c:2240 g10/keyedit.c:1719 +#: g10/gpg.c:2271 g10/keyedit.c:1730 #, c-format msgid "This command is not allowed while in %s mode.\n" msgstr "不允许在 %s 模式中使用此命令。\n" -#: g10/gpg.c:2878 g10/gpg.c:3718 g10/gpg.c:3730 +#: g10/gpg.c:2919 g10/gpg.c:3776 g10/gpg.c:3788 #, c-format msgid "Note: %s is not for normal use!\n" msgstr "注意：%s 不适用于一般使用！\n" -#: g10/gpg.c:3053 g10/gpg.c:3065 +#: g10/gpg.c:3096 g10/gpg.c:3108 #, c-format msgid "'%s' is not a valid signature expiration\n" msgstr "‘%s’不是一个有效的签名过期日期\n" -#: g10/gpg.c:3087 +#: g10/gpg.c:3130 #, c-format msgid "\"%s\" is not a proper mail address\n" msgstr "“%s” 不是一个合适的邮件地址\n" -#: g10/gpg.c:3119 sm/gpgsm.c:1121 +#: g10/gpg.c:3168 sm/gpgsm.c:1129 #, c-format msgid "invalid pinentry mode '%s'\n" msgstr "无效的 pinentry 模式‘%s’\n" -#: g10/gpg.c:3125 sm/gpgsm.c:1127 +#: g10/gpg.c:3174 sm/gpgsm.c:1135 #, c-format msgid "invalid request origin '%s'\n" msgstr "无效的请求来源‘%s’\n" -#: g10/gpg.c:3179 +#: g10/gpg.c:3228 #, c-format msgid "'%s' is not a valid character set\n" msgstr "‘%s’不是一个有效的字符集\n" -#: g10/gpg.c:3201 g10/gpg.c:3415 g10/keyedit.c:5338 +#: g10/gpg.c:3250 g10/gpg.c:3470 g10/keyedit.c:5275 #, c-format msgid "could not parse keyserver URL\n" msgstr "无法解析公钥服务器 URL\n" -#: g10/gpg.c:3219 +#: g10/gpg.c:3268 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s：%d：无效的公钥服务器选项\n" -#: g10/gpg.c:3222 +#: g10/gpg.c:3271 #, c-format msgid "invalid keyserver options\n" msgstr "无效的公钥服务器选项\n" -#: g10/gpg.c:3229 +#: g10/gpg.c:3278 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s：%d：无效的导入选项\n" -#: g10/gpg.c:3232 +#: g10/gpg.c:3281 #, c-format msgid "invalid import options\n" msgstr "无效的导入选项\n" -#: g10/gpg.c:3238 g10/gpg.c:3253 +#: g10/gpg.c:3287 g10/gpg.c:3302 #, c-format msgid "invalid filter option: %s\n" msgstr "无效的过滤选项：%s\n" -#: g10/gpg.c:3244 +#: g10/gpg.c:3293 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s：%d：无效的导出选项\n" -#: g10/gpg.c:3247 +#: g10/gpg.c:3296 #, c-format msgid "invalid export options\n" msgstr "无效的导出选项\n" -#: g10/gpg.c:3259 +#: g10/gpg.c:3308 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s：%d：无效的列表选项\n" -#: g10/gpg.c:3262 +#: g10/gpg.c:3311 #, c-format msgid "invalid list options\n" msgstr "无效的列表选项\n" -#: g10/gpg.c:3270 +#: g10/gpg.c:3319 msgid "display photo IDs during signature verification" msgstr "验证签名时显示照片标识" -#: g10/gpg.c:3272 +#: g10/gpg.c:3321 msgid "show policy URLs during signature verification" msgstr "验证签名时显示策略 URL" -#: g10/gpg.c:3274 +#: g10/gpg.c:3323 msgid "show all notations during signature verification" msgstr "验证签名时显示所有注记" -#: g10/gpg.c:3276 +#: g10/gpg.c:3325 msgid "show IETF standard notations during signature verification" msgstr "验证签名时显示 IETF 标准注记" -#: g10/gpg.c:3280 +#: g10/gpg.c:3329 msgid "show user-supplied notations during signature verification" msgstr "验证签名时显示用户提供的注记" -#: g10/gpg.c:3282 +#: g10/gpg.c:3331 msgid "show preferred keyserver URLs during signature verification" msgstr "验证签名时显示首选公钥服务器 URL" -#: g10/gpg.c:3284 +#: g10/gpg.c:3333 msgid "show user ID validity during signature verification" msgstr "验证签名时显示用户标识的有效性" -#: g10/gpg.c:3286 +#: g10/gpg.c:3335 msgid "show revoked and expired user IDs in signature verification" msgstr "验证密钥时显示已吊销或已过期的子钥" -#: g10/gpg.c:3288 +#: g10/gpg.c:3337 msgid "show only the primary user ID in signature verification" msgstr "在签名验证中只显示主要用户标识" -#: g10/gpg.c:3290 +#: g10/gpg.c:3339 msgid "validate signatures with PKA data" msgstr "使用 PKA 数据验证签名" -#: g10/gpg.c:3292 +#: g10/gpg.c:3341 msgid "elevate the trust of signatures with valid PKA data" msgstr "提升带有有效 PKA 数据的签名的信任度" -#: g10/gpg.c:3299 +#: g10/gpg.c:3348 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: 无效的验证选项\n" -#: g10/gpg.c:3302 +#: g10/gpg.c:3351 #, c-format msgid "invalid verify options\n" msgstr "无效的验证选项\n" -#: g10/gpg.c:3309 +#: g10/gpg.c:3358 #, c-format msgid "unable to set exec-path to %s\n" msgstr "无法设置运行路径为 %s\n" -#: g10/gpg.c:3513 +#: g10/gpg.c:3568 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s%d: 无效的 auto-key-locate 列表\n" -#: g10/gpg.c:3516 +#: g10/gpg.c:3571 #, c-format msgid "invalid auto-key-locate list\n" msgstr "无效的 auto-key-locate 列表\n" -#: g10/gpg.c:3700 sm/gpgsm.c:1492 +#: g10/gpg.c:3758 sm/gpgsm.c:1509 #, c-format msgid "WARNING: program may create a core file!\n" msgstr "警告：程序可能会创建核心内存转储文件！\n" -#: g10/gpg.c:3711 +#: g10/gpg.c:3769 sm/gpgsm.c:1515 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "警告：%s 覆盖了 %s \n" -#: g10/gpg.c:3720 +#: g10/gpg.c:3778 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s 不允许与 %s 并用\n" -#: g10/gpg.c:3723 +#: g10/gpg.c:3781 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s 与 %s 并用时不起作用\n" -#: g10/gpg.c:3738 sm/gpgsm.c:1509 dirmngr/dirmngr.c:1205 +#: g10/gpg.c:3796 sm/gpgsm.c:1535 dirmngr/dirmngr.c:1242 #, c-format msgid "WARNING: running with faked system time: " msgstr "警告：正在以虚假的系统时间运行： " -#: g10/gpg.c:3759 +#: g10/gpg.c:3817 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "不会在内存不安全的情况下运行，原因是 %s\n" -#: g10/gpg.c:3804 g10/gpg.c:3828 sm/gpgsm.c:1579 +#: g10/gpg.c:3859 g10/gpg.c:3883 sm/gpgsm.c:1605 #, c-format msgid "selected cipher algorithm is invalid\n" msgstr "所选的密文算法无效\n" -#: g10/gpg.c:3816 +#: g10/gpg.c:3871 #, c-format msgid "selected compression algorithm is invalid\n" msgstr "所选的压缩算法无效\n" -#: g10/gpg.c:3822 +#: g10/gpg.c:3877 #, c-format msgid "selected certification digest algorithm is invalid\n" msgstr "所选的证书散列算法无效\n" -#: g10/gpg.c:3837 +#: g10/gpg.c:3892 #, c-format msgid "completes-needed must be greater than 0\n" msgstr "需要的完全可信签名数一定要大于 0\n" -#: g10/gpg.c:3839 +#: g10/gpg.c:3894 #, c-format msgid "marginals-needed must be greater than 1\n" msgstr "需要的勉强可信签名数一定要大于 1\n" -#: g10/gpg.c:3841 +#: g10/gpg.c:3896 #, c-format msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "最大证书链深度（max-cert-depth）一定要介于 1 和 255 之间\n" -#: g10/gpg.c:3843 +#: g10/gpg.c:3898 #, c-format msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "无效的默认认证级别（default-cert-level）；必须为 0，1，2 或 3\n" -#: g10/gpg.c:3845 +#: g10/gpg.c:3900 #, c-format msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "无效的最小认证级别（default-cert-level）；必须为 1，2 或 3\n" -#: g10/gpg.c:3849 +#: g10/gpg.c:3904 #, c-format msgid "Note: simple S2K mode (0) is strongly discouraged\n" msgstr "注意：强烈不建议使用简单的 S2K 模式 (0)\n" -#: g10/gpg.c:3853 +#: g10/gpg.c:3908 #, c-format msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "无效的 S2K 模式；必须是 0，1 或 3\n" -#: g10/gpg.c:3860 +#: g10/gpg.c:3915 #, c-format msgid "invalid default preferences\n" msgstr "无效的默认偏好设置\n" -#: g10/gpg.c:3864 +#: g10/gpg.c:3919 #, c-format msgid "invalid personal cipher preferences\n" msgstr "无效的个人密文偏好设置\n" -#: g10/gpg.c:3868 +#: g10/gpg.c:3923 #, c-format msgid "invalid personal digest preferences\n" msgstr "无效的个人摘要算法偏好设置\n" -#: g10/gpg.c:3872 +#: g10/gpg.c:3927 #, c-format msgid "invalid personal compress preferences\n" msgstr "无效的个人压缩算法首选项\n" -#: g10/gpg.c:3908 +#: g10/gpg.c:3963 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s 尚不能和 %s 并用\n" -#: g10/gpg.c:3971 +#: g10/gpg.c:4026 #, c-format msgid "compression algorithm '%s' may not be used in %s mode\n" msgstr "压缩算法‘%s’不能在 %s 模式下使用\n" -#: g10/gpg.c:4115 +#: g10/gpg.c:4170 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "初始化信任度数据库失败：%s\n" -#: g10/gpg.c:4127 +#: g10/gpg.c:4182 #, c-format msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "警告：给定了接收者（-r）但并未使用公钥加密\n" -#: g10/gpg.c:4199 +#: g10/gpg.c:4255 #, c-format msgid "symmetric encryption of '%s' failed: %s\n" msgstr "对称加密‘%s’失败：%s\n" -#: g10/gpg.c:4228 +#: g10/gpg.c:4284 #, c-format msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "您不能在使用 --symmetric --encrypt 时使用 --s2k-mode 0\n" -#: g10/gpg.c:4231 +#: g10/gpg.c:4287 #, c-format msgid "you cannot use --symmetric --encrypt in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n" -#: g10/gpg.c:4289 +#: g10/gpg.c:4345 #, c-format msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "您不能在使用 --symmetric --sign --encrypt 时使用 --s2k-mode 0\n" -#: g10/gpg.c:4292 +#: g10/gpg.c:4348 #, c-format msgid "you cannot use --symmetric --sign --encrypt in %s mode\n" msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n" -#: g10/gpg.c:4692 g10/keyserver.c:1648 +#: g10/gpg.c:4756 g10/keyserver.c:1650 #, c-format msgid "keyserver send failed: %s\n" msgstr "发送至公钥服务器失败：%s\n" -#: g10/gpg.c:4697 +#: g10/gpg.c:4761 #, c-format msgid "keyserver receive failed: %s\n" msgstr "从公钥服务器接收失败：%s\n" -#: g10/gpg.c:4703 +#: g10/gpg.c:4767 #, c-format msgid "key export failed: %s\n" msgstr "导出密钥失败：%s\n" -#: g10/gpg.c:4716 +#: g10/gpg.c:4780 #, c-format msgid "export as ssh key failed: %s\n" msgstr "作为 ssh 密钥导出失败：%s\n" -#: g10/gpg.c:4728 +#: g10/gpg.c:4792 #, c-format msgid "keyserver search failed: %s\n" msgstr "公钥服务器搜索失败：%s\n" -#: g10/gpg.c:4741 +#: g10/gpg.c:4805 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "公钥服务器刷新失败：%s\n" -#: g10/gpg.c:4810 +#: g10/gpg.c:4874 #, c-format msgid "dearmoring failed: %s\n" msgstr "解开字符封装时失败：%s\n" -#: g10/gpg.c:4821 +#: g10/gpg.c:4885 #, c-format msgid "enarmoring failed: %s\n" msgstr "进行字符封装时失败：%s\n" -#: g10/gpg.c:4913 +#: g10/gpg.c:5009 #, c-format msgid "invalid hash algorithm '%s'\n" msgstr "无效的散列算法‘%s’\n" -#: g10/gpg.c:5065 g10/tofu.c:2153 +#: g10/gpg.c:5161 g10/tofu.c:2153 #, c-format msgid "error parsing key specification '%s': %s\n" msgstr "解析密钥指定‘%s’时出现错误：%s\n" -#: g10/gpg.c:5078 +#: g10/gpg.c:5174 #, c-format msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n" msgstr "‘%s’不像是一个有效的密钥标识、指纹或者 keygrip\n" -#: g10/gpg.c:5134 +#: g10/gpg.c:5230 #, c-format msgid "WARNING: no command supplied. Trying to guess what you mean ...\n" msgstr "警告：没有提供命令。正在尝试猜测您的意图...\n" -#: g10/gpg.c:5145 +#: g10/gpg.c:5241 #, c-format msgid "Go ahead and type your message ...\n" msgstr "请开始输入您的消息…\n" -#: g10/gpg.c:5490 +#: g10/gpg.c:5586 #, c-format msgid "the given certification policy URL is invalid\n" msgstr "给定的的证书策略 URL 无效\n" -#: g10/gpg.c:5492 +#: g10/gpg.c:5588 #, c-format msgid "the given signature policy URL is invalid\n" msgstr "给定的签名策略 URL 无效\n" -#: g10/gpg.c:5525 +#: g10/gpg.c:5621 #, c-format msgid "the given preferred keyserver URL is invalid\n" msgstr "给定的首选公钥服务器 URL 无效\n" @@ -3415,7 +3436,7 @@ msgstr "|FILE|从钥匙环 FILE 文件中取得密钥" msgid "make timestamp conflicts only a warning" msgstr "把时间戳冲突仅视为警告" -#: g10/gpgv.c:86 sm/gpgsm.c:402 tools/gpgconf.c:114 +#: g10/gpgv.c:86 sm/gpgsm.c:407 tools/gpgconf.c:117 msgid "|FD|write status info to this FD" msgstr "|FD|把状态信息写入文件描述符 FD" @@ -3444,145 +3465,145 @@ msgstr "没有可用的帮助" msgid "No help available for '%s'" msgstr "没有关于‘%s’的可用帮助" -#: g10/import.c:169 +#: g10/import.c:170 msgid "import signatures that are marked as local-only" msgstr "导入被标记为仅限本地（local-only）的签名" -#: g10/import.c:172 +#: g10/import.c:173 msgid "repair damage from the pks keyserver during import" msgstr "导入时修复源于 PKS 公钥服务器的损坏" -#: g10/import.c:175 +#: g10/import.c:176 msgid "do not clear the ownertrust values during import" msgstr "在导入期间不清除信任度" -#: g10/import.c:178 +#: g10/import.c:179 msgid "do not update the trustdb after import" msgstr "导入后不更新信任度数据库" -#: g10/import.c:181 +#: g10/import.c:182 msgid "show key during import" msgstr "在导入时显示密钥" -#: g10/import.c:184 +#: g10/import.c:185 msgid "only accept updates to existing keys" msgstr "只接受对现有密钥的更新" -#: g10/import.c:187 +#: g10/import.c:188 msgid "remove unusable parts from key after import" msgstr "导入后移除密钥中无用的部分" -#: g10/import.c:190 +#: g10/import.c:191 msgid "remove as much as possible from key after import" msgstr "导入后尽可能多地移除密钥中的可选部分" -#: g10/import.c:193 +#: g10/import.c:194 msgid "ignore key-signatures which are not self-signatures" msgstr "忽略不是自签名的密钥签名" -#: g10/import.c:196 +#: g10/import.c:197 msgid "run import filters and export key immediately" msgstr "运行导入过滤器并立即导出密钥" -#: g10/import.c:199 +#: g10/import.c:200 msgid "assume the GnuPG key backup format" msgstr "假定为 GnuPG 密钥备份格式" -#: g10/import.c:203 +#: g10/import.c:204 msgid "repair keys on import" msgstr "在导入期间修复密钥" -#: g10/import.c:392 g10/import.c:711 +#: g10/import.c:393 g10/import.c:712 #, c-format msgid "skipping block of type %d\n" msgstr "跳过 %d 类型的块\n" -#: g10/import.c:728 +#: g10/import.c:729 #, c-format msgid "%lu keys processed so far\n" msgstr "目前已处理 %lu 个密钥\n" -#: g10/import.c:814 +#: g10/import.c:815 #, c-format msgid "Total number processed: %lu\n" msgstr "处理的总数：%lu\n" -#: g10/import.c:817 +#: g10/import.c:818 #, c-format msgid " skipped PGP-2 keys: %lu\n" msgstr " 已跳过的 PGP-2 密钥：%lu\n" -#: g10/import.c:819 +#: g10/import.c:820 #, c-format msgid " skipped new keys: %lu\n" msgstr " 已跳过的新密钥：%lu\n" -#: g10/import.c:822 +#: g10/import.c:823 #, c-format msgid " w/o user IDs: %lu\n" msgstr " 缺少用户标识：%lu\n" -#: g10/import.c:825 sm/import.c:130 +#: g10/import.c:826 sm/import.c:130 #, c-format msgid " imported: %lu" msgstr " 已导入：%lu" -#: g10/import.c:829 sm/import.c:134 +#: g10/import.c:830 sm/import.c:134 #, c-format msgid " unchanged: %lu\n" msgstr " 未改变：%lu\n" -#: g10/import.c:831 +#: g10/import.c:832 #, c-format msgid " new user IDs: %lu\n" msgstr " 新用户标识：%lu\n" -#: g10/import.c:833 +#: g10/import.c:834 #, c-format msgid " new subkeys: %lu\n" msgstr " 新的子密钥：%lu\n" -#: g10/import.c:835 +#: g10/import.c:836 #, c-format msgid " new signatures: %lu\n" msgstr " 新的签名：%lu\n" -#: g10/import.c:837 +#: g10/import.c:838 #, c-format msgid " new key revocations: %lu\n" msgstr " 新的密钥吊销：%lu\n" -#: g10/import.c:839 sm/import.c:136 +#: g10/import.c:840 sm/import.c:136 #, c-format msgid " secret keys read: %lu\n" msgstr " 读取的私钥：%lu\n" -#: g10/import.c:841 sm/import.c:138 +#: g10/import.c:842 sm/import.c:138 #, c-format msgid " secret keys imported: %lu\n" msgstr " 导入的私钥：%lu\n" -#: g10/import.c:843 sm/import.c:140 +#: g10/import.c:844 sm/import.c:140 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " 未改变的私钥：%lu\n" -#: g10/import.c:845 sm/import.c:142 +#: g10/import.c:846 sm/import.c:142 #, c-format msgid " not imported: %lu\n" msgstr " 未被导入：%lu\n" -#: g10/import.c:847 +#: g10/import.c:848 #, c-format msgid " signatures cleaned: %lu\n" msgstr " 清理的签名：%lu\n" -#: g10/import.c:849 +#: g10/import.c:850 #, c-format msgid " user IDs cleaned: %lu\n" msgstr " 清理的用户标识：%lu\n" -#: g10/import.c:1276 +#: g10/import.c:1277 #, c-format msgid "" "WARNING: key %s contains preferences for unavailable\n" @@ -3591,170 +3612,175 @@ msgstr "" "警告：密钥 %s 包含了不可用算法的偏好设置\n" "于下列用户标识上：\n" -#: g10/import.c:1318 +#: g10/import.c:1319 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr " “%s”：密文算法 %s 的首选项\n" -#: g10/import.c:1333 +#: g10/import.c:1334 #, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr " “%s”：散列算法 %s 对应首选项\n" -#: g10/import.c:1345 +#: g10/import.c:1346 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr " “%s”：压缩算法 %s 对应首选项\n" -#: g10/import.c:1358 +#: g10/import.c:1359 #, c-format msgid "it is strongly suggested that you update your preferences and\n" msgstr "强烈建议您更新您的偏好设置并重新分发这个密钥\n" -#: g10/import.c:1360 +#: g10/import.c:1361 #, c-format msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "以避免可能的算法不匹配问题\n" -#: g10/import.c:1385 +#: g10/import.c:1386 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "您可以这样更新您的偏好设置：gpg --edit-key %s updpref save\n" -#: g10/import.c:1899 g10/import.c:3013 +#: g10/import.c:1902 g10/import.c:3038 #, c-format msgid "key %s: no user ID\n" msgstr "密钥 %s：没有用户标识\n" -#: g10/import.c:1905 +#: g10/import.c:1908 #, c-format msgid "key %s: %s\n" msgstr "密钥 %s： %s\n" -#: g10/import.c:1906 g10/import.c:2985 +#: g10/import.c:1909 g10/import.c:3010 msgid "rejected by import screener" msgstr "被导入筛查器拒绝" -#: g10/import.c:1950 +#: g10/import.c:1953 #, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "密钥%s：PKS 子密钥破损已修复\n" -#: g10/import.c:1971 +#: g10/import.c:1974 #, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "密钥 %s：已接受不含自签名的用户标识 “%s”\n" -#: g10/import.c:1981 g10/import.c:2012 +#: g10/import.c:1985 g10/import.c:2016 #, c-format msgid "key %s: no valid user IDs\n" msgstr "密钥 %s：没有有效的用户标识\n" -#: g10/import.c:1983 +#: g10/import.c:1987 #, c-format msgid "this may be caused by a missing self-signature\n" msgstr "这可能由于遗失自签名所致\n" -#: g10/import.c:2062 g10/import.c:3399 +#: g10/import.c:2066 g10/import.c:3425 #, c-format msgid "key %s: public key not found: %s\n" msgstr "密钥 %s：找不到公钥：%s\n" -#: g10/import.c:2068 +#: g10/import.c:2072 #, c-format msgid "key %s: new key - skipped\n" msgstr "密钥 %s：新密钥 - 已跳过\n" -#: g10/import.c:2080 +#: g10/import.c:2084 #, c-format msgid "no writable keyring found: %s\n" msgstr "找不到可写的钥匙环：%s\n" -#: g10/import.c:2112 g10/import.c:2214 g10/import.c:3476 +#: g10/import.c:2116 g10/import.c:2218 g10/import.c:3502 #, c-format msgid "error writing keyring '%s': %s\n" msgstr "写入钥匙环 ‘%s’ 时出现错误： %s\n" -#: g10/import.c:2135 +#: g10/import.c:2139 #, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "密钥 %s：公钥 “%s” 已导入\n" -#: g10/import.c:2162 +#: g10/import.c:2166 #, c-format msgid "key %s: doesn't match our copy\n" msgstr "密钥 %s：与我们的副本不符合\n" -#: g10/import.c:2230 +#: g10/import.c:2234 #, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "密钥 %s：“%s” 1 个新的用户标识\n" -#: g10/import.c:2233 +#: g10/import.c:2237 #, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "密钥 %s：“%s” %d 个新的用户标识\n" -#: g10/import.c:2236 +#: g10/import.c:2240 #, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "密钥 %s：“%s” 1 个新的签名\n" -#: g10/import.c:2239 +#: g10/import.c:2243 #, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "密钥 %s：“%s” %d 个新的签名\n" -#: g10/import.c:2242 +#: g10/import.c:2246 #, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "密钥 %s：“%s” 1 个新的子密钥\n" -#: g10/import.c:2245 +#: g10/import.c:2249 #, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "密钥 %s：“%s” %d 个新的子密钥\n" -#: g10/import.c:2248 +#: g10/import.c:2252 #, c-format msgid "key %s: \"%s\" %d signature cleaned\n" msgstr "密钥 %s：“%s” %d 个签名被清理\n" -#: g10/import.c:2251 +#: g10/import.c:2255 #, c-format msgid "key %s: \"%s\" %d signatures cleaned\n" msgstr "密钥 %s：“%s” %d 个签名被清理\n" -#: g10/import.c:2254 +#: g10/import.c:2258 #, c-format msgid "key %s: \"%s\" %d user ID cleaned\n" msgstr "密钥 %s：“%s” %d 个用户标识被清理\n" -#: g10/import.c:2257 +#: g10/import.c:2261 #, c-format msgid "key %s: \"%s\" %d user IDs cleaned\n" msgstr "密钥 %s：“%s” %d 个用户标识被清理\n" -#: g10/import.c:2293 +#: g10/import.c:2297 #, c-format msgid "key %s: \"%s\" not changed\n" msgstr "密钥 %s：“%s” 未改变\n" -#: g10/import.c:2652 g10/import.c:2847 +#: g10/import.c:2667 g10/import.c:2872 #, c-format msgid "key %s: secret key imported\n" msgstr "密钥 %s：私钥已导入\n" -#: g10/import.c:2660 +#: g10/import.c:2675 #, c-format msgid "key %s: secret key already exists\n" msgstr "密钥 %s：私钥已存在\n" -#: g10/import.c:2668 +#: g10/import.c:2683 #, c-format msgid "key %s: error sending to agent: %s\n" msgstr "密钥 %s：发送至代理人程序时出现错误：%s\n" +#: g10/import.c:2845 +#, c-format +msgid "key %s: card reference is overridden by key material\n" +msgstr "" + #. TRANSLATORS: For a smartcard, each private key on host has a #. * reference (stub) to a smartcard and actual private key data #. * is stored on the card. A single smartcard can have up to @@ -3763,192 +3789,192 @@ msgstr "密钥 %s：发送至代理人程序时出现错误：%s\n" #. * Instead, user should be suggested to run 'gpg --card-status', #. * then, references to a card will be automatically created #. * again. -#: g10/import.c:2837 +#: g10/import.c:2862 #, c-format msgid "To migrate '%s', with each smartcard, run: %s\n" msgstr "要迁移 ‘%s’，对每一张智能卡，执行：%s\n" -#: g10/import.c:2984 +#: g10/import.c:3009 #, c-format msgid "secret key %s: %s\n" msgstr "私钥 %s：%s\n" -#: g10/import.c:3005 g10/import.c:3044 +#: g10/import.c:3030 g10/import.c:3069 #, c-format msgid "importing secret keys not allowed\n" msgstr "私钥导入被禁止\n" -#: g10/import.c:3032 +#: g10/import.c:3057 #, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "密钥 %s：私钥使用了无效的密文算法 %d - 已跳过\n" -#: g10/import.c:3194 g10/pkclist.c:72 g10/revoke.c:776 +#: g10/import.c:3219 g10/pkclist.c:72 g10/revoke.c:775 msgid "No reason specified" msgstr "未指定原因" -#: g10/import.c:3195 g10/pkclist.c:74 g10/revoke.c:778 +#: g10/import.c:3220 g10/pkclist.c:74 g10/revoke.c:777 msgid "Key is superseded" msgstr "密钥被替换" -#: g10/import.c:3196 g10/pkclist.c:76 g10/revoke.c:777 +#: g10/import.c:3221 g10/pkclist.c:76 g10/revoke.c:776 msgid "Key has been compromised" msgstr "密钥已泄漏" -#: g10/import.c:3197 g10/pkclist.c:78 g10/revoke.c:779 +#: g10/import.c:3222 g10/pkclist.c:78 g10/revoke.c:778 msgid "Key is no longer used" msgstr "密钥不再使用" -#: g10/import.c:3198 g10/pkclist.c:80 g10/revoke.c:780 +#: g10/import.c:3223 g10/pkclist.c:80 g10/revoke.c:779 msgid "User ID is no longer valid" msgstr "用户标识不再有效" -#: g10/import.c:3323 g10/keylist.c:1258 g10/pkclist.c:84 +#: g10/import.c:3348 g10/keylist.c:1437 g10/pkclist.c:84 #, c-format msgid "reason for revocation: " msgstr "吊销原因： " -#: g10/import.c:3342 g10/keylist.c:1277 g10/pkclist.c:100 +#: g10/import.c:3367 g10/keylist.c:1456 g10/pkclist.c:100 #, c-format msgid "revocation comment: " msgstr "吊销注释： " -#: g10/import.c:3392 +#: g10/import.c:3418 #, c-format msgid "key %s: no public key - can't apply revocation certificate\n" msgstr "密钥 %s：没有公钥 - 无法应用吊销证书\n" -#: g10/import.c:3423 +#: g10/import.c:3449 #, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "密钥 %s：无法定位原始的密钥区块：%s\n" -#: g10/import.c:3430 +#: g10/import.c:3456 #, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "密钥 %s：无法读取原始的密钥区块：%s\n" -#: g10/import.c:3450 +#: g10/import.c:3476 #, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "密钥 %s：无效的吊销证书：%s - 已拒绝\n" -#: g10/import.c:3485 +#: g10/import.c:3511 #, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "密钥 %s：“%s” 吊销证书已被导入\n" -#: g10/import.c:3571 +#: g10/import.c:3597 #, c-format msgid "key %s: no user ID for signature\n" msgstr "密钥 %s：签名没有用户标识\n" -#: g10/import.c:3588 +#: g10/import.c:3614 #, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "密钥 %s：用户标识 “%s” 使用了不支持的公钥算法\n" -#: g10/import.c:3590 +#: g10/import.c:3616 #, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "密钥 %s：用户标识 “%s” 自身签名无效\n" -#: g10/import.c:3607 g10/import.c:3635 g10/import.c:3691 +#: g10/import.c:3633 g10/import.c:3661 g10/import.c:3717 #, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "密钥 %s：不支持的公钥算法\n" -#: g10/import.c:3608 +#: g10/import.c:3634 #, c-format msgid "key %s: invalid direct key signature\n" msgstr "密钥 %s：无效的直接密钥签名\n" -#: g10/import.c:3622 +#: g10/import.c:3648 #, c-format msgid "key %s: no subkey for key binding\n" msgstr "密钥 %s：没有可供绑定的子密钥\n" -#: g10/import.c:3637 +#: g10/import.c:3663 #, c-format msgid "key %s: invalid subkey binding\n" msgstr "密钥 %s：无效的子密钥绑定\n" -#: g10/import.c:3656 +#: g10/import.c:3682 #, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "密钥 %s：已删除多重子密钥绑定\n" -#: g10/import.c:3680 +#: g10/import.c:3706 #, c-format msgid "key %s: no subkey for key revocation\n" msgstr "密钥 %s：没有用于密钥吊销用的子密钥\n" -#: g10/import.c:3693 +#: g10/import.c:3719 #, c-format msgid "key %s: invalid subkey revocation\n" msgstr "密钥 %s：无效的子密钥吊销\n" -#: g10/import.c:3708 +#: g10/import.c:3734 #, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "密钥 %s：已删除多重子密钥吊销\n" -#: g10/import.c:3752 +#: g10/import.c:3781 #, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "密钥 %s：已跳过用户标识 “%s”\n" -#: g10/import.c:3779 +#: g10/import.c:3808 #, c-format msgid "key %s: skipped subkey\n" msgstr "密钥 %s：已跳过子密钥\n" -#: g10/import.c:3810 +#: g10/import.c:3839 #, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "密钥 %s：非可导出签名（验证级别 0x%02X）- 已跳过\n" -#: g10/import.c:3821 +#: g10/import.c:3850 #, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "密钥 %s：吊销证书位置错误――已跳过\n" -#: g10/import.c:3839 +#: g10/import.c:3878 #, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n" -#: g10/import.c:3853 +#: g10/import.c:3902 #, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "密钥 %s：子钥签名位置错误 - 已跳过\n" -#: g10/import.c:3861 +#: g10/import.c:3910 #, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "密钥 %s：与预期不符的签名级别（0x%02X） - 已跳过\n" -#: g10/import.c:4034 +#: g10/import.c:4083 #, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "密钥 %s：检测到重复的用户标识 - 已合并\n" -#: g10/import.c:4099 +#: g10/import.c:4148 #, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销用密钥 %s\n" -#: g10/import.c:4115 +#: g10/import.c:4164 #, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" msgstr "警告：密钥 %s 可能已被吊销：吊销用密钥 %s 不存在。\n" -#: g10/import.c:4181 +#: g10/import.c:4230 #, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "密钥 %s：已添加吊销证书 “%s”\n" -#: g10/import.c:4219 +#: g10/import.c:4268 #, c-format msgid "key %s: direct key signature added\n" msgstr "密钥 %s：已添加直接密钥签名\n" @@ -3984,13 +4010,13 @@ msgid "%d duplicate signature removed\n" msgid_plural "%d duplicate signatures removed\n" msgstr[0] "%d 个重复签名被移除\n" -#: g10/key-check.c:715 g10/keylist.c:487 +#: g10/key-check.c:715 g10/keylist.c:654 #, c-format msgid "%d signature not checked due to a missing key\n" msgid_plural "%d signatures not checked due to missing keys\n" msgstr[0] "%d 个签名因密钥遗失而未被检查\n" -#: g10/key-check.c:723 g10/keylist.c:483 +#: g10/key-check.c:723 g10/keylist.c:650 #, c-format msgid "%d bad signature\n" msgid_plural "%d bad signatures\n" @@ -4044,15 +4070,15 @@ msgstr "打开密钥数据库时出现错误：%s\n" msgid "failed to rebuild keyring cache: %s\n" msgstr "重新建立钥匙环缓存失败： %s\n" -#: g10/keyedit.c:261 +#: g10/keyedit.c:262 msgid "[revocation]" msgstr "[吊销]" -#: g10/keyedit.c:261 +#: g10/keyedit.c:262 msgid "[self-signature]" msgstr "[自签名]" -#: g10/keyedit.c:384 g10/pkclist.c:274 +#: g10/keyedit.c:385 g10/pkclist.c:274 msgid "" "Please decide how far you trust this user to correctly verify other users' " "keys\n" @@ -4062,17 +4088,17 @@ msgstr "" "请决定您对这名用户能否正确地验证其他用户密钥\n" "（通过查看护照，检查不同来源的的指纹等等）的相信程度\n" -#: g10/keyedit.c:388 g10/pkclist.c:286 +#: g10/keyedit.c:389 g10/pkclist.c:286 #, c-format msgid " %d = I trust marginally\n" msgstr " %d = 我勉强相信\n" -#: g10/keyedit.c:389 g10/pkclist.c:288 +#: g10/keyedit.c:390 g10/pkclist.c:288 #, c-format msgid " %d = I trust fully\n" msgstr " %d = 我完全相信\n" -#: g10/keyedit.c:407 +#: g10/keyedit.c:408 msgid "" "Please enter the depth of this trust signature.\n" "A depth greater than 1 allows the key you are signing to make\n" @@ -4082,50 +4108,50 @@ msgstr "" "深度若大于 1 您将签名的这个密钥将可以\n" "代表您进行信任签名。\n" -#: g10/keyedit.c:424 +#: g10/keyedit.c:425 msgid "Please enter a domain to restrict this signature, or enter for none.\n" msgstr "请输入一个限制此签名的域，如果没有请按回车。\n" -#: g10/keyedit.c:552 +#: g10/keyedit.c:553 #, c-format msgid "Skipping user ID \"%s\", which is not a text ID.\n" msgstr "跳过用户标识 “%s”，其不是一个文字标识。\n" -#: g10/keyedit.c:560 +#: g10/keyedit.c:561 #, c-format msgid "User ID \"%s\" is revoked." msgstr "用户标识 “%s” 已被吊销。" -#: g10/keyedit.c:569 g10/keyedit.c:597 g10/keyedit.c:624 g10/keyedit.c:809 -#: g10/keyedit.c:1656 +#: g10/keyedit.c:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810 +#: g10/keyedit.c:1667 msgid "Are you sure you still want to sign it? (y/N) " msgstr "您仍然想要为它签名吗？(y/N) " -#: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815 -#: g10/keyedit.c:1661 g10/keyedit.c:2724 +#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816 +#: g10/keyedit.c:1672 g10/keyedit.c:2799 msgid " Unable to sign.\n" msgstr " 无法添加签名。\n" -#: g10/keyedit.c:588 +#: g10/keyedit.c:589 #, c-format msgid "User ID \"%s\" is expired." msgstr "用户标识 “%s” 已过期。" -#: g10/keyedit.c:616 +#: g10/keyedit.c:617 #, c-format msgid "User ID \"%s\" is not self-signed." msgstr "警告：用户标识 “%s” 不含自签名。" -#: g10/keyedit.c:645 +#: g10/keyedit.c:646 #, c-format msgid "User ID \"%s\" is signable. " msgstr "用户标识 “%s” 可被签名。 " -#: g10/keyedit.c:647 +#: g10/keyedit.c:648 msgid "Sign it? (y/N) " msgstr "为其签名吗？(y/N) " -#: g10/keyedit.c:674 +#: g10/keyedit.c:675 #, c-format msgid "" "The self-signature on \"%s\"\n" @@ -4134,65 +4160,65 @@ msgstr "" "“%s” 上的自签名是\n" "PGP 2.x 样式的签名。\n" -#: g10/keyedit.c:683 +#: g10/keyedit.c:684 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) " msgstr "您是否想要将它升级成一个 OpenPGP 自签名？(y/N) " -#: g10/keyedit.c:696 +#: g10/keyedit.c:697 #, c-format msgid "" "Your current signature on \"%s\"\n" "has expired.\n" msgstr "您当前在 “%s” 上的签名已过期。\n" -#: g10/keyedit.c:701 +#: g10/keyedit.c:702 msgid "Do you want to issue a new signature to replace the expired one? (y/N) " msgstr "您是否想要签发一个新的签名来取代已过期的那个吗？(y/N) " -#: g10/keyedit.c:722 +#: g10/keyedit.c:723 #, c-format msgid "" "Your current signature on \"%s\"\n" "is a local signature.\n" msgstr "您目前为 “%s” 的签名是一个本地签名。\n" -#: g10/keyedit.c:727 +#: g10/keyedit.c:728 msgid "Do you want to promote it to a full exportable signature? (y/N) " msgstr "您是否想要把它升级成一个可完整导出的签名？(y/N) " -#: g10/keyedit.c:747 +#: g10/keyedit.c:748 #, c-format msgid "\"%s\" was already locally signed by key %s\n" msgstr "“%s” 已由密钥 %s 在本地签名\n" -#: g10/keyedit.c:751 +#: g10/keyedit.c:752 #, c-format msgid "\"%s\" was already signed by key %s\n" msgstr "“%s” 已由密钥 %s 签名\n" -#: g10/keyedit.c:757 +#: g10/keyedit.c:758 msgid "Do you want to sign it again anyway? (y/N) " msgstr "您无论如何都要为它再次签名吗？(y/N) " -#: g10/keyedit.c:779 +#: g10/keyedit.c:780 #, c-format msgid "Nothing to sign with key %s\n" msgstr "没有东西可以用密钥 %s 签名\n" -#: g10/keyedit.c:803 +#: g10/keyedit.c:804 msgid "This key has expired!" msgstr "这个密钥已过期！" -#: g10/keyedit.c:821 +#: g10/keyedit.c:822 #, c-format msgid "This key is due to expire on %s.\n" msgstr "这个密钥将在 %s 过期。\n" -#: g10/keyedit.c:827 +#: g10/keyedit.c:828 msgid "Do you want your signature to expire at the same time? (Y/n) " msgstr "您想要让您的签名也在同一时间过期吗？ (Y/n) " -#: g10/keyedit.c:868 +#: g10/keyedit.c:869 msgid "" "How carefully have you verified the key you are about to sign actually " "belongs\n" @@ -4201,31 +4227,31 @@ msgstr "" "您有多仔细地检查过您正要签名的密钥确实属于具有以上名字的人呢？\n" "如果您不知道这个问题的答案，请输入“0”。\n" -#: g10/keyedit.c:873 +#: g10/keyedit.c:874 #, c-format msgid " (0) I will not answer.%s\n" msgstr " (0) 我不作答。 %s\n" -#: g10/keyedit.c:875 +#: g10/keyedit.c:876 #, c-format msgid " (1) I have not checked at all.%s\n" msgstr " (1) 我根本没有检查过。 %s\n" -#: g10/keyedit.c:877 +#: g10/keyedit.c:878 #, c-format msgid " (2) I have done casual checking.%s\n" msgstr " (2) 我随意检查过。 %s\n" -#: g10/keyedit.c:880 +#: g10/keyedit.c:881 #, c-format msgid " (3) I have done very careful checking.%s\n" msgstr " (3) 我非常小心地检查过。 %s\n" -#: g10/keyedit.c:887 +#: g10/keyedit.c:888 msgid "Your selection? (enter '?' for more information): " msgstr "您的选择是？（输入‘?’以获得更多的信息）： " -#: g10/keyedit.c:914 +#: g10/keyedit.c:915 #, c-format msgid "" "Are you sure that you want to sign this key with your\n" @@ -4234,222 +4260,229 @@ msgstr "" "您真的确定要签名这个密钥，使用您的密钥\n" "“%s” (%s)\n" -#: g10/keyedit.c:922 +#: g10/keyedit.c:923 msgid "This will be a self-signature.\n" msgstr "这将会是一个自签名。\n" -#: g10/keyedit.c:927 +#: g10/keyedit.c:928 msgid "WARNING: the signature will not be marked as non-exportable.\n" msgstr "警告：这份签名将不会被标记为不可导出。\n" -#: g10/keyedit.c:934 +#: g10/keyedit.c:935 msgid "WARNING: the signature will not be marked as non-revocable.\n" msgstr "警告：这份签名将不会被标记成不可吊销。\n" -#: g10/keyedit.c:944 +#: g10/keyedit.c:945 msgid "The signature will be marked as non-exportable.\n" msgstr "这份签名将会被标记成不可导出。\n" -#: g10/keyedit.c:951 +#: g10/keyedit.c:952 msgid "The signature will be marked as non-revocable.\n" msgstr "这份签名将会被标记成不可吊销。\n" -#: g10/keyedit.c:958 +#: g10/keyedit.c:959 msgid "I have not checked this key at all.\n" msgstr "我根本没有检查过这个密钥。\n" -#: g10/keyedit.c:963 +#: g10/keyedit.c:964 msgid "I have checked this key casually.\n" msgstr "我随意检查过这个密钥。\n" -#: g10/keyedit.c:968 +#: g10/keyedit.c:969 msgid "I have checked this key very carefully.\n" msgstr "我非常小心地检查过这个密钥。\n" -#: g10/keyedit.c:980 +#: g10/keyedit.c:981 msgid "Really sign? (y/N) " msgstr "真的要签名吗？(y/N) " -#: g10/keyedit.c:1031 g10/keyedit.c:6211 g10/keyedit.c:6294 g10/keyedit.c:6423 -#: g10/keyedit.c:6485 g10/sign.c:466 +#: g10/keyedit.c:1032 g10/keyedit.c:6148 g10/keyedit.c:6231 g10/keyedit.c:6360 +#: g10/keyedit.c:6422 g10/sign.c:468 #, c-format msgid "signing failed: %s\n" msgstr "签名时失败： %s\n" -#: g10/keyedit.c:1118 +#: g10/keyedit.c:1119 msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "密钥只有存根或者卡上项目 - 没有密码可以更改。\n" -#: g10/keyedit.c:1150 +#: g10/keyedit.c:1151 #, c-format msgid "key %s: error changing passphrase: %s\n" msgstr "密钥 %s：修改密码时出现错误：%s\n" -#: g10/keyedit.c:1262 +#: g10/keyedit.c:1263 msgid "save and quit" msgstr "保存并退出" -#: g10/keyedit.c:1265 +#: g10/keyedit.c:1266 msgid "show key fingerprint" msgstr "显示密钥指纹" -#: g10/keyedit.c:1266 +#: g10/keyedit.c:1267 msgid "show the keygrip" msgstr "显示 keygrip" -#: g10/keyedit.c:1267 +#: g10/keyedit.c:1268 msgid "list key and user IDs" msgstr "列出密钥和用户标识" -#: g10/keyedit.c:1269 +#: g10/keyedit.c:1270 msgid "select user ID N" msgstr "选择用户标识 N" -#: g10/keyedit.c:1270 +#: g10/keyedit.c:1271 msgid "select subkey N" msgstr "选择子密钥 N" -#: g10/keyedit.c:1271 +#: g10/keyedit.c:1272 msgid "check signatures" msgstr "检查签名" -#: g10/keyedit.c:1277 +#: g10/keyedit.c:1278 msgid "sign selected user IDs [* see below for related commands]" msgstr "为所选用户标识添加签名 [* 参见下面的相关命令]" -#: g10/keyedit.c:1282 +#: g10/keyedit.c:1283 msgid "sign selected user IDs locally" msgstr "为所选用户标识添加本地签名" -#: g10/keyedit.c:1283 +#: g10/keyedit.c:1284 msgid "sign selected user IDs with a trust signature" msgstr "为所选用户标识添加信任签名" -#: g10/keyedit.c:1285 +#: g10/keyedit.c:1286 msgid "sign selected user IDs with a non-revocable signature" msgstr "为所选用户标识添加不可吊销签名" -#: g10/keyedit.c:1287 +#: g10/keyedit.c:1288 msgid "add a user ID" msgstr "增加一个用户标识" -#: g10/keyedit.c:1289 +#: g10/keyedit.c:1290 msgid "add a photo ID" msgstr "增加一个照片标识" -#: g10/keyedit.c:1290 +#: g10/keyedit.c:1291 msgid "delete selected user IDs" msgstr "删除选定的用户标识" -#: g10/keyedit.c:1293 +#: g10/keyedit.c:1294 msgid "add a subkey" msgstr "增加一个子密钥" -#: g10/keyedit.c:1296 +#: g10/keyedit.c:1297 msgid "add a key to a smartcard" msgstr "增加一个密钥到智能卡" -#: g10/keyedit.c:1298 +#: g10/keyedit.c:1299 msgid "move a key to a smartcard" msgstr "移动一个密钥到智能卡" -#: g10/keyedit.c:1300 +#: g10/keyedit.c:1301 msgid "move a backup key to a smartcard" msgstr "移动一个备份密钥到智能卡上" -#: g10/keyedit.c:1302 +#: g10/keyedit.c:1303 msgid "delete selected subkeys" msgstr "删除选定的子密钥" -#: g10/keyedit.c:1304 +#: g10/keyedit.c:1305 msgid "add a revocation key" msgstr "增加一个吊销用密钥" -#: g10/keyedit.c:1306 +#: g10/keyedit.c:1307 msgid "delete signatures from the selected user IDs" msgstr "从所选用户标识上删除签名" -#: g10/keyedit.c:1308 +#: g10/keyedit.c:1309 msgid "change the expiration date for the key or selected subkeys" msgstr "变更密钥或所选子密钥的使用期限" -#: g10/keyedit.c:1310 +#: g10/keyedit.c:1311 msgid "flag the selected user ID as primary" msgstr "标记所选的用户标识为主要" -#: g10/keyedit.c:1313 +#: g10/keyedit.c:1314 msgid "list preferences (expert)" msgstr "列出偏好设置（专家模式）" -#: g10/keyedit.c:1314 +#: g10/keyedit.c:1315 msgid "list preferences (verbose)" msgstr "列出偏好设置（详细模式）" -#: g10/keyedit.c:1316 +#: g10/keyedit.c:1317 msgid "set preference list for the selected user IDs" msgstr "为所选用户标识设定偏好设置列表" -#: g10/keyedit.c:1319 +#: g10/keyedit.c:1320 msgid "set the preferred keyserver URL for the selected user IDs" msgstr "为所选用户标识设定首选公钥服务器 URL" -#: g10/keyedit.c:1321 +#: g10/keyedit.c:1322 msgid "set a notation for the selected user IDs" msgstr "为所选用户标识的设定注记" -#: g10/keyedit.c:1323 +#: g10/keyedit.c:1324 msgid "change the passphrase" msgstr "变更密码" -#: g10/keyedit.c:1326 +#: g10/keyedit.c:1327 msgid "change the ownertrust" msgstr "变更信任度" -#: g10/keyedit.c:1329 +#: g10/keyedit.c:1330 msgid "revoke signatures on the selected user IDs" msgstr "吊销所选用户标识上的签名" -#: g10/keyedit.c:1331 +#: g10/keyedit.c:1332 msgid "revoke selected user IDs" msgstr "吊销选定的用户标识" -#: g10/keyedit.c:1334 +#: g10/keyedit.c:1335 msgid "revoke key or selected subkeys" msgstr "吊销密钥或选定的子密钥" -#: g10/keyedit.c:1336 +#: g10/keyedit.c:1337 msgid "enable key" msgstr "启用密钥" -#: g10/keyedit.c:1337 +#: g10/keyedit.c:1338 msgid "disable key" msgstr "禁用密钥" -#: g10/keyedit.c:1339 +#: g10/keyedit.c:1340 msgid "show selected photo IDs" msgstr "显示选定的照片标识" -#: g10/keyedit.c:1341 +#: g10/keyedit.c:1342 msgid "compact unusable user IDs and remove unusable signatures from key" msgstr "压缩不可用的用户标识并从密钥上移除不可用的签名" -#: g10/keyedit.c:1343 +#: g10/keyedit.c:1344 msgid "compact unusable user IDs and remove all signatures from key" msgstr "压缩不可用的用户标识并从密钥上移除所有签名" -#: g10/keyedit.c:1464 +#: g10/keyedit.c:1467 msgid "Secret key is available.\n" msgstr "私钥可用。\n" -#: g10/keyedit.c:1466 +#: g10/keyedit.c:1469 msgid "Secret subkeys are available.\n" msgstr "私密子密钥可用。\n" -#: g10/keyedit.c:1568 +#: g10/keyedit.c:1501 +#, fuzzy +#| msgid "Note: Only the secret part of the shown subkey will be deleted.\n" +msgid "" +"Note: the local copy of the secret key will only be deleted with \"save\".\n" +msgstr "主要：只有显示的子钥的秘密部分会被删除。\n" + +#: g10/keyedit.c:1579 msgid "Need the secret key to do this.\n" msgstr "要有私钥才能这么做。\n" -#: g10/keyedit.c:1591 +#: g10/keyedit.c:1602 msgid "" "* The 'sign' command may be prefixed with an 'l' for local signatures " "(lsign),\n" @@ -4460,299 +4493,289 @@ msgstr "" " 信任签名，‘nr’前缀（nrsign）进行不可吊销签名，\n" " 或者上述三种前缀的任意组合（ltsign、tnrsign 等）。\n" -#: g10/keyedit.c:1649 g10/keyedit.c:2724 g10/keyedit.c:3097 g10/keyedit.c:3165 +#: g10/keyedit.c:1660 g10/keyedit.c:2799 g10/keyedit.c:3175 g10/keyedit.c:3243 msgid "Key is revoked." msgstr "密钥已被吊销。" -#: g10/keyedit.c:1672 +#: g10/keyedit.c:1683 msgid "Really sign all text user IDs? (y/N) " msgstr "真的要签名所有的文本用户标识吗？(y/N) " -#: g10/keyedit.c:1676 +#: g10/keyedit.c:1687 msgid "Really sign all user IDs? (y/N) " msgstr "真的要签名所有的用户标识吗？(y/N) " -#: g10/keyedit.c:1684 +#: g10/keyedit.c:1695 msgid "Hint: Select the user IDs to sign\n" msgstr "提示：选择用户标识以签名\n" -#: g10/keyedit.c:1695 +#: g10/keyedit.c:1706 #, c-format msgid "Unknown signature type '%s'\n" msgstr "未知的签名类型‘%s’\n" -#: g10/keyedit.c:1741 g10/keyedit.c:1765 g10/keyedit.c:1962 +#: g10/keyedit.c:1752 g10/keyedit.c:1776 g10/keyedit.c:1975 msgid "You must select at least one user ID.\n" msgstr "您必须选择至少一个用户标识。\n" -#: g10/keyedit.c:1743 g10/keyedit.c:1767 g10/keyedit.c:1924 g10/keyedit.c:1964 +#: g10/keyedit.c:1754 g10/keyedit.c:1778 g10/keyedit.c:1937 g10/keyedit.c:1977 #, c-format msgid "(Use the '%s' command.)\n" msgstr "（使用‘%s’ 命令。)\n" -#: g10/keyedit.c:1746 +#: g10/keyedit.c:1757 msgid "You can't delete the last user ID!\n" msgstr "您不能删除最后一个用户标识！\n" -#: g10/keyedit.c:1749 +#: g10/keyedit.c:1760 msgid "Really remove all selected user IDs? (y/N) " msgstr "真的要移除所有选定的用户标识吗？(y/N) " -#: g10/keyedit.c:1750 +#: g10/keyedit.c:1761 msgid "Really remove this user ID? (y/N) " msgstr "真的要移除此用户标识吗？(y/N) " #. TRANSLATORS: Please take care: This is about #. moving the key and not about removing it. -#: g10/keyedit.c:1807 +#: g10/keyedit.c:1818 msgid "Really move the primary key? (y/N) " msgstr "真的要移动主密钥吗？(y/N) " -#: g10/keyedit.c:1819 g10/keyedit.c:4860 +#: g10/keyedit.c:1830 g10/keyedit.c:4795 msgid "You must select exactly one key.\n" msgstr "您必须选择一个密钥。\n" -#: g10/keyedit.c:1847 +#: g10/keyedit.c:1860 msgid "Command expects a filename argument\n" msgstr "命令需要一个文件名作为参数\n" -#: g10/keyedit.c:1868 +#: g10/keyedit.c:1881 #, c-format msgid "Can't open '%s': %s\n" msgstr "无法打开‘%s’：%s\n" -#: g10/keyedit.c:1887 +#: g10/keyedit.c:1900 #, c-format msgid "Error reading backup key from '%s': %s\n" msgstr "从‘%s’读取备份密钥时出现错误：%s\n" -#: g10/keyedit.c:1922 +#: g10/keyedit.c:1935 msgid "You must select at least one key.\n" msgstr "您必须选择至少一个密钥。\n" -#: g10/keyedit.c:1928 +#: g10/keyedit.c:1941 msgid "Do you really want to delete the selected keys? (y/N) " msgstr "您真的想要删除选定的密钥吗？(y/N) " -#: g10/keyedit.c:1930 +#: g10/keyedit.c:1943 msgid "Do you really want to delete this key? (y/N) " msgstr "您真的要删除此密钥吗？(y/N) " -#: g10/keyedit.c:1968 +#: g10/keyedit.c:1981 msgid "Really revoke all selected user IDs? (y/N) " msgstr "真的要吊销所有选定的用户标识吗？(y/N) " -#: g10/keyedit.c:1969 +#: g10/keyedit.c:1982 msgid "Really revoke this user ID? (y/N) " msgstr "真的要吊销此用户标识吗？(y/N) " -#: g10/keyedit.c:1987 +#: g10/keyedit.c:2000 msgid "Do you really want to revoke the entire key? (y/N) " msgstr "您真的要吊销整个密钥吗？(y/N) " -#: g10/keyedit.c:1998 +#: g10/keyedit.c:2011 msgid "Do you really want to revoke the selected subkeys? (y/N) " msgstr "您真的要吊销选定的子密钥吗？(y/N) " -#: g10/keyedit.c:2000 +#: g10/keyedit.c:2013 msgid "Do you really want to revoke this subkey? (y/N) " msgstr "您真的要吊销这个子密钥吗？(y/N) " -#: g10/keyedit.c:2058 +#: g10/keyedit.c:2071 msgid "Owner trust may not be set while using a user provided trust database\n" msgstr "在使用一个用户提供的信任度数据库时信任度可能并未被设定\n" -#: g10/keyedit.c:2103 +#: g10/keyedit.c:2116 msgid "Set preference list to:\n" msgstr "设定偏好设置列表为：\n" -#: g10/keyedit.c:2110 +#: g10/keyedit.c:2123 msgid "Really update the preferences for the selected user IDs? (y/N) " msgstr "真的要更新所选用户标识的偏好设置吗？(y/N) " -#: g10/keyedit.c:2112 +#: g10/keyedit.c:2125 msgid "Really update the preferences? (y/N) " msgstr "真的要更新偏好设置吗？(y/N) " -#: g10/keyedit.c:2186 +#: g10/keyedit.c:2199 msgid "Save changes? (y/N) " msgstr "要保存变更吗？(y/N) " -#: g10/keyedit.c:2190 +#: g10/keyedit.c:2203 msgid "Quit without saving? (y/N) " msgstr "要不保存而退出吗？(y/N) " -#: g10/keyedit.c:2217 g10/keyedit.c:2819 g10/keyedit.c:3118 g10/keyedit.c:3271 +#: g10/keyedit.c:2234 +#, fuzzy, c-format +#| msgid "deleting secret %s failed: %s\n" +msgid "deleting copy of secret key failed: %s\n" +msgstr "删除私钥 %s 时失败： %s\n" + +#: g10/keyedit.c:2251 g10/keyedit.c:2896 g10/keyedit.c:3196 g10/keyedit.c:3349 #, c-format msgid "Key not changed so no update needed.\n" msgstr "密钥没有变更所以不需要更新。\n" -#: g10/keyedit.c:2506 +#: g10/keyedit.c:2542 #, c-format msgid "cannot revoke the last valid user ID.\n" msgstr "不能吊销最后一个有效的用户标识。\n" -#: g10/keyedit.c:2532 +#: g10/keyedit.c:2568 #, c-format msgid "revoking the user ID failed: %s\n" msgstr "吊销用户标识时出现错误：%s\n" -#: g10/keyedit.c:2598 +#: g10/keyedit.c:2634 #, c-format msgid "setting the primary user ID failed: %s\n" msgstr "设置主要用户标识时出现错误：%s\n" -#: g10/keyedit.c:2629 +#: g10/keyedit.c:2704 g10/keygen.c:3898 #, c-format msgid "\"%s\" is not a fingerprint\n" msgstr "\"%s\" 不是一个指纹\n" -#: g10/keyedit.c:2659 +#: g10/keyedit.c:2734 #, c-format msgid "\"%s\" is not the primary fingerprint\n" msgstr "“%s” 不是主要指纹\n" -#: g10/keyedit.c:2795 g10/keyedit.c:2798 +#: g10/keyedit.c:2871 g10/keyedit.c:2874 #, c-format msgid "Invalid user ID '%s': %s\n" msgstr "无效的用户标识‘%s’：%s\n" -#: g10/keyedit.c:2801 +#: g10/keyedit.c:2877 msgid "No matching user IDs." msgstr "没有匹配的用户标识。" -#: g10/keyedit.c:2801 +#: g10/keyedit.c:2877 msgid "Nothing to sign.\n" msgstr "没有可被签名的东西。\n" -#: g10/keyedit.c:2994 g10/keyedit.c:6076 +#: g10/keyedit.c:3072 g10/keyedit.c:6013 #, c-format msgid "Not signed by you.\n" msgstr "并非由您签名。\n" -#: g10/keyedit.c:3052 +#: g10/keyedit.c:3130 #, c-format msgid "revoking the key signature failed: %s\n" msgstr "吊销密钥签名失败：%s\n" -#: g10/keyedit.c:3173 +#: g10/keyedit.c:3251 #, c-format msgid "'%s' is not a valid expiration time\n" msgstr "‘%s’不是一个有效的过期时间\n" -#: g10/keyedit.c:3216 +#: g10/keyedit.c:3294 #, c-format msgid "\"%s\" is not a proper fingerprint\n" msgstr "“%s” 不是一个正确的指纹\n" -#: g10/keyedit.c:3240 +#: g10/keyedit.c:3318 #, c-format msgid "subkey \"%s\" not found\n" msgstr "子密钥 “%s” 未找到\n" -#: g10/keyedit.c:3363 -msgid "AEAD: " -msgstr "AEAD： " - -#: g10/keyedit.c:3380 -msgid "Digest: " -msgstr "摘要： " - -#: g10/keyedit.c:3437 -msgid "Features: " -msgstr "特点： " - -#: g10/keyedit.c:3454 -msgid "Keyserver no-modify" -msgstr "公钥服务器不可修改" - -#: g10/keyedit.c:3469 g10/keylist.c:376 +#: g10/keyedit.c:3413 g10/keylist.c:543 msgid "Preferred keyserver: " msgstr "首选公钥服务器： " -#: g10/keyedit.c:3477 g10/keyedit.c:3478 +#: g10/keyedit.c:3421 g10/keyedit.c:3422 msgid "Notations: " msgstr "注记： " -#: g10/keyedit.c:3726 +#: g10/keyedit.c:3661 msgid "There are no preferences on a PGP 2.x-style user ID.\n" msgstr "没有关于 PGP 2.x 样式用户标识的偏好设置。\n" -#: g10/keyedit.c:3798 +#: g10/keyedit.c:3733 #, c-format msgid "The following key was revoked on %s by %s key %s\n" msgstr "下列密钥在 %s 被 %s 的密钥 %s 所吊销\n" -#: g10/keyedit.c:3822 +#: g10/keyedit.c:3757 #, c-format msgid "This key may be revoked by %s key %s" msgstr "这个密钥可被 %s 的密钥 %s 吊销" -#: g10/keyedit.c:3828 +#: g10/keyedit.c:3763 msgid "(sensitive)" msgstr "（敏感的）" -#: g10/keyedit.c:3870 g10/keyedit.c:4017 g10/keylist.c:264 g10/keyserver.c:361 +#: g10/keyedit.c:3805 g10/keyedit.c:3952 g10/keylist.c:264 g10/keyserver.c:361 #, c-format msgid "created: %s" msgstr "创建于：%s" -#: g10/keyedit.c:3873 g10/keylist.c:2153 +#: g10/keyedit.c:3808 g10/keylist.c:2332 #, c-format msgid "revoked: %s" msgstr "吊销于：%s" -#: g10/keyedit.c:3875 g10/keylist.c:2159 +#: g10/keyedit.c:3810 g10/keylist.c:2338 #, c-format msgid "expired: %s" msgstr "过期于：%s" -#: g10/keyedit.c:3877 g10/keyedit.c:4019 g10/keylist.c:266 g10/keylist.c:2165 +#: g10/keyedit.c:3812 g10/keyedit.c:3954 g10/keylist.c:266 g10/keylist.c:2344 #: g10/keyserver.c:367 #, c-format msgid "expires: %s" msgstr "有效至：%s" -#: g10/keyedit.c:3879 +#: g10/keyedit.c:3814 #, c-format msgid "usage: %s" msgstr "可用于：%s" -#: g10/keyedit.c:3887 g10/keyedit.c:3907 g10/keylist.c:269 +#: g10/keyedit.c:3822 g10/keyedit.c:3842 g10/keylist.c:269 msgid "card-no: " msgstr "卡号： " -#: g10/keyedit.c:3946 +#: g10/keyedit.c:3881 #, c-format msgid "trust: %s" msgstr "信任度：%s" -#: g10/keyedit.c:3950 +#: g10/keyedit.c:3885 #, c-format msgid "validity: %s" msgstr "有效性：%s" -#: g10/keyedit.c:3957 +#: g10/keyedit.c:3892 msgid "This key has been disabled" msgstr "这个密钥已经被禁用" -#: g10/keyedit.c:3975 +#: g10/keyedit.c:3910 msgid "" "Please note that the shown key validity is not necessarily correct\n" "unless you restart the program.\n" msgstr "请注意，在您重启程序之前，所显示的密钥有效性不一定正确。\n" -#: g10/keyedit.c:4036 g10/keyedit.c:4467 g10/keyserver.c:371 -#: g10/mainproc.c:2468 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:794 +#: g10/keyedit.c:3971 g10/keyedit.c:4402 g10/keyserver.c:371 +#: g10/mainproc.c:2472 g10/tofu.c:1787 g10/trust.c:430 dirmngr/ocsp.c:849 msgid "revoked" msgstr "已吊销" -#: g10/keyedit.c:4038 g10/keyedit.c:4469 g10/keyserver.c:375 -#: g10/mainproc.c:2470 g10/tofu.c:1792 g10/trust.c:113 +#: g10/keyedit.c:3973 g10/keyedit.c:4404 g10/keyserver.c:375 +#: g10/mainproc.c:2474 g10/tofu.c:1792 g10/trust.c:113 msgid "expired" msgstr "已过期" -#: g10/keyedit.c:4155 +#: g10/keyedit.c:4090 #, c-format msgid "" "WARNING: no user ID has been marked as primary. This command may\n" @@ -4761,17 +4784,17 @@ msgstr "" "警告： 没有用户标识被标记为主要。 此命令可能会\n" " 导致一个不同的用户标识被假定为主要。\n" -#: g10/keyedit.c:4207 +#: g10/keyedit.c:4142 #, c-format msgid "WARNING: Your encryption subkey expires soon.\n" msgstr "警告： 您的加密用子密钥将在不久后过期。\n" -#: g10/keyedit.c:4208 +#: g10/keyedit.c:4143 #, c-format msgid "You may want to change its expiration date too.\n" msgstr "您可能也想要变更它的过期日期。\n" -#: g10/keyedit.c:4267 +#: g10/keyedit.c:4202 msgid "" "WARNING: This is a PGP2-style key. Adding a photo ID may cause some " "versions\n" @@ -4780,70 +4803,70 @@ msgstr "" "警告：这是一个 PGP2 样式的密钥。增加照片标识可能会导致某些版本的\n" " PGP 拒绝这个密钥。\n" -#: g10/keyedit.c:4272 g10/keyedit.c:4562 +#: g10/keyedit.c:4207 g10/keyedit.c:4497 msgid "Are you sure you still want to add it? (y/N) " msgstr "您确定仍然想要增加吗？(y/N) " -#: g10/keyedit.c:4278 +#: g10/keyedit.c:4213 msgid "You may not add a photo ID to a PGP2-style key.\n" msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n" -#: g10/keyedit.c:4293 g10/keygen.c:2899 +#: g10/keyedit.c:4228 g10/keygen.c:3058 msgid "Such a user ID already exists on this key!\n" msgstr "这样的用户标识已经存在于这个密钥上了！\n" -#: g10/keyedit.c:4395 +#: g10/keyedit.c:4330 msgid "Delete this good signature? (y/N/q)" msgstr "删除这个完好的签名吗？(y/N/q)" -#: g10/keyedit.c:4405 +#: g10/keyedit.c:4340 msgid "Delete this invalid signature? (y/N/q)" msgstr "删除这个无效的签名吗？(y/N/q)" -#: g10/keyedit.c:4409 +#: g10/keyedit.c:4344 msgid "Delete this unknown signature? (y/N/q)" msgstr "删除这个未知的签名吗？(y/N/q)" -#: g10/keyedit.c:4416 +#: g10/keyedit.c:4351 msgid "Really delete this self-signature? (y/N)" msgstr "真的要删除这个自签名吗？(y/N)" -#: g10/keyedit.c:4432 +#: g10/keyedit.c:4367 #, c-format msgid "Deleted %d signature.\n" msgid_plural "Deleted %d signatures.\n" msgstr[0] "已经删除了 %d 个签名。\n" -#: g10/keyedit.c:4436 +#: g10/keyedit.c:4371 msgid "Nothing deleted.\n" msgstr "没有东西被删除。\n" -#: g10/keyedit.c:4471 +#: g10/keyedit.c:4406 msgid "invalid" msgstr "无效" -#: g10/keyedit.c:4473 +#: g10/keyedit.c:4408 #, c-format msgid "User ID \"%s\" compacted: %s\n" msgstr "用户标识 “%s” 已被压缩：%s\n" -#: g10/keyedit.c:4479 +#: g10/keyedit.c:4414 #, c-format msgid "User ID \"%s\": %d signature removed\n" msgid_plural "User ID \"%s\": %d signatures removed\n" msgstr[0] "用户标识 “%s”：%d 个签名被移除\n" -#: g10/keyedit.c:4487 +#: g10/keyedit.c:4422 #, c-format msgid "User ID \"%s\": already minimized\n" msgstr "用户标识 “%s”：已被最小化\n" -#: g10/keyedit.c:4488 +#: g10/keyedit.c:4423 #, c-format msgid "User ID \"%s\": already clean\n" msgstr "用户标识 “%s”：无用部分已清理\n" -#: g10/keyedit.c:4557 +#: g10/keyedit.c:4492 msgid "" "WARNING: This is a PGP 2.x-style key. Adding a designated revoker may " "cause\n" @@ -4852,288 +4875,288 @@ msgstr "" "警告：这是一个 PGP2 样式的密钥。增加指定吊销者\n" " 可能会导致某些版本的 PGP 无法识别这个密钥。\n" -#: g10/keyedit.c:4568 +#: g10/keyedit.c:4503 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n" msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n" -#: g10/keyedit.c:4585 +#: g10/keyedit.c:4520 msgid "Enter the user ID of the designated revoker: " msgstr "输入指定吊销者的用户标识： " -#: g10/keyedit.c:4611 +#: g10/keyedit.c:4546 g10/keygen.c:3913 #, c-format msgid "cannot appoint a PGP 2.x style key as a designated revoker\n" msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n" -#: g10/keyedit.c:4626 +#: g10/keyedit.c:4561 #, c-format msgid "you cannot appoint a key as its own designated revoker\n" msgstr "您不能将某把密钥设为它自己的指定吊销者\n" -#: g10/keyedit.c:4648 +#: g10/keyedit.c:4583 #, c-format msgid "this key has already been designated as a revoker\n" msgstr "这个密钥已被指派为一个吊销者\n" -#: g10/keyedit.c:4666 +#: g10/keyedit.c:4601 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n" msgstr "警告：将某把密钥设置为指定吊销者的操作无法撤销！\n" -#: g10/keyedit.c:4672 +#: g10/keyedit.c:4607 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " msgstr "您确定要将这个密钥设置为指定吊销者吗？(y/N)： " -#: g10/keyedit.c:4740 +#: g10/keyedit.c:4675 msgid "" "Are you sure you want to change the expiration time for multiple subkeys? (y/" "N) " msgstr "您确定要改变多个子密钥的过期时间吗？ (y/N) " -#: g10/keyedit.c:4745 +#: g10/keyedit.c:4680 msgid "Changing expiration time for a subkey.\n" msgstr "将要变更子密钥的过期时间。\n" -#: g10/keyedit.c:4748 +#: g10/keyedit.c:4683 msgid "Changing expiration time for the primary key.\n" msgstr "将要变更主密钥的过期时间。\n" -#: g10/keyedit.c:4804 +#: g10/keyedit.c:4739 #, c-format msgid "You can't change the expiration date of a v3 key\n" msgstr "您不能变更 v3 密钥的过期时间\n" -#: g10/keyedit.c:4864 +#: g10/keyedit.c:4799 msgid "Changing usage of a subkey.\n" msgstr "变更一个子密钥的用途。\n" -#: g10/keyedit.c:4867 +#: g10/keyedit.c:4802 msgid "Changing usage of the primary key.\n" msgstr "变更主密钥的用途。\n" -#: g10/keyedit.c:4985 +#: g10/keyedit.c:4920 #, c-format msgid "signing subkey %s is already cross-certified\n" msgstr "签名的子密钥 %s 已经交叉验证\n" -#: g10/keyedit.c:4991 +#: g10/keyedit.c:4926 #, c-format msgid "subkey %s does not sign and so does not need to be cross-certified\n" msgstr "子密钥 %s 不签名，因此不需要被交叉验证\n" -#: g10/keyedit.c:5108 +#: g10/keyedit.c:5043 msgid "Please select exactly one user ID.\n" msgstr "请选定仅一个用户标识。\n" -#: g10/keyedit.c:5149 g10/keyedit.c:5263 g10/keyedit.c:5376 g10/keyedit.c:5514 +#: g10/keyedit.c:5084 g10/keyedit.c:5200 g10/keyedit.c:5313 g10/keyedit.c:5451 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "跳过用户标识 “%s” 上的 v3 自签名\n" -#: g10/keyedit.c:5320 +#: g10/keyedit.c:5257 msgid "Enter your preferred keyserver URL: " msgstr "输入您首选公钥服务器的 URL： " -#: g10/keyedit.c:5399 +#: g10/keyedit.c:5336 msgid "Are you sure you want to replace it? (y/N) " msgstr "您确定要替换它吗？(y/N) " -#: g10/keyedit.c:5400 +#: g10/keyedit.c:5337 msgid "Are you sure you want to delete it? (y/N) " msgstr "您确定要删除它吗？(y/N) " -#: g10/keyedit.c:5460 +#: g10/keyedit.c:5397 msgid "Enter the notation: " msgstr "输入注记： " -#: g10/keyedit.c:5607 +#: g10/keyedit.c:5544 msgid "Proceed? (y/N) " msgstr "继续？(y/N) " -#: g10/keyedit.c:5677 +#: g10/keyedit.c:5614 #, c-format msgid "No user ID with index %d\n" msgstr "没有索引为 %d 的用户标识\n" -#: g10/keyedit.c:5739 +#: g10/keyedit.c:5676 #, c-format msgid "No user ID with hash %s\n" msgstr "没有散列值为 %s 的用户标识\n" -#: g10/keyedit.c:5840 +#: g10/keyedit.c:5777 #, c-format msgid "No subkey with key ID '%s'.\n" msgstr "没有属于密钥标识‘%s’的子密钥。\n" -#: g10/keyedit.c:5862 +#: g10/keyedit.c:5799 #, c-format msgid "No subkey with index %d\n" msgstr "没有索引为 %d 的子密钥\n" -#: g10/keyedit.c:6003 +#: g10/keyedit.c:5940 #, c-format msgid "user ID: \"%s\"\n" msgstr "用户标识：“%s”\n" -#: g10/keyedit.c:6006 g10/keyedit.c:6108 g10/keyedit.c:6156 +#: g10/keyedit.c:5943 g10/keyedit.c:6045 g10/keyedit.c:6093 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "由您的密钥 %s 于 %s%s%s 签名\n" -#: g10/keyedit.c:6008 g10/keyedit.c:6110 g10/keyedit.c:6158 +#: g10/keyedit.c:5945 g10/keyedit.c:6047 g10/keyedit.c:6095 msgid " (non-exportable)" msgstr " (不可导出)" -#: g10/keyedit.c:6012 +#: g10/keyedit.c:5949 #, c-format msgid "This signature expired on %s.\n" msgstr "此签名已在 %s 过期。\n" -#: g10/keyedit.c:6017 +#: g10/keyedit.c:5954 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "您确定您仍然想要吊销它吗？(y/N) " -#: g10/keyedit.c:6022 +#: g10/keyedit.c:5959 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "要为这份签名生成一份吊销证书吗？(y/N) " -#: g10/keyedit.c:6082 +#: g10/keyedit.c:6019 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "您已经签名来密钥 %s 上的这些用户标识：\n" -#: g10/keyedit.c:6111 +#: g10/keyedit.c:6048 msgid " (non-revocable)" msgstr " (不可吊销)" -#: g10/keyedit.c:6118 +#: g10/keyedit.c:6055 #, c-format msgid "revoked by your key %s on %s\n" msgstr "由您的密钥 %s 吊销于 %s\n" -#: g10/keyedit.c:6143 +#: g10/keyedit.c:6080 msgid "You are about to revoke these signatures:\n" msgstr "您正在吊销这些签名：\n" -#: g10/keyedit.c:6166 +#: g10/keyedit.c:6103 msgid "Really create the revocation certificates? (y/N) " msgstr "真的要生成吊销证书吗？(y/N) " -#: g10/keyedit.c:6199 +#: g10/keyedit.c:6136 #, c-format msgid "no secret key\n" msgstr "没有私钥\n" -#: g10/keyedit.c:6247 +#: g10/keyedit.c:6184 #, c-format msgid "tried to revoke a non-user ID: %s\n" msgstr "尝试吊销一个非用户标识：%s\n" -#: g10/keyedit.c:6257 +#: g10/keyedit.c:6194 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "用户标识 “%s” 已经被吊销。\n" -#: g10/keyedit.c:6274 +#: g10/keyedit.c:6211 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n" -#: g10/keyedit.c:6370 +#: g10/keyedit.c:6307 #, c-format msgid "Cannot revoke the last valid user ID.\n" msgstr "不能吊销最后一个有效的用户标识。\n" -#: g10/keyedit.c:6408 +#: g10/keyedit.c:6345 #, c-format msgid "Key %s is already revoked.\n" msgstr "密钥 %s 已被吊销。\n" -#: g10/keyedit.c:6470 +#: g10/keyedit.c:6407 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "子密钥 %s 已被吊销。\n" -#: g10/keyedit.c:6567 +#: g10/keyedit.c:6504 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "正在显示 %s 的照片标识，大小 %ld，属于密钥 %s （用户标识 %d）\n" -#: g10/keygen.c:169 +#: g10/keygen.c:176 #, c-format msgid "invalid value for option '%s'\n" msgstr "选项‘%s’有无效的值\n" -#: g10/keygen.c:322 +#: g10/keygen.c:333 #, c-format msgid "preference '%s' duplicated\n" msgstr "偏好设置‘%s’重复\n" -#: g10/keygen.c:329 +#: g10/keygen.c:340 #, c-format msgid "too many cipher preferences\n" msgstr "过多的密文偏好设置\n" -#: g10/keygen.c:331 +#: g10/keygen.c:342 #, c-format msgid "too many digest preferences\n" msgstr "过多的散列算法偏好设置\n" -#: g10/keygen.c:333 +#: g10/keygen.c:344 #, c-format msgid "too many compression preferences\n" msgstr "过多的压缩算法偏好设置\n" -#: g10/keygen.c:493 +#: g10/keygen.c:518 #, c-format msgid "invalid item '%s' in preference string\n" msgstr "首选项字符串里有无效项‘%s’\n" -#: g10/keygen.c:972 +#: g10/keygen.c:1095 #, c-format msgid "writing direct signature\n" msgstr "正在写入直接签名\n" -#: g10/keygen.c:1018 +#: g10/keygen.c:1141 #, c-format msgid "writing self signature\n" msgstr "正在写入自签名\n" -#: g10/keygen.c:1075 +#: g10/keygen.c:1198 #, c-format msgid "writing key binding signature\n" msgstr "正在写入密钥绑定签名\n" -#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502 -#: g10/keygen.c:1656 g10/keygen.c:1661 +#: g10/keygen.c:1569 g10/keygen.c:1574 g10/keygen.c:1626 g10/keygen.c:1631 +#: g10/keygen.c:1785 g10/keygen.c:1790 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "密钥尺寸无效；改用 %u 位\n" -#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667 +#: g10/keygen.c:1580 g10/keygen.c:1637 g10/keygen.c:1645 g10/keygen.c:1796 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "密钥尺寸舍入到 %u 位\n" -#: g10/keygen.c:1542 +#: g10/keygen.c:1671 #, c-format msgid "" "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n" msgstr "警告：一些 OpenPGP 程序不能处理具有此摘要长度的 DSA 密钥\n" -#: g10/keygen.c:1723 +#: g10/keygen.c:1852 msgid "Sign" msgstr "签名（Sign）" -#: g10/keygen.c:1726 +#: g10/keygen.c:1855 msgid "Certify" msgstr "认证（Certify）" -#: g10/keygen.c:1729 +#: g10/keygen.c:1858 msgid "Encrypt" msgstr "加密（Encrypt）" -#: g10/keygen.c:1732 +#: g10/keygen.c:1861 msgid "Authenticate" msgstr "身份验证（Authenticate）" @@ -5147,161 +5170,161 @@ msgstr "身份验证（Authenticate）" #. * a = Toggle authentication capability #. * q = Finish #. -#: g10/keygen.c:1753 +#: g10/keygen.c:1885 msgid "SsEeAaQq" msgstr "SsEeAaQq" -#: g10/keygen.c:1784 +#: g10/keygen.c:1919 #, c-format msgid "Possible actions for a %s key: " msgstr "%s 密钥的可实现的功能： " -#: g10/keygen.c:1790 +#: g10/keygen.c:1925 msgid "Current allowed actions: " msgstr "目前启用的功能： " -#: g10/keygen.c:1795 +#: g10/keygen.c:1930 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr " (%c) 签名功能开关\n" -#: g10/keygen.c:1798 +#: g10/keygen.c:1933 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr " (%c) 加密功能开关\n" -#: g10/keygen.c:1801 +#: g10/keygen.c:1936 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr " (%c) 身份验证功能开关\n" -#: g10/keygen.c:1804 +#: g10/keygen.c:1939 #, c-format msgid " (%c) Finished\n" msgstr " (%c) 已完成\n" -#: g10/keygen.c:1930 +#: g10/keygen.c:2071 #, c-format msgid " (%d) RSA and RSA (default)\n" msgstr " (%d) RSA 和 RSA （默认）\n" -#: g10/keygen.c:1934 +#: g10/keygen.c:2075 #, c-format msgid " (%d) DSA and Elgamal\n" msgstr " (%d) DSA 和 Elgamal\n" -#: g10/keygen.c:1937 +#: g10/keygen.c:2078 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA（仅用于签名）\n" -#: g10/keygen.c:1939 +#: g10/keygen.c:2080 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA（仅用于签名）\n" -#: g10/keygen.c:1945 +#: g10/keygen.c:2086 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal（仅用于加密）\n" -#: g10/keygen.c:1947 +#: g10/keygen.c:2088 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA（仅用于加密）\n" -#: g10/keygen.c:1953 +#: g10/keygen.c:2094 #, c-format msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) DSA（自定义用途）\n" -#: g10/keygen.c:1955 +#: g10/keygen.c:2096 #, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA（自定义用途）\n" -#: g10/keygen.c:1961 +#: g10/keygen.c:2102 #, c-format msgid " (%d) ECC and ECC\n" msgstr " (%d) ECC 和 ECC\n" -#: g10/keygen.c:1963 +#: g10/keygen.c:2104 #, c-format msgid " (%d) ECC (sign only)\n" msgstr " (%d) ECC（仅用于签名）\n" -#: g10/keygen.c:1965 +#: g10/keygen.c:2106 #, c-format msgid " (%d) ECC (set your own capabilities)\n" msgstr " (%d) ECC（自定义用途）\n" -#: g10/keygen.c:1967 +#: g10/keygen.c:2108 #, c-format msgid " (%d) ECC (encrypt only)\n" msgstr " (%d) ECC（仅用于加密）\n" -#: g10/keygen.c:1971 +#: g10/keygen.c:2112 #, c-format msgid " (%d) Existing key\n" msgstr " (%d) 现存的密钥\n" -#: g10/keygen.c:1973 +#: g10/keygen.c:2114 #, c-format msgid " (%d) Existing key from card\n" msgstr " （%d）卡中现有密钥\n" -#: g10/keygen.c:2069 sm/certreqgen-ui.c:202 +#: g10/keygen.c:2210 sm/certreqgen-ui.c:204 msgid "Enter the keygrip: " msgstr "输入 keygrip： " -#: g10/keygen.c:2082 sm/certreqgen-ui.c:210 +#: g10/keygen.c:2223 sm/certreqgen-ui.c:212 msgid "Not a valid keygrip (expecting 40 hex digits)\n" msgstr "不是一个有效的 keygrip （需要 40 位十六进制数）\n" -#: g10/keygen.c:2084 sm/certreqgen-ui.c:212 +#: g10/keygen.c:2225 sm/certreqgen-ui.c:214 msgid "No key with this keygrip\n" msgstr "没有此 keygrip 关联的密钥\n" -#: g10/keygen.c:2103 g10/keygen.c:2113 g10/keygen.c:3216 g10/keygen.c:3227 -#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239 +#: g10/keygen.c:2244 g10/keygen.c:2254 g10/keygen.c:3375 g10/keygen.c:3386 +#: sm/certreqgen-ui.c:232 sm/certreqgen-ui.c:241 #, c-format msgid "error reading the card: %s\n" msgstr "读取卡片时出现错误：%s\n" -#: g10/keygen.c:2107 g10/keygen.c:3220 sm/certreqgen-ui.c:233 +#: g10/keygen.c:2248 g10/keygen.c:3379 sm/certreqgen-ui.c:235 #, c-format msgid "Serial number of the card: %s\n" msgstr "卡片的序列号：%s\n" -#: g10/keygen.c:2120 sm/certreqgen-ui.c:245 +#: g10/keygen.c:2261 sm/certreqgen-ui.c:247 msgid "Available keys:\n" msgstr "可用的密钥：\n" -#: g10/keygen.c:2297 g10/keygen.c:2311 +#: g10/keygen.c:2438 g10/keygen.c:2452 #, c-format msgid "rounded to %u bits\n" msgstr "舍入到 %u 位\n" -#: g10/keygen.c:2352 +#: g10/keygen.c:2493 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "%s 密钥的长度应在 %u 位与 %u 位之间。\n" -#: g10/keygen.c:2360 +#: g10/keygen.c:2501 #, c-format msgid "What keysize do you want for the subkey? (%u) " msgstr "您想要为此子密钥使用的密钥长度？(%u) " -#: g10/keygen.c:2377 sm/certreqgen-ui.c:189 +#: g10/keygen.c:2518 sm/certreqgen-ui.c:191 #, c-format msgid "Requested keysize is %u bits\n" msgstr "请求的密钥长度是 %u 位\n" -#: g10/keygen.c:2423 +#: g10/keygen.c:2564 msgid "Please select which elliptic curve you want:\n" msgstr "请选择您想要使用的椭圆曲线：\n" -#: g10/keygen.c:2611 +#: g10/keygen.c:2770 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -5317,7 +5340,7 @@ msgstr "" " <n>m = 密钥在 n 月后过期\n" " <n>y = 密钥在 n 年后过期\n" -#: g10/keygen.c:2622 +#: g10/keygen.c:2781 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -5333,38 +5356,38 @@ msgstr "" " <n>m = 签名在 n 月后过期\n" " <n>y = 签名在 n 年后过期\n" -#: g10/keygen.c:2645 +#: g10/keygen.c:2804 msgid "Key is valid for? (0) " msgstr "密钥的有效期限是？(0) " -#: g10/keygen.c:2650 +#: g10/keygen.c:2809 #, c-format msgid "Signature is valid for? (%s) " msgstr "签名的有效期限是？(%s) " -#: g10/keygen.c:2663 g10/keygen.c:2688 +#: g10/keygen.c:2822 g10/keygen.c:2847 msgid "invalid value\n" msgstr "无效的值\n" -#: g10/keygen.c:2670 +#: g10/keygen.c:2829 msgid "Key does not expire at all\n" msgstr "密钥永远不会过期\n" -#: g10/keygen.c:2671 +#: g10/keygen.c:2830 msgid "Signature does not expire at all\n" msgstr "签名永远不会过期\n" -#: g10/keygen.c:2676 +#: g10/keygen.c:2835 #, c-format msgid "Key expires at %s\n" msgstr "密钥于 %s 过期\n" -#: g10/keygen.c:2677 +#: g10/keygen.c:2836 #, c-format msgid "Signature expires at %s\n" msgstr "签名于 %s 过期\n" -#: g10/keygen.c:2681 +#: g10/keygen.c:2840 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -5372,11 +5395,11 @@ msgstr "" "您的系统无法显示 2038 年以后的日期。\n" "不过它可以正确地处理到 2106 年之前的日期。\n" -#: g10/keygen.c:2694 +#: g10/keygen.c:2853 msgid "Is this correct? (y/N) " msgstr "这些内容正确吗？ (y/N) " -#: g10/keygen.c:2762 +#: g10/keygen.c:2921 msgid "" "\n" "GnuPG needs to construct a user ID to identify your key.\n" @@ -5390,7 +5413,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:2777 +#: g10/keygen.c:2936 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -5405,49 +5428,49 @@ msgstr "" " “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n" "\n" -#: g10/keygen.c:2796 +#: g10/keygen.c:2955 msgid "Real name: " msgstr "真实姓名： " -#: g10/keygen.c:2805 +#: g10/keygen.c:2964 msgid "Invalid character in name\n" msgstr "姓名含有无效的字符\n" -#: g10/keygen.c:2806 +#: g10/keygen.c:2965 #, c-format msgid "The characters '%s' and '%s' may not appear in name\n" msgstr "字符‘%s’和‘%s’不能出现在姓名中\n" -#: g10/keygen.c:2810 +#: g10/keygen.c:2969 msgid "Name may not start with a digit\n" msgstr "姓名不可以用数字开头\n" -#: g10/keygen.c:2813 +#: g10/keygen.c:2972 msgid "Name must be at least 5 characters long\n" msgstr "姓名至少要有五个字符长\n" -#: g10/keygen.c:2823 +#: g10/keygen.c:2982 msgid "Email address: " msgstr "电子邮件地址： " -#: g10/keygen.c:2829 +#: g10/keygen.c:2988 msgid "Not a valid email address\n" msgstr "电子邮件地址无效\n" -#: g10/keygen.c:2838 +#: g10/keygen.c:2997 msgid "Comment: " msgstr "注释： " -#: g10/keygen.c:2844 +#: g10/keygen.c:3003 msgid "Invalid character in comment\n" msgstr "注释含有无效的字符\n" -#: g10/keygen.c:2880 +#: g10/keygen.c:3039 #, c-format msgid "You are using the '%s' character set.\n" msgstr "您正在使用‘%s’字符集。\n" -#: g10/keygen.c:2886 +#: g10/keygen.c:3045 #, c-format msgid "" "You selected this USER-ID:\n" @@ -5458,7 +5481,7 @@ msgstr "" " “%s”\n" "\n" -#: g10/keygen.c:2891 +#: g10/keygen.c:3050 msgid "Please don't put the email address into the real name or the comment\n" msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n" @@ -5473,31 +5496,31 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n" #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:2916 +#: g10/keygen.c:3075 msgid "NnCcEeOoQq" msgstr "NnCcEeOoQq" -#: g10/keygen.c:2926 +#: g10/keygen.c:3085 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或退出（Q）？ " -#: g10/keygen.c:2927 +#: g10/keygen.c:3086 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或确定（O）/退出（Q）？ " -#: g10/keygen.c:2932 +#: g10/keygen.c:3091 msgid "Change (N)ame, (E)mail, or (Q)uit? " msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或退出（Q）？ " -#: g10/keygen.c:2933 +#: g10/keygen.c:3092 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? " msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或确定（O）/退出（Q）？ " -#: g10/keygen.c:2952 +#: g10/keygen.c:3111 msgid "Please correct the error first\n" msgstr "请先改正错误\n" -#: g10/keygen.c:2998 +#: g10/keygen.c:3157 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" @@ -5508,13 +5531,13 @@ msgstr "" "、移动鼠标、读写硬盘之类的）将会是一个不错的主意；这会让随机数\n" "发生器有更好的机会获得足够的熵。\n" -#: g10/keygen.c:4278 g10/keygen.c:4349 g10/keygen.c:4367 g10/keygen.c:4395 -#: g10/keygen.c:4739 g10/keygen.c:5239 g10/keygen.c:5534 g10/keygen.c:5639 +#: g10/keygen.c:4535 g10/keygen.c:4606 g10/keygen.c:4624 g10/keygen.c:4652 +#: g10/keygen.c:4996 g10/keygen.c:5523 g10/keygen.c:5818 g10/keygen.c:5923 #, c-format msgid "Key generation failed: %s\n" msgstr "密钥生成失败：%s\n" -#: g10/keygen.c:4287 +#: g10/keygen.c:4544 #, c-format msgid "" "About to create a key for:\n" @@ -5525,64 +5548,64 @@ msgstr "" " \"%s\"\n" "\n" -#: g10/keygen.c:4289 +#: g10/keygen.c:4546 msgid "Continue? (Y/n) " msgstr "继续吗？ (Y/n) " -#: g10/keygen.c:4310 +#: g10/keygen.c:4567 #, c-format msgid "A key for \"%s\" already exists\n" msgstr "一个 \"%s\" 的密钥已经存在\n" -#: g10/keygen.c:4315 +#: g10/keygen.c:4572 msgid "Create anyway? (y/N) " msgstr "无论如何都要创建吗？(y/N) " -#: g10/keygen.c:4321 +#: g10/keygen.c:4578 #, c-format msgid "creating anyway\n" msgstr "无论如何都创建\n" -#: g10/keygen.c:4722 +#: g10/keygen.c:4979 #, c-format msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n" msgstr "注意：使用 “%s %s” 以获得一个全功能的密钥生成对话框。\n" -#: g10/keygen.c:4771 +#: g10/keygen.c:5028 #, c-format msgid "Key generation canceled.\n" msgstr "密钥生成已取消。\n" -#: g10/keygen.c:4831 +#: g10/keygen.c:5088 #, c-format msgid "can't create backup file '%s': %s\n" msgstr "不能创建备份文件‘%s’：%s\n" -#: g10/keygen.c:4851 +#: g10/keygen.c:5108 #, c-format msgid "Note: backup of card key saved to '%s'\n" msgstr "注意：卡片密钥的备份已保存到‘%s’\n" -#: g10/keygen.c:5010 g10/keygen.c:5172 +#: g10/keygen.c:5291 g10/keygen.c:5456 #, c-format msgid "writing public key to '%s'\n" msgstr "正在将公钥写至‘%s’\n" -#: g10/keygen.c:5166 +#: g10/keygen.c:5450 #, c-format msgid "no writable public keyring found: %s\n" msgstr "无可写的公钥钥匙环：%s\n" -#: g10/keygen.c:5180 +#: g10/keygen.c:5464 #, c-format msgid "error writing public keyring '%s': %s\n" msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n" -#: g10/keygen.c:5210 +#: g10/keygen.c:5494 msgid "public and secret key created and signed.\n" msgstr "公钥和私钥已经生成并被签名。\n" -#: g10/keygen.c:5226 +#: g10/keygen.c:5510 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" @@ -5590,106 +5613,122 @@ msgstr "" "请注意这个密钥不能用于加密。您可能想要使用“--edit-key”命令来\n" "生成一个用于此用途的子密钥。\n" -#: g10/keygen.c:5401 g10/keygen.c:5590 +#: g10/keygen.c:5685 g10/keygen.c:5874 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" msgstr "密钥已经在 %lu 秒后的未来生成（可能是因为时空扭曲或时钟的问题）\n" -#: g10/keygen.c:5403 g10/keygen.c:5592 +#: g10/keygen.c:5687 g10/keygen.c:5876 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" msgstr "密钥已经在 %lu 秒后的未来生成（可能是因为时空扭曲或时钟的问题）\n" -#: g10/keygen.c:5414 g10/keygen.c:5603 +#: g10/keygen.c:5698 g10/keygen.c:5887 #, c-format msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "注意：为 v3 密钥创建子密钥是不与 OpenPGP 兼容的\n" -#: g10/keygen.c:5426 g10/keygen.c:5428 +#: g10/keygen.c:5710 g10/keygen.c:5712 #, c-format msgid "Secret parts of primary key are not available.\n" msgstr "主密钥的私钥部分不可用。\n" -#: g10/keygen.c:5435 g10/keygen.c:5437 +#: g10/keygen.c:5719 g10/keygen.c:5721 #, c-format msgid "Secret parts of primary key are stored on-card.\n" msgstr "主密钥的私钥部分存储在卡上。\n" -#: g10/keygen.c:5456 g10/keygen.c:5617 +#: g10/keygen.c:5740 g10/keygen.c:5901 msgid "Really create? (y/N) " msgstr "真的要创建吗？(y/N) " -#: g10/keyid.c:666 g10/keyid.c:677 g10/keyid.c:688 +#: g10/keyid.c:668 g10/keyid.c:679 g10/keyid.c:690 msgid "never " msgstr "永不 " -#: g10/keylist.c:332 +#: g10/keylist.c:341 +msgid "AEAD: " +msgstr "AEAD： " + +#: g10/keylist.c:357 +msgid "Digest: " +msgstr "摘要： " + +#: g10/keylist.c:413 +msgid "Features: " +msgstr "特点： " + +#: g10/keylist.c:430 +msgid "Keyserver no-modify" +msgstr "公钥服务器不可修改" + +#: g10/keylist.c:499 msgid "Critical signature policy: " msgstr "紧急签名策略： " -#: g10/keylist.c:334 +#: g10/keylist.c:501 msgid "Signature policy: " msgstr "签名策略： " -#: g10/keylist.c:374 +#: g10/keylist.c:541 msgid "Critical preferred keyserver: " msgstr "紧急首选公钥服务器： " -#: g10/keylist.c:427 +#: g10/keylist.c:594 msgid "Critical signature notation: " msgstr "紧急签名注记： " -#: g10/keylist.c:429 +#: g10/keylist.c:596 msgid "Signature notation: " msgstr "签名注记： " -#: g10/keylist.c:479 +#: g10/keylist.c:646 #, c-format msgid "%d good signature\n" msgid_plural "%d good signatures\n" msgstr[0] "%d 个良好签名\n" -#: g10/keylist.c:492 +#: g10/keylist.c:659 #, c-format msgid "%d signature not checked due to an error\n" msgid_plural "%d signatures not checked due to errors\n" msgstr[0] "%d 个签名因错误而未被检查\n" -#: g10/keylist.c:580 +#: g10/keylist.c:747 #, c-format msgid "Warning: %lu key skipped due to its large size\n" msgid_plural "Warning: %lu keys skipped due to their large sizes\n" msgstr[0] "警告：%lu 把密钥因尺寸大而被跳过\n" -#: g10/keylist.c:603 +#: g10/keylist.c:770 msgid "Keyring" msgstr "钥匙环" -#: g10/keylist.c:2012 +#: g10/keylist.c:2191 msgid "Primary key fingerprint:" msgstr "主密钥指纹：" -#: g10/keylist.c:2014 +#: g10/keylist.c:2193 msgid " Subkey fingerprint:" msgstr " 子密钥指纹：" #. TRANSLATORS: this should fit into 24 bytes so that the #. * fingerprint data is properly aligned with the user ID -#: g10/keylist.c:2022 +#: g10/keylist.c:2201 msgid " Primary key fingerprint:" msgstr " 主密钥指纹：" -#: g10/keylist.c:2024 g10/keylist.c:2034 +#: g10/keylist.c:2203 g10/keylist.c:2213 msgid " Subkey fingerprint:" msgstr " 子密钥指纹：" -#: g10/keylist.c:2029 g10/keylist.c:2045 +#: g10/keylist.c:2208 g10/keylist.c:2224 msgid " Key fingerprint =" msgstr " 密钥指纹 =" -#: g10/keylist.c:2096 +#: g10/keylist.c:2275 msgid " Card serial no. =" msgstr " 卡片序列号 =" @@ -5767,53 +5806,53 @@ msgstr "无效的公钥服务器协议（us %d!=handler %d）\n" msgid "\"%s\" not a key ID: skipping\n" msgstr "“%s” 不是一个用户标识：跳过\n" -#: g10/keyserver.c:1237 g10/keyserver.c:1270 +#: g10/keyserver.c:1237 g10/keyserver.c:1272 #, c-format msgid "refreshing %d key from %s\n" msgid_plural "refreshing %d keys from %s\n" msgstr[0] "正在更新 %d 把密钥，从 %s \n" -#: g10/keyserver.c:1244 +#: g10/keyserver.c:1246 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "警告：无法通过 %s 更新密钥 %s ：%s\n" -#: g10/keyserver.c:1336 +#: g10/keyserver.c:1338 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "在公钥服务器上找不到密钥 “%s”\n" -#: g10/keyserver.c:1339 +#: g10/keyserver.c:1341 #, c-format msgid "key not found on keyserver\n" msgstr "在公钥服务器上找不到密钥\n" -#: g10/keyserver.c:1504 +#: g10/keyserver.c:1506 #, c-format msgid "requesting key %s from %s\n" msgstr "正在请求密钥 %s 从 %s\n" -#: g10/keyserver.c:1619 g10/keyserver.c:1812 +#: g10/keyserver.c:1621 g10/keyserver.c:1814 #, c-format msgid "no keyserver known\n" msgstr "无已知的公钥服务器\n" -#: g10/keyserver.c:1634 g10/skclist.c:215 g10/skclist.c:243 +#: g10/keyserver.c:1636 g10/skclist.c:215 g10/skclist.c:243 #, c-format msgid "skipped \"%s\": %s\n" msgstr "已跳过 “%s”： %s\n" -#: g10/keyserver.c:1638 +#: g10/keyserver.c:1640 #, c-format msgid "sending key %s to %s\n" msgstr "正在发送密钥 %s 到 %s\n" -#: g10/keyserver.c:1681 +#: g10/keyserver.c:1683 #, c-format msgid "requesting key from '%s'\n" msgstr "正在从 %s 请求密钥\n" -#: g10/keyserver.c:1699 +#: g10/keyserver.c:1701 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "警告：无法获取 URI %s：%s\n" @@ -5863,7 +5902,7 @@ msgstr "由 %s 密钥加密、密钥号为 %s\n" msgid "public key decryption failed: %s\n" msgstr "公钥解密失败：%s\n" -#: g10/mainproc.c:686 g10/mainproc.c:1064 +#: g10/mainproc.c:686 g10/mainproc.c:1068 #, c-format msgid "WARNING: multiple plaintexts seen\n" msgstr "警告： 检测到多重纯文本\n" @@ -5888,12 +5927,12 @@ msgstr "假定 %s 为加密过的数据\n" msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n" msgstr "IDEA 密文算法不可用，尝试使用 %s 代替\n" -#: g10/mainproc.c:839 g10/mainproc.c:883 +#: g10/mainproc.c:843 g10/mainproc.c:887 #, c-format msgid "WARNING: message was not integrity protected\n" msgstr "警告：消息未受到完整性保护\n" -#: g10/mainproc.c:850 +#: g10/mainproc.c:854 msgid "" "Hint: If this message was created before the year 2003 it is\n" "likely that this message is legitimate. This is because back\n" @@ -5903,178 +5942,178 @@ msgstr "" "看起来此信息就是合法的。这是因为那个时候完整性\n" "保护还没有被广泛地采用。\n" -#: g10/mainproc.c:853 +#: g10/mainproc.c:857 #, c-format msgid "Use the option '%s' to decrypt anyway.\n" msgstr "无论如何使用选项‘%s’来解密。\n" -#: g10/mainproc.c:858 +#: g10/mainproc.c:862 #, c-format msgid "decryption forced to fail!\n" msgstr "解密强制失败！\n" -#: g10/mainproc.c:870 +#: g10/mainproc.c:874 #, c-format msgid "decryption okay\n" msgstr "解密成功\n" -#: g10/mainproc.c:889 +#: g10/mainproc.c:893 #, c-format msgid "WARNING: encrypted message has been manipulated!\n" msgstr "警告：加密过的报文已经变造！\n" -#: g10/mainproc.c:914 +#: g10/mainproc.c:918 #, c-format msgid "decryption failed: %s\n" msgstr "解密失败：%s\n" -#: g10/mainproc.c:980 +#: g10/mainproc.c:984 #, c-format msgid "Note: sender requested \"for-your-eyes-only\"\n" msgstr "注意：发送者要求您“只阅读不存盘”\n" -#: g10/mainproc.c:987 +#: g10/mainproc.c:991 #, c-format msgid "original file name='%.*s'\n" msgstr "原始文件名 =‘%.*s’\n" -#: g10/mainproc.c:1242 +#: g10/mainproc.c:1246 #, c-format msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "独立的吊销证书 - 请使用“gpg --import”来应用\n" -#: g10/mainproc.c:1546 g10/mainproc.c:1589 +#: g10/mainproc.c:1550 g10/mainproc.c:1593 #, c-format msgid "no signature found\n" msgstr "未找到签名\n" -#: g10/mainproc.c:1946 +#: g10/mainproc.c:1950 #, c-format msgid "BAD signature from \"%s\"" msgstr "已损坏的签名，来自于 “%s”" -#: g10/mainproc.c:1948 +#: g10/mainproc.c:1952 #, c-format msgid "Expired signature from \"%s\"" msgstr "过期的签名，来自于 “%s”" -#: g10/mainproc.c:1950 +#: g10/mainproc.c:1954 #, c-format msgid "Good signature from \"%s\"" msgstr "完好的签名，来自于 “%s”" -#: g10/mainproc.c:1970 +#: g10/mainproc.c:1974 #, c-format msgid "signature verification suppressed\n" msgstr "签名验证已被抑制\n" -#: g10/mainproc.c:2079 +#: g10/mainproc.c:2083 #, c-format msgid "can't handle this ambiguous signature data\n" msgstr "无法处理此有歧义的签名数据\n" -#: g10/mainproc.c:2095 g10/mainproc.c:2102 +#: g10/mainproc.c:2099 g10/mainproc.c:2106 #, c-format msgid "Signature made %s\n" msgstr "签名建立于 %s\n" -#: g10/mainproc.c:2096 g10/mainproc.c:2103 sm/verify.c:476 +#: g10/mainproc.c:2100 g10/mainproc.c:2107 sm/verify.c:491 #, c-format msgid " using %s key %s\n" msgstr " 使用 %s 密钥 %s\n" -#: g10/mainproc.c:2107 +#: g10/mainproc.c:2111 #, c-format msgid "Signature made %s using %s key ID %s\n" msgstr "于 %s 创建的签名，使用 %s，密钥号 %s\n" -#: g10/mainproc.c:2113 +#: g10/mainproc.c:2117 #, c-format msgid " issuer \"%s\"\n" msgstr " 签发者 \"%s\"\n" -#: g10/mainproc.c:2164 +#: g10/mainproc.c:2168 #, c-format msgid "Key available at: " msgstr "密钥在以下地方可用： " -#: g10/mainproc.c:2206 +#: g10/mainproc.c:2210 #, c-format msgid "Note: Use '%s' to make use of this info\n" msgstr "注意：使用 “%s” 可使用此信息\n" -#: g10/mainproc.c:2422 +#: g10/mainproc.c:2426 msgid "[uncertain]" msgstr "[不确定]" -#: g10/mainproc.c:2460 +#: g10/mainproc.c:2464 #, c-format msgid " aka \"%s\"" msgstr " 亦即 “%s”" -#: g10/mainproc.c:2535 +#: g10/mainproc.c:2539 sm/verify.c:533 #, c-format msgid "WARNING: This key is not suitable for signing in %s mode\n" msgstr "警告： 此密钥在 %s 模式下不适用于签名\n" -#: g10/mainproc.c:2553 +#: g10/mainproc.c:2557 #, c-format msgid "Signature expired %s\n" msgstr "这份签名已于 %s 过期。\n" -#: g10/mainproc.c:2557 +#: g10/mainproc.c:2561 #, c-format msgid "Signature expires %s\n" msgstr "这份签名在 %s 过期。\n" -#: g10/mainproc.c:2568 +#: g10/mainproc.c:2572 #, c-format msgid "%s signature, digest algorithm %s%s%s\n" msgstr "%s 签名，摘要算法 %s%s%s\n" -#: g10/mainproc.c:2569 +#: g10/mainproc.c:2573 msgid "binary" msgstr "二进制" -#: g10/mainproc.c:2570 +#: g10/mainproc.c:2574 msgid "textmode" msgstr "文本模式" -#: g10/mainproc.c:2570 g10/trust.c:112 dirmngr/ocsp.c:795 +#: g10/mainproc.c:2574 g10/trust.c:112 dirmngr/ocsp.c:850 msgid "unknown" msgstr "未知" -#: g10/mainproc.c:2572 +#: g10/mainproc.c:2576 msgid ", key algorithm " msgstr "，密钥算法 " -#: g10/mainproc.c:2607 +#: g10/mainproc.c:2611 #, c-format msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n" msgstr "警告：不是一个分离签名；文件‘%s’没有被验证！\n" -#: g10/mainproc.c:2654 +#: g10/mainproc.c:2658 #, c-format msgid "Can't check signature: %s\n" msgstr "无法检查签名：%s\n" -#: g10/mainproc.c:2750 g10/mainproc.c:2769 g10/mainproc.c:2893 +#: g10/mainproc.c:2754 g10/mainproc.c:2773 g10/mainproc.c:2897 #, c-format msgid "not a detached signature\n" msgstr "不是一份分离的签名\n" -#: g10/mainproc.c:2803 +#: g10/mainproc.c:2807 #, c-format msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "警告：检测到多重签名。只检查第一个签名。\n" -#: g10/mainproc.c:2812 +#: g10/mainproc.c:2816 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "等级 0x%02x 的独立签名\n" -#: g10/mainproc.c:2897 +#: g10/mainproc.c:2901 #, c-format msgid "old style (PGP 2.x) signature\n" msgstr "旧式（PGP 2.x）签名\n" @@ -6179,7 +6218,7 @@ msgstr "不压缩" msgid "uncompressed|none" msgstr "未压缩|无" -#: g10/misc.c:1410 sm/decrypt.c:1035 sm/encrypt.c:541 sm/verify.c:522 +#: g10/misc.c:1410 sm/decrypt.c:1403 sm/encrypt.c:833 sm/verify.c:548 #, c-format msgid "operation forced to fail due to unfulfilled compliance rules\n" msgstr "未能满足合规规则，操作已强制取消\n" @@ -6262,7 +6301,7 @@ msgstr "%d 类型的子包设定了紧急位\n" msgid "problem with the agent: %s\n" msgstr "代理人程序出现问题：%s\n" -#: g10/passphrase.c:251 sm/decrypt.c:341 +#: g10/passphrase.c:251 sm/decrypt.c:670 msgid "Please enter the passphrase for decryption." msgstr "请输入密码进行解密。" @@ -6319,7 +6358,7 @@ msgstr "" "创建于 %s%s.\n" "%s" -#: g10/photoid.c:77 +#: g10/photoid.c:76 msgid "" "\n" "Pick an image to use for your photo ID. The image must be a JPEG file.\n" @@ -6332,34 +6371,34 @@ msgstr "" "请记住这张图片储存在您的公钥里。如果您挑了过大的图片的话，\n" "您的密钥也会变得非常大！请把图片控制到接近理想尺寸 240x288。\n" -#: g10/photoid.c:99 +#: g10/photoid.c:98 msgid "Enter JPEG filename for photo ID: " msgstr "输入要当作照片标识的 JPEG 文件名： " -#: g10/photoid.c:120 +#: g10/photoid.c:119 #, c-format msgid "unable to open JPEG file '%s': %s\n" msgstr "无法打开 JPEG 文件‘%s’：%s\n" -#: g10/photoid.c:131 +#: g10/photoid.c:136 #, c-format msgid "This JPEG is really large (%d bytes) !\n" msgstr "此 JPEG 文件过大（%d 字节）！\n" -#: g10/photoid.c:133 +#: g10/photoid.c:139 msgid "Are you sure you want to use it? (y/N) " msgstr "您确定要用它吗？(y/N) " -#: g10/photoid.c:149 +#: g10/photoid.c:155 #, c-format msgid "'%s' is not a JPEG file\n" msgstr "‘%s’不是一个 JPEG 文件\n" -#: g10/photoid.c:168 +#: g10/photoid.c:174 msgid "Is this photo correct (y/N/q)? " msgstr "这张照片正确吗？(y/N/q) " -#: g10/photoid.c:399 +#: g10/photoid.c:405 #, c-format msgid "unable to display photo ID!\n" msgstr "无法显示照片标识！\n" @@ -6428,7 +6467,7 @@ msgstr "" "这个密钥的最小信任等级为：%s\n" "\n" -#: g10/pkclist.c:310 g10/revoke.c:805 +#: g10/pkclist.c:310 g10/revoke.c:804 msgid "Your decision? " msgstr "您的决定是什么？ " @@ -6580,45 +6619,45 @@ msgstr "警告：此密钥未被足够可信的签名所认证！\n" msgid " It is not certain that the signature belongs to the owner.\n" msgstr " 此签名并不一定属于其声称的所有者。\n" -#: g10/pkclist.c:844 g10/pkclist.c:863 g10/pkclist.c:1049 g10/pkclist.c:1091 +#: g10/pkclist.c:845 g10/pkclist.c:864 g10/pkclist.c:1065 g10/pkclist.c:1107 #, c-format msgid "%s: skipped: %s\n" msgstr "%s：已跳过：%s\n" -#: g10/pkclist.c:879 +#: g10/pkclist.c:880 #, c-format msgid "%s: skipped: public key is disabled\n" msgstr "%s：已跳过：公钥已被禁用\n" -#: g10/pkclist.c:898 g10/pkclist.c:1062 +#: g10/pkclist.c:900 g10/pkclist.c:1078 #, c-format msgid "%s: skipped: public key already present\n" msgstr "%s: 已跳过：公钥已存在\n" -#: g10/pkclist.c:986 +#: g10/pkclist.c:1002 #, c-format msgid "can't encrypt to '%s'\n" msgstr "无法加密给‘%s’\n" -#: g10/pkclist.c:1001 +#: g10/pkclist.c:1017 #, c-format msgid "option '%s' given, but no valid default keys given\n" msgstr "选项‘%s’已给定，但尚未给定有效的默认密钥\n" -#: g10/pkclist.c:1008 +#: g10/pkclist.c:1024 #, c-format msgid "option '%s' given, but option '%s' not given\n" msgstr "选项‘%s’已给定，但是选项‘%s’尚未给定\n" -#: g10/pkclist.c:1111 +#: g10/pkclist.c:1127 msgid "You did not specify a user ID. (you may use \"-r\")\n" msgstr "您没有指定用户标识。（您可以在命令行中用“-r”指定）\n" -#: g10/pkclist.c:1135 +#: g10/pkclist.c:1151 msgid "Current recipients:\n" msgstr "当前接收者：\n" -#: g10/pkclist.c:1161 +#: g10/pkclist.c:1177 msgid "" "\n" "Enter the user ID. End with an empty line: " @@ -6626,40 +6665,40 @@ msgstr "" "\n" "输入用户标识。以空白行结束： " -#: g10/pkclist.c:1186 +#: g10/pkclist.c:1202 msgid "No such user ID.\n" msgstr "没有此用户标识。\n" -#: g10/pkclist.c:1197 g10/pkclist.c:1275 +#: g10/pkclist.c:1213 g10/pkclist.c:1291 #, c-format msgid "skipped: public key already set as default recipient\n" msgstr "已跳过：公钥已被设为用于默认接收者\n" -#: g10/pkclist.c:1219 +#: g10/pkclist.c:1235 msgid "Public key is disabled.\n" msgstr "公钥被禁用。\n" -#: g10/pkclist.c:1229 +#: g10/pkclist.c:1245 #, c-format msgid "skipped: public key already set\n" msgstr "已跳过：公钥已被设定\n" -#: g10/pkclist.c:1265 +#: g10/pkclist.c:1281 #, c-format msgid "unknown default recipient \"%s\"\n" msgstr "未知的默认接收者 “%s”\n" -#: g10/pkclist.c:1314 +#: g10/pkclist.c:1330 #, c-format msgid "no valid addressees\n" msgstr "没有有效的地址\n" -#: g10/pkclist.c:1693 +#: g10/pkclist.c:1710 #, c-format msgid "Note: key %s has no %s feature\n" msgstr "注意：密钥 %s 没有 %s 特性\n" -#: g10/pkclist.c:1718 +#: g10/pkclist.c:1735 #, c-format msgid "Note: key %s has no preference for %s\n" msgstr "注意：密钥 %s 没有关于 %s 的偏好设置\n" @@ -6669,35 +6708,35 @@ msgstr "注意：密钥 %s 没有关于 %s 的偏好设置\n" msgid "data not saved; use option \"--output\" to save it\n" msgstr "数据未被保存；请用“--output”选项来保存它们\n" -#: g10/plaintext.c:615 +#: g10/plaintext.c:620 msgid "Detached signature.\n" msgstr "分离的签名。\n" -#: g10/plaintext.c:623 +#: g10/plaintext.c:628 msgid "Please enter name of data file: " msgstr "请输入数据文件的名称： " -#: g10/plaintext.c:660 +#: g10/plaintext.c:665 #, c-format msgid "reading stdin ...\n" msgstr "正在从标准输入（stdin）读取 ...\n" -#: g10/plaintext.c:705 +#: g10/plaintext.c:710 #, c-format msgid "no signed data\n" msgstr "没有已签名的数据\n" -#: g10/plaintext.c:723 +#: g10/plaintext.c:728 #, c-format msgid "can't open signed data '%s'\n" msgstr "无法打开已签名的数据‘%s’\n" -#: g10/plaintext.c:758 +#: g10/plaintext.c:763 #, c-format msgid "can't open signed data fd=%d: %s\n" msgstr "无法打开已签名的数据 fd=%d: %s\n" -#: g10/pubkey-enc.c:98 g10/pubkey-enc.c:139 sm/decrypt.c:969 +#: g10/pubkey-enc.c:98 g10/pubkey-enc.c:139 sm/decrypt.c:1337 #, c-format msgid "key %s is not suitable for decryption in %s mode\n" msgstr "密钥 %s 在 %s 模式下不适用于解密\n" @@ -6738,7 +6777,7 @@ msgid "Note: key has been revoked" msgstr "注意：密钥已被吊销" #: g10/revoke.c:100 g10/revoke.c:126 g10/revoke.c:172 g10/revoke.c:184 -#: g10/revoke.c:500 +#: g10/revoke.c:499 #, c-format msgid "build_packet failed: %s\n" msgstr "build_packet 失败：%s\n" @@ -6756,37 +6795,37 @@ msgstr "将被吊销，吊销者为：\n" msgid "(This is a sensitive revocation key)\n" msgstr "（这是一个敏感的吊销用密钥）\n" -#: g10/revoke.c:321 +#: g10/revoke.c:320 msgid "Secret key is not available.\n" msgstr "私钥不可用。\n" -#: g10/revoke.c:326 +#: g10/revoke.c:325 msgid "Create a designated revocation certificate for this key? (y/N) " msgstr "要为这个密钥创建一个指定吊销者证书吗？(y/N) " -#: g10/revoke.c:335 g10/revoke.c:746 +#: g10/revoke.c:334 g10/revoke.c:745 msgid "ASCII armored output forced.\n" msgstr "已强行使用 ASCII 字符封装过的输出。\n" -#: g10/revoke.c:351 g10/revoke.c:479 +#: g10/revoke.c:350 g10/revoke.c:478 #, c-format msgid "make_keysig_packet failed: %s\n" msgstr "make_keysig_packet 方法失败： %s\n" -#: g10/revoke.c:414 +#: g10/revoke.c:413 msgid "Revocation certificate created.\n" msgstr "已建立吊销证书。\n" -#: g10/revoke.c:420 +#: g10/revoke.c:419 #, c-format msgid "no revocation keys found for \"%s\"\n" msgstr "没有找到 “%s” 的吊销用密钥\n" -#: g10/revoke.c:565 +#: g10/revoke.c:564 msgid "This is a revocation certificate for the OpenPGP key:" msgstr "这是一份针对此 OpenPGP 密钥的吊销证书：" -#: g10/revoke.c:581 +#: g10/revoke.c:580 msgid "" "A revocation certificate is a kind of \"kill switch\" to publicly\n" "declare that a key shall not anymore be used. It is not possible\n" @@ -6796,7 +6835,7 @@ msgstr "" "声明一个密钥将不再被使用。 一旦一个这样的\n" "吊销证书被发布之后，就不可能撤回。" -#: g10/revoke.c:584 +#: g10/revoke.c:583 msgid "" "Use it to revoke this key in case of a compromise or loss of\n" "the secret key. However, if the secret key is still accessible,\n" @@ -6809,7 +6848,7 @@ msgstr "" "个新的吊销证书并给定一个吊销理由。更多的细节请参阅\n" " GnuPG 手册中关于 gpg 命令“--generate-revocation”的描述。" -#: g10/revoke.c:590 +#: g10/revoke.c:589 msgid "" "To avoid an accidental use of this file, a colon has been inserted\n" "before the 5 dashes below. Remove this colon with a text editor\n" @@ -6819,12 +6858,12 @@ msgstr "" "5 个短横线之前。在导入和发布此吊销证书之前，请使用一个\n" "文本编辑器来移除此冒号。" -#: g10/revoke.c:609 +#: g10/revoke.c:608 #, c-format msgid "revocation certificate stored as '%s.rev'\n" msgstr "吊销证书已被存储为‘%s.rev’\n" -#: g10/revoke.c:653 +#: g10/revoke.c:652 #, c-format msgid "secret key \"%s\" not found\n" msgstr "私钥 “%s” 未找到\n" @@ -6832,21 +6871,21 @@ msgstr "私钥 “%s” 未找到\n" #. TRANSLATORS: The %s prints a key specification which #. for example has been given at the command line. Several lines #. lines with secret key infos are printed after this message. -#: g10/revoke.c:680 +#: g10/revoke.c:679 #, c-format msgid "'%s' matches multiple secret keys:\n" msgstr "‘%s’匹配了多个私钥：\n" -#: g10/revoke.c:707 +#: g10/revoke.c:706 #, c-format msgid "error searching the keyring: %s\n" msgstr "搜索钥匙环时出现错误： %s\n" -#: g10/revoke.c:730 +#: g10/revoke.c:729 msgid "Create a revocation certificate for this key? (y/N) " msgstr "要为这个密钥创建一个吊销证书吗？(y/N) " -#: g10/revoke.c:754 +#: g10/revoke.c:753 msgid "" "Revocation certificate created.\n" "\n" @@ -6864,37 +6903,37 @@ msgstr "" "不可读。但是千万小心：您机器上的打印系统可能会在打印过程中储存\n" "这些数据，并使得其他人看到！\n" -#: g10/revoke.c:788 +#: g10/revoke.c:787 msgid "Please select the reason for the revocation:\n" msgstr "请选择吊销的原因：\n" -#: g10/revoke.c:798 +#: g10/revoke.c:797 msgid "Cancel" msgstr "取消" -#: g10/revoke.c:800 +#: g10/revoke.c:799 #, c-format msgid "(Probably you want to select %d here)\n" msgstr "（也许您会想要在这里选择 %d）\n" -#: g10/revoke.c:841 +#: g10/revoke.c:840 msgid "Enter an optional description; end it with an empty line:\n" msgstr "请输入描述（可选）；以空白行结束：\n" -#: g10/revoke.c:869 +#: g10/revoke.c:868 #, c-format msgid "Reason for revocation: %s\n" msgstr "吊销原因：%s\n" -#: g10/revoke.c:871 +#: g10/revoke.c:870 msgid "(No description given)\n" msgstr "（未给定描述）\n" -#: g10/revoke.c:876 +#: g10/revoke.c:875 msgid "Is this okay? (y/N) " msgstr "这样可以吗？ (y/N) " -#: g10/seskey.c:62 sm/encrypt.c:124 +#: g10/seskey.c:62 sm/encrypt.c:127 #, c-format msgid "weak key created - retrying\n" msgstr "创建了弱密钥 - 正在重试\n" @@ -6914,49 +6953,44 @@ msgstr "%s 密钥 %s 使用了一个不安全的（%zu 位）散列\n" msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n" msgstr "%s 密钥 %s 要求一个 %zu 位或更长的散列（散列是 %s）\n" -#: g10/sig-check.c:78 g10/sign.c:402 sm/sign.c:496 sm/verify.c:498 +#: g10/sig-check.c:78 g10/sign.c:404 sm/sign.c:742 sm/verify.c:514 #, c-format msgid "key %s may not be used for signing in %s mode\n" msgstr "密钥 %s 在 %s 模式中不适用于签名\n" -#: g10/sig-check.c:82 -#, c-format -msgid "continuing verification anyway due to option %s\n" -msgstr "由于 %s 选项，验证仍在继续中\n" - -#: g10/sig-check.c:190 +#: g10/sig-check.c:183 #, c-format msgid "WARNING: signature digest conflict in message\n" msgstr "警告：签名散列值与报文不一致\n" -#: g10/sig-check.c:219 +#: g10/sig-check.c:212 #, c-format msgid "WARNING: signing subkey %s is not cross-certified\n" msgstr "警告：签名的子密钥 %s 未经交叉验证\n" -#: g10/sig-check.c:221 +#: g10/sig-check.c:214 #, c-format msgid "please see %s for more information\n" msgstr "请参见 %s 以得到更多信息。\n" -#: g10/sig-check.c:230 +#: g10/sig-check.c:223 #, c-format msgid "WARNING: signing subkey %s has an invalid cross-certification\n" msgstr "警告：签名的子密钥 %s 具有无效的交叉验证\n" -#: g10/sig-check.c:351 +#: g10/sig-check.c:345 #, c-format msgid "public key %s is %lu second newer than the signature\n" msgid_plural "public key %s is %lu seconds newer than the signature\n" msgstr[0] "公钥 %s 在其签名之后的 %lu 秒生成\n" -#: g10/sig-check.c:359 +#: g10/sig-check.c:353 #, c-format msgid "public key %s is %lu day newer than the signature\n" msgid_plural "public key %s is %lu days newer than the signature\n" msgstr[0] "公钥 %s 在其签名之后的 %lu 天生成\n" -#: g10/sig-check.c:373 g10/sign.c:361 +#: g10/sig-check.c:367 g10/sign.c:361 #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" @@ -6965,7 +6999,7 @@ msgid_plural "" msgstr[0] "" "密钥 %s 生成于未来的 %lu 秒后（可能是因为时空扭曲或系统时钟的问题）\n" -#: g10/sig-check.c:382 +#: g10/sig-check.c:376 #, c-format msgid "key %s was created %lu day in the future (time warp or clock problem)\n" msgid_plural "" @@ -6973,37 +7007,37 @@ msgid_plural "" msgstr[0] "" "密钥 %s 生成于未来的 %lu 天后（可能是因为时空扭曲或系统时钟的问题）\n" -#: g10/sig-check.c:400 +#: g10/sig-check.c:394 #, c-format msgid "Note: signature key %s expired %s\n" msgstr "注意：签名密钥 %s 已于 %s 过期\n" -#: g10/sig-check.c:411 +#: g10/sig-check.c:405 #, c-format msgid "Note: signature key %s has been revoked\n" msgstr "注意：签名密钥 %s 已被吊销\n" -#: g10/sig-check.c:500 +#: g10/sig-check.c:494 #, c-format msgid "bad key signature from key %s: %s (0x%02x, 0x%x)\n" msgstr "损坏的密钥签名来自密钥 %s: %s (0x%02x, 0x%x)\n" -#: g10/sig-check.c:512 +#: g10/sig-check.c:506 #, c-format msgid "bad data signature from key %s: %s (0x%02x, 0x%x)\n" msgstr "损坏的数据签名来自密钥 %s: %s (0x%02x, 0x%x)\n" -#: g10/sig-check.c:579 +#: g10/sig-check.c:573 #, c-format msgid "assuming bad signature from key %s due to an unknown critical bit\n" msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n" -#: g10/sig-check.c:1176 +#: g10/sig-check.c:1170 #, c-format msgid "key %s: no subkey for subkey revocation signature\n" msgstr "密钥 %s：没有用于子密钥吊销签名的子密钥\n" -#: g10/sig-check.c:1179 +#: g10/sig-check.c:1173 #, c-format msgid "key %s: no subkey for subkey binding signature\n" msgstr "密钥 %s：没有用于子密钥绑定签名的子密钥\n" @@ -7026,23 +7060,23 @@ msgid "" "unexpanded.\n" msgstr "警告：首选公钥服务器 URL %% 无法扩展（过大）。现在使用未扩展的。\n" -#: g10/sign.c:476 +#: g10/sign.c:478 #, c-format msgid "%s/%s signature from: \"%s\"\n" msgstr "%s/%s 签名来自：“%s”\n" -#: g10/sign.c:1045 +#: g10/sign.c:1062 #, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" msgstr "警告：强制摘要算法 %s (%d) 与接收者的偏好设置冲突\n" -#: g10/sign.c:1187 +#: g10/sign.c:1215 #, c-format msgid "signing:" msgstr "正在签名：" -#: g10/sign.c:1464 +#: g10/sign.c:1495 #, c-format msgid "%s encryption will be used\n" msgstr "%s 加密将被采用\n" @@ -7066,7 +7100,7 @@ msgstr "已跳过：私钥已存在\n" msgid "this is a PGP generated Elgamal key which is not secure for signatures!" msgstr "这是一个由 PGP 生成的 ElGamal 密钥，其用于签名时不安全！" -#: g10/tdbdump.c:57 g10/trustdb.c:451 +#: g10/tdbdump.c:57 g10/trustdb.c:471 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" msgstr "信任记录 %lu，类别 %d：写入失败：%s\n" @@ -7111,7 +7145,7 @@ msgstr "在‘%s’中寻找信任度记录时出现错误：%s\n" msgid "read error in '%s': %s\n" msgstr "读取‘%s’时出现错误：%s\n" -#: g10/tdbdump.c:237 g10/trustdb.c:466 +#: g10/tdbdump.c:237 g10/trustdb.c:486 #, c-format msgid "trustdb: sync failed: %s\n" msgstr "信任度数据库：sync 失败：%s\n" @@ -7146,7 +7180,7 @@ msgstr "信任度数据库处理量过大\n" msgid "%s: directory does not exist!\n" msgstr "%s：目录不存在！\n" -#: g10/tdbio.c:741 dirmngr/http.c:595 dirmngr/http.c:624 +#: g10/tdbio.c:741 dirmngr/http.c:645 dirmngr/http.c:675 #, c-format msgid "can't access '%s': %s\n" msgstr "无法访问‘%s’：%s\n" @@ -7584,126 +7618,126 @@ msgstr "打开 TOFU 数据库时出现错误：%s\n" msgid "WARNING: Encrypting to %s, which has no non-revoked user ids\n" msgstr "警告：正在加密给 %s，其不具有不可吊销的用户标识。\n" -#: g10/trustdb.c:232 +#: g10/trustdb.c:251 #, c-format msgid "'%s' is not a valid long keyID\n" msgstr "‘%s’不是一个有效的长格式 keyID\n" -#: g10/trustdb.c:255 g10/trustdb.c:284 +#: g10/trustdb.c:274 g10/trustdb.c:303 #, c-format msgid "key %s: accepted as trusted key\n" msgstr "密钥 %s：接受为受信任的密钥\n" -#: g10/trustdb.c:336 +#: g10/trustdb.c:355 #, c-format msgid "key %s occurs more than once in the trustdb\n" msgstr "密钥 %s 在信任度数据库中出现多于一次\n" -#: g10/trustdb.c:375 +#: g10/trustdb.c:395 #, c-format msgid "key %s: no public key for trusted key - skipped\n" msgstr "密钥 %s：受信任的密钥没有公钥 - 已跳过\n" -#: g10/trustdb.c:386 +#: g10/trustdb.c:406 #, c-format msgid "key %s marked as ultimately trusted\n" msgstr "密钥 %s 被标记为绝对信任\n" -#: g10/trustdb.c:430 +#: g10/trustdb.c:450 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n" -#: g10/trustdb.c:436 +#: g10/trustdb.c:456 #, c-format msgid "trust record %lu is not of requested type %d\n" msgstr "信任记录 %lu 不属于所请求的类别 %d\n" -#: g10/trustdb.c:511 +#: g10/trustdb.c:531 #, c-format msgid "You may try to re-create the trustdb using the commands:\n" msgstr "您可以通过下列命令尝试重建信任度数据库：\n" -#: g10/trustdb.c:520 +#: g10/trustdb.c:540 #, c-format msgid "If that does not work, please consult the manual\n" msgstr "如果那样不起作用，请查阅手册。\n" -#: g10/trustdb.c:570 +#: g10/trustdb.c:590 #, c-format msgid "unable to use unknown trust model (%d) - assuming %s trust model\n" msgstr "无法使用未知的信任模型（%d）- 假定为 %s 信任模型\n" -#: g10/trustdb.c:576 +#: g10/trustdb.c:596 #, c-format msgid "using %s trust model\n" msgstr "使用 %s 信任模型\n" -#: g10/trustdb.c:625 +#: g10/trustdb.c:645 #, c-format msgid "no need for a trustdb check\n" msgstr "不需要检查信任度数据库\n" -#: g10/trustdb.c:631 g10/trustdb.c:2326 +#: g10/trustdb.c:651 g10/trustdb.c:2379 #, c-format msgid "next trustdb check due at %s\n" msgstr "下次信任度数据库检查将于 %s 进行\n" -#: g10/trustdb.c:640 +#: g10/trustdb.c:660 #, c-format msgid "no need for a trustdb check with '%s' trust model\n" msgstr "在‘%s’信任模型下无需进行 trustdb 检查\n" -#: g10/trustdb.c:656 +#: g10/trustdb.c:676 #, c-format msgid "no need for a trustdb update with '%s' trust model\n" msgstr "在‘%s’信任模型下无需进行 trustdb 更新\n" -#: g10/trustdb.c:898 g10/trustdb.c:1485 +#: g10/trustdb.c:918 g10/trustdb.c:1526 #, c-format msgid "public key %s not found: %s\n" msgstr "公钥 %s 未找到：%s\n" -#: g10/trustdb.c:1118 +#: g10/trustdb.c:1159 #, c-format msgid "please do a --check-trustdb\n" msgstr "请执行一次 --check-trustdb\n" -#: g10/trustdb.c:1123 +#: g10/trustdb.c:1164 #, c-format msgid "checking the trustdb\n" msgstr "正在检查信任度数据库\n" -#: g10/trustdb.c:2047 +#: g10/trustdb.c:2100 #, c-format msgid "%d key processed" msgid_plural "%d keys processed" msgstr[0] "已处理 %d 把密钥" -#: g10/trustdb.c:2050 +#: g10/trustdb.c:2103 #, c-format msgid " (%d validity count cleared)\n" msgid_plural " (%d validity counts cleared)\n" msgstr[0] " （%d 个有效计数已被清除）\n" -#: g10/trustdb.c:2120 +#: g10/trustdb.c:2173 #, c-format msgid "no ultimately trusted keys found\n" msgstr "未找到任何绝对信任的密钥\n" -#: g10/trustdb.c:2134 +#: g10/trustdb.c:2187 #, c-format msgid "public key of ultimately trusted key %s not found\n" msgstr "绝对信任密钥 %s 的公钥未找到\n" -#: g10/trustdb.c:2252 +#: g10/trustdb.c:2305 #, 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:2333 +#: g10/trustdb.c:2386 #, c-format msgid "unable to update trustdb version record: write failed: %s\n" msgstr "无法更新信任度数据库版本记录：写入失败：%s\n" @@ -7816,123 +7850,129 @@ msgstr "" #. TRANSLATORS: Put a \x1f right before a colon. This can be #. * used by pinentry to nicely align the names and values. Keep #. * the %s at the start and end of the string. -#: scd/app-p15.c:5116 scd/app-openpgp.c:2154 +#: scd/app-p15.c:5149 scd/app-nks.c:1541 scd/app-openpgp.c:2449 #, c-format msgid "%sNumber : %s%%0AHolder : %s%s" msgstr "%s数字 : %s%%0A持有者 : %s%s" #. TRANSLATORS: This is the number of remaining attempts to #. * enter a PIN. Use %%0A (double-percent,0A) for a linefeed. -#: scd/app-p15.c:5135 scd/app-openpgp.c:2170 +#: scd/app-p15.c:5168 scd/app-nks.c:1560 scd/app-openpgp.c:2465 #, c-format msgid "Remaining attempts: %d" msgstr "剩余尝试：%d" -#: scd/app-p15.c:5214 scd/app-nks.c:1113 +#: scd/app-p15.c:5248 scd/app-nks.c:2112 msgid "||Please enter the PIN for the key to create qualified signatures." msgstr "||请为这个密钥输入 PIN 以创建合格的签名。" #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at #. the start of the string. Use %0A (single percent) for a linefeed. -#: scd/app-p15.c:5217 scd/app-openpgp.c:2464 +#: scd/app-p15.c:5251 scd/app-openpgp.c:2791 msgid "|A|Please enter the Admin PIN" msgstr "|A|请输入管理员 PIN" -#: scd/app-p15.c:5219 scd/app-nks.c:1103 +#: scd/app-p15.c:5253 scd/app-nks.c:2102 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys." msgstr "|NP|请输入标准密钥的 PIN 解锁码（PUK）。" -#: scd/app-p15.c:5222 scd/app-nks.c:1095 +#: scd/app-p15.c:5256 scd/app-nks.c:2093 msgid "||Please enter the PIN for the standard keys." msgstr "||请输入标准密钥的 PIN。" -#: scd/app-nks.c:709 scd/app-openpgp.c:3666 +#: scd/app-nks.c:1479 scd/app-openpgp.c:4190 #, c-format msgid "RSA modulus missing or not of size %d bits\n" msgstr "RSA 余数缺失或者不是 %d 位长\n" -#: scd/app-nks.c:717 scd/app-openpgp.c:3678 +#: scd/app-nks.c:1487 scd/app-openpgp.c:4202 #, c-format msgid "RSA public exponent missing or larger than %d bits\n" msgstr "RSA 公钥指数缺失或长于 %d 位\n" -#: scd/app-nks.c:797 scd/app-openpgp.c:2327 scd/app-openpgp.c:2346 -#: scd/app-openpgp.c:2513 scd/app-openpgp.c:2531 scd/app-openpgp.c:2829 -#: scd/app-openpgp.c:2876 scd/app-openpgp.c:2991 scd/app-dinsig.c:302 +#: scd/app-nks.c:1660 +#, fuzzy +#| msgid "the NullPIN has not yet been changed\n" +msgid "Note: PIN has not yet been enabled." +msgstr "尚未变更 NullPIN\n" + +#: scd/app-nks.c:1671 scd/app-openpgp.c:2649 scd/app-openpgp.c:2666 +#: scd/app-openpgp.c:2843 scd/app-openpgp.c:2862 scd/app-openpgp.c:3206 +#: scd/app-openpgp.c:3253 scd/app-openpgp.c:3418 scd/app-dinsig.c:303 #, c-format msgid "PIN callback returned error: %s\n" msgstr "PIN 回调返回错误：%s\n" -#: scd/app-nks.c:830 +#: scd/app-nks.c:1707 #, c-format msgid "the NullPIN has not yet been changed\n" msgstr "尚未变更 NullPIN\n" -#: scd/app-nks.c:1094 +#: scd/app-nks.c:2092 msgid "|N|Please enter a new PIN for the standard keys." msgstr "|N|请为标准密钥输入一个新的 PIN。" -#: scd/app-nks.c:1101 +#: scd/app-nks.c:2100 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys." msgstr "|NP|请为标准密钥输入一个新的 PIN 解锁码（PUK）。" -#: scd/app-nks.c:1111 +#: scd/app-nks.c:2110 msgid "|N|Please enter a new PIN for the key to create qualified signatures." msgstr "|N|请为这个密钥输入一个新的 PIN 以创建合格的签名。" -#: scd/app-nks.c:1121 +#: scd/app-nks.c:2120 msgid "" "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create " "qualified signatures." msgstr "|NP|请为这个密钥输入一个新的 PIN 解锁码（PUK）以创建合格的签名。" -#: scd/app-nks.c:1123 +#: scd/app-nks.c:2122 msgid "" "|P|Please enter the PIN Unblocking Code (PUK) for the key to create " "qualified signatures." msgstr "|P|请为这个密钥输入 PIN 解锁码（PUK）以创建合格的签名。" -#: scd/app-nks.c:1230 scd/app-openpgp.c:2910 scd/app-dinsig.c:532 +#: scd/app-nks.c:2295 scd/app-openpgp.c:3288 scd/app-dinsig.c:535 #, c-format msgid "error getting new PIN: %s\n" msgstr "获取新 PIN 时出现错误：%s\n" -#: scd/app-openpgp.c:862 +#: scd/app-openpgp.c:938 #, c-format msgid "failed to store the fingerprint: %s\n" msgstr "存储指纹失败：%s\n" -#: scd/app-openpgp.c:875 +#: scd/app-openpgp.c:951 #, c-format msgid "failed to store the creation date: %s\n" msgstr "存储创建日期失败：%s\n" -#: scd/app-openpgp.c:1271 scd/app-openpgp.c:2857 scd/app-openpgp.c:5041 +#: scd/app-openpgp.c:1422 scd/app-openpgp.c:3234 scd/app-openpgp.c:5635 #, c-format msgid "error retrieving CHV status from card\n" msgstr "从卡片中拉取 CHV 状态时出现错误\n" -#: scd/app-openpgp.c:1429 +#: scd/app-openpgp.c:1611 #, c-format msgid "response does not contain the RSA modulus\n" msgstr "响应不包含 RSA 余数\n" -#: scd/app-openpgp.c:1436 +#: scd/app-openpgp.c:1618 #, c-format msgid "response does not contain the RSA public exponent\n" msgstr "响应不包含 RSA 公钥指数\n" -#: scd/app-openpgp.c:1546 +#: scd/app-openpgp.c:1736 #, c-format msgid "response does not contain the EC public key\n" msgstr "响应不包含 EC 公钥\n" -#: scd/app-openpgp.c:1664 scd/app-openpgp.c:4286 +#: scd/app-openpgp.c:1853 scd/app-openpgp.c:4880 #, c-format msgid "response does not contain the public key data\n" msgstr "响应不包含公钥数据\n" -#: scd/app-openpgp.c:1771 +#: scd/app-openpgp.c:1961 #, c-format msgid "reading public key failed: %s\n" msgstr "读取公钥失败：%s\n" @@ -7940,62 +7980,63 @@ msgstr "读取公钥失败：%s\n" #. TRANSLATORS: Put a \x1f right before a colon. This can be #. * used by pinentry to nicely align the names and values. Keep #. * the %s at the start and end of the string. -#: scd/app-openpgp.c:2141 +#: scd/app-openpgp.c:2436 #, c-format msgid "%sNumber : %s%%0AHolder : %s%%0ACounter : %lu%s" msgstr "%s数字 : %s%%0A持有者 : %s%%0A计数 : %lu%s" -#: scd/app-openpgp.c:2281 +#: scd/app-openpgp.c:2603 #, c-format msgid "using default PIN as %s\n" msgstr "使用默认 PIN 作为 %s\n" -#: scd/app-openpgp.c:2288 +#: scd/app-openpgp.c:2610 #, c-format msgid "failed to use default PIN as %s: %s - disabling further default use\n" msgstr "使用默认 PIN 作为 %s 失败：%s - 禁用进一步的默认使用\n" -#: scd/app-openpgp.c:2301 +#: scd/app-openpgp.c:2623 msgid "||Please unlock the card" msgstr "||请解锁卡片" -#: scd/app-openpgp.c:2353 scd/app-openpgp.c:2538 scd/app-openpgp.c:2836 +#: scd/app-openpgp.c:2673 scd/app-openpgp.c:2869 scd/app-openpgp.c:3213 +#: scd/app-openpgp.c:3308 scd/app-openpgp.c:3321 #, 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:2367 scd/app-openpgp.c:2414 scd/app-openpgp.c:2552 -#: scd/app-openpgp.c:4644 +#: scd/app-openpgp.c:2688 scd/app-openpgp.c:2736 scd/app-openpgp.c:2884 +#: scd/app-openpgp.c:5244 #, c-format msgid "verify CHV%d failed: %s\n" msgstr "验证 CHV%d 失败：%s\n" -#: scd/app-openpgp.c:2450 scd/app-openpgp.c:5050 +#: scd/app-openpgp.c:2777 scd/app-openpgp.c:5644 #, c-format msgid "card is permanently locked!\n" msgstr "卡片被永久锁定！\n" -#: scd/app-openpgp.c:2454 +#: scd/app-openpgp.c:2781 #, c-format msgid "%d Admin PIN attempt remaining before card is permanently locked\n" msgid_plural "" "%d Admin PIN attempts remaining before card is permanently locked\n" msgstr[0] "在卡片被永久锁定之前剩余 %d 次管理员 PIN 尝试\n" -#: scd/app-openpgp.c:2485 +#: scd/app-openpgp.c:2814 #, c-format msgid "access to admin commands is not configured\n" msgstr "未配置到管理员命令的访问\n" -#: scd/app-openpgp.c:2823 +#: scd/app-openpgp.c:3200 msgid "||Please enter the PIN" msgstr "||请输入 PIN" -#: scd/app-openpgp.c:2872 -msgid "||Please enter the Reset Code for the card" -msgstr "||请输入卡片的重置码" +#: scd/app-openpgp.c:3249 +msgid "|R|Please enter the Reset Code for the card" +msgstr "|R|请输入卡片的重置码" -#: scd/app-openpgp.c:2882 scd/app-openpgp.c:2943 +#: scd/app-openpgp.c:3259 scd/app-openpgp.c:3298 #, c-format msgid "Reset Code is too short; minimum length is %d\n" msgstr "重置码太短；最小长度为 %d\n" @@ -8003,131 +8044,131 @@ msgstr "重置码太短；最小长度为 %d\n" #. 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-openpgp.c:2905 +#: scd/app-openpgp.c:3283 msgid "|RN|New Reset Code" msgstr "|RN|新的重置码" -#: scd/app-openpgp.c:2906 +#: scd/app-openpgp.c:3284 msgid "|AN|New Admin PIN" msgstr "|AN|新的管理员 PIN" -#: scd/app-openpgp.c:2906 +#: scd/app-openpgp.c:3284 msgid "|N|New PIN" msgstr "|N|新的 PIN" -#: scd/app-openpgp.c:2987 +#: scd/app-openpgp.c:3414 msgid "||Please enter the Admin PIN and New Admin PIN" msgstr "||请输入原管理员 PIN 和新管理员 PIN" -#: scd/app-openpgp.c:2988 +#: scd/app-openpgp.c:3415 msgid "||Please enter the PIN and New PIN" msgstr "||请输入原 PIN 和新 PIN" -#: scd/app-openpgp.c:3050 scd/app-openpgp.c:4346 +#: scd/app-openpgp.c:3471 scd/app-openpgp.c:4940 #, c-format msgid "error reading application data\n" msgstr "读取应用程序数据时出错\n" -#: scd/app-openpgp.c:3056 scd/app-openpgp.c:4353 +#: scd/app-openpgp.c:3477 scd/app-openpgp.c:4947 #, c-format msgid "error reading fingerprint DO\n" msgstr "读取指纹 DO 时出现错误\n" -#: scd/app-openpgp.c:3066 +#: scd/app-openpgp.c:3487 #, c-format msgid "key already exists\n" msgstr "密钥已存在\n" -#: scd/app-openpgp.c:3070 +#: scd/app-openpgp.c:3491 #, c-format msgid "existing key will be replaced\n" msgstr "现有的密钥将被替换\n" -#: scd/app-openpgp.c:3072 +#: scd/app-openpgp.c:3493 #, c-format msgid "generating new key\n" msgstr "生成新密钥\n" -#: scd/app-openpgp.c:3074 +#: scd/app-openpgp.c:3495 #, c-format msgid "writing new key\n" msgstr "正在写入新密钥\n" -#: scd/app-openpgp.c:3647 scd/app-openpgp.c:3999 +#: scd/app-openpgp.c:4171 scd/app-openpgp.c:4540 #, c-format msgid "creation timestamp missing\n" msgstr "缺少创建时间戳\n" -#: scd/app-openpgp.c:3688 scd/app-openpgp.c:3696 +#: scd/app-openpgp.c:4212 scd/app-openpgp.c:4220 #, c-format msgid "RSA prime %s missing or not of size %d bits\n" msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n" -#: scd/app-openpgp.c:3829 scd/app-openpgp.c:4106 +#: scd/app-openpgp.c:4353 scd/app-openpgp.c:4659 #, c-format msgid "failed to store the key: %s\n" msgstr "存储密钥失败：%s\n" -#: scd/app-openpgp.c:3993 +#: scd/app-openpgp.c:4534 #, c-format msgid "unsupported curve\n" msgstr "不支持的曲线\n" -#: scd/app-openpgp.c:4263 +#: scd/app-openpgp.c:4857 #, c-format msgid "please wait while key is being generated ...\n" msgstr "请等待密钥生成…\n" -#: scd/app-openpgp.c:4271 +#: scd/app-openpgp.c:4865 #, c-format msgid "generating key failed\n" msgstr "生成密钥失败\n" -#: scd/app-openpgp.c:4277 +#: scd/app-openpgp.c:4871 #, c-format msgid "key generation completed (%d second)\n" msgid_plural "key generation completed (%d seconds)\n" msgstr[0] "密钥生成完成（%d 秒）\n" -#: scd/app-openpgp.c:4311 +#: scd/app-openpgp.c:4905 #, c-format msgid "invalid structure of OpenPGP card (DO 0x93)\n" msgstr "无效的 OpenPGP 卡结构（DO 0x93）\n" -#: scd/app-openpgp.c:4361 +#: scd/app-openpgp.c:4955 #, c-format msgid "fingerprint on card does not match requested one\n" msgstr "卡片上的指纹与请求的不匹配\n" -#: scd/app-openpgp.c:4560 +#: scd/app-openpgp.c:5159 #, c-format msgid "card does not support digest algorithm %s\n" msgstr "卡片不支持摘要算法 %s\n" -#: scd/app-openpgp.c:4618 +#: scd/app-openpgp.c:5217 #, c-format msgid "signatures created so far: %lu\n" msgstr "目前已创建的签名：%lu\n" -#: scd/app-openpgp.c:5055 +#: scd/app-openpgp.c:5649 #, c-format msgid "" "verification of Admin PIN is currently prohibited through this command\n" msgstr "目前禁止通过此命令验证管理员 PIN\n" -#: scd/app-openpgp.c:5386 scd/app-openpgp.c:5398 +#: scd/app-openpgp.c:6034 scd/app-openpgp.c:6046 #, c-format msgid "can't access %s - invalid OpenPGP card?\n" msgstr "不能访问 %s - 无效的 OpenPGP 卡？\n" -#: scd/app-dinsig.c:298 +#: scd/app-dinsig.c:299 msgid "||Please enter your PIN at the reader's pinpad" msgstr "||请在读卡器的小键盘上输入您的 PIN" #. 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-dinsig.c:529 +#: scd/app-dinsig.c:532 msgid "|N|Initial New PIN" msgstr "|N|初始化新 PIN" @@ -8135,7 +8176,7 @@ msgstr "|N|初始化新 PIN" msgid "run in multi server mode (foreground)" msgstr "正在以多服务器模式运行（前台）" -#: scd/scdaemon.c:137 sm/gpgsm.c:268 dirmngr/dirmngr.c:202 +#: scd/scdaemon.c:137 sm/gpgsm.c:271 dirmngr/dirmngr.c:204 msgid "|LEVEL|set the debugging level to LEVEL" msgstr "|LEVEL|设置调试级别至 LEVEL" @@ -8192,18 +8233,18 @@ msgstr "" msgid "please use the option '--daemon' to run the program in the background\n" msgstr "请使用‘--daemon’选项以在后台运行此程序\n" -#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2178 +#: scd/scdaemon.c:1199 dirmngr/dirmngr.c:2218 #, c-format msgid "handler for fd %d started\n" msgstr "fd %d 的句柄已启动\n" -#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2186 +#: scd/scdaemon.c:1211 dirmngr/dirmngr.c:2226 #, c-format msgid "handler for fd %d terminated\n" msgstr "fd %d 的句柄已关闭\n" -#: sm/call-agent.c:1053 sm/certlist.c:134 sm/keylist.c:285 -#: dirmngr/validate.c:1228 +#: sm/call-agent.c:1086 sm/certlist.c:144 sm/keylist.c:285 +#: dirmngr/validate.c:1271 #, c-format msgid "error getting key usage information: %s\n" msgstr "获取密钥用途信息时出现错误：%s\n" @@ -8213,11 +8254,11 @@ msgstr "获取密钥用途信息时出现错误：%s\n" msgid "validation model requested by certificate: %s" msgstr "证书所请求的验证模型：%s" -#: sm/certchain.c:199 sm/certchain.c:2164 +#: sm/certchain.c:199 sm/certchain.c:2201 msgid "chain" msgstr "链" -#: sm/certchain.c:200 sm/certchain.c:2164 +#: sm/certchain.c:200 sm/certchain.c:2201 msgid "shell" msgstr "外壳" @@ -8226,270 +8267,271 @@ msgstr "外壳" msgid "critical certificate extension %s is not supported" msgstr "紧急认证扩展 %s 不被支持" -#: sm/certchain.c:299 dirmngr/validate.c:242 +#: sm/certchain.c:299 dirmngr/validate.c:243 #, c-format msgid "issuer certificate is not marked as a CA" msgstr "签发者证书没有被标记为 CA" -#: sm/certchain.c:337 +#: sm/certchain.c:338 msgid "critical marked policy without configured policies" msgstr "未配置关键标记策略" -#: sm/certchain.c:347 +#: sm/certchain.c:356 #, c-format msgid "failed to open '%s': %s\n" msgstr "无法打开‘%s’：%s\n" -#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204 +#: sm/certchain.c:368 sm/certchain.c:400 dirmngr/validate.c:204 #, c-format msgid "Note: non-critical certificate policy not allowed" msgstr "注意：非紧急认证策略不被允许" -#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209 +#: sm/certchain.c:372 sm/certchain.c:404 dirmngr/validate.c:209 #, c-format msgid "certificate policy not allowed" msgstr "证书策略不被允许" -#: sm/certchain.c:595 sm/keydb.c:1084 sm/keydb.c:1171 +#: sm/certchain.c:611 sm/keydb.c:1091 sm/keydb.c:1178 #, c-format msgid "failed to get the fingerprint\n" msgstr "获取指纹失败\n" -#: sm/certchain.c:624 +#: sm/certchain.c:640 #, c-format msgid "looking up issuer at external location\n" msgstr "在外部位置查找签发者\n" -#: sm/certchain.c:644 +#: sm/certchain.c:660 #, c-format msgid "number of issuers matching: %d\n" msgstr "匹配的签发者数目：%d\n" -#: sm/certchain.c:723 dirmngr/ocsp.c:685 +#: sm/certchain.c:739 dirmngr/ocsp.c:740 #, c-format msgid "can't get authorityInfoAccess: %s\n" msgstr "无法获取 authorityInfoAccess：%s\n" -#: sm/certchain.c:791 +#: sm/certchain.c:807 #, c-format msgid "looking up issuer from the Dirmngr cache\n" msgstr "在 Dirmngr 缓存中查找签发者\n" -#: sm/certchain.c:816 +#: sm/certchain.c:832 #, c-format msgid "number of matching certificates: %d\n" msgstr "匹配的证书数：%d\n" -#: sm/certchain.c:819 +#: sm/certchain.c:835 #, c-format msgid "dirmngr cache-only key lookup failed: %s\n" msgstr "dirmngr 仅缓存的密钥查找失败：%s\n" -#: sm/certchain.c:1041 sm/certchain.c:1554 sm/certchain.c:2192 sm/decrypt.c:728 -#: sm/encrypt.c:345 sm/import.c:415 sm/keydb.c:1091 sm/keydb.c:1178 -#: sm/sign.c:337 sm/verify.c:118 +#: sm/certchain.c:1059 sm/certchain.c:1574 sm/certchain.c:2229 +#: sm/decrypt.c:1086 sm/encrypt.c:639 sm/import.c:416 sm/keydb.c:1098 +#: sm/keydb.c:1185 sm/sign.c:553 sm/verify.c:123 #, c-format msgid "failed to allocate keyDB handle\n" msgstr "分配 keyDB 句柄时失败\n" -#: sm/certchain.c:1225 +#: sm/certchain.c:1245 msgid "certificate has been revoked" msgstr "证书已被吊销" -#: sm/certchain.c:1240 +#: sm/certchain.c:1260 msgid "the status of the certificate is unknown" msgstr "证书的状态未知" -#: sm/certchain.c:1247 +#: sm/certchain.c:1267 #, c-format msgid "please make sure that the \"dirmngr\" is properly installed\n" msgstr "请确定“dirmngr”被正确安装\n" -#: sm/certchain.c:1253 +#: sm/certchain.c:1273 #, c-format msgid "checking the CRL failed: %s" msgstr "检查 CRL 时失败：%s" -#: sm/certchain.c:1282 sm/certchain.c:1350 dirmngr/validate.c:497 +#: sm/certchain.c:1302 sm/certchain.c:1370 dirmngr/validate.c:498 #, c-format msgid "certificate with invalid validity: %s" msgstr "证书的有效期无效：%s" -#: sm/certchain.c:1297 sm/certchain.c:1382 dirmngr/validate.c:515 +#: sm/certchain.c:1317 sm/certchain.c:1402 dirmngr/validate.c:516 #, c-format msgid "certificate not yet valid" msgstr "证书尚未验证" -#: sm/certchain.c:1298 sm/certchain.c:1383 +#: sm/certchain.c:1318 sm/certchain.c:1403 msgid "root certificate not yet valid" msgstr "根证书尚未验证" -#: sm/certchain.c:1299 sm/certchain.c:1384 +#: sm/certchain.c:1319 sm/certchain.c:1404 msgid "intermediate certificate not yet valid" msgstr "中间证书尚未验证" -#: sm/certchain.c:1312 dirmngr/validate.c:526 +#: sm/certchain.c:1332 dirmngr/validate.c:527 #, c-format msgid "certificate has expired" msgstr "证书已过期" -#: sm/certchain.c:1313 +#: sm/certchain.c:1333 msgid "root certificate has expired" msgstr "根证书已过期" -#: sm/certchain.c:1314 +#: sm/certchain.c:1334 msgid "intermediate certificate has expired" msgstr "中间证书已过期" -#: sm/certchain.c:1356 +#: sm/certchain.c:1376 #, c-format msgid "required certificate attributes missing: %s%s%s" msgstr "请求的证书属性缺失：%s%s%s" -#: sm/certchain.c:1365 +#: sm/certchain.c:1385 msgid "certificate with invalid validity" msgstr "证书有效期无效" -#: sm/certchain.c:1402 +#: sm/certchain.c:1422 msgid "signature not created during lifetime of certificate" msgstr "签名不是在证书的有效期内被创建的" -#: sm/certchain.c:1404 +#: sm/certchain.c:1424 msgid "certificate not created during lifetime of issuer" msgstr "签名不是在签发者的有效期内被创建的" -#: sm/certchain.c:1405 +#: sm/certchain.c:1425 msgid "intermediate certificate not created during lifetime of issuer" msgstr "中间证书不是在签发者的有效期内被创建的" -#: sm/certchain.c:1409 +#: sm/certchain.c:1429 #, c-format msgid " ( signature created at " msgstr " （ 签名创建于 " -#: sm/certchain.c:1410 +#: sm/certchain.c:1430 #, c-format msgid " (certificate created at " msgstr " （证书创建于 " -#: sm/certchain.c:1413 +#: sm/certchain.c:1433 #, c-format msgid " (certificate valid from " msgstr " （证书有效期从 " -#: sm/certchain.c:1414 +#: sm/certchain.c:1434 #, c-format msgid " ( issuer valid from " msgstr " （ 签发者有效期从 " -#: sm/certchain.c:1444 dirmngr/validate.c:577 +#: sm/certchain.c:1464 dirmngr/validate.c:578 #, c-format msgid "fingerprint=%s\n" msgstr "指纹 = %s\n" -#: sm/certchain.c:1453 +#: sm/certchain.c:1473 #, c-format msgid "root certificate has now been marked as trusted\n" msgstr "根证书现已被标记为信任\n" -#: sm/certchain.c:1466 +#: sm/certchain.c:1486 #, c-format msgid "interactive marking as trusted not enabled in gpg-agent\n" msgstr "交互式标记为信任未在 gpg-agent 中开启\n" -#: sm/certchain.c:1472 +#: sm/certchain.c:1492 #, c-format msgid "interactive marking as trusted disabled for this session\n" msgstr "交互式标记为信任在此会话中被关闭\n" -#: sm/certchain.c:1531 +#: sm/certchain.c:1551 msgid "WARNING: creation time of signature not known - assuming current time" msgstr "警告：签名的创建时间未知 - 猜测为当前时间" -#: sm/certchain.c:1595 +#: sm/certchain.c:1615 msgid "no issuer found in certificate" msgstr "证书中没有找到签发者" -#: sm/certchain.c:1673 +#: sm/certchain.c:1693 msgid "self-signed certificate has a BAD signature" msgstr "自签名证书具有损坏的签名" -#: sm/certchain.c:1742 dirmngr/validate.c:575 +#: sm/certchain.c:1766 dirmngr/validate.c:576 #, c-format msgid "root certificate is not marked trusted" msgstr "根证书未被标记为信任" -#: sm/certchain.c:1758 +#: sm/certchain.c:1782 #, c-format msgid "checking the trust list failed: %s\n" msgstr "检查信任列表时失败：%s\n" -#: sm/certchain.c:1789 sm/import.c:176 sm/keylist.c:1396 dirmngr/validate.c:630 +#: sm/certchain.c:1813 sm/import.c:176 sm/keylist.c:1403 dirmngr/validate.c:631 #, c-format msgid "certificate chain too long\n" msgstr "证书链过长\n" -#: sm/certchain.c:1801 dirmngr/validate.c:642 +#: sm/certchain.c:1825 dirmngr/validate.c:643 #, c-format msgid "issuer certificate not found" msgstr "签发者证书未找到" -#: sm/certchain.c:1834 dirmngr/validate.c:668 +#: sm/certchain.c:1859 dirmngr/validate.c:669 #, c-format msgid "certificate has a BAD signature" msgstr "证书具有损坏的签名" -#: sm/certchain.c:1866 dirmngr/validate.c:692 +#: sm/certchain.c:1891 dirmngr/validate.c:693 msgid "found another possible matching CA certificate - trying again" msgstr "找到另一个可能匹配的 CA 证书 - 正在重试" -#: sm/certchain.c:1925 dirmngr/validate.c:717 +#: sm/certchain.c:1950 dirmngr/validate.c:718 #, c-format msgid "certificate chain longer than allowed by CA (%d)" msgstr "证书链长于 CA 允许的长度（%d）" -#: sm/certchain.c:1967 sm/certchain.c:2263 dirmngr/validate.c:747 +#: sm/certchain.c:1992 sm/certchain.c:2301 dirmngr/validate.c:748 #, c-format msgid "certificate is good\n" msgstr "证书有效\n" -#: sm/certchain.c:1968 +#: sm/certchain.c:1993 #, c-format msgid "intermediate certificate is good\n" msgstr "中间证书有效\n" -#: sm/certchain.c:1969 +#: sm/certchain.c:1994 #, c-format msgid "root certificate is good\n" msgstr "根证书良好\n" -#: sm/certchain.c:2151 +#: sm/certchain.c:2186 msgid "switching to chain model" msgstr "正在切换为链模型" -#: sm/certchain.c:2160 +#: sm/certchain.c:2195 #, c-format msgid "validation model used: %s" msgstr "使用的验证模型：%s" -#: sm/certcheck.c:110 +#: sm/certcheck.c:113 dirmngr/crlcache.c:1829 dirmngr/ocsp.c:464 +#: dirmngr/validate.c:1148 #, c-format msgid "a %u bit hash is not valid for a %u bit %s key\n" msgstr "一个 %u 位的散列对于一个 %u 位的 %s 密钥是无效的\n" -#: sm/certcheck.c:238 sm/certcheck.c:262 dirmngr/crlcache.c:1542 -#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1453 dirmngr/validate.c:903 -#: dirmngr/validate.c:927 +#: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542 +#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1490 dirmngr/validate.c:906 +#: dirmngr/validate.c:930 #, c-format msgid "out of core\n" msgstr "内存不足\n" -#: sm/certcheck.c:370 sm/verify.c:213 +#: sm/certcheck.c:381 sm/verify.c:223 #, c-format msgid "(this is the MD2 algorithm)\n" msgstr "（这是 MD2 算法）\n" -#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:796 +#: sm/certdump.c:60 sm/certdump.c:92 sm/certdump.c:222 dirmngr/ocsp.c:851 msgid "none" msgstr "none" @@ -8523,176 +8565,176 @@ msgstr "" "S/N %s，ID 0x%08lX，\n" "创建于 %s，过期于 %s。\n" -#: sm/certlist.c:124 dirmngr/validate.c:1218 +#: sm/certlist.c:134 dirmngr/validate.c:1261 #, c-format msgid "no key usage specified - assuming all usages\n" msgstr "没有指定密钥用途 - 假设为所有用途\n" -#: sm/certlist.c:145 dirmngr/validate.c:1259 +#: sm/certlist.c:155 dirmngr/validate.c:1302 #, c-format msgid "certificate should not have been used for certification\n" msgstr "证书本不应被用于认证\n" -#: sm/certlist.c:158 dirmngr/validate.c:1269 +#: sm/certlist.c:168 dirmngr/validate.c:1312 #, c-format msgid "certificate should not have been used for OCSP response signing\n" msgstr "证书本不应被用于认 OCSP 响应签名\n" -#: sm/certlist.c:174 dirmngr/validate.c:1252 +#: sm/certlist.c:185 dirmngr/validate.c:1295 #, c-format msgid "certificate should not have been used for encryption\n" msgstr "证书本不应被用于加密\n" -#: sm/certlist.c:175 dirmngr/validate.c:1242 +#: sm/certlist.c:187 dirmngr/validate.c:1285 #, c-format msgid "certificate should not have been used for signing\n" msgstr "证书本不应被用于签名\n" -#: sm/certlist.c:176 dirmngr/validate.c:1253 +#: sm/certlist.c:189 dirmngr/validate.c:1296 #, c-format msgid "certificate is not usable for encryption\n" msgstr "证书不可用于加密\n" -#: sm/certlist.c:177 dirmngr/validate.c:1243 +#: sm/certlist.c:190 dirmngr/validate.c:1286 #, c-format msgid "certificate is not usable for signing\n" msgstr "证书不可用于签名\n" -#: sm/certreqgen.c:465 +#: sm/certreqgen.c:469 sm/certreqgen.c:755 #, c-format msgid "line %d: invalid algorithm\n" msgstr "第 %d 行：无效的算法\n" -#: sm/certreqgen.c:481 +#: sm/certreqgen.c:485 #, c-format msgid "line %d: invalid key length %u (valid are %d to %d)\n" msgstr "第 %d 行：无效的密钥长度 %u （有效值为从 %d 到 %d）\n" -#: sm/certreqgen.c:499 +#: sm/certreqgen.c:503 #, c-format msgid "line %d: no subject name given\n" msgstr "第 %d 行：未指定主题名称\n" -#: sm/certreqgen.c:508 +#: sm/certreqgen.c:512 #, c-format msgid "line %d: invalid subject name label '%.*s'\n" msgstr "第 %d 行：无效的主题名称标签‘%.*s’\n" -#: sm/certreqgen.c:511 +#: sm/certreqgen.c:515 #, c-format msgid "line %d: invalid subject name '%s' at pos %d\n" msgstr "第 %d 行：无效的主题名称‘%s’位于 %d\n" -#: sm/certreqgen.c:528 +#: sm/certreqgen.c:532 #, c-format msgid "line %d: not a valid email address\n" msgstr "第 %d 行：不是有效的电子邮件地址\n" -#: sm/certreqgen.c:547 +#: sm/certreqgen.c:551 #, c-format msgid "line %d: invalid serial number\n" msgstr "第 %d 行：无效的序列号\n" -#: sm/certreqgen.c:563 +#: sm/certreqgen.c:567 #, c-format msgid "line %d: invalid issuer name label '%.*s'\n" msgstr "第 %d 行：无效的签发者姓名标签‘%.*s’\n" -#: sm/certreqgen.c:566 +#: sm/certreqgen.c:570 #, c-format msgid "line %d: invalid issuer name '%s' at pos %d\n" msgstr "第 %d 行：无效的签发者名称‘%s’，位于 %d\n" -#: sm/certreqgen.c:578 sm/certreqgen.c:589 +#: sm/certreqgen.c:582 sm/certreqgen.c:593 #, c-format msgid "line %d: invalid date given\n" msgstr "第 %d 行：无效的日期\n" -#: sm/certreqgen.c:602 +#: sm/certreqgen.c:606 #, c-format msgid "line %d: error getting signing key by keygrip '%s': %s\n" msgstr "第 %d 行：通过 keygrip '%s' 获取签名密钥时出现错误：%s\n" -#: sm/certreqgen.c:621 +#: sm/certreqgen.c:625 #, c-format msgid "line %d: invalid hash algorithm given\n" msgstr "第 %d 行：无效的散列算法\n" -#: sm/certreqgen.c:636 +#: sm/certreqgen.c:640 #, c-format msgid "line %d: invalid authority-key-id\n" msgstr "第 %d 行：无效的 authority-key-id\n" -#: sm/certreqgen.c:651 +#: sm/certreqgen.c:655 #, c-format msgid "line %d: invalid subject-key-id\n" msgstr "第 %d 行：无效的 subject-key-id\n" -#: sm/certreqgen.c:689 +#: sm/certreqgen.c:693 #, c-format msgid "line %d: invalid extension syntax\n" msgstr "第 %d 行：无效的扩展语法\n" -#: sm/certreqgen.c:702 +#: sm/certreqgen.c:706 #, c-format msgid "line %d: error reading key '%s' from card: %s\n" msgstr "第 %d 行：读取密钥 '%s' 从以下卡片时出现错误: %s\n" -#: sm/certreqgen.c:715 +#: sm/certreqgen.c:719 #, c-format msgid "line %d: error getting key by keygrip '%s': %s\n" msgstr "第 %d 行：通过 keygrip '%s' 获取密钥时出现错误：%s\n" -#: sm/certreqgen.c:732 +#: sm/certreqgen.c:764 #, c-format msgid "line %d: key generation failed: %s <%s>\n" msgstr "第 %d 行：密钥生成失败：%s <%s>\n" -#: sm/certreqgen.c:1331 +#: sm/certreqgen.c:1480 msgid "" "To complete this certificate request please enter the passphrase for the key " "you just created once more.\n" msgstr "要完成此证书请求，请再次输入您刚才创建的密钥的密码\n" -#: sm/certreqgen-ui.c:159 +#: sm/certreqgen-ui.c:161 #, c-format msgid " (%d) Existing key\n" msgstr " (%d) 现存的密钥\n" -#: sm/certreqgen-ui.c:160 +#: sm/certreqgen-ui.c:162 #, c-format msgid " (%d) Existing key from card\n" msgstr " (%d) 卡片上现存的密钥\n" -#: sm/certreqgen-ui.c:318 +#: sm/certreqgen-ui.c:320 #, c-format msgid "Possible actions for a %s key:\n" msgstr "%s 密钥可能的操作：\n" -#: sm/certreqgen-ui.c:319 +#: sm/certreqgen-ui.c:321 #, c-format msgid " (%d) sign, encrypt\n" msgstr " (%d) 签名，加密\n" -#: sm/certreqgen-ui.c:320 +#: sm/certreqgen-ui.c:322 #, c-format msgid " (%d) sign\n" msgstr " (%d) 签名\n" -#: sm/certreqgen-ui.c:321 +#: sm/certreqgen-ui.c:323 #, c-format msgid " (%d) encrypt\n" msgstr " (%d) 加密\n" -#: sm/certreqgen-ui.c:345 +#: sm/certreqgen-ui.c:347 msgid "Enter the X.509 subject name: " msgstr "输入 X.509 主题名称： " -#: sm/certreqgen-ui.c:349 +#: sm/certreqgen-ui.c:351 msgid "No subject name given\n" msgstr "未指定主题名称\n" -#: sm/certreqgen-ui.c:353 +#: sm/certreqgen-ui.c:355 #, c-format msgid "Invalid subject name label '%.*s'\n" msgstr "无效的主题名称标签‘%.*s’\n" @@ -8702,89 +8744,89 @@ msgstr "无效的主题名称标签‘%.*s’\n" #. adjust it do the length of your translation. The #. second string is merely passed to atoi so you can #. drop everything after the number. -#: sm/certreqgen-ui.c:362 +#: sm/certreqgen-ui.c:364 #, c-format msgid "Invalid subject name '%s'\n" msgstr "无效的主题名称 '%s'\n" -#: sm/certreqgen-ui.c:364 +#: sm/certreqgen-ui.c:366 msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty" msgstr "16 translator: see certreg-ui.c:gpgsm_gencertreq_tty" -#: sm/certreqgen-ui.c:376 +#: sm/certreqgen-ui.c:378 msgid "Enter email addresses" msgstr "输入电子邮件地址" -#: sm/certreqgen-ui.c:377 +#: sm/certreqgen-ui.c:379 msgid " (end with an empty line):\n" msgstr " （以空白行结束）：\n" -#: sm/certreqgen-ui.c:381 +#: sm/certreqgen-ui.c:383 msgid "Enter DNS names" msgstr "输入 DNS 名称" -#: sm/certreqgen-ui.c:382 sm/certreqgen-ui.c:387 +#: sm/certreqgen-ui.c:384 sm/certreqgen-ui.c:389 msgid " (optional; end with an empty line):\n" msgstr " （可选；以空白行结束）：\n" -#: sm/certreqgen-ui.c:386 +#: sm/certreqgen-ui.c:388 msgid "Enter URIs" msgstr "输入 URI" -#: sm/certreqgen-ui.c:393 +#: sm/certreqgen-ui.c:395 msgid "Create self-signed certificate? (y/N) " msgstr "创建自签名证书？ (y/N) " -#: sm/certreqgen-ui.c:420 +#: sm/certreqgen-ui.c:422 msgid "These parameters are used:\n" msgstr "这些参数被使用：\n" -#: sm/certreqgen-ui.c:432 +#: sm/certreqgen-ui.c:434 #, c-format msgid "error creating temporary file: %s\n" msgstr "创建临时文件时出现错误： %s\n" -#: sm/certreqgen-ui.c:438 +#: sm/certreqgen-ui.c:440 msgid "Now creating self-signed certificate. " msgstr "现在正在创建自签名证书。 " -#: sm/certreqgen-ui.c:440 +#: sm/certreqgen-ui.c:442 msgid "Now creating certificate request. " msgstr "已创建证书请求。 " -#: sm/certreqgen-ui.c:441 +#: sm/certreqgen-ui.c:443 msgid "This may take a while ...\n" msgstr "这可能需要等一会儿...\n" -#: sm/certreqgen-ui.c:452 +#: sm/certreqgen-ui.c:454 msgid "Ready.\n" msgstr "就绪。\n" -#: sm/certreqgen-ui.c:455 +#: sm/certreqgen-ui.c:457 msgid "Ready. You should now send this request to your CA.\n" msgstr "就绪。您现在应该将此请求发送给您的 CA。\n" -#: sm/certreqgen-ui.c:461 +#: sm/certreqgen-ui.c:463 #, c-format msgid "resource problem: out of core\n" msgstr "资源问题：内存不足\n" -#: sm/decrypt.c:536 +#: sm/decrypt.c:893 #, c-format msgid "%s.%s encrypted data\n" msgstr "%s.%s 加密过的数据\n" -#: sm/decrypt.c:803 +#: sm/decrypt.c:1165 #, c-format msgid "(this is the RC2 algorithm)\n" msgstr "（此为 RC2 算法）\n" -#: sm/decrypt.c:805 +#: sm/decrypt.c:1167 #, c-format msgid "(this does not seem to be an encrypted message)\n" msgstr "（这看起来不像是一条被加密的消息）\n" -#: sm/decrypt.c:958 +#: sm/decrypt.c:1325 #, c-format msgid "encrypted to %s key %s\n" msgstr "由 %s 密钥 %s 加密\n" @@ -8794,7 +8836,7 @@ msgstr "由 %s 密钥 %s 加密\n" msgid "certificate '%s' not found: %s\n" msgstr "证书‘%s’未找到：%s\n" -#: sm/delete.c:122 sm/keydb.c:1189 sm/keydb.c:1288 +#: sm/delete.c:122 sm/keydb.c:1196 sm/keydb.c:1293 #, c-format msgid "error locking keybox: %s\n" msgstr "锁定钥匙箱时出现错误：%s\n" @@ -8814,128 +8856,128 @@ msgstr "证书‘%s’已被删除\n" msgid "deleting certificate \"%s\" failed: %s\n" msgstr "删除证书 “%s” 时失败：%s\n" -#: sm/encrypt.c:331 +#: sm/encrypt.c:625 #, c-format msgid "no valid recipients given\n" msgstr "未指定有效的接收者\n" -#: sm/gpgsm.c:221 +#: sm/gpgsm.c:224 msgid "list external keys" msgstr "列出外部密钥" -#: sm/gpgsm.c:223 +#: sm/gpgsm.c:226 msgid "list certificate chain" msgstr "列出证书链" -#: sm/gpgsm.c:231 +#: sm/gpgsm.c:234 msgid "import certificates" msgstr "导入证书" -#: sm/gpgsm.c:232 +#: sm/gpgsm.c:235 msgid "export certificates" msgstr "导出证书" -#: sm/gpgsm.c:240 +#: sm/gpgsm.c:243 msgid "register a smartcard" msgstr "注册一张智能卡" -#: sm/gpgsm.c:243 +#: sm/gpgsm.c:246 msgid "pass a command to the dirmngr" msgstr "传递一条命令给 dirmngr" -#: sm/gpgsm.c:245 +#: sm/gpgsm.c:248 msgid "invoke gpg-protect-tool" msgstr "调用 gpg-protect-tool" -#: sm/gpgsm.c:264 +#: sm/gpgsm.c:267 msgid "don't use the terminal at all" msgstr "始终不使用终端" -#: sm/gpgsm.c:290 +#: sm/gpgsm.c:293 msgid "|N|number of certificates to include" msgstr "|N|要包含的证书数目" -#: sm/gpgsm.c:292 +#: sm/gpgsm.c:295 msgid "|FILE|take policy information from FILE" msgstr "|FILE|从 FILE 处获取策略信息" -#: sm/gpgsm.c:307 +#: sm/gpgsm.c:310 msgid "assume input is in PEM format" msgstr "假定输入的是 PEM 格式" -#: sm/gpgsm.c:309 +#: sm/gpgsm.c:312 msgid "assume input is in base-64 format" msgstr "假定输入的是 base-64 格式" -#: sm/gpgsm.c:311 +#: sm/gpgsm.c:314 msgid "assume input is in binary format" msgstr "假定输入的是二进制格式" -#: sm/gpgsm.c:320 +#: sm/gpgsm.c:324 msgid "create base-64 encoded output" msgstr "创建 base-64 编码的输出" -#: sm/gpgsm.c:330 +#: sm/gpgsm.c:334 msgid "|USER-ID|use USER-ID as default secret key" msgstr "|USER-ID|使用 USER-ID 作为默认的私钥" -#: sm/gpgsm.c:341 +#: sm/gpgsm.c:345 msgid "|FILE|add keyring to the list of keyrings" msgstr "|FILE|添加钥匙环到钥匙环列表" -#: sm/gpgsm.c:352 +#: sm/gpgsm.c:356 msgid "fetch missing issuer certificates" msgstr "获取缺失的签发者证书" -#: sm/gpgsm.c:354 +#: sm/gpgsm.c:358 msgid "|NAME|use encoding NAME for PKCS#12 passphrases" msgstr "|NAME|对 PKCS#12 密码使用名为 NAME 的编码" -#: sm/gpgsm.c:372 +#: sm/gpgsm.c:376 msgid "never consult a CRL" msgstr "从不查询 CRL" -#: sm/gpgsm.c:376 +#: sm/gpgsm.c:380 msgid "do not check CRLs for root certificates" msgstr "不对根证书检查 CRLs" -#: sm/gpgsm.c:380 +#: sm/gpgsm.c:384 msgid "check validity using OCSP" msgstr "使用 OCSP 检查有效性" -#: sm/gpgsm.c:382 +#: sm/gpgsm.c:386 msgid "do not check certificate policies" msgstr "不检查证书策略" -#: sm/gpgsm.c:385 +#: sm/gpgsm.c:389 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|使用名称为 NAME 的密文算法" -#: sm/gpgsm.c:387 +#: sm/gpgsm.c:391 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|使用以 NAME 命名的信息摘要算法" -#: sm/gpgsm.c:398 +#: sm/gpgsm.c:403 msgid "batch mode: never ask" msgstr "批处理模式：永不询问" -#: sm/gpgsm.c:400 +#: sm/gpgsm.c:405 msgid "assume yes on most questions" msgstr "在多数问题上假定回答为是" -#: sm/gpgsm.c:401 +#: sm/gpgsm.c:406 msgid "assume no on most questions" msgstr "在多数问题上假定回答为否" -#: sm/gpgsm.c:418 +#: sm/gpgsm.c:423 msgid "|FILE|write an audit log to FILE" msgstr "|FILE|将审计日志写入 FILE" -#: sm/gpgsm.c:603 +#: sm/gpgsm.c:611 msgid "Usage: @GPGSM@ [options] [files] (-h for help)" msgstr "用法：@GPGSM@ [选项] [文件] (-h 获取帮助)" -#: sm/gpgsm.c:606 +#: sm/gpgsm.c:614 msgid "" "Syntax: @GPGSM@ [options] [files]\n" "Sign, check, encrypt or decrypt using the S/MIME protocol\n" @@ -8945,27 +8987,27 @@ msgstr "" "使用 S/MIME 协议以签名、检查、加密或者解密\n" "默认操作取决于输入的数据\n" -#: sm/gpgsm.c:814 +#: sm/gpgsm.c:822 #, c-format msgid "Note: won't be able to encrypt to '%s': %s\n" msgstr "注意：将不加密给‘%s’：%s\n" -#: sm/gpgsm.c:825 +#: sm/gpgsm.c:833 #, c-format msgid "unknown validation model '%s'\n" msgstr "未知的验证模型‘%s’\n" -#: sm/gpgsm.c:1666 +#: sm/gpgsm.c:1692 #, c-format msgid "importing common certificates '%s'\n" msgstr "正在导入通用证书‘%s’\n" -#: sm/gpgsm.c:1709 +#: sm/gpgsm.c:1735 #, c-format msgid "can't sign using '%s': %s\n" msgstr "无法使用‘%s’签名：%s\n" -#: sm/gpgsm.c:2063 +#: sm/gpgsm.c:2095 #, c-format msgid "invalid command (there is no implicit command)\n" msgstr "无效的命令（不存在隐式的命令）\n" @@ -8975,57 +9017,57 @@ msgstr "无效的命令（不存在隐式的命令）\n" msgid "total number processed: %lu\n" msgstr "经处理的总数：%lu\n" -#: sm/import.c:246 +#: sm/import.c:247 #, c-format msgid "error storing certificate\n" msgstr "存储证书时出现错误\n" -#: sm/import.c:254 +#: sm/import.c:255 #, c-format msgid "basic certificate checks failed - not imported\n" msgstr "基本证书检查失败 - 未被导入\n" -#: sm/import.c:472 sm/keydb.c:1209 sm/keydb.c:1300 +#: sm/import.c:473 sm/keydb.c:1214 sm/keydb.c:1305 #, c-format msgid "error getting stored flags: %s\n" msgstr "获取存储选项时出现错误：%s\n" -#: sm/import.c:531 sm/import.c:563 +#: sm/import.c:532 sm/import.c:564 #, c-format msgid "error importing certificate: %s\n" msgstr "导入证书时出现错误：%s\n" -#: sm/import.c:751 tools/gpg-connect-agent.c:1440 +#: sm/import.c:753 tools/gpg-connect-agent.c:1440 #, c-format msgid "error reading input: %s\n" msgstr "读取输入时出现错误：%s\n" -#: sm/keydb.c:1127 +#: sm/keydb.c:1134 #, c-format msgid "problem looking for existing certificate: %s\n" msgstr "查找现存证书时出现问题：%s\n" -#: sm/keydb.c:1139 +#: sm/keydb.c:1146 #, c-format msgid "error finding writable keyDB: %s\n" msgstr "寻找可写入的 keyDB 时出现错误：%s\n" -#: sm/keydb.c:1147 +#: sm/keydb.c:1154 #, c-format msgid "error storing certificate: %s\n" msgstr "存储证书时出现错误：%s\n" -#: sm/keydb.c:1200 +#: sm/keydb.c:1205 #, c-format msgid "problem re-searching certificate: %s\n" msgstr "重新搜索证书时出现问题：%s\n" -#: sm/keydb.c:1221 sm/keydb.c:1311 +#: sm/keydb.c:1226 sm/keydb.c:1316 #, c-format msgid "error storing flags: %s\n" msgstr "存储选项时出现错误：%s\n" -#: sm/keylist.c:711 +#: sm/keylist.c:719 msgid "Error - " msgstr "错误 - " @@ -9060,7 +9102,7 @@ msgstr "" "\n" "%s%s您真的确定您要这样做吗？" -#: sm/qualified.c:215 sm/verify.c:686 +#: sm/qualified.c:215 sm/verify.c:711 #, c-format msgid "" "Note, that this software is not officially approved to create or verify such " @@ -9078,53 +9120,59 @@ msgstr "" "“%s”\n" "注意，此证书将不会创建一个合格签名！" -#: sm/sign.c:465 +#: sm/sign.c:715 #, c-format msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n" msgstr "散列算法 %d (%s) 对于签名者 %d 而言不被支持；使用 %s\n" -#: sm/sign.c:508 +#: sm/sign.c:753 #, c-format msgid "hash algorithm used for signer %d: %s (%s)\n" msgstr "为签名者 %d 使用的散列算法：%s (%s)\n" -#: sm/sign.c:560 +#: sm/sign.c:803 #, c-format msgid "checking for qualified certificate failed: %s\n" msgstr "检查合格证书失败：%s\n" -#: sm/verify.c:463 +#: sm/sign.c:1019 +#, fuzzy, c-format +#| msgid "Signature made %s using %s key ID %s\n" +msgid "%s/%s signature using %s key %s\n" +msgstr "于 %s 创建的签名，使用 %s，密钥号 %s\n" + +#: sm/verify.c:478 #, c-format msgid "Signature made " msgstr "已签名 " -#: sm/verify.c:475 +#: sm/verify.c:490 #, c-format msgid "[date not given]" msgstr "[日期未指定]" -#: sm/verify.c:479 +#: sm/verify.c:494 #, c-format msgid "algorithm:" msgstr "算法：" -#: sm/verify.c:543 +#: sm/verify.c:568 #, c-format msgid "" "invalid signature: message digest attribute does not match computed one\n" msgstr "无效的签名：消息摘要属性与计算得到的不匹配\n" -#: sm/verify.c:664 +#: sm/verify.c:689 #, c-format msgid "Good signature from" msgstr "良好签名来自于" -#: sm/verify.c:665 +#: sm/verify.c:690 #, c-format msgid " aka" msgstr " 亦即" -#: sm/verify.c:683 +#: sm/verify.c:708 #, c-format msgid "This is a qualified signature\n" msgstr "这是一个合格的签名\n" @@ -9237,7 +9285,7 @@ msgstr "通过 S/N 获取证书时出现错误：%s\n" msgid "error fetching certificate by subject: %s\n" msgstr "通过主题获取证书时出现错误：%s\n" -#: dirmngr/certcache.c:1754 dirmngr/validate.c:483 +#: dirmngr/certcache.c:1754 dirmngr/validate.c:484 #, c-format msgid "no issuer found in certificate\n" msgstr "没有找到证书的签发者\n" @@ -9277,7 +9325,7 @@ msgstr "正在移除缓存文件‘%s’\n" msgid "not removing file '%s'\n" msgstr "未能移除文件‘%s’\n" -#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2380 +#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2453 #, c-format msgid "error closing cache file: %s\n" msgstr "关闭缓存文件时出现错误：%s\n" @@ -9513,219 +9561,219 @@ msgstr "S/N %s 有效，其未被列入 CRL\n" msgid "error getting data from cache file: %s\n" msgstr "从缓存文件中获取数据时出现错误：%s\n" -#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1672 dirmngr/crlcache.c:1697 -#: dirmngr/crlcache.c:1763 +#: dirmngr/crlcache.c:1601 dirmngr/crlcache.c:1686 dirmngr/crlcache.c:1711 +#: dirmngr/crlcache.c:1777 #, c-format msgid "got an invalid S-expression from libksba\n" msgstr "从 libksba 获得了无效的 S 表达式\n" -#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1679 dirmngr/crlcache.c:1705 -#: dirmngr/crlcache.c:1770 dirmngr/misc.c:176 +#: dirmngr/crlcache.c:1608 dirmngr/crlcache.c:1693 dirmngr/crlcache.c:1719 +#: dirmngr/crlcache.c:1784 dirmngr/misc.c:176 #, c-format msgid "converting S-expression failed: %s\n" msgstr "转换 S 表达式时失败：%s\n" -#: dirmngr/crlcache.c:1630 dirmngr/validate.c:964 +#: dirmngr/crlcache.c:1643 dirmngr/validate.c:976 #, c-format msgid "unknown hash algorithm '%s'\n" msgstr "未知的散列算法‘%s’\n" -#: dirmngr/crlcache.c:1637 +#: dirmngr/crlcache.c:1650 #, c-format msgid "gcry_md_open for algorithm %d failed: %s\n" msgstr "算法 %d 的 gcry_md_open 方法失败：%s\n" -#: dirmngr/crlcache.c:1797 dirmngr/ocsp.c:478 +#: dirmngr/crlcache.c:1859 dirmngr/ocsp.c:500 #, c-format msgid "creating S-expression failed: %s\n" msgstr "创建 S 表达式时失败：%s\n" -#: dirmngr/crlcache.c:1871 +#: dirmngr/crlcache.c:1933 #, c-format msgid "ksba_crl_parse failed: %s\n" msgstr "ksba_crl_parse 方法失败：%s\n" -#: dirmngr/crlcache.c:1886 +#: dirmngr/crlcache.c:1948 #, c-format msgid "error getting update times of CRL: %s\n" msgstr "从 CRL 获取更新次数时出现错误：%s\n" -#: dirmngr/crlcache.c:1893 +#: dirmngr/crlcache.c:1955 #, c-format msgid "update times of this CRL: this=%s next=%s\n" msgstr "此 CRL 的更新时间：本次=%s 下次=%s\n" -#: dirmngr/crlcache.c:1897 +#: dirmngr/crlcache.c:1959 #, c-format msgid "nextUpdate not given; assuming a validity period of one day\n" msgstr "nextUpdate 参数未被指定；假设有效期为一天\n" -#: dirmngr/crlcache.c:1917 +#: dirmngr/crlcache.c:1979 #, c-format msgid "error getting CRL item: %s\n" msgstr "获取 CRL 项目时出现错误：%s\n" -#: dirmngr/crlcache.c:1932 +#: dirmngr/crlcache.c:1994 #, c-format msgid "error inserting item into temporary cache file: %s\n" msgstr "向临时缓存文件中插入项目时出现错误：%s\n" -#: dirmngr/crlcache.c:1959 +#: dirmngr/crlcache.c:2021 #, c-format msgid "no CRL issuer found in CRL: %s\n" msgstr "没有在 CRL 中找到 CRL 签发者： %s\n" -#: dirmngr/crlcache.c:1974 +#: dirmngr/crlcache.c:2036 #, c-format msgid "locating CRL issuer certificate by authorityKeyIdentifier\n" msgstr "正在通过 authorityKeyIdentifier 定位 CRL 签发者\n" -#: dirmngr/crlcache.c:2020 +#: dirmngr/crlcache.c:2082 #, c-format msgid "CRL signature verification failed: %s\n" msgstr "CRL 签名验证失败：%s\n" -#: dirmngr/crlcache.c:2032 +#: dirmngr/crlcache.c:2095 #, c-format msgid "error checking validity of CRL issuer certificate: %s\n" msgstr "检查 CRL 签署者证书的有效性时出现错误：%s\n" -#: dirmngr/crlcache.c:2174 +#: dirmngr/crlcache.c:2237 #, c-format msgid "ksba_crl_new failed: %s\n" msgstr "ksba_crl_new 方法失败：%s\n" -#: dirmngr/crlcache.c:2181 +#: dirmngr/crlcache.c:2244 #, c-format msgid "ksba_crl_set_reader failed: %s\n" msgstr "ksba_crl_set_reader 方法失败：%s\n" -#: dirmngr/crlcache.c:2215 +#: dirmngr/crlcache.c:2278 #, c-format msgid "removed stale temporary cache file '%s'\n" msgstr "移除过期的缓存文件‘%s’\n" -#: dirmngr/crlcache.c:2219 +#: dirmngr/crlcache.c:2282 #, c-format msgid "problem removing stale temporary cache file '%s': %s\n" msgstr "移除过期的缓存文件‘%s’时出现问题：%s\n" -#: dirmngr/crlcache.c:2229 +#: dirmngr/crlcache.c:2292 #, c-format msgid "error creating temporary cache file '%s': %s\n" msgstr "创建临时缓存文件‘%s’时出现错误：%s\n" -#: dirmngr/crlcache.c:2239 +#: dirmngr/crlcache.c:2302 #, c-format msgid "crl_parse_insert failed: %s\n" msgstr "crl_parse_insert 方法失败：%s\n" -#: dirmngr/crlcache.c:2249 +#: dirmngr/crlcache.c:2312 #, c-format msgid "error finishing temporary cache file '%s': %s\n" msgstr "完成临时缓存文件时出现错误‘%s’：%s\n" -#: dirmngr/crlcache.c:2256 +#: dirmngr/crlcache.c:2319 #, c-format msgid "error closing temporary cache file '%s': %s\n" msgstr "关闭临时缓存文件时出现错误‘%s’：%s\n" -#: dirmngr/crlcache.c:2281 +#: dirmngr/crlcache.c:2344 #, c-format msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n" msgstr "警告：新的 CRL 仍然太旧；其已在 %s 过期 - 无论如何先加载\n" -#: dirmngr/crlcache.c:2285 +#: dirmngr/crlcache.c:2348 #, c-format msgid "new CRL still too old; it expired on %s\n" msgstr "新的 CRL 仍然太旧；其已在 %s 过期\n" -#: dirmngr/crlcache.c:2301 +#: dirmngr/crlcache.c:2373 #, c-format msgid "unknown critical CRL extension %s\n" msgstr "未知的紧急 CRL 扩展 %s\n" -#: dirmngr/crlcache.c:2311 +#: dirmngr/crlcache.c:2384 #, c-format msgid "error reading CRL extensions: %s\n" msgstr "读取 CRL 扩展时出现错误：%s\n" -#: dirmngr/crlcache.c:2362 +#: dirmngr/crlcache.c:2435 #, c-format msgid "creating cache file '%s'\n" msgstr "正在创建缓存文件‘%s’\n" -#: dirmngr/crlcache.c:2394 +#: dirmngr/crlcache.c:2467 #, c-format msgid "problem renaming '%s' to '%s': %s\n" msgstr "将‘%s’重命名为‘%s’时出现问题：%s\n" -#: dirmngr/crlcache.c:2408 +#: dirmngr/crlcache.c:2481 #, c-format msgid "" "updating the DIR file failed - cache entry will get lost with the next " "program start\n" msgstr "更新 DIR 文件时失败 - 缓存条目将会在下次程序启动时丢失\n" -#: dirmngr/crlcache.c:2445 +#: dirmngr/crlcache.c:2518 #, c-format msgid "Begin CRL dump (retrieved via %s)\n" msgstr "开始 CRL 导出（已通过 %s 取回）\n" -#: dirmngr/crlcache.c:2468 +#: dirmngr/crlcache.c:2541 msgid "" " ERROR: The CRL will not be used because it was still too old after an " "update!\n" msgstr " 错误：此 CRL 将不会被使用，因为它在一次更新之后仍然太旧！\n" -#: dirmngr/crlcache.c:2471 +#: dirmngr/crlcache.c:2544 msgid "" " ERROR: The CRL will not be used due to an unknown critical extension!\n" msgstr " 错误：此 CRL 将不会被使用，因为一个未知的紧急扩展！\n" -#: dirmngr/crlcache.c:2474 +#: dirmngr/crlcache.c:2547 msgid " ERROR: The CRL will not be used\n" msgstr " 错误：此 CRL 将不会被使用\n" -#: dirmngr/crlcache.c:2481 +#: dirmngr/crlcache.c:2554 msgid " ERROR: This cached CRL may have been tampered with!\n" msgstr " 错误：此缓存的 CRL 可能已经被篡改！\n" -#: dirmngr/crlcache.c:2499 +#: dirmngr/crlcache.c:2572 #, c-format msgid " WARNING: invalid cache record length\n" msgstr " 警告： 无效的缓存记录长度\n" -#: dirmngr/crlcache.c:2506 +#: dirmngr/crlcache.c:2579 #, c-format msgid "problem reading cache record: %s\n" msgstr "读取缓存记录时出现问题：%s\n" -#: dirmngr/crlcache.c:2517 +#: dirmngr/crlcache.c:2590 #, c-format msgid "problem reading cache key: %s\n" msgstr "读取缓存的密钥时出现问题：%s\n" -#: dirmngr/crlcache.c:2548 +#: dirmngr/crlcache.c:2621 #, c-format msgid "error reading cache entry from db: %s\n" msgstr "从数据库读取缓存项目时出现错误：%s\n" -#: dirmngr/crlcache.c:2551 +#: dirmngr/crlcache.c:2624 msgid "End CRL dump\n" msgstr "结束 CRL 导出\n" -#: dirmngr/crlcache.c:2671 +#: dirmngr/crlcache.c:2744 #, c-format msgid "crl_fetch via DP failed: %s\n" msgstr "通过 DP 的 crl_fetch 方法失败：%s\n" -#: dirmngr/crlcache.c:2682 +#: dirmngr/crlcache.c:2755 #, c-format msgid "crl_cache_insert via DP failed: %s\n" msgstr "通过 DP 进行 crl_cache_insert 失败：%s\n" -#: dirmngr/crlcache.c:2728 +#: dirmngr/crlcache.c:2801 #, c-format msgid "crl_cache_insert via issuer failed: %s\n" msgstr "通过发布者进行 crl_cache_insert 失败：%s\n" @@ -9902,135 +9950,135 @@ msgstr "需要绝对文件名\n" msgid "looking up '%s'\n" msgstr "正在查找‘%s’\n" -#: dirmngr/dirmngr.c:178 +#: dirmngr/dirmngr.c:180 msgid "list the contents of the CRL cache" msgstr "列出 CRL 缓存的内容" -#: dirmngr/dirmngr.c:179 +#: dirmngr/dirmngr.c:181 msgid "|FILE|load CRL from FILE into cache" msgstr "|FILE|从 FILE 中加载 CRL 到缓存" -#: dirmngr/dirmngr.c:180 +#: dirmngr/dirmngr.c:182 msgid "|URL|fetch a CRL from URL" msgstr "|URL|从 URL 处获取 CRL" -#: dirmngr/dirmngr.c:181 +#: dirmngr/dirmngr.c:183 msgid "shutdown the dirmngr" msgstr "关闭 dirmngr" -#: dirmngr/dirmngr.c:182 +#: dirmngr/dirmngr.c:184 msgid "flush the cache" msgstr "刷新缓存" -#: dirmngr/dirmngr.c:216 +#: dirmngr/dirmngr.c:218 msgid "allow online software version check" msgstr "允许在线软件版本检查" -#: dirmngr/dirmngr.c:219 +#: dirmngr/dirmngr.c:221 msgid "|N|do not return more than N items in one query" msgstr "|N|在一次查询中最多返回 N 个项目" -#: dirmngr/dirmngr.c:226 +#: dirmngr/dirmngr.c:229 msgid "Network related options" msgstr "网络相关选项" -#: dirmngr/dirmngr.c:228 +#: dirmngr/dirmngr.c:231 msgid "route all network traffic via Tor" msgstr "通过 Tor 转发所有网络流量" -#: dirmngr/dirmngr.c:240 +#: dirmngr/dirmngr.c:243 msgid "Configuration for Keyservers" msgstr "公钥服务器的配置" -#: dirmngr/dirmngr.c:243 +#: dirmngr/dirmngr.c:246 msgid "|URL|use keyserver at URL" msgstr "|URL|使用 URL 处的密钥服务器" -#: dirmngr/dirmngr.c:245 +#: dirmngr/dirmngr.c:248 msgid "|FILE|use the CA certificates in FILE for HKP over TLS" msgstr "|FILE|为承载 HKP 的 TLS 使用 FILE 中的 CA 证书" -#: dirmngr/dirmngr.c:248 +#: dirmngr/dirmngr.c:251 msgid "Configuration for HTTP servers" msgstr "对 HTTP 服务器的配置" -#: dirmngr/dirmngr.c:250 +#: dirmngr/dirmngr.c:253 msgid "inhibit the use of HTTP" msgstr "禁止使用 HTTP 协议" -#: dirmngr/dirmngr.c:252 +#: dirmngr/dirmngr.c:255 msgid "ignore HTTP CRL distribution points" msgstr "忽略 HTTP CRL 分发点" -#: dirmngr/dirmngr.c:254 +#: dirmngr/dirmngr.c:257 msgid "|URL|redirect all HTTP requests to URL" msgstr "|URL|重定向 HTTP 请求到 URL" -#: dirmngr/dirmngr.c:256 +#: dirmngr/dirmngr.c:259 msgid "use system's HTTP proxy setting" msgstr "使用系统的 HTTP 代理设置" -#: dirmngr/dirmngr.c:260 +#: dirmngr/dirmngr.c:263 msgid "Configuration of LDAP servers to use" msgstr "对要使用的 LDAP 服务器的配置" -#: dirmngr/dirmngr.c:262 +#: dirmngr/dirmngr.c:265 msgid "inhibit the use of LDAP" msgstr "抑制 LDAP 的使用" -#: dirmngr/dirmngr.c:264 +#: dirmngr/dirmngr.c:267 msgid "ignore LDAP CRL distribution points" msgstr "忽略 LDAP CRL 分发点" -#: dirmngr/dirmngr.c:266 +#: dirmngr/dirmngr.c:269 msgid "|HOST|use HOST for LDAP queries" msgstr "|HOST|使用 HOST 进行 LDAP 查询" -#: dirmngr/dirmngr.c:268 +#: dirmngr/dirmngr.c:271 msgid "do not use fallback hosts with --ldap-proxy" msgstr "使用 --ldap-proxy 选项以不使用回退主机" -#: dirmngr/dirmngr.c:270 +#: dirmngr/dirmngr.c:273 msgid "|SPEC|use this keyserver to lookup keys" msgstr "|SPEC|使用此公钥服务器来查找密钥" -#: dirmngr/dirmngr.c:272 +#: dirmngr/dirmngr.c:275 msgid "|FILE|read LDAP server list from FILE" msgstr "|FILE|从 FILE 中读取 LDAP 服务器列表" -#: dirmngr/dirmngr.c:274 +#: dirmngr/dirmngr.c:277 msgid "add new servers discovered in CRL distribution points to serverlist" msgstr "添加从 CRL 分发点发现的新服务器到服务器列表" -#: dirmngr/dirmngr.c:277 +#: dirmngr/dirmngr.c:280 msgid "|N|set LDAP timeout to N seconds" msgstr "|N|设置 LDAP 超时时间为 N 秒" -#: dirmngr/dirmngr.c:280 +#: dirmngr/dirmngr.c:283 msgid "Configuration for OCSP" msgstr "对于 OCSP 的配置" -#: dirmngr/dirmngr.c:282 +#: dirmngr/dirmngr.c:285 msgid "allow sending OCSP requests" msgstr "允许发送 OCSP 请求" -#: dirmngr/dirmngr.c:284 +#: dirmngr/dirmngr.c:287 msgid "ignore certificate contained OCSP service URLs" msgstr "忽略证书包含的 OCSP 服务 URLs" -#: dirmngr/dirmngr.c:286 +#: dirmngr/dirmngr.c:289 msgid "|URL|use OCSP responder at URL" msgstr "|URL|使用 URL 处的 OCSP 响应者" -#: dirmngr/dirmngr.c:288 +#: dirmngr/dirmngr.c:291 msgid "|FPR|OCSP response signed by FPR" msgstr "|FPR|OCSP 响应由 FPR 签名" -#: dirmngr/dirmngr.c:296 +#: dirmngr/dirmngr.c:299 msgid "force loading of outdated CRLs" msgstr "强制载入过期的 CRLs" -#: dirmngr/dirmngr.c:308 +#: dirmngr/dirmngr.c:312 msgid "" "@\n" "(See the \"info\" manual for a complete listing of all commands and " @@ -10039,11 +10087,11 @@ msgstr "" "@\n" "(参阅 \"info\" 手册以获取一份所有命令及选项的完整列表)\n" -#: dirmngr/dirmngr.c:461 +#: dirmngr/dirmngr.c:472 msgid "Usage: @DIRMNGR@ [options] (-h for help)" msgstr "用法：@DIRMNGR@ [选项] (-h 获取帮助)" -#: dirmngr/dirmngr.c:463 +#: dirmngr/dirmngr.c:474 msgid "" "Syntax: @DIRMNGR@ [options] [command [args]]\n" "Keyserver, CRL, and OCSP access for @GNUPG@\n" @@ -10051,103 +10099,103 @@ msgstr "" "语法：@DIRMNGR@ [选项] [命令 [参数]]\n" "@GNUPG@ 的公钥服务器、CRL 和 OCSP 访问\n" -#: dirmngr/dirmngr.c:543 +#: dirmngr/dirmngr.c:554 #, c-format msgid "valid debug levels are: %s\n" msgstr "有效的调试等级为：%s\n" -#: dirmngr/dirmngr.c:638 tools/gpgconf.c:706 tools/gpgconf.c:741 -#: tools/gpgconf.c:839 +#: dirmngr/dirmngr.c:649 tools/gpgconf.c:738 tools/gpgconf.c:773 +#: tools/gpgconf.c:871 #, c-format msgid "usage: %s [options] " msgstr "用法：%s [选项] " -#: dirmngr/dirmngr.c:1337 +#: dirmngr/dirmngr.c:1374 #, c-format msgid "colons are not allowed in the socket name\n" msgstr "套接字名称中不允许使用冒号\n" -#: dirmngr/dirmngr.c:1573 dirmngr/server.c:1885 +#: dirmngr/dirmngr.c:1610 dirmngr/server.c:1892 #, c-format msgid "fetching CRL from '%s' failed: %s\n" msgstr "从‘%s’处获取 CRL 时失败：%s\n" -#: dirmngr/dirmngr.c:1579 dirmngr/server.c:1891 +#: dirmngr/dirmngr.c:1616 dirmngr/server.c:1898 #, c-format msgid "processing CRL from '%s' failed: %s\n" msgstr "从‘%s’处处理 CRL 时失败：%s\n" -#: dirmngr/dirmngr.c:1725 +#: dirmngr/dirmngr.c:1764 #, c-format msgid "%s:%u: line too long - skipped\n" msgstr "%s:%u: 行太长 - 跳过\n" -#: dirmngr/dirmngr.c:1785 dirmngr/dirmngr.c:1874 +#: dirmngr/dirmngr.c:1824 dirmngr/dirmngr.c:1913 #, c-format msgid "%s:%u: invalid fingerprint detected\n" msgstr "%s:%u: 检测到无效指纹\n" -#: dirmngr/dirmngr.c:1826 dirmngr/dirmngr.c:1852 tools/gpgconf-comp.c:3427 +#: dirmngr/dirmngr.c:1865 dirmngr/dirmngr.c:1891 tools/gpgconf-comp.c:3427 #, c-format msgid "%s:%u: read error: %s\n" msgstr "%s:%u: 读取错误：%s\n" -#: dirmngr/dirmngr.c:1887 +#: dirmngr/dirmngr.c:1926 #, c-format msgid "%s:%u: garbage at end of line ignored\n" msgstr "%s:%u: 已忽略行尾部的垃圾数据\n" -#: dirmngr/dirmngr.c:1956 +#: dirmngr/dirmngr.c:1995 #, c-format msgid "SIGHUP received - re-reading configuration and flushing caches\n" msgstr "接收到 SIGHUP 信号 -正在重新读取配置文件并刷新缓存\n" -#: dirmngr/dirmngr.c:1996 +#: dirmngr/dirmngr.c:2036 #, c-format msgid "SIGUSR2 received - no action defined\n" msgstr "接收到 SIGUSR2 信号 - 未定义要进行的操作\n" -#: dirmngr/dirmngr.c:2001 +#: dirmngr/dirmngr.c:2041 #, c-format msgid "SIGTERM received - shutting down ...\n" msgstr "接收到 SIGTERM 信号 - 正在关闭...\n" -#: dirmngr/dirmngr.c:2003 +#: dirmngr/dirmngr.c:2043 #, c-format msgid "SIGTERM received - still %d active connections\n" msgstr "接收到 SIGTERM 信号 - 仍然有 %d 个活动的连接\n" -#: dirmngr/dirmngr.c:2008 +#: dirmngr/dirmngr.c:2048 #, c-format msgid "shutdown forced\n" msgstr "强制关闭\n" -#: dirmngr/dirmngr.c:2016 +#: dirmngr/dirmngr.c:2056 #, c-format msgid "SIGINT received - immediate shutdown\n" msgstr "收到 SIGINT 信号 - 立即关闭\n" -#: dirmngr/dirmngr.c:2023 +#: dirmngr/dirmngr.c:2063 #, c-format msgid "signal %d received - no action defined\n" msgstr "收到 %d 信号 - 未定义要进行的操作\n" -#: dirmngr/http.c:1996 dirmngr/ocsp.c:255 +#: dirmngr/http.c:2680 dirmngr/ocsp.c:255 #, c-format msgid "error accessing '%s': http status %u\n" msgstr "访问‘%s’时出现错误：http 状态码 %u\n" -#: dirmngr/http.c:3647 dirmngr/ocsp.c:229 +#: dirmngr/http.c:4408 dirmngr/ocsp.c:229 #, c-format msgid "URL '%s' redirected to '%s' (%u)\n" msgstr "URL '%s' 重定向到 '%s' (%u)\n" -#: dirmngr/http.c:3653 dirmngr/ocsp.c:246 +#: dirmngr/http.c:4414 dirmngr/ocsp.c:246 #, c-format msgid "too many redirections\n" msgstr "过多重定向\n" -#: dirmngr/http.c:3765 +#: dirmngr/http.c:4526 #, c-format msgid "redirection changed to '%s'\n" msgstr "重定向更改到 “%s”\n" @@ -10317,204 +10365,204 @@ msgstr "计算‘%s’的 OCSP 请求的散列时失败：%s\n" msgid "not signed by a default OCSP signer's certificate" msgstr "并非由一个默认的 OCSP 签名者的证书签名" -#: dirmngr/ocsp.c:524 +#: dirmngr/ocsp.c:582 #, c-format msgid "allocating list item failed: %s\n" msgstr "分配列表项时失败：%s\n" -#: dirmngr/ocsp.c:540 dirmngr/ocsp.c:727 +#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782 #, c-format msgid "error getting responder ID: %s\n" msgstr "获取响应者 ID 时出现错误：%s\n" -#: dirmngr/ocsp.c:587 +#: dirmngr/ocsp.c:642 #, c-format msgid "no suitable certificate found to verify the OCSP response\n" msgstr "未找到合适的证书来验证 OCSP 请求\n" -#: dirmngr/ocsp.c:626 dirmngr/validate.c:648 +#: dirmngr/ocsp.c:681 dirmngr/validate.c:649 #, c-format msgid "issuer certificate not found: %s\n" msgstr "未找到签发者证书：%s\n" -#: dirmngr/ocsp.c:636 +#: dirmngr/ocsp.c:691 #, c-format msgid "caller did not return the target certificate\n" msgstr "调用者没有返回目标证书\n" -#: dirmngr/ocsp.c:643 +#: dirmngr/ocsp.c:698 #, c-format msgid "caller did not return the issuing certificate\n" msgstr "调用者没有返回签发的证书\n" -#: dirmngr/ocsp.c:653 +#: dirmngr/ocsp.c:708 #, c-format msgid "failed to allocate OCSP context: %s\n" msgstr "分配 OCSP 上下文时失败：%s\n" -#: dirmngr/ocsp.c:692 +#: dirmngr/ocsp.c:747 #, c-format msgid "no default OCSP responder defined\n" msgstr "未定义默认的 OCSP 响应者\n" -#: dirmngr/ocsp.c:698 +#: dirmngr/ocsp.c:753 #, c-format msgid "no default OCSP signer defined\n" msgstr "未定义默认的 OCSP 签名者\n" -#: dirmngr/ocsp.c:705 +#: dirmngr/ocsp.c:760 #, c-format msgid "using default OCSP responder '%s'\n" msgstr "正在使用默认的 OCSP 响应者‘%s’\n" -#: dirmngr/ocsp.c:710 +#: dirmngr/ocsp.c:765 #, c-format msgid "using OCSP responder '%s'\n" msgstr "正在使用 OCSP 响应者‘%s’\n" -#: dirmngr/ocsp.c:767 +#: dirmngr/ocsp.c:822 #, c-format msgid "error getting OCSP status for target certificate: %s\n" msgstr "获取目标证书的 OCSP 状态时出现错误：%s\n" -#: dirmngr/ocsp.c:792 +#: dirmngr/ocsp.c:847 #, c-format msgid "certificate status is: %s (this=%s next=%s)\n" msgstr "证书状态：%s (当前=%s 下一个=%s)\n" -#: dirmngr/ocsp.c:793 +#: dirmngr/ocsp.c:848 msgid "good" msgstr "良好" -#: dirmngr/ocsp.c:799 +#: dirmngr/ocsp.c:854 #, c-format msgid "certificate has been revoked at: %s due to: %s\n" msgstr "证书已经被吊销于： %s 原因是： %s\n" -#: dirmngr/ocsp.c:834 +#: dirmngr/ocsp.c:889 #, c-format msgid "OCSP responder returned a status in the future\n" msgstr "OCSP 响应者返回了将来的状态\n" -#: dirmngr/ocsp.c:846 +#: dirmngr/ocsp.c:901 #, c-format msgid "OCSP responder returned a non-current status\n" msgstr "OCSP 响应者返回了一个非当前的状态\n" -#: dirmngr/ocsp.c:861 +#: dirmngr/ocsp.c:916 #, c-format msgid "OCSP responder returned an too old status\n" msgstr "OCSP 返回了一个太以前的状态\n" -#: dirmngr/server.c:394 dirmngr/server.c:503 dirmngr/server.c:549 +#: dirmngr/server.c:401 dirmngr/server.c:510 dirmngr/server.c:556 #, c-format msgid "assuan_inquire(%s) failed: %s\n" msgstr "assuan_inquire(%s) 方法失败：%s\n" -#: dirmngr/server.c:1284 +#: dirmngr/server.c:1291 msgid "serialno missing in cert ID" msgstr "证书 ID 中的序列号缺失" -#: dirmngr/server.c:1447 dirmngr/server.c:1533 dirmngr/server.c:1970 -#: dirmngr/server.c:2041 dirmngr/server.c:2716 dirmngr/server.c:2731 +#: dirmngr/server.c:1454 dirmngr/server.c:1540 dirmngr/server.c:1977 +#: dirmngr/server.c:2048 dirmngr/server.c:2675 dirmngr/server.c:2690 #, c-format msgid "assuan_inquire failed: %s\n" msgstr "assuan_inquire 方法失败：%s\n" -#: dirmngr/server.c:1576 +#: dirmngr/server.c:1583 #, c-format msgid "fetch_cert_by_url failed: %s\n" msgstr "fetch_cert_by_url 方法失败：%s\n" -#: dirmngr/server.c:1588 dirmngr/server.c:1619 dirmngr/server.c:1779 +#: dirmngr/server.c:1595 dirmngr/server.c:1626 dirmngr/server.c:1786 #, c-format msgid "error sending data: %s\n" msgstr "发送数据时出现错误：%s\n" -#: dirmngr/server.c:1727 +#: dirmngr/server.c:1734 #, c-format msgid "start_cert_fetch failed: %s\n" msgstr "start_cert_fetch 方法失败：%s\n" -#: dirmngr/server.c:1760 +#: dirmngr/server.c:1767 #, c-format msgid "fetch_next_cert failed: %s\n" msgstr "fetch_next_cert 方法失败：%s\n" -#: dirmngr/server.c:1787 +#: dirmngr/server.c:1794 #, c-format msgid "max_replies %d exceeded\n" msgstr "超过设置的 max_replies %d\n" -#: dirmngr/server.c:3020 +#: dirmngr/server.c:3115 #, c-format msgid "can't allocate control structure: %s\n" msgstr "无法分配控制结构：%s\n" -#: dirmngr/server.c:3031 +#: dirmngr/server.c:3126 #, c-format msgid "failed to allocate assuan context: %s\n" msgstr "分配 assuan 上下文时失败：%s\n" -#: dirmngr/server.c:3052 +#: dirmngr/server.c:3147 #, c-format msgid "failed to initialize the server: %s\n" msgstr "初始化服务器时失败：%s\n" -#: dirmngr/server.c:3060 +#: dirmngr/server.c:3155 #, c-format msgid "failed to the register commands with Assuan: %s\n" msgstr "向 Assuan 注册命令时失败：%s\n" -#: dirmngr/server.c:3093 +#: dirmngr/server.c:3188 #, c-format msgid "Assuan accept problem: %s\n" msgstr "Assuan 接受出现问题：%s\n" -#: dirmngr/server.c:3112 +#: dirmngr/server.c:3207 #, c-format msgid "Assuan processing failed: %s\n" msgstr "Assuan 处理时失败：%s\n" -#: dirmngr/validate.c:238 +#: dirmngr/validate.c:239 #, c-format msgid "accepting root CA not marked as a CA" msgstr "正在接受的根 CA 没有被标记为一个 CA" -#: dirmngr/validate.c:264 +#: dirmngr/validate.c:265 #, c-format msgid "CRL checking too deeply nested\n" msgstr "CRL 检查时出现过深层的嵌套\n" -#: dirmngr/validate.c:282 +#: dirmngr/validate.c:283 msgid "not checking CRL for" msgstr "未检查 CRL ，对于" -#: dirmngr/validate.c:287 +#: dirmngr/validate.c:288 msgid "checking CRL for" msgstr "正在检查 CRL，对于" -#: dirmngr/validate.c:556 +#: dirmngr/validate.c:557 #, c-format msgid "selfsigned certificate has a BAD signature" msgstr "自签名证书具有损坏的签名" -#: dirmngr/validate.c:590 +#: dirmngr/validate.c:591 #, c-format msgid "checking trustworthiness of root certificate failed: %s\n" msgstr "检查根证书的信任度时失败：%s\n" -#: dirmngr/validate.c:769 +#: dirmngr/validate.c:770 #, c-format msgid "certificate chain is good\n" msgstr "证书链良好\n" -#: dirmngr/validate.c:1276 +#: dirmngr/validate.c:1319 #, c-format msgid "certificate should not have been used for CRL signing\n" msgstr "证书本不应被用于 CRL 签名\n" -#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:111 +#: tools/gpg-connect-agent.c:79 tools/gpgconf.c:112 msgid "quiet" msgstr "静默" @@ -10676,63 +10724,63 @@ msgstr "检查所有程序" msgid "|COMPONENT|list options" msgstr "|COMPONENT|列出选项" -#: tools/gpgconf.c:85 +#: tools/gpgconf.c:86 msgid "|COMPONENT|change options" msgstr "|COMPONENT|变更选项" -#: tools/gpgconf.c:86 +#: tools/gpgconf.c:87 msgid "|COMPONENT|check options" msgstr "|COMPONENT|检查选项" -#: tools/gpgconf.c:88 +#: tools/gpgconf.c:89 msgid "apply global default values" msgstr "应用全局默认值" -#: tools/gpgconf.c:90 +#: tools/gpgconf.c:91 msgid "|FILE|update configuration files using FILE" msgstr "|FILE|使用 FILE 更新配置文件" -#: tools/gpgconf.c:92 +#: tools/gpgconf.c:93 msgid "get the configuration directories for @GPGCONF@" msgstr "为 @GPGCONF@ 获取配置目录" -#: tools/gpgconf.c:94 +#: tools/gpgconf.c:95 msgid "list global configuration file" msgstr "列出全局配置文件" -#: tools/gpgconf.c:96 +#: tools/gpgconf.c:97 msgid "check global configuration file" msgstr "检查全局配置文件" -#: tools/gpgconf.c:98 +#: tools/gpgconf.c:99 msgid "query the software version database" msgstr "查询软件版本数据库" -#: tools/gpgconf.c:99 +#: tools/gpgconf.c:100 msgid "reload all or a given component" msgstr "重新载入全部或者给定的组件" -#: tools/gpgconf.c:100 +#: tools/gpgconf.c:101 msgid "launch a given component" msgstr "启动一个给定的组件" -#: tools/gpgconf.c:101 +#: tools/gpgconf.c:102 msgid "kill a given component" msgstr "关闭一个给定的组件" -#: tools/gpgconf.c:109 +#: tools/gpgconf.c:110 msgid "use as output file" msgstr "指定输出文件" -#: tools/gpgconf.c:113 +#: tools/gpgconf.c:115 msgid "activate changes at runtime, if possible" msgstr "若可能，在运行时激活变更" -#: tools/gpgconf.c:157 +#: tools/gpgconf.c:161 msgid "Usage: @GPGCONF@ [options] (-h for help)" msgstr "用法：@GPGCONF@ [选项] (-h 获取帮助)" -#: tools/gpgconf.c:160 +#: tools/gpgconf.c:164 msgid "" "Syntax: @GPGCONF@ [options]\n" "Manage configuration options for tools of the @GNUPG@ system\n" @@ -10740,15 +10788,15 @@ msgstr "" "语法 @GPGCONF@ [选项]\n" "管理 @GNUPG@ 系统的工具的配置选项 \n" -#: tools/gpgconf.c:708 tools/gpgconf.c:743 +#: tools/gpgconf.c:740 tools/gpgconf.c:775 msgid "Need one component argument" msgstr "需要一个组件参数" -#: tools/gpgconf.c:717 tools/gpgconf.c:767 tools/gpgconf.c:815 +#: tools/gpgconf.c:749 tools/gpgconf.c:799 tools/gpgconf.c:847 msgid "Component not found" msgstr "组件未找到" -#: tools/gpgconf.c:841 +#: tools/gpgconf.c:873 msgid "No argument allowed" msgstr "没有参数被允许" @@ -10764,6 +10812,13 @@ msgstr "" "语法：gpg-check-pattern [选项] patternfile\n" "按照 patternfile 检查一个由标准输入（stdin）给定的密码\n" +#, c-format +#~ msgid "continuing verification anyway due to option %s\n" +#~ msgstr "由于 %s 选项，验证仍在继续中\n" + +#~ msgid "%s/%s encrypted for: \"%s\"\n" +#~ msgstr "%s/%s 已经加密给：“%s”\n" + #~ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" #~ msgstr "强行对称密文算法 %s (%d) 与接收者的偏好设置冲突\n" |