msgstr ""
"Project-Id-Version: gnupg 1.4.4\n"
"Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2012-03-27 10:23+0200\n"
+"POT-Creation-Date: 2014-08-12 20:30+0200\n"
"PO-Revision-Date: 2009-07-09 10:03+0200\n"
"Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
"X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
-#: agent/call-pinentry.c:244
+#: agent/call-pinentry.c:254
#, fuzzy, c-format
msgid "failed to acquire the pinentry lock: %s\n"
msgstr "无法存储指纹：%s\n"
#. should be used as an accelerator. Double the underscore for
#. a literal one. The actual to be translated text starts after
#. the second vertical bar.
-#: agent/call-pinentry.c:401
+#: agent/call-pinentry.c:411
msgid "|pinentry-label|_OK"
msgstr ""
-#: agent/call-pinentry.c:402
+#: agent/call-pinentry.c:412
msgid "|pinentry-label|_Cancel"
msgstr ""
-#: agent/call-pinentry.c:403
+#: agent/call-pinentry.c:413
msgid "|pinentry-label|PIN:"
msgstr ""
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
-#: agent/call-pinentry.c:649
+#: agent/call-pinentry.c:659
#, fuzzy
msgid "Quality:"
msgstr "有效性：%s"
#. 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:671
+#: agent/call-pinentry.c:681
msgid "pinentry.qualitybar.tooltip"
msgstr ""
-#: agent/call-pinentry.c:716
+#: agent/call-pinentry.c:726
msgid ""
"Please enter your PIN, so that the secret key can be unlocked for this "
"session"
msgstr ""
-#: agent/call-pinentry.c:719
+#: agent/call-pinentry.c:729
#, fuzzy
msgid ""
"Please enter your passphrase, so that the secret key can be unlocked for "
"this session"
msgstr "请输入密码：这是一个秘密的句子 \n"
-#: agent/call-pinentry.c:776
+#. 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:786
#, c-format
msgid "SETERROR %s (try %d of %d)"
msgstr ""
-#: agent/call-pinentry.c:799 agent/call-pinentry.c:811
+#: agent/call-pinentry.c:809 agent/call-pinentry.c:821
#, fuzzy
msgid "PIN too long"
msgstr "列太长"
-#: agent/call-pinentry.c:800
+#: agent/call-pinentry.c:810
#, fuzzy
msgid "Passphrase too long"
msgstr "列太长"
-#: agent/call-pinentry.c:808
+#: agent/call-pinentry.c:818
#, fuzzy
msgid "Invalid characters in PIN"
msgstr "姓名含有无效的字符\n"
-#: agent/call-pinentry.c:813
+#: agent/call-pinentry.c:823
msgid "PIN too short"
msgstr ""
-#: agent/call-pinentry.c:825
+#: agent/call-pinentry.c:835
#, fuzzy
msgid "Bad PIN"
msgstr "损坏的多精度整数(MPI)"
-#: agent/call-pinentry.c:826
+#: agent/call-pinentry.c:836
#, fuzzy
msgid "Bad Passphrase"
msgstr "错误的密码"
-#: agent/call-pinentry.c:863
+#: agent/call-pinentry.c:873
#, fuzzy
msgid "Passphrase"
msgstr "错误的密码"
-#: agent/command-ssh.c:531
+#: agent/command-ssh.c:595
#, fuzzy, c-format
msgid "ssh keys greater than %d bits are not supported\n"
msgstr "不支持保护散列 %d\n"
-#: agent/command-ssh.c:690 g10/card-util.c:833 g10/exec.c:473 g10/gpg.c:1122
-#: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
+#: agent/command-ssh.c:763 g10/card-util.c:834 g10/exec.c:476 g10/gpg.c:1127
+#: g10/keygen.c:3402 g10/keygen.c:3435 g10/keyring.c:1237 g10/keyring.c:1569
#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
-#: g10/tdbio.c:550 jnlib/dotlock.c:310
+#: g10/tdbio.c:554 jnlib/dotlock.c:310
#, c-format
msgid "can't create `%s': %s\n"
msgstr "无法建立‘%s’：%s\n"
-#: agent/command-ssh.c:702 common/helpfile.c:47 g10/card-util.c:787
+#: agent/command-ssh.c:775 common/helpfile.c:47 g10/card-util.c:788
#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:192 g10/keygen.c:2877
+#: g10/encode.c:504 g10/gpg.c:1128 g10/import.c:197 g10/keygen.c:2885
#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
-#: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:554
-#: g10/tdbio.c:618 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2044
-#: sm/gpgsm.c:2074 sm/gpgsm.c:2112 sm/gpgsm.c:2150 sm/qualified.c:66
+#: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:558
+#: g10/tdbio.c:622 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
#, c-format
msgid "can't open `%s': %s\n"
msgstr "无法打开‘%s’： %s\n"
-#: agent/command-ssh.c:1708 agent/command-ssh.c:1726
+#: agent/command-ssh.c:2110 agent/command-ssh.c:2128
#, fuzzy, c-format
msgid "error getting serial number of card: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
-#: agent/command-ssh.c:1712
+#: agent/command-ssh.c:2114
#, c-format
msgid "detected card with S/N: %s\n"
msgstr ""
-#: agent/command-ssh.c:1717
+#: agent/command-ssh.c:2119
#, fuzzy, c-format
msgid "error getting default authentication keyID of card: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
-#: agent/command-ssh.c:1737
+#: agent/command-ssh.c:2139
#, fuzzy, c-format
msgid "no suitable card key found: %s\n"
msgstr "找不到可写的私钥钥匙环：%s\n"
-#: agent/command-ssh.c:1787
+#: agent/command-ssh.c:2189
#, fuzzy, c-format
msgid "shadowing the key failed: %s\n"
msgstr "无法读出公钥：%s\n"
-#: agent/command-ssh.c:1802
+#: agent/command-ssh.c:2204
#, fuzzy, c-format
msgid "error writing key: %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
-#: agent/command-ssh.c:2139
+#: agent/command-ssh.c:2498
#, c-format
msgid ""
"An ssh process requested the use of key%%0A %s%%0A (%s)%%0ADo you want to "
"allow this?"
msgstr ""
-#: agent/command-ssh.c:2146
+#: agent/command-ssh.c:2505
msgid "Allow"
msgstr ""
-#: agent/command-ssh.c:2146
+#: agent/command-ssh.c:2505
msgid "Deny"
msgstr ""
-#: agent/command-ssh.c:2155
+#: agent/command-ssh.c:2514
#, fuzzy, c-format
msgid "Please enter the passphrase for the ssh key%%0A %F%%0A (%c)"
msgstr "请输入密码：这是一个秘密的句子 \n"
-#: agent/command-ssh.c:2484 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2833 agent/genkey.c:310 agent/genkey.c:432
#, fuzzy
msgid "Please re-enter this passphrase"
msgstr "更改密码"
-#: agent/command-ssh.c:2509
+#: agent/command-ssh.c:2858
#, fuzzy, c-format
msgid ""
-"Please enter a passphrase to protect the received secret key%%0A %s%%0A %"
-"s%%0Awithin gpg-agent's key storage"
+"Please enter a passphrase to protect the received secret key%%0A %s%%0A "
+"%s%%0Awithin gpg-agent's key storage"
msgstr "请输入密码：这是一个秘密的句子 \n"
-#: agent/command-ssh.c:2548 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2896 agent/genkey.c:340 agent/genkey.c:463
#: tools/symcryptrun.c:436
msgid "does not match - try again"
msgstr ""
-#: agent/command-ssh.c:3054
+#: agent/command-ssh.c:3408
#, fuzzy, c-format
msgid "failed to create stream from socket: %s\n"
msgstr "%s：建立散列表失败：%s\n"
-#: agent/divert-scd.c:92 g10/call-agent.c:923
+#: agent/divert-scd.c:92 g10/call-agent.c:991
#, fuzzy
msgid "Please insert the card with serial number"
msgstr ""
"请取出当前的卡，并插入有下列序列号的卡：\n"
" %.*s\n"
-#: agent/divert-scd.c:93 g10/call-agent.c:924
+#: agent/divert-scd.c:93 g10/call-agent.c:992
#, fuzzy
msgid "Please remove the current card and insert the one with serial number"
msgstr ""
#: agent/divert-scd.c:238
#, c-format
-msgid "%s%%0A%%0AUse the reader's keypad for input."
+msgid "%s%%0A%%0AUse the reader's pinpad for input."
msgstr ""
#: agent/divert-scd.c:287
#: agent/genkey.c:308
#, fuzzy, c-format
-msgid "Please enter the passphrase to%0Ato protect your new key"
+msgid "Please enter the passphrase to%0Aprotect your new key"
msgstr ""
"您需要一个密码来保护您的私钥。\n"
"\n"
msgid "Please enter the new passphrase"
msgstr "更改密码"
-#: agent/gpg-agent.c:121 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:133 agent/preset-passphrase.c:75 scd/scdaemon.c:105
#: tools/gpg-check-pattern.c:70
#, fuzzy
msgid ""
"选项：\n"
" "
-#: agent/gpg-agent.c:123 scd/scdaemon.c:105
-msgid "run in server mode (foreground)"
+#: agent/gpg-agent.c:135 scd/scdaemon.c:110
+msgid "run in daemon mode (background)"
msgstr ""
-#: agent/gpg-agent.c:124 scd/scdaemon.c:108
-msgid "run in daemon mode (background)"
+#: agent/gpg-agent.c:136 scd/scdaemon.c:107
+msgid "run in server mode (foreground)"
msgstr ""
-#: agent/gpg-agent.c:125 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: agent/gpg-agent.c:137 g10/gpg.c:493 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:111 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
#: tools/gpgconf.c:80 tools/symcryptrun.c:166
msgid "verbose"
msgstr "详细模式"
-#: agent/gpg-agent.c:126 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:138 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:112
#: sm/gpgsm.c:282
msgid "be somewhat more quiet"
msgstr "尽量减少提示信息"
-#: agent/gpg-agent.c:127 scd/scdaemon.c:111
+#: agent/gpg-agent.c:139 scd/scdaemon.c:113
msgid "sh-style command output"
msgstr ""
-#: agent/gpg-agent.c:128 scd/scdaemon.c:112
+#: agent/gpg-agent.c:140 scd/scdaemon.c:114
msgid "csh-style command output"
msgstr ""
-#: agent/gpg-agent.c:129 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:141 scd/scdaemon.c:115 sm/gpgsm.c:312
#: tools/symcryptrun.c:169
#, fuzzy
msgid "|FILE|read options from FILE"
msgstr "从‘%s’读取选项\n"
-#: agent/gpg-agent.c:134 scd/scdaemon.c:123
+#: agent/gpg-agent.c:146 scd/scdaemon.c:125
msgid "do not detach from the console"
msgstr ""
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:147
msgid "do not grab keyboard and mouse"
msgstr ""
-#: agent/gpg-agent.c:136 tools/symcryptrun.c:168
+#: agent/gpg-agent.c:148 tools/symcryptrun.c:168
#, fuzzy
msgid "use a log file for the server"
msgstr "在公钥服务器上搜寻密钥"
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:150
#, fuzzy
msgid "use a standard location for the socket"
msgstr "为所选用户标识的设定注记"
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:153
msgid "|PGM|use PGM as the PIN-Entry program"
msgstr ""
-#: agent/gpg-agent.c:144
+#: agent/gpg-agent.c:156
msgid "|PGM|use PGM as the SCdaemon program"
msgstr ""
-#: agent/gpg-agent.c:145
+#: agent/gpg-agent.c:157
#, fuzzy
msgid "do not use the SCdaemon"
msgstr "导入后不更新信任度数据库"
-#: agent/gpg-agent.c:157
+#: agent/gpg-agent.c:169
msgid "ignore requests to change the TTY"
msgstr ""
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:171
msgid "ignore requests to change the X display"
msgstr ""
-#: agent/gpg-agent.c:162
+#: agent/gpg-agent.c:174
msgid "|N|expire cached PINs after N seconds"
msgstr ""
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:187
msgid "do not use the PIN cache when signing"
msgstr ""
-#: agent/gpg-agent.c:177
-msgid "allow clients to mark keys as \"trusted\""
+#: agent/gpg-agent.c:189
+msgid "disallow clients to mark keys as \"trusted\""
msgstr ""
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:192
#, fuzzy
msgid "allow presetting passphrase"
msgstr "生成密码的时候发生错误：%s\n"
-#: agent/gpg-agent.c:180
-msgid "enable ssh-agent emulation"
-msgstr ""
+#: agent/gpg-agent.c:193
+#, fuzzy
+#| msgid "not supported"
+msgid "enable ssh support"
+msgstr "未被支持"
+
+#: agent/gpg-agent.c:196
+#, fuzzy
+#| msgid "not supported"
+msgid "enable putty support"
+msgstr "未被支持"
-#: agent/gpg-agent.c:182
+#: agent/gpg-agent.c:202
msgid "|FILE|write environment settings also to FILE"
msgstr ""
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
-#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: agent/gpg-agent.c:367 agent/preset-passphrase.c:97 agent/protect-tool.c:164
+#: g10/gpg.c:820 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:256
#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
#: tools/symcryptrun.c:206 tools/gpg-check-pattern.c:141
msgid "Please report bugs to <@EMAIL@>.\n"
"请向 <@EMAIL@> 报告程序缺陷。\n"
"请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:376
#, fuzzy
msgid "Usage: gpg-agent [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:378
msgid ""
"Syntax: gpg-agent [options] [command [args]]\n"
"Secret key management for GnuPG\n"
msgstr ""
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:424 g10/gpg.c:1012 scd/scdaemon.c:328 sm/gpgsm.c:669
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
-#: scd/scdaemon.c:424 sm/gpgsm.c:911 sm/gpgsm.c:914 tools/symcryptrun.c:998
-#: tools/gpg-check-pattern.c:177
+#: agent/gpg-agent.c:649 agent/protect-tool.c:1034 g10/gpgv.c:155
+#: kbx/kbxutil.c:428 scd/scdaemon.c:441 sm/gpgsm.c:911 sm/gpgsm.c:914
+#: tools/symcryptrun.c:998 tools/gpg-check-pattern.c:177
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:510 sm/gpgsm.c:1010
+#: agent/gpg-agent.c:764 g10/gpg.c:2120 scd/scdaemon.c:527 sm/gpgsm.c:1013
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "注意：没有默认配置文件‘%s’\n"
-#: agent/gpg-agent.c:736 agent/gpg-agent.c:1348 g10/gpg.c:2115
-#: scd/scdaemon.c:515 sm/gpgsm.c:1014 tools/symcryptrun.c:931
+#: agent/gpg-agent.c:775 agent/gpg-agent.c:1400 g10/gpg.c:2124
+#: scd/scdaemon.c:532 sm/gpgsm.c:1017 tools/symcryptrun.c:931
#, c-format
msgid "option file `%s': %s\n"
msgstr "配置文件‘%s’：%s\n"
-#: agent/gpg-agent.c:744 g10/gpg.c:2122 scd/scdaemon.c:523 sm/gpgsm.c:1021
+#: agent/gpg-agent.c:783 g10/gpg.c:2131 scd/scdaemon.c:540 sm/gpgsm.c:1024
#, c-format
msgid "reading options from `%s'\n"
msgstr "从‘%s’读取选项\n"
-#: agent/gpg-agent.c:1117 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1168 g10/plaintext.c:140 g10/plaintext.c:145
#: g10/plaintext.c:162
#, c-format
msgid "error creating `%s': %s\n"
msgstr "建立‘%s’时发生错误：%s\n"
-#: agent/gpg-agent.c:1461 agent/gpg-agent.c:1579 agent/gpg-agent.c:1583
-#: agent/gpg-agent.c:1624 agent/gpg-agent.c:1628 g10/exec.c:188
-#: g10/openfile.c:429 scd/scdaemon.c:1020
+#: agent/gpg-agent.c:1513 agent/gpg-agent.c:1631 agent/gpg-agent.c:1635
+#: agent/gpg-agent.c:1676 agent/gpg-agent.c:1680 g10/exec.c:191
+#: g10/openfile.c:429 scd/scdaemon.c:1040 sm/keydb.c:103
#, c-format
msgid "can't create directory `%s': %s\n"
msgstr "无法建立目录‘%s’：%s\n"
-#: agent/gpg-agent.c:1475 scd/scdaemon.c:1034
+#: agent/gpg-agent.c:1527 scd/scdaemon.c:1054
msgid "name of socket too long\n"
msgstr ""
-#: agent/gpg-agent.c:1498 scd/scdaemon.c:1057
+#: agent/gpg-agent.c:1550 scd/scdaemon.c:1077
#, fuzzy, c-format
msgid "can't create socket: %s\n"
msgstr "无法建立‘%s’：%s\n"
-#: agent/gpg-agent.c:1507
+#: agent/gpg-agent.c:1559
#, c-format
msgid "socket name `%s' is too long\n"
msgstr ""
-#: agent/gpg-agent.c:1525
+#: agent/gpg-agent.c:1577
#, fuzzy
msgid "a gpg-agent is already running - not starting a new one\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:1536 scd/scdaemon.c:1076
+#: agent/gpg-agent.c:1588 scd/scdaemon.c:1096
#, fuzzy
msgid "error getting nonce for the socket\n"
msgstr "获取新 PIN 时出错：%s\n"
-#: agent/gpg-agent.c:1541 scd/scdaemon.c:1079
+#: agent/gpg-agent.c:1593 scd/scdaemon.c:1099
#, fuzzy, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
-#: agent/gpg-agent.c:1553 scd/scdaemon.c:1088
+#: agent/gpg-agent.c:1605 scd/scdaemon.c:1108
#, fuzzy, c-format
msgid "listen() failed: %s\n"
msgstr "更新失败：%s\n"
-#: agent/gpg-agent.c:1559 scd/scdaemon.c:1095
+#: agent/gpg-agent.c:1611 scd/scdaemon.c:1115
#, fuzzy, c-format
msgid "listening on socket `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: agent/gpg-agent.c:1587 agent/gpg-agent.c:1634 g10/openfile.c:432
+#: agent/gpg-agent.c:1639 agent/gpg-agent.c:1686 g10/openfile.c:432
+#: sm/keydb.c:106
#, c-format
msgid "directory `%s' created\n"
msgstr "已创建目录‘%s’\n"
-#: agent/gpg-agent.c:1640
+#: agent/gpg-agent.c:1692
#, fuzzy, c-format
msgid "stat() failed for `%s': %s\n"
msgstr "fstat(%d) 在 %s 中出错：%s\n"
-#: agent/gpg-agent.c:1644
+#: agent/gpg-agent.c:1696
#, fuzzy, c-format
msgid "can't use `%s' as home directory\n"
msgstr "无法建立目录‘%s’：%s\n"
-#: agent/gpg-agent.c:1777 scd/scdaemon.c:1111
+#: agent/gpg-agent.c:1829 scd/scdaemon.c:1131
#, fuzzy, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr "读取‘%s’时出错：%s\n"
-#: agent/gpg-agent.c:1799
+#: agent/gpg-agent.c:2044
#, c-format
msgid "handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1804
+#: agent/gpg-agent.c:2049
#, c-format
msgid "handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1824
+#: agent/gpg-agent.c:2069
#, c-format
msgid "ssh handler 0x%lx for fd %d started\n"
msgstr ""
-#: agent/gpg-agent.c:1829
+#: agent/gpg-agent.c:2074
#, c-format
msgid "ssh handler 0x%lx for fd %d terminated\n"
msgstr ""
-#: agent/gpg-agent.c:1973 scd/scdaemon.c:1248
+#: agent/gpg-agent.c:2233 scd/scdaemon.c:1268
#, fuzzy, c-format
msgid "pth_select failed: %s - waiting 1s\n"
msgstr "更新私钥失败：%s\n"
-#: agent/gpg-agent.c:2096 scd/scdaemon.c:1315
+#: agent/gpg-agent.c:2356 scd/scdaemon.c:1335
#, fuzzy, c-format
msgid "%s %s stopped\n"
msgstr "%s：已跳过：%s\n"
-#: agent/gpg-agent.c:2232
+#: agent/gpg-agent.c:2492
#, fuzzy
msgid "no gpg-agent running in this session\n"
msgstr "gpg-agent 在此次舍话中无法使用\n"
-#: agent/gpg-agent.c:2243 common/simple-pwquery.c:352 common/asshelp.c:403
+#: agent/gpg-agent.c:2503 common/simple-pwquery.c:352 common/asshelp.c:403
#: tools/gpg-connect-agent.c:2168
msgid "malformed GPG_AGENT_INFO environment variable\n"
msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
-#: agent/gpg-agent.c:2256 common/simple-pwquery.c:364 common/asshelp.c:415
+#: agent/gpg-agent.c:2516 common/simple-pwquery.c:364 common/asshelp.c:415
#: tools/gpg-connect-agent.c:2179
#, c-format
msgid "gpg-agent protocol version %d is not supported\n"
msgstr "不支持 gpg-agent 协议版本 %d\n"
-#: agent/preset-passphrase.c:98
+#: agent/preset-passphrase.c:101
#, fuzzy
msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
-#: agent/preset-passphrase.c:101
+#: agent/preset-passphrase.c:104
msgid ""
"Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
"Password cache maintenance\n"
msgstr ""
-#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
+#: agent/protect-tool.c:114 g10/gpg.c:378 kbx/kbxutil.c:71 sm/gpgsm.c:186
#: tools/gpgconf.c:60
msgid ""
"@Commands:\n"
"@指令：\n"
" "
-#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: agent/protect-tool.c:128 g10/gpg.c:446 g10/gpgv.c:69 kbx/kbxutil.c:81
#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
#: tools/symcryptrun.c:159
msgid ""
"选项：\n"
" "
-#: agent/protect-tool.c:166
+#: agent/protect-tool.c:167
#, fuzzy
msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
-#: agent/protect-tool.c:168
+#: agent/protect-tool.c:169
msgid ""
"Syntax: gpg-protect-tool [options] [args]\n"
"Secret key maintenance tool\n"
msgstr ""
-#: agent/protect-tool.c:1162
+#: agent/protect-tool.c:1166
#, fuzzy
msgid "Please enter the passphrase to unprotect the PKCS#12 object."
msgstr "请输入密码：这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1167
+#: agent/protect-tool.c:1171
#, fuzzy
msgid "Please enter the passphrase to protect the new PKCS#12 object."
msgstr "请输入密码：这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1173
+#: agent/protect-tool.c:1177
msgid ""
"Please enter the passphrase to protect the imported object within the GnuPG "
"system."
msgstr ""
-#: agent/protect-tool.c:1178
+#: agent/protect-tool.c:1182
#, fuzzy
msgid ""
"Please enter the passphrase or the PIN\n"
"needed to complete this operation."
msgstr "请输入密码：这是一个秘密的句子 \n"
-#: agent/protect-tool.c:1183 tools/symcryptrun.c:437
+#: agent/protect-tool.c:1187 tools/symcryptrun.c:437
#, fuzzy
msgid "Passphrase:"
msgstr "错误的密码"
-#: agent/protect-tool.c:1188 tools/symcryptrun.c:448
+#: agent/protect-tool.c:1192 tools/symcryptrun.c:448
#, fuzzy
msgid "cancelled\n"
msgstr "已取消"
-#: agent/protect-tool.c:1190 tools/symcryptrun.c:444
+#: agent/protect-tool.c:1194 tools/symcryptrun.c:444
#, fuzzy, c-format
msgid "error while asking for the passphrase: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
msgid "I'll change it later"
msgstr ""
-#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
-#: tools/gpgconf-comp.c:1814
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1485
+#: tools/gpgconf-comp.c:1824
#, fuzzy, c-format
msgid "error creating a pipe: %s\n"
msgstr "生成密码的时候发生错误：%s\n"
msgid "error running `%s': terminated\n"
msgstr "读取‘%s’时出错：%s\n"
-#: common/http.c:1674
+#: common/http.c:1682
#, fuzzy, c-format
msgid "error creating socket: %s\n"
msgstr "建立‘%s’时发生错误：%s\n"
-#: common/http.c:1718
+#: common/http.c:1733
#, fuzzy
msgid "host not found"
msgstr "[找不到用户标识]"
msgid "problem with the agent\n"
msgstr "代理程序有问题――正在停用代理程序\n"
-#: common/sysutils.c:105
+#: common/sysutils.c:111
#, c-format
msgid "can't disable core dumps: %s\n"
msgstr "无法禁用核心内存转储：%s\n"
-#: common/sysutils.c:200
+#: common/sysutils.c:206
#, fuzzy, c-format
msgid "Warning: unsafe ownership on %s \"%s\"\n"
msgstr "警告：扩展模块‘%s’所有权不安全\n"
-#: common/sysutils.c:232
+#: common/sysutils.c:238
#, fuzzy, c-format
msgid "Warning: unsafe permissions on %s \"%s\"\n"
msgstr "警告：扩展模块‘%s’权限不安全\n"
msgid "Root certificate trustworthy"
msgstr "证书已损坏"
-#: common/audit.c:1111 sm/certchain.c:935
+#: common/audit.c:1111 sm/certchain.c:991
#, fuzzy
msgid "no CRL found for certificate"
msgstr "证书已损坏"
-#: common/audit.c:1114 sm/certchain.c:945
+#: common/audit.c:1114 sm/certchain.c:1001
#, fuzzy
msgid "the available CRL is too old"
msgstr "可用的密钥在："
msgid "invalid dash escaped line: "
msgstr "以连字符开头的行格式错误："
-#: g10/armor.c:810 g10/armor.c:1420
+#: g10/armor.c:810 g10/armor.c:1434
#, c-format
msgid "invalid radix64 character %02X skipped\n"
msgstr "跳过无效的 64 进制字符 %02x\n"
msgid "malformed CRC\n"
msgstr "异常的 CRC\n"
-#: g10/armor.c:899 g10/armor.c:1457
+#: g10/armor.c:899 g10/armor.c:1471
#, c-format
msgid "CRC error; %06lX - %06lX\n"
msgstr "CRC 错误：%06lx - %06lx\n"
msgid "error in trailer line\n"
msgstr "结尾行有问题\n"
-#: g10/armor.c:1234
+#: g10/armor.c:1248
msgid "no valid OpenPGP data found.\n"
msgstr "找不到有效的 OpenPGP 数据。\n"
-#: g10/armor.c:1239
+#: g10/armor.c:1253
#, c-format
msgid "invalid armor: line longer than %d characters\n"
msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
-#: g10/armor.c:1243
+#: g10/armor.c:1257
msgid ""
"quoted printable character in armor - probably a buggy MTA has been used\n"
msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
msgid "not human readable"
msgstr ""
-#: g10/card-util.c:85 g10/card-util.c:374
+#: g10/card-util.c:85 g10/card-util.c:375
#, c-format
msgid "OpenPGP card not available: %s\n"
msgstr "OpenPGP 卡不可用：%s\n"
msgid "OpenPGP card no. %s detected\n"
msgstr "检测到 OpenPGP 卡号 %s\n"
-#: g10/card-util.c:98 g10/card-util.c:1773 g10/delkey.c:126 g10/keyedit.c:1551
-#: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:98 g10/card-util.c:1774 g10/delkey.c:126 g10/keyedit.c:1551
+#: g10/keygen.c:3076 g10/revoke.c:216 g10/revoke.c:455
msgid "can't do this in batch mode\n"
msgstr "在批处理模式中无法完成此操作\n"
msgid "This command is only available for version 2 cards\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
-#: g10/card-util.c:108 scd/app-openpgp.c:2029
+#: g10/card-util.c:108 scd/app-openpgp.c:2146
#, fuzzy
msgid "Reset Code not or not anymore available\n"
msgstr "私钥部分不可用\n"
-#: g10/card-util.c:141 g10/card-util.c:1458 g10/card-util.c:1568
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1630
-#: g10/keygen.c:1711 sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:249
+#: g10/card-util.c:141 g10/card-util.c:1459 g10/card-util.c:1569
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1637
+#: g10/keygen.c:1718 sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:249
#: sm/certreqgen-ui.c:283
msgid "Your selection? "
msgstr "您的选择？ "
-#: g10/card-util.c:272 g10/card-util.c:322
+#: g10/card-util.c:273 g10/card-util.c:323
msgid "[not set]"
msgstr "[未设定]"
-#: g10/card-util.c:512
+#: g10/card-util.c:513
msgid "male"
msgstr "男性"
-#: g10/card-util.c:513
+#: g10/card-util.c:514
msgid "female"
msgstr "女性"
-#: g10/card-util.c:513
+#: g10/card-util.c:514
msgid "unspecified"
msgstr "未定义"
-#: g10/card-util.c:540
+#: g10/card-util.c:541
msgid "not forced"
msgstr "可选"
-#: g10/card-util.c:540
+#: g10/card-util.c:541
msgid "forced"
msgstr "必须"
-#: g10/card-util.c:631
+#: g10/card-util.c:632
msgid "Error: Only plain ASCII is currently allowed.\n"
msgstr "错误：目前只允许使用 ASCII 字符。\n"
-#: g10/card-util.c:633
+#: g10/card-util.c:634
msgid "Error: The \"<\" character may not be used.\n"
msgstr "错误：不能使用字符“<”。\n"
-#: g10/card-util.c:635
+#: g10/card-util.c:636
msgid "Error: Double spaces are not allowed.\n"
msgstr "错误：不允许出现两个空格。\n"
-#: g10/card-util.c:652
+#: g10/card-util.c:653
msgid "Cardholder's surname: "
msgstr "卡持有人的姓："
-#: g10/card-util.c:654
+#: g10/card-util.c:655
msgid "Cardholder's given name: "
msgstr "卡持有人的名："
-#: g10/card-util.c:672
+#: g10/card-util.c:673
#, c-format
msgid "Error: Combined name too long (limit is %d characters).\n"
msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
-#: g10/card-util.c:693
+#: g10/card-util.c:694
msgid "URL to retrieve public key: "
msgstr "获取公钥的 URL："
-#: g10/card-util.c:701
+#: g10/card-util.c:702
#, c-format
msgid "Error: URL too long (limit is %d characters).\n"
msgstr "错误：URL 太长(至多 %d 个字符)\n"
-#: g10/card-util.c:794 tools/no-libgcrypt.c:30
+#: g10/card-util.c:795 tools/no-libgcrypt.c:30
#, fuzzy, c-format
msgid "error allocating enough memory: %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
-#: g10/card-util.c:806 g10/import.c:280
+#: g10/card-util.c:807 g10/import.c:291
#, c-format
msgid "error reading `%s': %s\n"
msgstr "读取‘%s’时出错：%s\n"
-#: g10/card-util.c:839
+#: g10/card-util.c:840
#, fuzzy, c-format
msgid "error writing `%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
-#: g10/card-util.c:866
+#: g10/card-util.c:867
msgid "Login data (account name): "
msgstr "登录数据(帐号名)："
-#: g10/card-util.c:876
+#: g10/card-util.c:877
#, c-format
msgid "Error: Login data too long (limit is %d characters).\n"
msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
-#: g10/card-util.c:912
+#: g10/card-util.c:913
msgid "Private DO data: "
msgstr "个人 DO 数据："
-#: g10/card-util.c:922
+#: g10/card-util.c:923
#, c-format
msgid "Error: Private DO too long (limit is %d characters).\n"
msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
-#: g10/card-util.c:1005
+#: g10/card-util.c:1006
msgid "Language preferences: "
msgstr "首选语言："
-#: g10/card-util.c:1013
+#: g10/card-util.c:1014
msgid "Error: invalid length of preference string.\n"
msgstr "错误：首选项字符串长度无效。\n"
-#: g10/card-util.c:1022
+#: g10/card-util.c:1023
msgid "Error: invalid characters in preference string.\n"
msgstr "错误：首选项字符串里有无效字符。\n"
-#: g10/card-util.c:1044
+#: g10/card-util.c:1045
msgid "Sex ((M)ale, (F)emale or space): "
msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
-#: g10/card-util.c:1058
+#: g10/card-util.c:1059
msgid "Error: invalid response.\n"
msgstr "错误：无效的响应。\n"
-#: g10/card-util.c:1080
+#: g10/card-util.c:1081
msgid "CA fingerprint: "
msgstr "CA 指纹："
-#: g10/card-util.c:1103
+#: g10/card-util.c:1104
msgid "Error: invalid formatted fingerprint.\n"
msgstr "错误：指纹格式无效。\n"
-#: g10/card-util.c:1153
+#: g10/card-util.c:1154
#, c-format
msgid "key operation not possible: %s\n"
msgstr "针对密钥的操作无法实现：%s\n"
-#: g10/card-util.c:1154
+#: g10/card-util.c:1155
msgid "not an OpenPGP card"
msgstr "不是一个 OpenPGP 卡"
-#: g10/card-util.c:1167
+#: g10/card-util.c:1168
#, c-format
msgid "error getting current key info: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
-#: g10/card-util.c:1254
+#: g10/card-util.c:1255
msgid "Replace existing key? (y/N) "
msgstr "替换已有的密钥？(y/N)"
-#: g10/card-util.c:1270
+#: g10/card-util.c:1271
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"
" documentation of your card to see what sizes are allowed.\n"
msgstr ""
-#: g10/card-util.c:1295
+#: g10/card-util.c:1296
#, fuzzy, c-format
msgid "What keysize do you want for the Signature key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
-#: g10/card-util.c:1297
+#: g10/card-util.c:1298
#, fuzzy, c-format
msgid "What keysize do you want for the Encryption key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
-#: g10/card-util.c:1298
+#: g10/card-util.c:1299
#, fuzzy, c-format
msgid "What keysize do you want for the Authentication key? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
-#: g10/card-util.c:1309 g10/keygen.c:1844 g10/keygen.c:1850
+#: g10/card-util.c:1310 g10/keygen.c:1851 g10/keygen.c:1857
#: sm/certreqgen-ui.c:194
#, c-format
msgid "rounded up to %u bits\n"
msgstr "舍入到 %u 位\n"
-#: g10/card-util.c:1317 g10/keygen.c:1831 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1318 g10/keygen.c:1838 sm/certreqgen-ui.c:184
#, c-format
msgid "%s keysizes must be in the range %u-%u\n"
msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
-#: g10/card-util.c:1322
+#: g10/card-util.c:1323
#, c-format
msgid "The card will now be re-configured to generate a key of %u bits\n"
msgstr ""
-#: g10/card-util.c:1342
+#: g10/card-util.c:1343
#, fuzzy, c-format
msgid "error changing size of key %d to %u bits: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
-#: g10/card-util.c:1364
+#: g10/card-util.c:1365
msgid "Make off-card backup of encryption key? (Y/n) "
msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
-#: g10/card-util.c:1378
+#: g10/card-util.c:1379
#, fuzzy
msgid "NOTE: keys are already stored on the card!\n"
msgstr "私钥已存储在卡上\n"
-#: g10/card-util.c:1381
+#: g10/card-util.c:1382
msgid "Replace existing keys? (y/N) "
msgstr "替换已有的密钥？(y/N)"
-#: g10/card-util.c:1393
+#: g10/card-util.c:1394
#, c-format
msgid ""
"Please note that the factory settings of the PINs are\n"
" PIN = ‘%s’ 管理员 PIN = ‘%s’\n"
"您应当使用 --change-pin 命令来更改它们\n"
-#: g10/card-util.c:1449
+#: g10/card-util.c:1450
msgid "Please select the type of key to generate:\n"
msgstr "请选择您要使用的密钥种类：\n"
-#: g10/card-util.c:1451 g10/card-util.c:1559
+#: g10/card-util.c:1452 g10/card-util.c:1560
msgid " (1) Signature key\n"
msgstr " (1) 签名密钥\n"
-#: g10/card-util.c:1452 g10/card-util.c:1561
+#: g10/card-util.c:1453 g10/card-util.c:1562
msgid " (2) Encryption key\n"
msgstr " (2) 加密密钥\n"
-#: g10/card-util.c:1453 g10/card-util.c:1563
+#: g10/card-util.c:1454 g10/card-util.c:1564
msgid " (3) Authentication key\n"
msgstr " (3) 认证密钥\n"
-#: g10/card-util.c:1469 g10/card-util.c:1588 g10/keyedit.c:945
-#: g10/keygen.c:1634 g10/keygen.c:1662 g10/keygen.c:1764 g10/revoke.c:683
+#: g10/card-util.c:1470 g10/card-util.c:1589 g10/keyedit.c:945
+#: g10/keygen.c:1641 g10/keygen.c:1669 g10/keygen.c:1771 g10/revoke.c:683
msgid "Invalid selection.\n"
msgstr "无效的选择。\n"
-#: g10/card-util.c:1556
+#: g10/card-util.c:1557
msgid "Please select where to store the key:\n"
msgstr "请选择在哪里存储密钥：\n"
-#: g10/card-util.c:1600
+#: g10/card-util.c:1601
msgid "unknown key protection algorithm\n"
msgstr "不支持的密钥保护算法\n"
-#: g10/card-util.c:1605
+#: g10/card-util.c:1606
msgid "secret parts of key are not available\n"
msgstr "私钥部分不可用\n"
-#: g10/card-util.c:1610
+#: g10/card-util.c:1611
msgid "secret key already stored on a card\n"
msgstr "私钥已存储在卡上\n"
-#: g10/card-util.c:1623
+#: g10/card-util.c:1624
#, fuzzy, c-format
msgid "error writing key to card: %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
-#: g10/card-util.c:1682 g10/keyedit.c:1382
+#: g10/card-util.c:1683 g10/keyedit.c:1382
msgid "quit this menu"
msgstr "离开这个菜单"
-#: g10/card-util.c:1684
+#: g10/card-util.c:1685
msgid "show admin commands"
msgstr "显示管理员命令"
-#: g10/card-util.c:1685 g10/keyedit.c:1385
+#: g10/card-util.c:1686 g10/keyedit.c:1385
msgid "show this help"
msgstr "显示这份在线说明"
-#: g10/card-util.c:1687
+#: g10/card-util.c:1688
msgid "list all available data"
msgstr "列出所有可用数据"
-#: g10/card-util.c:1690
+#: g10/card-util.c:1691
msgid "change card holder's name"
msgstr "更改卡持有人的姓名"
-#: g10/card-util.c:1691
+#: g10/card-util.c:1692
msgid "change URL to retrieve key"
msgstr "更改获取密钥的 URL"
-#: g10/card-util.c:1692
+#: g10/card-util.c:1693
msgid "fetch the key specified in the card URL"
msgstr "根据卡中指定的 URL 获取密钥"
-#: g10/card-util.c:1693
+#: g10/card-util.c:1694
msgid "change the login name"
msgstr "更改登录名"
-#: g10/card-util.c:1694
+#: g10/card-util.c:1695
msgid "change the language preferences"
msgstr "更改首选语言首选"
-#: g10/card-util.c:1695
+#: g10/card-util.c:1696
msgid "change card holder's sex"
msgstr "更改卡持有人的性别"
-#: g10/card-util.c:1696
+#: g10/card-util.c:1697
msgid "change a CA fingerprint"
msgstr "更改一个 CA 指纹"
-#: g10/card-util.c:1697
+#: g10/card-util.c:1698
msgid "toggle the signature force PIN flag"
msgstr "设定 PIN 签名是否必须"
-#: g10/card-util.c:1698
+#: g10/card-util.c:1699
msgid "generate new keys"
msgstr "生成新的密钥"
-#: g10/card-util.c:1699
+#: g10/card-util.c:1700
msgid "menu to change or unblock the PIN"
msgstr "更改或解锁 PIN 的菜单"
-#: g10/card-util.c:1700
+#: g10/card-util.c:1701
msgid "verify the PIN and list all data"
msgstr "验证 PIN 并列出所有数据"
-#: g10/card-util.c:1701
+#: g10/card-util.c:1702
msgid "unblock the PIN using a Reset Code"
msgstr ""
-#: g10/card-util.c:1823
+#: g10/card-util.c:1824
msgid "gpg/card> "
msgstr ""
-#: g10/card-util.c:1864
+#: g10/card-util.c:1865
msgid "Admin-only command\n"
msgstr "仅供管理员使用的命令\n"
-#: g10/card-util.c:1895
+#: g10/card-util.c:1896
msgid "Admin commands are allowed\n"
msgstr "允许使用管理员命令\n"
-#: g10/card-util.c:1897
+#: g10/card-util.c:1898
msgid "Admin commands are not allowed\n"
msgstr "不允许使用管理员命令\n"
-#: g10/card-util.c:1988 g10/keyedit.c:2292
+#: g10/card-util.c:1989 g10/keyedit.c:2296
msgid "Invalid command (try \"help\")\n"
msgstr "无效的指令(尝试“help”)\n"
msgid "--output doesn't work for this command\n"
msgstr "--output 在这个命令中不起作用\n"
-#: g10/decrypt.c:166 g10/gpg.c:4019 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4042 g10/keyring.c:387 g10/keyring.c:698
#, c-format
msgid "can't open `%s'\n"
msgstr "无法打开‘%s’\n"
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3514 g10/keyserver.c:1737
-#: g10/revoke.c:226
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:1572 g10/keyedit.c:3518
+#: g10/keyserver.c:1839 g10/revoke.c:226
#, c-format
msgid "key \"%s\" not found: %s\n"
msgstr "密钥‘%s’找不到：%s\n"
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2480 g10/keyserver.c:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2533 g10/keyserver.c:1853
#: g10/revoke.c:232 g10/revoke.c:477
#, c-format
msgid "error reading keyblock: %s\n"
msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
-#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:862
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:867
#, c-format
msgid "you may not use %s while in %s mode\n"
msgstr "您不该将 %s 用于 %s 模式中\n"
msgid "%s/%s encrypted for: \"%s\"\n"
msgstr "%s/%s 已经加密给：“%s”\n"
-#: g10/encr-data.c:93 g10/mainproc.c:286
+#: g10/encr-data.c:93 g10/mainproc.c:297
#, c-format
msgid "%s encrypted data\n"
msgstr "%s 加密过的数据\n"
-#: g10/encr-data.c:96 g10/mainproc.c:290
+#: g10/encr-data.c:96 g10/mainproc.c:301
#, c-format
msgid "encrypted with unknown algorithm %d\n"
msgstr "以未知的算法 %d 加密\n"
-#: g10/encr-data.c:142 sm/decrypt.c:126
+#: g10/encr-data.c:159 sm/decrypt.c:126
msgid ""
"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
-#: g10/encr-data.c:154
+#: g10/encr-data.c:171
msgid "problem handling encrypted packet\n"
msgstr "处理加密包有问题\n"
-#: g10/exec.c:57
+#: g10/exec.c:60
msgid "no remote program execution supported\n"
msgstr "不支持远程调用\n"
-#: g10/exec.c:308
+#: g10/exec.c:311
msgid ""
"external program calls are disabled due to unsafe options file permissions\n"
msgstr "由于配置文件权限不安全，外部程序调用被禁用\n"
-#: g10/exec.c:338
+#: g10/exec.c:341
msgid "this platform requires temporary files when calling external programs\n"
msgstr "在这个操作平台上调用外部程序时需要临时文件\n"
-#: g10/exec.c:416
+#: g10/exec.c:419
#, c-format
msgid "unable to execute program `%s': %s\n"
msgstr "无法执行程序‘%s’：%s\n"
-#: g10/exec.c:419
+#: g10/exec.c:422
#, c-format
msgid "unable to execute shell `%s': %s\n"
msgstr "无法在命令解释环境中执行‘%s’：%s\n"
-#: g10/exec.c:510
+#: g10/exec.c:513
#, c-format
msgid "system error while calling external program: %s\n"
msgstr "调用外部程序时发生系统错误：%s\n"
-#: g10/exec.c:521 g10/exec.c:588
+#: g10/exec.c:524 g10/exec.c:591
msgid "unnatural exit of external program\n"
msgstr "外部程序异常退出\n"
-#: g10/exec.c:536
+#: g10/exec.c:539
msgid "unable to execute external program\n"
msgstr "无法执行外部程序\n"
-#: g10/exec.c:553
+#: g10/exec.c:556
#, c-format
msgid "unable to read external program response: %s\n"
msgstr "无法读取外部程序响应：%s\n"
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:602 g10/exec.c:609
#, c-format
msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
-#: g10/exec.c:611
+#: g10/exec.c:614
#, c-format
msgid "WARNING: unable to remove temp directory `%s': %s\n"
msgstr "警告：无法删除临时目录‘%s’：%s\n"
msgid "No fingerprint"
msgstr "CA 指纹："
-#: g10/getkey.c:1930
+#: g10/getkey.c:1936
#, c-format
msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2539 g10/keyedit.c:3843
#, c-format
msgid "no secret subkey for public subkey %s - ignoring\n"
msgstr "公钥 %s 没有相对应的私钥――忽略\n"
-#: g10/getkey.c:2759
+#: g10/getkey.c:2765
#, c-format
msgid "using subkey %s instead of primary key %s\n"
msgstr "使用子钥 %s 而非主钥 %s\n"
-#: g10/getkey.c:2806
+#: g10/getkey.c:2812
#, c-format
msgid "key %s: secret key without public key - skipped\n"
msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
-#: g10/gpg.c:375 sm/gpgsm.c:188
+#: g10/gpg.c:380 sm/gpgsm.c:188
#, fuzzy
msgid "make a signature"
msgstr "|[文件名]|生成一份签名"
-#: g10/gpg.c:376 sm/gpgsm.c:189
+#: g10/gpg.c:381 sm/gpgsm.c:189
#, fuzzy
msgid "make a clear text signature"
msgstr "|[文件名]|生成一份明文签名"
-#: g10/gpg.c:377 sm/gpgsm.c:190
+#: g10/gpg.c:382 sm/gpgsm.c:190
msgid "make a detached signature"
msgstr "生成一份分离的签名"
-#: g10/gpg.c:378 sm/gpgsm.c:191
+#: g10/gpg.c:383 sm/gpgsm.c:191
msgid "encrypt data"
msgstr "加密数据"
-#: g10/gpg.c:380 sm/gpgsm.c:192
+#: g10/gpg.c:385 sm/gpgsm.c:192
msgid "encryption only with symmetric cipher"
msgstr "仅使用对称加密"
-#: g10/gpg.c:382 sm/gpgsm.c:193
+#: g10/gpg.c:387 sm/gpgsm.c:193
msgid "decrypt data (default)"
msgstr "解密数据(默认)"
-#: g10/gpg.c:384 sm/gpgsm.c:194
+#: g10/gpg.c:389 sm/gpgsm.c:194
msgid "verify a signature"
msgstr "验证签名"
-#: g10/gpg.c:386 sm/gpgsm.c:195
+#: g10/gpg.c:391 sm/gpgsm.c:195
msgid "list keys"
msgstr "列出密钥"
-#: g10/gpg.c:388
+#: g10/gpg.c:393
msgid "list keys and signatures"
msgstr "列出密钥和签名"
-#: g10/gpg.c:389
+#: g10/gpg.c:394
msgid "list and check key signatures"
msgstr "列出并检查密钥签名"
-#: g10/gpg.c:390 sm/gpgsm.c:200
+#: g10/gpg.c:395 sm/gpgsm.c:200
msgid "list keys and fingerprints"
msgstr "列出密钥和指纹"
-#: g10/gpg.c:391 sm/gpgsm.c:198
+#: g10/gpg.c:396 sm/gpgsm.c:198
msgid "list secret keys"
msgstr "列出私钥"
-#: g10/gpg.c:392 sm/gpgsm.c:201
+#: g10/gpg.c:397 sm/gpgsm.c:201
msgid "generate a new key pair"
msgstr "生成一副新的密钥对"
-#: g10/gpg.c:393
+#: g10/gpg.c:398
msgid "generate a revocation certificate"
msgstr "生成一份吊销证书"
-#: g10/gpg.c:395 sm/gpgsm.c:203
+#: g10/gpg.c:400 sm/gpgsm.c:203
msgid "remove keys from the public keyring"
msgstr "从公钥钥匙环里删除密钥"
-#: g10/gpg.c:397
+#: g10/gpg.c:402
msgid "remove keys from the secret keyring"
msgstr "从私钥钥匙环里删除密钥"
-#: g10/gpg.c:398
+#: g10/gpg.c:403
msgid "sign a key"
msgstr "为某把密钥添加签名"
-#: g10/gpg.c:399
+#: g10/gpg.c:404
msgid "sign a key locally"
msgstr "为某把密钥添加本地签名"
-#: g10/gpg.c:400
+#: g10/gpg.c:405
msgid "sign or edit a key"
msgstr "编辑某把密钥或为其添加签名"
-#: g10/gpg.c:402 sm/gpgsm.c:215
+#: g10/gpg.c:407 sm/gpgsm.c:215
#, fuzzy
msgid "change a passphrase"
msgstr "更改密码"
-#: g10/gpg.c:404
+#: g10/gpg.c:409
msgid "export keys"
msgstr "导出密钥"
-#: g10/gpg.c:405 sm/gpgsm.c:204
+#: g10/gpg.c:410 sm/gpgsm.c:204
msgid "export keys to a key server"
msgstr "把密钥导出到某个公钥服务器上"
-#: g10/gpg.c:406 sm/gpgsm.c:205
+#: g10/gpg.c:411 sm/gpgsm.c:205
msgid "import keys from a key server"
msgstr "从公钥服务器上导入密钥"
-#: g10/gpg.c:408
+#: g10/gpg.c:413
msgid "search for keys on a key server"
msgstr "在公钥服务器上搜寻密钥"
-#: g10/gpg.c:410
+#: g10/gpg.c:415
msgid "update all keys from a keyserver"
msgstr "从公钥服务器更新所有的本地密钥"
-#: g10/gpg.c:415
+#: g10/gpg.c:420
msgid "import/merge keys"
msgstr "导入/合并密钥"
-#: g10/gpg.c:418
+#: g10/gpg.c:423
msgid "print the card status"
msgstr "打印卡状态"
-#: g10/gpg.c:419
+#: g10/gpg.c:424
msgid "change data on a card"
msgstr "更改卡上的数据"
-#: g10/gpg.c:420
+#: g10/gpg.c:425
msgid "change a card's PIN"
msgstr "更改卡的 PIN"
-#: g10/gpg.c:429
+#: g10/gpg.c:434
msgid "update the trust database"
msgstr "更新信任度数据库"
-#: g10/gpg.c:436
+#: g10/gpg.c:441
#, fuzzy
msgid "print message digests"
msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
-#: g10/gpg.c:439 sm/gpgsm.c:210
+#: g10/gpg.c:444 sm/gpgsm.c:210
msgid "run in server mode"
msgstr ""
-#: g10/gpg.c:443 sm/gpgsm.c:228
+#: g10/gpg.c:448 sm/gpgsm.c:228
msgid "create ascii armored output"
msgstr "输出经 ASCII 封装"
-#: g10/gpg.c:446 sm/gpgsm.c:241
+#: g10/gpg.c:451 sm/gpgsm.c:241
#, fuzzy
msgid "|USER-ID|encrypt for USER-ID"
msgstr "|某甲|为收件者“某甲”加密"
-#: g10/gpg.c:459 sm/gpgsm.c:278
+#: g10/gpg.c:464 sm/gpgsm.c:278
#, fuzzy
msgid "|USER-ID|use USER-ID to sign or decrypt"
msgstr "使用这个用户标识来签名或解密"
-#: g10/gpg.c:462
+#: g10/gpg.c:467
#, fuzzy
msgid "|N|set compress level to N (0 disables)"
msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
-#: g10/gpg.c:468
+#: g10/gpg.c:473
msgid "use canonical text mode"
msgstr "使用标准的文本模式"
-#: g10/gpg.c:485 sm/gpgsm.c:280
+#: g10/gpg.c:490 sm/gpgsm.c:280
#, fuzzy
msgid "|FILE|write output to FILE"
msgstr "从‘%s’读取选项\n"
-#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
+#: g10/gpg.c:506 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
msgid "do not make any changes"
msgstr "不做任何改变"
-#: g10/gpg.c:502
+#: g10/gpg.c:507
msgid "prompt before overwriting"
msgstr "覆盖前先询问"
-#: g10/gpg.c:554
+#: g10/gpg.c:559
msgid "use strict OpenPGP behavior"
msgstr "行为严格遵循 OpenPGP 定义"
-#: g10/gpg.c:585 sm/gpgsm.c:336
+#: g10/gpg.c:590 sm/gpgsm.c:336
msgid ""
"@\n"
"(See the man page for a complete listing of all commands and options)\n"
"@\n"
"(请参考在线说明以获得所有命令和选项的完整清单)\n"
-#: g10/gpg.c:588 sm/gpgsm.c:339
+#: g10/gpg.c:593 sm/gpgsm.c:339
msgid ""
"@\n"
"Examples:\n"
" --list-keys [某甲] 显示密钥\n"
" --fingerprint [某甲] 显示指纹\n"
-#: g10/gpg.c:836
+#: g10/gpg.c:842
msgid "Usage: gpg [options] [files] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
-#: g10/gpg.c:839
+#: g10/gpg.c:845
+#, fuzzy
+#| msgid ""
+#| "Syntax: gpg [options] [files]\n"
+#| "sign, check, encrypt or decrypt\n"
+#| "default operation depends on the input data\n"
msgid ""
"Syntax: gpg [options] [files]\n"
-"sign, check, encrypt or decrypt\n"
-"default operation depends on the input data\n"
+"Sign, check, encrypt or decrypt\n"
+"Default operation depends on the input data\n"
msgstr ""
"语法：gpg [选项] [文件名]\n"
"签名、检查、加密或解密\n"
"默认的操作依输入数据而定\n"
-#: g10/gpg.c:850 sm/gpgsm.c:543
+#: g10/gpg.c:856 sm/gpgsm.c:543
msgid ""
"\n"
"Supported algorithms:\n"
"\n"
"支持的算法：\n"
-#: g10/gpg.c:853
+#: g10/gpg.c:859
msgid "Pubkey: "
msgstr "公钥："
-#: g10/gpg.c:860 g10/keyedit.c:2423
+#: g10/gpg.c:866 g10/keyedit.c:2427
msgid "Cipher: "
msgstr "对称加密："
-#: g10/gpg.c:867
+#: g10/gpg.c:873
msgid "Hash: "
msgstr "散列："
-#: g10/gpg.c:874 g10/keyedit.c:2468
+#: g10/gpg.c:880 g10/keyedit.c:2472
msgid "Compression: "
msgstr "压缩："
-#: g10/gpg.c:944
+#: g10/gpg.c:949
msgid "usage: gpg [options] "
msgstr "用法：gpg [选项] "
-#: g10/gpg.c:1158 sm/gpgsm.c:716
+#: g10/gpg.c:1163 sm/gpgsm.c:716
msgid "conflicting commands\n"
msgstr "冲突的指令\n"
-#: g10/gpg.c:1176
+#: g10/gpg.c:1181
#, c-format
msgid "no = sign found in group definition `%s'\n"
msgstr "在‘%s’组定义里找不到等号(=)\n"
-#: g10/gpg.c:1373
+#: g10/gpg.c:1378
#, c-format
msgid "WARNING: unsafe ownership on homedir `%s'\n"
msgstr "警告：用户目录‘%s’所有权不安全\n"
-#: g10/gpg.c:1376
+#: g10/gpg.c:1381
#, c-format
msgid "WARNING: unsafe ownership on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’所有权不安全\n"
-#: g10/gpg.c:1379
+#: g10/gpg.c:1384
#, c-format
msgid "WARNING: unsafe ownership on extension `%s'\n"
msgstr "警告：扩展模块‘%s’所有权不安全\n"
-#: g10/gpg.c:1385
+#: g10/gpg.c:1390
#, c-format
msgid "WARNING: unsafe permissions on homedir `%s'\n"
msgstr "警告：用户目录‘%s’权限不安全\n"
-#: g10/gpg.c:1388
+#: g10/gpg.c:1393
#, c-format
msgid "WARNING: unsafe permissions on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’权限不安全\n"
-#: g10/gpg.c:1391
+#: g10/gpg.c:1396
#, c-format
msgid "WARNING: unsafe permissions on extension `%s'\n"
msgstr "警告：扩展模块‘%s’权限不安全\n"
-#: g10/gpg.c:1397
+#: g10/gpg.c:1402
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1400
+#: g10/gpg.c:1405
#, c-format
msgid ""
"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1403
+#: g10/gpg.c:1408
#, c-format
msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
-#: g10/gpg.c:1409
+#: g10/gpg.c:1414
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1412
+#: g10/gpg.c:1417
#, c-format
msgid ""
"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1415
+#: g10/gpg.c:1420
#, c-format
msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
-#: g10/gpg.c:1595
+#: g10/gpg.c:1600
#, c-format
msgid "unknown configuration item `%s'\n"
msgstr "未知的配置项‘%s’\n"
-#: g10/gpg.c:1699
+#: g10/gpg.c:1704
msgid "display photo IDs during key listings"
msgstr "列出密钥时显示用户标识"
-#: g10/gpg.c:1701
+#: g10/gpg.c:1706
msgid "show policy URLs during signature listings"
msgstr "列出签名时显示策略 URL"
-#: g10/gpg.c:1703
+#: g10/gpg.c:1708
msgid "show all notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1705
+#: g10/gpg.c:1710
msgid "show IETF standard notations during signature listings"
msgstr "列出签名时显示 IETF 标准注记"
-#: g10/gpg.c:1709
+#: g10/gpg.c:1714
msgid "show user-supplied notations during signature listings"
msgstr "列出签名时显示用户提供的注记"
-#: g10/gpg.c:1711
+#: g10/gpg.c:1716
msgid "show preferred keyserver URLs during signature listings"
msgstr "列出密钥时显示首选公钥服务器 URL"
-#: g10/gpg.c:1713
+#: g10/gpg.c:1718
msgid "show user ID validity during key listings"
msgstr "列出密钥时显示用户标识的有效性"
-#: g10/gpg.c:1715
+#: g10/gpg.c:1720
msgid "show revoked and expired user IDs in key listings"
msgstr "列出密钥时显示已吊销或已过期的用户标识"
-#: g10/gpg.c:1717
+#: g10/gpg.c:1722
msgid "show revoked and expired subkeys in key listings"
msgstr "列出密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:1719
+#: g10/gpg.c:1724
msgid "show the keyring name in key listings"
msgstr "列出密钥时显示钥匙环的名称"
-#: g10/gpg.c:1721
+#: g10/gpg.c:1726
msgid "show expiration dates during signature listings"
msgstr "列出签名时显示过期日期"
-#: g10/gpg.c:1855
+#: g10/gpg.c:1860
#, c-format
msgid "NOTE: old default options file `%s' ignored\n"
msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
-#: g10/gpg.c:1948
+#: g10/gpg.c:1953
#, c-format
msgid "libgcrypt is too old (need %s, have %s)\n"
msgstr ""
-#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
+#: g10/gpg.c:2355 g10/gpg.c:3050 g10/gpg.c:3062
#, c-format
msgid "NOTE: %s is not for normal use!\n"
msgstr "注意：一般情况下不会用到 %s！\n"
-#: g10/gpg.c:2530 g10/gpg.c:2542
+#: g10/gpg.c:2539 g10/gpg.c:2551
#, c-format
msgid "`%s' is not a valid signature expiration\n"
msgstr "‘%s’不是一个有效的签名过期日期\n"
-#: g10/gpg.c:2624
+#: g10/gpg.c:2633
#, c-format
msgid "`%s' is not a valid character set\n"
msgstr "‘%s’不是一个有效的字符集\n"
-#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4197
+#: g10/gpg.c:2656 g10/gpg.c:2851 g10/keyedit.c:4201
msgid "could not parse keyserver URL\n"
msgstr "无法解析公钥服务器 URL\n"
-#: g10/gpg.c:2659
+#: g10/gpg.c:2668
#, c-format
msgid "%s:%d: invalid keyserver options\n"
msgstr "%s：%d：无效的公钥服务器选项\n"
-#: g10/gpg.c:2662
+#: g10/gpg.c:2671
msgid "invalid keyserver options\n"
msgstr "无效的公钥服务器选项\n"
-#: g10/gpg.c:2669
+#: g10/gpg.c:2678
#, c-format
msgid "%s:%d: invalid import options\n"
msgstr "%s：%d：无效的导入选项\n"
-#: g10/gpg.c:2672
+#: g10/gpg.c:2681
msgid "invalid import options\n"
msgstr "无效的导入选项\n"
-#: g10/gpg.c:2679
+#: g10/gpg.c:2688
#, c-format
msgid "%s:%d: invalid export options\n"
msgstr "%s：%d：无效的导出选项\n"
-#: g10/gpg.c:2682
+#: g10/gpg.c:2691
msgid "invalid export options\n"
msgstr "无效的导出选项\n"
-#: g10/gpg.c:2689
+#: g10/gpg.c:2698
#, c-format
msgid "%s:%d: invalid list options\n"
msgstr "%s：%d：无效的列表选项\n"
-#: g10/gpg.c:2692
+#: g10/gpg.c:2701
msgid "invalid list options\n"
msgstr "无效的列表选项\n"
-#: g10/gpg.c:2700
+#: g10/gpg.c:2709
msgid "display photo IDs during signature verification"
msgstr "验证签名时显示照片标识"
-#: g10/gpg.c:2702
+#: g10/gpg.c:2711
msgid "show policy URLs during signature verification"
msgstr "验证签名时显示策略 URL"
-#: g10/gpg.c:2704
+#: g10/gpg.c:2713
msgid "show all notations during signature verification"
msgstr "验证签名时显示所有注记"
-#: g10/gpg.c:2706
+#: g10/gpg.c:2715
msgid "show IETF standard notations during signature verification"
msgstr "验证签名时显示 IETF 标准注记"
-#: g10/gpg.c:2710
+#: g10/gpg.c:2719
msgid "show user-supplied notations during signature verification"
msgstr "验证签名时显示用户提供的注记"
-#: g10/gpg.c:2712
+#: g10/gpg.c:2721
msgid "show preferred keyserver URLs during signature verification"
msgstr "验证签名时显示首选公钥服务器 URL"
-#: g10/gpg.c:2714
+#: g10/gpg.c:2723
msgid "show user ID validity during signature verification"
msgstr "验证签名时显示用户标识的有效性"
-#: g10/gpg.c:2716
+#: g10/gpg.c:2725
msgid "show revoked and expired user IDs in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2718
+#: g10/gpg.c:2727
#, fuzzy
msgid "show only the primary user ID in signature verification"
msgstr "验证密钥时显示已吊销或已过期的子钥"
-#: g10/gpg.c:2720
+#: g10/gpg.c:2729
msgid "validate signatures with PKA data"
msgstr "使用 PKA 数据验证签名的有效性"
-#: g10/gpg.c:2722
+#: g10/gpg.c:2731
msgid "elevate the trust of signatures with valid PKA data"
msgstr "提升带有有效 PKA 数据的签名的信任度"
-#: g10/gpg.c:2729
+#: g10/gpg.c:2738
#, c-format
msgid "%s:%d: invalid verify options\n"
msgstr "%s：%d：无效的校验选项\n"
-#: g10/gpg.c:2732
+#: g10/gpg.c:2741
msgid "invalid verify options\n"
msgstr "无效的校验选项\n"
-#: g10/gpg.c:2739
+#: g10/gpg.c:2748
#, c-format
msgid "unable to set exec-path to %s\n"
msgstr "无法把运行路径设成 %s\n"
-#: g10/gpg.c:2925
+#: g10/gpg.c:2934
#, c-format
msgid "%s:%d: invalid auto-key-locate list\n"
msgstr "%s：%d：无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:2928
+#: g10/gpg.c:2937
msgid "invalid auto-key-locate list\n"
msgstr "无效的 auto-key-locate 清单\n"
-#: g10/gpg.c:3026 sm/gpgsm.c:1439
+#: g10/gpg.c:3039 sm/gpgsm.c:1442
msgid "WARNING: program may create a core file!\n"
msgstr "警告：程序可能会创建核心内存转储！\n"
-#: g10/gpg.c:3030
+#: g10/gpg.c:3043
#, c-format
msgid "WARNING: %s overrides %s\n"
msgstr "警告：%s 会使得 %s 失效\n"
-#: g10/gpg.c:3039
+#: g10/gpg.c:3052
#, c-format
msgid "%s not allowed with %s!\n"
msgstr "%s 不可与 %s 并用\n"
-#: g10/gpg.c:3042
+#: g10/gpg.c:3055
#, c-format
msgid "%s makes no sense with %s!\n"
msgstr "%s 与 %s 并用无意义！\n"
-#: g10/gpg.c:3057
+#: g10/gpg.c:3070
#, c-format
msgid "will not run with insecure memory due to %s\n"
msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
-#: g10/gpg.c:3071
+#: g10/gpg.c:3084
msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
-#: g10/gpg.c:3077
+#: g10/gpg.c:3090
msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
-#: g10/gpg.c:3083
+#: g10/gpg.c:3096
msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
-#: g10/gpg.c:3096
+#: g10/gpg.c:3109
msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
-#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1511
+#: g10/gpg.c:3177 g10/gpg.c:3201 sm/gpgsm.c:1514
msgid "selected cipher algorithm is invalid\n"
msgstr "所选的对称加密算法无效\n"
-#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1517 sm/gpgsm.c:1523
+#: g10/gpg.c:3183 g10/gpg.c:3207 sm/gpgsm.c:1520 sm/gpgsm.c:1526
msgid "selected digest algorithm is invalid\n"
msgstr "所选的散列算法无效\n"
-#: g10/gpg.c:3175
+#: g10/gpg.c:3189
msgid "selected compression algorithm is invalid\n"
msgstr "所选的压缩算法无效\n"
-#: g10/gpg.c:3181
+#: g10/gpg.c:3195
msgid "selected certification digest algorithm is invalid\n"
msgstr "所选的证书散列算法无效\n"
-#: g10/gpg.c:3196
+#: g10/gpg.c:3210
msgid "completes-needed must be greater than 0\n"
msgstr "需要的完全可信签名数一定要大于 0\n"
-#: g10/gpg.c:3198
+#: g10/gpg.c:3212
msgid "marginals-needed must be greater than 1\n"
msgstr "需要的勉强可信签名数一定要大于 1\n"
-#: g10/gpg.c:3200
+#: g10/gpg.c:3214
msgid "max-cert-depth must be in the range from 1 to 255\n"
msgstr "最大验证深度一定要介于 1 和 255 之间\n"
-#: g10/gpg.c:3202
+#: g10/gpg.c:3216
msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
-#: g10/gpg.c:3204
+#: g10/gpg.c:3218
msgid "invalid min-cert-level; must be 1, 2, or 3\n"
msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
-#: g10/gpg.c:3207
+#: g10/gpg.c:3221
msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
-#: g10/gpg.c:3211
+#: g10/gpg.c:3225
msgid "invalid S2K mode; must be 0, 1 or 3\n"
msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
-#: g10/gpg.c:3218
+#: g10/gpg.c:3232
msgid "invalid default preferences\n"
msgstr "无效的默认首选项\n"
-#: g10/gpg.c:3222
+#: g10/gpg.c:3236
msgid "invalid personal cipher preferences\n"
msgstr "无效的个人对称加密算法首选项\n"
-#: g10/gpg.c:3226
+#: g10/gpg.c:3240
msgid "invalid personal digest preferences\n"
msgstr "无效的个人散列算法首选项\n"
-#: g10/gpg.c:3230
+#: g10/gpg.c:3244
msgid "invalid personal compress preferences\n"
msgstr "无效的个人压缩算法首选项\n"
-#: g10/gpg.c:3263
+#: g10/gpg.c:3277
#, c-format
msgid "%s does not yet work with %s\n"
msgstr "%s 尚不能和 %s 并用\n"
-#: g10/gpg.c:3310
+#: g10/gpg.c:3324
#, c-format
msgid "you may not use cipher algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
-#: g10/gpg.c:3315
+#: g10/gpg.c:3329
#, c-format
msgid "you may not use digest algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
-#: g10/gpg.c:3320
+#: g10/gpg.c:3334
#, c-format
msgid "you may not use compression algorithm `%s' while in %s mode\n"
msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
-#: g10/gpg.c:3406
+#: g10/gpg.c:3429
#, c-format
msgid "failed to initialize the TrustDB: %s\n"
msgstr "初始化信任度数据库失败：%s\n"
-#: g10/gpg.c:3417
+#: g10/gpg.c:3440
msgid "WARNING: recipients (-r) given without using public key encryption\n"
msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
-#: g10/gpg.c:3438
+#: g10/gpg.c:3461
msgid "--store [filename]"
msgstr "--store [文件名]"
-#: g10/gpg.c:3445
+#: g10/gpg.c:3468
msgid "--symmetric [filename]"
msgstr "--symmetric [文件名]"
-#: g10/gpg.c:3447
+#: g10/gpg.c:3470
#, c-format
msgid "symmetric encryption of `%s' failed: %s\n"
msgstr "对称加密‘%s’失败：%s\n"
-#: g10/gpg.c:3457
+#: g10/gpg.c:3480
msgid "--encrypt [filename]"
msgstr "--encrypt [文件名]"
-#: g10/gpg.c:3470
+#: g10/gpg.c:3493
msgid "--symmetric --encrypt [filename]"
msgstr "--symmetric --encrypt [文件名]"
-#: g10/gpg.c:3472
+#: g10/gpg.c:3495
msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3475
+#: g10/gpg.c:3498
#, c-format
msgid "you cannot use --symmetric --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
-#: g10/gpg.c:3493
+#: g10/gpg.c:3516
msgid "--sign [filename]"
msgstr "--sign [文件名]"
-#: g10/gpg.c:3506
+#: g10/gpg.c:3529
msgid "--sign --encrypt [filename]"
msgstr "--sign --encrypt [文件名]"
-#: g10/gpg.c:3521
+#: g10/gpg.c:3544
msgid "--symmetric --sign --encrypt [filename]"
msgstr "--symmetric --sign --encrypt [文件名]"
-#: g10/gpg.c:3523
+#: g10/gpg.c:3546
msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
-#: g10/gpg.c:3526
+#: g10/gpg.c:3549
#, c-format
msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
-#: g10/gpg.c:3546
+#: g10/gpg.c:3569
msgid "--sign --symmetric [filename]"
msgstr "--sign --symmetric [文件名]"
-#: g10/gpg.c:3555
+#: g10/gpg.c:3578
msgid "--clearsign [filename]"
msgstr "--clearsign [文件名]"
-#: g10/gpg.c:3580
+#: g10/gpg.c:3603
msgid "--decrypt [filename]"
msgstr "--decrypt [文件名]"
-#: g10/gpg.c:3588
+#: g10/gpg.c:3611
msgid "--sign-key user-id"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3592
+#: g10/gpg.c:3615
msgid "--lsign-key user-id"
msgstr "--lsign-key 用户标识"
-#: g10/gpg.c:3613
+#: g10/gpg.c:3636
msgid "--edit-key user-id [commands]"
msgstr "--edit-key 用户标识 [指令]"
-#: g10/gpg.c:3629
+#: g10/gpg.c:3652
#, fuzzy
msgid "--passwd <user-id>"
msgstr "--sign-key 用户标识"
-#: g10/gpg.c:3716
+#: g10/gpg.c:3739
#, c-format
msgid "keyserver send failed: %s\n"
msgstr "上传至公钥服务器失败：%s\n"
-#: g10/gpg.c:3718
+#: g10/gpg.c:3741
#, c-format
msgid "keyserver receive failed: %s\n"
msgstr "从公钥服务器接收失败：%s\n"
-#: g10/gpg.c:3720
+#: g10/gpg.c:3743
#, c-format
msgid "key export failed: %s\n"
msgstr "导出密钥失败：%s\n"
-#: g10/gpg.c:3731
+#: g10/gpg.c:3754
#, c-format
msgid "keyserver search failed: %s\n"
msgstr "搜寻公钥服务器失败：%s\n"
-#: g10/gpg.c:3741
+#: g10/gpg.c:3764
#, c-format
msgid "keyserver refresh failed: %s\n"
msgstr "从公钥服务器更新失败：%s\n"
-#: g10/gpg.c:3792
+#: g10/gpg.c:3815
#, c-format
msgid "dearmoring failed: %s\n"
msgstr "解开 ASCII 封装失败：%s\n"
-#: g10/gpg.c:3800
+#: g10/gpg.c:3823
#, c-format
msgid "enarmoring failed: %s\n"
msgstr "进行 ASCII 封装失败：%s\n"
-#: g10/gpg.c:3890
+#: g10/gpg.c:3913
#, c-format
msgid "invalid hash algorithm `%s'\n"
msgstr "无效的‘%s’散列算法\n"
-#: g10/gpg.c:4005
+#: g10/gpg.c:4028
msgid "[filename]"
msgstr "[文件名]"
-#: g10/gpg.c:4009
+#: g10/gpg.c:4032
msgid "Go ahead and type your message ...\n"
msgstr "请开始键入您的报文……\n"
-#: g10/gpg.c:4323
+#: g10/gpg.c:4346
msgid "the given certification policy URL is invalid\n"
msgstr "给定的的验证策略 URL 无效\n"
-#: g10/gpg.c:4325
+#: g10/gpg.c:4348
msgid "the given signature policy URL is invalid\n"
msgstr "给定的签名策略 URL 无效\n"
-#: g10/gpg.c:4358
+#: g10/gpg.c:4381
msgid "the given preferred keyserver URL is invalid\n"
msgstr "给定的首选公钥服务器 URL 无效\n"
msgid "No help available for `%s'"
msgstr "‘%s’没有可用的帮助"
-#: g10/import.c:94
+#: g10/import.c:97
msgid "import signatures that are marked as local-only"
msgstr "导入被标记为局部的签名"
-#: g10/import.c:96
+#: g10/import.c:99
msgid "repair damage from the pks keyserver during import"
msgstr "导入时修复 PKS 公钥服务器导致的损坏"
-#: g10/import.c:98
+#: g10/import.c:101
msgid "do not update the trustdb after import"
msgstr "导入后不更新信任度数据库"
-#: g10/import.c:100
+#: g10/import.c:103
msgid "create a public key when importing a secret key"
msgstr "导入私钥时创建对应的公钥"
-#: g10/import.c:102
+#: g10/import.c:105
msgid "only accept updates to existing keys"
msgstr "只接受对已有密钥的更新"
-#: g10/import.c:104
+#: g10/import.c:107
msgid "remove unusable parts from key after import"
msgstr "导入后清除密钥中无用的部分"
-#: g10/import.c:106
+#: g10/import.c:109
msgid "remove as much as possible from key after import"
msgstr "导入后尽可能清除密钥中的可选部分"
-#: g10/import.c:266
+#: g10/import.c:277
#, c-format
msgid "skipping block of type %d\n"
msgstr "跳过 %d 样式的区块\n"
-#: g10/import.c:275
+#: g10/import.c:286
#, c-format
msgid "%lu keys processed so far\n"
msgstr "目前已处理 %lu 把密钥\n"
-#: g10/import.c:292
+#: g10/import.c:303
#, c-format
msgid "Total number processed: %lu\n"
msgstr "合计被处理的数量：%lu\n"
-#: g10/import.c:294
+#: g10/import.c:305
#, c-format
msgid " skipped new keys: %lu\n"
msgstr " 已跳过的新密钥：%lu\n"
-#: g10/import.c:297
+#: g10/import.c:308
#, c-format
msgid " w/o user IDs: %lu\n"
msgstr " 遗失用户标识：%lu\n"
-#: g10/import.c:299 sm/import.c:114
+#: g10/import.c:310 sm/import.c:114
#, c-format
msgid " imported: %lu"
msgstr " 已导入：%lu"
-#: g10/import.c:305 sm/import.c:118
+#: g10/import.c:316 sm/import.c:118
#, c-format
msgid " unchanged: %lu\n"
msgstr " 未改变：%lu\n"
-#: g10/import.c:307
+#: g10/import.c:318
#, c-format
msgid " new user IDs: %lu\n"
msgstr " 新用户标识：%lu\n"
-#: g10/import.c:309
+#: g10/import.c:320
#, c-format
msgid " new subkeys: %lu\n"
msgstr " 新的子钥：%lu\n"
-#: g10/import.c:311
+#: g10/import.c:322
#, c-format
msgid " new signatures: %lu\n"
msgstr " 新的签名：%lu\n"
-#: g10/import.c:313
+#: g10/import.c:324
#, c-format
msgid " new key revocations: %lu\n"
msgstr " 新的密钥吊销：%lu\n"
-#: g10/import.c:315 sm/import.c:120
+#: g10/import.c:326 sm/import.c:120
#, c-format
msgid " secret keys read: %lu\n"
msgstr " 读取的私钥：%lu\n"
-#: g10/import.c:317 sm/import.c:122
+#: g10/import.c:328 sm/import.c:122
#, c-format
msgid " secret keys imported: %lu\n"
msgstr " 导入的私钥：%lu\n"
-#: g10/import.c:319 sm/import.c:124
+#: g10/import.c:330 sm/import.c:124
#, c-format
msgid " secret keys unchanged: %lu\n"
msgstr " 未改变的私钥：%lu\n"
-#: g10/import.c:321 sm/import.c:126
+#: g10/import.c:332 sm/import.c:126
#, c-format
msgid " not imported: %lu\n"
msgstr " 未被导入：%lu\n"
-#: g10/import.c:323
+#: g10/import.c:334
#, c-format
msgid " signatures cleaned: %lu\n"
msgstr " 清除的签名：%lu\n"
-#: g10/import.c:325
+#: g10/import.c:336
#, c-format
msgid " user IDs cleaned: %lu\n"
msgstr " 清除的用户标识：%lu\n"
-#: g10/import.c:606
+#: g10/import.c:638
#, fuzzy, c-format
msgid ""
"WARNING: key %s contains preferences for unavailable\n"
"algorithms on these user IDs:\n"
msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
-#: g10/import.c:647
+#: g10/import.c:679
#, c-format
msgid " \"%s\": preference for cipher algorithm %s\n"
msgstr " “%s”：对称加密算法 %s 对应首选项\n"
-#: g10/import.c:662
+#: g10/import.c:694
#, c-format
msgid " \"%s\": preference for digest algorithm %s\n"
msgstr " “%s”：散列算法 %s 对应首选项\n"
-#: g10/import.c:674
+#: g10/import.c:706
#, c-format
msgid " \"%s\": preference for compression algorithm %s\n"
msgstr " “%s”：压缩算法 %s 对应首选项\n"
-#: g10/import.c:687
+#: g10/import.c:719
msgid "it is strongly suggested that you update your preferences and\n"
msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
-#: g10/import.c:689
+#: g10/import.c:721
msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
msgstr "以避免可能的算法不匹配问题\n"
-#: g10/import.c:713
+#: g10/import.c:745
#, 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:766 g10/import.c:1179
+#: g10/import.c:798 g10/import.c:1231
#, c-format
msgid "key %s: no user ID\n"
msgstr "密钥 %s：没有用户标识\n"
-#: g10/import.c:795
+#: g10/import.c:804
+#, fuzzy, c-format
+#| msgid "skipped \"%s\": %s\n"
+msgid "key %s: %s\n"
+msgstr "“%s”已跳过：%s\n"
+
+#: g10/import.c:805 g10/import.c:1206
+msgid "rejected by import filter"
+msgstr ""
+
+#: g10/import.c:834
#, c-format
msgid "key %s: PKS subkey corruption repaired\n"
msgstr "密钥 %s：PKS 子钥破损已修复\n"
-#: g10/import.c:810
+#: g10/import.c:849
#, c-format
msgid "key %s: accepted non self-signed user ID \"%s\"\n"
msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
-#: g10/import.c:816
+#: g10/import.c:855
#, c-format
msgid "key %s: no valid user IDs\n"
msgstr "密钥 %s：没有有效的用户标识\n"
-#: g10/import.c:818
+#: g10/import.c:857
msgid "this may be caused by a missing self-signature\n"
msgstr "这可能由于遗失自身签名所致\n"
-#: g10/import.c:828 g10/import.c:1303
+#: g10/import.c:867 g10/import.c:1356
#, c-format
msgid "key %s: public key not found: %s\n"
msgstr "密钥 %s：找不到公钥：%s\n"
-#: g10/import.c:834
+#: g10/import.c:873
#, c-format
msgid "key %s: new key - skipped\n"
msgstr "密钥 %s：新密钥――已跳过\n"
-#: g10/import.c:843
+#: g10/import.c:882
#, c-format
msgid "no writable keyring found: %s\n"
msgstr "找不到可写的钥匙环：%s\n"
-#: g10/import.c:848 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:887 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
#, c-format
msgid "writing to `%s'\n"
msgstr "正在写入‘%s’\n"
-#: g10/import.c:852 g10/import.c:952 g10/import.c:1219 g10/import.c:1364
-#: g10/import.c:2494 g10/import.c:2516
+#: g10/import.c:891 g10/import.c:991 g10/import.c:1271 g10/import.c:1417
+#: g10/import.c:2547 g10/import.c:2569
#, c-format
msgid "error writing keyring `%s': %s\n"
msgstr "写入钥匙环‘%s’时出错： %s\n"
-#: g10/import.c:871
+#: g10/import.c:910
#, c-format
msgid "key %s: public key \"%s\" imported\n"
msgstr "密钥 %s：公钥“%s”已导入\n"
-#: g10/import.c:895
+#: g10/import.c:934
#, c-format
msgid "key %s: doesn't match our copy\n"
msgstr "密钥 %s：与我们的副本不吻合\n"
-#: g10/import.c:912 g10/import.c:1321
+#: g10/import.c:951 g10/import.c:1374
#, c-format
msgid "key %s: can't locate original keyblock: %s\n"
msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
-#: g10/import.c:920 g10/import.c:1328
+#: g10/import.c:959 g10/import.c:1381
#, c-format
msgid "key %s: can't read original keyblock: %s\n"
msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
-#: g10/import.c:962
+#: g10/import.c:1001
#, c-format
msgid "key %s: \"%s\" 1 new user ID\n"
msgstr "密钥 %s：“%s”一个新的用户标识\n"
-#: g10/import.c:965
+#: g10/import.c:1004
#, c-format
msgid "key %s: \"%s\" %d new user IDs\n"
msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
-#: g10/import.c:968
+#: g10/import.c:1007
#, c-format
msgid "key %s: \"%s\" 1 new signature\n"
msgstr "密钥 %s：“%s”1 个新的签名\n"
-#: g10/import.c:971
+#: g10/import.c:1010
#, c-format
msgid "key %s: \"%s\" %d new signatures\n"
msgstr "密钥 %s：“%s”%d 个新的签名\n"
-#: g10/import.c:974
+#: g10/import.c:1013
#, c-format
msgid "key %s: \"%s\" 1 new subkey\n"
msgstr "密钥 %s：“%s”1 个新的子钥\n"
-#: g10/import.c:977
+#: g10/import.c:1016
#, c-format
msgid "key %s: \"%s\" %d new subkeys\n"
msgstr "密钥 %s：“%s”%d 个新的子钥\n"
-#: g10/import.c:980
+#: g10/import.c:1019
#, c-format
msgid "key %s: \"%s\" %d signature cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
-#: g10/import.c:983
+#: g10/import.c:1022
#, c-format
msgid "key %s: \"%s\" %d signatures cleaned\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
-#: g10/import.c:986
+#: g10/import.c:1025
#, c-format
msgid "key %s: \"%s\" %d user ID cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
-#: g10/import.c:989
+#: g10/import.c:1028
#, c-format
msgid "key %s: \"%s\" %d user IDs cleaned\n"
msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
-#: g10/import.c:1013
+#: g10/import.c:1052
#, c-format
msgid "key %s: \"%s\" not changed\n"
msgstr "密钥 %s：“%s”未改变\n"
-#: g10/import.c:1185
-#, c-format
-msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
+#: g10/import.c:1205
+#, fuzzy, c-format
+#| msgid "secret key \"%s\" not found: %s\n"
+msgid "secret key %s: %s\n"
+msgstr "找不到私钥“%s”：%s\n"
-#: g10/import.c:1196
+#: g10/import.c:1225 g10/import.c:1248
msgid "importing secret keys not allowed\n"
msgstr "不允许导入私钥\n"
-#: g10/import.c:1213 g10/import.c:2509
+#: g10/import.c:1237
+#, c-format
+msgid "key %s: secret key with invalid cipher %d - skipped\n"
+msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
+
+#: g10/import.c:1265 g10/import.c:2562
#, c-format
msgid "no default secret keyring: %s\n"
msgstr "没有默认的私钥钥匙环： %s\n"
-#: g10/import.c:1224
+#: g10/import.c:1276
#, c-format
msgid "key %s: secret key imported\n"
msgstr "密钥 %s：私钥已导入\n"
-#: g10/import.c:1254
+#: g10/import.c:1307
#, c-format
msgid "key %s: already in secret keyring\n"
msgstr "密钥 %s：已在私钥钥匙环中\n"
-#: g10/import.c:1264
+#: g10/import.c:1317
#, c-format
msgid "key %s: secret key not found: %s\n"
msgstr "密钥 %s：找不到私钥：%s\n"
-#: g10/import.c:1296
+#: g10/import.c:1349
#, c-format
msgid "key %s: no public key - can't apply revocation certificate\n"
msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
-#: g10/import.c:1339
+#: g10/import.c:1392
#, c-format
msgid "key %s: invalid revocation certificate: %s - rejected\n"
msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
-#: g10/import.c:1371
+#: g10/import.c:1424
#, c-format
msgid "key %s: \"%s\" revocation certificate imported\n"
msgstr "密钥 %s：“%s”吊销证书已被导入\n"
-#: g10/import.c:1447
+#: g10/import.c:1500
#, c-format
msgid "key %s: no user ID for signature\n"
msgstr "密钥 %s：签名没有用户标识\n"
-#: g10/import.c:1464
+#: g10/import.c:1517
#, c-format
msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
-#: g10/import.c:1466
+#: g10/import.c:1519
#, c-format
msgid "key %s: invalid self-signature on user ID \"%s\"\n"
msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
-#: g10/import.c:1483 g10/import.c:1509 g10/import.c:1560
+#: g10/import.c:1536 g10/import.c:1562 g10/import.c:1613
#, c-format
msgid "key %s: unsupported public key algorithm\n"
msgstr "密钥 %s：不支持的公钥算法\n"
-#: g10/import.c:1484
+#: g10/import.c:1537
#, fuzzy, c-format
msgid "key %s: invalid direct key signature\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
-#: g10/import.c:1498
+#: g10/import.c:1551
#, c-format
msgid "key %s: no subkey for key binding\n"
msgstr "密钥 %s：没有可供绑定的子钥\n"
-#: g10/import.c:1511
+#: g10/import.c:1564
#, c-format
msgid "key %s: invalid subkey binding\n"
msgstr "密钥 %s：无效的子钥绑定\n"
-#: g10/import.c:1527
+#: g10/import.c:1580
#, c-format
msgid "key %s: removed multiple subkey binding\n"
msgstr "密钥 %s：已删除多重子钥绑定\n"
-#: g10/import.c:1549
+#: g10/import.c:1602
#, c-format
msgid "key %s: no subkey for key revocation\n"
msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
-#: g10/import.c:1562
+#: g10/import.c:1615
#, c-format
msgid "key %s: invalid subkey revocation\n"
msgstr "密钥 %s：无效的子钥吊销\n"
-#: g10/import.c:1577
+#: g10/import.c:1630
#, c-format
msgid "key %s: removed multiple subkey revocation\n"
msgstr "密钥 %s：已删除多重子钥吊销\n"
-#: g10/import.c:1618
+#: g10/import.c:1671
#, c-format
msgid "key %s: skipped user ID \"%s\"\n"
msgstr "密钥 %s：已跳过用户标识“%s”\n"
-#: g10/import.c:1639
+#: g10/import.c:1692
#, c-format
msgid "key %s: skipped subkey\n"
msgstr "密钥 %s：已跳过子钥\n"
# * to import non-exportable signature when we have the
# * the secret key used to create this signature - it
# * seems that this makes sense
-#: g10/import.c:1666
+#: g10/import.c:1719
#, c-format
msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
-#: g10/import.c:1676
+#: g10/import.c:1729
#, c-format
msgid "key %s: revocation certificate at wrong place - skipped\n"
msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
-#: g10/import.c:1693
+#: g10/import.c:1746
#, c-format
msgid "key %s: invalid revocation certificate: %s - skipped\n"
msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
-#: g10/import.c:1707
+#: g10/import.c:1760
#, c-format
msgid "key %s: subkey signature in wrong place - skipped\n"
msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
-#: g10/import.c:1715
+#: g10/import.c:1768
#, c-format
msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
-#: g10/import.c:1844
+#: g10/import.c:1897
#, c-format
msgid "key %s: duplicated user ID detected - merged\n"
msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
-#: g10/import.c:1906
+#: g10/import.c:1959
#, c-format
msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
-#: g10/import.c:1920
+#: g10/import.c:1973
#, c-format
msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
-#: g10/import.c:1979
+#: g10/import.c:2032
#, c-format
msgid "key %s: \"%s\" revocation certificate added\n"
msgstr "密钥 %s：已新增吊销证书“%s”\n"
-#: g10/import.c:2013
+#: g10/import.c:2066
#, c-format
msgid "key %s: direct key signature added\n"
msgstr "密钥 %s：已新增直接密钥签名\n"
-#: g10/import.c:2414
+#: g10/import.c:2467
msgid "NOTE: a key's S/N does not match the card's one\n"
msgstr "注意：密钥的序列号与卡的不符\n"
-#: g10/import.c:2422
+#: g10/import.c:2475
msgid "NOTE: primary key is online and stored on card\n"
msgstr "注意：主钥在线，存储在卡上\n"
-#: g10/import.c:2424
+#: g10/import.c:2477
msgid "NOTE: secondary key is online and stored on card\n"
msgstr "注意：子钥在线，存储在卡上\n"
-#: g10/keydb.c:181
+#: g10/keydb.c:182
#, c-format
msgid "error creating keyring `%s': %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
-#: g10/keydb.c:187
+#: g10/keydb.c:188
#, c-format
msgid "keyring `%s' created\n"
msgstr "钥匙环‘%s’已建立\n"
-#: g10/keydb.c:333 g10/keydb.c:336
+#: g10/keydb.c:348 g10/keydb.c:351
#, c-format
msgid "keyblock resource `%s': %s\n"
msgstr "密钥块资源‘%s’：%s\n"
-#: g10/keydb.c:719
+#: g10/keydb.c:749
#, c-format
msgid "failed to rebuild keyring cache: %s\n"
msgstr "重新建立钥匙环缓存失败： %s\n"
msgstr "用户标识“%s”已被吊销。"
#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1785
+#: g10/keyedit.c:895 g10/keyedit.c:1789
msgid "Are you sure you still want to sign it? (y/N) "
msgstr "您仍然想要为它签名吗？(y/N)"
#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1795
msgid " Unable to sign.\n"
msgstr " 无法添加签名。\n"
msgid "Really sign? (y/N) "
msgstr "真的要签名吗？(y/N)"
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4969 g10/keyedit.c:5060 g10/keyedit.c:5124
+#: g10/keyedit.c:5185 g10/sign.c:316
#, c-format
msgid "signing failed: %s\n"
msgstr "签名时失败： %s\n"
msgid "Key has only stub or on-card key items - no passphrase to change.\n"
msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
-#: g10/keyedit.c:1142 g10/keygen.c:3774
+#: g10/keyedit.c:1142 g10/keygen.c:3782
msgid "This key is not protected.\n"
msgstr "这把密钥没有被保护。\n"
-#: g10/keyedit.c:1146 g10/keygen.c:3761 g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3769 g10/revoke.c:536
msgid "Secret parts of primary key are not available.\n"
msgstr "主钥的私钥部分无法取用。\n"
-#: g10/keyedit.c:1150 g10/keygen.c:3777
+#: g10/keyedit.c:1150 g10/keygen.c:3785
msgid "Secret parts of primary key are stored on-card.\n"
msgstr "主钥的私钥部分存储在卡上。\n"
-#: g10/keyedit.c:1156 g10/keygen.c:3781
+#: g10/keyedit.c:1156 g10/keygen.c:3789
msgid "Key is protected.\n"
msgstr "密钥受保护。\n"
"输入要给这把私钥用的新密码。\n"
"\n"
-#: g10/keyedit.c:1207 g10/keygen.c:2291
+#: g10/keyedit.c:1207 g10/keygen.c:2299
msgid "passphrase not correctly repeated; try again"
msgstr "密码再次输入时与首次输入不符；请再试一次"
msgid "compact unusable user IDs and remove all signatures from key"
msgstr "压缩不可用的用户标识并删除所有签名"
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1605
#, c-format
msgid "error reading secret keyblock \"%s\": %s\n"
msgstr "读取私钥区块“%s”时出错：%s\n"
-#: g10/keyedit.c:1619
+#: g10/keyedit.c:1623
msgid "Secret key is available.\n"
msgstr "私钥可用。\n"
-#: g10/keyedit.c:1702
+#: g10/keyedit.c:1706
msgid "Need the secret key to do this.\n"
msgstr "要有私钥才能这么做。\n"
-#: g10/keyedit.c:1710
+#: g10/keyedit.c:1714
msgid "Please use the command \"toggle\" first.\n"
msgstr "请先使用“toggle”指令。\n"
-#: g10/keyedit.c:1729
+#: g10/keyedit.c:1733
msgid ""
"* The `sign' command may be prefixed with an `l' for local signatures "
"(lsign),\n"
" 信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
" 合(ltsign、tnrsign 等)。\n"
-#: g10/keyedit.c:1779
+#: g10/keyedit.c:1783
msgid "Key is revoked."
msgstr "密钥已被吊销。"
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1802
msgid "Really sign all user IDs? (y/N) "
msgstr "真的为所有的用户标识签名吗？(y/N)"
-#: g10/keyedit.c:1805
+#: g10/keyedit.c:1809
msgid "Hint: Select the user IDs to sign\n"
msgstr "提示：选择要添加签名的用户标识\n"
-#: g10/keyedit.c:1814
+#: g10/keyedit.c:1818
#, c-format
msgid "Unknown signature type `%s'\n"
msgstr "未知的签名类型‘%s’\n"
-#: g10/keyedit.c:1837
+#: g10/keyedit.c:1841
#, c-format
msgid "This command is not allowed while in %s mode.\n"
msgstr "在 %s 模式中不允许使用这个指令。\n"
-#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
+#: g10/keyedit.c:1863 g10/keyedit.c:1883 g10/keyedit.c:2052
msgid "You must select at least one user ID.\n"
msgstr "您至少得选择一个用户标识。\n"
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1865
msgid "You can't delete the last user ID!\n"
msgstr "您不能删除最后一个用户标识！\n"
-#: g10/keyedit.c:1863
+#: g10/keyedit.c:1867
msgid "Really remove all selected user IDs? (y/N) "
msgstr "真的要删除所有选定的用户标识吗？(y/N)"
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1868
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:1917
+#: g10/keyedit.c:1921
#, fuzzy
msgid "Really move the primary key? (y/N) "
msgstr "真的要删除主钥吗？(y/N)"
-#: g10/keyedit.c:1929
+#: g10/keyedit.c:1933
msgid "You must select exactly one key.\n"
msgstr "您必须指定一把密钥。\n"
-#: g10/keyedit.c:1957
+#: g10/keyedit.c:1961
msgid "Command expects a filename argument\n"
msgstr "命令需要一个文件名作为参数\n"
-#: g10/keyedit.c:1971
+#: g10/keyedit.c:1975
#, c-format
msgid "Can't open `%s': %s\n"
msgstr "无法打开‘%s’：%s\n"
-#: g10/keyedit.c:1988
+#: g10/keyedit.c:1992
#, c-format
msgid "Error reading backup key from `%s': %s\n"
msgstr "从‘%s’读取备份密钥时出错：%s\n"
-#: g10/keyedit.c:2012
+#: g10/keyedit.c:2016
msgid "You must select at least one key.\n"
msgstr "您必须选择至少一把密钥。\n"
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2019
msgid "Do you really want to delete the selected keys? (y/N) "
msgstr "您真的想要删除选定的密钥吗？(y/N)"
-#: g10/keyedit.c:2016
+#: g10/keyedit.c:2020
msgid "Do you really want to delete this key? (y/N) "
msgstr "您真的要删除这把密钥吗？(y/N)"
-#: g10/keyedit.c:2051
+#: g10/keyedit.c:2055
msgid "Really revoke all selected user IDs? (y/N) "
msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
-#: g10/keyedit.c:2052
+#: g10/keyedit.c:2056
msgid "Really revoke this user ID? (y/N) "
msgstr "真的要吊销这个用户标识吗？(y/N)"
-#: g10/keyedit.c:2070
+#: g10/keyedit.c:2074
msgid "Do you really want to revoke the entire key? (y/N) "
msgstr "您真的要吊销整把密钥吗？(y/N)"
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2085
msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgstr "您真的要吊销选定的子钥吗？(y/N)"
-#: g10/keyedit.c:2083
+#: g10/keyedit.c:2087
msgid "Do you really want to revoke this subkey? (y/N) "
msgstr "您真的要吊销这把子钥吗？(y/N)"
-#: g10/keyedit.c:2133
+#: g10/keyedit.c:2137
msgid "Owner trust may not be set while using a user provided trust database\n"
msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
-#: g10/keyedit.c:2175
+#: g10/keyedit.c:2179
msgid "Set preference list to:\n"
msgstr "设为首选项列表为：\n"
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2185
msgid "Really update the preferences for the selected user IDs? (y/N) "
msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
-#: g10/keyedit.c:2183
+#: g10/keyedit.c:2187
msgid "Really update the preferences? (y/N) "
msgstr "真的要更新首选项吗？(y/N)"
-#: g10/keyedit.c:2253
+#: g10/keyedit.c:2257
msgid "Save changes? (y/N) "
msgstr "要保存变动吗？(y/N)"
-#: g10/keyedit.c:2256
+#: g10/keyedit.c:2260
msgid "Quit without saving? (y/N) "
msgstr "要不保存而离开吗？(y/N)"
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
#, c-format
msgid "update failed: %s\n"
msgstr "更新失败：%s\n"
-#: g10/keyedit.c:2273 g10/keyedit.c:2351
+#: g10/keyedit.c:2277 g10/keyedit.c:2355
#, c-format
msgid "update secret failed: %s\n"
msgstr "更新私钥失败：%s\n"
-#: g10/keyedit.c:2280
+#: g10/keyedit.c:2284
msgid "Key not changed so no update needed.\n"
msgstr "密钥没有变动所以不需要更新。\n"
-#: g10/keyedit.c:2446
+#: g10/keyedit.c:2450
msgid "Digest: "
msgstr "散列："
-#: g10/keyedit.c:2497
+#: g10/keyedit.c:2501
msgid "Features: "
msgstr "特点："
-#: g10/keyedit.c:2508
+#: g10/keyedit.c:2512
msgid "Keyserver no-modify"
msgstr "公钥服务器不可变造"
-#: g10/keyedit.c:2523 g10/keylist.c:316
+#: g10/keyedit.c:2527 g10/keylist.c:316
msgid "Preferred keyserver: "
msgstr "首选公钥服务器："
-#: g10/keyedit.c:2531 g10/keyedit.c:2532
+#: g10/keyedit.c:2535 g10/keyedit.c:2536
msgid "Notations: "
msgstr "注记："
-#: g10/keyedit.c:2753
+#: g10/keyedit.c:2757
msgid "There are no preferences on a PGP 2.x-style user ID.\n"
msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
-#: g10/keyedit.c:2810
+#: g10/keyedit.c:2814
#, fuzzy, c-format
msgid "The following key was revoked on %s by %s key %s\n"
msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2836
#, c-format
msgid "This key may be revoked by %s key %s"
msgstr "这把密钥可被 %s 密钥 %s 吊销"
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2842
msgid "(sensitive)"
msgstr " (敏感的)"
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
-#: g10/keylist.c:202 g10/keyserver.c:532
+#: g10/keyedit.c:2858 g10/keyedit.c:2914 g10/keyedit.c:2975 g10/keyedit.c:2990
+#: g10/keylist.c:202 g10/keyserver.c:539
#, c-format
msgid "created: %s"
msgstr "创建于：%s"
-#: g10/keyedit.c:2857 g10/keylist.c:834 g10/keylist.c:928 g10/mainproc.c:997
+#: g10/keyedit.c:2861 g10/keylist.c:834 g10/keylist.c:928 g10/mainproc.c:959
#, c-format
msgid "revoked: %s"
msgstr "已吊销：%s"
-#: g10/keyedit.c:2859 g10/keylist.c:805 g10/keylist.c:840 g10/keylist.c:934
+#: g10/keyedit.c:2863 g10/keylist.c:805 g10/keylist.c:840 g10/keylist.c:934
#, c-format
msgid "expired: %s"
msgstr "已过期：%s"
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2865 g10/keyedit.c:2916 g10/keyedit.c:2977 g10/keyedit.c:2992
#: g10/keylist.c:204 g10/keylist.c:811 g10/keylist.c:846 g10/keylist.c:940
-#: g10/keylist.c:961 g10/keyserver.c:538 g10/mainproc.c:1003
+#: g10/keylist.c:961 g10/keyserver.c:545 g10/mainproc.c:965
#, c-format
msgid "expires: %s"
msgstr "有效至：%s"
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2867
#, c-format
msgid "usage: %s"
msgstr "可用于：%s"
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2882
#, c-format
msgid "trust: %s"
msgstr "信任度：%s"
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2886
#, c-format
msgid "validity: %s"
msgstr "有效性：%s"
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2893
msgid "This key has been disabled"
msgstr "这把密钥已经被禁用"
-#: g10/keyedit.c:2917 g10/keylist.c:208
+#: g10/keyedit.c:2921 g10/keylist.c:208
msgid "card-no: "
msgstr "卡号："
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2945
msgid ""
"Please note that the shown key validity is not necessarily correct\n"
"unless you restart the program.\n"
msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
-#: g10/mainproc.c:1850 g10/trustdb.c:1204 g10/trustdb.c:1732
+#: g10/keyedit.c:3009 g10/keyedit.c:3355 g10/keyserver.c:549
+#: g10/mainproc.c:1858 g10/trustdb.c:1238 g10/trustdb.c:1766
msgid "revoked"
msgstr "已吊销"
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
-#: g10/mainproc.c:1852 g10/trustdb.c:547 g10/trustdb.c:1734
+#: g10/keyedit.c:3011 g10/keyedit.c:3357 g10/keyserver.c:553
+#: g10/mainproc.c:1860 g10/trustdb.c:548 g10/trustdb.c:1768
msgid "expired"
msgstr "已过期"
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3076
msgid ""
"WARNING: no user ID has been marked as primary. This command may\n"
" cause a different user ID to become the assumed primary.\n"
msgstr ""
"警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3137
msgid ""
"WARNING: This is a PGP2-style key. Adding a photo ID may cause some "
"versions\n"
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3142 g10/keyedit.c:3477
msgid "Are you sure you still want to add it? (y/N) "
msgstr "您确定仍然想要增加吗？(y/N)"
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3148
msgid "You may not add a photo ID to a PGP2-style key.\n"
msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3288
msgid "Delete this good signature? (y/N/q)"
msgstr "删除这个完好的签名吗？(y/N/q)"
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3298
msgid "Delete this invalid signature? (y/N/q)"
msgstr "删除这个无效的签名吗？(y/N/q)"
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3302
msgid "Delete this unknown signature? (y/N/q)"
msgstr "删除这个未知的签名吗？(y/N/q)"
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3308
msgid "Really delete this self-signature? (y/N)"
msgstr "真的要删除这个自身签名吗？(y/N)"
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3322
#, c-format
msgid "Deleted %d signature.\n"
msgstr "已经删除了 %d 个签名。\n"
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3323
#, c-format
msgid "Deleted %d signatures.\n"
msgstr "已经删除了 %d 个签名。\n"
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3326
msgid "Nothing deleted.\n"
msgstr "没有东西被删除。\n"
-#: g10/keyedit.c:3355 g10/trustdb.c:1736
+#: g10/keyedit.c:3359 g10/trustdb.c:1770
msgid "invalid"
msgstr "无效"
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3361
#, fuzzy, c-format
msgid "User ID \"%s\" compacted: %s\n"
msgstr "用户标识“%s”：无用部分已清除\n"
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3368
#, fuzzy, c-format
msgid "User ID \"%s\": %d signature removed\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3369
#, fuzzy, c-format
msgid "User ID \"%s\": %d signatures removed\n"
msgstr "密钥 %s：“%s”%d 个签名被清除\n"
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3377
#, fuzzy, c-format
msgid "User ID \"%s\": already minimized\n"
msgstr "用户标识“%s”：无用部分已清除\n"
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3378
#, c-format
msgid "User ID \"%s\": already clean\n"
msgstr "用户标识“%s”：无用部分已清除\n"
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3472
msgid ""
"WARNING: This is a PGP 2.x-style key. Adding a designated revoker may "
"cause\n"
"警告：这是一把 PGP2 样式的密钥。\n"
" 增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3483
msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3503
msgid "Enter the user ID of the designated revoker: "
msgstr "输入指定吊销者的用户标识："
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3528
msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3543
msgid "you cannot appoint a key as its own designated revoker\n"
msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
# This actually causes no harm (after all, a key that
# designates itself as a revoker is the same as a
# regular key), but it's easy enough to check.
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3565
msgid "this key has already been designated as a revoker\n"
msgstr "这把密钥已被指定为一个吊销者\n"
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3584
msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3590
msgid ""
"Are you sure you want to appoint this key as a designated revoker? (y/N) "
msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3651
msgid "Please remove selections from the secret keys.\n"
msgstr "请从私钥中删除选择。\n"
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3657
msgid "Please select at most one subkey.\n"
msgstr "请至多选择一个子钥。\n"
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3661
msgid "Changing expiration time for a subkey.\n"
msgstr "将要变更子钥的使用期限。\n"
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3664
msgid "Changing expiration time for the primary key.\n"
msgstr "将要变更主钥的使用期限。\n"
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3710
msgid "You can't change the expiration date of a v3 key\n"
msgstr "您不能变更 v3 密钥的使用期限\n"
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3726
msgid "No corresponding signature in secret ring\n"
msgstr "在私钥环里没有相应的签名\n"
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3804
#, c-format
msgid "signing subkey %s is already cross-certified\n"
msgstr "签名的子钥 %s 已经交叉验证\n"
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3810
#, c-format
msgid "subkey %s does not sign and so does not need to be cross-certified\n"
msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3973
msgid "Please select exactly one user ID.\n"
msgstr "请精确地选择一个用户标识。\n"
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4012 g10/keyedit.c:4122 g10/keyedit.c:4242 g10/keyedit.c:4383
#, c-format
msgid "skipping v3 self-signature on user ID \"%s\"\n"
msgstr "跳过用户标识“%s”的 v3 自身签名\n"
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4183
msgid "Enter your preferred keyserver URL: "
msgstr "输入您首选的公钥服务器的 URL："
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4263
msgid "Are you sure you want to replace it? (y/N) "
msgstr "您确定要替换它吗？(y/N)"
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4264
msgid "Are you sure you want to delete it? (y/N) "
msgstr "您确定要删除它吗？(y/N)"
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4326
msgid "Enter the notation: "
msgstr "输入注记："
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4475
msgid "Proceed? (y/N) "
msgstr "继续？(y/N)"
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4547
#, c-format
msgid "No user ID with index %d\n"
msgstr "没有索引为 %d 的用户标识\n"
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4608
#, c-format
msgid "No user ID with hash %s\n"
msgstr "没有散列值为 %s 的用户标识\n"
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4643
#, c-format
msgid "No subkey with index %d\n"
msgstr "没有索引为 %d 的子钥\n"
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4778
#, c-format
msgid "user ID: \"%s\"\n"
msgstr "用户标识：“%s”\n"
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4781 g10/keyedit.c:4875 g10/keyedit.c:4918
#, c-format
msgid "signed by your key %s on %s%s%s\n"
msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4783 g10/keyedit.c:4877 g10/keyedit.c:4920
msgid " (non-exportable)"
msgstr " (不可导出)"
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4787
#, c-format
msgid "This signature expired on %s.\n"
msgstr "这份签名已在 %s 过期。\n"
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4791
msgid "Are you sure you still want to revoke it? (y/N) "
msgstr "您确定您仍然想要吊销它吗？(y/N)"
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4795
msgid "Create a revocation certificate for this signature? (y/N) "
msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4846
msgid "Not signed by you.\n"
msgstr ""
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4852
#, c-format
msgid "You have signed these user IDs on key %s:\n"
msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4878
msgid " (non-revocable)"
msgstr " (不可吊销)"
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4885
#, c-format
msgid "revoked by your key %s on %s\n"
msgstr "由您的密钥 %s 于 %s 吊销\n"
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4907
msgid "You are about to revoke these signatures:\n"
msgstr "您正在吊销这些签名：\n"
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4927
msgid "Really create the revocation certificates? (y/N) "
msgstr "真的要生成吊销证书吗？(y/N)"
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4957
msgid "no secret key\n"
msgstr "没有私钥\n"
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5027
#, c-format
msgid "user ID \"%s\" is already revoked\n"
msgstr "用户标识“%s”已经被吊销。\n"
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5044
#, c-format
msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5108
#, c-format
msgid "Key %s is already revoked.\n"
msgstr "密钥 %s 已被吊销。\n"
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5170
#, c-format
msgid "Subkey %s is already revoked.\n"
msgstr "子钥 %s 已被吊销。\n"
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5265
#, 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:275
+#: g10/keygen.c:272
#, c-format
msgid "preference `%s' duplicated\n"
msgstr "首选项‘%s’重复\n"
-#: g10/keygen.c:282
+#: g10/keygen.c:279
msgid "too many cipher preferences\n"
msgstr "太多对称加密算法首选项\n"
-#: g10/keygen.c:284
+#: g10/keygen.c:281
msgid "too many digest preferences\n"
msgstr "太多散列算法首选项\n"
-#: g10/keygen.c:286
+#: g10/keygen.c:283
msgid "too many compression preferences\n"
msgstr "太多首选压缩算法\n"
-#: g10/keygen.c:426
+#: g10/keygen.c:423
#, c-format
msgid "invalid item `%s' in preference string\n"
msgstr "首选项字符串里有无效项‘%s’\n"
-#: g10/keygen.c:910
+#: g10/keygen.c:907
msgid "writing direct signature\n"
msgstr "正在写入直接签名\n"
-#: g10/keygen.c:952
+#: g10/keygen.c:949
msgid "writing self signature\n"
msgstr "正在写入自身签名\n"
-#: g10/keygen.c:1009
+#: g10/keygen.c:1006
msgid "writing key binding signature\n"
msgstr "正在写入密钥绑定签名\n"
-#: g10/keygen.c:1179 g10/keygen.c:1290 g10/keygen.c:1295 g10/keygen.c:1441
-#: g10/keygen.c:3269
+#: g10/keygen.c:1176 g10/keygen.c:1181 g10/keygen.c:1292 g10/keygen.c:1297
+#: g10/keygen.c:1443 g10/keygen.c:1448 g10/keygen.c:3277
#, c-format
msgid "keysize invalid; using %u bits\n"
msgstr "密钥尺寸无效：改用 %u 位\n"
-#: g10/keygen.c:1185 g10/keygen.c:1301 g10/keygen.c:1309 g10/keygen.c:1447
-#: g10/keygen.c:3275
+#: g10/keygen.c:1187 g10/keygen.c:1303 g10/keygen.c:1311 g10/keygen.c:1454
+#: g10/keygen.c:3283
#, c-format
msgid "keysize rounded up to %u bits\n"
msgstr "密钥尺寸舍入到 %u 位\n"
-#: g10/keygen.c:1335
+#: g10/keygen.c:1337
msgid ""
"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
msgstr ""
-#: g10/keygen.c:1558
+#: g10/keygen.c:1565
msgid "Sign"
msgstr "签名"
-#: g10/keygen.c:1561
+#: g10/keygen.c:1568
msgid "Certify"
msgstr "验证"
-#: g10/keygen.c:1564
+#: g10/keygen.c:1571
msgid "Encrypt"
msgstr "加密"
-#: g10/keygen.c:1567
+#: g10/keygen.c:1574
msgid "Authenticate"
msgstr "认证"
#. a = Toggle authentication capability
#. q = Finish
#.
-#: g10/keygen.c:1585
+#: g10/keygen.c:1592
msgid "SsEeAaQq"
msgstr "SsEeAaQq"
-#: g10/keygen.c:1608
+#: g10/keygen.c:1615
#, c-format
msgid "Possible actions for a %s key: "
msgstr "%s 密钥可能的操作："
-#: g10/keygen.c:1612
+#: g10/keygen.c:1619
msgid "Current allowed actions: "
msgstr "目前允许的操作："
-#: g10/keygen.c:1617
+#: g10/keygen.c:1624
#, c-format
msgid " (%c) Toggle the sign capability\n"
msgstr " (%c) 选择是否用于签名\n"
-#: g10/keygen.c:1620
+#: g10/keygen.c:1627
#, c-format
msgid " (%c) Toggle the encrypt capability\n"
msgstr " (%c) 选择是否用于加密\n"
-#: g10/keygen.c:1623
+#: g10/keygen.c:1630
#, c-format
msgid " (%c) Toggle the authenticate capability\n"
msgstr " (%c) 选择是否用于认证\n"
-#: g10/keygen.c:1626
+#: g10/keygen.c:1633
#, c-format
msgid " (%c) Finished\n"
msgstr " (%c) 已完成\n"
-#: g10/keygen.c:1686 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1693 sm/certreqgen-ui.c:157
msgid "Please select what kind of key you want:\n"
msgstr "请选择您要使用的密钥种类：\n"
-#: g10/keygen.c:1689
+#: g10/keygen.c:1696
#, fuzzy, c-format
msgid " (%d) RSA and RSA (default)\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1691
+#: g10/keygen.c:1698
#, fuzzy, c-format
msgid " (%d) DSA and Elgamal\n"
msgstr " (%d) DSA 和 ElGamal (默认)\n"
-#: g10/keygen.c:1693
+#: g10/keygen.c:1700
#, c-format
msgid " (%d) DSA (sign only)\n"
msgstr " (%d) DSA (仅用于签名)\n"
-#: g10/keygen.c:1694
+#: g10/keygen.c:1701
#, c-format
msgid " (%d) RSA (sign only)\n"
msgstr " (%d) RSA (仅用于签名)\n"
-#: g10/keygen.c:1698
+#: g10/keygen.c:1705
#, c-format
msgid " (%d) Elgamal (encrypt only)\n"
msgstr " (%d) ElGamal (仅用于加密)\n"
-#: g10/keygen.c:1699
+#: g10/keygen.c:1706
#, c-format
msgid " (%d) RSA (encrypt only)\n"
msgstr " (%d) RSA (仅用于加密)\n"
-#: g10/keygen.c:1703
+#: g10/keygen.c:1710
#, c-format
msgid " (%d) DSA (set your own capabilities)\n"
msgstr " (%d) DSA (自定义用途)\n"
-#: g10/keygen.c:1704
+#: g10/keygen.c:1711
#, c-format
msgid " (%d) RSA (set your own capabilities)\n"
msgstr " (%d) RSA (自定义用途)\n"
-#: g10/keygen.c:1812
+#: g10/keygen.c:1819
#, c-format
msgid "%s keys may be between %u and %u bits long.\n"
msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
-#: g10/keygen.c:1820
+#: g10/keygen.c:1827
#, fuzzy, c-format
msgid "What keysize do you want for the subkey? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
-#: g10/keygen.c:1823 sm/certreqgen-ui.c:179
+#: g10/keygen.c:1830 sm/certreqgen-ui.c:179
#, c-format
msgid "What keysize do you want? (%u) "
msgstr "您想要用多大的密钥尺寸？(%u)"
-#: g10/keygen.c:1837 sm/certreqgen-ui.c:189
+#: g10/keygen.c:1844 sm/certreqgen-ui.c:189
#, c-format
msgid "Requested keysize is %u bits\n"
msgstr "您所要求的密钥尺寸是 %u 位\n"
-#: g10/keygen.c:1925
+#: g10/keygen.c:1932
msgid ""
"Please specify how long the key should be valid.\n"
" 0 = key does not expire\n"
" <n>m = 密钥在 n 月后过期\n"
" <n>y = 密钥在 n 年后过期\n"
-#: g10/keygen.c:1936
+#: g10/keygen.c:1943
msgid ""
"Please specify how long the signature should be valid.\n"
" 0 = signature does not expire\n"
" <n>m = 签名在 n 月后过期\n"
" <n>y = 签名在 n 年后过期\n"
-#: g10/keygen.c:1959
+#: g10/keygen.c:1966
msgid "Key is valid for? (0) "
msgstr "密钥的有效期限是？(0) "
-#: g10/keygen.c:1964
+#: g10/keygen.c:1971
#, c-format
msgid "Signature is valid for? (%s) "
msgstr "签名的有效期限是多久？(%s) "
-#: g10/keygen.c:1982 g10/keygen.c:2007
+#: g10/keygen.c:1990 g10/keygen.c:2015
msgid "invalid value\n"
msgstr "无效的数值\n"
-#: g10/keygen.c:1989
+#: g10/keygen.c:1997
msgid "Key does not expire at all\n"
msgstr "密钥永远不会过期\n"
-#: g10/keygen.c:1990
+#: g10/keygen.c:1998
msgid "Signature does not expire at all\n"
msgstr "签名永远不会过期\n"
-#: g10/keygen.c:1995
+#: g10/keygen.c:2003
#, c-format
msgid "Key expires at %s\n"
msgstr "密钥于 %s 过期\n"
-#: g10/keygen.c:1996
+#: g10/keygen.c:2004
#, c-format
msgid "Signature expires at %s\n"
msgstr "签名于 %s 过期\n"
-#: g10/keygen.c:2000
+#: g10/keygen.c:2008
msgid ""
"Your system can't display dates beyond 2038.\n"
"However, it will be correctly handled up to 2106.\n"
"您的系统无法显示 2038 年以后的日期。\n"
"不过，它可以正确处理 2106 年之前的年份。\n"
-#: g10/keygen.c:2013
+#: g10/keygen.c:2021
msgid "Is this correct? (y/N) "
msgstr "以上正确吗？(y/n)"
-#: g10/keygen.c:2063
+#: g10/keygen.c:2071
msgid ""
"\n"
"GnuPG needs to construct a user ID to identify your key.\n"
#. but you should keep your existing translation. In case
#. the new string is not translated this old string will
#. be used.
-#: g10/keygen.c:2078
+#: g10/keygen.c:2086
msgid ""
"\n"
"You need a user ID to identify your key; the software constructs the user "
" “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
"\n"
-#: g10/keygen.c:2097
+#: g10/keygen.c:2105
msgid "Real name: "
msgstr "真实姓名："
-#: g10/keygen.c:2105
+#: g10/keygen.c:2113
msgid "Invalid character in name\n"
msgstr "姓名含有无效的字符\n"
-#: g10/keygen.c:2107
+#: g10/keygen.c:2115
msgid "Name may not start with a digit\n"
msgstr "姓名不可以用数字开头\n"
-#: g10/keygen.c:2109
+#: g10/keygen.c:2117
msgid "Name must be at least 5 characters long\n"
msgstr "姓名至少要有五个字符长\n"
-#: g10/keygen.c:2117
+#: g10/keygen.c:2125
msgid "Email address: "
msgstr "电子邮件地址："
-#: g10/keygen.c:2123
+#: g10/keygen.c:2131
msgid "Not a valid email address\n"
msgstr "电子邮件地址无效\n"
-#: g10/keygen.c:2131
+#: g10/keygen.c:2139
msgid "Comment: "
msgstr "注释："
-#: g10/keygen.c:2137
+#: g10/keygen.c:2145
msgid "Invalid character in comment\n"
msgstr "注释含有无效的字符\n"
-#: g10/keygen.c:2159
+#: g10/keygen.c:2167
#, c-format
msgid "You are using the `%s' character set.\n"
msgstr "您正在使用‘%s’字符集。\n"
-#: g10/keygen.c:2165
+#: g10/keygen.c:2173
#, c-format
msgid ""
"You selected this USER-ID:\n"
" “%s”\n"
"\n"
-#: g10/keygen.c:2170
+#: g10/keygen.c:2178
msgid "Please don't put the email address into the real name or the comment\n"
msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
-#: g10/keygen.c:2185
+#: g10/keygen.c:2193
msgid "Such a user ID already exists on this key!\n"
msgstr ""
#. o = Okay (ready, continue)
#. q = Quit
#.
-#: g10/keygen.c:2201
+#: g10/keygen.c:2209
msgid "NnCcEeOoQq"
msgstr "NnCcEeOoQq"
-#: g10/keygen.c:2211
+#: g10/keygen.c:2219
msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
-#: g10/keygen.c:2212
+#: g10/keygen.c:2220
msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
-#: g10/keygen.c:2231
+#: g10/keygen.c:2239
msgid "Please correct the error first\n"
msgstr "请先改正错误\n"
-#: g10/keygen.c:2273
+#: g10/keygen.c:2281
msgid ""
"You need a Passphrase to protect your secret key.\n"
"\n"
"您需要一个密码来保护您的私钥。\n"
"\n"
-#: g10/keygen.c:2276
+#: g10/keygen.c:2284
#, fuzzy
msgid ""
"Please enter a passphrase to protect the off-card backup of the new "
"encryption key."
msgstr "请输入密码：这是一个秘密的句子 \n"
-#: g10/keygen.c:2292
+#: g10/keygen.c:2300
#, c-format
msgid "%s.\n"
msgstr "%s.\n"
-#: g10/keygen.c:2298
+#: g10/keygen.c:2306
msgid ""
"You don't want a passphrase - this is probably a *bad* idea!\n"
"I will do it anyway. You can change your passphrase at any time,\n"
"再次执行这个程序，并且使用“--edit-key”选项即可。\n"
"\n"
-#: g10/keygen.c:2322
+#: g10/keygen.c:2330
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"
"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
"鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
-#: g10/keygen.c:3209 g10/keygen.c:3236
+#: g10/keygen.c:3217 g10/keygen.c:3244
msgid "Key generation canceled.\n"
msgstr "密钥生成已取消。\n"
-#: g10/keygen.c:3441 g10/keygen.c:3611
+#: g10/keygen.c:3449 g10/keygen.c:3619
#, c-format
msgid "writing public key to `%s'\n"
msgstr "正在将公钥写至`%s'\n"
-#: g10/keygen.c:3443 g10/keygen.c:3614
+#: g10/keygen.c:3451 g10/keygen.c:3622
#, c-format
msgid "writing secret key stub to `%s'\n"
msgstr "向‘%s’写入私钥占位符\n"
-#: g10/keygen.c:3446 g10/keygen.c:3617
+#: g10/keygen.c:3454 g10/keygen.c:3625
#, c-format
msgid "writing secret key to `%s'\n"
msgstr "正在将私钥写至`%s'\n"
-#: g10/keygen.c:3598
+#: g10/keygen.c:3606
#, c-format
msgid "no writable public keyring found: %s\n"
msgstr "找不到可写的公钥钥匙环：%s\n"
-#: g10/keygen.c:3605
+#: g10/keygen.c:3613
#, c-format
msgid "no writable secret keyring found: %s\n"
msgstr "找不到可写的私钥钥匙环：%s\n"
-#: g10/keygen.c:3625
+#: g10/keygen.c:3633
#, c-format
msgid "error writing public keyring `%s': %s\n"
msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
-#: g10/keygen.c:3633
+#: g10/keygen.c:3641
#, c-format
msgid "error writing secret keyring `%s': %s\n"
msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
-#: g10/keygen.c:3661
+#: g10/keygen.c:3669
msgid "public and secret key created and signed.\n"
msgstr "公钥和私钥已经生成并经签名。\n"
-#: g10/keygen.c:3672
+#: g10/keygen.c:3680
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"
"请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
"生成用于加密的子钥。\n"
-#: g10/keygen.c:3685 g10/keygen.c:3831 g10/keygen.c:3952
+#: g10/keygen.c:3693 g10/keygen.c:3839 g10/keygen.c:3960
#, c-format
msgid "Key generation failed: %s\n"
msgstr "生成密钥失败：%s\n"
-#: g10/keygen.c:3741 g10/keygen.c:3882 g10/sign.c:241
+#: g10/keygen.c:3749 g10/keygen.c:3890 g10/sign.c:241
#, c-format
msgid ""
"key has been created %lu second in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3743 g10/keygen.c:3884 g10/sign.c:243
+#: g10/keygen.c:3751 g10/keygen.c:3892 g10/sign.c:243
#, c-format
msgid ""
"key has been created %lu seconds in future (time warp or clock problem)\n"
msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
-#: g10/keygen.c:3754 g10/keygen.c:3895
+#: g10/keygen.c:3762 g10/keygen.c:3903
msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
-#: g10/keygen.c:3795 g10/keygen.c:3928
+#: g10/keygen.c:3803 g10/keygen.c:3936
msgid "Really create? (y/N) "
msgstr "真的要建立吗？(y/N)"
-#: g10/keygen.c:4116
+#: g10/keygen.c:4124
#, c-format
msgid "storing key onto card failed: %s\n"
msgstr "向卡上存储密钥时失败：%s\n"
-#: g10/keygen.c:4165
+#: g10/keygen.c:4173
#, c-format
msgid "can't create backup file `%s': %s\n"
msgstr "不能创建备份文件‘%s’：%s\n"
-#: g10/keygen.c:4191
+#: g10/keygen.c:4199
#, c-format
msgid "NOTE: backup of card key saved to `%s'\n"
msgstr "注意：卡密钥的备份已保存到‘%s’\n"
msgid "Keyring"
msgstr "钥匙环"
-#: g10/keylist.c:1526
+#: g10/keylist.c:1522
msgid "Primary key fingerprint:"
msgstr "主钥指纹："
-#: g10/keylist.c:1528
+#: g10/keylist.c:1524
msgid " Subkey fingerprint:"
msgstr "子钥指纹："
#. TRANSLATORS: this should fit into 24 bytes to that the
#. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1535
+#: g10/keylist.c:1531
msgid " Primary key fingerprint:"
msgstr " 主钥指纹："
-#: g10/keylist.c:1537
+#: g10/keylist.c:1533
msgid " Subkey fingerprint:"
msgstr " 子钥指纹："
# use tty
-#: g10/keylist.c:1541 g10/keylist.c:1545
+#: g10/keylist.c:1537 g10/keylist.c:1541
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
-#: g10/keylist.c:1612
+#: g10/keylist.c:1608
msgid " Card serial no. ="
msgstr "卡序列号 ="
msgid "WARNING: keyserver option `%s' is not used on this platform\n"
msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
-#: g10/keyserver.c:544
+#: g10/keyserver.c:551
msgid "disabled"
msgstr "已禁用"
-#: g10/keyserver.c:747
+#: g10/keyserver.c:754
msgid "Enter number(s), N)ext, or Q)uit > "
msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
-#: g10/keyserver.c:831 g10/keyserver.c:1458
+#: g10/keyserver.c:838 g10/keyserver.c:1546
#, c-format
msgid "invalid keyserver protocol (us %d!=handler %d)\n"
msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
-#: g10/keyserver.c:932
+#: g10/keyserver.c:939
#, c-format
msgid "key \"%s\" not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥“%s”\n"
-#: g10/keyserver.c:934
+#: g10/keyserver.c:941
msgid "key not found on keyserver\n"
msgstr "在公钥服务器上找不到密钥\n"
-#: g10/keyserver.c:1177
+#: g10/keyserver.c:1265
#, c-format
msgid "requesting key %s from %s server %s\n"
msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
-#: g10/keyserver.c:1181
+#: g10/keyserver.c:1269
#, c-format
msgid "requesting key %s from %s\n"
msgstr "下载密钥 %s，从 %s\n"
-#: g10/keyserver.c:1205
+#: g10/keyserver.c:1293
#, c-format
msgid "searching for names from %s server %s\n"
msgstr "在 %s 服务器 %s 上搜索名字\n"
-#: g10/keyserver.c:1208
+#: g10/keyserver.c:1296
#, c-format
msgid "searching for names from %s\n"
msgstr "在 %s 上搜索名字\n"
-#: g10/keyserver.c:1361
+#: g10/keyserver.c:1449
#, c-format
msgid "sending key %s to %s server %s\n"
msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
-#: g10/keyserver.c:1365
+#: g10/keyserver.c:1453
#, c-format
msgid "sending key %s to %s\n"
msgstr "将密钥‘%s’上传到 %s\n"
-#: g10/keyserver.c:1408
+#: g10/keyserver.c:1496
#, c-format
msgid "searching for \"%s\" from %s server %s\n"
msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
-#: g10/keyserver.c:1411
+#: g10/keyserver.c:1499
#, c-format
msgid "searching for \"%s\" from %s\n"
msgstr "搜索“%s”，在 %s 上\n"
-#: g10/keyserver.c:1418 g10/keyserver.c:1514
+#: g10/keyserver.c:1506 g10/keyserver.c:1609
msgid "no keyserver action!\n"
msgstr "公钥服务器无动作！\n"
-#: g10/keyserver.c:1466
+#: g10/keyserver.c:1554
#, c-format
msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
-#: g10/keyserver.c:1475
+#: g10/keyserver.c:1563
msgid "keyserver did not send VERSION\n"
msgstr "公钥服务器未发送 VERSION\n"
-#: g10/keyserver.c:1537 g10/keyserver.c:2066
+#: g10/keyserver.c:1634 g10/keyserver.c:2169
msgid "no keyserver known (use option --keyserver)\n"
msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
-#: g10/keyserver.c:1543
+#: g10/keyserver.c:1640
msgid "external keyserver calls are not supported in this build\n"
msgstr "这一编译版本不支持外部调用公钥服务器\n"
-#: g10/keyserver.c:1555
+#: g10/keyserver.c:1652
#, c-format
msgid "no handler for keyserver scheme `%s'\n"
msgstr "没有处理‘%s’公钥服务器的程序\n"
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1657
#, c-format
msgid "action `%s' not supported with keyserver scheme `%s'\n"
msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
-#: g10/keyserver.c:1568
+#: g10/keyserver.c:1665
#, c-format
msgid "%s does not support handler version %d\n"
msgstr "%s 不支持对版本 %d 的处理\n"
-#: g10/keyserver.c:1575
+#: g10/keyserver.c:1672
msgid "keyserver timed out\n"
msgstr "公钥服务器超时\n"
-#: g10/keyserver.c:1580
+#: g10/keyserver.c:1677
msgid "keyserver internal error\n"
msgstr "公钥服务器内部错误\n"
-#: g10/keyserver.c:1589
+#: g10/keyserver.c:1686
#, c-format
msgid "keyserver communications error: %s\n"
msgstr "公钥服务器通讯错误：%s\n"
-#: g10/keyserver.c:1614 g10/keyserver.c:1648
+#: g10/keyserver.c:1712 g10/keyserver.c:1747
#, c-format
msgid "\"%s\" not a key ID: skipping\n"
msgstr "“%s”不是一个用户标识：跳过\n"
-#: g10/keyserver.c:1907
+#: g10/keyserver.c:2009
#, c-format
msgid "WARNING: unable to refresh key %s via %s: %s\n"
msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
-#: g10/keyserver.c:1929
+#: g10/keyserver.c:2031
#, c-format
msgid "refreshing 1 key from %s\n"
msgstr "1 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1931
+#: g10/keyserver.c:2033
#, c-format
msgid "refreshing %d keys from %s\n"
msgstr "%d 个密钥正从 %s 得到更新\n"
-#: g10/keyserver.c:1987
+#: g10/keyserver.c:2089
#, c-format
msgid "WARNING: unable to fetch URI %s: %s\n"
msgstr "警告：无法获取 URI %s：%s\n"
-#: g10/keyserver.c:1993
+#: g10/keyserver.c:2095
#, c-format
msgid "WARNING: unable to parse URI %s\n"
msgstr "不能解析 URI %s\n"
-#: g10/mainproc.c:231
+#: g10/mainproc.c:242
#, c-format
msgid "weird size for an encrypted session key (%d)\n"
msgstr "加密过的会话密钥尺寸(%d)诡异\n"
-#: g10/mainproc.c:284
+#: g10/mainproc.c:295
#, c-format
msgid "%s encrypted session key\n"
msgstr "%s 加密过的会话密钥\n"
-#: g10/mainproc.c:294
+#: g10/mainproc.c:305
#, c-format
msgid "passphrase generated with unknown digest algorithm %d\n"
msgstr "密码由未知的散列算法 %d 生成\n"
-#: g10/mainproc.c:360
+#: g10/mainproc.c:371
#, c-format
msgid "public key is %s\n"
msgstr "公钥是 %s\n"
-#: g10/mainproc.c:423
+#: g10/mainproc.c:434
msgid "public key encrypted data: good DEK\n"
msgstr "公钥加密过的数据：完好的数据加密密钥\n"
-#: g10/mainproc.c:456
+#: g10/mainproc.c:467
#, c-format
msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
-#: g10/mainproc.c:460 g10/pkclist.c:217
+#: g10/mainproc.c:471 g10/pkclist.c:217
#, c-format
msgid " \"%s\"\n"
msgstr " “%s”\n"
-#: g10/mainproc.c:464
+#: g10/mainproc.c:475
#, c-format
msgid "encrypted with %s key, ID %s\n"
msgstr "由 %s 密钥加密、钥匙号为 %s\n"
-#: g10/mainproc.c:479
+#: g10/mainproc.c:490
#, c-format
msgid "public key decryption failed: %s\n"
msgstr "公钥解密失败：%s\n"
-#: g10/mainproc.c:495
+#: g10/mainproc.c:506
#, c-format
msgid "encrypted with %lu passphrases\n"
msgstr "以 %lu 个密码加密\n"
-#: g10/mainproc.c:497
+#: g10/mainproc.c:508
msgid "encrypted with 1 passphrase\n"
msgstr "以 1 个密码加密\n"
-#: g10/mainproc.c:529 g10/mainproc.c:551
+#: g10/mainproc.c:540 g10/mainproc.c:562
#, c-format
msgid "assuming %s encrypted data\n"
msgstr "假定 %s 为加密过的数据\n"
-#: g10/mainproc.c:537
+#: g10/mainproc.c:548
#, c-format
msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
msgstr "IDEA 算法不可用，试以 %s 代替\n"
-#: g10/mainproc.c:570
+#: g10/mainproc.c:582
msgid "decryption okay\n"
msgstr "解密成功\n"
-#: g10/mainproc.c:574
+#: g10/mainproc.c:586
msgid "WARNING: message was not integrity protected\n"
msgstr "警告：报文未受到完整的保护\n"
-#: g10/mainproc.c:587
+#: g10/mainproc.c:589
msgid "WARNING: encrypted message has been manipulated!\n"
msgstr "警告：加密过的报文已经变造！\n"
-#: g10/mainproc.c:595
+#: g10/mainproc.c:597
#, c-format
msgid "cleared passphrase cached with ID: %s\n"
msgstr ""
-#: g10/mainproc.c:600
+#: g10/mainproc.c:602
#, c-format
msgid "decryption failed: %s\n"
msgstr "解密失败：%s\n"
-#: g10/mainproc.c:621
+#: g10/mainproc.c:623
msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
msgstr "注意：发件者要求您“只阅读不存盘”\n"
-#: g10/mainproc.c:623
+#: g10/mainproc.c:625
#, c-format
msgid "original file name='%.*s'\n"
msgstr "原始文件名 =‘%.*s’\n"
-#: g10/mainproc.c:711
+#: g10/mainproc.c:713
msgid "WARNING: multiple plaintexts seen\n"
msgstr ""
-#: g10/mainproc.c:850
+#: g10/mainproc.c:866
msgid "standalone revocation - use \"gpg --import\" to apply\n"
msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
-#: g10/mainproc.c:1203 g10/mainproc.c:1240
+#: g10/mainproc.c:1184 g10/mainproc.c:1221
msgid "no signature found\n"
msgstr "未找到签名\n"
-#: g10/mainproc.c:1478
+#: g10/mainproc.c:1486
msgid "signature verification suppressed\n"
msgstr "签名验证已被抑制\n"
-#: g10/mainproc.c:1587
+#: g10/mainproc.c:1595
msgid "can't handle this ambiguous signature data\n"
msgstr "无法处理这些有歧义的签名\n"
-#: g10/mainproc.c:1598
+#: g10/mainproc.c:1606
#, c-format
msgid "Signature made %s\n"
msgstr "签名建立于 %s\n"
-#: g10/mainproc.c:1599
+#: g10/mainproc.c:1607
#, c-format
msgid " using %s key %s\n"
msgstr " 使用 %s 密钥 %s\n"
-#: g10/mainproc.c:1603
+#: g10/mainproc.c:1611
#, c-format
msgid "Signature made %s using %s key ID %s\n"
msgstr "于 %s 创建的签名，使用 %s，钥匙号 %s\n"
-#: g10/mainproc.c:1623
+#: g10/mainproc.c:1631
msgid "Key available at: "
msgstr "可用的密钥在："
-#: g10/mainproc.c:1756 g10/mainproc.c:1804
+#: g10/mainproc.c:1764 g10/mainproc.c:1812
#, c-format
msgid "BAD signature from \"%s\""
msgstr "已损坏的签名，来自于“%s”"
-#: g10/mainproc.c:1758 g10/mainproc.c:1806
+#: g10/mainproc.c:1766 g10/mainproc.c:1814
#, c-format
msgid "Expired signature from \"%s\""
msgstr "过期的签名，来自于“%s”"
-#: g10/mainproc.c:1760 g10/mainproc.c:1808
+#: g10/mainproc.c:1768 g10/mainproc.c:1816
#, c-format
msgid "Good signature from \"%s\""
msgstr "完好的签名，来自于“%s”"
-#: g10/mainproc.c:1810
+#: g10/mainproc.c:1818
msgid "[uncertain]"
msgstr "[不确定]"
-#: g10/mainproc.c:1843
+#: g10/mainproc.c:1851
#, c-format
msgid " aka \"%s\""
msgstr " 亦即“%s”"
-#: g10/mainproc.c:1941
+#: g10/mainproc.c:1949
#, c-format
msgid "Signature expired %s\n"
msgstr "这份签名已于 %s 过期。\n"
-#: g10/mainproc.c:1946
+#: g10/mainproc.c:1954
#, c-format
msgid "Signature expires %s\n"
msgstr "这份签名在 %s 过期。\n"
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1957
#, c-format
msgid "%s signature, digest algorithm %s\n"
msgstr "%s 签名，散列算法 %s\n"
-#: g10/mainproc.c:1950
+#: g10/mainproc.c:1958
msgid "binary"
msgstr "二进制"
-#: g10/mainproc.c:1951
+#: g10/mainproc.c:1959
msgid "textmode"
msgstr "文本模式"
-#: g10/mainproc.c:1951 g10/trustdb.c:546
+#: g10/mainproc.c:1959 g10/trustdb.c:547
msgid "unknown"
msgstr "未知"
-#: g10/mainproc.c:1971
+#: g10/mainproc.c:1979
#, c-format
msgid "Can't check signature: %s\n"
msgstr "无法检查签名：%s\n"
-#: g10/mainproc.c:2055 g10/mainproc.c:2071 g10/mainproc.c:2167
+#: g10/mainproc.c:2063 g10/mainproc.c:2079 g10/mainproc.c:2175
msgid "not a detached signature\n"
msgstr "不是一份分离的签名\n"
-#: g10/mainproc.c:2098
+#: g10/mainproc.c:2106
msgid ""
"WARNING: multiple signatures detected. Only the first will be checked.\n"
msgstr "警告：检测到多重签名。只检查第一个签名。\n"
-#: g10/mainproc.c:2106
+#: g10/mainproc.c:2114
#, c-format
msgid "standalone signature of class 0x%02x\n"
msgstr "等级 0x%02x 的独立签名\n"
-#: g10/mainproc.c:2171
+#: g10/mainproc.c:2179
msgid "old style (PGP 2.x) signature\n"
msgstr "旧式(PGP 2.x)签名\n"
-#: g10/mainproc.c:2181
+#: g10/mainproc.c:2189
msgid "invalid root packet detected in proc_tree()\n"
msgstr "在 proc_tree() 中检测到无效的根包\n"
-#: g10/misc.c:109 g10/misc.c:139 g10/misc.c:215
+#: g10/misc.c:112 g10/misc.c:142 g10/misc.c:218
#, c-format
msgid "fstat of `%s' failed in %s: %s\n"
msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
-#: g10/misc.c:178
+#: g10/misc.c:181
#, c-format
msgid "fstat(%d) failed in %s: %s\n"
msgstr "fstat(%d) 在 %s 中出错：%s\n"
-#: g10/misc.c:296
+#: g10/misc.c:299
#, c-format
msgid "WARNING: using experimental public key algorithm %s\n"
msgstr "警告: 使用试验性质的公钥算法 %s\n"
-#: g10/misc.c:302
+#: g10/misc.c:305
#, fuzzy
msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
msgstr "警告：不建议使用散列算法 %s\n"
-#: g10/misc.c:315
+#: g10/misc.c:318
#, c-format
msgid "WARNING: using experimental cipher algorithm %s\n"
msgstr "警告：使用试验性质的对称加密算法 %s\n"
-#: g10/misc.c:330
+#: g10/misc.c:333
#, c-format
msgid "WARNING: using experimental digest algorithm %s\n"
msgstr "警告：使用试验性质的散列算法 %s\n"
-#: g10/misc.c:335
+#: g10/misc.c:338
#, c-format
msgid "WARNING: digest algorithm %s is deprecated\n"
msgstr "警告：不建议使用散列算法 %s\n"
-#: g10/misc.c:503
+#: g10/misc.c:548
msgid "the IDEA cipher plugin is not present\n"
msgstr "IDEA 算法插件不存在\n"
-#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:549 g10/sig-check.c:107
#, c-format
msgid "please see %s for more information\n"
msgstr "请参见 %s 以得到更多信息。\n"
-#: g10/misc.c:761
+#: g10/misc.c:823
#, c-format
msgid "%s:%d: deprecated option \"%s\"\n"
msgstr "%s:%d：不建议使用该选项“%s”\n"
-#: g10/misc.c:765
+#: g10/misc.c:827
#, c-format
msgid "WARNING: \"%s\" is a deprecated option\n"
msgstr "警告：“%s”选项已不建议使用\n"
-#: g10/misc.c:767
+#: g10/misc.c:829
#, c-format
msgid "please use \"%s%s\" instead\n"
msgstr "请以“%s%s”代替\n"
-#: g10/misc.c:774
+#: g10/misc.c:836
#, c-format
msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
-#: g10/misc.c:784
+#: g10/misc.c:846
#, c-format
msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
msgstr ""
-#: g10/misc.c:787
+#: g10/misc.c:849
#, fuzzy, c-format
msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
msgstr "警告：“%s”选项已不建议使用\n"
-#: g10/misc.c:848
+#: g10/misc.c:910
msgid "Uncompressed"
msgstr "不压缩"
#. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:873
+#: g10/misc.c:935
msgid "uncompressed|none"
msgstr "未压缩|无"
-#: g10/misc.c:1000
+#: g10/misc.c:1062
#, c-format
msgid "this message may not be usable by %s\n"
msgstr "%s 也许不能使用这个报文\n"
-#: g10/misc.c:1175
+#: g10/misc.c:1237
#, c-format
msgid "ambiguous option `%s'\n"
msgstr "有歧义的选项‘%s’\n"
-#: g10/misc.c:1200
+#: g10/misc.c:1262
#, c-format
msgid "unknown option `%s'\n"
msgstr "未知的选项 '%s'\n"
msgid "WARNING: options in `%s' are not yet active during this run\n"
msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
-#: g10/parse-packet.c:201
+#: g10/parse-packet.c:213
#, c-format
msgid "can't handle public key algorithm %d\n"
msgstr "无法操作公钥算法 %d\n"
-#: g10/parse-packet.c:822
+#: g10/parse-packet.c:834
msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
msgstr "警告：潜在不安全的对称加密会话密钥\n"
-#: g10/parse-packet.c:1273
+#: g10/parse-packet.c:1285
#, c-format
msgid "subpacket of type %d has critical bit set\n"
msgstr "%d 类别的子包设定了关键位\n"
msgid " (subkey on main key ID %s)"
msgstr " (主钥 %s 的子钥)"
-#: g10/photoid.c:74
+#: g10/photoid.c:77
msgid ""
"\n"
"Pick an image to use for your photo ID. The image must be a JPEG file.\n"
"片会被存放在您的公钥里。如果您挑了非常大的图片的话，您的密钥也会变得非\n"
"常大！请尽量把图片尺寸控制在240x288左右，这是个理想的尺寸。\n"
-#: g10/photoid.c:96
+#: g10/photoid.c:99
msgid "Enter JPEG filename for photo ID: "
msgstr "输入要当作相片标识的JPEG文件名： "
-#: g10/photoid.c:117
+#: g10/photoid.c:120
#, c-format
msgid "unable to open JPEG file `%s': %s\n"
msgstr "无法打开 JPEG 文件‘%s’：%s\n"
-#: g10/photoid.c:128
+#: g10/photoid.c:131
#, c-format
msgid "This JPEG is really large (%d bytes) !\n"
msgstr "这个 JPEG 文件太大了(%d 字节)！\n"
-#: g10/photoid.c:130
+#: g10/photoid.c:133
msgid "Are you sure you want to use it? (y/N) "
msgstr "您确定要用它吗？(y/N)"
-#: g10/photoid.c:146
+#: g10/photoid.c:149
#, c-format
msgid "`%s' is not a JPEG file\n"
msgstr "“%s”不是一个 JPEG 文件\n"
-#: g10/photoid.c:165
+#: g10/photoid.c:168
msgid "Is this photo correct (y/N/q)? "
msgstr "这张照片正确吗？(y/N/q)"
-#: g10/photoid.c:373
+#: g10/photoid.c:377
msgid "unable to display photo ID!\n"
msgstr "无法显示照片标识！\n"
msgstr "吊销注释："
# a string with valid answers
+#. TRANSLATORS: These are the allowed answers in lower and
+#. uppercase. Below you will find the matching strings which
+#. should be translated accordingly and the letter changed to
+#. match the one in the answer string.
+#.
+#. i = please show me more information
+#. m = back to the main menu
+#. s = skip this key
+#. q = quit
+#.
#: g10/pkclist.c:204
msgid "iImMqQsS"
msgstr "iImMqQsS"
msgid " It is not certain that the signature belongs to the owner.\n"
msgstr " 这份签名并不一定属于它所声称的持有者\n"
-#: g10/pkclist.c:833 g10/pkclist.c:875 g10/pkclist.c:1087 g10/pkclist.c:1157
+#: g10/pkclist.c:833 g10/pkclist.c:880 g10/pkclist.c:1092 g10/pkclist.c:1167
#, c-format
msgid "%s: skipped: %s\n"
msgstr "%s：已跳过：%s\n"
-#: g10/pkclist.c:845 g10/pkclist.c:1125
+#: g10/pkclist.c:850 g10/pkclist.c:1135
#, c-format
msgid "%s: skipped: public key already present\n"
msgstr "%s: 已跳过：公钥已存在\n"
-#: g10/pkclist.c:896
+#: g10/pkclist.c:901
msgid "You did not specify a user ID. (you may use \"-r\")\n"
msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
-#: g10/pkclist.c:920
+#: g10/pkclist.c:925
msgid "Current recipients:\n"
msgstr "当前收件人：\n"
-#: g10/pkclist.c:946
+#: g10/pkclist.c:951
msgid ""
"\n"
"Enter the user ID. End with an empty line: "
"\n"
"输入用户标识。以空白行结束："
-#: g10/pkclist.c:971
+#: g10/pkclist.c:976
msgid "No such user ID.\n"
msgstr "没有这个用户标识。\n"
-#: g10/pkclist.c:980 g10/pkclist.c:1054
+#: g10/pkclist.c:985 g10/pkclist.c:1059
msgid "skipped: public key already set as default recipient\n"
msgstr "已跳过：公钥已被设为默认收件者\n"
-#: g10/pkclist.c:1001
+#: g10/pkclist.c:1006
msgid "Public key is disabled.\n"
msgstr "公钥被禁用。\n"
-#: g10/pkclist.c:1010
+#: g10/pkclist.c:1015
msgid "skipped: public key already set\n"
msgstr "已跳过：公钥已被设定\n"
-#: g10/pkclist.c:1045
+#: g10/pkclist.c:1050
#, c-format
msgid "unknown default recipient \"%s\"\n"
msgstr "未知的默认收件者“%s”\n"
-#: g10/pkclist.c:1103
+#: g10/pkclist.c:1112
#, c-format
msgid "%s: skipped: public key is disabled\n"
msgstr "%s：已跳过：公钥已被禁用\n"
-#: g10/pkclist.c:1165
+#: g10/pkclist.c:1175
msgid "no valid addressees\n"
msgstr "没有有效的地址\n"
-#: g10/pkclist.c:1503
+#: g10/pkclist.c:1513
#, fuzzy, c-format
msgid "Note: key %s has no %s feature\n"
msgstr "密钥 %s：没有有效的用户标识\n"
-#: g10/pkclist.c:1528
+#: g10/pkclist.c:1538
#, fuzzy, c-format
msgid "Note: key %s has no preference for %s\n"
msgstr "密钥 %s：没有有效的用户标识\n"
msgid "NOTE: signature key %s has been revoked\n"
msgstr "注意：密钥已被吊销"
-#: g10/sig-check.c:325
+#: g10/sig-check.c:280
+#, fuzzy, c-format
+#| msgid "%s signature, digest algorithm %s\n"
+msgid "Note: signatures using the %s algorithm are rejected\n"
+msgstr "%s 签名，散列算法 %s\n"
+
+#: g10/sig-check.c:341
#, c-format
msgid "assuming bad signature from key %s due to an unknown critical bit\n"
msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
-#: g10/sig-check.c:591
+#: g10/sig-check.c:607
#, c-format
msgid "key %s: no subkey for subkey revocation signature\n"
msgstr "密钥 %s：没有子钥吊销签名所需的子钥\n"
-#: g10/sig-check.c:618
+#: g10/sig-check.c:634
#, c-format
msgid "key %s: no subkey for subkey binding signature\n"
msgstr "密钥 %s：没有子钥绑定签名所需的子钥\n"
msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
msgstr "这是一把由 PGP 生成的 ElGamal 密钥，用于签名不安全！"
-#: g10/tdbdump.c:58 g10/trustdb.c:360
+#: g10/tdbdump.c:58 g10/trustdb.c:361
#, c-format
msgid "trust record %lu, type %d: write failed: %s\n"
msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
msgid "read error in `%s': %s\n"
msgstr "读取‘%s’错误：%s\n"
-#: g10/tdbdump.c:229 g10/trustdb.c:375
+#: g10/tdbdump.c:229 g10/trustdb.c:376
#, c-format
msgid "trustdb: sync failed: %s\n"
msgstr "信任度数据库：同步失败：%s\n"
-#: g10/tdbio.c:128 g10/tdbio.c:1456
+#: g10/tdbio.c:128 g10/tdbio.c:1460
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任度数据库记录 %lu：lseek 失败：%s\n"
-#: g10/tdbio.c:135 g10/tdbio.c:1463
+#: g10/tdbio.c:135 g10/tdbio.c:1467
#, c-format
msgid "trustdb rec %lu: write failed (n=%d): %s\n"
msgstr "信任度数据库记录 %lu：write 失败 (n=%d): %s\n"
msgid "trustdb transaction too large\n"
msgstr "信任度数据库处理量过大\n"
-#: g10/tdbio.c:500
+#: g10/tdbio.c:502
#, c-format
msgid "can't access `%s': %s\n"
msgstr "无法存取‘%s’：%s\n"
-#: g10/tdbio.c:527
+#: g10/tdbio.c:531
#, c-format
msgid "%s: directory does not exist!\n"
msgstr "%s：目录不存在！\n"
-#: g10/tdbio.c:537 g10/tdbio.c:560 g10/tdbio.c:601 sm/keydb.c:219
+#: g10/tdbio.c:541 g10/tdbio.c:564 g10/tdbio.c:605 sm/keydb.c:344
#, c-format
msgid "can't create lock for `%s'\n"
msgstr "不能为‘%s’创建锁定\n"
-#: g10/tdbio.c:539 g10/tdbio.c:604
+#: g10/tdbio.c:543 g10/tdbio.c:608
#, c-format
msgid "can't lock `%s'\n"
msgstr "无法锁定‘%s’\n"
-#: g10/tdbio.c:565
+#: g10/tdbio.c:569
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s：建立版本记录失败：%s"
-#: g10/tdbio.c:569
+#: g10/tdbio.c:573
#, c-format
msgid "%s: invalid trustdb created\n"
msgstr "%s：建立了无效的信任度数据库\n"
-#: g10/tdbio.c:572
+#: g10/tdbio.c:576
#, c-format
msgid "%s: trustdb created\n"
msgstr "%s：建立了信任度数据库\n"
-#: g10/tdbio.c:615
+#: g10/tdbio.c:619
msgid "NOTE: trustdb not writable\n"
msgstr "注意：信任度数据库不可写入\n"
-#: g10/tdbio.c:623
+#: g10/tdbio.c:627
#, c-format
msgid "%s: invalid trustdb\n"
msgstr "%s：无效的信任度数据库\n"
-#: g10/tdbio.c:655
+#: g10/tdbio.c:659
#, c-format
msgid "%s: failed to create hashtable: %s\n"
msgstr "%s：建立散列表失败：%s\n"
-#: g10/tdbio.c:663
+#: g10/tdbio.c:667
#, c-format
msgid "%s: error updating version record: %s\n"
msgstr "%s：更新版本记录时出错： %s\n"
-#: g10/tdbio.c:680 g10/tdbio.c:701 g10/tdbio.c:717 g10/tdbio.c:731
-#: g10/tdbio.c:761 g10/tdbio.c:1388 g10/tdbio.c:1415
+#: g10/tdbio.c:684 g10/tdbio.c:705 g10/tdbio.c:721 g10/tdbio.c:735
+#: g10/tdbio.c:765 g10/tdbio.c:1392 g10/tdbio.c:1419
#, c-format
msgid "%s: error reading version record: %s\n"
msgstr "%s：读取版本记录时出错： %s\n"
-#: g10/tdbio.c:740
+#: g10/tdbio.c:744
#, c-format
msgid "%s: error writing version record: %s\n"
msgstr "%s：写入版本记录时出错：%s\n"
-#: g10/tdbio.c:1181
+#: g10/tdbio.c:1185
#, c-format
msgid "trustdb: lseek failed: %s\n"
msgstr "信任度数据库：lseek 失败：%s\n"
-#: g10/tdbio.c:1190
+#: g10/tdbio.c:1194
#, c-format
msgid "trustdb: read failed (n=%d): %s\n"
msgstr "信任度数据库：read 失败(n=%d)：%s\n"
-#: g10/tdbio.c:1211
+#: g10/tdbio.c:1215
#, c-format
msgid "%s: not a trustdb file\n"
msgstr "%s：不是一个信任度数据库文件\n"
-#: g10/tdbio.c:1230
+#: g10/tdbio.c:1234
#, c-format
msgid "%s: version record with recnum %lu\n"
msgstr "%s：记录编号为%lu的版本记录\n"
-#: g10/tdbio.c:1235
+#: g10/tdbio.c:1239
#, c-format
msgid "%s: invalid file version %d\n"
msgstr "%s：无效的文件版本%d\n"
-#: g10/tdbio.c:1421
+#: g10/tdbio.c:1425
#, c-format
msgid "%s: error reading free record: %s\n"
msgstr "%s：读取自由记录时出错：%s\n"
-#: g10/tdbio.c:1429
+#: g10/tdbio.c:1433
#, c-format
msgid "%s: error writing dir record: %s\n"
msgstr "%s：写入目录记录时出错：%s\n"
-#: g10/tdbio.c:1439
+#: g10/tdbio.c:1443
#, c-format
msgid "%s: failed to zero a record: %s\n"
msgstr "%s：记录归零时失败：%s\n"
-#: g10/tdbio.c:1469
+#: g10/tdbio.c:1473
#, c-format
msgid "%s: failed to append a record: %s\n"
msgstr "%s：附加记录时失败：%s\n"
-#: g10/tdbio.c:1512
+#: g10/tdbio.c:1516
#, fuzzy
msgid "Error: The trustdb is corrupted.\n"
msgstr "%s：建立了信任度数据库\n"
msgid "input line longer than %d characters\n"
msgstr "输入行长度超过 %d 字符\n"
-#: g10/trustdb.c:221
+#: g10/trustdb.c:222
#, c-format
msgid "`%s' is not a valid long keyID\n"
msgstr "‘%s’不是一个有效的长式钥匙号\n"
-#: g10/trustdb.c:252
+#: g10/trustdb.c:253
#, c-format
msgid "key %s: accepted as trusted key\n"
msgstr "密钥 %s：受信任，已接受\n"
-#: g10/trustdb.c:290
+#: g10/trustdb.c:291
#, c-format
msgid "key %s occurs more than once in the trustdb\n"
msgstr "密钥 %s 在信任度数据库中重复出现\n"
-#: g10/trustdb.c:305
+#: g10/trustdb.c:306
#, c-format
msgid "key %s: no public key for trusted key - skipped\n"
msgstr "密钥 %s：受信任的密钥没有公钥――已跳过\n"
-#: g10/trustdb.c:315
+#: g10/trustdb.c:316
#, c-format
msgid "key %s marked as ultimately trusted\n"
msgstr "密钥 %s 被标记为绝对信任\n"
-#: g10/trustdb.c:339
+#: g10/trustdb.c:340
#, c-format
msgid "trust record %lu, req type %d: read failed: %s\n"
msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
-#: g10/trustdb.c:345
+#: g10/trustdb.c:346
#, c-format
msgid "trust record %lu is not of requested type %d\n"
msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
-#: g10/trustdb.c:418
+#: g10/trustdb.c:419
msgid "You may try to re-create the trustdb using the commands:\n"
msgstr ""
-#: g10/trustdb.c:427
+#: g10/trustdb.c:428
msgid "If that does not work, please consult the manual\n"
msgstr ""
-#: g10/trustdb.c:462
+#: g10/trustdb.c:463
#, c-format
msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
-#: g10/trustdb.c:468
+#: g10/trustdb.c:469
#, c-format
msgid "using %s trust model\n"
msgstr "使用 %s 信任模型\n"
-#: g10/trustdb.c:520
+#. TRANSLATORS: these strings are similar to those in
+#. trust_value_to_string(), but are a fixed length. This is needed to
+#. make attractive information listings where columns line up
+#. properly. The value "10" should be the length of the strings you
+#. choose to translate to. This is the length in printable columns.
+#. It gets passed to atoi() so everything after the number is
+#. essentially a comment and need not be translated. Either key and
+#. uid are both NULL, or neither are NULL.
+#: g10/trustdb.c:521
msgid "10 translator see trustdb.c:uid_trust_string_fixed"
msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
-#: g10/trustdb.c:522
+#: g10/trustdb.c:523
msgid "[ revoked]"
msgstr "[已吊销]"
-#: g10/trustdb.c:524 g10/trustdb.c:529
+#: g10/trustdb.c:525 g10/trustdb.c:530
msgid "[ expired]"
msgstr "[已过期]"
-#: g10/trustdb.c:528
+#: g10/trustdb.c:529
msgid "[ unknown]"
msgstr "[ 未知 ]"
-#: g10/trustdb.c:530
+#: g10/trustdb.c:531
msgid "[ undef ]"
msgstr "[未定义]"
-#: g10/trustdb.c:531
+#: g10/trustdb.c:532
msgid "[marginal]"
msgstr "[ 勉强 ]"
-#: g10/trustdb.c:532
+#: g10/trustdb.c:533
msgid "[ full ]"
msgstr "[ 完全 ]"
-#: g10/trustdb.c:533
+#: g10/trustdb.c:534
msgid "[ultimate]"
msgstr "[ 绝对 ]"
-#: g10/trustdb.c:548
+#: g10/trustdb.c:549
msgid "undefined"
msgstr "未定义"
-#: g10/trustdb.c:549
+#: g10/trustdb.c:550
msgid "never"
msgstr "从不"
-#: g10/trustdb.c:550
+#: g10/trustdb.c:551
msgid "marginal"
msgstr "勉强"
-#: g10/trustdb.c:551
+#: g10/trustdb.c:552
msgid "full"
msgstr "完全"
-#: g10/trustdb.c:552
+#: g10/trustdb.c:553
msgid "ultimate"
msgstr "绝对"
-#: g10/trustdb.c:592
+#: g10/trustdb.c:593
msgid "no need for a trustdb check\n"
msgstr "不需要检查信任度数据库\n"
-#: g10/trustdb.c:598 g10/trustdb.c:2487
+#: g10/trustdb.c:599 g10/trustdb.c:2521
#, c-format
msgid "next trustdb check due at %s\n"
msgstr "下次信任度数据库检查将于 %s 进行\n"
-#: g10/trustdb.c:607
+#: g10/trustdb.c:608
#, c-format
msgid "no need for a trustdb check with `%s' trust model\n"
msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
-#: g10/trustdb.c:622
+#: g10/trustdb.c:623
#, c-format
msgid "no need for a trustdb update with `%s' trust model\n"
msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
-#: g10/trustdb.c:857 g10/trustdb.c:1310
+#: g10/trustdb.c:875 g10/trustdb.c:1344
#, c-format
msgid "public key %s not found: %s\n"
msgstr "找不到公钥 %s：%s\n"
-#: g10/trustdb.c:1053
+#: g10/trustdb.c:1079
msgid "please do a --check-trustdb\n"
msgstr "请执行一次 --check-trustdb\n"
-#: g10/trustdb.c:1057
+#: g10/trustdb.c:1083
msgid "checking the trustdb\n"
msgstr "正在检查信任度数据库\n"
-#: g10/trustdb.c:2230
+#: g10/trustdb.c:2264
#, c-format
msgid "%d keys processed (%d validity counts cleared)\n"
msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
-#: g10/trustdb.c:2295
+#: g10/trustdb.c:2329
msgid "no ultimately trusted keys found\n"
msgstr "没有找到任何绝对信任的密钥\n"
-#: g10/trustdb.c:2309
+#: g10/trustdb.c:2343
#, c-format
msgid "public key of ultimately trusted key %s not found\n"
msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
-#: g10/trustdb.c:2332
+#: g10/trustdb.c:2366
#, c-format
msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
-#: g10/trustdb.c:2418
+#: g10/trustdb.c:2452
#, 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:2493
+#: g10/trustdb.c:2527
#, c-format
msgid "unable to update trustdb version record: write failed: %s\n"
msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
msgid "can't open fd %d: %s\n"
msgstr "无法打开‘%s’： %s\n"
-#: jnlib/argparse.c:180
+#: jnlib/argparse.c:194
#, fuzzy
msgid "argument not expected"
msgstr "不允许使用管理员命令\n"
-#: jnlib/argparse.c:182
+#: jnlib/argparse.c:196
#, fuzzy
msgid "read error"
msgstr "文件读取错误"
-#: jnlib/argparse.c:184
+#: jnlib/argparse.c:198
#, fuzzy
msgid "keyword too long"
msgstr "列太长"
-#: jnlib/argparse.c:186
+#: jnlib/argparse.c:200
#, fuzzy
msgid "missing argument"
msgstr "无效的参数"
-#: jnlib/argparse.c:188
+#: jnlib/argparse.c:202
#, fuzzy
msgid "invalid command"
msgstr "仅供管理员使用的命令\n"
-#: jnlib/argparse.c:190
+#: jnlib/argparse.c:204
#, fuzzy
msgid "invalid alias definition"
msgstr "无效的列表选项\n"
-#: jnlib/argparse.c:192
+#: jnlib/argparse.c:206
#, fuzzy
msgid "out of core"
msgstr "可选"
-#: jnlib/argparse.c:194
+#: jnlib/argparse.c:208
#, fuzzy
msgid "invalid option"
msgstr "无效的列表选项\n"
-#: jnlib/argparse.c:202
+#: jnlib/argparse.c:216
#, c-format
msgid "missing argument for option \"%.50s\"\n"
msgstr ""
-#: jnlib/argparse.c:204
+#: jnlib/argparse.c:218
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
msgstr ""
-#: jnlib/argparse.c:207
+#: jnlib/argparse.c:221
#, fuzzy, c-format
msgid "invalid command \"%.50s\"\n"
msgstr "无效的指令(尝试“help”)\n"
-#: jnlib/argparse.c:209
+#: jnlib/argparse.c:223
#, c-format
msgid "option \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:211
+#: jnlib/argparse.c:225
#, c-format
msgid "command \"%.50s\" is ambiguous\n"
msgstr ""
-#: jnlib/argparse.c:213
+#: jnlib/argparse.c:227
#, fuzzy
msgid "out of core\n"
msgstr "可选"
-#: jnlib/argparse.c:215
+#: jnlib/argparse.c:229
#, fuzzy, c-format
msgid "invalid option \"%.50s\"\n"
msgstr "无效的列表选项\n"
msgid "you found a bug ... (%s:%d)\n"
msgstr "您找到一个程序缺陷了……(%s:%d)\n"
-#: jnlib/utf8conv.c:85
-#, fuzzy, c-format
-msgid "error loading `%s': %s\n"
-msgstr "读取‘%s’时出错：%s\n"
-
-#: jnlib/utf8conv.c:123
+#: jnlib/utf8conv.c:68
#, c-format
msgid "conversion from `%s' to `%s' not available\n"
msgstr ""
-#: jnlib/utf8conv.c:131
+#: jnlib/utf8conv.c:76
#, fuzzy, c-format
msgid "iconv_open failed: %s\n"
msgstr "签名时失败： %s\n"
-#: jnlib/utf8conv.c:388 jnlib/utf8conv.c:654
+#: jnlib/utf8conv.c:328 jnlib/utf8conv.c:594
#, fuzzy, c-format
msgid "conversion from `%s' to `%s' failed: %s\n"
msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
#: kbx/kbxutil.c:120
+#, fuzzy
msgid ""
"Syntax: kbxutil [options] [files]\n"
-"list, export, import Keybox data\n"
-msgstr ""
+"List, export, import Keybox data\n"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
-#: scd/app-nks.c:713 scd/app-openpgp.c:2647
+#: scd/app-nks.c:713 scd/app-openpgp.c:2808
#, c-format
msgid "RSA modulus missing or not of size %d bits\n"
msgstr "RSA 余数缺失或者不是 %d 位长\n"
-#: scd/app-nks.c:721 scd/app-openpgp.c:2659
+#: scd/app-nks.c:721 scd/app-openpgp.c:2820
#, c-format
msgid "RSA public exponent missing or larger than %d bits\n"
msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-#: scd/app-nks.c:801 scd/app-openpgp.c:1549 scd/app-openpgp.c:1568
-#: scd/app-openpgp.c:1729 scd/app-openpgp.c:1746 scd/app-openpgp.c:1994
-#: scd/app-openpgp.c:2039 scd/app-dinsig.c:303
+#: scd/app-nks.c:801 scd/app-openpgp.c:1648 scd/app-openpgp.c:1667
+#: scd/app-openpgp.c:1829 scd/app-openpgp.c:1846 scd/app-openpgp.c:2109
+#: scd/app-openpgp.c:2156 scd/app-openpgp.c:2261 scd/app-dinsig.c:303
#, c-format
msgid "PIN callback returned error: %s\n"
msgstr "PIN 回调返回错误：%s\n"
"qualified signatures."
msgstr ""
-#: scd/app-nks.c:1222 scd/app-openpgp.c:2072 scd/app-dinsig.c:532
+#: scd/app-nks.c:1222 scd/app-openpgp.c:2190 scd/app-dinsig.c:532
#, c-format
msgid "error getting new PIN: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
-#: scd/app-openpgp.c:695
+#: scd/app-openpgp.c:758
#, c-format
msgid "failed to store the fingerprint: %s\n"
msgstr "无法存储指纹：%s\n"
-#: scd/app-openpgp.c:708
+#: scd/app-openpgp.c:771
#, c-format
msgid "failed to store the creation date: %s\n"
msgstr "无法存储创建日期：%s\n"
-#: scd/app-openpgp.c:1156
+#: scd/app-openpgp.c:1219
#, c-format
msgid "reading public key failed: %s\n"
msgstr "无法读出公钥：%s\n"
-#: scd/app-openpgp.c:1164 scd/app-openpgp.c:2882
+#: scd/app-openpgp.c:1227 scd/app-openpgp.c:3080
msgid "response does not contain the public key data\n"
msgstr "响应未包含公钥数据\n"
-#: scd/app-openpgp.c:1172 scd/app-openpgp.c:2890
+#: scd/app-openpgp.c:1235 scd/app-openpgp.c:3088
msgid "response does not contain the RSA modulus\n"
msgstr "响应未包含 RSA 余数\n"
-#: scd/app-openpgp.c:1181 scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:1244 scd/app-openpgp.c:3098
msgid "response does not contain the RSA public exponent\n"
msgstr "响应未包含 RSA 公钥指数\n"
-#: scd/app-openpgp.c:1501
+#: scd/app-openpgp.c:1599
#, c-format
msgid "using default PIN as %s\n"
msgstr ""
-#: scd/app-openpgp.c:1508
+#: scd/app-openpgp.c:1606
#, c-format
msgid "failed to use default PIN as %s: %s - disabling further default use\n"
msgstr ""
-#: scd/app-openpgp.c:1523
+#: scd/app-openpgp.c:1621
#, c-format
msgid "||Please enter the PIN%%0A[sigs done: %lu]"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
-#: scd/app-openpgp.c:1534 scd/app-openpgp.c:1988
+#: scd/app-openpgp.c:1632 scd/app-openpgp.c:2103
#, fuzzy
msgid "||Please enter the PIN"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
-#: scd/app-openpgp.c:1575 scd/app-openpgp.c:1753 scd/app-openpgp.c:2001
+#: scd/app-openpgp.c:1674 scd/app-openpgp.c:1853 scd/app-openpgp.c:2116
#, 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:1588 scd/app-openpgp.c:1627 scd/app-openpgp.c:1765
-#: scd/app-openpgp.c:3200
+#: scd/app-openpgp.c:1687 scd/app-openpgp.c:1726 scd/app-openpgp.c:1865
+#: scd/app-openpgp.c:3398
#, c-format
msgid "verify CHV%d failed: %s\n"
msgstr "验证 CHV%d 失败：%s\n"
-#: scd/app-openpgp.c:1656 scd/app-openpgp.c:2020 scd/app-openpgp.c:3498
+#: scd/app-openpgp.c:1755 scd/app-openpgp.c:2137 scd/app-openpgp.c:3702
msgid "error retrieving CHV status from card\n"
msgstr "从卡中获取 CHV 状态时出错\n"
-#: scd/app-openpgp.c:1662 scd/app-openpgp.c:3507
+#: scd/app-openpgp.c:1761 scd/app-openpgp.c:3711
msgid "card is permanently locked!\n"
msgstr "卡被永久锁定！\n"
-#: scd/app-openpgp.c:1669
+#: scd/app-openpgp.c:1768
#, c-format
msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
#. the start of the string. Use %%0A to force a linefeed.
-#: scd/app-openpgp.c:1676
+#: scd/app-openpgp.c:1775
#, fuzzy, c-format
msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
-#: scd/app-openpgp.c:1680
+#: scd/app-openpgp.c:1779
#, fuzzy
msgid "|A|Please enter the Admin PIN"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
-#: scd/app-openpgp.c:1701
+#: scd/app-openpgp.c:1800
msgid "access to admin commands is not configured\n"
msgstr "尚未配置管理员命令的权限\n"
-#: scd/app-openpgp.c:2035
+#: scd/app-openpgp.c:2152
#, fuzzy
msgid "||Please enter the Reset Code for the card"
msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
-#: scd/app-openpgp.c:2045 scd/app-openpgp.c:2097
+#: scd/app-openpgp.c:2162 scd/app-openpgp.c:2216
#, fuzzy, c-format
msgid "Reset Code is too short; minimum length is %d\n"
msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
-#: scd/app-openpgp.c:2067
+#. 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:2185
msgid "|RN|New Reset Code"
msgstr ""
-#: scd/app-openpgp.c:2068
+#: scd/app-openpgp.c:2186
msgid "|AN|New Admin PIN"
msgstr "|AN|新的管理员 PIN"
-#: scd/app-openpgp.c:2068
+#: scd/app-openpgp.c:2186
msgid "|N|New PIN"
msgstr "新的 PIN"
-#: scd/app-openpgp.c:2178 scd/app-openpgp.c:2968
+#: scd/app-openpgp.c:2257
+#, fuzzy
+msgid "||Please enter the Admin PIN and New Admin PIN"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: scd/app-openpgp.c:2258
+#, fuzzy
+msgid "||Please enter the PIN and New PIN"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
+
+#: scd/app-openpgp.c:2315 scd/app-openpgp.c:3166
msgid "error reading application data\n"
msgstr "读取应用程序数据时出错\n"
-#: scd/app-openpgp.c:2184 scd/app-openpgp.c:2975
+#: scd/app-openpgp.c:2321 scd/app-openpgp.c:3173
msgid "error reading fingerprint DO\n"
msgstr "读取指纹 D0 出错\n"
-#: scd/app-openpgp.c:2194
+#: scd/app-openpgp.c:2331
msgid "key already exists\n"
msgstr "密钥已存在\n"
-#: scd/app-openpgp.c:2198
+#: scd/app-openpgp.c:2335
msgid "existing key will be replaced\n"
msgstr "现有的密钥将被替换\n"
-#: scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:2337
msgid "generating new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:2202
+#: scd/app-openpgp.c:2339
#, fuzzy
msgid "writing new key\n"
msgstr "生成新密钥\n"
-#: scd/app-openpgp.c:2627
+#: scd/app-openpgp.c:2788
msgid "creation timestamp missing\n"
msgstr "缺少创建时间戳\n"
-#: scd/app-openpgp.c:2669 scd/app-openpgp.c:2677
+#: scd/app-openpgp.c:2830 scd/app-openpgp.c:2838
#, c-format
msgid "RSA prime %s missing or not of size %d bits\n"
msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
-#: scd/app-openpgp.c:2773
+#: scd/app-openpgp.c:2971
#, c-format
msgid "failed to store the key: %s\n"
msgstr "无法存储密钥：%s\n"
-#: scd/app-openpgp.c:2859
+#: scd/app-openpgp.c:3057
msgid "please wait while key is being generated ...\n"
msgstr "请稍候，正在生成密钥……\n"
-#: scd/app-openpgp.c:2872
+#: scd/app-openpgp.c:3070
msgid "generating key failed\n"
msgstr "生成密钥失败\n"
-#: scd/app-openpgp.c:2875
+#: scd/app-openpgp.c:3073
#, c-format
msgid "key generation completed (%d seconds)\n"
msgstr "密钥已生成(耗时 %d 秒)\n"
-#: scd/app-openpgp.c:2933
+#: scd/app-openpgp.c:3131
msgid "invalid structure of OpenPGP card (DO 0x93)\n"
msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
-#: scd/app-openpgp.c:2983
+#: scd/app-openpgp.c:3181
msgid "fingerprint on card does not match requested one\n"
msgstr ""
-#: scd/app-openpgp.c:3099
+#: scd/app-openpgp.c:3297
#, c-format
msgid "card does not support digest algorithm %s\n"
msgstr "卡不支持散列算法 %s\n"
-#: scd/app-openpgp.c:3175
+#: scd/app-openpgp.c:3373
#, c-format
msgid "signatures created so far: %lu\n"
msgstr "目前已创建的签名：%lu\n"
-#: scd/app-openpgp.c:3512
+#: scd/app-openpgp.c:3716
msgid ""
"verification of Admin PIN is currently prohibited through this command\n"
msgstr "目前禁止通过此命令验证管理员 PIN\n"
-#: scd/app-openpgp.c:3737 scd/app-openpgp.c:3748
+#: scd/app-openpgp.c:3943 scd/app-openpgp.c:3954
#, c-format
msgid "can't access %s - invalid OpenPGP card?\n"
msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
#: scd/app-dinsig.c:299
-msgid "||Please enter your PIN at the reader's keypad"
-msgstr ""
+#, fuzzy
+msgid "||Please enter your PIN at the reader's pinpad"
+msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
#. TRANSLATORS: Do not translate the "|*|" prefixes but
#. keep it at the start of the string. We need this elsewhere
msgid "|N|Initial New PIN"
msgstr "新的 PIN"
-#: scd/scdaemon.c:107
+#: scd/scdaemon.c:109
msgid "run in multi server mode (foreground)"
msgstr ""
-#: scd/scdaemon.c:117 sm/gpgsm.c:316
+#: scd/scdaemon.c:119 sm/gpgsm.c:316
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:126 tools/gpgconf-comp.c:630
#, fuzzy
msgid "|FILE|write a log to FILE"
msgstr "从‘%s’读取选项\n"
-#: scd/scdaemon.c:126
+#: scd/scdaemon.c:128
msgid "|N|connect to reader at port N"
msgstr ""
-#: scd/scdaemon.c:128
+#: scd/scdaemon.c:130
msgid "|NAME|use NAME as ct-API driver"
msgstr ""
-#: scd/scdaemon.c:130
+#: scd/scdaemon.c:132
msgid "|NAME|use NAME as PC/SC driver"
msgstr ""
-#: scd/scdaemon.c:133
+#: scd/scdaemon.c:135
msgid "do not use the internal CCID driver"
msgstr ""
-#: scd/scdaemon.c:139
+#: scd/scdaemon.c:141
msgid "|N|disconnect the card after N seconds of inactivity"
msgstr ""
-#: scd/scdaemon.c:141
-msgid "do not use a reader's keypad"
+#: scd/scdaemon.c:144
+msgid "do not use a reader's pinpad"
msgstr ""
-#: scd/scdaemon.c:144
+#: scd/scdaemon.c:149
#, fuzzy
msgid "deny the use of admin card commands"
msgstr "显示管理员命令"
-#: scd/scdaemon.c:259
+#: scd/scdaemon.c:152
+msgid "use variable length input for pinpad"
+msgstr ""
+
+#: scd/scdaemon.c:269
#, fuzzy
msgid "Usage: scdaemon [options] (-h for help)"
msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
-#: scd/scdaemon.c:261
+#: scd/scdaemon.c:271
msgid ""
"Syntax: scdaemon [options] [command [args]]\n"
"Smartcard daemon for GnuPG\n"
msgstr ""
-#: scd/scdaemon.c:766
+#: scd/scdaemon.c:786
msgid "please use the option `--daemon' to run the program in the background\n"
msgstr ""
-#: scd/scdaemon.c:1120
+#: scd/scdaemon.c:1140
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: scd/scdaemon.c:1132
+#: scd/scdaemon.c:1152
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
msgid "validation model requested by certificate: %s"
msgstr ""
-#: sm/certchain.c:197 sm/certchain.c:1828
+#: sm/certchain.c:197 sm/certchain.c:1884
msgid "chain"
msgstr ""
-#: sm/certchain.c:198 sm/certchain.c:1828
+#: sm/certchain.c:198 sm/certchain.c:1884
msgid "shell"
msgstr ""
msgid "certificate policy not allowed"
msgstr "不允许导出私钥\n"
-#: sm/certchain.c:498
+#: sm/certchain.c:527
msgid "looking up issuer at external location\n"
msgstr ""
-#: sm/certchain.c:517
+#: sm/certchain.c:546
#, c-format
msgid "number of issuers matching: %d\n"
msgstr ""
-#: sm/certchain.c:561
+#: sm/certchain.c:590
msgid "looking up issuer from the Dirmngr cache\n"
msgstr ""
-#: sm/certchain.c:585
+#: sm/certchain.c:614
#, fuzzy, c-format
msgid "number of matching certificates: %d\n"
msgstr "生成密码的时候发生错误：%s\n"
-#: sm/certchain.c:587
+#: sm/certchain.c:616
#, fuzzy, c-format
msgid "dirmngr cache-only key lookup failed: %s\n"
msgstr "无法读出公钥：%s\n"
-#: sm/certchain.c:759 sm/certchain.c:1252 sm/certchain.c:1856 sm/decrypt.c:261
-#: sm/encrypt.c:335 sm/sign.c:335 sm/verify.c:113
+#: sm/certchain.c:815 sm/certchain.c:1308 sm/certchain.c:1912 sm/decrypt.c:261
+#: sm/encrypt.c:335 sm/import.c:435 sm/keydb.c:1496 sm/keydb.c:1564
+#: sm/sign.c:335 sm/verify.c:113
#, fuzzy
-msgid "failed to allocated keyDB handle\n"
+msgid "failed to allocate keyDB handle\n"
msgstr "无法存储密钥：%s\n"
-#: sm/certchain.c:925
+#: sm/certchain.c:981
#, fuzzy
msgid "certificate has been revoked"
msgstr "注意：密钥已被吊销"
-#: sm/certchain.c:940
+#: sm/certchain.c:996
msgid "the status of the certificate is unknown"
msgstr ""
-#: sm/certchain.c:947
+#: sm/certchain.c:1003
msgid "please make sure that the \"dirmngr\" is properly installed\n"
msgstr ""
-#: sm/certchain.c:953
+#: sm/certchain.c:1009
#, fuzzy, c-format
msgid "checking the CRL failed: %s"
msgstr "检查已建立的签名时发生错误： %s\n"
-#: sm/certchain.c:982 sm/certchain.c:1050
+#: sm/certchain.c:1038 sm/certchain.c:1106
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: sm/certchain.c:997 sm/certchain.c:1082
+#: sm/certchain.c:1053 sm/certchain.c:1138
msgid "certificate not yet valid"
msgstr ""
-#: sm/certchain.c:998 sm/certchain.c:1083
+#: sm/certchain.c:1054 sm/certchain.c:1139
#, fuzzy
msgid "root certificate not yet valid"
msgstr "不允许导出私钥\n"
-#: sm/certchain.c:999 sm/certchain.c:1084
+#: sm/certchain.c:1055 sm/certchain.c:1140
msgid "intermediate certificate not yet valid"
msgstr ""
-#: sm/certchain.c:1012
+#: sm/certchain.c:1068
#, fuzzy
msgid "certificate has expired"
msgstr "这把密钥已经过期！"
-#: sm/certchain.c:1013
+#: sm/certchain.c:1069
#, fuzzy
msgid "root certificate has expired"
msgstr "这把密钥已经过期！"
-#: sm/certchain.c:1014
+#: sm/certchain.c:1070
#, fuzzy
msgid "intermediate certificate has expired"
msgstr "这把密钥已经过期！"
-#: sm/certchain.c:1056
+#: sm/certchain.c:1112
#, c-format
msgid "required certificate attributes missing: %s%s%s"
msgstr ""
-#: sm/certchain.c:1065
+#: sm/certchain.c:1121
#, fuzzy
msgid "certificate with invalid validity"
msgstr "这把密钥已经过期！"
-#: sm/certchain.c:1102
+#: sm/certchain.c:1158
msgid "signature not created during lifetime of certificate"
msgstr ""
-#: sm/certchain.c:1104
+#: sm/certchain.c:1160
msgid "certificate not created during lifetime of issuer"
msgstr ""
-#: sm/certchain.c:1105
+#: sm/certchain.c:1161
msgid "intermediate certificate not created during lifetime of issuer"
msgstr ""
-#: sm/certchain.c:1109
+#: sm/certchain.c:1165
#, fuzzy
msgid " ( signature created at "
msgstr " 清除的签名：%lu\n"
-#: sm/certchain.c:1110
+#: sm/certchain.c:1166
#, fuzzy
msgid " (certificate created at "
msgstr "已建立吊销证书。\n"
-#: sm/certchain.c:1113
+#: sm/certchain.c:1169
#, fuzzy
msgid " (certificate valid from "
msgstr "证书已损坏"
-#: sm/certchain.c:1114
+#: sm/certchain.c:1170
#, fuzzy
msgid " ( issuer valid from "
msgstr "卡序列号 ="
-#: sm/certchain.c:1144
+#: sm/certchain.c:1200
#, fuzzy, c-format
msgid "fingerprint=%s\n"
msgstr "CA 指纹："
-#: sm/certchain.c:1153
+#: sm/certchain.c:1209
msgid "root certificate has now been marked as trusted\n"
msgstr ""
-#: sm/certchain.c:1166
+#: sm/certchain.c:1222
msgid "interactive marking as trusted not enabled in gpg-agent\n"
msgstr ""
-#: sm/certchain.c:1172
+#: sm/certchain.c:1228
msgid "interactive marking as trusted disabled for this session\n"
msgstr ""
-#: sm/certchain.c:1229
+#: sm/certchain.c:1285
msgid "WARNING: creation time of signature not known - assuming current time"
msgstr ""
-#: sm/certchain.c:1293
+#: sm/certchain.c:1349
#, fuzzy
msgid "no issuer found in certificate"
msgstr "生成一份吊销证书"
-#: sm/certchain.c:1366
+#: sm/certchain.c:1422
msgid "self-signed certificate has a BAD signature"
msgstr ""
-#: sm/certchain.c:1435
+#: sm/certchain.c:1491
msgid "root certificate is not marked trusted"
msgstr ""
-#: sm/certchain.c:1448
+#: sm/certchain.c:1504
#, fuzzy, c-format
msgid "checking the trust list failed: %s\n"
msgstr "检查已建立的签名时发生错误： %s\n"
-#: sm/certchain.c:1477 sm/import.c:160
+#: sm/certchain.c:1533 sm/import.c:160
msgid "certificate chain too long\n"
msgstr ""
-#: sm/certchain.c:1489
+#: sm/certchain.c:1545
msgid "issuer certificate not found"
msgstr ""
-#: sm/certchain.c:1522
+#: sm/certchain.c:1578
#, fuzzy
msgid "certificate has a BAD signature"
msgstr "验证签名"
-#: sm/certchain.c:1553
+#: sm/certchain.c:1609
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: sm/certchain.c:1604
+#: sm/certchain.c:1660
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: sm/certchain.c:1644 sm/certchain.c:1927
+#: sm/certchain.c:1700 sm/certchain.c:1983
#, fuzzy
msgid "certificate is good\n"
msgstr "首选项‘%s’重复\n"
-#: sm/certchain.c:1645
+#: sm/certchain.c:1701
#, fuzzy
msgid "intermediate certificate is good\n"
msgstr "已建立吊销证书。\n"
-#: sm/certchain.c:1646
+#: sm/certchain.c:1702
#, fuzzy
msgid "root certificate is good\n"
msgstr "证书已损坏"
-#: sm/certchain.c:1817
+#: sm/certchain.c:1873
msgid "switching to chain model"
msgstr ""
-#: sm/certchain.c:1826
+#: sm/certchain.c:1882
#, c-format
msgid "validation model used: %s"
msgstr ""
msgstr "取得当前密钥信息时出错：%s\n"
#: sm/certlist.c:142
-msgid "certificate should have not been used for certification\n"
+msgid "certificate should not have been used for certification\n"
msgstr ""
#: sm/certlist.c:154
-msgid "certificate should have not been used for OCSP response signing\n"
+msgid "certificate should not have been used for OCSP response signing\n"
msgstr ""
#: sm/certlist.c:165
-msgid "certificate should have not been used for encryption\n"
+msgid "certificate should not have been used for encryption\n"
msgstr ""
#: sm/certlist.c:166
-msgid "certificate should have not been used for signing\n"
+msgid "certificate should not have been used for signing\n"
msgstr ""
#: sm/certlist.c:167
msgid "certificate `%s' not found: %s\n"
msgstr "找不到私钥“%s”：%s\n"
-#: sm/delete.c:122 sm/keydb.c:1397 sm/keydb.c:1499
+#: sm/delete.c:122 sm/keydb.c:1574 sm/keydb.c:1676
#, fuzzy, c-format
msgid "error locking keybox: %s\n"
msgstr "读取密钥区块时发生错误：%s\n"
msgid "|USER-ID|use USER-ID as default secret key"
msgstr ""
-#: sm/gpgsm.c:311 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:311 tools/gpgconf-comp.c:755
msgid "|SPEC|use this keyserver to lookup keys"
msgstr ""
#, fuzzy
msgid ""
"Syntax: gpgsm [options] [files]\n"
-"sign, check, encrypt or decrypt using the S/MIME protocol\n"
-"default operation depends on the input data\n"
+"Sign, check, encrypt or decrypt using the S/MIME protocol\n"
+"Default operation depends on the input data\n"
msgstr ""
"语法：gpg [选项] [文件名]\n"
"签名、检查、加密或解密\n"
msgid "%s:%u: skipping this line\n"
msgstr " s = 跳过这把密钥\n"
-#: sm/gpgsm.c:1376
+#: sm/gpgsm.c:1379
#, fuzzy
msgid "could not parse keyserver\n"
msgstr "无法解析公钥服务器 URL\n"
-#: sm/gpgsm.c:1456
+#: sm/gpgsm.c:1459
msgid "WARNING: running with faked system time: "
msgstr ""
-#: sm/gpgsm.c:1556
+#: sm/gpgsm.c:1559
#, c-format
msgid "importing common certificates `%s'\n"
msgstr ""
-#: sm/gpgsm.c:1597
+#: sm/gpgsm.c:1600
#, fuzzy, c-format
msgid "can't sign using `%s': %s\n"
msgstr "无法存取‘%s’：%s\n"
-#: sm/gpgsm.c:1931
+#: sm/gpgsm.c:1934
msgid "invalid command (there is no implicit command)\n"
msgstr ""
msgid "basic certificate checks failed - not imported\n"
msgstr ""
-#: sm/import.c:435 sm/keydb.c:1319 sm/keydb.c:1387
-#, fuzzy
-msgid "failed to allocate keyDB handle\n"
-msgstr "无法存储密钥：%s\n"
-
-#: sm/import.c:492 sm/keydb.c:1417 sm/keydb.c:1511
+#: sm/import.c:492 sm/keydb.c:1594 sm/keydb.c:1688
#, fuzzy, c-format
msgid "error getting stored flags: %s\n"
msgstr "获取新 PIN 时出错：%s\n"
msgid "error reading input: %s\n"
msgstr "读取‘%s’时出错：%s\n"
-#: sm/keydb.c:187
+#: sm/keydb.c:216
#, fuzzy, c-format
msgid "error creating keybox `%s': %s\n"
msgstr "建立钥匙环‘%s’时发生错误：%s\n"
-#: sm/keydb.c:190
-msgid "you may want to start the gpg-agent first\n"
-msgstr ""
-
-#: sm/keydb.c:195
+#: sm/keydb.c:223
#, fuzzy, c-format
msgid "keybox `%s' created\n"
msgstr "钥匙环‘%s’已建立\n"
-#: sm/keydb.c:1312 sm/keydb.c:1380
+#: sm/keydb.c:1489 sm/keydb.c:1557
#, fuzzy
msgid "failed to get the fingerprint\n"
msgstr "无法存储指纹：%s\n"
-#: sm/keydb.c:1340
+#: sm/keydb.c:1517
#, c-format
msgid "problem looking for existing certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1348
+#: sm/keydb.c:1525
#, fuzzy, c-format
msgid "error finding writable keyDB: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
-#: sm/keydb.c:1356
+#: sm/keydb.c:1533
#, fuzzy, c-format
msgid "error storing certificate: %s\n"
msgstr "取得当前密钥信息时出错：%s\n"
-#: sm/keydb.c:1408
+#: sm/keydb.c:1585
#, c-format
msgid "problem re-searching certificate: %s\n"
msgstr ""
-#: sm/keydb.c:1429 sm/keydb.c:1522
+#: sm/keydb.c:1606 sm/keydb.c:1699
#, fuzzy, c-format
msgid "error storing flags: %s\n"
msgstr "读取‘%s’时出错：%s\n"
msgid "error sending standard options: %s\n"
msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
-#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:644
-#: tools/gpgconf-comp.c:712 tools/gpgconf-comp.c:799
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:583 tools/gpgconf-comp.c:654
+#: tools/gpgconf-comp.c:722 tools/gpgconf-comp.c:809
msgid "Options controlling the diagnostic output"
msgstr ""
-#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:590 tools/gpgconf-comp.c:657
-#: tools/gpgconf-comp.c:725 tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:596 tools/gpgconf-comp.c:667
+#: tools/gpgconf-comp.c:735 tools/gpgconf-comp.c:832
msgid "Options controlling the configuration"
msgstr ""
-#: tools/gpgconf-comp.c:496 tools/gpgconf-comp.c:615 tools/gpgconf-comp.c:673
-#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:829
+#: tools/gpgconf-comp.c:502 tools/gpgconf-comp.c:625 tools/gpgconf-comp.c:683
+#: tools/gpgconf-comp.c:760 tools/gpgconf-comp.c:839
msgid "Options useful for debugging"
msgstr ""
-#: tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:678 tools/gpgconf-comp.c:755
-#: tools/gpgconf-comp.c:837
+#: tools/gpgconf-comp.c:507 tools/gpgconf-comp.c:688 tools/gpgconf-comp.c:765
+#: tools/gpgconf-comp.c:847
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:625 tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:515 tools/gpgconf-comp.c:635 tools/gpgconf-comp.c:773
msgid "Options controlling the security"
msgstr ""
-#: tools/gpgconf-comp.c:516
+#: tools/gpgconf-comp.c:522
msgid "|N|expire SSH keys after N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:520
+#: tools/gpgconf-comp.c:526
msgid "|N|set maximum PIN cache lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:524
+#: tools/gpgconf-comp.c:530
msgid "|N|set maximum SSH key lifetime to N seconds"
msgstr ""
-#: tools/gpgconf-comp.c:538
+#: tools/gpgconf-comp.c:544
msgid "Options enforcing a passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:541
+#: tools/gpgconf-comp.c:547
msgid "do not allow to bypass the passphrase policy"
msgstr ""
-#: tools/gpgconf-comp.c:545
+#: tools/gpgconf-comp.c:551
msgid "|N|set minimal required length for new passphrases to N"
msgstr ""
-#: tools/gpgconf-comp.c:549
+#: tools/gpgconf-comp.c:555
msgid "|N|require at least N non-alpha characters for a new passphrase"
msgstr ""
-#: tools/gpgconf-comp.c:553
+#: tools/gpgconf-comp.c:559
msgid "|FILE|check new passphrases against pattern in FILE"
msgstr ""
-#: tools/gpgconf-comp.c:557
+#: tools/gpgconf-comp.c:563
#, fuzzy
msgid "|N|expire the passphrase after N days"
msgstr "从导出的子钥中删除所有密码"
-#: tools/gpgconf-comp.c:561
+#: tools/gpgconf-comp.c:567
#, fuzzy
msgid "do not allow the reuse of old passphrases"
msgstr "生成密码的时候发生错误：%s\n"
-#: tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:737
msgid "|NAME|use NAME as default secret key"
msgstr ""
-#: tools/gpgconf-comp.c:662 tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:672 tools/gpgconf-comp.c:740
#, fuzzy
msgid "|NAME|encrypt to user ID NAME as well"
msgstr "|某甲|为收件者“某甲”加密"
-#: tools/gpgconf-comp.c:665
+#: tools/gpgconf-comp.c:675
msgid "|SPEC|set up email aliases"
msgstr ""
-#: tools/gpgconf-comp.c:686
+#: tools/gpgconf-comp.c:696
msgid "Configuration for Keyservers"
msgstr ""
-#: tools/gpgconf-comp.c:688
+#: tools/gpgconf-comp.c:698
#, fuzzy
msgid "|URL|use keyserver at URL"
msgstr "无法解析公钥服务器 URL\n"
-#: tools/gpgconf-comp.c:691
+#: tools/gpgconf-comp.c:701
msgid "allow PKA lookups (DNS requests)"
msgstr ""
-#: tools/gpgconf-comp.c:694
+#: tools/gpgconf-comp.c:704
msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
msgstr ""
-#: tools/gpgconf-comp.c:739
+#: tools/gpgconf-comp.c:749
msgid "disable all access to the dirmngr"
msgstr ""
-#: tools/gpgconf-comp.c:742
+#: tools/gpgconf-comp.c:752
msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
msgstr ""
-#: tools/gpgconf-comp.c:768
+#: tools/gpgconf-comp.c:778
msgid "do not check CRLs for root certificates"
msgstr ""
-#: tools/gpgconf-comp.c:812
+#: tools/gpgconf-comp.c:822
msgid "Options controlling the format of the output"
msgstr ""
-#: tools/gpgconf-comp.c:848
+#: tools/gpgconf-comp.c:858
msgid "Options controlling the interactivity and enforcement"
msgstr ""
-#: tools/gpgconf-comp.c:858
+#: tools/gpgconf-comp.c:868
msgid "Configuration for HTTP servers"
msgstr ""
-#: tools/gpgconf-comp.c:869
+#: tools/gpgconf-comp.c:879
msgid "use system's HTTP proxy setting"
msgstr ""
-#: tools/gpgconf-comp.c:874
+#: tools/gpgconf-comp.c:884
msgid "Configuration of LDAP servers to use"
msgstr ""
-#: tools/gpgconf-comp.c:903
+#: tools/gpgconf-comp.c:913
msgid "LDAP server list"
msgstr ""
-#: tools/gpgconf-comp.c:911
+#: tools/gpgconf-comp.c:921
msgid "Configuration for OCSP"
msgstr ""
-#: tools/gpgconf-comp.c:3077
+#: tools/gpgconf-comp.c:3087
#, c-format
msgid "External verification of component %s failed"
msgstr ""
-#: tools/gpgconf-comp.c:3227
+#: tools/gpgconf-comp.c:3237
msgid "Note that group specifications are ignored\n"
msgstr ""
"Check a passphrase given on stdin against the patternfile\n"
msgstr ""
+#, fuzzy
+#~ msgid "error loading `%s': %s\n"
+#~ msgstr "读取‘%s’时出错：%s\n"
+
+#, fuzzy
+#~ msgid "failed to allocated keyDB handle\n"
+#~ msgstr "无法存储密钥：%s\n"
+
#~ msgid "Command> "
#~ msgstr "命令> "
#~ msgid "Repeat passphrase\n"
#~ msgstr "请再输入一次密码\n"
-#, fuzzy
-#~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
-#~ msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
-
#~ msgid "|A|Admin PIN"
#~ msgstr "|A|管理员 PIN"
#~ msgid "wrong secret key used"
#~ msgstr "使用了错误的私钥"
-#~ msgid "not supported"
-#~ msgstr "未被支持"
-
#~ msgid "bad key"
#~ msgstr "密钥已损坏"
projects / platform / upstream / gpg2.git / blobdiff