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

Documentation fixes.
Some enhancements for the new OpenPGP Card.

1 files changed, 301 insertions, 214 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 49c6b6246..566a4f8c5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\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: 2008-03-26 22:35+0800\n"
 "Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -94,9 +94,10 @@ msgstr "密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\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"
@@ -104,11 +105,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"
@@ -388,24 +389,24 @@ msgid "invalid debug-level `%s' given\n"
 msgstr "給定的除錯等級 `%s' 無效\n"
 
 #: 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 "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: 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"
@@ -689,8 +690,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
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立管道時出錯: %s\n"
@@ -1070,13 +1071,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 "你要選哪一個? "
 
@@ -1243,7 +1244,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"
 
@@ -2157,7 +2158,7 @@ msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\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"
 
@@ -2197,11 +2198,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"
 
@@ -3198,19 +3199,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"
 
@@ -3227,7 +3228,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 "前後兩次輸入的密語不一致; 請再試一次"
 
@@ -3942,69 +3943,69 @@ msgstr "子鑰 %s 已撤銷.\n"
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %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 "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
 
-#: 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 "鑑定"
 
@@ -4018,109 +4019,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"
@@ -4136,7 +4137,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"
@@ -4152,38 +4153,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"
@@ -4191,18 +4192,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 "
@@ -4217,44 +4218,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\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"
@@ -4265,7 +4266,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"
 
@@ -4280,23 +4281,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"
@@ -4304,12 +4305,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"
@@ -4321,7 +4322,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"
@@ -4332,50 +4333,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 "正在寫入私鑰 stub 至 `%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"
@@ -4383,42 +4384,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"
@@ -4451,30 +4452,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 "      卡片序號 ="
 
@@ -4939,7 +4940,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"
@@ -6214,26 +6215,64 @@ msgstr "無效的選項 \"%.50s\"\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "你找到一個瑕疵了 ... (%s:%d)\n"
 
-#: jnlib/utf8conv.c:86
+#: jnlib/utf8conv.c:85
 #, 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 "沒有從 `%s' 到 `%s' 之間的轉換可用\n"
 
-#: jnlib/utf8conv.c:132
+#: jnlib/utf8conv.c:131
 #, c-format
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open 失敗: %s\n"
 
-#: jnlib/utf8conv.c:392 jnlib/utf8conv.c:658
+#: jnlib/utf8conv.c:387 jnlib/utf8conv.c:653
 #, 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 "設定除錯旗標"
@@ -6272,6 +6311,18 @@ msgstr "收回 PIN 時傳回錯誤: %s\n"
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN 還沒有變更過\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-nks.c:555 scd/app-openpgp.c:1698
+msgid "|N|New PIN"
+msgstr "|N|新增 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"
@@ -6287,15 +6338,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"
 
@@ -6325,7 +6376,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"
@@ -6334,11 +6385,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"
 
@@ -6368,104 +6419,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 "|N|新增 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 "讀取指紋 DO 時出錯\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 卡片結構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2215
+#: scd/app-openpgp.c:2217
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 
-#: 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 "|N|新增 PIN"
+
 #: scd/scdaemon.c:105
 msgid "run in multi server mode (foreground)"
 msgstr "以多重伺服器模式執行 (前景)"
@@ -6534,21 +6584,21 @@ msgstr "已跳過無效的 radix64 字符 %02x\n"
 msgid "failed to proxy %s inquiry to client\n"
 msgstr "以 %s 代理伺服器查詢用戶端時失敗\n"
 
-#: sm/call-dirmngr.c:212
+#: sm/call-dirmngr.c:233
 #, c-format
 msgid "no running dirmngr - starting `%s'\n"
 msgstr "沒有執行中的 dirmngr - 正在啟動 `%s'\n"
 
-#: sm/call-dirmngr.c:245
+#: sm/call-dirmngr.c:266
 msgid "malformed DIRMNGR_INFO environment variable\n"
 msgstr "被變造的 DIRMNGR_INFO 環境變數\n"
 
-#: sm/call-dirmngr.c:257
+#: sm/call-dirmngr.c:278
 #, c-format
 msgid "dirmngr protocol version %d is not supported\n"
 msgstr "未支援 dirmngr 協定版本 %d\n"
 
-#: sm/call-dirmngr.c:277
+#: sm/call-dirmngr.c:298
 msgid "can't connect to the dirmngr - trying fall back\n"
 msgstr "無法連線至 dirmngr - 正試著退回\n"
 
@@ -6615,7 +6665,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %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
 msgid "failed to allocated keyDB handle\n"
 msgstr "配置 keyDB handle 失敗\n"
 
@@ -6800,7 +6850,7 @@ msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
 
-#: 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 "(這是 MD2 演算法)\n"
 
@@ -6846,7 +6896,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
 
-#: sm/certlist.c:132 sm/keylist.c:258
+#: sm/certlist.c:132 sm/keylist.c:269
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "取得金鑰用途資訊時出錯: %s\n"
@@ -7051,7 +7101,7 @@ msgstr "憑證 `%s' 已刪除\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
 
-#: sm/encrypt.c:335
+#: sm/encrypt.c:333
 msgid "no valid recipients given\n"
 msgstr "沒有給定有效的收件者\n"
 
@@ -7191,12 +7241,13 @@ msgstr "將此金鑰鑰匙圈加到金鑰鑰匙圈清單中"
 msgid "add this secret keyring to the list"
 msgstr "將此私鑰鑰匙圈加到清單中"
 
-#: 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
+#, fuzzy
+msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|主機|使用此金鑰伺服器來查找金鑰"
 
 #: sm/gpgsm.c:365
@@ -7251,25 +7302,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 "第 %d 列: 沒有給定的物件名稱\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 "正在匯入通用憑證 `%s'\n"
 
-#: sm/gpgsm.c:1531
+#: sm/gpgsm.c:1642
 #, 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 "這個指令尚未實做完成\n"
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1968
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7348,6 +7419,11 @@ msgstr "取得已存放的旗標時出錯: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "存放旗標時出錯: %s\n"
 
+#: sm/keylist.c:618
+#, fuzzy
+msgid "Error - "
+msgstr "[錯誤 - 沒有名稱]"
+
 #: sm/misc.c:55
 msgid "GPG_TTY has not been set - using maybe bogus default\n"
 msgstr "尚未設定 GPG_TTY - 使用可能是偽造的預設值\n"
@@ -7384,7 +7460,7 @@ msgid ""
 "signatures.\n"
 msgstr "請注意, 本軟體並未正式被認可來建立或驗證這樣的簽章.\n"
 
-#: sm/qualified.c:277
+#: sm/qualified.c:276
 #, c-format
 msgid ""
 "You are about to create a signature using your certificate:\n"
@@ -7395,7 +7471,17 @@ msgstr ""
 "\"%s\"\n"
 "請注意, 這個憑證並 不會 建立出合格的簽章!"
 
-#: 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
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查合格憑證時失敗: %s\n"
@@ -7517,136 +7603,140 @@ msgstr "送出 `%s' 指令時出錯: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "送出標準選項時出錯: %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 "|N|在 N 秒之後讓 SSH 金鑰過期"
 
-#: tools/gpgconf-comp.c:514
+#: tools/gpgconf-comp.c:519
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|把 PIN 快取最大生存時間設成 N 秒"
 
-#: tools/gpgconf-comp.c:518
+#: tools/gpgconf-comp.c:523
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|把 SSH 金鑰最大生存時間設成 N 秒"
 
-#: 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 "|N|把新密語所需的最短長度設成 N"
 
-#: tools/gpgconf-comp.c:543
+#: tools/gpgconf-comp.c:548
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|新密語至少要有 N 個非字母的字符"
 
-#: 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
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|在 N 天之後讓密語過期"
 
-#: tools/gpgconf-comp.c:555
+#: tools/gpgconf-comp.c:560
 msgid "do not allow the reuse of old passphrases"
 msgstr "不允許重複使用舊密語"
 
-#: tools/gpgconf-comp.c:656 tools/gpgconf-comp.c:721
+#: tools/gpgconf-comp.c:661 tools/gpgconf-comp.c:729
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|名字|也加密給使用者 ID「名字」"
 
-#: 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
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|使用位於 URL 的金鑰伺服器"
 
-#: tools/gpgconf-comp.c:682
+#: tools/gpgconf-comp.c:690
 msgid "allow PKA lookups (DNS requests)"
 msgstr "允許 PKA 查找 (DNS 請求)"
 
-#: 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 "停用所有的 dirmngr 存取"
 
-#: tools/gpgconf-comp.c:733
+#: tools/gpgconf-comp.c:741
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|名稱|將「名稱」編碼用於 PKCS#12 密語"
 
-#: tools/gpgconf-comp.c:756
+#: tools/gpgconf-comp.c:767
 msgid "do not check CRLs for root certificates"
 msgstr "不要為根憑證檢查 CRL"
 
-#: 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 "HTTP 伺服器組態"
 
-#: tools/gpgconf-comp.c:857
+#: tools/gpgconf-comp.c:868
 msgid "use system's HTTP proxy setting"
 msgstr "使用系統的 HTTP 代理伺服器設定"
 
-#: tools/gpgconf-comp.c:862
+#: tools/gpgconf-comp.c:873
 msgid "Configuration of LDAP servers to use"
 msgstr "要用的 LDAP 伺服器組態"
 
-#: tools/gpgconf-comp.c:891
+#: tools/gpgconf-comp.c:902
 msgid "LDAP server list"
 msgstr "LDAP 伺服器清單"
 
-#: tools/gpgconf-comp.c:899
+#: tools/gpgconf-comp.c:910
 msgid "Configuration for OCSP"
 msgstr "OCSP 組態"
 
-#: 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 "請注意群組規格已忽略\n"
 
@@ -7920,9 +8010,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"