diff --git a/Makefile.am b/Makefile.am
index 00f2fa0f2..7e46d2295 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,11 @@ SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks}
 EXTRA_DIST = scripts/config.rpath  PROJECTS BUGS config.h.in autogen.sh
 DISTCLEANFILES = 
 
+# We do not install README into the doc directory because that would
+# conflict with GnuPG-2.
+# dist_doc_DATA = README
+
+
 # Add all the files listed in "distfiles" files to the distribution,
 # apply version numbers to some files and create a VERSION file which
 # we need for the Prereq: patch file trick.
diff --git a/po/ChangeLog b/po/ChangeLog
index a21f3ea37..20f7bd66d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-27  Jedi <Jedi@Jedi.org>  (wk)
+
+	* zh_TW.po: Minor update.
+
 2008-01-02  Jedi <Jedi@Jedi.org>  (wk)
 
 	* zh_TW.po: Update.
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 225df0e7b..d01844c32 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,22 +1,25 @@
 # Traditional Chinese(zh-tw) messages for GnuPG
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
-# Jedi <Jedi@Jedi.org>, 2003, 2004, 2005.
+# Jedi Lin <Jedi@Jedi.org>, 2003, 2004, 2005, 2006, 2007, 2008.
 #
-# Special thanks to "Autrijus Tang <autrijus@autrijus.org>".
+# Special thanks to "Audrey Tang <audreyt@audreyt.org>".
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.4.2\n"
+"Project-Id-Version: gnupg 1.4.9\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
 "POT-Creation-Date: 2008-03-25 09:52+0100\n"
-"PO-Revision-Date: 2007-12-29 20:48+0800\n"
-"Last-Translator: Jedi <Jedi@Jedi.org>\n"
+"PO-Revision-Date: 2008-03-27 09:51+0800\n"
+"Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Basepath: gnupg-1.4.8/\n"
+"X-Poedit-Basepath: gnupg-1.4.9/\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: TAIWAN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: cipher/primegen.c:119
 #, c-format
@@ -42,12 +45,28 @@ msgstr "無法鎖定 `%s': %s\n"
 msgid "waiting for lock on `%s'...\n"
 msgstr "正在等候 `%s' 鎖定...\n"
 
-#: cipher/random.c:446 g10/card-util.c:681 g10/card-util.c:750
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3605 g10/import.c:193 g10/keygen.c:2403
-#: g10/keyring.c:1523 g10/openfile.c:188 g10/openfile.c:356
-#: g10/plaintext.c:490 g10/sign.c:776 g10/sign.c:969 g10/sign.c:1083
-#: g10/sign.c:1234 g10/tdbdump.c:139 g10/tdbdump.c:147 g10/tdbio.c:538
+#: cipher/random.c:446
+#: g10/card-util.c:681
+#: g10/card-util.c:750
+#: g10/dearmor.c:59
+#: g10/dearmor.c:108
+#: g10/encode.c:182
+#: g10/encode.c:472
+#: g10/gpg.c:1015
+#: g10/gpg.c:3605
+#: g10/import.c:193
+#: g10/keygen.c:2403
+#: g10/keyring.c:1523
+#: g10/openfile.c:188
+#: g10/openfile.c:356
+#: g10/plaintext.c:490
+#: g10/sign.c:776
+#: g10/sign.c:969
+#: g10/sign.c:1083
+#: g10/sign.c:1234
+#: g10/tdbdump.c:139
+#: g10/tdbdump.c:147
+#: g10/tdbio.c:538
 #: g10/tdbio.c:603
 #, c-format
 msgid "can't open `%s': %s\n"
@@ -80,14 +99,24 @@ msgstr "無法讀取 `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未更新\n"
 
-#: cipher/random.c:542 g10/exec.c:479 g10/gpg.c:1014 g10/keygen.c:2889
-#: g10/keygen.c:2919 g10/keyring.c:1199 g10/keyring.c:1499 g10/openfile.c:277
-#: g10/openfile.c:371 g10/sign.c:794 g10/sign.c:1099 g10/tdbio.c:534
+#: cipher/random.c:542
+#: g10/exec.c:479
+#: g10/gpg.c:1014
+#: g10/keygen.c:2889
+#: g10/keygen.c:2919
+#: g10/keyring.c:1199
+#: g10/keyring.c:1499
+#: g10/openfile.c:277
+#: g10/openfile.c:371
+#: g10/sign.c:794
+#: g10/sign.c:1099
+#: g10/tdbio.c:534
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: cipher/random.c:554 cipher/random.c:564
+#: cipher/random.c:554
+#: cipher/random.c:564
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "無法寫入 `%s': %s\n"
@@ -150,30 +179,40 @@ msgstr "存放創生日期失敗: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: g10/app-openpgp.c:983 g10/app-openpgp.c:1908
+#: g10/app-openpgp.c:983
+#: g10/app-openpgp.c:1908
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: g10/app-openpgp.c:991 g10/app-openpgp.c:1916
+#: g10/app-openpgp.c:991
+#: g10/app-openpgp.c:1916
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: g10/app-openpgp.c:1000 g10/app-openpgp.c:1926
+#: g10/app-openpgp.c:1000
+#: g10/app-openpgp.c:1926
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: g10/app-openpgp.c:1256 g10/app-openpgp.c:1344 g10/app-openpgp.c:2152
+#: g10/app-openpgp.c:1256
+#: g10/app-openpgp.c:1344
+#: g10/app-openpgp.c:2152
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
 
-#: g10/app-openpgp.c:1262 g10/app-openpgp.c:1350 g10/app-openpgp.c:2158
+#: g10/app-openpgp.c:1262
+#: g10/app-openpgp.c:1350
+#: g10/app-openpgp.c:2158
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: g10/app-openpgp.c:1271 g10/app-openpgp.c:1285 g10/app-openpgp.c:1360
-#: g10/app-openpgp.c:2167 g10/app-openpgp.c:2181
+#: g10/app-openpgp.c:1271
+#: g10/app-openpgp.c:1285
+#: g10/app-openpgp.c:1360
+#: g10/app-openpgp.c:2167
+#: g10/app-openpgp.c:2181
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
@@ -182,11 +221,13 @@ msgstr "驗證 CHV%d 失敗: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "管理者指令存取權限尚未組態\n"
 
-#: g10/app-openpgp.c:1323 g10/app-openpgp.c:2428
+#: g10/app-openpgp.c:1323
+#: g10/app-openpgp.c:2428
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: g10/app-openpgp.c:1329 g10/app-openpgp.c:2437
+#: g10/app-openpgp.c:1329
+#: g10/app-openpgp.c:2437
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
@@ -218,11 +259,13 @@ msgstr "|N|新增 PIN"
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: g10/app-openpgp.c:1544 g10/app-openpgp.c:1994
+#: g10/app-openpgp.c:1544
+#: g10/app-openpgp.c:1994
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: g10/app-openpgp.c:1550 g10/app-openpgp.c:2001
+#: g10/app-openpgp.c:1550
+#: g10/app-openpgp.c:2001
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
@@ -252,7 +295,8 @@ msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: g10/app-openpgp.c:1755 g10/app-openpgp.c:1762
+#: g10/app-openpgp.c:1755
+#: g10/app-openpgp.c:1762
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
@@ -295,11 +339,11 @@ msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
 #: g10/app-openpgp.c:2442
-msgid ""
-"verification of Admin PIN is currently prohibited through this command\n"
+msgid "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者個人識別碼 (PIN) 驗證被禁止了\n"
 
-#: g10/app-openpgp.c:2513 g10/app-openpgp.c:2523
+#: g10/app-openpgp.c:2513
+#: g10/app-openpgp.c:2523
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -337,7 +381,8 @@ msgstr "未預期的封裝: "
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:813 g10/armor.c:1423
+#: g10/armor.c:813
+#: g10/armor.c:1423
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 已跳過\n"
@@ -354,7 +399,8 @@ msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:902 g10/armor.c:1460
+#: g10/armor.c:902
+#: g10/armor.c:1460
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
@@ -377,11 +423,11 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
 #: g10/armor.c:1246
-msgid ""
-"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
-#: g10/card-util.c:61 g10/card-util.c:309
+#: g10/card-util.c:61
+#: g10/card-util.c:309
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
@@ -391,18 +437,29 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:74 g10/card-util.c:1409 g10/delkey.c:126 g10/keyedit.c:1516
-#: g10/keygen.c:2587 g10/revoke.c:216 g10/revoke.c:454
+#: g10/card-util.c:74
+#: g10/card-util.c:1409
+#: g10/delkey.c:126
+#: g10/keyedit.c:1516
+#: g10/keygen.c:2587
+#: g10/revoke.c:216
+#: g10/revoke.c:454
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
-#: g10/card-util.c:101 g10/card-util.c:1135 g10/card-util.c:1218
-#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1400
+#: g10/card-util.c:101
+#: g10/card-util.c:1135
+#: g10/card-util.c:1218
+#: g10/keyedit.c:423
+#: g10/keyedit.c:444
+#: g10/keyedit.c:458
+#: g10/keygen.c:1400
 #: g10/keygen.c:1467
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
 
-#: g10/card-util.c:219 g10/card-util.c:269
+#: g10/card-util.c:219
+#: g10/card-util.c:269
 msgid "[not set]"
 msgstr "[未設定]"
 
@@ -460,7 +517,9 @@ msgstr "取回公鑰的 URL: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:690 g10/card-util.c:759 g10/import.c:279
+#: g10/card-util.c:690
+#: g10/card-util.c:759
+#: g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時出錯: %s\n"
@@ -529,7 +588,8 @@ msgstr "取得現用金鑰資訊時出錯: %s\n"
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1057 g10/card-util.c:1066
+#: g10/card-util.c:1057
+#: g10/card-util.c:1066
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
@@ -552,20 +612,28 @@ msgstr ""
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇妳要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1128 g10/card-util.c:1209
+#: g10/card-util.c:1128
+#: g10/card-util.c:1209
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1129 g10/card-util.c:1211
+#: g10/card-util.c:1129
+#: g10/card-util.c:1211
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1130 g10/card-util.c:1213
+#: g10/card-util.c:1130
+#: g10/card-util.c:1213
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1146 g10/card-util.c:1229 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1146
+#: g10/card-util.c:1229
+#: g10/keyedit.c:938
+#: g10/keygen.c:1404
+#: g10/keygen.c:1432
+#: g10/keygen.c:1506
+#: g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
@@ -585,7 +653,8 @@ msgstr "私鑰部分無法取用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放在卡片上了\n"
 
-#: g10/card-util.c:1322 g10/keyedit.c:1349
+#: g10/card-util.c:1322
+#: g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "離開這個選單"
 
@@ -593,7 +662,8 @@ msgstr "離開這個選單"
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1325 g10/keyedit.c:1352
+#: g10/card-util.c:1325
+#: g10/keyedit.c:1352
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
@@ -645,7 +715,8 @@ msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1460 g10/keyedit.c:1619
+#: g10/card-util.c:1460
+#: g10/keyedit.c:1619
 msgid "Command> "
 msgstr "指令> "
 
@@ -661,7 +732,8 @@ msgstr "允許使用管理者指令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1605 g10/keyedit.c:2240
+#: g10/card-util.c:1605
+#: g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -715,29 +787,43 @@ msgstr "請再次輸入個人識別碼 (PIN): "
 msgid "PIN not correctly repeated; try again"
 msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
 
-#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3970 g10/keyring.c:375
-#: g10/keyring.c:661 g10/verify.c:101 g10/verify.c:156
+#: g10/decrypt.c:67
+#: g10/decrypt.c:158
+#: g10/gpg.c:3970
+#: g10/keyring.c:375
+#: g10/keyring.c:661
+#: g10/verify.c:101
+#: g10/verify.c:156
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/decrypt.c:103 g10/encode.c:823
+#: g10/decrypt.c:103
+#: g10/encode.c:823
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/delkey.c:73 g10/export.c:309 g10/keyedit.c:3388 g10/keyserver.c:1711
+#: g10/delkey.c:73
+#: g10/export.c:309
+#: g10/keyedit.c:3388
+#: g10/keyserver.c:1711
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2378 g10/keyserver.c:1725
-#: g10/revoke.c:232 g10/revoke.c:476
+#: g10/delkey.c:81
+#: g10/export.c:339
+#: g10/import.c:2378
+#: g10/keyserver.c:1725
+#: g10/revoke.c:232
+#: g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時出錯: %s\n"
 
-#: g10/delkey.c:127 g10/delkey.c:134
+#: g10/delkey.c:127
+#: g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非妳用指紋指定了金鑰)\n"
 
@@ -771,7 +857,8 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:211 g10/sign.c:1254
+#: g10/encode.c:211
+#: g10/sign.c:1254
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語時出錯: %s\n"
@@ -785,12 +872,15 @@ msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 msgid "using cipher %s\n"
 msgstr "正在使用 %s 編密法\n"
 
-#: g10/encode.c:239 g10/encode.c:534
+#: g10/encode.c:239
+#: g10/encode.c:534
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:290 g10/encode.c:568 g10/sign.c:559
+#: g10/encode.c:290
+#: g10/encode.c:568
+#: g10/sign.c:559
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是個空檔案\n"
@@ -805,21 +895,18 @@ msgid "reading from `%s'\n"
 msgstr "正在從 `%s' 讀取中\n"
 
 #: g10/encode.c:506
-msgid ""
-"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "妳正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
 #: g10/encode.c:516
 #, c-format
-msgid ""
-"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:612 g10/sign.c:931
+#: g10/encode.c:612
+#: g10/sign.c:931
 #, c-format
-msgid ""
-"WARNING: forcing compression algorithm %s (%d) violates recipient "
-"preferences\n"
+msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 
 #: g10/encode.c:699
@@ -827,7 +914,9 @@ msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:769 g10/pkclist.c:804 g10/pkclist.c:852
+#: g10/encode.c:769
+#: g10/pkclist.c:804
+#: g10/pkclist.c:852
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "妳不能夠將 %s 用於 %s 模式中\n"
@@ -837,19 +926,20 @@ msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已加密給: \"%s\"\n"
 
-#: g10/encr-data.c:89 g10/mainproc.c:296
+#: g10/encr-data.c:89
+#: g10/mainproc.c:296
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 已加密的資料\n"
 
-#: g10/encr-data.c:91 g10/mainproc.c:300
+#: g10/encr-data.c:91
+#: g10/mainproc.c:300
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以 %d 未知演算法所加密\n"
 
 #: g10/encr-data.c:115
-msgid ""
-"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
 
 #: g10/encr-data.c:126
@@ -860,14 +950,14 @@ msgstr "處理已加密封包有問題\n"
 msgid "no remote program execution supported\n"
 msgstr "沒有支援的遠端程式執行\n"
 
-#: g10/exec.c:174 g10/openfile.c:429
+#: g10/exec.c:174
+#: g10/openfile.c:429
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
 #: g10/exec.c:315
-msgid ""
-"external program calls are disabled due to unsafe options file permissions\n"
+msgid "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
 #: g10/exec.c:345
@@ -889,7 +979,8 @@ msgstr "無法執行 shell `%s': %s\n"
 msgid "system error while calling external program: %s\n"
 msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
-#: g10/exec.c:522 g10/exec.c:588
+#: g10/exec.c:522
+#: g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "外部程式不自然地離開\n"
 
@@ -902,7 +993,8 @@ msgstr "無法執行外部程式\n"
 msgid "unable to read external program response: %s\n"
 msgstr "無法讀取外部程式回應: %s\n"
 
-#: g10/exec.c:599 g10/exec.c:606
+#: g10/exec.c:599
+#: g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
@@ -1102,7 +1194,8 @@ msgstr "更新信任資料庫"
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:444 g10/gpgv.c:68
+#: g10/gpg.c:444
+#: g10/gpgv.c:68
 msgid ""
 "@\n"
 "Options:\n"
@@ -1136,7 +1229,8 @@ msgstr "使用標準的文字模式"
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:481 g10/gpgv.c:70
+#: g10/gpg.c:481
+#: g10/gpgv.c:70
 msgid "verbose"
 msgstr "囉唆模式"
 
@@ -1184,10 +1278,10 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:769 g10/gpgv.c:95
+#: g10/gpg.c:769
+#: g10/gpgv.c:95
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
-msgstr ""
-"請向 <gnupg-bugs@gnu.org> 回報程式瑕疵, 向 <Jedi@Jedi.org> 回報翻譯瑕疵.\n"
+msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵, 向 <Jedi@Jedi.org> 回報翻譯瑕疵.\n"
 
 #: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
@@ -1215,7 +1309,8 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809
+#: g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "編密法: "
 
@@ -1223,7 +1318,8 @@ msgstr "編密法: "
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821
+#: g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "壓縮: "
 
@@ -1277,8 +1373,7 @@ msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
 #: g10/gpg.c:1294
 #, c-format
-msgid ""
-"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
 #: g10/gpg.c:1297
@@ -1293,8 +1388,7 @@ msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
 #: g10/gpg.c:1306
 #, c-format
-msgid ""
-"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
 #: g10/gpg.c:1309
@@ -1371,7 +1465,9 @@ msgstr "選項檔 `%s': %s\n"
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
 
-#: g10/gpg.c:2286 g10/gpg.c:2955 g10/gpg.c:2974
+#: g10/gpg.c:2286
+#: g10/gpg.c:2955
+#: g10/gpg.c:2974
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
@@ -1381,7 +1477,8 @@ msgstr "請注意: 一般情況下不會用到 %s!\n"
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未載入\n"
 
-#: g10/gpg.c:2488 g10/gpg.c:2500
+#: g10/gpg.c:2488
+#: g10/gpg.c:2500
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是個有效的簽章使用期限\n"
@@ -1391,7 +1488,9 @@ msgstr "`%s' 不是個有效的簽章使用期限\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2601 g10/gpg.c:2790 g10/keyedit.c:4076
+#: g10/gpg.c:2601
+#: g10/gpg.c:2790
+#: g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
@@ -1543,11 +1642,13 @@ msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3088 g10/gpg.c:3112
+#: g10/gpg.c:3088
+#: g10/gpg.c:3112
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3094 g10/gpg.c:3118
+#: g10/gpg.c:3094
+#: g10/gpg.c:3118
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
@@ -1779,7 +1880,10 @@ msgstr "pk 快取裡有太多項目 - 已禁用\n"
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:946 g10/getkey.c:956 g10/getkey.c:966 g10/getkey.c:982
+#: g10/getkey.c:946
+#: g10/getkey.c:956
+#: g10/getkey.c:966
+#: g10/getkey.c:982
 #: g10/getkey.c:997
 #, c-format
 msgid "automatically retrieved `%s' via %s\n"
@@ -1790,7 +1894,8 @@ msgstr "已自動取回 `%s' (經由 %s )\n"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2389 g10/keyedit.c:3719
+#: g10/getkey.c:2389
+#: g10/keyedit.c:3719
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
@@ -1858,8 +1963,7 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "如果妳無論如何都想要用這把未被信任的金鑰, 請回答 \"yes\"."
 
 #: g10/helptext.c:64
-msgid ""
-"Enter the user ID of the addressee to whom you want to send the message."
+msgid "Enter the user ID of the addressee to whom you want to send the message."
 msgstr "輸入妳要遞送的訊息接收者的使用者 ID."
 
 #: g10/helptext.c:68
@@ -1900,8 +2004,13 @@ msgstr ""
 msgid "Enter the size of the key"
 msgstr "請輸入金鑰尺寸"
 
-#: g10/helptext.c:93 g10/helptext.c:98 g10/helptext.c:110 g10/helptext.c:142
-#: g10/helptext.c:170 g10/helptext.c:175 g10/helptext.c:180
+#: g10/helptext.c:93
+#: g10/helptext.c:98
+#: g10/helptext.c:110
+#: g10/helptext.c:142
+#: g10/helptext.c:170
+#: g10/helptext.c:175
+#: g10/helptext.c:180
 msgid "Answer \"yes\" or \"no\""
 msgstr "請回答 \"yes\" 或 \"no\""
 
@@ -1952,36 +2061,26 @@ msgid ""
 "belongs to the person named in the user ID.  It is useful for others to\n"
 "know how carefully you verified this.\n"
 "\n"
-"\"0\" means you make no particular claim as to how carefully you verified "
-"the\n"
+"\"0\" means you make no particular claim as to how carefully you verified the\n"
 "    key.\n"
 "\n"
 "\"1\" means you believe the key is owned by the person who claims to own it\n"
-"    but you could not, or did not verify the key at all.  This is useful "
-"for\n"
-"    a \"persona\" verification, where you sign the key of a pseudonymous "
-"user.\n"
+"    but you could not, or did not verify the key at all.  This is useful for\n"
+"    a \"persona\" verification, where you sign the key of a pseudonymous user.\n"
 "\n"
-"\"2\" means you did casual verification of the key.  For example, this "
-"could\n"
-"    mean that you verified the key fingerprint and checked the user ID on "
-"the\n"
+"\"2\" means you did casual verification of the key.  For example, this could\n"
+"    mean that you verified the key fingerprint and checked the user ID on the\n"
 "    key against a photo ID.\n"
 "\n"
-"\"3\" means you did extensive verification of the key.  For example, this "
-"could\n"
+"\"3\" means you did extensive verification of the key.  For example, this could\n"
 "    mean that you verified the key fingerprint with the owner of the key in\n"
-"    person, and that you checked, by means of a hard to forge document with "
-"a\n"
-"    photo ID (such as a passport) that the name of the key owner matches "
-"the\n"
-"    name in the user ID on the key, and finally that you verified (by "
-"exchange\n"
+"    person, and that you checked, by means of a hard to forge document with a\n"
+"    photo ID (such as a passport) that the name of the key owner matches the\n"
+"    name in the user ID on the key, and finally that you verified (by exchange\n"
 "    of email) that the email address on the key belongs to the key owner.\n"
 "\n"
 "Note that the examples given above for levels 2 and 3 are *only* examples.\n"
-"In the end, it is up to you to decide just what \"casual\" and \"extensive"
-"\"\n"
+"In the end, it is up to you to decide just what \"casual\" and \"extensive\"\n"
 "mean to you when you sign other keys.\n"
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
@@ -2304,7 +2403,8 @@ msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:719 g10/import.c:1117
+#: g10/import.c:719
+#: g10/import.c:1117
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
@@ -2328,7 +2428,8 @@ msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能肇因於遺失自我簽章所致\n"
 
-#: g10/import.c:781 g10/import.c:1239
+#: g10/import.c:781
+#: g10/import.c:1239
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
@@ -2343,13 +2444,20 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫入的鑰匙圈: %s\n"
 
-#: g10/import.c:801 g10/openfile.c:281 g10/sign.c:799 g10/sign.c:1104
+#: g10/import.c:801
+#: g10/openfile.c:281
+#: g10/sign.c:799
+#: g10/sign.c:1104
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "寫入 `%s' 中\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2392 g10/import.c:2414
+#: g10/import.c:805
+#: g10/import.c:900
+#: g10/import.c:1157
+#: g10/import.c:1300
+#: g10/import.c:2392
+#: g10/import.c:2414
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫入鑰匙圈 `%s' 時出錯: %s\n"
@@ -2364,12 +2472,14 @@ msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:865 g10/import.c:1257
+#: g10/import.c:865
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
 
-#: g10/import.c:873 g10/import.c:1264
+#: g10/import.c:873
+#: g10/import.c:1264
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
@@ -2438,7 +2548,8 @@ msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 msgid "importing secret keys not allowed\n"
 msgstr "未允許匯入私鑰\n"
 
-#: g10/import.c:1151 g10/import.c:2407
+#: g10/import.c:1151
+#: g10/import.c:2407
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
@@ -2493,7 +2604,8 @@ msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
 
-#: g10/import.c:1419 g10/import.c:1469
+#: g10/import.c:1419
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未支援的公鑰演算法\n"
@@ -2609,7 +2721,8 @@ msgstr "建立 `%s' 鑰匙圈時出錯: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "`%s' 鑰匙圈已建立\n"
 
-#: g10/keydb.c:314 g10/keydb.c:317
+#: g10/keydb.c:314
+#: g10/keydb.c:317
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "`%s' 金鑰區塊資源: %s\n"
@@ -2627,29 +2740,35 @@ msgstr "[撤銷]"
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:343 g10/keylist.c:388
+#: g10/keyedit.c:343
+#: g10/keylist.c:388
 msgid "1 bad signature\n"
 msgstr "1 份損壞的簽章\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:390
+#: g10/keyedit.c:345
+#: g10/keylist.c:390
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 份損壞的簽章\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:392
+#: g10/keyedit.c:347
+#: g10/keylist.c:392
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:394
+#: g10/keyedit.c:349
+#: g10/keylist.c:394
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:396
+#: g10/keyedit.c:351
+#: g10/keylist.c:396
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因錯誤而未被檢查\n"
 
-#: g10/keyedit.c:353 g10/keylist.c:398
+#: g10/keyedit.c:353
+#: g10/keylist.c:398
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因錯誤而未被檢查\n"
@@ -2663,22 +2782,23 @@ msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:413 g10/pkclist.c:264
+#: g10/keyedit.c:413
+#: g10/pkclist.c:264
 msgid ""
-"Please decide how far you trust this user to correctly verify other users' "
-"keys\n"
-"(by looking at passports, checking fingerprints from different sources, "
-"etc.)\n"
+"Please decide how far you trust this user to correctly verify other users' keys\n"
+"(by looking at passports, checking fingerprints from different sources, etc.)\n"
 msgstr ""
 "請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:417 g10/pkclist.c:276
+#: g10/keyedit.c:417
+#: g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:278
+#: g10/keyedit.c:418
+#: g10/pkclist.c:278
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
@@ -2702,12 +2822,19 @@ msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已撤銷."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:828
-#: g10/keyedit.c:888 g10/keyedit.c:1738
+#: g10/keyedit.c:607
+#: g10/keyedit.c:635
+#: g10/keyedit.c:662
+#: g10/keyedit.c:828
+#: g10/keyedit.c:888
+#: g10/keyedit.c:1738
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:834
+#: g10/keyedit.c:621
+#: g10/keyedit.c:649
+#: g10/keyedit.c:676
+#: g10/keyedit.c:834
 #: g10/keyedit.c:1744
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
@@ -2803,9 +2930,7 @@ msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
 #: g10/keyedit.c:881
-msgid ""
-"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
-"mode.\n"
+msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
 msgstr "妳不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
 #: g10/keyedit.c:883
@@ -2814,8 +2939,7 @@ msgstr "這會讓這把金鑰在 PGP 2.x 模式下無法使用.\n"
 
 #: g10/keyedit.c:908
 msgid ""
-"How carefully have you verified the key you are about to sign actually "
-"belongs\n"
+"How carefully have you verified the key you are about to sign actually belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
@@ -2890,8 +3014,12 @@ msgstr "我非常小心地檢查過這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1059 g10/keyedit.c:4795 g10/keyedit.c:4886 g10/keyedit.c:4950
-#: g10/keyedit.c:5011 g10/sign.c:317
+#: g10/keyedit.c:1059
+#: g10/keyedit.c:4795
+#: g10/keyedit.c:4886
+#: g10/keyedit.c:4950
+#: g10/keyedit.c:5011
+#: g10/sign.c:317
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -2900,19 +3028,24 @@ msgstr "簽署時失敗: %s\n"
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1135 g10/keygen.c:3226
+#: g10/keyedit.c:1135
+#: g10/keygen.c:3226
 msgid "This key is not protected.\n"
 msgstr "這把金鑰未被保護.\n"
 
-#: g10/keyedit.c:1139 g10/keygen.c:3214 g10/revoke.c:537
+#: g10/keyedit.c:1139
+#: g10/keygen.c:3214
+#: g10/revoke.c:537
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keyedit.c:1143 g10/keygen.c:3229
+#: g10/keyedit.c:1143
+#: g10/keygen.c:3229
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keyedit.c:1147 g10/keygen.c:3233
+#: g10/keyedit.c:1147
+#: g10/keygen.c:3233
 msgid "Key is protected.\n"
 msgstr "金鑰已保護.\n"
 
@@ -2929,7 +3062,8 @@ msgstr ""
 "請輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1186 g10/keygen.c:1906
+#: g10/keyedit.c:1186
+#: g10/keygen.c:1906
 msgid "passphrase not correctly repeated; try again"
 msgstr "前後兩次輸入的密語不一致; 請再試一次"
 
@@ -3120,8 +3254,7 @@ msgstr "請先使用 \"toggle\" 指令.\n"
 
 #: g10/keyedit.c:1692
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures "
-"(lsign),\n"
+"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
@@ -3151,7 +3284,9 @@ msgstr "未知的 `%s' 簽章種類\n"
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1812 g10/keyedit.c:1832 g10/keyedit.c:1998
+#: g10/keyedit.c:1812
+#: g10/keyedit.c:1832
+#: g10/keyedit.c:1998
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
@@ -3271,11 +3406,13 @@ msgstr "特點: "
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2407 g10/keylist.c:306
+#: g10/keyedit.c:2407
+#: g10/keylist.c:306
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2415 g10/keyedit.c:2416
+#: g10/keyedit.c:2415
+#: g10/keyedit.c:2416
 msgid "Notations: "
 msgstr "註記: "
 
@@ -3297,27 +3434,45 @@ msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:2728 g10/keyedit.c:2784 g10/keyedit.c:2845 g10/keyedit.c:2860
-#: g10/keylist.c:192 g10/keyserver.c:517
+#: g10/keyedit.c:2728
+#: g10/keyedit.c:2784
+#: g10/keyedit.c:2845
+#: g10/keyedit.c:2860
+#: g10/keylist.c:192
+#: g10/keyserver.c:517
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:2731 g10/keylist.c:769 g10/keylist.c:863 g10/mainproc.c:997
+#: g10/keyedit.c:2731
+#: g10/keylist.c:769
+#: g10/keylist.c:863
+#: g10/mainproc.c:997
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2733 g10/keylist.c:740 g10/keylist.c:775 g10/keylist.c:869
+#: g10/keyedit.c:2733
+#: g10/keylist.c:740
+#: g10/keylist.c:775
+#: g10/keylist.c:869
 #, c-format
 msgid "expired: %s"
 msgstr "過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2735 g10/keyedit.c:2786 g10/keyedit.c:2847 g10/keyedit.c:2862
-#: g10/keylist.c:194 g10/keylist.c:746 g10/keylist.c:781 g10/keylist.c:875
-#: g10/keylist.c:896 g10/keyserver.c:523 g10/mainproc.c:1003
+#: g10/keyedit.c:2735
+#: g10/keyedit.c:2786
+#: g10/keyedit.c:2847
+#: g10/keyedit.c:2862
+#: g10/keylist.c:194
+#: g10/keylist.c:746
+#: g10/keylist.c:781
+#: g10/keylist.c:875
+#: g10/keylist.c:896
+#: g10/keyserver.c:523
+#: g10/mainproc.c:1003
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
@@ -3341,7 +3496,8 @@ msgstr "有效性: %s"
 msgid "This key has been disabled"
 msgstr "這把金鑰已經停用了"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2791
+#: g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡片編號: "
 
@@ -3353,13 +3509,21 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2879 g10/keyedit.c:3225 g10/keyserver.c:527
-#: g10/mainproc.c:1815 g10/trustdb.c:1177 g10/trustdb.c:1697
+#: g10/keyedit.c:2879
+#: g10/keyedit.c:3225
+#: g10/keyserver.c:527
+#: g10/mainproc.c:1815
+#: g10/trustdb.c:1177
+#: g10/trustdb.c:1697
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2881 g10/keyedit.c:3227 g10/keyserver.c:531
-#: g10/mainproc.c:1817 g10/trustdb.c:530 g10/trustdb.c:1699
+#: g10/keyedit.c:2881
+#: g10/keyedit.c:3227
+#: g10/keyserver.c:531
+#: g10/mainproc.c:1817
+#: g10/trustdb.c:530
+#: g10/trustdb.c:1699
 msgid "expired"
 msgstr "已過期"
 
@@ -3373,14 +3537,14 @@ msgstr ""
 
 #: g10/keyedit.c:3007
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
-"versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3012 g10/keyedit.c:3347
+#: g10/keyedit.c:3012
+#: g10/keyedit.c:3347
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
@@ -3418,7 +3582,8 @@ msgstr "已經刪除了 %d 份簽章.\n"
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3229
+#: g10/trustdb.c:1701
 msgid "invalid"
 msgstr "無效"
 
@@ -3449,8 +3614,7 @@ msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
 #: g10/keyedit.c:3342
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
-"cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
@@ -3484,8 +3648,7 @@ msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
 #: g10/keyedit.c:3460
-msgid ""
-"Are you sure you want to appoint this key as a designated revoker? (y/N) "
+msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
 #: g10/keyedit.c:3522
@@ -3526,7 +3689,10 @@ msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3887 g10/keyedit.c:3997 g10/keyedit.c:4117 g10/keyedit.c:4258
+#: g10/keyedit.c:3887
+#: g10/keyedit.c:3997
+#: g10/keyedit.c:4117
+#: g10/keyedit.c:4258
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
@@ -3571,12 +3737,16 @@ msgstr "索引 %d 沒有對應到子鑰\n"
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4637 g10/keyedit.c:4701 g10/keyedit.c:4744
+#: g10/keyedit.c:4637
+#: g10/keyedit.c:4701
+#: g10/keyedit.c:4744
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:4639 g10/keyedit.c:4703 g10/keyedit.c:4746
+#: g10/keyedit.c:4639
+#: g10/keyedit.c:4703
+#: g10/keyedit.c:4746
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
@@ -3678,13 +3848,19 @@ msgstr "寫入自我簽章中\n"
 msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
-#: g10/keygen.c:1026 g10/keygen.c:1109 g10/keygen.c:1114 g10/keygen.c:1231
+#: g10/keygen.c:1026
+#: g10/keygen.c:1109
+#: g10/keygen.c:1114
+#: g10/keygen.c:1231
 #: g10/keygen.c:2787
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1031 g10/keygen.c:1120 g10/keygen.c:1236 g10/keygen.c:2793
+#: g10/keygen.c:1031
+#: g10/keygen.c:1120
+#: g10/keygen.c:1236
+#: g10/keygen.c:2793
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -3811,7 +3987,8 @@ msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
 msgid "Requested keysize is %u bits\n"
 msgstr "妳所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1575 g10/keygen.c:1580
+#: g10/keygen.c:1575
+#: g10/keygen.c:1580
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
@@ -3894,8 +4071,7 @@ msgstr "以上正確嗎? (y/N) "
 #: g10/keygen.c:1724
 msgid ""
 "\n"
-"You need a user ID to identify your key; the software constructs the user "
-"ID\n"
+"You need a user ID to identify your key; the software constructs the user ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
@@ -3993,7 +4169,8 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1907 g10/passphrase.c:808
+#: g10/keygen.c:1907
+#: g10/passphrase.c:808
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4025,17 +4202,20 @@ msgstr ""
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:2932 g10/keygen.c:3079
+#: g10/keygen.c:2932
+#: g10/keygen.c:3079
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在寫入公鑰至 `%s'\n"
 
-#: g10/keygen.c:2934 g10/keygen.c:3082
+#: g10/keygen.c:2934
+#: g10/keygen.c:3082
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:2937 g10/keygen.c:3085
+#: g10/keygen.c:2937
+#: g10/keygen.c:3085
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在寫入私鑰至 `%s'\n"
@@ -4072,28 +4252,34 @@ msgstr ""
 "請注意這把金鑰不能用於加密.  也許妳會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:3145 g10/keygen.c:3274 g10/keygen.c:3389
+#: g10/keygen.c:3145
+#: g10/keygen.c:3274
+#: g10/keygen.c:3389
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3197 g10/keygen.c:3324 g10/sign.c:242
+#: g10/keygen.c:3197
+#: g10/keygen.c:3324
+#: g10/sign.c:242
 #, c-format
-msgid ""
-"key has been created %lu second in future (time warp or clock problem)\n"
+msgid "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3199 g10/keygen.c:3326 g10/sign.c:244
+#: g10/keygen.c:3199
+#: g10/keygen.c:3326
+#: g10/sign.c:244
 #, c-format
-msgid ""
-"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3208 g10/keygen.c:3337
+#: g10/keygen.c:3208
+#: g10/keygen.c:3337
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3247 g10/keygen.c:3370
+#: g10/keygen.c:3247
+#: g10/keygen.c:3370
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
@@ -4112,7 +4298,10 @@ msgstr "無法建立備份檔案 `%s': %s\n"
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
 
-#: g10/keyid.c:496 g10/keyid.c:508 g10/keyid.c:520 g10/keyid.c:532
+#: g10/keyid.c:496
+#: g10/keyid.c:508
+#: g10/keyid.c:520
+#: g10/keyid.c:532
 msgid "never     "
 msgstr "永遠不過期"
 
@@ -4159,7 +4348,8 @@ msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1518 g10/keylist.c:1522
+#: g10/keylist.c:1518
+#: g10/keylist.c:1522
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
@@ -4251,7 +4441,8 @@ msgstr "已停用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
 
-#: g10/keyserver.c:814 g10/keyserver.c:1432
+#: g10/keyserver.c:814
+#: g10/keyserver.c:1432
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
@@ -4305,7 +4496,8 @@ msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1392 g10/keyserver.c:1488
+#: g10/keyserver.c:1392
+#: g10/keyserver.c:1488
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
@@ -4318,7 +4510,8 @@ msgstr "警告: 金鑰伺服器經手程式係來自不同版本的 GnuPG (%s)\n
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1511 g10/keyserver.c:2039
+#: g10/keyserver.c:1511
+#: g10/keyserver.c:2039
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
@@ -4354,7 +4547,8 @@ msgstr "金鑰伺服器內部錯誤\n"
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊錯誤: %s\n"
 
-#: g10/keyserver.c:1588 g10/keyserver.c:1622
+#: g10/keyserver.c:1588
+#: g10/keyserver.c:1622
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
@@ -4413,7 +4607,8 @@ msgstr "公鑰加密過的資料: 完好的 DEK\n"
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 所加密\n"
 
-#: g10/mainproc.c:486 g10/pkclist.c:220
+#: g10/mainproc.c:486
+#: g10/pkclist.c:220
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
@@ -4437,7 +4632,8 @@ msgstr "已用 %lu 個密語加密了\n"
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:551 g10/mainproc.c:573
+#: g10/mainproc.c:551
+#: g10/mainproc.c:573
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
@@ -4512,17 +4708,20 @@ msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1719 g10/mainproc.c:1767
+#: g10/mainproc.c:1719
+#: g10/mainproc.c:1767
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1721 g10/mainproc.c:1769
+#: g10/mainproc.c:1721
+#: g10/mainproc.c:1769
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1723 g10/mainproc.c:1771
+#: g10/mainproc.c:1723
+#: g10/mainproc.c:1771
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
@@ -4559,7 +4758,8 @@ msgstr "二進制"
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1916
+#: g10/trustdb.c:529
 msgid "unknown"
 msgstr "未知"
 
@@ -4568,13 +4768,14 @@ msgstr "未知"
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2005 g10/mainproc.c:2021 g10/mainproc.c:2107
+#: g10/mainproc.c:2005
+#: g10/mainproc.c:2021
+#: g10/mainproc.c:2107
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
 #: g10/mainproc.c:2048
-msgid ""
-"WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
 #: g10/mainproc.c:2056
@@ -4595,7 +4796,9 @@ msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 msgid "can't disable core dumps: %s\n"
 msgstr "無法讓系統停止傾印核心檔: %s\n"
 
-#: g10/misc.c:140 g10/misc.c:168 g10/misc.c:240
+#: g10/misc.c:140
+#: g10/misc.c:168
+#: g10/misc.c:240
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
@@ -4633,7 +4836,8 @@ msgstr "警告: 已不建議使用 %s 摘要演算法\n"
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
+#: g10/misc.c:460
+#: g10/sig-check.c:101
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 %s 上進一步的資訊\n"
@@ -4755,11 +4959,14 @@ msgstr "gpg-agent 協定版本 %d 未被支援\n"
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: g10/passphrase.c:377 g10/passphrase.c:653 g10/passphrase.c:743
+#: g10/passphrase.c:377
+#: g10/passphrase.c:653
+#: g10/passphrase.c:743
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程式的問題 - 停用代理程式中\n"
 
-#: g10/passphrase.c:530 g10/passphrase.c:912
+#: g10/passphrase.c:530
+#: g10/passphrase.c:912
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
@@ -4787,11 +4994,13 @@ msgstr "請輸入密語\n"
 msgid "cancelled by user\n"
 msgstr "由使用者所取消\n"
 
-#: g10/passphrase.c:803 g10/passphrase.c:972
+#: g10/passphrase.c:803
+#: g10/passphrase.c:972
 msgid "can't query passphrase in batch mode\n"
 msgstr "無法在批次模式中查詢密語\n"
 
-#: g10/passphrase.c:810 g10/passphrase.c:977
+#: g10/passphrase.c:810
+#: g10/passphrase.c:977
 msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
@@ -4867,23 +5076,28 @@ msgstr "沒有設定照片檢視程式\n"
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
-#: g10/pkclist.c:63 g10/revoke.c:621
+#: g10/pkclist.c:63
+#: g10/revoke.c:621
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:65 g10/revoke.c:623
+#: g10/pkclist.c:65
+#: g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/pkclist.c:67 g10/revoke.c:622
+#: g10/pkclist.c:67
+#: g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/pkclist.c:69 g10/revoke.c:624
+#: g10/pkclist.c:69
+#: g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/pkclist.c:71 g10/revoke.c:625
+#: g10/pkclist.c:71
+#: g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
@@ -4910,8 +5124,7 @@ msgid "  aka \"%s\"\n"
 msgstr "  亦即 \"%s\"\n"
 
 #: g10/pkclist.c:257
-msgid ""
-"How much do you trust that this key actually belongs to the named user?\n"
+msgid "How much do you trust that this key actually belongs to the named user?\n"
 msgstr "妳有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
 
 #: g10/pkclist.c:272
@@ -4950,7 +5163,8 @@ msgstr ""
 "這把金鑰的最小信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:300 g10/revoke.c:650
+#: g10/pkclist.c:300
+#: g10/revoke.c:650
 msgid "Your decision? "
 msgstr "妳的決定是甚麼? "
 
@@ -5049,8 +5263,7 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
 #: g10/pkclist.c:605
-msgid ""
-"         There is no indication that the signature belongs to the owner.\n"
+msgid "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
 #: g10/pkclist.c:613
@@ -5062,20 +5275,23 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
 #: g10/pkclist.c:622
-msgid ""
-"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
 #: g10/pkclist.c:624
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:823 g10/pkclist.c:865 g10/pkclist.c:1077 g10/pkclist.c:1147
+#: g10/pkclist.c:823
+#: g10/pkclist.c:865
+#: g10/pkclist.c:1077
+#: g10/pkclist.c:1147
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:835 g10/pkclist.c:1115
+#: g10/pkclist.c:835
+#: g10/pkclist.c:1115
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已存在\n"
@@ -5100,7 +5316,8 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:970 g10/pkclist.c:1044
+#: g10/pkclist.c:970
+#: g10/pkclist.c:1044
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
@@ -5130,7 +5347,9 @@ msgstr "沒有有效的地址\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
 
-#: g10/plaintext.c:139 g10/plaintext.c:144 g10/plaintext.c:162
+#: g10/plaintext.c:139
+#: g10/plaintext.c:144
+#: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時出錯: %s\n"
@@ -5188,8 +5407,12 @@ msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已撤銷"
 
-#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
-#: g10/revoke.c:186 g10/revoke.c:586
+#: g10/revoke.c:102
+#: g10/revoke.c:116
+#: g10/revoke.c:128
+#: g10/revoke.c:174
+#: g10/revoke.c:186
+#: g10/revoke.c:586
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
@@ -5211,11 +5434,13 @@ msgstr "(這是把機密的撤銷金鑰)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:327 g10/revoke.c:552
+#: g10/revoke.c:327
+#: g10/revoke.c:552
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
-#: g10/revoke.c:342 g10/revoke.c:566
+#: g10/revoke.c:342
+#: g10/revoke.c:566
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
@@ -5384,14 +5609,12 @@ msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
 #: g10/sig-check.c:191
 #, c-format
-msgid ""
-"key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid "key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
 #: g10/sig-check.c:193
 #, c-format
-msgid ""
-"key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
 #: g10/sig-check.c:203
@@ -5421,15 +5644,12 @@ msgstr "警告: 註記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:116
 #, c-format
-msgid ""
-"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgid "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:139
 #, c-format
-msgid ""
-"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
-"unexpanded.\n"
+msgid "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:312
@@ -5448,8 +5668,7 @@ msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分
 
 #: g10/sign.c:830
 #, c-format
-msgid ""
-"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
 #: g10/sign.c:956
@@ -5465,7 +5684,8 @@ msgstr "妳在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:126 g10/skclist.c:190
+#: g10/skclist.c:126
+#: g10/skclist.c:190
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
@@ -5474,7 +5694,9 @@ msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳過 \"%s\": 重複了\n"
 
-#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#: g10/skclist.c:165
+#: g10/skclist.c:175
+#: g10/skclist.c:184
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
@@ -5487,7 +5709,8 @@ msgstr "已跳過: 私鑰已經存在\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
-#: g10/tdbdump.c:58 g10/trustdb.c:364
+#: g10/tdbdump.c:58
+#: g10/trustdb.c:364
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@ -5501,7 +5724,10 @@ msgstr ""
 "# 相對應的信任值清單被建立於 %s\n"
 "# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
 
-#: g10/tdbdump.c:158 g10/tdbdump.c:166 g10/tdbdump.c:171 g10/tdbdump.c:176
+#: g10/tdbdump.c:158
+#: g10/tdbdump.c:166
+#: g10/tdbdump.c:171
+#: g10/tdbdump.c:176
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
@@ -5532,17 +5758,20 @@ msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: g10/tdbdump.c:226 g10/trustdb.c:379
+#: g10/tdbdump.c:226
+#: g10/trustdb.c:379
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1443
+#: g10/tdbio.c:127
+#: g10/tdbio.c:1443
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:133 g10/tdbio.c:1450
+#: g10/tdbio.c:133
+#: g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
@@ -5561,12 +5790,15 @@ msgstr "無法存取 `%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:521 g10/tdbio.c:544 g10/tdbio.c:587
+#: g10/tdbio.c:521
+#: g10/tdbio.c:544
+#: g10/tdbio.c:587
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "無法為 `%s' 建立鎖定\n"
 
-#: g10/tdbio.c:523 g10/tdbio.c:590
+#: g10/tdbio.c:523
+#: g10/tdbio.c:590
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "無法鎖定 `%s'\n"
@@ -5605,8 +5837,13 @@ msgstr "%s: 建立雜湊表失敗: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:674 g10/tdbio.c:694 g10/tdbio.c:710 g10/tdbio.c:724
-#: g10/tdbio.c:754 g10/tdbio.c:1376 g10/tdbio.c:1403
+#: g10/tdbio.c:674
+#: g10/tdbio.c:694
+#: g10/tdbio.c:710
+#: g10/tdbio.c:724
+#: g10/tdbio.c:754
+#: g10/tdbio.c:1376
+#: g10/tdbio.c:1403
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
@@ -5728,7 +5965,8 @@ msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:507 g10/trustdb.c:512
+#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
@@ -5776,7 +6014,8 @@ msgstr "徹底"
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:581 g10/trustdb.c:2425
+#: g10/trustdb.c:581
+#: g10/trustdb.c:2425
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@ -5791,7 +6030,8 @@ msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:837 g10/trustdb.c:1275
+#: g10/trustdb.c:837
+#: g10/trustdb.c:1275
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
@@ -5825,8 +6065,7 @@ msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小
 
 #: g10/trustdb.c:2356
 #, c-format
-msgid ""
-"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgid "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
 #: g10/trustdb.c:2431
@@ -6088,20 +6327,24 @@ msgid "you found a bug ... (%s:%d)\n"
 msgstr "妳找到一個瑕疵了 ... (%s:%d)\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:328 util/miscutil.c:365
+#: util/miscutil.c:328
+#: util/miscutil.c:365
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:329 util/miscutil.c:370
+#: util/miscutil.c:329
+#: util/miscutil.c:370
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: util/miscutil.c:331 util/miscutil.c:367
+#: util/miscutil.c:331
+#: util/miscutil.c:367
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:332 util/miscutil.c:371
+#: util/miscutil.c:332
+#: util/miscutil.c:371
 msgid "nN"
 msgstr "nN"
 
@@ -6150,39 +6393,29 @@ msgstr "(也許妳選錯程式來做這件事了)\n"
 
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
-
 #~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
-
 #~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
-
 #~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
-
 #~ msgid ""
 #~ "a notation name must have only printable characters or spaces, and end "
 #~ "with an '='\n"
 #~ msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
-
 #~ msgid "a user notation name must contain the '@' character\n"
 #~ msgstr "使用者標記名稱一定要含有 '@' 字符\n"
-
 #~ msgid "a notation name must not contain more than one '@' character\n"
 #~ msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
-
 #~ msgid "a notation value must not use any control characters\n"
 #~ msgstr "標記值一定不能使用任何的控制字符\n"
-
 #~ msgid "WARNING: invalid notation data found\n"
 #~ msgstr "警告: 找到無效的標記資料\n"
-
 #~ msgid "not human readable"
 #~ msgstr "不是人類能讀得懂的"
-
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 #~ msgstr "請參考 http://www.gnupg.org/why-not-idea.html 取得更多資訊\n"
-
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
+