diff --git a/po/ChangeLog b/po/ChangeLog
index 318002572..a21f3ea37 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-02  Jedi <Jedi@Jedi.org>  (wk)
+
+	* zh_TW.po: Update.
+
 2007-12-19  Walter Koch <koch@u32.de>  (wk)
 
 	* de.po, de.glo: Update.
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 895e5c95d..365c402a2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,25 +2,26 @@
 # 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.
-# 
+#
 # Special thanks to "Autrijus Tang <autrijus@autrijus.org>".
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
 "POT-Creation-Date: 2007-12-14 11:58+0100\n"
-"PO-Revision-Date: 2005-07-29 09:49+0800\n"
+"PO-Revision-Date: 2007-12-29 20:48+0800\n"
 "Last-Translator: Jedi <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"
 
 #: cipher/primegen.c:119
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "無法以 %u 位元長的 p 以及 %u 位元長的 q 產生質數\n"
+msgstr "無法以 %u 位元長的 p 及 %u 位元長的 q 產生質數\n"
 
 #: cipher/primegen.c:310
 #, c-format
@@ -32,21 +33,37 @@ msgid "no entropy gathering module detected\n"
 msgstr "偵測不到亂數蒐集模組\n"
 
 #: cipher/random.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "can't lock `%s': %s\n"
-msgstr "無法鎖定 `%s'\n"
+msgstr "無法鎖定 `%s': %s\n"
 
 #: cipher/random.c:406
-#, fuzzy, c-format
+#, c-format
 msgid "waiting for lock on `%s'...\n"
-msgstr "正在將私鑰寫至 `%s'\n"
+msgstr "正在等候 `%s' 鎖定...\n"
 
-#: cipher/random.c:446 g10/card-util.c:676 g10/card-util.c:745
-#: g10/dearmor.c:59 g10/dearmor.c:108 g10/encode.c:182 g10/encode.c:472
-#: g10/gpg.c:1015 g10/gpg.c:3583 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:676
+#: g10/card-util.c:745
+#: g10/dearmor.c:59
+#: g10/dearmor.c:108
+#: g10/encode.c:182
+#: g10/encode.c:472
+#: g10/gpg.c:1015
+#: g10/gpg.c:3583
+#: 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"
@@ -77,16 +94,26 @@ msgstr "無法讀取 `%s': %s\n"
 
 #: cipher/random.c:518
 msgid "note: random_seed file not updated\n"
-msgstr "請注意: random_seed 檔案未被更新\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"
@@ -142,86 +169,100 @@ msgstr "存放指紋失敗: %s\n"
 #: g10/app-openpgp.c:607
 #, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "存放創生資料失敗: %s\n"
+msgstr "存放創生日期失敗: %s\n"
 
 #: g10/app-openpgp.c:975
 #, c-format
 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"
+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"
+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"
+msgstr "驗證 CHV%d 失敗: %s\n"
 
 #: g10/app-openpgp.c:1308
 msgid "access to admin commands is not configured\n"
-msgstr "取用管理者指令尚未被組態過\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"
+msgstr "卡片永久鎖定了!!\n"
 
 #: g10/app-openpgp.c:1334
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片被永久鎖定前遺留下來\n"
+msgstr "%d 管理者個人識別碼 (PIN) 試圖在卡片永久鎖定前遺留下來\n"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
 #: g10/app-openpgp.c:1341
 msgid "|A|Admin PIN"
-msgstr "|A|Admin PIN"
+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.
 #: g10/app-openpgp.c:1490
 msgid "|AN|New Admin PIN"
-msgstr "|AN|New Admin PIN"
+msgstr "|AN|新增管理者 PIN"
 
 #: g10/app-openpgp.c:1490
 msgid "|N|New PIN"
-msgstr "|N|New PIN"
+msgstr "|N|新增 PIN"
 
 #: g10/app-openpgp.c:1494
 #, c-format
 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"
 
@@ -239,22 +280,23 @@ msgstr "正在產生新的金鑰\n"
 
 #: g10/app-openpgp.c:1733
 msgid "creation timestamp missing\n"
-msgstr "建立的時間戳印缺漏\n"
+msgstr "缺漏創生時間戳印\n"
 
 #: g10/app-openpgp.c:1740
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA 模組缺漏或者尺寸並非 %d 位元\n"
+msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 
 #: g10/app-openpgp.c:1747
 #, c-format
 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"
+msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 
 #: g10/app-openpgp.c:1825
 #, c-format
@@ -263,7 +305,7 @@ msgstr "存放金鑰失敗: %s\n"
 
 #: g10/app-openpgp.c:1884
 msgid "please wait while key is being generated ...\n"
-msgstr "公鑰正被產生中, 請稍候 ...\n"
+msgstr "正在產生金鑰中, 請稍候 ...\n"
 
 #: g10/app-openpgp.c:1899
 msgid "generating key failed\n"
@@ -272,16 +314,16 @@ msgstr "產生金鑰時失敗\n"
 #: g10/app-openpgp.c:1902
 #, c-format
 msgid "key generation completed (%d seconds)\n"
-msgstr "金鑰產生已完工 (%d 秒)\n"
+msgstr "金鑰產生完畢 (%d 秒)\n"
 
 #: g10/app-openpgp.c:1959
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
-msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
+msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 
 #: g10/app-openpgp.c:2085
-#, fuzzy, c-format
+#, c-format
 msgid "card does not support digest algorithm %s\n"
-msgstr "%s 簽章, 摘要演算法 %s\n"
+msgstr "卡片不支援 %s 摘要演算法\n"
 
 #: g10/app-openpgp.c:2132
 #, c-format
@@ -294,11 +336,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"
-msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\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"
@@ -321,9 +363,8 @@ msgid "invalid clearsig header\n"
 msgstr "無效的明文簽章檔頭\n"
 
 #: g10/armor.c:459
-#, fuzzy
 msgid "unknown armor header: "
-msgstr "封裝檔頭: "
+msgstr "未知的封裝檔頭: "
 
 #: g10/armor.c:512
 msgid "nested clear text signatures\n"
@@ -337,10 +378,11 @@ 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"
+msgstr "無效的 64 進位字符 %02x 已跳過\n"
 
 #: g10/armor.c:856
 msgid "premature eof (no CRC)\n"
@@ -354,7 +396,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 +420,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:304
+#: g10/card-util.c:61
+#: g10/card-util.c:304
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
@@ -391,18 +434,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:1404 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:1404
+#: 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:1130 g10/card-util.c:1213
-#: 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:1130
+#: g10/card-util.c:1213
+#: 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:214 g10/card-util.c:264
+#: g10/card-util.c:214
+#: g10/card-util.c:264
 msgid "[not set]"
 msgstr "[未設定]"
 
@@ -428,11 +482,11 @@ msgstr "強迫使用"
 
 #: g10/card-util.c:517
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr "錯誤: 目前祇允許使用單純的 ASCII 字元.\n"
+msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 
 #: g10/card-util.c:519
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr "錯誤: 不能使用 \"<\" 字元.\n"
+msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 
 #: g10/card-util.c:521
 msgid "Error: Double spaces are not allowed.\n"
@@ -444,12 +498,12 @@ msgstr "卡片持有者的姓氏: "
 
 #: g10/card-util.c:540
 msgid "Cardholder's given name: "
-msgstr "卡片持有者的教名: "
+msgstr "卡片持有者的名字: "
 
 #: g10/card-util.c:558
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字元).\n"
+msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 
 #: g10/card-util.c:579
 msgid "URL to retrieve public key: "
@@ -458,21 +512,23 @@ msgstr "取回公鑰的 URL: "
 #: g10/card-util.c:587
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
+msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:685 g10/card-util.c:754 g10/import.c:279
+#: g10/card-util.c:685
+#: g10/card-util.c:754
+#: g10/import.c:279
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "讀取 `%s' 時發生錯誤: %s\n"
+msgstr "讀取 `%s' 時出錯: %s\n"
 
 #: g10/card-util.c:693
 msgid "Login data (account name): "
-msgstr " 登入資料 (帳號名稱): "
+msgstr "登入資料 (帳號名稱): "
 
 #: g10/card-util.c:703
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
-msgstr "錯誤: 登入資料太長 (上限是 %d 個字元).\n"
+msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
 
 #: g10/card-util.c:762
 msgid "Private DO data: "
@@ -481,7 +537,7 @@ msgstr "私人的 DO 資料: "
 #: g10/card-util.c:772
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
-msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字元).\n"
+msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
 
 #: g10/card-util.c:792
 msgid "Language preferences: "
@@ -489,15 +545,15 @@ msgstr "介面語言偏好設定: "
 
 #: g10/card-util.c:800
 msgid "Error: invalid length of preference string.\n"
-msgstr "錯誤: 偏好設定字串的長度無效\n"
+msgstr "錯誤: 無效的偏好設定字串長度\n"
 
 #: g10/card-util.c:809
 msgid "Error: invalid characters in preference string.\n"
-msgstr "錯誤: 偏好設定字串中含有無效的字元\n"
+msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 
 #: g10/card-util.c:830
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr "性別 ((M)ale, (F)emale 或留空): "
+msgstr "性別 ((M)男性, (F)女性或留空): "
 
 #: g10/card-util.c:844
 msgid "Error: invalid response.\n"
@@ -509,7 +565,7 @@ msgstr "憑證中心 (CA) 指紋: "
 
 #: g10/card-util.c:888
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "錯誤: 指紋格式化無效.\n"
+msgstr "錯誤: 無效的格式化指紋.\n"
 
 #: g10/card-util.c:936
 #, c-format
@@ -523,13 +579,14 @@ msgstr "這不是 OpenPGP 卡片"
 #: g10/card-util.c:946
 #, c-format
 msgid "error getting current key info: %s\n"
-msgstr "取得現用金鑰資訊時發生錯誤: %s\n"
+msgstr "取得現用金鑰資訊時出錯: %s\n"
 
 #: g10/card-util.c:1031
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1052 g10/card-util.c:1061
+#: g10/card-util.c:1052
+#: g10/card-util.c:1061
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
@@ -552,20 +609,28 @@ msgstr ""
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇妳要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1123 g10/card-util.c:1204
+#: g10/card-util.c:1123
+#: g10/card-util.c:1204
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1124 g10/card-util.c:1206
+#: g10/card-util.c:1124
+#: g10/card-util.c:1206
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1125 g10/card-util.c:1208
+#: g10/card-util.c:1125
+#: g10/card-util.c:1208
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1141 g10/card-util.c:1224 g10/keyedit.c:938
-#: g10/keygen.c:1404 g10/keygen.c:1432 g10/keygen.c:1506 g10/revoke.c:683
+#: g10/card-util.c:1141
+#: g10/card-util.c:1224
+#: 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"
 
@@ -583,9 +648,10 @@ msgstr "私鑰部分無法取用\n"
 
 #: g10/card-util.c:1246
 msgid "secret key already stored on a card\n"
-msgstr "私鑰已經存放於卡片上了\n"
+msgstr "私鑰已經存放在卡片上了\n"
 
-#: g10/card-util.c:1317 g10/keyedit.c:1349
+#: g10/card-util.c:1317
+#: g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "離開這個選單"
 
@@ -593,7 +659,8 @@ msgstr "離開這個選單"
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1320 g10/keyedit.c:1352
+#: g10/card-util.c:1320
+#: g10/keyedit.c:1352
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
@@ -607,7 +674,7 @@ msgstr "變更卡片持有人的名字"
 
 #: g10/card-util.c:1326
 msgid "change URL to retrieve key"
-msgstr "變更要取回金鑰的 URL"
+msgstr "變更取回金鑰的 URL"
 
 #: g10/card-util.c:1327
 msgid "fetch the key specified in the card URL"
@@ -615,7 +682,7 @@ msgstr "從卡片 URL 取回指定的金鑰"
 
 #: g10/card-util.c:1328
 msgid "change the login name"
-msgstr "變更登入姓名"
+msgstr "變更登入名稱"
 
 #: g10/card-util.c:1329
 msgid "change the language preferences"
@@ -627,11 +694,11 @@ msgstr "變更卡片持有者的性別"
 
 #: g10/card-util.c:1331
 msgid "change a CA fingerprint"
-msgstr "變更某個憑證中心 (CA) 指紋"
+msgstr "變更某個憑證中心 (CA) 的指紋"
 
 #: g10/card-util.c:1332
 msgid "toggle the signature force PIN flag"
-msgstr "切換簽章強制個人識別碼 (PIN) 的旗標"
+msgstr "切換簽章是否強制使用個人識別碼 (PIN) 的旗標"
 
 #: g10/card-util.c:1333
 msgid "generate new keys"
@@ -645,7 +712,8 @@ msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:1455 g10/keyedit.c:1619
+#: g10/card-util.c:1455
+#: g10/keyedit.c:1619
 msgid "Command> "
 msgstr "指令> "
 
@@ -661,23 +729,23 @@ msgstr "允許使用管理者指令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1600 g10/keyedit.c:2240
+#: g10/card-util.c:1600
+#: g10/keyedit.c:2240
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
 #: g10/cardglue.c:414
-#, fuzzy
 msgid "card reader not available\n"
-msgstr "無法取用私鑰"
+msgstr "沒有讀卡機可用\n"
 
 #: g10/cardglue.c:432
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 以取消: "
+msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 取消: "
 
 #: g10/cardglue.c:444
-#, fuzzy, c-format
+#, c-format
 msgid "selecting openpgp failed: %s\n"
-msgstr "刪除金鑰區塊時失敗了: %s\n"
+msgstr "挑選 openpgp 時失敗: %s\n"
 
 #: g10/cardglue.c:571
 #, c-format
@@ -690,7 +758,7 @@ msgstr ""
 
 #: g10/cardglue.c:580
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr "準備好時請按下 [Enter], 或者輸入 'c' 以取消: "
+msgstr "準備好時請按下 [Enter], 或者輸入 'c' 取消: "
 
 #: g10/cardglue.c:915
 msgid "Enter New Admin PIN: "
@@ -714,31 +782,45 @@ msgstr "請再次輸入個人識別碼 (PIN): "
 
 #: g10/cardglue.c:950
 msgid "PIN not correctly repeated; try again"
-msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
+msgstr "前後兩次輸入的個人識別碼 (PIN) 不一致; 請再試一次"
 
-#: g10/decrypt.c:67 g10/decrypt.c:158 g10/gpg.c:3948 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:3948
+#: 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"
+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"
+msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/delkey.c:81 g10/export.c:339 g10/import.c:2361 g10/keyserver.c:1725
-#: g10/revoke.c:232 g10/revoke.c:476
+#: g10/delkey.c:81
+#: g10/export.c:339
+#: g10/import.c:2361
+#: g10/keyserver.c:1725
+#: g10/revoke.c:232
+#: g10/revoke.c:476
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "讀取金鑰區塊時發生錯誤: %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"
 
@@ -757,11 +839,11 @@ msgstr "這是一把私鑰! - 真的要刪除嗎? (y/N) "
 #: g10/delkey.c:163
 #, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "刪除金鑰區塊時失敗了: %s\n"
+msgstr "刪除金鑰區塊時失敗: %s\n"
 
 #: g10/delkey.c:173
 msgid "ownertrust information cleared\n"
-msgstr "主觀信任資訊已經被清除\n"
+msgstr "主觀信任資訊已清除\n"
 
 #: g10/delkey.c:204
 #, c-format
@@ -772,29 +854,33 @@ 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"
+msgstr "建立密語時出錯: %s\n"
 
 #: g10/encode.c:216
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "因為處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
+msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 
 #: g10/encode.c:229
 #, c-format
 msgid "using cipher %s\n"
-msgstr "正在使用編密法 %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"
+msgstr "警告: `%s' 是個空檔案\n"
 
 #: g10/encode.c:454
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
@@ -806,29 +892,28 @@ 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"
-msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\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"
-msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設定\n"
+msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 
 #: g10/encode.c:699
 #, c-format
 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"
@@ -836,39 +921,40 @@ msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 #: g10/encode.c:796
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s 已經加密給: \"%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"
+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"
+msgstr "以 %d 未知演算法所加密\n"
 
 #: g10/encr-data.c:115
-msgid ""
-"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "警告: 訊息被以對稱式編密法的弱金鑰加密了.\n"
+msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
 
 #: g10/encr-data.c:126
 msgid "problem handling encrypted packet\n"
-msgstr "處理加密的封包有問題\n"
+msgstr "處理已加密封包有問題\n"
 
 #: g10/exec.c:47
 msgid "no remote program execution supported\n"
-msgstr "沒有已支援的遠端程式執行\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
@@ -890,7 +976,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"
 
@@ -903,7 +990,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"
@@ -914,60 +1002,56 @@ msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 `%s': %s\n"
 
 #: g10/export.c:59
-#, fuzzy
 msgid "export signatures that are marked as local-only"
-msgstr "這份簽章會被標記成不可撤銷.\n"
+msgstr "匯出標記為僅限本機使用的簽章"
 
 #: g10/export.c:61
 msgid "export attribute user IDs (generally photo IDs)"
-msgstr ""
+msgstr "匯出署名使用者 ID (通常是照片 ID)"
 
 #: g10/export.c:63
-#, fuzzy
 msgid "export revocation keys marked as \"sensitive\""
-msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
+msgstr "匯出標記為 \"機密\" 的撤銷金鑰"
 
 #: g10/export.c:65
-#, fuzzy
 msgid "remove the passphrase from exported subkeys"
-msgstr "撤銷金鑰或所選的次鑰"
+msgstr "從匯出所得的子鑰中移除密語"
 
 #: g10/export.c:67
-#, fuzzy
 msgid "remove unusable parts from key during export"
-msgstr "從金鑰中清除無法使用的部分"
+msgstr "匯出時從金鑰中移除無法使用的部分"
 
 #: g10/export.c:69
 msgid "remove as much as possible from key during export"
-msgstr ""
+msgstr "匯出時盡可能地從金鑰中移除"
 
 #: g10/export.c:323
 msgid "exporting secret keys not allowed\n"
-msgstr "未被允許匯出私鑰\n"
+msgstr "不允許匯出私鑰\n"
 
 #: g10/export.c:352
 #, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "金鑰 %s: 未被保護 - 已跳過\n"
+msgstr "金鑰 %s: 未受保護 - 已跳過\n"
 
 #: g10/export.c:360
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
+msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳過\n"
 
 #: g10/export.c:371
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: key material on-card - skipped\n"
-msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
+msgstr "金鑰 %s: 金鑰資料在卡片上 - 已跳過\n"
 
 #: g10/export.c:519
 msgid "about to export an unprotected subkey\n"
-msgstr ""
+msgstr "正要匯出未受保護的子鑰\n"
 
 #: g10/export.c:542
-#, fuzzy, c-format
+#, c-format
 msgid "failed to unprotect the subkey: %s\n"
-msgstr "存放金鑰失敗: %s\n"
+msgstr "解除子鑰保護失敗: %s\n"
 
 #  I hope this warning doesn't confuse people.
 #: g10/export.c:563
@@ -989,15 +1073,15 @@ msgstr ""
 
 #: g10/gpg.c:383
 msgid "|[file]|make a signature"
-msgstr "|[檔案]|建立一份簽章"
+msgstr "|[檔案]|建立簽章"
 
 #: g10/gpg.c:384
 msgid "|[file]|make a clear text signature"
-msgstr "|[檔案]|建立一份明文簽章"
+msgstr "|[檔案]|建立明文簽章"
 
 #: g10/gpg.c:385
 msgid "make a detached signature"
-msgstr "建立一份分離式簽章"
+msgstr "建立分離式簽章"
 
 #: g10/gpg.c:386
 msgid "encrypt data"
@@ -1013,7 +1097,7 @@ msgstr "資料解密 (預設)"
 
 #: g10/gpg.c:392
 msgid "verify a signature"
-msgstr "驗證某份簽章"
+msgstr "驗證簽章"
 
 #: g10/gpg.c:394
 msgid "list keys"
@@ -1037,31 +1121,31 @@ msgstr "列出私鑰"
 
 #: g10/gpg.c:400
 msgid "generate a new key pair"
-msgstr "產生一份新的金鑰對"
+msgstr "產生新的金鑰對"
 
 #: g10/gpg.c:401
 msgid "remove keys from the public keyring"
-msgstr "從公鑰鑰匙圈裡移去金鑰"
+msgstr "從公鑰鑰匙圈裡移除金鑰"
 
 #: g10/gpg.c:403
 msgid "remove keys from the secret keyring"
-msgstr "從私鑰鑰匙圈裡移去金鑰"
+msgstr "從私鑰鑰匙圈裡移除金鑰"
 
 #: g10/gpg.c:404
 msgid "sign a key"
-msgstr "簽署某把金鑰"
+msgstr "簽署金鑰"
 
 #: g10/gpg.c:405
 msgid "sign a key locally"
-msgstr "僅在本地簽署某把金鑰"
+msgstr "僅在本機簽署金鑰"
 
 #: g10/gpg.c:406
 msgid "sign or edit a key"
-msgstr "簽署或編輯某把金鑰"
+msgstr "簽署或編輯金鑰"
 
 #: g10/gpg.c:407
 msgid "generate a revocation certificate"
-msgstr "產生一份撤銷憑證"
+msgstr "產生撤銷憑證"
 
 #: g10/gpg.c:409
 msgid "export keys"
@@ -1069,19 +1153,19 @@ msgstr "匯出金鑰"
 
 #: g10/gpg.c:410
 msgid "export keys to a key server"
-msgstr "把金鑰匯出至某個金鑰伺服器上"
+msgstr "把金鑰匯出至金鑰伺服器"
 
 #: g10/gpg.c:411
 msgid "import keys from a key server"
-msgstr "從某個金鑰伺服器上匯入金鑰"
+msgstr "從金鑰伺服器匯入金鑰"
 
 #: g10/gpg.c:413
 msgid "search for keys on a key server"
-msgstr "在某個金鑰伺服器上搜尋金鑰"
+msgstr "在金鑰伺服器上搜尋金鑰"
 
 #: g10/gpg.c:415
 msgid "update all keys from a keyserver"
-msgstr "從某個金鑰伺服器上更新所有的金鑰"
+msgstr "從金鑰伺服器更新所有的金鑰"
 
 #: g10/gpg.c:419
 msgid "import/merge keys"
@@ -1097,7 +1181,7 @@ msgstr "變更卡片上的資料"
 
 #: g10/gpg.c:424
 msgid "change a card's PIN"
-msgstr "變更某張卡片的個人識別碼 (PIN)"
+msgstr "變更卡片的個人識別碼 (PIN)"
 
 #: g10/gpg.c:433
 msgid "update the trust database"
@@ -1107,7 +1191,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"
@@ -1127,7 +1212,7 @@ msgstr "|名字|以「名字」作為加密對象"
 
 #: g10/gpg.c:459
 msgid "use this user-id to sign or decrypt"
-msgstr "使用這個使用者 ID 來簽署或解密"
+msgstr "拿這個使用者 ID 來簽署或解密"
 
 #: g10/gpg.c:460
 msgid "|N|set compress level N (0 disables)"
@@ -1141,7 +1226,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 "囉唆模式"
 
@@ -1189,9 +1275,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> 回報程式瑕疵.\n"
+msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵, 向 <Jedi@Jedi.org> 回報翻譯瑕疵.\n"
 
 #: g10/gpg.c:786
 msgid "Usage: gpg [options] [files] (-h for help)"
@@ -1213,13 +1300,14 @@ msgid ""
 "Supported algorithms:\n"
 msgstr ""
 "\n"
-"已被支援的演算法:\n"
+"已支援的演算法:\n"
 
 #: g10/gpg.c:803
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:809 g10/keyedit.c:2306
+#: g10/gpg.c:809
+#: g10/keyedit.c:2306
 msgid "Cipher: "
 msgstr "編密法: "
 
@@ -1227,7 +1315,8 @@ msgstr "編密法: "
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:821 g10/keyedit.c:2352
+#: g10/gpg.c:821
+#: g10/keyedit.c:2352
 msgid "Compression: "
 msgstr "壓縮: "
 
@@ -1281,8 +1370,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
@@ -1297,8 +1385,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
@@ -1313,56 +1400,52 @@ msgstr "未知的組態項目 `%s'\n"
 
 #: g10/gpg.c:1577
 msgid "display photo IDs during key listings"
-msgstr ""
+msgstr "列出金鑰時顯示照片 ID"
 
 #: g10/gpg.c:1579
 msgid "show policy URLs during signature listings"
-msgstr ""
+msgstr "列出簽章時顯示原則 URL"
 
 #: g10/gpg.c:1581
-#, fuzzy
 msgid "show all notations during signature listings"
-msgstr "在私鑰圈裡沒有一致的簽章\n"
+msgstr "列出簽章時顯示所有的註記"
 
 #: g10/gpg.c:1583
 msgid "show IETF standard notations during signature listings"
-msgstr ""
+msgstr "列出簽章時顯示 IETF 標準註記"
 
 #: g10/gpg.c:1587
 msgid "show user-supplied notations during signature listings"
-msgstr ""
+msgstr "列出簽章時顯示使用者提供的註記"
 
 #: g10/gpg.c:1589
-#, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
-msgstr "給定的偏好金鑰伺服器 URL 無效\n"
+msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 
 #: g10/gpg.c:1591
 msgid "show user ID validity during key listings"
-msgstr ""
+msgstr "列出金鑰時顯示使用者 ID 有效性"
 
 #: g10/gpg.c:1593
 msgid "show revoked and expired user IDs in key listings"
-msgstr ""
+msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 
 #: g10/gpg.c:1595
 msgid "show revoked and expired subkeys in key listings"
-msgstr ""
+msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 
 #: g10/gpg.c:1597
-#, fuzzy
 msgid "show the keyring name in key listings"
-msgstr "在私鑰清單和公鑰清單間切換"
+msgstr "在金鑰清單中顯示鑰匙圈名稱"
 
 #: g10/gpg.c:1599
-#, fuzzy
 msgid "show expiration dates during signature listings"
-msgstr "在私鑰圈裡沒有一致的簽章\n"
+msgstr "列出簽章時顯示有效期限"
 
 #: g10/gpg.c:1996
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
+msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
 
 #: g10/gpg.c:2038
 #, c-format
@@ -1377,9 +1460,11 @@ msgstr "選項檔 `%s': %s\n"
 #: g10/gpg.c:2049
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "從 `%s' 讀取選項\n"
+msgstr "從 `%s' 讀取選項中\n"
 
-#: g10/gpg.c:2265 g10/gpg.c:2933 g10/gpg.c:2952
+#: g10/gpg.c:2265
+#: g10/gpg.c:2933
+#: g10/gpg.c:2952
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
@@ -1387,21 +1472,24 @@ msgstr "請注意: 一般情況下不會用到 %s!\n"
 #: g10/gpg.c:2278
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
+msgstr "編密法延伸模組 `%s' 因為權限不安全而未載入\n"
 
-#: g10/gpg.c:2467 g10/gpg.c:2479
+#: g10/gpg.c:2467
+#: g10/gpg.c:2479
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
-msgstr "`%s' 不是一個有效的簽章使用期限\n"
+msgstr "`%s' 不是個有效的簽章使用期限\n"
 
 #: g10/gpg.c:2556
 #, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "`%s' 不是一個有效的字元集\n"
+msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2580 g10/gpg.c:2769 g10/keyedit.c:4076
+#: g10/gpg.c:2580
+#: g10/gpg.c:2769
+#: g10/keyedit.c:4076
 msgid "could not parse keyserver URL\n"
-msgstr "無法剖析金鑰伺服器 URI\n"
+msgstr "無法剖析金鑰伺服器 URL\n"
 
 #: g10/gpg.c:2592
 #, c-format
@@ -1441,51 +1529,47 @@ msgstr "無效的清單選項\n"
 
 #: g10/gpg.c:2633
 msgid "display photo IDs during signature verification"
-msgstr ""
+msgstr "驗證簽章時顯示照片 ID"
 
 #: g10/gpg.c:2635
 msgid "show policy URLs during signature verification"
-msgstr ""
+msgstr "驗證簽章時顯示原則 URL"
 
 #: g10/gpg.c:2637
-#, fuzzy
 msgid "show all notations during signature verification"
-msgstr "`%s' 不是一個有效的簽章使用期限\n"
+msgstr "驗證簽章時顯示所有的註記"
 
 #: g10/gpg.c:2639
 msgid "show IETF standard notations during signature verification"
-msgstr ""
+msgstr "驗證簽章時顯示 IETF 標準註記"
 
 #: g10/gpg.c:2643
 msgid "show user-supplied notations during signature verification"
-msgstr ""
+msgstr "驗證簽章時顯示使用者提供的註記"
 
 #: g10/gpg.c:2645
-#, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
-msgstr "給定的偏好金鑰伺服器 URL 無效\n"
+msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 
 #: g10/gpg.c:2647
-#, fuzzy
 msgid "show user ID validity during signature verification"
-msgstr "`%s' 不是一個有效的簽章使用期限\n"
+msgstr "驗證簽章時顯示使用者 ID 有效性"
 
 #: g10/gpg.c:2649
 msgid "show revoked and expired user IDs in signature verification"
-msgstr ""
+msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 
 #: g10/gpg.c:2651
-#, fuzzy
 msgid "show only the primary user ID in signature verification"
-msgstr "`%s' 不是一個有效的簽章使用期限\n"
+msgstr "驗證簽章時祇顯示主要的使用者 ID"
 
 #: g10/gpg.c:2653
 msgid "validate signatures with PKA data"
-msgstr ""
+msgstr "以 PKA 資料驗證簽章"
 
 #: g10/gpg.c:2655
 msgid "elevate the trust of signatures with valid PKA data"
-msgstr ""
+msgstr "提高對持有有效 PKA 資料之簽章的信任"
 
 #: g10/gpg.c:2662
 #, c-format
@@ -1502,13 +1586,13 @@ msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
 #: g10/gpg.c:2835
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
-msgstr "%s:%d: 無效的驗證選項\n"
+msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 
 #: g10/gpg.c:2838
 msgid "invalid auto-key-locate list\n"
-msgstr ""
+msgstr "無效的自動金鑰定址清單\n"
 
 #: g10/gpg.c:2922
 msgid "WARNING: program may create a core file!\n"
@@ -1517,12 +1601,12 @@ msgstr "警告: 程式可能會傾印出核心檔!\n"
 #: g10/gpg.c:2926
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr "警告: %s 會使得 %s 失效\n"
+msgstr "警告: %s 會推翻 %s\n"
 
 #: g10/gpg.c:2935
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s 不被允許跟 %s 併用\n"
+msgstr "%s 不允許跟 %s 併用!\n"
 
 #: g10/gpg.c:2938
 #, c-format
@@ -1532,7 +1616,7 @@ msgstr "%s 跟 %s 放在一起沒有意義!\n"
 #: g10/gpg.c:2945
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
-msgstr "注意: %s 在本版中無法使用\n"
+msgstr "請注意: %s 在本版中無法使用\n"
 
 #: g10/gpg.c:2960
 #, c-format
@@ -1555,11 +1639,13 @@ msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3066 g10/gpg.c:3090
+#: g10/gpg.c:3066
+#: g10/gpg.c:3090
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3072 g10/gpg.c:3096
+#: g10/gpg.c:3072
+#: g10/gpg.c:3096
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
@@ -1623,17 +1709,17 @@ msgstr "%s 還沒辦法跟 %s 一起運作\n"
 #: g10/gpg.c:3218
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
+msgstr "妳不該將 `%s' 編密演算法用於 %s 模式中\n"
 
 #: g10/gpg.c:3223
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
+msgstr "妳不該將 `%s' 摘要演算法用於 %s 模式中\n"
 
 #: g10/gpg.c:3228
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
-msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
+msgstr "妳不該將 `%s' 壓縮演算法用於 %s 模式中\n"
 
 #: g10/gpg.c:3330
 #, c-format
@@ -1655,7 +1741,7 @@ msgstr "--symmetric [檔名]"
 #: g10/gpg.c:3361
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "`%s' 的對稱式加密失敗: %s\n"
+msgstr "`%s' 對稱式加密失敗: %s\n"
 
 #: g10/gpg.c:3371
 msgid "--encrypt [filename]"
@@ -1726,27 +1812,27 @@ msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 #: g10/gpg.c:3640
 #, c-format
 msgid "keyserver send failed: %s\n"
-msgstr "送至金鑰伺服器時失敗: %s\n"
+msgstr "送至金鑰伺服器失敗: %s\n"
 
 #: g10/gpg.c:3642
 #, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "從金鑰伺服器接收時失敗: %s\n"
+msgstr "從金鑰伺服器接收失敗: %s\n"
 
 #: g10/gpg.c:3644
 #, c-format
 msgid "key export failed: %s\n"
-msgstr "金鑰匯出時失敗: %s\n"
+msgstr "金鑰匯出失敗: %s\n"
 
 #: g10/gpg.c:3655
 #, c-format
 msgid "keyserver search failed: %s\n"
-msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
+msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
 #: g10/gpg.c:3665
 #, c-format
 msgid "keyserver refresh failed: %s\n"
-msgstr "從金鑰伺服器更新時失敗: %s\n"
+msgstr "從金鑰伺服器更新失敗: %s\n"
 
 #: g10/gpg.c:3716
 #, c-format
@@ -1769,7 +1855,7 @@ msgstr "[檔名]"
 
 #: g10/gpg.c:3938
 msgid "Go ahead and type your message ...\n"
-msgstr "請開始鍵入妳的訊息 ...\n"
+msgstr "請開始輸入妳的訊息 ...\n"
 
 #: g10/gpg.c:4242
 msgid "the given certification policy URL is invalid\n"
@@ -1791,18 +1877,22 @@ 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"
-msgstr ""
+msgstr "已自動取回 `%s' (經由 %s )\n"
 
 #: g10/getkey.c:1829
 #, c-format
 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"
@@ -1810,7 +1900,7 @@ msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 #: g10/getkey.c:2620
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
-msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
+msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 
 #: g10/getkey.c:2667
 #, c-format
@@ -1851,7 +1941,7 @@ msgid ""
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"在這裡指派的數值完全是看妳自己決定; 這些數值永遠不會被匯出給其他人.\n"
+"在這裡指派的數值完全是看妳自己決定; 這些數值永遠不會匯出給其他人.\n"
 "我們需要它來實施信任網絡; 這跟 (自動建立起的) 憑證網絡一點關係也沒有."
 
 #: g10/helptext.c:53
@@ -1863,15 +1953,14 @@ msgid ""
 msgstr ""
 "要建立起信任網絡, GnuPG 需要知道哪些金鑰是被徹底信任的 -\n"
 "那些金鑰通常就是妳有辦法存取到私鑰的. 回答 \"yes\" 來將這些\n"
-"金鑰設成被徹底信任的\n"
+"金鑰設成徹底信任\n"
 
 #: g10/helptext.c:60
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "如果妳無論如何想要使用這把未被信任的金鑰, 請回答 \"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
@@ -1910,10 +1999,15 @@ msgstr ""
 
 #: g10/helptext.c:89
 msgid "Enter the size of the key"
-msgstr "請輸入金鑰的尺寸"
+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\""
 
@@ -1956,7 +2050,7 @@ msgstr ""
 
 #: g10/helptext.c:138
 msgid "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
-msgstr "如果妳覺得產生子鑰可以的話, 就回答 \"yes\" (或者祇要 \"y\")."
+msgstr "如果妳覺得可以產生子鑰的話, 就回答 \"yes\" (或者祇 \"y\" 就好)."
 
 #: g10/helptext.c:146
 msgid ""
@@ -1964,43 +2058,33 @@ 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\"."
 msgstr ""
-"當妳在某把金鑰上簽署某個使用者 ID, 妳首先必須先驗證那把\n"
-"金鑰確實屬於那個使用者 ID 上叫那個名字的人. 這對那些知道\n"
-"妳多小心驗證的人來說很有用.\n"
+"當妳要在金鑰上簽署使用者 ID 時, 妳首先必須先驗證那把金鑰\n"
+"確實屬於那個使用者 ID 上叫那個名字的人. 這對那些知道妳多\n"
+"小心驗證的人來說很有用.\n"
 "\n"
 "\"0\" 表示妳不能提出任何特別的主張來表明\n"
 "    妳多仔細驗證那把金鑰\n"
@@ -2041,7 +2125,7 @@ msgstr ""
 
 #: g10/helptext.c:193
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "如果刪除這把子鑰沒問題的話就回答 \"yes\""
+msgstr "如果可以刪除這把子鑰的話就回答 \"yes\""
 
 #: g10/helptext.c:198
 msgid ""
@@ -2049,9 +2133,9 @@ msgid ""
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
-"這是一份在這把金鑰上有效的簽章; 通常妳不會想要刪除這份簽章,\n"
-"因為要跟別的金鑰建立起信任連結, 或由這把金鑰所簽署的金鑰憑證\n"
-"會是一件相當重要的事."
+"這是一份在這把金鑰上的有效簽章; 通常妳不會想要刪除這份簽章,\n"
+"因為要跟這把金鑰或其他由這把金鑰所驗證的金鑰建立起信任連結\n"
+"時, 會相當重要."
 
 #: g10/helptext.c:203
 msgid ""
@@ -2068,7 +2152,7 @@ msgstr ""
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
-msgstr "這份簽章無效. 把它從妳的鑰匙圈裡移去相當合理."
+msgstr "這份簽章無效. 從妳的鑰匙圈中將它移除相當合理."
 
 #: g10/helptext.c:213
 msgid ""
@@ -2095,11 +2179,11 @@ msgstr ""
 
 #: g10/helptext.c:228
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "請輸入密語; 這是一個秘密的句子 \n"
+msgstr "請輸入密語; 這是個秘密的句子 \n"
 
 #: g10/helptext.c:234
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "請再次輸入最後的密語, 以確定妳到底鍵進了些甚麼."
+msgstr "請再次輸入最後的密語, 以確定妳到底鍵入了些甚麼."
 
 #: g10/helptext.c:238
 msgid "Give the name of the file to which the signature applies"
@@ -2107,15 +2191,15 @@ msgstr "請給定簽章所要套用的檔案名稱"
 
 #: g10/helptext.c:243
 msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "如果覆寫這個檔案沒有問題的話就回答 \"yes\""
+msgstr "如果可以覆寫這個檔案的話就回答 \"yes\""
 
 #: g10/helptext.c:248
 msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
-"請輸入一個新的檔名. 如果妳直接按下了 Enter, 那麼\n"
-"就會使用預設的檔案 (顯示在括號中)."
+"請輸入一個新的檔名. 如果妳直接按下 Enter, 那麼就\n"
+"會使用預設的檔案 (顯示在括號中)."
 
 #: g10/helptext.c:254
 msgid ""
@@ -2135,10 +2219,10 @@ msgstr ""
 "妳應該為這份憑證指定一個原因.\n"
 "根據情境的不同, 妳應該可以從這個清單中選出一項:\n"
 "  \"金鑰已經被洩漏了\"\n"
-"      如果妳相信有某個未經許可的傢伙取得了妳的私鑰的話,\n"
+"      如果妳相信有某個未經許可的傢伙取得了妳的私鑰,\n"
 "      就選這個.\n"
 "  \"金鑰被代換了\"\n"
-"      如果妳把妳的金鑰換成新的了, 就選這個.\n"
+"      如果妳把金鑰換成新的了, 就選這個.\n"
 "  \"金鑰不再被使用了\"\n"
 "      如果妳已經撤回了這把金鑰, 就選這個.\n"
 "  \"使用者 ID 不再有效了\"\n"
@@ -2153,7 +2237,7 @@ msgid ""
 msgstr ""
 "妳也可以輸入一串文字來描述為甚麼發佈這份撤銷憑證的理由.\n"
 "請讓這段文字保持簡明扼要.\n"
-"鍵入空白列以結束這段文字.\n"
+"用空白列來結束這段文字.\n"
 
 #: g10/helptext.c:285
 msgid "No help available"
@@ -2166,34 +2250,31 @@ msgstr "`%s' 沒有可用的說明"
 
 #: g10/import.c:94
 msgid "import signatures that are marked as local-only"
-msgstr ""
+msgstr "匯入標記為僅限本機使用的簽章"
 
 #: g10/import.c:96
 msgid "repair damage from the pks keyserver during import"
-msgstr ""
+msgstr "匯入時修復來自 pks 金鑰伺服器的損壞"
 
 #: g10/import.c:98
-#, fuzzy
 msgid "do not update the trustdb after import"
-msgstr "更新信任資料庫"
+msgstr "匯入後不要更新信任資料庫"
 
 #: g10/import.c:100
-#, fuzzy
 msgid "create a public key when importing a secret key"
-msgstr "公鑰與私鑰並不吻合!\n"
+msgstr "匯入私鑰時亦建立公鑰"
 
 #: g10/import.c:102
 msgid "only accept updates to existing keys"
-msgstr ""
+msgstr "祇接受既有金鑰的更新"
 
 #: g10/import.c:104
-#, fuzzy
 msgid "remove unusable parts from key after import"
-msgstr "從金鑰中清除無法使用的部分"
+msgstr "匯入後從金鑰中移除無法使用的部分"
 
 #: g10/import.c:106
 msgid "remove as much as possible from key after import"
-msgstr ""
+msgstr "匯入後盡可能地從金鑰中移除"
 
 #: g10/import.c:265
 #, c-format
@@ -2203,12 +2284,12 @@ msgstr "正在跳過 %d 型態的區塊\n"
 #: g10/import.c:274
 #, c-format
 msgid "%lu keys processed so far\n"
-msgstr "已有 %lu 把金鑰被處理了\n"
+msgstr "目前已處理 %lu 把金鑰\n"
 
 #: g10/import.c:291
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "總共被處理的數量: %lu\n"
+msgstr "處理總量: %lu\n"
 
 #: g10/import.c:293
 #, c-format
@@ -2253,7 +2334,7 @@ msgstr "          新的金鑰撤銷: %lu\n"
 #: g10/import.c:314
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "          被讀取的私鑰: %lu\n"
+msgstr "          已讀取的私鑰: %lu\n"
 
 #: g10/import.c:316
 #, c-format
@@ -2273,24 +2354,23 @@ msgstr "              未被匯入: %lu\n"
 #: g10/import.c:322
 #, c-format
 msgid "    signatures cleaned: %lu\n"
-msgstr "      已被清除掉的簽章: %lu\n"
+msgstr "      已清除的簽章: %lu\n"
 
 #: g10/import.c:324
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
-msgstr " 已被清除掉的使用者 ID: %lu\n"
+msgstr " 已清除的使用者 ID: %lu\n"
 
 #: g10/import.c:565
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
+msgstr "警告: 金鑰 %s 用於這些使用者 ID 的演算法偏好設定\n"
 
 #. TRANSLATORS: This string is belongs to the previous one.  They are
 #. only split up to allow printing of a common prefix.
 #: g10/import.c:569
-#, fuzzy
 msgid "         algorithms on these user IDs:\n"
-msgstr "這些使用者 ID 上的演算法:\n"
+msgstr "         無法使用:\n"
 
 #: g10/import.c:606
 #, c-format
@@ -2309,18 +2389,19 @@ msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
 #: g10/import.c:643
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
+msgstr "我們強烈建議妳更新偏好設定, 並重新\n"
 
 #: g10/import.c:645
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
-msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
+msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
 #: g10/import.c:669
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr "妳可以像這樣更新妳的偏好設定: 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"
@@ -2333,7 +2414,7 @@ msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 #: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
+msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
 
 #: g10/import.c:769
 #, c-format
@@ -2342,9 +2423,10 @@ msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
 #: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
-msgstr "這可能是由於遺失自我簽章所導致的後果\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"
@@ -2357,35 +2439,44 @@ msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 #: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "找不到可寫的鑰匙圈: %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"
+msgstr "寫入 `%s' 中\n"
 
-#: g10/import.c:805 g10/import.c:900 g10/import.c:1157 g10/import.c:1300
-#: g10/import.c:2375 g10/import.c:2397
+#: g10/import.c:805
+#: g10/import.c:900
+#: g10/import.c:1157
+#: g10/import.c:1300
+#: g10/import.c:2375
+#: g10/import.c:2397
 #, c-format
 msgid "error writing keyring `%s': %s\n"
-msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
+msgstr "寫入鑰匙圈 `%s' 時出錯: %s\n"
 
 #: g10/import.c:824
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
+msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 
 #: g10/import.c:848
 #, c-format
 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"
+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"
@@ -2403,58 +2494,59 @@ msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 #: g10/import.c:916
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
+msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
 
 #: g10/import.c:919
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
+msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
 
 #: g10/import.c:922
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
+msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
 
 #: g10/import.c:925
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
+msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
 
 #: g10/import.c:928
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
+msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
 #: g10/import.c:931
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
+msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
 #: g10/import.c:934
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
+msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
 #: g10/import.c:937
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
-msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
+msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
 #: g10/import.c:960
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
+msgstr "金鑰 %s: \"%s\" 未改變\n"
 
 #: g10/import.c:1123
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
+msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 
 #: g10/import.c:1134
 msgid "importing secret keys not allowed\n"
-msgstr "未被允許匯入私鑰\n"
+msgstr "未允許匯入私鑰\n"
 
-#: g10/import.c:1151 g10/import.c:2390
+#: g10/import.c:1151
+#: g10/import.c:2390
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
@@ -2462,12 +2554,12 @@ msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 #: g10/import.c:1162
 #, c-format
 msgid "key %s: secret key imported\n"
-msgstr "金鑰 %s: 私鑰被匯入了\n"
+msgstr "金鑰 %s: 私鑰已匯入\n"
 
 #: g10/import.c:1192
 #, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
+msgstr "金鑰 %s: 已在私鑰鑰匙圈之中了\n"
 
 #: g10/import.c:1202
 #, c-format
@@ -2487,7 +2579,7 @@ msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 #: g10/import.c:1307
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
+msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
 
 #: g10/import.c:1373
 #, c-format
@@ -2497,22 +2589,23 @@ msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 #: g10/import.c:1388
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
+msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
 
 #: g10/import.c:1390
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
+msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 
 #: g10/import.c:1408
 #, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "金鑰 %s: 沒有子鑰可供附帶\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"
+msgstr "金鑰 %s: 未支援的公鑰演算法\n"
 
 #: g10/import.c:1421
 #, c-format
@@ -2522,7 +2615,7 @@ msgstr "金鑰 %s: 無效的附帶子鑰\n"
 #: g10/import.c:1436
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
+msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
 
 #: g10/import.c:1458
 #, c-format
@@ -2605,7 +2698,7 @@ msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
 #: g10/import.c:2295
 msgid "NOTE: a key's S/N does not match the card's one\n"
-msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
+msgstr "請注意: 金鑰的序號 (S/N) 與卡片上的並不一致\n"
 
 #: g10/import.c:2303
 msgid "NOTE: primary key is online and stored on card\n"
@@ -2613,22 +2706,23 @@ msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
 #: g10/import.c:2305
 msgid "NOTE: secondary key is online and stored on card\n"
-msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
+msgstr "請注意: 子鑰在線上且已存放於卡片上了\n"
 
 #: g10/keydb.c:166
 #, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "建立鑰匙圈 `%s' 時發生錯誤: %s\n"
+msgstr "建立 `%s' 鑰匙圈時出錯: %s\n"
 
 #: g10/keydb.c:173
 #, c-format
 msgid "keyring `%s' created\n"
-msgstr "鑰匙圈 `%s' 已建立\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"
+msgstr "`%s' 金鑰區塊資源: %s\n"
 
 #: g10/keydb.c:696
 #, c-format
@@ -2643,32 +2737,38 @@ 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"
+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"
+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"
+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"
+msgstr "有 %d 份簽章因錯誤而未被檢查\n"
 
 #: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
@@ -2679,22 +2779,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"
@@ -2716,14 +2817,21 @@ msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 #: g10/keyedit.c:598
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "使用者 ID \"%s\" 已經被撤銷了."
+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"
@@ -2731,7 +2839,7 @@ msgstr "  無法簽署.\n"
 #: g10/keyedit.c:626
 #, c-format
 msgid "User ID \"%s\" is expired."
-msgstr "使用者 ID \"%s\" 已經過期了."
+msgstr "使用者 ID \"%s\" 已過期."
 
 #: g10/keyedit.c:654
 #, c-format
@@ -2771,7 +2879,7 @@ msgstr ""
 
 #: g10/keyedit.c:733
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
+msgstr "妳想要發佈一份新的簽章來取代已過期的那個嗎? (y/N) "
 
 #: g10/keyedit.c:754
 #, c-format
@@ -2780,7 +2888,7 @@ msgid ""
 "is a local signature.\n"
 msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
-"是一份本地簽章.\n"
+"是一份本機簽章.\n"
 
 #: g10/keyedit.c:758
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
@@ -2789,7 +2897,7 @@ msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 #: g10/keyedit.c:779
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
+msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
 
 #: g10/keyedit.c:782
 #, c-format
@@ -2819,19 +2927,16 @@ 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
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
+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"
@@ -2906,31 +3011,40 @@ 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"
+msgstr "簽署時失敗: %s\n"
 
 #: g10/keyedit.c:1124
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
-msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\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"
+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"
+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 "主鑰的私鑰部分存放於卡上 (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"
+msgstr "金鑰已保護.\n"
 
 #: g10/keyedit.c:1171
 #, c-format
@@ -2942,12 +3056,13 @@ msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"輸入要給這把私鑰用的新密語.\n"
+"請輸入要給這把私鑰用的新密語.\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 "密語再次輸入時沒有正確重複; 請再試一次"
+msgstr "前後兩次輸入的密語不一致; 請再試一次"
 
 #: g10/keyedit.c:1191
 msgid ""
@@ -2979,11 +3094,11 @@ msgstr "列出金鑰和使用者 ID"
 
 #: g10/keyedit.c:1357
 msgid "select user ID N"
-msgstr "使用者 ID 選了 N"
+msgstr "選擇使用者 ID N"
 
 #: g10/keyedit.c:1358
 msgid "select subkey N"
-msgstr "選擇次鑰 N"
+msgstr "選擇子鑰 N"
 
 #: g10/keyedit.c:1359
 msgid "check signatures"
@@ -2991,11 +3106,11 @@ msgstr "檢查簽章"
 
 #: g10/keyedit.c:1364
 msgid "sign selected user IDs [* see below for related commands]"
-msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
+msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
 
 #: g10/keyedit.c:1369
 msgid "sign selected user IDs locally"
-msgstr "僅在本地簽署所選的使用者 ID"
+msgstr "僅在本機簽署所選的使用者 ID"
 
 #: g10/keyedit.c:1371
 msgid "sign selected user IDs with a trust signature"
@@ -3007,11 +3122,11 @@ msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
 #: g10/keyedit.c:1377
 msgid "add a user ID"
-msgstr "增加一個使用者 ID"
+msgstr "增加使用者 ID"
 
 #: g10/keyedit.c:1379
 msgid "add a photo ID"
-msgstr "增加一個照片 ID"
+msgstr "增加照片 ID"
 
 #: g10/keyedit.c:1381
 msgid "delete selected user IDs"
@@ -3019,27 +3134,27 @@ msgstr "刪除所選的使用者 ID"
 
 #: g10/keyedit.c:1386
 msgid "add a subkey"
-msgstr "增加一把次鑰"
+msgstr "增加子鑰"
 
 #: g10/keyedit.c:1390
 msgid "add a key to a smartcard"
-msgstr "加入某把金鑰至智慧卡"
+msgstr "將金鑰加到智慧卡"
 
 #: g10/keyedit.c:1392
 msgid "move a key to a smartcard"
-msgstr "移動某把金鑰至智慧卡"
+msgstr "將金鑰移動到智慧卡"
 
 #: g10/keyedit.c:1394
 msgid "move a backup key to a smartcard"
-msgstr "移動某把備份金鑰至智慧卡"
+msgstr "將備份金鑰移動到智慧卡"
 
 #: g10/keyedit.c:1398
 msgid "delete selected subkeys"
-msgstr "刪除所選的次鑰"
+msgstr "刪除所選的子鑰"
 
 #: g10/keyedit.c:1400
 msgid "add a revocation key"
-msgstr "增加一把撤銷金鑰"
+msgstr "增加撤銷金鑰"
 
 #: g10/keyedit.c:1402
 msgid "delete signatures from the selected user IDs"
@@ -3047,7 +3162,7 @@ msgstr "從所選的使用者 ID 中刪除簽章"
 
 #: g10/keyedit.c:1404
 msgid "change the expiration date for the key or selected subkeys"
-msgstr "從金鑰或所選的次鑰中變更使用期限"
+msgstr "變更金鑰或所選子鑰的使用期限"
 
 #: g10/keyedit.c:1406
 msgid "flag the selected user ID as primary"
@@ -3070,14 +3185,12 @@ msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
 #: g10/keyedit.c:1420
-#, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
-msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
+msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
 
 #: g10/keyedit.c:1422
-#, fuzzy
 msgid "set a notation for the selected user IDs"
-msgstr "設定所選使用者 ID 的偏好清單"
+msgstr "為所選的使用者 ID 設定註記"
 
 #: g10/keyedit.c:1424
 msgid "change the passphrase"
@@ -3089,7 +3202,7 @@ msgstr "更改主觀信任"
 
 #: g10/keyedit.c:1430
 msgid "revoke signatures on the selected user IDs"
-msgstr "從所選的使用者 ID 上撤銷簽章"
+msgstr "撤銷所選使用者 ID 的簽章"
 
 #: g10/keyedit.c:1432
 msgid "revoke selected user IDs"
@@ -3097,7 +3210,7 @@ msgstr "撤銷所選的使用者 ID"
 
 #: g10/keyedit.c:1437
 msgid "revoke key or selected subkeys"
-msgstr "撤銷金鑰或所選的次鑰"
+msgstr "撤銷金鑰或所選的子鑰"
 
 #: g10/keyedit.c:1438
 msgid "enable key"
@@ -3105,7 +3218,7 @@ msgstr "啟用金鑰"
 
 #: g10/keyedit.c:1439
 msgid "disable key"
-msgstr "禁用金鑰"
+msgstr "停用金鑰"
 
 #: g10/keyedit.c:1440
 msgid "show selected photo IDs"
@@ -3113,11 +3226,11 @@ msgstr "顯示所選的照片 ID"
 
 #: g10/keyedit.c:1442
 msgid "compact unusable user IDs and remove unusable signatures from key"
-msgstr ""
+msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
 
 #: g10/keyedit.c:1444
 msgid "compact unusable user IDs and remove all signatures from key"
-msgstr ""
+msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
 
 #: g10/keyedit.c:1566
 #, c-format
@@ -3138,18 +3251,17 @@ 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 ""
-"* 這個 `sign' 指令也可以在前面加上一個 `l' 字母, 來表示本地簽章 (lsign),\n"
+"* 這個 `sign' 指令也可以在前面加上一個 `l' 字母, 來表示本機簽章 (lsign),\n"
 "  加上 `t' 的話就是信任簽章 (tsign), 加上 `nr' 的話就是不可撤銷簽章\n"
 "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
 #: g10/keyedit.c:1732
 msgid "Key is revoked."
-msgstr "金鑰已經被撤銷了."
+msgstr "金鑰已撤銷."
 
 #: g10/keyedit.c:1751
 msgid "Really sign all user IDs? (y/N) "
@@ -3162,14 +3274,16 @@ msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 #: g10/keyedit.c:1767
 #, c-format
 msgid "Unknown signature type `%s'\n"
-msgstr "未知的簽章種類 `%s'\n"
+msgstr "未知的 `%s' 簽章種類\n"
 
 #: g10/keyedit.c:1790
 #, c-format
 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"
 
@@ -3187,7 +3301,7 @@ msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
 #: g10/keyedit.c:1867
 msgid "Really move the primary key? (y/N) "
-msgstr "真的要移動主要金鑰嗎? (y/N) "
+msgstr "真的要移動主鑰嗎? (y/N) "
 
 #: g10/keyedit.c:1879
 msgid "You must select exactly one key.\n"
@@ -3195,7 +3309,7 @@ msgstr "妳一定祇得選擇一把金鑰.\n"
 
 #: g10/keyedit.c:1907
 msgid "Command expects a filename argument\n"
-msgstr "這項指令應該要拿一個檔名當作參數\n"
+msgstr "這項指令要拿一個檔名來當作參數\n"
 
 #: g10/keyedit.c:1921
 #, c-format
@@ -3205,23 +3319,23 @@ msgstr "無法開啟 `%s': %s\n"
 #: g10/keyedit.c:1938
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
-msgstr "從 `%s' 讀取備份金鑰時發生錯誤: %s\n"
+msgstr "從 `%s' 讀取備份金鑰時出錯: %s\n"
 
 #: g10/keyedit.c:1962
 msgid "You must select at least one key.\n"
-msgstr "妳至少必須選擇一把金鑰.\n"
+msgstr "妳至少得選擇一把金鑰.\n"
 
 #: g10/keyedit.c:1965
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
+msgstr "妳真的想要刪除所選的金鑰嗎? (y/N) "
 
 #: g10/keyedit.c:1966
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
+msgstr "妳真的想要刪除這把金鑰嗎? (y/N) "
 
 #: g10/keyedit.c:2001
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
+msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
 
 #: g10/keyedit.c:2002
 msgid "Really revoke this user ID? (y/N) "
@@ -3233,11 +3347,11 @@ msgstr "妳真的想要撤銷這整把金鑰嗎? (y/N) "
 
 #: g10/keyedit.c:2031
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
-msgstr "妳真的想要撤銷這些被選擇的次鑰嗎? (y/N) "
+msgstr "妳真的想要撤銷所選的子鑰嗎? (y/N) "
 
 #: g10/keyedit.c:2033
 msgid "Do you really want to revoke this subkey? (y/N) "
-msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
+msgstr "妳真的想要撤銷這把子鑰嗎? (y/N) "
 
 #: g10/keyedit.c:2083
 msgid "Owner trust may not be set while using a user provided trust database\n"
@@ -3249,11 +3363,11 @@ msgstr "設定偏好清單至:\n"
 
 #: g10/keyedit.c:2131
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
+msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
 
 #: g10/keyedit.c:2133
 msgid "Really update the preferences? (y/N) "
-msgstr "真的要更新偏好嗎? (y/N) "
+msgstr "真的要更新偏好設定嗎? (y/N) "
 
 #: g10/keyedit.c:2201
 msgid "Save changes? (y/N) "
@@ -3289,65 +3403,81 @@ 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
-#, fuzzy
+#: g10/keyedit.c:2415
+#: g10/keyedit.c:2416
 msgid "Notations: "
-msgstr ""
-"@\n"
-"選項:\n"
-" "
+msgstr "註記: "
 
 #: g10/keyedit.c:2626
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
+msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
 
 #: g10/keyedit.c:2685
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
-msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
+msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
 #: g10/keyedit.c:2706
 #, c-format
 msgid "This key may be revoked by %s key %s"
-msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
+msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 
 #: g10/keyedit.c:2712
 msgid "(sensitive)"
-msgstr "(機密的)"
+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"
+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"
+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"
+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"
+msgstr "到期: %s"
 
 #: g10/keyedit.c:2737
 #, c-format
 msgid "usage: %s"
-msgstr "用法: %s"
+msgstr "用途: %s"
 
 #: g10/keyedit.c:2752
 #, c-format
@@ -3361,9 +3491,10 @@ msgstr "有效性: %s"
 
 #: g10/keyedit.c:2763
 msgid "This key has been disabled"
-msgstr "這把金鑰已經被禁用了"
+msgstr "這把金鑰已經停用了"
 
-#: g10/keyedit.c:2791 g10/keylist.c:198
+#: g10/keyedit.c:2791
+#: g10/keylist.c:198
 msgid "card-no: "
 msgstr "卡片編號: "
 
@@ -3375,13 +3506,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 "已過期"
 
@@ -3390,19 +3529,19 @@ msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
-"警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
-"      會導致不同的使用者 ID 被當成主要 ID.\n"
+"警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
+"      導致不同的使用者 ID 被當成主要 ID.\n"
 
 #: 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) "
 
@@ -3412,67 +3551,67 @@ msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
 #: g10/keyedit.c:3158
 msgid "Delete this good signature? (y/N/q)"
-msgstr "刪除這個完好的簽章嗎? (y/N/q)"
+msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
 #: g10/keyedit.c:3168
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "刪除這個無效的簽章嗎? (y/N/q)"
+msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
 #: g10/keyedit.c:3172
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "刪除這個未知的簽章嗎? (y/N/q)"
+msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
 #: g10/keyedit.c:3178
 msgid "Really delete this self-signature? (y/N)"
-msgstr "真的要刪除這個自我簽章嗎? (y/N)"
+msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 
 #: g10/keyedit.c:3192
 #, c-format
 msgid "Deleted %d signature.\n"
-msgstr "已經刪除了 %d 個簽章.\n"
+msgstr "已經刪除了 %d 份簽章.\n"
 
 #: g10/keyedit.c:3193
 #, c-format
 msgid "Deleted %d signatures.\n"
-msgstr "已經刪除了 %d 個簽章.\n"
+msgstr "已經刪除了 %d 份簽章.\n"
 
 #: g10/keyedit.c:3196
 msgid "Nothing deleted.\n"
-msgstr "沒有東西被刪除.\n"
+msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:3229 g10/trustdb.c:1701
+#: g10/keyedit.c:3229
+#: g10/trustdb.c:1701
 msgid "invalid"
 msgstr "無效"
 
 #: g10/keyedit.c:3231
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\" compacted: %s\n"
-msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
+msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
 #: g10/keyedit.c:3238
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": %d signature removed\n"
-msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
+msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
 #: g10/keyedit.c:3239
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
-msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
+msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
 #: g10/keyedit.c:3247
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": already minimized\n"
-msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
+msgstr "使用者 ID \"%s\": 已經最小化了\n"
 
 #: g10/keyedit.c:3248
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": already clean\n"
-msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
+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"
@@ -3499,15 +3638,14 @@ msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
 #: g10/keyedit.c:3435
 msgid "this key has already been designated as a revoker\n"
-msgstr "這把金鑰已被指定為撤銷者了\n"
+msgstr "已指定這把金鑰為撤銷者了\n"
 
 #: g10/keyedit.c:3454
 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
@@ -3516,11 +3654,11 @@ msgstr "請從私鑰中移除選擇.\n"
 
 #: g10/keyedit.c:3528
 msgid "Please select at most one subkey.\n"
-msgstr "請至多選擇一把次鑰.\n"
+msgstr "請至多選擇一把子鑰.\n"
 
 #: g10/keyedit.c:3532
 msgid "Changing expiration time for a subkey.\n"
-msgstr "正在變更某把次鑰的使用期限.\n"
+msgstr "正在變更子鑰的使用期限.\n"
 
 #: g10/keyedit.c:3535
 msgid "Changing expiration time for the primary key.\n"
@@ -3535,20 +3673,23 @@ msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
 #: g10/keyedit.c:3680
-#, fuzzy, c-format
+#, c-format
 msgid "signing subkey %s is already cross-certified\n"
-msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
+msgstr "簽署子鑰 %s 已經交叉認證過了\n"
 
 #: g10/keyedit.c:3686
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
-msgstr ""
+msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 
 #: g10/keyedit.c:3848
 msgid "Please select exactly one user ID.\n"
-msgstr "請精確地選擇一個使用者 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"
@@ -3566,14 +3707,12 @@ msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
 #: g10/keyedit.c:4201
-#, fuzzy
 msgid "Enter the notation: "
-msgstr "簽章標記: "
+msgstr "請輸入註記: "
 
 #: g10/keyedit.c:4350
-#, fuzzy
 msgid "Proceed? (y/N) "
-msgstr "是否覆寫? (y/N) "
+msgstr "是否繼續? (y/N) "
 
 #: g10/keyedit.c:4414
 #, c-format
@@ -3588,30 +3727,34 @@ msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 #: g10/keyedit.c:4499
 #, c-format
 msgid "No subkey with index %d\n"
-msgstr "索引 %d 沒有對應到次鑰\n"
+msgstr "索引 %d 沒有對應到子鑰\n"
 
 #: g10/keyedit.c:4634
 #, c-format
 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"
+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 " (不可匯出)"
 
 #: g10/keyedit.c:4643
 #, c-format
 msgid "This signature expired on %s.\n"
-msgstr "這份簽署已經在 %s 過期了.\n"
+msgstr "這份簽章已經在 %s 過期了.\n"
 
 #: g10/keyedit.c:4647
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
+msgstr "妳確定仍然想要撤銷它嗎? (y/N) "
 
 #: g10/keyedit.c:4651
 msgid "Create a revocation certificate for this signature? (y/N) "
@@ -3633,7 +3776,7 @@ msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
 #: g10/keyedit.c:4733
 msgid "You are about to revoke these signatures:\n"
-msgstr "妳正在撤銷這些簽章:\n"
+msgstr "妳正要撤銷這些簽章:\n"
 
 #: g10/keyedit.c:4753
 msgid "Really create the revocation certificates? (y/N) "
@@ -3646,22 +3789,22 @@ msgstr "沒有私鑰\n"
 #: g10/keyedit.c:4853
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
+msgstr "使用者 ID \"%s\" 已撤銷\n"
 
 #: g10/keyedit.c:4870
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
+msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
 #: g10/keyedit.c:4934
 #, c-format
 msgid "Key %s is already revoked.\n"
-msgstr "金鑰 %s 已經被撤銷了.\n"
+msgstr "金鑰 %s 已撤銷.\n"
 
 #: g10/keyedit.c:4996
 #, c-format
 msgid "Subkey %s is already revoked.\n"
-msgstr "次鑰 %s 已經被撤銷了.\n"
+msgstr "子鑰 %s 已撤銷.\n"
 
 #: g10/keyedit.c:5091
 #, c-format
@@ -3692,23 +3835,29 @@ msgstr "偏好字串中含有無效的 `%s' 項目\n"
 
 #: g10/keygen.c:874
 msgid "writing direct signature\n"
-msgstr "正在寫入直接簽章\n"
+msgstr "寫入直接簽章中\n"
 
 #: g10/keygen.c:913
 msgid "writing self signature\n"
-msgstr "正在寫入自我簽章\n"
+msgstr "寫入自我簽章中\n"
 
 #: g10/keygen.c:963
 msgid "writing key binding signature\n"
-msgstr "正在寫入附鑰簽章\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"
@@ -3719,7 +3868,7 @@ msgstr "簽署"
 
 #: g10/keygen.c:1332
 msgid "Certify"
-msgstr ""
+msgstr "保證"
 
 #: g10/keygen.c:1335
 msgid "Encrypt"
@@ -3783,32 +3932,32 @@ msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 #: g10/keygen.c:1455
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
-msgstr "   (%d) DSA (僅能簽署用)\n"
+msgstr "   (%d) DSA (僅能用於簽署)\n"
 
 #: g10/keygen.c:1457
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (妳自己設定性能)\n"
+msgstr "   (%d) DSA (妳能自己設定性能)\n"
 
 #: g10/keygen.c:1459
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (僅能加密用)\n"
+msgstr "   (%d) Elgamal (僅能用於加密)\n"
 
 #: g10/keygen.c:1460
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) RSA (僅能簽署用)\n"
+msgstr "   (%d) RSA (僅能用於簽署)\n"
 
 #: g10/keygen.c:1462
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) RSA (僅能加密用)\n"
+msgstr "   (%d) RSA (僅能用於加密)\n"
 
 #: g10/keygen.c:1464
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (妳自己設定性能)\n"
+msgstr "   (%d) RSA (妳能自己設定性能)\n"
 
 #: g10/keygen.c:1533
 #, c-format
@@ -3835,7 +3984,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"
@@ -3851,10 +4001,10 @@ msgid ""
 msgstr ""
 "請指定這把金鑰的有效期限是多久.\n"
 "         0 = 金鑰不會過期\n"
-"      <n>  = 金鑰在 n 天後會過期\n"
-"      <n>w = 金鑰在 n 週後會過期\n"
-"      <n>m = 金鑰在 n 月後會過期\n"
-"      <n>y = 金鑰在 n 年後會過期\n"
+"      <n>  = 金鑰在 n 天後會到期\n"
+"      <n>w = 金鑰在 n 週後會到期\n"
+"      <n>m = 金鑰在 n 月後會到期\n"
+"      <n>y = 金鑰在 n 年後會到期\n"
 
 #: g10/keygen.c:1640
 msgid ""
@@ -3867,10 +4017,10 @@ msgid ""
 msgstr ""
 "請指定這份簽章的有效期限是多久.\n"
 "         0 = 簽章不會過期\n"
-"      <n>  = 簽章在 n 天後會過期\n"
-"      <n>w = 簽章在 n 週後會過期\n"
-"      <n>m = 簽章在 n 月後會過期\n"
-"      <n>y = 簽章在 n 年後會過期\n"
+"      <n>  = 簽章在 n 天後會到期\n"
+"      <n>w = 簽章在 n 週後會到期\n"
+"      <n>m = 簽章在 n 月後會到期\n"
+"      <n>y = 簽章在 n 年後會到期\n"
 
 #: g10/keygen.c:1661
 msgid "Key is valid for? (0) "
@@ -3896,12 +4046,12 @@ msgstr "簽章完全不會過期\n"
 #: g10/keygen.c:1697
 #, c-format
 msgid "Key expires at %s\n"
-msgstr "金鑰將會在 %s 過期\n"
+msgstr "金鑰將會在 %s 到期\n"
 
 #: g10/keygen.c:1698
 #, c-format
 msgid "Signature expires at %s\n"
-msgstr "簽章將會在 %s 過期.\n"
+msgstr "簽章將會在 %s 到期.\n"
 
 #: g10/keygen.c:1704
 msgid ""
@@ -3918,8 +4068,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"
@@ -4017,7 +4166,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"
@@ -4047,77 +4197,86 @@ msgstr ""
 
 #: g10/keygen.c:2733
 msgid "Key generation canceled.\n"
-msgstr "已取消金鑰產生.\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"
+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"
+msgstr "正在寫入私鑰至 `%s'\n"
 
 #: g10/keygen.c:3068
 #, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "找不到可寫的公鑰鑰匙圈: %s\n"
+msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 
 #: g10/keygen.c:3074
 #, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "找不到可寫的私鑰鑰匙圈: %s\n"
+msgstr "找不到可寫入的私鑰鑰匙圈: %s\n"
 
 #: g10/keygen.c:3092
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "寫入公鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
+msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n"
 
 #: g10/keygen.c:3099
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "寫入私鑰鑰匙圈 `%s' 時發生錯誤: %s\n"
+msgstr "寫入私鑰鑰匙圈 `%s' 時出錯: %s\n"
 
 #: g10/keygen.c:3122
 msgid "public and secret key created and signed.\n"
-msgstr "公鑰和私鑰已經被建立及簽署了.\n"
+msgstr "公鑰和私鑰已建立及簽署.\n"
 
 #: g10/keygen.c:3133
 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"
 msgstr ""
-"請注意這把金鑰不能用於加密之用.  也許妳會想藉由 \"--edit-key\" \n"
-"指令來產生加密用的次鑰.\n"
+"請注意這把金鑰不能用於加密.  也許妳會想藉由 \"--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"
-msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\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"
-msgstr "金鑰已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\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) "
 
@@ -4136,7 +4295,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 "永遠不過期"
 
@@ -4154,11 +4316,11 @@ msgstr "執意偏好的金鑰伺服器: "
 
 #: g10/keylist.c:357
 msgid "Critical signature notation: "
-msgstr "關鍵簽章標記: "
+msgstr "關鍵簽章註記: "
 
 #: g10/keylist.c:359
 msgid "Signature notation: "
-msgstr "簽章標記: "
+msgstr "簽章註記: "
 
 #: g10/keylist.c:469
 msgid "Keyring"
@@ -4183,7 +4345,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 "      金鑰指紋 ="
 
@@ -4212,22 +4375,22 @@ msgstr "%s 是新的那一個\n"
 
 #: g10/keyring.c:1254
 msgid "Please fix this possible security flaw\n"
-msgstr "請修補這個可能的安全性裂縫\n"
+msgstr "請修補這個可能的安全漏洞\n"
 
 #: g10/keyring.c:1374
 #, c-format
 msgid "caching keyring `%s'\n"
-msgstr "正在快取鑰匙圈 `%s'\n"
+msgstr "快取鑰匙圈 `%s' 中\n"
 
 #: g10/keyring.c:1420
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "目前檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
+msgstr "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 
 #: g10/keyring.c:1432
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
+msgstr "已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 
 #: g10/keyring.c:1503
 #, c-format
@@ -4236,32 +4399,31 @@ msgstr "%s: 鑰匙圈已建立\n"
 
 #: g10/keyserver.c:67
 msgid "include revoked keys in search results"
-msgstr ""
+msgstr "在搜尋結果中也包含已撤銷的金鑰"
 
 #: g10/keyserver.c:68
 msgid "include subkeys when searching by key ID"
-msgstr ""
+msgstr "以金鑰 ID 搜尋時也搜尋子鑰"
 
 #: g10/keyserver.c:70
 msgid "use temporary files to pass data to keyserver helpers"
-msgstr ""
+msgstr "用暫存檔來將資料遞送給金鑰伺服器協助程式"
 
 #: g10/keyserver.c:72
 msgid "do not delete temporary files after using them"
-msgstr ""
+msgstr "使用暫存檔後不要加以刪除"
 
 #: g10/keyserver.c:76
 msgid "automatically retrieve keys when verifying signatures"
-msgstr ""
+msgstr "驗證簽章時自動取回金鑰"
 
 #: g10/keyserver.c:78
-#, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
-msgstr "請輸入妳的偏好金鑰伺服器 URL: "
+msgstr "尊重金鑰上所設定的偏好金鑰伺服器 URL"
 
 #: g10/keyserver.c:80
 msgid "honor the PKA record set on a key when retrieving keys"
-msgstr ""
+msgstr "取回金鑰時尊重金鑰所設定的 PKA 記錄"
 
 #: g10/keyserver.c:146
 #, c-format
@@ -4270,16 +4432,17 @@ msgstr "警告: 金鑰伺服器選項 `%s' 並未用於此平台\n"
 
 #: g10/keyserver.c:529
 msgid "disabled"
-msgstr "已禁用"
+msgstr "已停用"
 
 #: g10/keyserver.c:730
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr "請輸入數字, N)ext, 或 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"
+msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
 
 #: g10/keyserver.c:912
 #, c-format
@@ -4301,14 +4464,14 @@ msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
 #: g10/keyserver.c:1179
-#, fuzzy, c-format
+#, c-format
 msgid "searching for names from %s server %s\n"
-msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
+msgstr "正在從 %s 伺服器 %s 搜尋名字\n"
 
 #: g10/keyserver.c:1182
-#, fuzzy, c-format
+#, c-format
 msgid "searching for names from %s\n"
-msgstr "正在搜尋 \"%s\" 於 %s\n"
+msgstr "正在從 %s 搜尋名字\n"
 
 #: g10/keyserver.c:1335
 #, c-format
@@ -4330,20 +4493,22 @@ 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"
 
 #: g10/keyserver.c:1440
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
+msgstr "警告: 金鑰伺服器經手程式係來自不同版本的 GnuPG (%s)\n"
 
 #: g10/keyserver.c:1449
 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,17 +4519,17 @@ msgstr "本版並不支援外部金鑰伺服器叫用\n"
 #: g10/keyserver.c:1529
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
+msgstr "沒有 `%s' 金鑰伺服器架構的經手程式\n"
 
 #: g10/keyserver.c:1534
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
-msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
+msgstr "`%s' 動作在 `%s' 金鑰伺服器架構中未支援\n"
 
 #: g10/keyserver.c:1542
 #, c-format
 msgid "%s does not support handler version %d\n"
-msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
+msgstr "%s 並不支援第 %d 版經手程式\n"
 
 #: g10/keyserver.c:1549
 msgid "keyserver timed out\n"
@@ -4372,17 +4537,18 @@ msgstr "金鑰伺服器逾時\n"
 
 #: g10/keyserver.c:1554
 msgid "keyserver internal error\n"
-msgstr "金鑰伺服器內部出錯\n"
+msgstr "金鑰伺服器內部錯誤\n"
 
 #: g10/keyserver.c:1563
 #, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "金鑰伺服器通訊出錯: %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"
+msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
 
 #: g10/keyserver.c:1881
 #, c-format
@@ -4392,22 +4558,22 @@ msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 #: g10/keyserver.c:1903
 #, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "正從 %s 更新 1 份金鑰\n"
+msgstr "更新 1 份金鑰中 (從 %s )\n"
 
 #: g10/keyserver.c:1905
 #, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "正在更新 %d 份金鑰自 %s\n"
+msgstr "更新 %d 份金鑰中 (從 %s )\n"
 
 #: g10/keyserver.c:1961
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
-msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
+msgstr "警告: 無法抓取 URI %s: %s\n"
 
 #: g10/keyserver.c:1967
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to parse URI %s\n"
-msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
+msgstr "警告: 無法剖析 URI %s\n"
 
 #: g10/mainproc.c:243
 #, c-format
@@ -4422,7 +4588,7 @@ msgstr "%s 加密過的階段金鑰\n"
 #: g10/mainproc.c:304
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "密語係以未知的摘要演算法 %d 所產生\n"
+msgstr "密語係以未知的 %d 摘要演算法所產生\n"
 
 #: g10/mainproc.c:385
 #, c-format
@@ -4436,9 +4602,10 @@ msgstr "公鑰加密過的資料: 完好的 DEK\n"
 #: g10/mainproc.c:482
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %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"
@@ -4446,7 +4613,7 @@ msgstr "      \"%s\"\n"
 #: g10/mainproc.c:490
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "已用 %s 金鑰, ID %s 加密了\n"
+msgstr "已用 %s 金鑰, ID %s 所加密\n"
 
 #: g10/mainproc.c:504
 #, c-format
@@ -4462,7 +4629,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"
@@ -4500,25 +4668,23 @@ msgstr "原始的檔名 ='%.*s'\n"
 
 #: g10/mainproc.c:722
 msgid "WARNING: multiple plaintexts seen\n"
-msgstr ""
+msgstr "警告: 看到了多份明文\n"
 
 #: g10/mainproc.c:850
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
 #: g10/mainproc.c:1198
-#, fuzzy
 msgid "no signature found\n"
-msgstr "完好的簽章來自於 \"%s\""
+msgstr "找不到簽章\n"
 
 #: g10/mainproc.c:1441
 msgid "signature verification suppressed\n"
-msgstr "簽章驗證已被抑制\n"
+msgstr "簽章驗證已抑制\n"
 
 #: g10/mainproc.c:1550
-#, fuzzy
 msgid "can't handle this ambiguous signature data\n"
-msgstr "無法處理這些多重簽章\n"
+msgstr "無法處理這個不明確的簽章資料\n"
 
 #: g10/mainproc.c:1561
 #, c-format
@@ -4539,17 +4705,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\""
@@ -4571,7 +4740,7 @@ msgstr "這份簽署已經在 %s 過期了\n"
 #: g10/mainproc.c:1911
 #, c-format
 msgid "Signature expires %s\n"
-msgstr "這份簽署在 %s 過期\n"
+msgstr "這份簽署將在 %s 到期\n"
 
 #: g10/mainproc.c:1914
 #, c-format
@@ -4586,7 +4755,8 @@ msgstr "二進制"
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1916 g10/trustdb.c:529
+#: g10/mainproc.c:1916
+#: g10/trustdb.c:529
 msgid "unknown"
 msgstr "未知"
 
@@ -4595,13 +4765,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
@@ -4622,7 +4793,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"
@@ -4635,36 +4808,36 @@ msgstr "fstat(%d) 失敗於 %s: %s\n"
 #: g10/misc.c:314
 #, c-format
 msgid "WARNING: using experimental public key algorithm %s\n"
-msgstr "警告: 正在使用實驗性的公鑰演算法 %s\n"
+msgstr "警告: 正在使用實驗性的 %s 公鑰演算法\n"
 
 #: g10/misc.c:320
-#, fuzzy
 msgid "WARNING: Elgamal sign+encrypt keys are deprecated\n"
-msgstr "警告: 摘要演算法 %s 已不建議使用\n"
+msgstr "警告: 已不建議使用 Elgamal 簽署暨加密金鑰\n"
 
 #: g10/misc.c:333
 #, c-format
 msgid "WARNING: using experimental cipher algorithm %s\n"
-msgstr "警告: 正在使用實驗性的編密演算法 %s\n"
+msgstr "警告: 正在使用實驗性的 %s 編密演算法\n"
 
 #: g10/misc.c:348
 #, c-format
 msgid "WARNING: using experimental digest algorithm %s\n"
-msgstr "警告: 正在使用實驗性的摘要演算法 %s\n"
+msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
 
 #: g10/misc.c:353
 #, c-format
 msgid "WARNING: digest algorithm %s is deprecated\n"
-msgstr "警告: 摘要演算法 %s 已不建議使用\n"
+msgstr "警告: 已不建議使用 %s 摘要演算法\n"
 
 #: g10/misc.c:459
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:460 g10/sig-check.c:101
-#, fuzzy, c-format
+#: g10/misc.c:460
+#: g10/sig-check.c:101
+#, c-format
 msgid "please see %s for more information\n"
-msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
+msgstr "請參考 %s 上進一步的資訊\n"
 
 #: g10/misc.c:693
 #, c-format
@@ -4674,7 +4847,7 @@ msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 #: g10/misc.c:697
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "警告: \"%s\" 選項已不建議使用\n"
+msgstr "警告: 已不建議使用 \"%s\" 選項\n"
 
 #: g10/misc.c:699
 #, c-format
@@ -4684,15 +4857,15 @@ msgstr "請改以 \"%s%s\" 代替\n"
 #: g10/misc.c:706
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
-msgstr "警告: \"%s\" 是個被反對使用的指令 - 別再用了\n"
+msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
 
 #: g10/misc.c:719
 msgid "Uncompressed"
-msgstr "未被壓縮"
+msgstr "未壓縮"
 
 #: g10/misc.c:744
 msgid "uncompressed|none"
-msgstr "uncompressed|none|未被壓縮|無"
+msgstr "uncompressed|none|未壓縮|無"
 
 #: g10/misc.c:871
 #, c-format
@@ -4702,17 +4875,17 @@ msgstr "這個訊息對 %s 來說無法使用\n"
 #: g10/misc.c:1046
 #, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "不明確的選項 `%s'\n"
+msgstr "不明確的 `%s' 選項\n"
 
 #: g10/misc.c:1071
 #, c-format
 msgid "unknown option `%s'\n"
-msgstr "未知的選項 `%s'\n"
+msgstr "未知的 `%s' 選項\n"
 
 #: g10/openfile.c:88
 #, c-format
 msgid "File `%s' exists. "
-msgstr "檔案 `%s' 存在. "
+msgstr "檔案 `%s' 已存在. "
 
 #: g10/openfile.c:92
 msgid "Overwrite? (y/N) "
@@ -4729,7 +4902,7 @@ msgstr "請輸入新的檔名"
 
 #: g10/openfile.c:192
 msgid "writing to stdout\n"
-msgstr "正在寫入到標準輸出\n"
+msgstr "寫到標準輸出中\n"
 
 #: g10/openfile.c:319
 #, c-format
@@ -4749,16 +4922,16 @@ msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 #: g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
-msgstr "目錄 `%s' 已建立\n"
+msgstr "`%s' 目錄已建立\n"
 
 #: g10/parse-packet.c:142
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "無法操作公開金鑰演算法 %d\n"
+msgstr "無法操作 %d 公開金鑰演算法\n"
 
 #: g10/parse-packet.c:747
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
+msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
 
 #: g10/parse-packet.c:1198
 #, c-format
@@ -4783,11 +4956,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"
+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)"
@@ -4813,13 +4989,15 @@ msgstr "請輸入密語\n"
 
 #: g10/passphrase.c:647
 msgid "cancelled by user\n"
-msgstr "由使用者取消了\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 "請輸入密語: "
 
@@ -4862,7 +5040,7 @@ msgstr ""
 
 #: g10/photoid.c:93
 msgid "Enter JPEG filename for photo ID: "
-msgstr "輸入要當作相片 ID 的 JPEG 檔名: "
+msgstr "輸入要當作照片 ID 的 JPEG 檔名: "
 
 #: g10/photoid.c:114
 #, c-format
@@ -4889,29 +5067,34 @@ msgstr "這張照片正確嗎? (y/N/q) "
 
 #: g10/photoid.c:327
 msgid "no photo viewer set\n"
-msgstr ""
+msgstr "沒有設定照片檢視程式\n"
 
 #: g10/photoid.c:381
 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 不再有效了"
 
@@ -4938,14 +5121,13 @@ 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
 #, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = 我不知道或不想說\n"
+msgstr "  %d = 我不知道或不想說\n"
 
 #: g10/pkclist.c:274
 #, c-format
@@ -4959,11 +5141,11 @@ msgstr "  %d = 我徹底信任\n"
 
 #: g10/pkclist.c:286
 msgid "  m = back to the main menu\n"
-msgstr " m = 回到主選單\n"
+msgstr "  m = 回到主選單\n"
 
 #: g10/pkclist.c:289
 msgid "  s = skip this key\n"
-msgstr " s = 跳過這把金鑰\n"
+msgstr "  s = 跳過這把金鑰\n"
 
 #: g10/pkclist.c:290
 msgid "  q = quit\n"
@@ -4978,7 +5160,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 "妳的決定是甚麼? "
 
@@ -5028,45 +5211,45 @@ msgstr "警告: 正在使用不被信任的金鑰!\n"
 
 #: g10/pkclist.c:510
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
-msgstr "警告: 這把金鑰可能已被撤銷了 (撤銷金鑰未出現)\n"
+msgstr "警告: 這把金鑰可能已撤銷 (撤銷金鑰未出現)\n"
 
 #: g10/pkclist.c:519
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "警告: 這把金鑰已經被它的指定撤銷者給撤銷了!\n"
+msgstr "警告: 這把金鑰已被指定撤銷者所撤銷!\n"
 
 #: g10/pkclist.c:522
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "警告: 這把金鑰已經被它的持有人撤銷了!\n"
+msgstr "警告: 這把金鑰已被其持有人所撤銷!\n"
 
 #: g10/pkclist.c:523
 msgid "         This could mean that the signature is forged.\n"
-msgstr "         這很有可能表示這個簽章是被偽造的.\n"
+msgstr "         這很有可能表示此簽章是偽造的.\n"
 
 #: g10/pkclist.c:529
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "警告: 這把子鑰已經被它的持有人撤銷了!\n"
+msgstr "警告: 這把子鑰已被其持有人所撤銷!\n"
 
 #: g10/pkclist.c:534
 msgid "Note: This key has been disabled.\n"
-msgstr "請注意: 這把金鑰已經被禁用了.\n"
+msgstr "請注意: 這把金鑰已停用.\n"
 
 #: g10/pkclist.c:554
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
-msgstr ""
+msgstr "請注意: 已驗證的簽署者地址為 `%s'\n"
 
 #: g10/pkclist.c:561
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
-msgstr ""
+msgstr "請注意: 簽署者地址 `%s' 與 DNS 項目並不吻合\n"
 
 #: g10/pkclist.c:573
 msgid "trustlevel adjusted to FULL due to valid PKA info\n"
-msgstr ""
+msgstr "信任等級因有效的 PKA 資訊而調整為 *完全*\n"
 
 #: g10/pkclist.c:581
 msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
-msgstr ""
+msgstr "信任等級因不良的 PKA 資訊而調整為 *永遠不會*\n"
 
 #: g10/pkclist.c:592
 msgid "Note: This key has expired!\n"
@@ -5077,8 +5260,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
@@ -5090,27 +5272,30 @@ 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"
+msgstr "%s: 已跳過: 公鑰已存在\n"
 
 #: g10/pkclist.c:886
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "妳沒有指定一個使用者 ID. (妳可能得用 \"-r\")\n"
+msgstr "妳沒有指定使用者 ID. (妳可能得用 \"-r\")\n"
 
 #: g10/pkclist.c:910
 msgid "Current recipients:\n"
@@ -5122,23 +5307,24 @@ msgid ""
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 "\n"
-"輸入使用者 ID. 以空白列結束: "
+"請輸入使用者 ID. 以空白列結束: "
 
 #: g10/pkclist.c:961
 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"
 
 #: g10/pkclist.c:991
 msgid "Public key is disabled.\n"
-msgstr "公鑰被禁用了.\n"
+msgstr "公鑰已停用.\n"
 
 #: g10/pkclist.c:1000
 msgid "skipped: public key already set\n"
-msgstr "已跳過: 公鑰已經被設過了\n"
+msgstr "已跳過: 公鑰已設過\n"
 
 #: g10/pkclist.c:1035
 #, c-format
@@ -5148,7 +5334,7 @@ msgstr "未知的預設收件者 \"%s\"\n"
 #: g10/pkclist.c:1093
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s: 已跳過: 公鑰已經被禁用了\n"
+msgstr "%s: 已跳過: 公鑰已停用\n"
 
 #: g10/pkclist.c:1155
 msgid "no valid addressees\n"
@@ -5156,12 +5342,14 @@ msgstr "沒有有效的地址\n"
 
 #: g10/plaintext.c:95
 msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存它們\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"
+msgstr "建立 `%s' 時出錯: %s\n"
 
 #: g10/plaintext.c:461
 msgid "Detached signature.\n"
@@ -5173,7 +5361,7 @@ msgstr "請輸入資料檔的名稱: "
 
 #: g10/plaintext.c:499
 msgid "reading stdin ...\n"
-msgstr "正在從標準輸入讀取 ...\n"
+msgstr "正在讀取標準輸入中 ...\n"
 
 #: g10/plaintext.c:533
 msgid "no signed data\n"
@@ -5200,12 +5388,12 @@ msgstr "不支援舊式的 DEK 編碼\n"
 #: g10/pubkey-enc.c:242
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "編密演算法 %d%s 未知或已停用了\n"
+msgstr "%d%s 編密演算法未知或已停用\n"
 
 #: g10/pubkey-enc.c:280
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "警告: 收件者偏好設定中找不到編密演算法 %s\n"
+msgstr "警告: 收件者偏好設定中找不到 %s 編密演算法\n"
 
 #: g10/pubkey-enc.c:300
 #, c-format
@@ -5214,10 +5402,14 @@ msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 
 #: g10/pubkey-enc.c:306
 msgid "NOTE: key has been revoked"
-msgstr "請注意: 金鑰已經被撤銷了"
+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"
@@ -5239,11 +5431,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"
@@ -5281,7 +5475,7 @@ msgstr "未知的保護演算法\n"
 
 #: g10/revoke.c:541
 msgid "NOTE: This key is not protected!\n"
-msgstr "注意: 這把金鑰沒有被保護!\n"
+msgstr "請注意: 這把金鑰未受保護!\n"
 
 #: g10/revoke.c:592
 msgid ""
@@ -5339,12 +5533,12 @@ msgstr "私鑰部分無法取用\n"
 #: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "保護演算法 %d%s 未被支援\n"
+msgstr "%d%s 保護演算法未支援\n"
 
 #: g10/seckey-cert.c:70
 #, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "保護摘要 %d 未被支援\n"
+msgstr "%d 保護摘要未支援\n"
 
 #: g10/seckey-cert.c:264
 msgid "Invalid passphrase; please try again"
@@ -5357,7 +5551,7 @@ msgstr "%s ...\n"
 
 #: g10/seckey-cert.c:326
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "警告: 偵測到金鑰薄弱 - 請再更換密語一次.\n"
+msgstr "警告: 偵測到金鑰薄弱 - 請再更換一次密語.\n"
 
 #: g10/seckey-cert.c:364
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
@@ -5365,7 +5559,7 @@ msgstr "正在產生私鑰保護會用到的舊式 16 位元加總檢查\n"
 
 #: g10/seskey.c:51
 msgid "weak key created - retrying\n"
-msgstr "建立了弱金鑰 - 正在重試\n"
+msgstr "建立了弱金鑰 - 重試中\n"
 
 #: g10/seskey.c:56
 #, c-format
@@ -5374,17 +5568,17 @@ msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 
 #: g10/seskey.c:218
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
-msgstr ""
+msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
 
 #: g10/seskey.c:232
 #, c-format
 msgid "DSA key %s uses an unsafe (%u bit) hash\n"
-msgstr ""
+msgstr "DSA 金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
 
 #: g10/seskey.c:244
 #, c-format
 msgid "DSA key %s requires a %u bit or larger hash\n"
-msgstr ""
+msgstr "DSA 金鑰 %s 需要 %u 位元以上的雜湊\n"
 
 #: g10/sig-check.c:74
 msgid "WARNING: signature digest conflict in message\n"
@@ -5393,12 +5587,12 @@ msgstr "警告: 簽章摘要與訊息不一致\n"
 #: g10/sig-check.c:99
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "警告: 正要簽署的子鑰 %s 未經交叉認證\n"
+msgstr "警告: 簽署子鑰 %s 未經交叉認證\n"
 
 #: g10/sig-check.c:111
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr "警告: 正要簽署的子鑰 %s 有無效的交叉憑證\n"
+msgstr "警告: 簽署子鑰 %s 有無效的交叉憑證\n"
 
 #: g10/sig-check.c:179
 #, c-format
@@ -5412,17 +5606,13 @@ 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"
-msgstr ""
-"金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\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"
-msgstr ""
-"金鑰 %s 已經在 %lu 秒後的未來製造出來了 (可能是因為時光旅行或時鐘的問題)\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
 #, c-format
@@ -5447,25 +5637,22 @@ msgstr "金鑰 %s: 沒有子鑰可供附子鑰簽章之用\n"
 #: g10/sign.c:90
 #, c-format
 msgid "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
-msgstr "警告: 標記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
+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
 #, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "檢查已建立的簽章時發生錯誤: %s\n"
+msgstr "檢查已建立的簽章時出錯: %s\n"
 
 #: g10/sign.c:321
 #, c-format
@@ -5478,8 +5665,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
@@ -5495,7 +5681,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"
 
@@ -5504,7 +5691,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"
@@ -5517,7 +5706,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"
@@ -5531,7 +5721,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"
@@ -5562,17 +5755,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"
+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"
@@ -5591,12 +5787,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"
@@ -5635,8 +5834,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"
@@ -5649,7 +5853,7 @@ msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 #: g10/tdbio.c:1172
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "信任資料庫: 本地搜尋失敗: %s\n"
+msgstr "信任資料庫: 本機搜尋失敗: %s\n"
 
 #: g10/tdbio.c:1180
 #, c-format
@@ -5674,26 +5878,26 @@ msgstr "%s: 無效的檔案版本 %d\n"
 #: g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: 讀取自由記錄時錯誤: %s\n"
+msgstr "%s: 讀取可用空間記錄時出錯: %s\n"
 
 #: g10/tdbio.c:1417
 #, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: 寫入目錄記錄時錯誤: %s\n"
+msgstr "%s: 寫入目錄記錄時出錯: %s\n"
 
 #: g10/tdbio.c:1427
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr "%s: 記錄歸零時失敗: %s\n"
+msgstr "%s: 記錄歸零失敗: %s\n"
 
 #: g10/tdbio.c:1457
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s: 附加某筆記錄時失敗: %s\n"
+msgstr "%s: 附加記錄失敗: %s\n"
 
 #: g10/tdbio.c:1502
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "信任資料庫損毀了; 請執行 \"gpg --fix-trustdb\".\n"
+msgstr "信任資料庫已損毀; 請執行 \"gpg --fix-trustdb\".\n"
 
 #: g10/textfilter.c:147
 #, c-format
@@ -5728,7 +5932,7 @@ msgstr "金鑰 %s: 受信任的金鑰沒有公鑰 - 已跳過\n"
 #: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "金鑰 %s 已被標記成徹底信任了\n"
+msgstr "金鑰 %s 已標記成徹底信任了\n"
 
 #: g10/trustdb.c:343
 #, c-format
@@ -5758,7 +5962,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 "[ 已過期 ]"
 
@@ -5806,7 +6011,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"
@@ -5821,7 +6027,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"
@@ -5846,7 +6053,7 @@ msgstr "沒有找到任何徹底信任的金鑰\n"
 #: g10/trustdb.c:2247
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
+msgstr "找不到徹底信任金鑰 %s 的公鑰\n"
 
 #: g10/trustdb.c:2270
 #, c-format
@@ -5855,8 +6062,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
@@ -5870,7 +6076,7 @@ msgid ""
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"簽章無法被驗證.\n"
+"簽章無法驗證.\n"
 "請記住簽章檔 (.sig 或 .asc)\n"
 "應該是第一個命令列給定的檔案.\n"
 
@@ -5953,7 +6159,7 @@ msgstr "用了錯誤的私鑰"
 
 #: util/errors.c:71
 msgid "not supported"
-msgstr "未被支援"
+msgstr "未支援"
 
 #: util/errors.c:72
 msgid "bad key"
@@ -5985,11 +6191,11 @@ msgstr "無效的密語"
 
 #: util/errors.c:79
 msgid "unimplemented pubkey algorithm"
-msgstr "未被採用的公鑰演算法"
+msgstr "尚未實做的公鑰演算法"
 
 #: util/errors.c:80
 msgid "unimplemented cipher algorithm"
-msgstr "未被採用的編密演算法"
+msgstr "尚未實做的編密演算法"
 
 #: util/errors.c:81
 msgid "unknown signature class"
@@ -6017,7 +6223,7 @@ msgstr "損壞的憑證"
 
 #: util/errors.c:87
 msgid "malformed user id"
-msgstr "被變造過的使用者 ID"
+msgstr "變造過的使用者 ID"
 
 #: util/errors.c:88
 msgid "file close error"
@@ -6061,7 +6267,7 @@ msgstr "損壞的 URI"
 
 #: util/errors.c:98
 msgid "unsupported URI"
-msgstr "未被支援的 URI"
+msgstr "未支援的 URI"
 
 #: util/errors.c:99
 msgid "network error"
@@ -6069,11 +6275,11 @@ msgstr "網路錯誤"
 
 #: util/errors.c:101
 msgid "not encrypted"
-msgstr "未被加密"
+msgstr "未加密"
 
 #: util/errors.c:102
 msgid "not processed"
-msgstr "未被處理"
+msgstr "未處理"
 
 #: util/errors.c:104
 msgid "unusable public key"
@@ -6096,9 +6302,8 @@ msgid "no card"
 msgstr "沒有卡片"
 
 #: util/errors.c:109
-#, fuzzy
 msgid "no data"
-msgstr "沒有被簽署過的資料\n"
+msgstr "沒有資料"
 
 #: util/logger.c:156
 msgid "ERROR: "
@@ -6119,20 +6324,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"
 
@@ -6173,7 +6382,7 @@ msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
 #: util/secmem.c:355
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "尚未啟用安全的記憶體前, 不可能進行操作\n"
+msgstr "尚未啟用安全的記憶體時, 不可能進行操作\n"
 
 #: util/secmem.c:356
 msgid "(you may have used the wrong program for this task)\n"
@@ -6181,39 +6390,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"
+