Do not run the setuid test if running under as root proper.

Documentation fixes.
Some enhancements for the new OpenPGP Card.

1 files changed, 299 insertions, 214 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b1a0357bb..c1b6e69ac 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: 2008-05-31 13:02+0200\n"
+"POT-Creation-Date: 2008-06-26 20:51+0200\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"
@@ -98,9 +98,10 @@ msgstr "错误的密码"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "不支持保护散列 %d\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3174
-#: g10/keygen.c:3207 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1064 g10/keygen.c:3213
+#: g10/keygen.c:3246 g10/keyring.c:1202 g10/keyring.c:1506 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:800 g10/sign.c:1109 g10/tdbio.c:547
+#: jnlib/dotlock.c:311
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
@@ -108,11 +109,11 @@ msgstr "无法建立‘%s’：%s\n"
 #: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:682
 #: g10/card-util.c:751 g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70
 #: g10/encode.c:194 g10/encode.c:504 g10/gpg.c:1065 g10/import.c:193
-#: g10/keygen.c:2663 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2698 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
 #: g10/plaintext.c:503 g10/sign.c:782 g10/sign.c:977 g10/sign.c:1093
 #: g10/sign.c:1249 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:551
-#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:614 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2077
+#: sm/gpgsm.c:2114 sm/gpgsm.c:2152 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -406,24 +407,24 @@ msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
 #: agent/gpg-agent.c:529 agent/protect-tool.c:1066 kbx/kbxutil.c:428
-#: scd/scdaemon.c:342 sm/gpgsm.c:881 sm/gpgsm.c:884 tools/symcryptrun.c:997
+#: scd/scdaemon.c:342 sm/gpgsm.c:974 sm/gpgsm.c:977 tools/symcryptrun.c:997
 #: tools/gpg-check-pattern.c:178
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:972
+#: agent/gpg-agent.c:628 g10/gpg.c:2069 scd/scdaemon.c:423 sm/gpgsm.c:1065
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
 #: agent/gpg-agent.c:633 agent/gpg-agent.c:1216 g10/gpg.c:2073
-#: scd/scdaemon.c:428 sm/gpgsm.c:976 tools/symcryptrun.c:930
+#: scd/scdaemon.c:428 sm/gpgsm.c:1069 tools/symcryptrun.c:930
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:983
+#: agent/gpg-agent.c:641 g10/gpg.c:2080 scd/scdaemon.c:436 sm/gpgsm.c:1076
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
@@ -713,8 +714,8 @@ msgstr "更改密码"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
-#: tools/gpgconf-comp.c:1734
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1406
+#: tools/gpgconf-comp.c:1745
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -1116,13 +1117,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
 #: g10/card-util.c:75 g10/card-util.c:1396 g10/delkey.c:126 g10/keyedit.c:1529
-#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2889 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
 #: g10/card-util.c:102 g10/card-util.c:1129 g10/card-util.c:1208
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1591
-#: g10/keygen.c:1658 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1592
+#: g10/keygen.c:1659 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "您的选择？ "
 
@@ -1289,7 +1290,7 @@ msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
 #: g10/card-util.c:1140 g10/card-util.c:1219 g10/keyedit.c:945
-#: g10/keygen.c:1595 g10/keygen.c:1623 g10/keygen.c:1697 g10/revoke.c:685
+#: g10/keygen.c:1596 g10/keygen.c:1624 g10/keygen.c:1698 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
@@ -2206,7 +2207,7 @@ msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2965 sm/gpgsm.c:1374
+#: g10/gpg.c:2965 sm/gpgsm.c:1485
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
@@ -2246,11 +2247,11 @@ msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1446
+#: g10/gpg.c:3101 g10/gpg.c:3125 sm/gpgsm.c:1557
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1454 sm/gpgsm.c:1460
+#: g10/gpg.c:3107 g10/gpg.c:3131 sm/gpgsm.c:1565 sm/gpgsm.c:1571
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
@@ -3243,19 +3244,19 @@ msgstr "签名时失败： %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3549
+#: g10/keyedit.c:1142 g10/keygen.c:3588
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3575 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3552
+#: g10/keyedit.c:1150 g10/keygen.c:3591
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3556
+#: g10/keyedit.c:1154 g10/keygen.c:3595
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
@@ -3272,7 +3273,7 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2149
+#: g10/keyedit.c:1199 g10/keygen.c:2150
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
@@ -3985,69 +3986,69 @@ msgstr "子钥 %s 已被吊销。\n"
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
 
-#: g10/keygen.c:268
+#: g10/keygen.c:269
 #, c-format
 msgid "preference `%s' duplicated\n"
 msgstr "首选项‘%s’重复\n"
 
-#: g10/keygen.c:275
+#: g10/keygen.c:276
 msgid "too many cipher preferences\n"
 msgstr "太多对称加密算法首选项\n"
 
-#: g10/keygen.c:277
+#: g10/keygen.c:278
 msgid "too many digest preferences\n"
 msgstr "太多散列算法首选项\n"
 
-#: g10/keygen.c:279
+#: g10/keygen.c:280
 msgid "too many compression preferences\n"
 msgstr "太多首选压缩算法\n"
 
-#: g10/keygen.c:404
+#: g10/keygen.c:405
 #, c-format
 msgid "invalid item `%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 msgid "writing direct signature\n"
 msgstr "正在写入直接签名\n"
 
-#: g10/keygen.c:926
+#: g10/keygen.c:927
 msgid "writing self signature\n"
 msgstr "正在写入自身签名\n"
 
-#: g10/keygen.c:983
+#: g10/keygen.c:984
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1151 g10/keygen.c:1262 g10/keygen.c:1267 g10/keygen.c:1402
-#: g10/keygen.c:3049
+#: g10/keygen.c:1152 g10/keygen.c:1263 g10/keygen.c:1268 g10/keygen.c:1403
+#: g10/keygen.c:3088
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
+#: g10/keygen.c:1158 g10/keygen.c:1274 g10/keygen.c:1409 g10/keygen.c:3094
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1299
+#: g10/keygen.c:1300
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1519
+#: g10/keygen.c:1520
 msgid "Sign"
 msgstr "签名"
 
-#: g10/keygen.c:1522
+#: g10/keygen.c:1523
 msgid "Certify"
 msgstr "验证"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1526
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1528
+#: g10/keygen.c:1529
 msgid "Authenticate"
 msgstr "认证"
 
@@ -4061,109 +4062,109 @@ msgstr "认证"
 #. a = Toggle authentication capability
 #. q = Finish
 #.
-#: g10/keygen.c:1546
+#: g10/keygen.c:1547
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1569
+#: g10/keygen.c:1570
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥可能的操作："
 
-#: g10/keygen.c:1573
+#: g10/keygen.c:1574
 msgid "Current allowed actions: "
 msgstr "目前允许的操作："
 
-#: g10/keygen.c:1578
+#: g10/keygen.c:1579
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 选择是否用于签名\n"
 
-#: g10/keygen.c:1581
+#: g10/keygen.c:1582
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 选择是否用于加密\n"
 
-#: g10/keygen.c:1584
+#: g10/keygen.c:1585
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 选择是否用于认证\n"
 
-#: g10/keygen.c:1587
+#: g10/keygen.c:1588
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1643 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1644 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1645
+#: g10/keygen.c:1646
 #, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1646
+#: g10/keygen.c:1647
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签名)\n"
 
-#: g10/keygen.c:1648
+#: g10/keygen.c:1649
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA (自定义用途)\n"
 
-#: g10/keygen.c:1650
+#: g10/keygen.c:1651
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (仅用于加密)\n"
 
-#: g10/keygen.c:1651
+#: g10/keygen.c:1652
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签名)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1654
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1655
+#: g10/keygen.c:1656
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1724
+#: g10/keygen.c:1725
 #, c-format
 msgid "DSA keypair will have %u bits.\n"
 msgstr "DSA 密钥对会有 %u 位。\n"
 
-#: g10/keygen.c:1734
+#: g10/keygen.c:1735
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1741 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1742 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1755 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1756 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥尺寸必须在 %u 与 %u 间\n"
 
-#: g10/keygen.c:1761 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1762 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1766 g10/keygen.c:1771 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1767 g10/keygen.c:1772 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1840
+#: g10/keygen.c:1841
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4179,7 +4180,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1851
+#: g10/keygen.c:1852
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4195,38 +4196,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1874
+#: g10/keygen.c:1875
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1879
+#: g10/keygen.c:1880
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1897
+#: g10/keygen.c:1898
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1904
+#: g10/keygen.c:1905
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1905
+#: g10/keygen.c:1906
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1911
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1911
+#: g10/keygen.c:1912
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1915
+#: g10/keygen.c:1916
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4234,18 +4235,18 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1922
+#: g10/keygen.c:1923
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1947
+#: g10/keygen.c:1948
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:1959
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4261,44 +4262,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1978
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:1985
+#: g10/keygen.c:1986
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1988
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1990
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1997
+#: g10/keygen.c:1998
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:2003
+#: g10/keygen.c:2004
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2012
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2018
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2040
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2046
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4309,7 +4310,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2050
+#: g10/keygen.c:2051
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -4324,23 +4325,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2066
+#: g10/keygen.c:2067
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2076
+#: g10/keygen.c:2077
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2078
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:2096
+#: g10/keygen.c:2097
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:2135
+#: g10/keygen.c:2136
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4348,12 +4349,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2151
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2156
+#: g10/keygen.c:2157
 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"
@@ -4365,7 +4366,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2181
 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"
@@ -4375,50 +4376,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2989 g10/keygen.c:3016
+#: g10/keygen.c:3028 g10/keygen.c:3055
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:3221 g10/keygen.c:3388
+#: g10/keygen.c:3260 g10/keygen.c:3427
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:3223 g10/keygen.c:3391
+#: g10/keygen.c:3262 g10/keygen.c:3430
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:3226 g10/keygen.c:3394
+#: g10/keygen.c:3265 g10/keygen.c:3433
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3375
+#: g10/keygen.c:3414
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3382
+#: g10/keygen.c:3421
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3402
+#: g10/keygen.c:3441
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3410
+#: g10/keygen.c:3449
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3437
+#: g10/keygen.c:3476
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3448
+#: g10/keygen.c:3487
 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"
@@ -4426,42 +4427,42 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
+#: g10/keygen.c:3500 g10/keygen.c:3645 g10/keygen.c:3766
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3516 g10/keygen.c:3657 g10/sign.c:241
+#: g10/keygen.c:3555 g10/keygen.c:3696 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:3518 g10/keygen.c:3659 g10/sign.c:243
+#: g10/keygen.c:3557 g10/keygen.c:3698 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:3529 g10/keygen.c:3670
+#: g10/keygen.c:3568 g10/keygen.c:3709
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3570 g10/keygen.c:3703
+#: g10/keygen.c:3609 g10/keygen.c:3742
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3876
+#: g10/keygen.c:3915
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3924
+#: g10/keygen.c:3963
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3950
+#: g10/keygen.c:3989
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -4494,30 +4495,30 @@ msgstr "签名注记："
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1547
+#: g10/keylist.c:1504
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1549
+#: g10/keylist.c:1506
 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:1556
+#: g10/keylist.c:1513
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1558
+#: g10/keylist.c:1515
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1562 g10/keylist.c:1566
+#: g10/keylist.c:1519 g10/keylist.c:1523
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
-#: g10/keylist.c:1633
+#: g10/keylist.c:1590
 msgid "      Card serial no. ="
 msgstr "卡序列号 ="
 
@@ -4983,7 +4984,7 @@ msgstr "警告：不建议使用散列算法 %s\n"
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:88
+#: g10/misc.c:505 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
@@ -6260,26 +6261,64 @@ msgstr "无效的列表选项\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
 #, fuzzy, c-format
 msgid "error loading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: jnlib/utf8conv.c:124
+#: jnlib/utf8conv.c:123
 #, c-format
 msgid "conversion from `%s' to `%s' not available\n"
 msgstr ""
 
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
 #, fuzzy, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "签名时失败： %s\n"
 
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
+#: jnlib/dotlock.c:235
+#, fuzzy, c-format
+msgid "failed to create temporary file `%s': %s\n"
+msgstr "无法建立目录‘%s’：%s\n"
+
+#: jnlib/dotlock.c:270
+#, fuzzy, c-format
+msgid "error writing to `%s': %s\n"
+msgstr "写入钥匙环‘%s’时出错： %s\n"
+
+#: jnlib/dotlock.c:454
+#, c-format
+msgid "removing stale lockfile (created by %d)\n"
+msgstr ""
+
+#: jnlib/dotlock.c:460
+msgid " - probably dead - removing lock"
+msgstr ""
+
+#: jnlib/dotlock.c:470
+#, fuzzy, c-format
+msgid "waiting for lock (held by %d%s) %s...\n"
+msgstr "等待‘%s’上的锁\n"
+
+#: jnlib/dotlock.c:471
+msgid "(deadlock?) "
+msgstr ""
+
+#: jnlib/dotlock.c:494
+#, fuzzy, c-format
+msgid "lock `%s' not made: %s\n"
+msgstr "找不到公钥 %s：%s\n"
+
+#: jnlib/dotlock.c:502
+#, fuzzy, c-format
+msgid "waiting for lock %s...\n"
+msgstr "等待‘%s’上的锁\n"
+
 #: kbx/kbxutil.c:92
 msgid "set debugging flags"
 msgstr ""
@@ -6320,6 +6359,18 @@ msgstr "PIN 回调返回错误：%s\n"
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-nks.c:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "新的 PIN"
+
+#: scd/app-nks.c:558 scd/app-openpgp.c:1702 scd/app-dinsig.c:529
+#, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "获取新 PIN 时出错：%s\n"
+
 #: scd/app-openpgp.c:599
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
@@ -6335,15 +6386,15 @@ msgstr "无法存储创建日期：%s\n"
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2114
+#: scd/app-openpgp.c:1015 scd/app-openpgp.c:2116
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2122
+#: scd/app-openpgp.c:1023 scd/app-openpgp.c:2124
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2132
+#: scd/app-openpgp.c:1032 scd/app-openpgp.c:2134
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
@@ -6373,7 +6424,7 @@ msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
 #: scd/app-openpgp.c:1403 scd/app-openpgp.c:1443 scd/app-openpgp.c:1567
-#: scd/app-openpgp.c:2385
+#: scd/app-openpgp.c:2387
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
@@ -6382,11 +6433,11 @@ msgstr "验证 CHV%d 失败：%s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2636
+#: scd/app-openpgp.c:1487 scd/app-openpgp.c:2638
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2645
+#: scd/app-openpgp.c:1493 scd/app-openpgp.c:2647
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
@@ -6417,104 +6468,103 @@ msgstr "|A|管理员 PIN"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:1696
+#: scd/app-openpgp.c:1698
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:1696
-msgid "|N|New PIN"
-msgstr "新的 PIN"
-
-#: scd/app-openpgp.c:1700
-#, c-format
-msgid "error getting new PIN: %s\n"
-msgstr "获取新 PIN 时出错：%s\n"
-
-#: scd/app-openpgp.c:1750 scd/app-openpgp.c:2200
+#: scd/app-openpgp.c:1752 scd/app-openpgp.c:2202
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:1756 scd/app-openpgp.c:2207
+#: scd/app-openpgp.c:1758 scd/app-openpgp.c:2209
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: scd/app-openpgp.c:1766
+#: scd/app-openpgp.c:1768
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:1770
+#: scd/app-openpgp.c:1772
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:1772
+#: scd/app-openpgp.c:1774
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:1939
+#: scd/app-openpgp.c:1941
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:1946
+#: scd/app-openpgp.c:1948
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:1953
+#: scd/app-openpgp.c:1955
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-openpgp.c:1961 scd/app-openpgp.c:1968
+#: scd/app-openpgp.c:1963 scd/app-openpgp.c:1970
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:2031
+#: scd/app-openpgp.c:2033
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: scd/app-openpgp.c:2091
+#: scd/app-openpgp.c:2093
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: scd/app-openpgp.c:2105
+#: scd/app-openpgp.c:2107
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:2108
+#: scd/app-openpgp.c:2110
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: scd/app-openpgp.c:2165
+#: scd/app-openpgp.c:2167
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2303
+#: scd/app-openpgp.c:2305
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2366
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:2650
+#: scd/app-openpgp.c:2652
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:2723 scd/app-openpgp.c:2733
+#: scd/app-openpgp.c:2725 scd/app-openpgp.c:2735
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 
+#. TRANSLATORS: Do not translate the "|*|" prefixes but
+#. keep it at the start of the string.  We need this elsewhere
+#. to get some infos on the string.
+#: scd/app-dinsig.c:526
+#, fuzzy
+msgid "|N|Initial New PIN"
+msgstr "新的 PIN"
+
 #: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr ""
@@ -6584,22 +6634,22 @@ msgstr "跳过无效的 64 进制字符 %02x\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr ""
 
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
 #, fuzzy
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
 #, fuzzy, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr ""
 
@@ -6667,7 +6717,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
 #: sm/certchain.c:742 sm/certchain.c:1229 sm/certchain.c:1833 sm/decrypt.c:259
-#: sm/encrypt.c:349 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "无法存储密钥：%s\n"
@@ -6870,7 +6920,7 @@ msgstr "DSA 密钥 %s 使用不安全的(%u 位)的散列\n"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: sm/certcheck.c:248 sm/sign.c:480 sm/verify.c:201
+#: sm/certcheck.c:248 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
@@ -6919,7 +6969,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
@@ -7132,7 +7182,7 @@ msgstr "首选项‘%s’重复\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(不给定描述)\n"
@@ -7288,12 +7338,12 @@ msgstr "从这个钥匙环里取用密钥"
 msgid "add this secret keyring to the list"
 msgstr "要有私钥才能这么做。\n"
 
-#: sm/gpgsm.c:363 tools/gpgconf-comp.c:653 tools/gpgconf-comp.c:718
+#: sm/gpgsm.c:363 tools/gpgconf-comp.c:658 tools/gpgconf-comp.c:726
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:364
-msgid "|HOST|use this keyserver to lookup keys"
+#: sm/gpgsm.c:364 tools/gpgconf-comp.c:744
+msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
 #: sm/gpgsm.c:365
@@ -7355,25 +7405,45 @@ msgstr "无法连接至‘%s’：%s\n"
 msgid "unknown validation model `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: sm/gpgsm.c:1391
+#: sm/gpgsm.c:867
+#, fuzzy, c-format
+msgid "%s:%u: no hostname given\n"
+msgstr "(不给定描述)\n"
+
+#: sm/gpgsm.c:886
+#, c-format
+msgid "%s:%u: password given without user\n"
+msgstr ""
+
+#: sm/gpgsm.c:907
+#, fuzzy, c-format
+msgid "%s:%u: skipping this line\n"
+msgstr "  s = 跳过这把密钥\n"
+
+#: sm/gpgsm.c:1419
+#, fuzzy
+msgid "could not parse keyserver\n"
+msgstr "无法解析公钥服务器 URL\n"
+
+#: sm/gpgsm.c:1502
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1493
+#: sm/gpgsm.c:1604
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1813
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7455,6 +7525,10 @@ msgstr "获取新 PIN 时出错：%s\n"
 msgid "error storing flags: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
+#: sm/keylist.c:618
+msgid "Error - "
+msgstr ""
+
 #: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr ""
@@ -7486,7 +7560,7 @@ msgid ""
 "signatures.\n"
 msgstr ""
 
-#: sm/qualified.c:277
+#: sm/qualified.c:276
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7494,7 +7568,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:445
+#: sm/sign.c:420
+#, fuzzy, c-format
+msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
+msgstr "保护算法 %d%s 未被支持\n"
+
+#: sm/sign.c:433
+#, c-format
+msgid "hash algorithm used for signer %d: %s (%s)\n"
+msgstr ""
+
+#: sm/sign.c:483
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
@@ -7622,140 +7706,144 @@ msgstr "读取‘%s’时出错：%s\n"
 msgid "error sending standard options: %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: tools/gpgconf-comp.c:467 tools/gpgconf-comp.c:571 tools/gpgconf-comp.c:638
-#: tools/gpgconf-comp.c:703 tools/gpgconf-comp.c:787
+#: 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
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:480 tools/gpgconf-comp.c:584 tools/gpgconf-comp.c:651
-#: tools/gpgconf-comp.c:716 tools/gpgconf-comp.c:810
+#: 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
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: tools/gpgconf-comp.c:490 tools/gpgconf-comp.c:609 tools/gpgconf-comp.c:664
-#: tools/gpgconf-comp.c:738 tools/gpgconf-comp.c:817
+#: 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
 msgid "Options useful for debugging"
 msgstr ""
 
-#: tools/gpgconf-comp.c:495 tools/gpgconf-comp.c:614 tools/gpgconf-comp.c:669
-#: tools/gpgconf-comp.c:743 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:500 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:754 tools/gpgconf-comp.c:836
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:503 tools/gpgconf-comp.c:619 tools/gpgconf-comp.c:751
+#: tools/gpgconf-comp.c:508 tools/gpgconf-comp.c:624 tools/gpgconf-comp.c:762
 msgid "Options controlling the security"
 msgstr ""
 
-#: tools/gpgconf-comp.c:510
+#: tools/gpgconf-comp.c:515
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: tools/gpgconf-comp.c:532
+#: tools/gpgconf-comp.c:537
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:535
+#: tools/gpgconf-comp.c:540
 msgid "do not allow to bypass the passphrase policy"
 msgstr ""
 
-#: tools/gpgconf-comp.c:539
+#: tools/gpgconf-comp.c:544
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: tools/gpgconf-comp.c:547
+#: tools/gpgconf-comp.c:552
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: tools/gpgconf-comp.c:551
+#: tools/gpgconf-comp.c:556
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "从导出的子钥中删除所有密码"
 
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: tools/gpgconf-comp.c:677
+#: tools/gpgconf-comp.c:664
+msgid "|SPEC|set up email aliases"
+msgstr ""
+
+#: tools/gpgconf-comp.c:685
 msgid "Configuration for Keyservers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:679
+#: tools/gpgconf-comp.c:687
 #, fuzzy
 msgid "|URL|use keyserver at URL"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
 msgid "allow PKA lookups (DNS requests)"
 msgstr ""
 
-#: tools/gpgconf-comp.c:685
+#: tools/gpgconf-comp.c:693
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:738
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: tools/gpgconf-comp.c:800
+#: tools/gpgconf-comp.c:811
 msgid "Options controlling the format of the output"
 msgstr ""
 
-#: tools/gpgconf-comp.c:836
+#: tools/gpgconf-comp.c:847
 msgid "Options controlling the interactivity and enforcement"
 msgstr ""
 
-#: tools/gpgconf-comp.c:846
+#: tools/gpgconf-comp.c:857
 msgid "Configuration for HTTP servers"
 msgstr ""
 
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
 msgid "use system's HTTP proxy setting"
 msgstr ""
 
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
 msgid "Configuration of LDAP servers to use"
 msgstr ""
 
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
 msgid "LDAP server list"
 msgstr ""
 
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
 msgid "Configuration for OCSP"
 msgstr ""
 
-#: tools/gpgconf-comp.c:2990
+#: tools/gpgconf-comp.c:3001
 #, c-format
 msgid "External verification of component %s failed"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3140
+#: tools/gpgconf-comp.c:3151
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
@@ -8357,9 +8445,6 @@ msgstr ""
 #~ msgid "can't lock `%s': %s\n"
 #~ msgstr "无法锁定‘%s’：%s\n"
 
-#~ msgid "waiting for lock on `%s'...\n"
-#~ msgstr "等待‘%s’上的锁\n"
-
 #~ msgid "can't stat `%s': %s\n"
 #~ msgstr "无法获得文件‘%s’的信息： %s\n"