Add --reload command to gpgconf.

Fix a problem in exechelp.c
Get ready for a release.

1 files changed, 239 insertions, 239 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 89da167f8..b24a6564d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-01-28 14:11+0100\n"
+"POT-Creation-Date: 2009-03-03 08:47+0100\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -154,7 +154,7 @@ msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
 #: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
-#: agent/protect-tool.c:1198
+#: agent/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密码"
@@ -167,7 +167,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1204 tools/symcryptrun.c:434
+#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -289,7 +289,7 @@ msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
 #: agent/gpg-agent.c:117 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:101 tools/gpg-check-pattern.c:70
+#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -299,40 +299,40 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:119 scd/scdaemon.c:103
+#: agent/gpg-agent.c:119 scd/scdaemon.c:104
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:106
+#: agent/gpg-agent.c:120 scd/scdaemon.c:107
 msgid "run in daemon mode (background)"
 msgstr ""
 
 #: agent/gpg-agent.c:121 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:107 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:77 tools/symcryptrun.c:164
+#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:79 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:108
+#: agent/gpg-agent.c:122 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:123 scd/scdaemon.c:109
+#: agent/gpg-agent.c:123 scd/scdaemon.c:110
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:124 scd/scdaemon.c:111
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111 sm/gpgsm.c:311
+#: agent/gpg-agent.c:125 scd/scdaemon.c:112 sm/gpgsm.c:311
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:130 scd/scdaemon.c:120
+#: agent/gpg-agent.c:130 scd/scdaemon.c:122
 msgid "do not detach from the console"
 msgstr ""
 
@@ -363,200 +363,200 @@ msgstr ""
 msgid "do not use the SCdaemon"
 msgstr "导入后不更新信任度数据库"
 
-#: agent/gpg-agent.c:150
+#: agent/gpg-agent.c:153
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:152
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:155
+#: agent/gpg-agent.c:158
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:168
+#: agent/gpg-agent.c:171
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:170
+#: agent/gpg-agent.c:173
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:175
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/gpg-agent.c:173
+#: agent/gpg-agent.c:176
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:175
+#: agent/gpg-agent.c:178
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:313 agent/preset-passphrase.c:94 agent/protect-tool.c:146
-#: scd/scdaemon.c:241 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:316 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:322
+#: agent/gpg-agent.c:325
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:324
+#: agent/gpg-agent.c:327
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:359 g10/gpg.c:980 scd/scdaemon.c:291 sm/gpgsm.c:640
+#: agent/gpg-agent.c:362 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:557 agent/protect-tool.c:1067 kbx/kbxutil.c:429
-#: scd/scdaemon.c:385 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:560 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:656 g10/gpg.c:2086 scd/scdaemon.c:467 sm/gpgsm.c:971
+#: agent/gpg-agent.c:659 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:661 agent/gpg-agent.c:1240 g10/gpg.c:2090
-#: scd/scdaemon.c:472 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:664 agent/gpg-agent.c:1243 g10/gpg.c:2090
+#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:669 g10/gpg.c:2097 scd/scdaemon.c:480 sm/gpgsm.c:982
+#: agent/gpg-agent.c:672 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:998 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1001 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:1353 agent/gpg-agent.c:1473 agent/gpg-agent.c:1477
-#: agent/gpg-agent.c:1518 agent/gpg-agent.c:1522 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:973
+#: agent/gpg-agent.c:1356 agent/gpg-agent.c:1476 agent/gpg-agent.c:1480
+#: agent/gpg-agent.c:1521 agent/gpg-agent.c:1525 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:989
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1367 scd/scdaemon.c:987
+#: agent/gpg-agent.c:1370 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1390 scd/scdaemon.c:1010
+#: agent/gpg-agent.c:1393 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1399
+#: agent/gpg-agent.c:1402
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1419
+#: agent/gpg-agent.c:1422
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1430 scd/scdaemon.c:1030
+#: agent/gpg-agent.c:1433 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: agent/gpg-agent.c:1435 scd/scdaemon.c:1033
+#: agent/gpg-agent.c:1438 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1042
+#: agent/gpg-agent.c:1450 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1453 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1456 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1481 agent/gpg-agent.c:1528 g10/openfile.c:432
+#: agent/gpg-agent.c:1484 agent/gpg-agent.c:1531 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1534
+#: agent/gpg-agent.c:1537
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1538
+#: agent/gpg-agent.c:1541
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1668 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1671 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/gpg-agent.c:1690
+#: agent/gpg-agent.c:1693
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1695
+#: agent/gpg-agent.c:1698
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1715
+#: agent/gpg-agent.c:1718
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1720
+#: agent/gpg-agent.c:1723
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1860 scd/scdaemon.c:1202
+#: agent/gpg-agent.c:1863 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:1969 scd/scdaemon.c:1269
+#: agent/gpg-agent.c:1972 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:2097
+#: agent/gpg-agent.c:2100
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:2108 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2111 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:2121 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2124 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -584,40 +584,40 @@ msgid ""
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1189
+#: agent/protect-tool.c:1196
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1192
+#: agent/protect-tool.c:1199
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1195
+#: agent/protect-tool.c:1202
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1200
+#: agent/protect-tool.c:1207
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1205 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "错误的密码"
 
-#: agent/protect-tool.c:1213 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/protect-tool.c:1216 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
@@ -729,43 +729,43 @@ msgstr "更改密码"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:380 common/exechelp.c:471 tools/gpgconf-comp.c:1406
-#: tools/gpgconf-comp.c:1745
+#: common/exechelp.c:385 common/exechelp.c:476 tools/gpgconf-comp.c:1475
+#: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: common/exechelp.c:445 common/exechelp.c:504
+#: common/exechelp.c:450 common/exechelp.c:509
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: common/exechelp.c:483 common/exechelp.c:611 common/exechelp.c:846
+#: common/exechelp.c:488 common/exechelp.c:616 common/exechelp.c:851
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:657 common/exechelp.c:710
+#: common/exechelp.c:662 common/exechelp.c:715
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:665
+#: common/exechelp.c:670
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: common/exechelp.c:671 common/exechelp.c:721
+#: common/exechelp.c:676 common/exechelp.c:726
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:716
+#: common/exechelp.c:721
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:729
+#: common/exechelp.c:734
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -1456,7 +1456,7 @@ msgstr "--output 在这个命令中不起作用\n"
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3424 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -1732,7 +1732,7 @@ msgstr "CA 指纹："
 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:3749
+#: g10/getkey.c:2533 g10/keyedit.c:3760
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -1747,7 +1747,7 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:58
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
 msgid ""
 "@Commands:\n"
 " "
@@ -1883,7 +1883,7 @@ msgid "run in server mode"
 msgstr ""
 
 #: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:74 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:76 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1921,7 +1921,7 @@ msgstr "使用标准的文本模式"
 msgid "|FILE|write output to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:79
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
@@ -2154,7 +2154,7 @@ msgstr "‘%s’不是一个有效的签名过期日期\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4107
+#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
@@ -3290,8 +3290,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4826 g10/keyedit.c:4917 g10/keyedit.c:4981
-#: g10/keyedit.c:5042 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4837 g10/keyedit.c:4928 g10/keyedit.c:4992
+#: g10/keyedit.c:5053 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -3679,94 +3679,94 @@ msgstr "首选公钥服务器："
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2662
+#: g10/keyedit.c:2673
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2721
+#: g10/keyedit.c:2732
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2742
+#: g10/keyedit.c:2753
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2759
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2764 g10/keyedit.c:2820 g10/keyedit.c:2881 g10/keyedit.c:2896
+#: g10/keyedit.c:2775 g10/keyedit.c:2831 g10/keyedit.c:2892 g10/keyedit.c:2907
 #: g10/keylist.c:200 g10/keyserver.c:529
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2767 g10/keylist.c:817 g10/keylist.c:911 g10/mainproc.c:989
+#: g10/keyedit.c:2778 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:989
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2769 g10/keylist.c:788 g10/keylist.c:823 g10/keylist.c:917
+#: g10/keyedit.c:2780 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2771 g10/keyedit.c:2822 g10/keyedit.c:2883 g10/keyedit.c:2898
-#: g10/keylist.c:202 g10/keylist.c:794 g10/keylist.c:829 g10/keylist.c:923
-#: g10/keylist.c:944 g10/keyserver.c:535 g10/mainproc.c:995
+#: g10/keyedit.c:2782 g10/keyedit.c:2833 g10/keyedit.c:2894 g10/keyedit.c:2909
+#: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
+#: g10/keylist.c:959 g10/keyserver.c:535 g10/mainproc.c:995
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2773
+#: g10/keyedit.c:2784
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2799
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2792
+#: g10/keyedit.c:2803
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2799
+#: g10/keyedit.c:2810
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2827 g10/keylist.c:206
+#: g10/keyedit.c:2838 g10/keylist.c:206
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2851
+#: g10/keyedit.c:2862
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2915 g10/keyedit.c:3261 g10/keyserver.c:539
+#: g10/keyedit.c:2926 g10/keyedit.c:3272 g10/keyserver.c:539
 #: g10/mainproc.c:1842 g10/trustdb.c:1173 g10/trustdb.c:1701
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2917 g10/keyedit.c:3263 g10/keyserver.c:543
+#: g10/keyedit.c:2928 g10/keyedit.c:3274 g10/keyserver.c:543
 #: g10/mainproc.c:1844 g10/trustdb.c:526 g10/trustdb.c:1703
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2982
+#: g10/keyedit.c:2993
 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:3043
+#: g10/keyedit.c:3054
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3775,74 +3775,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3048 g10/keyedit.c:3383
+#: g10/keyedit.c:3059 g10/keyedit.c:3394
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3065
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3205
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3204
+#: g10/keyedit.c:3215
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3208
+#: g10/keyedit.c:3219
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3214
+#: g10/keyedit.c:3225
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3228
+#: g10/keyedit.c:3239
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3229
+#: g10/keyedit.c:3240
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3232
+#: g10/keyedit.c:3243
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3265 g10/trustdb.c:1705
+#: g10/keyedit.c:3276 g10/trustdb.c:1705
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3267
+#: g10/keyedit.c:3278
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3274
+#: g10/keyedit.c:3285
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3275
+#: g10/keyedit.c:3286
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3283
+#: g10/keyedit.c:3294
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3295
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3378
+#: g10/keyedit.c:3389
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3851,193 +3851,193 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3389
+#: g10/keyedit.c:3400
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3409
+#: g10/keyedit.c:3420
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3434
+#: g10/keyedit.c:3445
 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:3449
+#: g10/keyedit.c:3460
 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:3471
+#: g10/keyedit.c:3482
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3490
+#: g10/keyedit.c:3501
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3496
+#: g10/keyedit.c:3507
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3568
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3563
+#: g10/keyedit.c:3574
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3567
+#: g10/keyedit.c:3578
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3570
+#: g10/keyedit.c:3581
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3616
+#: g10/keyedit.c:3627
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3632
+#: g10/keyedit.c:3643
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3710
+#: g10/keyedit.c:3721
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3716
+#: g10/keyedit.c:3727
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3890
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3918 g10/keyedit.c:4028 g10/keyedit.c:4148 g10/keyedit.c:4289
+#: g10/keyedit.c:3929 g10/keyedit.c:4039 g10/keyedit.c:4159 g10/keyedit.c:4300
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4089
+#: g10/keyedit.c:4100
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4169
+#: g10/keyedit.c:4180
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4170
+#: g10/keyedit.c:4181
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4232
+#: g10/keyedit.c:4243
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4381
+#: g10/keyedit.c:4392
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4445
+#: g10/keyedit.c:4456
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4503
+#: g10/keyedit.c:4514
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4530
+#: g10/keyedit.c:4541
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4665
+#: g10/keyedit.c:4676
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4668 g10/keyedit.c:4732 g10/keyedit.c:4775
+#: g10/keyedit.c:4679 g10/keyedit.c:4743 g10/keyedit.c:4786
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4670 g10/keyedit.c:4734 g10/keyedit.c:4777
+#: g10/keyedit.c:4681 g10/keyedit.c:4745 g10/keyedit.c:4788
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4674
+#: g10/keyedit.c:4685
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4678
+#: g10/keyedit.c:4689
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4682
+#: g10/keyedit.c:4693
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4709
+#: g10/keyedit.c:4720
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4735
+#: g10/keyedit.c:4746
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4742
+#: g10/keyedit.c:4753
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4764
+#: g10/keyedit.c:4775
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4784
+#: g10/keyedit.c:4795
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4814
+#: g10/keyedit.c:4825
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4884
+#: g10/keyedit.c:4895
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4901
+#: g10/keyedit.c:4912
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4965
+#: g10/keyedit.c:4976
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5027
+#: g10/keyedit.c:5038
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5122
+#: g10/keyedit.c:5133
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -4555,30 +4555,30 @@ msgstr "签名注记："
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1509
+#: g10/keylist.c:1524
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1511
+#: g10/keylist.c:1526
 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:1518
+#: g10/keylist.c:1533
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1520
+#: g10/keylist.c:1535
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1524 g10/keylist.c:1528
+#: g10/keylist.c:1539 g10/keylist.c:1543
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
-#: g10/keylist.c:1595
+#: g10/keylist.c:1610
 msgid "      Card serial no. ="
 msgstr "卡序列号 ="
 
@@ -6326,7 +6326,7 @@ msgstr "可选"
 msgid "invalid option \"%.50s\"\n"
 msgstr "无效的列表选项\n"
 
-#: jnlib/logging.c:630
+#: jnlib/logging.c:644
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "您找到一个程序缺陷了……(%s:%d)\n"
@@ -6652,69 +6652,69 @@ msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 msgid "|N|Initial New PIN"
 msgstr "新的 PIN"
 
-#: scd/scdaemon.c:105
+#: scd/scdaemon.c:106
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:115 sm/gpgsm.c:315
+#: scd/scdaemon.c:116 sm/gpgsm.c:315
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:121 tools/gpgconf-comp.c:619
+#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: scd/scdaemon.c:123
+#: scd/scdaemon.c:125
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:127
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:129
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:130
+#: scd/scdaemon.c:132
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:136
+#: scd/scdaemon.c:138
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:140
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:141
+#: scd/scdaemon.c:143
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "显示管理员命令"
 
-#: scd/scdaemon.c:254
+#: scd/scdaemon.c:256
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:258
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:720
+#: scd/scdaemon.c:736
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1074
+#: scd/scdaemon.c:1090
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1086
+#: scd/scdaemon.c:1102
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
@@ -7405,7 +7405,7 @@ msgstr "从这个钥匙环里取用密钥"
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:744
+#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
@@ -7662,7 +7662,7 @@ msgstr "              亦即“%s”"
 msgid "This is a qualified signature\n"
 msgstr "这将是一个自身签名。\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:78 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -7751,223 +7751,223 @@ msgstr "读取‘%s’时出错：%s\n"
 msgid "error sending standard options: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: tools/gpgconf-comp.c:472 tools/gpgconf-comp.c:576 tools/gpgconf-comp.c:643
-#: tools/gpgconf-comp.c:711 tools/gpgconf-comp.c:798
+#: 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
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:485 tools/gpgconf-comp.c:589 tools/gpgconf-comp.c:656
-#: tools/gpgconf-comp.c:724 tools/gpgconf-comp.c:821
+#: 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
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:672
-#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:828
+#: 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
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:677 tools/gpgconf-comp.c:754
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:678 tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:837
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
+#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:625 tools/gpgconf-comp.c:763
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:515
+#: tools/gpgconf-comp.c:516
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:519
+#: tools/gpgconf-comp.c:520
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:523
+#: tools/gpgconf-comp.c:524
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:537
+#: tools/gpgconf-comp.c:538
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:540
+#: tools/gpgconf-comp.c:541
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:544
+#: tools/gpgconf-comp.c:545
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:548
+#: tools/gpgconf-comp.c:549
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:552
+#: tools/gpgconf-comp.c:553
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:556
+#: tools/gpgconf-comp.c:557
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "从导出的子钥中删除所有密码"
 
-#: tools/gpgconf-comp.c:560
+#: tools/gpgconf-comp.c:561
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
+#: tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:727
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
+#: tools/gpgconf-comp.c:662 tools/gpgconf-comp.c:730
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: tools/gpgconf-comp.c:664
+#: tools/gpgconf-comp.c:665
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:686
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:687
+#: tools/gpgconf-comp.c:688
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: tools/gpgconf-comp.c:690
+#: tools/gpgconf-comp.c:691
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:693
+#: tools/gpgconf-comp.c:694
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: tools/gpgconf-comp.c:738
+#: tools/gpgconf-comp.c:739
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: tools/gpgconf-comp.c:741
+#: tools/gpgconf-comp.c:742
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:767
+#: tools/gpgconf-comp.c:768
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:811
+#: tools/gpgconf-comp.c:812
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:847
+#: tools/gpgconf-comp.c:848
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:858
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:868
+#: tools/gpgconf-comp.c:869
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:873
+#: tools/gpgconf-comp.c:874
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:902
+#: tools/gpgconf-comp.c:903
 msgid "LDAP server list"
 msgstr ""
 
-#: tools/gpgconf-comp.c:910
+#: tools/gpgconf-comp.c:911
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3008
+#: tools/gpgconf-comp.c:3077
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3158
+#: tools/gpgconf-comp.c:3227
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:61
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:66
+#: tools/gpgconf.c:67
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:68
+#: tools/gpgconf.c:69
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:70
+#: tools/gpgconf.c:71
 #, fuzzy
 msgid "list global configuration file"
 msgstr "未知的配置项‘%s’\n"
 
-#: tools/gpgconf.c:72
+#: tools/gpgconf.c:73
 #, fuzzy
 msgid "check global configuration file"
 msgstr "未知的配置项‘%s’\n"
 
-#: tools/gpgconf.c:76
+#: tools/gpgconf.c:78
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:82
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:102
+#: tools/gpgconf.c:104
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/gpgconf.c:105
+#: tools/gpgconf.c:107
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:209 tools/gpgconf.c:249
+#: tools/gpgconf.c:212 tools/gpgconf.c:277
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法：gpg [选项] "
 
-#: tools/gpgconf.c:211
+#: tools/gpgconf.c:214
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:220
+#: tools/gpgconf.c:223 tools/gpgconf.c:253
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公钥"
 
-#: tools/gpgconf.c:251
+#: tools/gpgconf.c:279
 #, fuzzy
 msgid "No argument allowed"
 msgstr "不允许使用管理员命令\n"