Changes the header presented before requesting the user ID.

1 files changed, 144 insertions, 123 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 952b0e147..49c6b6246 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-09 11:38+0200\n"
+"POT-Creation-Date: 2008-05-31 13:02+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,8 +94,8 @@ 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:3155
-#: g10/keygen.c:3188 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:3174
+#: g10/keygen.c:3207 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
 #, c-format
 msgid "can't create `%s': %s\n"
@@ -104,7 +104,7 @@ 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:2644 g10/keyring.c:1532 g10/openfile.c:192 g10/openfile.c:353
+#: g10/keygen.c:2663 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
@@ -283,7 +283,7 @@ msgstr "以服務模式執行 (背景)"
 
 #: agent/gpg-agent.c:121 g10/gpg.c:472 g10/gpgv.c:70 kbx/kbxutil.c:88
 #: scd/scdaemon.c:107 sm/gpgsm.c:344 tools/gpg-connect-agent.c:66
-#: tools/gpgconf.c:72 tools/symcryptrun.c:164
+#: tools/gpgconf.c:77 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "囉唆模式"
 
@@ -364,17 +364,17 @@ msgstr "啟用 ssh-agent 模擬"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|檔案|將環境設定也寫至「檔案」"
 
-#: agent/gpg-agent.c:283 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: agent/gpg-agent.c:290 agent/preset-passphrase.c:94 agent/protect-tool.c:146
 #: scd/scdaemon.c:207 sm/gpgsm.c:574 tools/gpg-connect-agent.c:171
-#: tools/gpgconf.c:94 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: tools/gpgconf.c:99 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程式瑕疵則請回報給 <"
 
-#: agent/gpg-agent.c:286
+#: agent/gpg-agent.c:293
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg-agent [選項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:295
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -382,145 +382,145 @@ msgstr ""
 "語法: gpg-agent [選項] [指令 [引數]]\n"
 "GnuPG 私鑰管理\n"
 
-#: agent/gpg-agent.c:323 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
+#: agent/gpg-agent.c:330 g10/gpg.c:971 scd/scdaemon.c:247 sm/gpgsm.c:736
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "給定的除錯等級 `%s' 無效\n"
 
-#: agent/gpg-agent.c:522 agent/protect-tool.c:1066 kbx/kbxutil.c:428
+#: 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
 #: 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:621 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:972
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:626 agent/gpg-agent.c:1206 g10/gpg.c:2073
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:634 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:983
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
 
-#: agent/gpg-agent.c:966 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:974 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:1298 agent/gpg-agent.c:1420 agent/gpg-agent.c:1424
-#: agent/gpg-agent.c:1465 agent/gpg-agent.c:1469 g10/exec.c:172
+#: agent/gpg-agent.c:1308 agent/gpg-agent.c:1430 agent/gpg-agent.c:1434
+#: agent/gpg-agent.c:1475 agent/gpg-agent.c:1479 g10/exec.c:172
 #: g10/openfile.c:429 scd/scdaemon.c:923
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1312 scd/scdaemon.c:937
+#: agent/gpg-agent.c:1322 scd/scdaemon.c:937
 msgid "name of socket too long\n"
 msgstr "socket 名稱太長\n"
 
-#: agent/gpg-agent.c:1337 scd/scdaemon.c:960
+#: agent/gpg-agent.c:1347 scd/scdaemon.c:960
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:1346
+#: agent/gpg-agent.c:1356
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "socket 名稱 `%s' 太長\n"
 
-#: agent/gpg-agent.c:1366
+#: agent/gpg-agent.c:1376
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
-#: agent/gpg-agent.c:1377 scd/scdaemon.c:980
+#: agent/gpg-agent.c:1387 scd/scdaemon.c:980
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket 取得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:1382 scd/scdaemon.c:983
+#: agent/gpg-agent.c:1392 scd/scdaemon.c:983
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1394 scd/scdaemon.c:992
+#: agent/gpg-agent.c:1404 scd/scdaemon.c:992
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() 失敗: %s\n"
 
-#: agent/gpg-agent.c:1400 scd/scdaemon.c:999
+#: agent/gpg-agent.c:1410 scd/scdaemon.c:999
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在候聽 socket `%s'\n"
 
-#: agent/gpg-agent.c:1428 agent/gpg-agent.c:1475 g10/openfile.c:432
+#: agent/gpg-agent.c:1438 agent/gpg-agent.c:1485 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "`%s' 目錄已建立\n"
 
-#: agent/gpg-agent.c:1481
+#: agent/gpg-agent.c:1491
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() 失敗於 `%s': %s\n"
 
-#: agent/gpg-agent.c:1485
+#: agent/gpg-agent.c:1495
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法使用 `%s' 做為家目錄\n"
 
-#: agent/gpg-agent.c:1602 scd/scdaemon.c:1015
+#: agent/gpg-agent.c:1612 scd/scdaemon.c:1015
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1624
+#: agent/gpg-agent.c:1634
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1639
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1649
+#: agent/gpg-agent.c:1659
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1654
+#: agent/gpg-agent.c:1664
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1771 scd/scdaemon.c:1137
+#: agent/gpg-agent.c:1781 scd/scdaemon.c:1137
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
 
-#: agent/gpg-agent.c:1884 scd/scdaemon.c:1204
+#: agent/gpg-agent.c:1894 scd/scdaemon.c:1204
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:1907
+#: agent/gpg-agent.c:1917
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: agent/gpg-agent.c:1918 common/simple-pwquery.c:349 common/asshelp.c:324
-#: tools/gpg-connect-agent.c:2021
+#: agent/gpg-agent.c:1928 common/simple-pwquery.c:349 common/asshelp.c:324
+#: tools/gpg-connect-agent.c:2032
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:1931 common/simple-pwquery.c:361 common/asshelp.c:336
-#: tools/gpg-connect-agent.c:2032
+#: agent/gpg-agent.c:1941 common/simple-pwquery.c:361 common/asshelp.c:336
+#: tools/gpg-connect-agent.c:2043
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
@@ -632,7 +632,7 @@ msgstr "讀取已信任根憑證清單時出錯\n"
 #. second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives
 #. the name as stored in the certificate.
-#: agent/trustlist.c:539
+#: agent/trustlist.c:541
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -642,7 +642,7 @@ msgstr "請驗證憑證與此完全相同:%%0A  \"%s\"%%0A其指紋為:%%0A  %s"
 #. TRANSLATORS: "Correct" is the label of a button and intended to
 #. be hit if the fingerprint matches the one of the CA.  The other
 #. button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:551
+#: agent/trustlist.c:554
 msgid "Correct"
 msgstr "正確"
 
@@ -654,18 +654,18 @@ msgstr "正確"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as store in the
 #. certificate.
-#: agent/trustlist.c:574
+#: agent/trustlist.c:577
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "請問你是否徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:583
+#: agent/trustlist.c:587
 msgid "No"
 msgstr "No"
 
@@ -689,8 +689,8 @@ msgstr "更改密語"
 msgid "I'll change it later"
 msgstr "我稍後再變更"
 
-#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1372
-#: tools/gpgconf-comp.c:1695
+#: common/exechelp.c:378 common/exechelp.c:467 tools/gpgconf-comp.c:1395
+#: tools/gpgconf-comp.c:1734
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立管道時出錯: %s\n"
@@ -1070,7 +1070,7 @@ 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:2831 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2850 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
@@ -1643,7 +1643,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:246 tools/gpgconf.c:56
+#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:246 tools/gpgconf.c:58
 msgid ""
 "@Commands:\n"
 " "
@@ -1776,7 +1776,7 @@ msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
 #: g10/gpg.c:435 g10/gpgv.c:68 kbx/kbxutil.c:81 sm/gpgsm.c:283
-#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:69 tools/symcryptrun.c:157
+#: tools/gpg-connect-agent.c:64 tools/gpgconf.c:74 tools/symcryptrun.c:157
 msgid ""
 "@\n"
 "Options:\n"
@@ -1810,7 +1810,7 @@ msgstr "使用標準的文字模式"
 msgid "|FILE|write output to FILE"
 msgstr "|檔案|將輸出寫入至「檔案」"
 
-#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:74
+#: g10/gpg.c:483 kbx/kbxutil.c:90 sm/gpgsm.c:354 tools/gpgconf.c:79
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
@@ -3198,19 +3198,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:3530
+#: g10/keyedit.c:1142 g10/keygen.c:3549
 msgid "This key is not protected.\n"
 msgstr "這把金鑰未被保護.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3517 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3536 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3533
+#: g10/keyedit.c:1150 g10/keygen.c:3552
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3537
+#: g10/keyedit.c:1154 g10/keygen.c:3556
 msgid "Key is protected.\n"
 msgstr "金鑰已保護.\n"
 
@@ -3227,7 +3227,7 @@ msgstr ""
 "請輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1199 g10/keygen.c:2130
+#: g10/keyedit.c:1199 g10/keygen.c:2149
 msgid "passphrase not correctly repeated; try again"
 msgstr "前後兩次輸入的密語不一致; 請再試一次"
 
@@ -3977,12 +3977,12 @@ 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:3030
+#: g10/keygen.c:3049
 #, 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:3036
+#: g10/keygen.c:1157 g10/keygen.c:1273 g10/keygen.c:1408 g10/keygen.c:3055
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -4195,7 +4195,14 @@ msgstr ""
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1947
+msgid ""
+"\n"
+"GnuPG needs to construct a user ID to identify your key.\n"
+"\n"
+msgstr ""
+
+#: g10/keygen.c:1958
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4210,44 +4217,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
 "\n"
 
-#: g10/keygen.c:1958
+#: g10/keygen.c:1977
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1985
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:1968
+#: g10/keygen.c:1987
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:1970
+#: g10/keygen.c:1989
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:1978
+#: g10/keygen.c:1997
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:2003
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:2011
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:2017
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:2020
+#: g10/keygen.c:2039
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "你正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:2026
+#: g10/keygen.c:2045
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4258,7 +4265,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2050
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 
@@ -4273,23 +4280,23 @@ msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2047
+#: g10/keygen.c:2066
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2057
+#: g10/keygen.c:2076
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:2058
+#: g10/keygen.c:2077
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:2077
+#: g10/keygen.c:2096
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:2116
+#: g10/keygen.c:2135
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4297,12 +4304,12 @@ msgstr ""
 "你需要一個密語來保護你的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2150
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2137
+#: g10/keygen.c:2156
 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"
@@ -4314,7 +4321,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2180
 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"
@@ -4325,50 +4332,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:2970 g10/keygen.c:2997
+#: g10/keygen.c:2989 g10/keygen.c:3016
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:3202 g10/keygen.c:3369
+#: g10/keygen.c:3221 g10/keygen.c:3388
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在寫入公鑰至 `%s'\n"
 
-#: g10/keygen.c:3204 g10/keygen.c:3372
+#: g10/keygen.c:3223 g10/keygen.c:3391
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:3207 g10/keygen.c:3375
+#: g10/keygen.c:3226 g10/keygen.c:3394
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在寫入私鑰至 `%s'\n"
 
-#: g10/keygen.c:3356
+#: g10/keygen.c:3375
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3363
+#: g10/keygen.c:3382
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫入的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3383
+#: g10/keygen.c:3402
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3391
+#: g10/keygen.c:3410
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3418
+#: g10/keygen.c:3437
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已建立及簽署.\n"
 
-#: g10/keygen.c:3429
+#: g10/keygen.c:3448
 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"
@@ -4376,42 +4383,42 @@ msgstr ""
 "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:3442 g10/keygen.c:3587 g10/keygen.c:3708
+#: g10/keygen.c:3461 g10/keygen.c:3606 g10/keygen.c:3727
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3497 g10/keygen.c:3638 g10/sign.c:241
+#: g10/keygen.c:3516 g10/keygen.c:3657 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:3499 g10/keygen.c:3640 g10/sign.c:243
+#: g10/keygen.c:3518 g10/keygen.c:3659 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:3510 g10/keygen.c:3651
+#: g10/keygen.c:3529 g10/keygen.c:3670
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3551 g10/keygen.c:3684
+#: g10/keygen.c:3570 g10/keygen.c:3703
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3857
+#: g10/keygen.c:3876
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:3905
+#: g10/keygen.c:3924
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:3931
+#: g10/keygen.c:3950
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -7284,7 +7291,7 @@ msgstr "基本的憑證檢查失敗了 - 未匯入\n"
 msgid "error importing certificate: %s\n"
 msgstr "匯入憑證時出錯: %s\n"
 
-#: sm/import.c:542 tools/gpg-connect-agent.c:1307
+#: sm/import.c:542 tools/gpg-connect-agent.c:1318
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取輸入時出錯: %s\n"
@@ -7423,7 +7430,7 @@ msgstr "                亦即"
 msgid "This is a qualified signature\n"
 msgstr "這是一份合格簽章\n"
 
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:73 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:78 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "安靜模式"
 
@@ -7467,45 +7474,45 @@ msgstr ""
 "語法: gpg-connect-agent [選項]\n"
 "連線至運作中的代理程式並送出指令\n"
 
-#: tools/gpg-connect-agent.c:1188
+#: tools/gpg-connect-agent.c:1189
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" 選項需要有程式及選用的引數\n"
 
-#: tools/gpg-connect-agent.c:1197
+#: tools/gpg-connect-agent.c:1198
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
 
-#: tools/gpg-connect-agent.c:1252 tools/gpg-connect-agent.c:1706
+#: tools/gpg-connect-agent.c:1253 tools/gpg-connect-agent.c:1717
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "接收列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:1332
+#: tools/gpg-connect-agent.c:1343
 msgid "line too long - skipped\n"
 msgstr "列太長 - 已跳過\n"
 
-#: tools/gpg-connect-agent.c:1336
+#: tools/gpg-connect-agent.c:1347
 msgid "line shortened due to embedded Nul character\n"
 msgstr "列因嵌入的 Nul 字符而縮短了\n"
 
-#: tools/gpg-connect-agent.c:1680
+#: tools/gpg-connect-agent.c:1691
 #, c-format
 msgid "unknown command `%s'\n"
 msgstr "未知的指令 `%s'\n"
 
-#: tools/gpg-connect-agent.c:1698
+#: tools/gpg-connect-agent.c:1709
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "送出列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:2054
+#: tools/gpg-connect-agent.c:2065
 #, c-format
 msgid "error sending %s command: %s\n"
 msgstr "送出 `%s' 指令時出錯: %s\n"
 
-#: tools/gpg-connect-agent.c:2063
+#: tools/gpg-connect-agent.c:2074
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "送出標準選項時出錯: %s\n"
@@ -7634,51 +7641,65 @@ msgstr "LDAP 伺服器清單"
 msgid "Configuration for OCSP"
 msgstr "OCSP 組態"
 
-#: tools/gpgconf-comp.c:3080
+#: tools/gpgconf-comp.c:2990
+#, c-format
+msgid "External verification of component %s failed"
+msgstr ""
+
+#: tools/gpgconf-comp.c:3140
 msgid "Note that group specifications are ignored\n"
 msgstr "請注意群組規格已忽略\n"
 
-#: tools/gpgconf.c:58
+#: tools/gpgconf.c:60
 msgid "list all components"
 msgstr "列出所有的元件"
 
-#: tools/gpgconf.c:59
+#: tools/gpgconf.c:61
 msgid "check all programs"
 msgstr "檢查所有的程式"
 
-#: tools/gpgconf.c:60
+#: tools/gpgconf.c:62
 msgid "|COMPONENT|list options"
 msgstr "|元件|列出選項"
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:63
 msgid "|COMPONENT|change options"
 msgstr "|元件|變更選項"
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
+#, fuzzy
+msgid "|COMPONENT|check options"
+msgstr "|元件|變更選項"
+
+#: tools/gpgconf.c:66
 msgid "apply global default values"
 msgstr "套用全域預設值"
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:68
+msgid "get the configuration directories for gpgconf"
+msgstr ""
+
+#: tools/gpgconf.c:70
 msgid "list global configuration file"
 msgstr "列出全域組態檔"
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:72
 msgid "check global configuration file"
 msgstr "檢查全域組態檔案"
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:76
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: tools/gpgconf.c:75
+#: tools/gpgconf.c:80
 msgid "activate changes at runtime, if possible"
 msgstr "如果可能的話, 在執行期啟用變更"
 
-#: tools/gpgconf.c:97
+#: tools/gpgconf.c:102
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法: gpgconf [選項] (或用 -h 求助)"
 
-#: tools/gpgconf.c:100
+#: tools/gpgconf.c:105
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7686,19 +7707,19 @@ msgstr ""
 "語法: gpgconf [選項]\n"
 "管理 GnuPG 系統工具的組態選項\n"
 
-#: tools/gpgconf.c:202 tools/gpgconf.c:240
+#: tools/gpgconf.c:210 tools/gpgconf.c:250
 msgid "usage: gpgconf [options] "
 msgstr "用法: gpgconf [選項] "
 
-#: tools/gpgconf.c:204
+#: tools/gpgconf.c:212
 msgid "Need one component argument"
 msgstr "需要一個元件引數"
 
-#: tools/gpgconf.c:213
+#: tools/gpgconf.c:221
 msgid "Component not found"
 msgstr "找不到元件"
 
-#: tools/gpgconf.c:242
+#: tools/gpgconf.c:252
 msgid "No argument allowed"
 msgstr "未允許使用引數"