MH dirs are now correctly parsed (Closes: 538128)

[software/mutt-debian.git] / po / zh_TW.po

diff --git a/po/zh_TW.po b/po/zh_TW.po
index d991af150e68eb00cba691a1c7354ec7490442f5..efeae6306e1259da73d39274c2e4bd00f2f98b99 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mutt 1.3.22.1\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: Mutt 1.3.22.1\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-05-17 12:35-0700\n"
+"POT-Creation-Date: 2009-06-14 11:53-0700\n"

 "PO-Revision-Date: 2001-09-06 18:25+0800\n"
 "Last-Translator: Anthony Wong <ypwong@debian.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"
 "PO-Revision-Date: 2001-09-06 18:25+0800\n"
 "Last-Translator: Anthony Wong <ypwong@debian.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"


@@ -14,26 +14,26 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: account.c:164
+#: account.c:161

 #, c-format
 msgid "Username at %s: "
 msgstr "在 %s 的使用者名稱："
 
 #, c-format
 msgid "Username at %s: "
 msgstr "在 %s 的使用者名稱："
 

-#: account.c:223
+#: account.c:220

 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s 的密碼："
 
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s 的密碼："
 

-#: addrbook.c:37 browser.c:45 pager.c:1480 postpone.c:43 query.c:49
-#: recvattach.c:54
+#: addrbook.c:37 browser.c:45 pager.c:1502 postpone.c:41 query.c:48
+#: recvattach.c:53

 msgid "Exit"
 msgstr "離開"
 
 msgid "Exit"
 msgstr "離開"
 

-#: addrbook.c:38 curs_main.c:408 pager.c:1487 postpone.c:44
+#: addrbook.c:38 curs_main.c:406 pager.c:1509 postpone.c:42

 msgid "Del"
 msgstr "刪除"
 
 msgid "Del"
 msgstr "刪除"
 

-#: addrbook.c:39 curs_main.c:409 postpone.c:45
+#: addrbook.c:39 curs_main.c:407 postpone.c:43

 msgid "Undel"
 msgstr "反刪除"
 
 msgid "Undel"
 msgstr "反刪除"
 


@@ -42,9 +42,9 @@ msgid "Select"
 msgstr "選擇"
 
 #. __STRCAT_CHECKED__
 msgstr "選擇"
 
 #. __STRCAT_CHECKED__

-#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3647 curs_main.c:414
-#: mutt_ssl.c:679 mutt_ssl_gnutls.c:783 pager.c:1579 pgpkey.c:522
-#: postpone.c:46 query.c:54 recvattach.c:58 smime.c:437
+#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3829 curs_main.c:412
+#: mutt_ssl.c:895 mutt_ssl_gnutls.c:875 pager.c:1601 pgpkey.c:522
+#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:437

 msgid "Help"
 msgstr "求助"
 
 msgid "Help"
 msgstr "求助"
 


@@ -52,61 +52,61 @@ msgstr "求助"
 msgid "You have no aliases!"
 msgstr "您沒有別名資料！"
 
 msgid "You have no aliases!"
 msgstr "您沒有別名資料！"
 

-#: addrbook.c:156
+#: addrbook.c:155

 msgid "Aliases"
 msgstr "別名"
 
 #. add a new alias
 msgid "Aliases"
 msgstr "別名"
 
 #. add a new alias

-#: alias.c:246
+#: alias.c:260

 msgid "Alias as: "
 msgstr "取別名為："
 
 msgid "Alias as: "
 msgstr "取別名為："
 

-#: alias.c:252
+#: alias.c:266

 msgid "You already have an alias defined with that name!"
 msgstr "您已經為這個名字定義了別名啦！"
 
 msgid "You already have an alias defined with that name!"
 msgstr "您已經為這個名字定義了別名啦！"
 

-#: alias.c:258
+#: alias.c:272

 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr "警告：這個別名可能無效。要修正它？"
 
 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr "警告：這個別名可能無效。要修正它？"
 

-#: alias.c:283
+#: alias.c:297

 msgid "Address: "
 msgstr "地址："
 
 msgid "Address: "
 msgstr "地址："
 

-#: alias.c:293 send.c:207
+#: alias.c:307 send.c:206

 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "錯誤：「%s」是無效的 IDN。"
 
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "錯誤：「%s」是無效的 IDN。"
 

-#: alias.c:305
+#: alias.c:319

 msgid "Personal name: "
 msgstr "個人姓名："
 
 msgid "Personal name: "
 msgstr "個人姓名："
 

-#: alias.c:314
+#: alias.c:328

 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] 接受?"
 
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] 接受?"
 

-#: alias.c:331 recvattach.c:432 recvattach.c:455 recvattach.c:468
-#: recvattach.c:481 recvattach.c:511
+#: alias.c:347 recvattach.c:431 recvattach.c:457 recvattach.c:470
+#: recvattach.c:483 recvattach.c:513

 msgid "Save to file: "
 msgstr "存到檔案："
 
 msgid "Save to file: "
 msgstr "存到檔案："
 

-#: alias.c:345
+#: alias.c:361

 #, fuzzy
 msgid "Error reading alias file"
 msgstr "讀取信件時發生錯誤！"
 
 #, fuzzy
 msgid "Error reading alias file"
 msgstr "讀取信件時發生錯誤！"
 

-#: alias.c:364
+#: alias.c:383

 msgid "Alias added."
 msgstr "別名已經增加。"
 
 msgid "Alias added."
 msgstr "別名已經增加。"
 

-#: alias.c:372
+#: alias.c:391

 #, fuzzy
 msgid "Error seeking in alias file"
 msgstr "無法試著顯示檔案"
 
 #, fuzzy
 msgid "Error seeking in alias file"
 msgstr "無法試著顯示檔案"
 

-#: attach.c:113 attach.c:245 attach.c:477 attach.c:968
+#: attach.c:113 attach.c:245 attach.c:477 attach.c:973

 msgid "Can't match nametemplate, continue?"
 msgstr "無法配合二個同樣名稱，繼續？"
 
 msgid "Can't match nametemplate, continue?"
 msgstr "無法配合二個同樣名稱，繼續？"
 


@@ -116,8 +116,8 @@ msgstr "無法配合二個同樣名稱，繼續？"
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap 編輯項目需要 %%s"
 
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap 編輯項目需要 %%s"
 

-#: attach.c:134 attach.c:266 commands.c:223 compose.c:1183 curs_lib.c:179
-#: curs_lib.c:533
+#: attach.c:134 attach.c:266 commands.c:223 compose.c:1182 curs_lib.c:177
+#: curs_lib.c:544

 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "執行 \"%s\" 時發生錯誤！"
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "執行 \"%s\" 時發生錯誤！"


@@ -163,16 +163,36 @@ msgstr "MIME 形式未被定義. 無法顯示附件內容。"
 msgid "Cannot create filter"
 msgstr "無法建立過濾器"
 
 msgid "Cannot create filter"
 msgstr "無法建立過濾器"
 

-#: attach.c:676 attach.c:708 attach.c:1001 attach.c:1059 handler.c:1279
-#: pgpkey.c:571 pgpkey.c:760
+#: attach.c:554
+#, c-format
+msgid "---Command: %-20.20s Description: %s"
+msgstr ""
+
+#: attach.c:558
+#, c-format
+msgid "---Command: %-30.30s Attachment: %s"
+msgstr ""
+
+#: attach.c:604
+#, fuzzy, c-format
+msgid "---Attachment: %s: %s"
+msgstr "-- 附件"
+
+#: attach.c:607
+#, fuzzy, c-format
+msgid "---Attachment: %s"
+msgstr "-- 附件"
+
+#: attach.c:677 attach.c:709 attach.c:1006 attach.c:1064 handler.c:1285
+#: pgpkey.c:570 pgpkey.c:759

 msgid "Can't create filter"
 msgstr "無法建立過濾器"
 
 msgid "Can't create filter"
 msgstr "無法建立過濾器"
 

-#: attach.c:840
+#: attach.c:845

 msgid "Write fault!"
 msgstr "寫入失敗！"
 
 msgid "Write fault!"
 msgstr "寫入失敗！"
 

-#: attach.c:1082
+#: attach.c:1087

 msgid "I don't know how to print that!"
 msgstr "我不知道要如何列印它！"
 
 msgid "I don't know how to print that!"
 msgstr "我不知道要如何列印它！"
 


@@ -184,102 +204,102 @@ msgstr "改變目錄"
 msgid "Mask"
 msgstr "遮罩"
 
 msgid "Mask"
 msgstr "遮罩"
 

-#: browser.c:383 browser.c:1022
+#: browser.c:383 browser.c:1038

 #, c-format
 msgid "%s is not a directory."
 msgstr "%s 不是一個目錄。"
 
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s 不是一個目錄。"
 

-#: browser.c:507
+#: browser.c:522

 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "信箱 [%d]"
 
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "信箱 [%d]"
 

-#: browser.c:514
+#: browser.c:529

 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "已訂閱 [%s], 檔案遮罩: %s"
 
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "已訂閱 [%s], 檔案遮罩: %s"
 

-#: browser.c:518
+#: browser.c:533

 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "目錄 [%s], 檔案遮罩: %s"
 
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "目錄 [%s], 檔案遮罩: %s"
 

-#: browser.c:530
+#: browser.c:545

 msgid "Can't attach a directory!"
 msgstr "無法附帶目錄！"
 
 msgid "Can't attach a directory!"
 msgstr "無法附帶目錄！"
 

-#: browser.c:670 browser.c:1091 browser.c:1189
+#: browser.c:684 browser.c:1107 browser.c:1205

 msgid "No files match the file mask"
 msgstr "沒有檔案與檔案遮罩相符"
 
 msgid "No files match the file mask"
 msgstr "沒有檔案與檔案遮罩相符"
 

-#: browser.c:876
+#: browser.c:888

 msgid "Create is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
 
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
 

-#: browser.c:897
+#: browser.c:912

 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
 
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
 

-#: browser.c:919
+#: browser.c:935

 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援刪除功能"
 
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援刪除功能"
 

-#: browser.c:929
+#: browser.c:945

 #, fuzzy
 msgid "Cannot delete root folder"
 msgstr "無法建立過濾器"
 
 #, fuzzy
 msgid "Cannot delete root folder"
 msgstr "無法建立過濾器"
 

-#: browser.c:932
+#: browser.c:948

 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "真的要刪除 \"%s\" 郵箱？"
 
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "真的要刪除 \"%s\" 郵箱？"
 

-#: browser.c:946
+#: browser.c:962

 msgid "Mailbox deleted."
 msgstr "郵箱已刪除。"
 
 msgid "Mailbox deleted."
 msgstr "郵箱已刪除。"
 

-#: browser.c:952
+#: browser.c:968

 msgid "Mailbox not deleted."
 msgstr "郵箱未被刪除。"
 
 msgid "Mailbox not deleted."
 msgstr "郵箱未被刪除。"
 

-#: browser.c:971
+#: browser.c:987

 msgid "Chdir to: "
 msgstr "改變目錄到："
 
 msgid "Chdir to: "
 msgstr "改變目錄到："
 

-#: browser.c:1010 browser.c:1084
+#: browser.c:1026 browser.c:1100

 msgid "Error scanning directory."
 msgstr "無法掃描目錄。"
 
 msgid "Error scanning directory."
 msgstr "無法掃描目錄。"
 

-#: browser.c:1034
+#: browser.c:1050

 msgid "File Mask: "
 msgstr "檔案遮罩："
 
 msgid "File Mask: "
 msgstr "檔案遮罩："
 

-#: browser.c:1107
+#: browser.c:1123

 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "反向排序 (1)日期, (2)字元, (3)大小 或 (4)不排序 ? "
 
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "反向排序 (1)日期, (2)字元, (3)大小 或 (4)不排序 ? "
 

-#: browser.c:1108
+#: browser.c:1124

 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "依照 (1)日期 (2)字元 (3)大小 來排序，或(4)不排序 ? "
 
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "依照 (1)日期 (2)字元 (3)大小 來排序，或(4)不排序 ? "
 

-#: browser.c:1109
+#: browser.c:1125

 msgid "dazn"
 msgstr "1234"
 
 msgid "dazn"
 msgstr "1234"
 

-#: browser.c:1176
+#: browser.c:1192

 msgid "New file name: "
 msgstr "新檔名："
 
 msgid "New file name: "
 msgstr "新檔名："
 

-#: browser.c:1207
+#: browser.c:1223

 msgid "Can't view a directory"
 msgstr "無法顯示目錄"
 
 msgid "Can't view a directory"
 msgstr "無法顯示目錄"
 

-#: browser.c:1224
+#: browser.c:1240

 msgid "Error trying to view file"
 msgstr "無法試著顯示檔案"
 
 msgid "Error trying to view file"
 msgstr "無法試著顯示檔案"
 

-#: buffy.c:424
+#: buffy.c:459

 #, fuzzy
 msgid "New mail in "
 msgstr "在 %s 有新信件。"
 #, fuzzy
 msgid "New mail in "
 msgstr "在 %s 有新信件。"


@@ -294,47 +314,47 @@ msgstr "%s：終端機無法顯示色彩"
 msgid "%s: no such color"
 msgstr "%s：沒有這種顏色"
 
 msgid "%s: no such color"
 msgstr "%s：沒有這種顏色"
 

-#: color.c:378 color.c:579 color.c:590
+#: color.c:378 color.c:584 color.c:595

 #, c-format
 msgid "%s: no such object"
 msgstr "%s：沒有這個物件"
 
 #, c-format
 msgid "%s: no such object"
 msgstr "%s：沒有這個物件"
 

-#: color.c:385
-#, c-format
-msgid "%s: command valid only for index object"
+#: color.c:391
+#, fuzzy, c-format
+msgid "%s: command valid only for index, body, header objects"

 msgstr "%s：命令只提供索引物件"
 
 msgstr "%s：命令只提供索引物件"
 

-#: color.c:393
+#: color.c:399

 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s：太少參數"
 
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s：太少參數"
 

-#: color.c:567
+#: color.c:572

 msgid "Missing arguments."
 msgstr "缺少參數。"
 
 msgid "Missing arguments."
 msgstr "缺少參數。"
 

-#: color.c:606 color.c:617
+#: color.c:611 color.c:622

 msgid "color: too few arguments"
 msgstr "色彩：太少引數"
 
 msgid "color: too few arguments"
 msgstr "色彩：太少引數"
 

-#: color.c:640
+#: color.c:645

 msgid "mono: too few arguments"
 msgstr "單色：太少引數"
 
 msgid "mono: too few arguments"
 msgstr "單色：太少引數"
 

-#: color.c:660
+#: color.c:665

 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s：沒有這個屬性"
 
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s：沒有這個屬性"
 

-#: color.c:700 hook.c:69 hook.c:77 keymap.c:751
+#: color.c:705 hook.c:69 hook.c:77 keymap.c:776

 msgid "too few arguments"
 msgstr "太少參數"
 
 msgid "too few arguments"
 msgstr "太少參數"
 

-#: color.c:709 hook.c:83
+#: color.c:714 hook.c:83

 msgid "too many arguments"
 msgstr "太多參數"
 
 msgid "too many arguments"
 msgstr "太多參數"
 

-#: color.c:725
+#: color.c:730

 msgid "default colors not supported"
 msgstr "不支援預設的色彩"
 
 msgid "default colors not supported"
 msgstr "不支援預設的色彩"
 


@@ -343,7 +363,7 @@ msgstr "不支援預設的色彩"
 msgid "Verify PGP signature?"
 msgstr "檢查 PGP 簽名?"
 
 msgid "Verify PGP signature?"
 msgstr "檢查 PGP 簽名?"
 

-#: commands.c:115 mbox.c:754
+#: commands.c:115 mbox.c:772

 msgid "Could not create temporary file!"
 msgstr "無法建立暫存檔！"
 
 msgid "Could not create temporary file!"
 msgstr "無法建立暫存檔！"
 


@@ -385,88 +405,93 @@ msgstr "PGP 簽名無法驗證。"
 msgid "Command: "
 msgstr "指令："
 
 msgid "Command: "
 msgstr "指令："
 

-#: commands.c:250 recvcmd.c:147
+#: commands.c:255
+#, fuzzy
+msgid "Warning: message has no From: header"
+msgstr "跳到這個序列的主信件"
+
+#: commands.c:273 recvcmd.c:171

 msgid "Bounce message to: "
 msgstr "直接傳送郵件到："
 
 msgid "Bounce message to: "
 msgstr "直接傳送郵件到："
 

-#: commands.c:252 recvcmd.c:149
+#: commands.c:275 recvcmd.c:173

 msgid "Bounce tagged messages to: "
 msgstr "無法傳送已標記的郵件至："
 
 msgid "Bounce tagged messages to: "
 msgstr "無法傳送已標記的郵件至："
 

-#: commands.c:267 recvcmd.c:158
+#: commands.c:290 recvcmd.c:182

 msgid "Error parsing address!"
 msgstr "無法分析位址！"
 
 msgid "Error parsing address!"
 msgstr "無法分析位址！"
 

-#: commands.c:275 recvcmd.c:166
+#: commands.c:298 recvcmd.c:190

 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "無效的 IDN：「%s」"
 
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "無效的 IDN：「%s」"
 

-#: commands.c:286 recvcmd.c:180
+#: commands.c:309 recvcmd.c:204

 #, c-format
 msgid "Bounce message to %s"
 msgstr "把郵件直接傳送至 %s"
 
 #, c-format
 msgid "Bounce message to %s"
 msgstr "把郵件直接傳送至 %s"
 

-#: commands.c:286 recvcmd.c:180
+#: commands.c:309 recvcmd.c:204

 #, c-format
 msgid "Bounce messages to %s"
 msgstr "把郵件直接傳送至 %s"
 
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "把郵件直接傳送至 %s"
 

-#: commands.c:302 recvcmd.c:196
+#: commands.c:325 recvcmd.c:220

 #, fuzzy
 msgid "Message not bounced."
 msgstr "郵件已被傳送。"
 
 #, fuzzy
 msgid "Message not bounced."
 msgstr "郵件已被傳送。"
 

-#: commands.c:302 recvcmd.c:196
+#: commands.c:325 recvcmd.c:220

 #, fuzzy
 msgid "Messages not bounced."
 msgstr "郵件已傳送。"
 
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "郵件已傳送。"
 

-#: commands.c:312 recvcmd.c:215
+#: commands.c:335 recvcmd.c:239

 msgid "Message bounced."
 msgstr "郵件已被傳送。"
 
 msgid "Message bounced."
 msgstr "郵件已被傳送。"
 

-#: commands.c:312 recvcmd.c:215
+#: commands.c:335 recvcmd.c:239

 msgid "Messages bounced."
 msgstr "郵件已傳送。"
 
 msgid "Messages bounced."
 msgstr "郵件已傳送。"
 

-#: commands.c:389 commands.c:423 commands.c:440
+#: commands.c:412 commands.c:446 commands.c:463

 msgid "Can't create filter process"
 msgstr "無法啟動過濾程序"
 
 msgid "Can't create filter process"
 msgstr "無法啟動過濾程序"
 

-#: commands.c:469
+#: commands.c:492

 msgid "Pipe to command: "
 msgstr "用管道輸出至命令："
 
 msgid "Pipe to command: "
 msgstr "用管道輸出至命令："
 

-#: commands.c:486
+#: commands.c:509

 msgid "No printing command has been defined."
 msgstr "沒有定義列印指令。"
 
 msgid "No printing command has been defined."
 msgstr "沒有定義列印指令。"
 

-#: commands.c:491
+#: commands.c:514

 msgid "Print message?"
 msgstr "列印信件？"
 
 msgid "Print message?"
 msgstr "列印信件？"
 

-#: commands.c:491
+#: commands.c:514

 msgid "Print tagged messages?"
 msgstr "列印已標記的信件？"
 
 msgid "Print tagged messages?"
 msgstr "列印已標記的信件？"
 

-#: commands.c:500
+#: commands.c:523

 msgid "Message printed"
 msgstr "信件已印出"
 
 msgid "Message printed"
 msgstr "信件已印出"
 

-#: commands.c:500
+#: commands.c:523

 msgid "Messages printed"
 msgstr "信件已印出"
 
 msgid "Messages printed"
 msgstr "信件已印出"
 

-#: commands.c:502
+#: commands.c:525

 msgid "Message could not be printed"
 msgstr "信件未能列印出來"
 
 msgid "Message could not be printed"
 msgstr "信件未能列印出來"
 

-#: commands.c:503
+#: commands.c:526

 msgid "Messages could not be printed"
 msgstr "信件未能列印出來"
 
 msgid "Messages could not be printed"
 msgstr "信件未能列印出來"
 

-#: commands.c:512
+#: commands.c:535

 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 #, fuzzy
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"


@@ -475,7 +500,7 @@ msgstr ""
 "反方向 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排 8)大小 9)分"
 "數:"
 
 "反方向 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排 8)大小 9)分"
 "數:"
 

-#: commands.c:513
+#: commands.c:536

 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 #, fuzzy
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"


@@ -484,74 +509,74 @@ msgstr ""
 "排序 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排序 8)大小 9)分"
 "數:"
 
 "排序 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排序 8)大小 9)分"
 "數:"
 

-#: commands.c:514
+#: commands.c:537

 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "123456789"
 
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "123456789"
 

-#: commands.c:571
+#: commands.c:594

 msgid "Shell command: "
 msgstr "Shell 指令："
 
 msgid "Shell command: "
 msgstr "Shell 指令："
 

-#: commands.c:716
+#: commands.c:737

 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s 到信箱"
 
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s 到信箱"
 

-#: commands.c:717
+#: commands.c:738

 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s 到信箱"
 
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s 到信箱"
 

-#: commands.c:718
+#: commands.c:739

 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s 到信箱"
 
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s 到信箱"
 

-#: commands.c:719
+#: commands.c:740

 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s 到信箱"
 
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s 到信箱"
 

-#: commands.c:720
+#: commands.c:741

 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s 到信箱"
 
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s 到信箱"
 

-#: commands.c:720
+#: commands.c:741

 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s 到信箱"
 
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s 到信箱"
 

-#: commands.c:721
+#: commands.c:742

 msgid " tagged"
 msgstr " 已標記"
 
 msgid " tagged"
 msgstr " 已標記"
 

-#: commands.c:794
+#: commands.c:815

 #, c-format
 msgid "Copying to %s..."
 msgstr "拷貝到 %s…"
 
 #, c-format
 msgid "Copying to %s..."
 msgstr "拷貝到 %s…"
 

-#: commands.c:929
+#: commands.c:931

 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "送出的時候轉換字符集為 %s ？"
 
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "送出的時候轉換字符集為 %s ？"
 

-#: commands.c:939
+#: commands.c:941

 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type 被改為 %s。"
 
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type 被改為 %s。"
 

-#: commands.c:944
+#: commands.c:946

 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "字符集已換為 %s; %s。"
 
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "字符集已換為 %s; %s。"
 

-#: commands.c:946
+#: commands.c:948

 msgid "not converting"
 msgstr "沒有轉換"
 
 msgid "not converting"
 msgstr "沒有轉換"
 

-#: commands.c:946
+#: commands.c:948

 msgid "converting"
 msgstr "轉換中"
 
 msgid "converting"
 msgstr "轉換中"
 


@@ -567,7 +592,7 @@ msgstr "寄出"
 msgid "Abort"
 msgstr "中斷"
 
 msgid "Abort"
 msgstr "中斷"
 

-#: compose.c:94 compose.c:668
+#: compose.c:94 compose.c:667

 msgid "Attach file"
 msgstr "附加檔案"
 
 msgid "Attach file"
 msgstr "附加檔案"
 


@@ -636,245 +661,254 @@ msgstr "警告：「%s」為無效的 IDN。"
 msgid "You may not delete the only attachment."
 msgstr "您不可以刪除唯一的附件。"
 
 msgid "You may not delete the only attachment."
 msgstr "您不可以刪除唯一的附件。"
 

-#: compose.c:601 send.c:1561
+#: compose.c:600 send.c:1591

 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "「%s」中有無效的 IDN：「%s」"
 
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "「%s」中有無效的 IDN：「%s」"
 

-#: compose.c:684
+#: compose.c:683

 msgid "Attaching selected files..."
 msgstr "正在附加選取了的檔案…"
 
 msgid "Attaching selected files..."
 msgstr "正在附加選取了的檔案…"
 

-#: compose.c:696
+#: compose.c:695

 #, c-format
 msgid "Unable to attach %s!"
 msgstr "無法附加 %s！"
 
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "無法附加 %s！"
 

-#: compose.c:715
+#: compose.c:714

 msgid "Open mailbox to attach message from"
 msgstr "開啟信箱並從它選擇附加的信件"
 
 msgid "Open mailbox to attach message from"
 msgstr "開啟信箱並從它選擇附加的信件"
 

-#: compose.c:753
+#: compose.c:752

 msgid "No messages in that folder."
 msgstr "檔案夾中沒有信件。"
 
 msgid "No messages in that folder."
 msgstr "檔案夾中沒有信件。"
 

-#: compose.c:762
+#: compose.c:761

 msgid "Tag the messages you want to attach!"
 msgstr "請標記您要附加的信件！"
 
 msgid "Tag the messages you want to attach!"
 msgstr "請標記您要附加的信件！"
 

-#: compose.c:794
+#: compose.c:793

 msgid "Unable to attach!"
 msgstr "無法附加！"
 
 msgid "Unable to attach!"
 msgstr "無法附加！"
 

-#: compose.c:845
+#: compose.c:844

 msgid "Recoding only affects text attachments."
 msgstr "重新編碼只影響文字附件。"
 
 msgid "Recoding only affects text attachments."
 msgstr "重新編碼只影響文字附件。"
 

-#: compose.c:850
+#: compose.c:849

 msgid "The current attachment won't be converted."
 msgstr "這個附件不會被轉換。"
 
 msgid "The current attachment won't be converted."
 msgstr "這個附件不會被轉換。"
 

-#: compose.c:852
+#: compose.c:851

 msgid "The current attachment will be converted."
 msgstr "這個附件會被轉換。"
 
 msgid "The current attachment will be converted."
 msgstr "這個附件會被轉換。"
 

-#: compose.c:927
+#: compose.c:926

 msgid "Invalid encoding."
 msgstr "無效的編碼。"
 
 msgid "Invalid encoding."
 msgstr "無效的編碼。"
 

-#: compose.c:953
+#: compose.c:952

 msgid "Save a copy of this message?"
 msgstr "儲存這封信件的拷貝嗎？"
 
 msgid "Save a copy of this message?"
 msgstr "儲存這封信件的拷貝嗎？"
 

-#: compose.c:1009
+#: compose.c:1008

 msgid "Rename to: "
 msgstr "更改名稱為："
 
 msgid "Rename to: "
 msgstr "更改名稱為："
 

-#: compose.c:1014 editmsg.c:96 editmsg.c:121 sendlib.c:857
+#: compose.c:1013 editmsg.c:96 editmsg.c:121 sendlib.c:858

 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "無法讀取：%s"
 
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "無法讀取：%s"
 

-#: compose.c:1041
+#: compose.c:1040

 msgid "New file: "
 msgstr "建立新檔："
 
 msgid "New file: "
 msgstr "建立新檔："
 

-#: compose.c:1054
+#: compose.c:1053

 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type 的格式是 base/sub"
 
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type 的格式是 base/sub"
 

-#: compose.c:1060
+#: compose.c:1059

 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "不明的 Content-Type %s"
 
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "不明的 Content-Type %s"
 

-#: compose.c:1073
+#: compose.c:1072

 #, c-format
 msgid "Can't create file %s"
 msgstr "無法建立檔案 %s"
 
 #, c-format
 msgid "Can't create file %s"
 msgstr "無法建立檔案 %s"
 

-#: compose.c:1081
+#: compose.c:1080

 msgid "What we have here is a failure to make an attachment"
 msgstr "我們無法加上附件"
 
 msgid "What we have here is a failure to make an attachment"
 msgstr "我們無法加上附件"
 

-#: compose.c:1142
+#: compose.c:1141

 msgid "Postpone this message?"
 msgstr "延遲寄出這封信件？"
 
 msgid "Postpone this message?"
 msgstr "延遲寄出這封信件？"
 

-#: compose.c:1201
+#: compose.c:1200

 msgid "Write message to mailbox"
 msgstr "將信件寫入到信箱"
 
 msgid "Write message to mailbox"
 msgstr "將信件寫入到信箱"
 

-#: compose.c:1204
+#: compose.c:1203

 #, c-format
 msgid "Writing message to %s ..."
 msgstr "寫入信件到 %s …"
 
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "寫入信件到 %s …"
 

-#: compose.c:1213
+#: compose.c:1212

 msgid "Message written."
 msgstr "信件已寫入。"
 
 msgid "Message written."
 msgstr "信件已寫入。"
 

-#: compose.c:1225
+#: compose.c:1224

 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 

-#: compose.c:1251
+#: compose.c:1250

 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 

-#: crypt-gpgme.c:345
+#: crypt-gpgme.c:358

 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:355
+#: crypt-gpgme.c:368

 #, c-format
 msgid "error enabling CMS protocol: %s\n"
 msgstr ""
 
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:375
+#: crypt-gpgme.c:388

 #, fuzzy, c-format
 msgid "error creating gpgme data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "error creating gpgme data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:441 crypt-gpgme.c:459 crypt-gpgme.c:1400
+#: crypt-gpgme.c:454 crypt-gpgme.c:472 crypt-gpgme.c:1431

 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:477
+#: crypt-gpgme.c:490

 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:499 crypt-gpgme.c:546
+#: crypt-gpgme.c:512 crypt-gpgme.c:559

 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:607
+#: crypt-gpgme.c:620

 #, fuzzy, c-format
 msgid "error adding recipient `%s': %s\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "error adding recipient `%s': %s\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:645
+#: crypt-gpgme.c:658

 #, c-format
 msgid "secret key `%s' not found: %s\n"
 msgstr ""
 
 #, c-format
 msgid "secret key `%s' not found: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:655
+#: crypt-gpgme.c:668

 #, c-format
 msgid "ambiguous specification of secret key `%s'\n"
 msgstr ""
 
 #, c-format
 msgid "ambiguous specification of secret key `%s'\n"
 msgstr ""
 

-#: crypt-gpgme.c:667
+#: crypt-gpgme.c:680

 #, c-format
 msgid "error setting secret key `%s': %s\n"
 msgstr ""
 
 #, c-format
 msgid "error setting secret key `%s': %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:684
+#: crypt-gpgme.c:697

 #, fuzzy, c-format
 msgid "error setting PKA signature notation: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "error setting PKA signature notation: %s\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:740
+#: crypt-gpgme.c:753

 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:850
+#: crypt-gpgme.c:870

 #, fuzzy, c-format
 msgid "error signing data: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:1045
+#: crypt-gpgme.c:1065

 msgid "Warning: One of the keys has been revoked\n"
 msgstr ""
 
 msgid "Warning: One of the keys has been revoked\n"
 msgstr ""
 

-#: crypt-gpgme.c:1054
+#: crypt-gpgme.c:1074

 msgid "Warning: The key used to create the signature expired at: "
 msgstr ""
 
 msgid "Warning: The key used to create the signature expired at: "
 msgstr ""
 

-#: crypt-gpgme.c:1060
+#: crypt-gpgme.c:1080

 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
 msgstr "伺服器的驗証已過期"
 
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
 msgstr "伺服器的驗証已過期"
 

-#: crypt-gpgme.c:1076
+#: crypt-gpgme.c:1096

 msgid "Warning: The signature expired at: "
 msgstr ""
 
 msgid "Warning: The signature expired at: "
 msgstr ""
 

-#: crypt-gpgme.c:1082
+#: crypt-gpgme.c:1102

 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 

-#: crypt-gpgme.c:1087
+#: crypt-gpgme.c:1107

 #, fuzzy
 msgid "The CRL is not available\n"
 msgstr "沒有 SSL 功能"
 
 #, fuzzy
 msgid "The CRL is not available\n"
 msgstr "沒有 SSL 功能"
 

-#: crypt-gpgme.c:1093
+#: crypt-gpgme.c:1113

 msgid "Available CRL is too old\n"
 msgstr ""
 
 msgid "Available CRL is too old\n"
 msgstr ""
 

-#: crypt-gpgme.c:1098
+#: crypt-gpgme.c:1118

 msgid "A policy requirement was not met\n"
 msgstr ""
 
 msgid "A policy requirement was not met\n"
 msgstr ""
 

-#: crypt-gpgme.c:1107
+#: crypt-gpgme.c:1127

 msgid "A system error occurred"
 msgstr ""
 
 msgid "A system error occurred"
 msgstr ""
 

-#: crypt-gpgme.c:1141
+#: crypt-gpgme.c:1161

 msgid "WARNING: PKA entry does not match signer's address: "
 msgstr ""
 
 msgid "WARNING: PKA entry does not match signer's address: "
 msgstr ""
 

-#: crypt-gpgme.c:1148
+#: crypt-gpgme.c:1168

 msgid "PKA verified signer's address is: "
 msgstr ""
 
 msgid "PKA verified signer's address is: "
 msgstr ""
 

-#: crypt-gpgme.c:1165 crypt-gpgme.c:3114
+#: crypt-gpgme.c:1185 crypt-gpgme.c:3296

 #, fuzzy
 msgid "Fingerprint: "
 msgstr "指模：%s"
 
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "指模：%s"
 

-#: crypt-gpgme.c:1225
+#: crypt-gpgme.c:1245

 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr ""
 
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr ""
 

-#: crypt-gpgme.c:1232
+#: crypt-gpgme.c:1252

 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
 msgstr ""
 
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
 msgstr ""
 

-#: crypt-gpgme.c:1236
+#: crypt-gpgme.c:1256

 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
 msgstr ""
 
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
 msgstr ""
 

-#: crypt-gpgme.c:1311
+#: crypt-gpgme.c:1286
+msgid "aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1297
+#, fuzzy
+msgid "created: "
+msgstr "建立 %s？"
+
+#: crypt-gpgme.c:1362

 msgid "Error getting key information: "
 msgstr ""
 
 msgid "Error getting key information: "
 msgstr ""
 


@@ -882,49 +916,44 @@ msgstr ""
 #. signature, so we display what a PGP user expects: The name,
 #. fingerprint and the key validity (which is neither fully or
 #. ultimate).
 #. signature, so we display what a PGP user expects: The name,
 #. fingerprint and the key validity (which is neither fully or
 #. ultimate).

-#: crypt-gpgme.c:1318 crypt-gpgme.c:1351
-msgid "Good signature from: "
+#: crypt-gpgme.c:1369 crypt-gpgme.c:1384
+msgid "Good signature from:"

 msgstr ""
 
 msgstr ""
 

-#: crypt-gpgme.c:1328
-msgid "                aka: "
+#: crypt-gpgme.c:1376
+msgid "*BAD* signature from:"

 msgstr ""
 
 msgstr ""
 

-#: crypt-gpgme.c:1332 crypt-gpgme.c:1354
-msgid "            created: "
+#: crypt-gpgme.c:1392
+msgid "Problem signature from:"

 msgstr ""
 
 msgstr ""
 

-#: crypt-gpgme.c:1341
-msgid "*BAD* signature claimed to be from: "
+#: crypt-gpgme.c:1393
+msgid "               expires: "

 msgstr ""
 
 msgstr ""
 

-#: crypt-gpgme.c:1364
-#, fuzzy
-msgid "Error checking signature"
-msgstr "寄信途中發生錯誤。"
-

 #. Note: We don't need a current time output because GPGME avoids
 #. such an attack by separating the meta information from the
 #. data.
 #. Note: We don't need a current time output because GPGME avoids
 #. such an attack by separating the meta information from the
 #. data.

-#: crypt-gpgme.c:1408 crypt-gpgme.c:1623 crypt-gpgme.c:2108
+#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2287

 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 

-#: crypt-gpgme.c:1417
+#: crypt-gpgme.c:1448

 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "指令行有錯：%s\n"
 
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "指令行有錯：%s\n"
 

-#: crypt-gpgme.c:1466
+#: crypt-gpgme.c:1497

 #, c-format
 msgid "*** Begin Notation (signature by: %s) ***\n"
 msgstr ""
 
 #, c-format
 msgid "*** Begin Notation (signature by: %s) ***\n"
 msgstr ""
 

-#: crypt-gpgme.c:1488
+#: crypt-gpgme.c:1519

 msgid "*** End Notation ***\n"
 msgstr ""
 
 msgid "*** End Notation ***\n"
 msgstr ""
 

-#: crypt-gpgme.c:1496 crypt-gpgme.c:1636 crypt-gpgme.c:2123
+#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2302

 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"


@@ -933,23 +962,28 @@ msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 
 "\n"
 "[-- 簽署的資料結束 --]\n"
 

-#: crypt-gpgme.c:1591
+#: crypt-gpgme.c:1622

 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- 錯誤：突發的檔尾！ --]\n"
 
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- 錯誤：突發的檔尾！ --]\n"
 

-#: crypt-gpgme.c:2083
+#: crypt-gpgme.c:2079
+#, fuzzy, c-format
+msgid "Error extracting key data!\n"
+msgstr "在樣式上有錯誤：%s"
+
+#: crypt-gpgme.c:2262

 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:2131
+#: crypt-gpgme.c:2310

 msgid "Error: copy data failed\n"
 msgstr ""
 
 msgid "Error: copy data failed\n"
 msgstr ""
 

-#: crypt-gpgme.c:2151 pgp.c:428
+#: crypt-gpgme.c:2330 pgp.c:438

 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"


@@ -957,11 +991,11 @@ msgstr ""
 "[-- PGP 信件開始 --]\n"
 "\n"
 
 "[-- PGP 信件開始 --]\n"
 "\n"
 

-#: crypt-gpgme.c:2153 pgp.c:430
+#: crypt-gpgme.c:2332 pgp.c:440

 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共鑰匙區段開始 --]\n"
 
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共鑰匙區段開始 --]\n"
 

-#: crypt-gpgme.c:2156 pgp.c:432
+#: crypt-gpgme.c:2335 pgp.c:442

 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"


@@ -969,25 +1003,25 @@ msgstr ""
 "[-- PGP 簽名的信件開始 --]\n"
 "\n"
 
 "[-- PGP 簽名的信件開始 --]\n"
 "\n"
 

-#: crypt-gpgme.c:2183 pgp.c:458
+#: crypt-gpgme.c:2362 pgp.c:473

 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP 信件結束 --]\n"
 
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP 信件結束 --]\n"
 

-#: crypt-gpgme.c:2185 pgp.c:465
+#: crypt-gpgme.c:2364 pgp.c:480

 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共鑰匙區段結束 --]\n"
 
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共鑰匙區段結束 --]\n"
 

-#: crypt-gpgme.c:2187 pgp.c:467
+#: crypt-gpgme.c:2366 pgp.c:482

 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP 簽名的信件結束 --]\n"
 
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP 簽名的信件結束 --]\n"
 

-#: crypt-gpgme.c:2208 pgp.c:497
+#: crypt-gpgme.c:2390 pgp.c:517

 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"


@@ -995,7 +1029,7 @@ msgstr ""
 "[-- 錯誤：找不到 PGP 信件的開頭！ --]\n"
 "\n"
 
 "[-- 錯誤：找不到 PGP 信件的開頭！ --]\n"
 "\n"
 

-#: crypt-gpgme.c:2239 pgp.c:926
+#: crypt-gpgme.c:2421 pgp.c:949

 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"


@@ -1003,11 +1037,11 @@ msgstr ""
 "[-- 錯誤：不正確的 PGP/MIME 信件！ --]\n"
 "\n"
 
 "[-- 錯誤：不正確的 PGP/MIME 信件！ --]\n"
 "\n"
 

-#: crypt-gpgme.c:2251 crypt-gpgme.c:2317 pgp.c:939
+#: crypt-gpgme.c:2433 crypt-gpgme.c:2499 pgp.c:962

 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- 錯誤：無法建立暫存檔！ --]\n"
 
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- 錯誤：無法建立暫存檔！ --]\n"
 

-#: crypt-gpgme.c:2263
+#: crypt-gpgme.c:2445

 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"


@@ -1016,7 +1050,7 @@ msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 

-#: crypt-gpgme.c:2264 pgp.c:948
+#: crypt-gpgme.c:2446 pgp.c:971

 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"


@@ -1024,21 +1058,21 @@ msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 

-#: crypt-gpgme.c:2286
+#: crypt-gpgme.c:2468

 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 

-#: crypt-gpgme.c:2287 pgp.c:968
+#: crypt-gpgme.c:2469 pgp.c:991

 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 

-#: crypt-gpgme.c:2329
+#: crypt-gpgme.c:2511

 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"


@@ -1047,7 +1081,7 @@ msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 

-#: crypt-gpgme.c:2330
+#: crypt-gpgme.c:2512

 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"


@@ -1056,266 +1090,266 @@ msgstr ""
 "[-- 下面是 S/MIME 加密資料 --]\n"
 "\n"
 
 "[-- 下面是 S/MIME 加密資料 --]\n"
 "\n"
 

-#: crypt-gpgme.c:2360
+#: crypt-gpgme.c:2542

 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 

-#: crypt-gpgme.c:2361
+#: crypt-gpgme.c:2543

 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- S/MIME 加密資料結束 --]\n"
 
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- S/MIME 加密資料結束 --]\n"
 

-#: crypt-gpgme.c:2954
+#: crypt-gpgme.c:3136

 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 

-#: crypt-gpgme.c:2956
+#: crypt-gpgme.c:3138

 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 

-#: crypt-gpgme.c:2961
+#: crypt-gpgme.c:3143

 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 

-#: crypt-gpgme.c:3040
+#: crypt-gpgme.c:3222

 msgid " aka ......: "
 msgstr ""
 
 msgid " aka ......: "
 msgstr ""
 

-#: crypt-gpgme.c:3040
+#: crypt-gpgme.c:3222

 msgid "Name ......: "
 msgstr ""
 
 msgid "Name ......: "
 msgstr ""
 

-#: crypt-gpgme.c:3043 crypt-gpgme.c:3182
+#: crypt-gpgme.c:3225 crypt-gpgme.c:3364

 #, fuzzy
 msgid "[Invalid]"
 msgstr "無效的月份：%s"
 
 #, fuzzy
 msgid "[Invalid]"
 msgstr "無效的月份：%s"
 

-#: crypt-gpgme.c:3063 crypt-gpgme.c:3206
+#: crypt-gpgme.c:3245 crypt-gpgme.c:3388

 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "無效的月份：%s"
 
 #, fuzzy, c-format
 msgid "Valid From : %s\n"
 msgstr "無效的月份：%s"
 

-#: crypt-gpgme.c:3076 crypt-gpgme.c:3219
+#: crypt-gpgme.c:3258 crypt-gpgme.c:3401

 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "無效的月份：%s"
 
 #, fuzzy, c-format
 msgid "Valid To ..: %s\n"
 msgstr "無效的月份：%s"
 

-#: crypt-gpgme.c:3089 crypt-gpgme.c:3232
+#: crypt-gpgme.c:3271 crypt-gpgme.c:3414

 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
 msgstr ""
 

-#: crypt-gpgme.c:3091 crypt-gpgme.c:3234
+#: crypt-gpgme.c:3273 crypt-gpgme.c:3416

 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 
 #, c-format
 msgid "Key Usage .: "
 msgstr ""
 

-#: crypt-gpgme.c:3096 crypt-gpgme.c:3239
+#: crypt-gpgme.c:3278 crypt-gpgme.c:3421

 #, fuzzy
 msgid "encryption"
 msgstr "加密"
 
 #, fuzzy
 msgid "encryption"
 msgstr "加密"
 

-#: crypt-gpgme.c:3097 crypt-gpgme.c:3102 crypt-gpgme.c:3107 crypt-gpgme.c:3240
-#: crypt-gpgme.c:3245 crypt-gpgme.c:3250
+#: crypt-gpgme.c:3279 crypt-gpgme.c:3284 crypt-gpgme.c:3289 crypt-gpgme.c:3422
+#: crypt-gpgme.c:3427 crypt-gpgme.c:3432

 msgid ", "
 msgstr ""
 
 msgid ", "
 msgstr ""
 

-#: crypt-gpgme.c:3101 crypt-gpgme.c:3244
+#: crypt-gpgme.c:3283 crypt-gpgme.c:3426

 msgid "signing"
 msgstr ""
 
 msgid "signing"
 msgstr ""
 

-#: crypt-gpgme.c:3106 crypt-gpgme.c:3249
+#: crypt-gpgme.c:3288 crypt-gpgme.c:3431

 #, fuzzy
 msgid "certification"
 msgstr "驗証已儲存"
 
 #, fuzzy
 msgid "certification"
 msgstr "驗証已儲存"
 

-#: crypt-gpgme.c:3146
+#: crypt-gpgme.c:3328

 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr ""
 

-#: crypt-gpgme.c:3154
+#: crypt-gpgme.c:3336

 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
 #. display only the short keyID
 #, c-format
 msgid "Issued By .: "
 msgstr ""
 
 #. display only the short keyID

-#: crypt-gpgme.c:3173
+#: crypt-gpgme.c:3355

 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "鑰匙 ID：0x%s"
 
 #, fuzzy, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "鑰匙 ID：0x%s"
 

-#: crypt-gpgme.c:3177
+#: crypt-gpgme.c:3359

 msgid "[Revoked]"
 msgstr ""
 
 msgid "[Revoked]"
 msgstr ""
 

-#: crypt-gpgme.c:3187
+#: crypt-gpgme.c:3369

 #, fuzzy
 msgid "[Expired]"
 msgstr "離開  "
 
 #, fuzzy
 msgid "[Expired]"
 msgstr "離開  "
 

-#: crypt-gpgme.c:3192
+#: crypt-gpgme.c:3374

 msgid "[Disabled]"
 msgstr ""
 
 msgid "[Disabled]"
 msgstr ""
 

-#: crypt-gpgme.c:3276 pgpkey.c:560 pgpkey.c:740
+#: crypt-gpgme.c:3458 pgpkey.c:559 pgpkey.c:739

 msgid "Can't create temporary file"
 msgstr "無法建立暫存檔"
 
 msgid "Can't create temporary file"
 msgstr "無法建立暫存檔"
 

-#: crypt-gpgme.c:3279
+#: crypt-gpgme.c:3461

 #, fuzzy
 msgid "Collecting data..."
 msgstr "正連接到 %s…"
 
 #, fuzzy
 msgid "Collecting data..."
 msgstr "正連接到 %s…"
 

-#: crypt-gpgme.c:3305
+#: crypt-gpgme.c:3487

 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "連線到 %s 時失敗"
 
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "連線到 %s 時失敗"
 

-#: crypt-gpgme.c:3315
+#: crypt-gpgme.c:3497

 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 

-#: crypt-gpgme.c:3326 pgpkey.c:581
+#: crypt-gpgme.c:3508 pgpkey.c:580

 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "鑰匙 ID：0x%s"
 
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "鑰匙 ID：0x%s"
 

-#: crypt-gpgme.c:3409
+#: crypt-gpgme.c:3591

 #, fuzzy, c-format
 msgid "gpgme_new failed: %s"
 msgstr "登入失敗： %s"
 
 #, fuzzy, c-format
 msgid "gpgme_new failed: %s"
 msgstr "登入失敗： %s"
 

-#: crypt-gpgme.c:3448 crypt-gpgme.c:3511
+#: crypt-gpgme.c:3630 crypt-gpgme.c:3693

 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 

-#: crypt-gpgme.c:3498 crypt-gpgme.c:3539
+#: crypt-gpgme.c:3680 crypt-gpgme.c:3721

 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 

-#: crypt-gpgme.c:3610
+#: crypt-gpgme.c:3792

 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "所有符合的鑰匙經已過期或取消。"
 
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "所有符合的鑰匙經已過期或取消。"
 

-#: crypt-gpgme.c:3639 mutt_ssl.c:677 mutt_ssl_gnutls.c:781 pgpkey.c:515
+#: crypt-gpgme.c:3821 mutt_ssl.c:893 mutt_ssl_gnutls.c:873 pgpkey.c:515

 #: smime.c:432
 msgid "Exit  "
 msgstr "離開  "
 
 #. __STRCAT_CHECKED__
 #: smime.c:432
 msgid "Exit  "
 msgstr "離開  "
 
 #. __STRCAT_CHECKED__

-#: crypt-gpgme.c:3641 pgpkey.c:517 smime.c:434
+#: crypt-gpgme.c:3823 pgpkey.c:517 smime.c:434

 msgid "Select  "
 msgstr "選擇    "
 
 #. __STRCAT_CHECKED__
 msgid "Select  "
 msgstr "選擇    "
 
 #. __STRCAT_CHECKED__

-#: crypt-gpgme.c:3644 pgpkey.c:520
+#: crypt-gpgme.c:3826 pgpkey.c:520

 msgid "Check key  "
 msgstr "檢查鑰匙   "
 
 msgid "Check key  "
 msgstr "檢查鑰匙   "
 

-#: crypt-gpgme.c:3661
+#: crypt-gpgme.c:3842

 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 

-#: crypt-gpgme.c:3663
+#: crypt-gpgme.c:3844

 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 

-#: crypt-gpgme.c:3665
+#: crypt-gpgme.c:3846

 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME 鑰匙符合 <%s>。"
 
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "S/MIME 鑰匙符合 <%s>。"
 

-#: crypt-gpgme.c:3667
+#: crypt-gpgme.c:3848

 #, fuzzy
 msgid "keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 

-#: crypt-gpgme.c:3670
+#: crypt-gpgme.c:3851

 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s 【%s】\n"
 
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s 【%s】\n"
 

-#: crypt-gpgme.c:3672
+#: crypt-gpgme.c:3853

 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s 【%s】\n"
 
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s 【%s】\n"
 

-#: crypt-gpgme.c:3699 pgpkey.c:601
+#: crypt-gpgme.c:3880 pgpkey.c:600

 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "這個鑰匙不能使用：過期/停用/已取消。"
 
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "這個鑰匙不能使用：過期/停用/已取消。"
 

-#: crypt-gpgme.c:3713 pgpkey.c:613
+#: crypt-gpgme.c:3894 pgpkey.c:612

 #, fuzzy
 msgid "ID is expired/disabled/revoked."
 msgstr "這個 ID 已過期/停用/取消。"
 
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
 msgstr "這個 ID 已過期/停用/取消。"
 

-#: crypt-gpgme.c:3733 pgpkey.c:617
+#: crypt-gpgme.c:3914 pgpkey.c:616

 msgid "ID has undefined validity."
 msgstr ""
 
 msgid "ID has undefined validity."
 msgstr ""
 

-#: crypt-gpgme.c:3736 pgpkey.c:620
+#: crypt-gpgme.c:3917 pgpkey.c:619

 #, fuzzy
 msgid "ID is not valid."
 msgstr "這個 ID 不可接受。"
 
 #, fuzzy
 msgid "ID is not valid."
 msgstr "這個 ID 不可接受。"
 

-#: crypt-gpgme.c:3739 pgpkey.c:623
+#: crypt-gpgme.c:3920 pgpkey.c:622

 #, fuzzy
 msgid "ID is only marginally valid."
 msgstr "此 ID 只是勉強可接受。"
 
 #, fuzzy
 msgid "ID is only marginally valid."
 msgstr "此 ID 只是勉強可接受。"
 

-#: crypt-gpgme.c:3747 pgpkey.c:627
+#: crypt-gpgme.c:3928 pgpkey.c:626

 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s 您真的要使用這個鑰匙？"
 
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s 您真的要使用這個鑰匙？"
 

-#: crypt-gpgme.c:3804 crypt-gpgme.c:3917 pgpkey.c:840 pgpkey.c:956
+#: crypt-gpgme.c:3985 crypt-gpgme.c:4098 pgpkey.c:834 pgpkey.c:939

 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "正找尋匹配 \"%s\" 的鑰匙…"
 
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "正找尋匹配 \"%s\" 的鑰匙…"
 

-#: crypt-gpgme.c:4080 pgp.c:1175
+#: crypt-gpgme.c:4261 pgp.c:1198

 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 

-#: crypt-gpgme.c:4116 pgp.c:1209 smime.c:666 smime.c:791
+#: crypt-gpgme.c:4297 pgp.c:1232 smime.c:664 smime.c:789

 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "請輸入 %s 的鑰匙 ID："
 
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "請輸入 %s 的鑰匙 ID："
 

-#: crypt-gpgme.c:4181
+#: crypt-gpgme.c:4362

 msgid ""
 "\n"
 "Using GPGME backend, although no gpg-agent is running"
 msgstr ""
 
 msgid ""
 "\n"
 "Using GPGME backend, although no gpg-agent is running"
 msgstr ""
 

-#: crypt-gpgme.c:4209
+#: crypt-gpgme.c:4390

 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
 #, fuzzy
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 

-#: crypt-gpgme.c:4210
+#: crypt-gpgme.c:4391

 #, fuzzy
 msgid "esabpfc"
 msgstr "12345"
 
 #, fuzzy
 msgid "esabpfc"
 msgstr "12345"
 

-#: crypt-gpgme.c:4213
+#: crypt-gpgme.c:4394

 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
 #, fuzzy
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 

-#: crypt-gpgme.c:4214
+#: crypt-gpgme.c:4395

 #, fuzzy
 msgid "esabmfc"
 msgstr "12345"
 #, fuzzy
 msgid "esabmfc"
 msgstr "12345"


@@ -1323,62 +1357,62 @@ msgstr "12345"
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s

-#: crypt-gpgme.c:4230 pgp.c:1585 smime.c:2036
+#: crypt-gpgme.c:4411 pgp.c:1608 smime.c:2040 smime.c:2052

 msgid "Sign as: "
 msgstr "簽名的身份是："
 
 msgid "Sign as: "
 msgstr "簽名的身份是："
 

-#: crypt-gpgme.c:4327
+#: crypt-gpgme.c:4508

 msgid "Failed to verify sender"
 msgstr ""
 
 msgid "Failed to verify sender"
 msgstr ""
 

-#: crypt-gpgme.c:4330
+#: crypt-gpgme.c:4511

 #, fuzzy
 msgid "Failed to figure out sender"
 msgstr "開啟檔案來分析檔頭失敗。"
 
 #, fuzzy
 msgid "Failed to figure out sender"
 msgstr "開啟檔案來分析檔頭失敗。"
 

-#: crypt.c:69
+#: crypt.c:68

 #, c-format
 msgid " (current time: %c)"
 msgstr ""
 
 #, c-format
 msgid " (current time: %c)"
 msgstr ""
 

-#: crypt.c:75
+#: crypt.c:74

 #, fuzzy, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr "[-- 以下為 PGP 輸出的資料（現在時間：%c) --]\n"
 
 #, fuzzy, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr "[-- 以下為 PGP 輸出的資料（現在時間：%c) --]\n"
 

-#: crypt.c:90
+#: crypt.c:89

 #, fuzzy
 msgid "Passphrase(s) forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 
 #. they really want to send it inline... go for it
 #, fuzzy
 msgid "Passphrase(s) forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 
 #. they really want to send it inline... go for it

-#: crypt.c:147 cryptglue.c:110 pgpkey.c:564 pgpkey.c:753
+#: crypt.c:146 cryptglue.c:110 pgpkey.c:563 pgpkey.c:752

 msgid "Invoking PGP..."
 msgstr "啟動 PGP…"
 
 #. otherwise inline won't work...ask for revert
 msgid "Invoking PGP..."
 msgstr "啟動 PGP…"
 
 #. otherwise inline won't work...ask for revert

-#: crypt.c:156
+#: crypt.c:155

 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort

-#: crypt.c:158 send.c:1513
+#: crypt.c:157 send.c:1542

 msgid "Mail not sent."
 msgstr "信件沒有寄出。"
 
 msgid "Mail not sent."
 msgstr "信件沒有寄出。"
 

-#: crypt.c:409
+#: crypt.c:408

 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 

-#: crypt.c:628 crypt.c:672
+#: crypt.c:627 crypt.c:671

 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 

-#: crypt.c:652 crypt.c:692
+#: crypt.c:651 crypt.c:691

 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 

-#: crypt.c:814
+#: crypt.c:813

 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"


@@ -1386,7 +1420,7 @@ msgstr ""
 "[-- 錯誤：不一致的 multipart/signed 結構！ --]\n"
 "\n"
 
 "[-- 錯誤：不一致的 multipart/signed 結構！ --]\n"
 "\n"
 

-#: crypt.c:835
+#: crypt.c:834

 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"


@@ -1395,7 +1429,7 @@ msgstr ""
 "[-- 錯誤：不明的 multipart/signed 協定 %s！ --]\n"
 "\n"
 
 "[-- 錯誤：不明的 multipart/signed 協定 %s！ --]\n"
 "\n"
 

-#: crypt.c:874
+#: crypt.c:873

 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"


@@ -1405,7 +1439,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
 "\n"
 
 #. Now display the signed body

-#: crypt.c:886
+#: crypt.c:885

 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"


@@ -1414,7 +1448,7 @@ msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 

-#: crypt.c:892
+#: crypt.c:891

 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"


@@ -1422,7 +1456,7 @@ msgstr ""
 "[-- 警告：找不到任何的簽名。 --]\n"
 "\n"
 
 "[-- 警告：找不到任何的簽名。 --]\n"
 "\n"
 

-#: crypt.c:898
+#: crypt.c:897

 #, fuzzy
 msgid ""
 "\n"
 #, fuzzy
 msgid ""
 "\n"


@@ -1441,295 +1475,295 @@ msgid "Invoking S/MIME..."
 msgstr "啟動 S/MIME…"
 
 # Don't translate this!!
 msgstr "啟動 S/MIME…"
 
 # Don't translate this!!

-#: curs_lib.c:189
+#: curs_lib.c:191

 msgid "yes"
 msgstr ""
 
 # Don't translate this!!
 msgid "yes"
 msgstr ""
 
 # Don't translate this!!

-#: curs_lib.c:190
+#: curs_lib.c:192

 msgid "no"
 msgstr ""
 
 #. restore blocking operation
 msgid "no"
 msgstr ""
 
 #. restore blocking operation

-#: curs_lib.c:286
+#: curs_lib.c:288

 msgid "Exit Mutt?"
 msgstr "離開 Mutt？"
 
 msgid "Exit Mutt?"
 msgstr "離開 Mutt？"
 

-#: curs_lib.c:485 mutt_socket.c:570 mutt_ssl.c:329
+#: curs_lib.c:496 mutt_socket.c:577 mutt_ssl.c:337

 msgid "unknown error"
 msgstr "不明的錯誤"
 
 msgid "unknown error"
 msgstr "不明的錯誤"
 

-#: curs_lib.c:505
+#: curs_lib.c:516

 msgid "Press any key to continue..."
 msgstr "按下任何鍵繼續…"
 
 msgid "Press any key to continue..."
 msgstr "按下任何鍵繼續…"
 

-#: curs_lib.c:549
+#: curs_lib.c:560

 msgid " ('?' for list): "
 msgstr " (用 '?' 顯示列表)："
 
 msgid " ('?' for list): "
 msgstr " (用 '?' 顯示列表)："
 

-#: curs_main.c:54 curs_main.c:625 curs_main.c:655
+#: curs_main.c:52 curs_main.c:617 curs_main.c:647

 msgid "No mailbox is open."
 msgstr "沒有已開啟的信箱。"
 
 msgid "No mailbox is open."
 msgstr "沒有已開啟的信箱。"
 

-#: curs_main.c:55
+#: curs_main.c:53

 msgid "There are no messages."
 msgstr "沒有信件。"
 
 msgid "There are no messages."
 msgstr "沒有信件。"
 

-#: curs_main.c:56 mx.c:1115 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1090 pager.c:51 recvattach.c:43

 msgid "Mailbox is read-only."
 msgstr "信箱是唯讀的。"
 
 msgid "Mailbox is read-only."
 msgstr "信箱是唯讀的。"
 

-#: curs_main.c:57 pager.c:59 recvattach.c:913
+#: curs_main.c:55 pager.c:52 recvattach.c:915

 msgid "Function not permitted in attach-message mode."
 msgstr "功能在 attach-message 模式下不被支援。"
 
 msgid "Function not permitted in attach-message mode."
 msgstr "功能在 attach-message 模式下不被支援。"
 

-#: curs_main.c:58
+#: curs_main.c:56

 msgid "No visible messages."
 msgstr "沒有要被顯示的信件。"
 
 msgid "No visible messages."
 msgstr "沒有要被顯示的信件。"
 

-#: curs_main.c:98 pager.c:89
+#: curs_main.c:96 pager.c:82

 #, c-format
 msgid "Cannot %s: Operation not permitted by ACL"
 msgstr ""
 
 #, c-format
 msgid "Cannot %s: Operation not permitted by ACL"
 msgstr ""
 

-#: curs_main.c:253
+#: curs_main.c:251

 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "無法寫入到一個唯讀的信箱！"
 
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "無法寫入到一個唯讀的信箱！"
 

-#: curs_main.c:260
+#: curs_main.c:258

 msgid "Changes to folder will be written on folder exit."
 msgstr "在離開之後將會把改變寫入資料夾。"
 
 msgid "Changes to folder will be written on folder exit."
 msgstr "在離開之後將會把改變寫入資料夾。"
 

-#: curs_main.c:265
+#: curs_main.c:263

 msgid "Changes to folder will not be written."
 msgstr "將不會把改變寫入資料夾。"
 
 msgid "Changes to folder will not be written."
 msgstr "將不會把改變寫入資料夾。"
 

-#: curs_main.c:407
+#: curs_main.c:405

 msgid "Quit"
 msgstr "離開"
 
 msgid "Quit"
 msgstr "離開"
 

-#: curs_main.c:410 recvattach.c:55
+#: curs_main.c:408 recvattach.c:54

 msgid "Save"
 msgstr "儲存"
 
 msgid "Save"
 msgstr "儲存"
 

-#: curs_main.c:411 query.c:50
+#: curs_main.c:409 query.c:49

 msgid "Mail"
 msgstr "信件"
 
 msgid "Mail"
 msgstr "信件"
 

-#: curs_main.c:412 pager.c:1488
+#: curs_main.c:410 pager.c:1510

 msgid "Reply"
 msgstr "回覆"
 
 msgid "Reply"
 msgstr "回覆"
 

-#: curs_main.c:413
+#: curs_main.c:411

 msgid "Group"
 msgstr "群組"
 
 msgid "Group"
 msgstr "群組"
 

-#: curs_main.c:502
+#: curs_main.c:499

 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "信箱已經由其他途徑改變過。旗標可能有錯誤。"
 
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "信箱已經由其他途徑改變過。旗標可能有錯誤。"
 

-#: curs_main.c:505
+#: curs_main.c:502

 msgid "New mail in this mailbox."
 msgstr "這個信箱中有新信件。"
 
 msgid "New mail in this mailbox."
 msgstr "這個信箱中有新信件。"
 

-#: curs_main.c:509
+#: curs_main.c:506

 msgid "Mailbox was externally modified."
 msgstr "信箱已經由其他途徑更改過。"
 
 msgid "Mailbox was externally modified."
 msgstr "信箱已經由其他途徑更改過。"
 

-#: curs_main.c:631
+#: curs_main.c:623

 msgid "No tagged messages."
 msgstr "沒有標記了的信件。"
 
 msgid "No tagged messages."
 msgstr "沒有標記了的信件。"
 

-#: curs_main.c:667 menu.c:906
+#: curs_main.c:659 menu.c:915

 #, fuzzy
 msgid "Nothing to do."
 msgstr "正連接到 %s…"
 
 #, fuzzy
 msgid "Nothing to do."
 msgstr "正連接到 %s…"
 

-#: curs_main.c:753
+#: curs_main.c:749

 msgid "Jump to message: "
 msgstr "跳到信件："
 
 msgid "Jump to message: "
 msgstr "跳到信件："
 

-#: curs_main.c:759
+#: curs_main.c:755

 msgid "Argument must be a message number."
 msgstr "需要一個信件編號的參數。"
 
 msgid "Argument must be a message number."
 msgstr "需要一個信件編號的參數。"
 

-#: curs_main.c:792
+#: curs_main.c:787

 msgid "That message is not visible."
 msgstr "這封信件無法顯示。"
 
 msgid "That message is not visible."
 msgstr "這封信件無法顯示。"
 

-#: curs_main.c:795
+#: curs_main.c:790

 msgid "Invalid message number."
 msgstr "無效的信件編號。"
 
 msgid "Invalid message number."
 msgstr "無效的信件編號。"
 

-#: curs_main.c:808 curs_main.c:1849 pager.c:2279
+#: curs_main.c:803 curs_main.c:1852 pager.c:2346

 #, fuzzy
 msgid "delete message(s)"
 msgstr "沒有要反刪除的信件。"
 
 #, fuzzy
 msgid "delete message(s)"
 msgstr "沒有要反刪除的信件。"
 

-#: curs_main.c:811
+#: curs_main.c:806

 msgid "Delete messages matching: "
 msgstr "刪除符合這樣式的信件："
 
 msgid "Delete messages matching: "
 msgstr "刪除符合這樣式的信件："
 

-#: curs_main.c:833
+#: curs_main.c:828

 msgid "No limit pattern is in effect."
 msgstr "目前未有指定限制樣式。"
 
 #. i18n: ask for a limit to apply
 msgid "No limit pattern is in effect."
 msgstr "目前未有指定限制樣式。"
 
 #. i18n: ask for a limit to apply

-#: curs_main.c:838
+#: curs_main.c:833

 #, c-format
 msgid "Limit: %s"
 msgstr "限制: %s"
 
 #, c-format
 msgid "Limit: %s"
 msgstr "限制: %s"
 

-#: curs_main.c:848
+#: curs_main.c:843

 msgid "Limit to messages matching: "
 msgstr "限制只符合這樣式的信件："
 
 msgid "Limit to messages matching: "
 msgstr "限制只符合這樣式的信件："
 

-#: curs_main.c:870
+#: curs_main.c:865

 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 
 msgid "To view all messages, limit to \"all\"."
 msgstr ""
 

-#: curs_main.c:882
+#: curs_main.c:877

 msgid "Quit Mutt?"
 msgstr "離開 Mutt？"
 
 msgid "Quit Mutt?"
 msgstr "離開 Mutt？"
 

-#: curs_main.c:967
+#: curs_main.c:962

 msgid "Tag messages matching: "
 msgstr "標記信件的條件："
 
 msgid "Tag messages matching: "
 msgstr "標記信件的條件："
 

-#: curs_main.c:976 curs_main.c:2138 pager.c:2589
+#: curs_main.c:971 curs_main.c:2141 pager.c:2656

 #, fuzzy
 msgid "undelete message(s)"
 msgstr "沒有要反刪除的信件。"
 
 #, fuzzy
 msgid "undelete message(s)"
 msgstr "沒有要反刪除的信件。"
 

-#: curs_main.c:978
+#: curs_main.c:973

 msgid "Undelete messages matching: "
 msgstr "反刪除信件的條件："
 
 msgid "Undelete messages matching: "
 msgstr "反刪除信件的條件："
 

-#: curs_main.c:986
+#: curs_main.c:981

 msgid "Untag messages matching: "
 msgstr "反標記信件的條件："
 
 msgid "Untag messages matching: "
 msgstr "反標記信件的條件："
 

-#: curs_main.c:1066
+#: curs_main.c:1069

 msgid "Open mailbox in read-only mode"
 msgstr "用唯讀模式開啟信箱"
 
 msgid "Open mailbox in read-only mode"
 msgstr "用唯讀模式開啟信箱"
 

-#: curs_main.c:1068
+#: curs_main.c:1071

 msgid "Open mailbox"
 msgstr "開啟信箱"
 
 msgid "Open mailbox"
 msgstr "開啟信箱"
 

-#: curs_main.c:1078
+#: curs_main.c:1081

 #, fuzzy
 msgid "No mailboxes have new mail"
 msgstr "沒有信箱有新信件。"
 
 #, fuzzy
 msgid "No mailboxes have new mail"
 msgstr "沒有信箱有新信件。"
 

-#: curs_main.c:1106 mx.c:503 mx.c:652
+#: curs_main.c:1109 mx.c:473 mx.c:622

 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s 不是信箱。"
 
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s 不是信箱。"
 

-#: curs_main.c:1201
+#: curs_main.c:1204

 msgid "Exit Mutt without saving?"
 msgstr "不儲存便離開 Mutt 嗎？"
 
 msgid "Exit Mutt without saving?"
 msgstr "不儲存便離開 Mutt 嗎？"
 

-#: curs_main.c:1219 curs_main.c:1252 curs_main.c:1696 curs_main.c:1728
-#: flags.c:286 thread.c:1026 thread.c:1081 thread.c:1136
+#: curs_main.c:1222 curs_main.c:1255 curs_main.c:1699 curs_main.c:1731
+#: flags.c:282 thread.c:1026 thread.c:1081 thread.c:1136

 msgid "Threading is not enabled."
 msgstr "序列功能尚未啟動。"
 
 msgid "Threading is not enabled."
 msgstr "序列功能尚未啟動。"
 

-#: curs_main.c:1231
+#: curs_main.c:1234

 msgid "Thread broken"
 msgstr ""
 
 msgid "Thread broken"
 msgstr ""
 

-#: curs_main.c:1249
+#: curs_main.c:1252

 msgid "link threads"
 msgstr ""
 
 msgid "link threads"
 msgstr ""
 

-#: curs_main.c:1254
+#: curs_main.c:1257

 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 

-#: curs_main.c:1256
+#: curs_main.c:1259

 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "儲存信件以便稍後寄出"
 
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "儲存信件以便稍後寄出"
 

-#: curs_main.c:1268
+#: curs_main.c:1271

 msgid "Threads linked"
 msgstr ""
 
 msgid "Threads linked"
 msgstr ""
 

-#: curs_main.c:1271
+#: curs_main.c:1274

 msgid "No thread linked"
 msgstr ""
 
 msgid "No thread linked"
 msgstr ""
 

-#: curs_main.c:1307 curs_main.c:1332
+#: curs_main.c:1310 curs_main.c:1335

 msgid "You are on the last message."
 msgstr "您已經在最後一封信了。"
 
 msgid "You are on the last message."
 msgstr "您已經在最後一封信了。"
 

-#: curs_main.c:1314 curs_main.c:1358
+#: curs_main.c:1317 curs_main.c:1361

 msgid "No undeleted messages."
 msgstr "沒有要反刪除的信件。"
 
 msgid "No undeleted messages."
 msgstr "沒有要反刪除的信件。"
 

-#: curs_main.c:1351 curs_main.c:1375
+#: curs_main.c:1354 curs_main.c:1378

 msgid "You are on the first message."
 msgstr "您已經在第一封信了。"
 
 msgid "You are on the first message."
 msgstr "您已經在第一封信了。"
 

-#: curs_main.c:1450 pattern.c:1479
+#: curs_main.c:1453 menu.c:760 pager.c:2014 pattern.c:1465

 msgid "Search wrapped to top."
 msgstr "搜尋至開頭。"
 
 msgid "Search wrapped to top."
 msgstr "搜尋至開頭。"
 

-#: curs_main.c:1459 pattern.c:1490
+#: curs_main.c:1462 pager.c:2036 pattern.c:1476

 msgid "Search wrapped to bottom."
 msgstr "搜尋至結尾。"
 
 msgid "Search wrapped to bottom."
 msgstr "搜尋至結尾。"
 

-#: curs_main.c:1500
+#: curs_main.c:1503

 msgid "No new messages"
 msgstr "沒有新信件"
 
 msgid "No new messages"
 msgstr "沒有新信件"
 

-#: curs_main.c:1500
+#: curs_main.c:1503

 msgid "No unread messages"
 msgstr "沒有尚未讀取的信件"
 
 msgid "No unread messages"
 msgstr "沒有尚未讀取的信件"
 

-#: curs_main.c:1501
+#: curs_main.c:1504

 msgid " in this limited view"
 msgstr " 在這限定的瀏覽中"
 
 msgid " in this limited view"
 msgstr " 在這限定的瀏覽中"
 

-#: curs_main.c:1517
+#: curs_main.c:1520

 #, fuzzy
 msgid "flag message"
 msgstr "顯示信件"
 
 #, fuzzy
 msgid "flag message"
 msgstr "顯示信件"
 

-#: curs_main.c:1554 pager.c:2555
+#: curs_main.c:1557 pager.c:2622

 msgid "toggle new"
 msgstr ""
 
 msgid "toggle new"
 msgstr ""
 

-#: curs_main.c:1631
+#: curs_main.c:1634

 msgid "No more threads."
 msgstr "沒有更多的序列"
 
 msgid "No more threads."
 msgstr "沒有更多的序列"
 

-#: curs_main.c:1633
+#: curs_main.c:1636

 msgid "You are on the first thread."
 msgstr "您已經在第一個序列上。"
 
 msgid "You are on the first thread."
 msgstr "您已經在第一個序列上。"
 

-#: curs_main.c:1714
+#: curs_main.c:1717

 msgid "Thread contains unread messages."
 msgstr "序列中有尚未讀取的信件。"
 
 msgid "Thread contains unread messages."
 msgstr "序列中有尚未讀取的信件。"
 

-#: curs_main.c:1808 pager.c:2262
+#: curs_main.c:1811 pager.c:2315

 #, fuzzy
 msgid "delete message"
 msgstr "沒有要反刪除的信件。"
 
 #, fuzzy
 msgid "delete message"
 msgstr "沒有要反刪除的信件。"
 

-#: curs_main.c:1890
+#: curs_main.c:1893

 #, fuzzy
 msgid "edit message"
 msgstr "編輯信件內容"
 
 #, fuzzy
 msgid "edit message"
 msgstr "編輯信件內容"
 

-#: curs_main.c:2021
+#: curs_main.c:2024

 #, fuzzy
 msgid "mark message(s) as read"
 msgstr "跳到這個序列的主信件"
 
 #, fuzzy
 msgid "mark message(s) as read"
 msgstr "跳到這個序列的主信件"
 

-#: curs_main.c:2111 pager.c:2574
+#: curs_main.c:2114 pager.c:2641

 #, fuzzy
 msgid "undelete message"
 msgstr "沒有要反刪除的信件。"
 #, fuzzy
 msgid "undelete message"
 msgstr "沒有要反刪除的信件。"


@@ -1802,41 +1836,41 @@ msgstr ""
 "~?\t\t這訊息\n"
 ".\t\t如果是一行裏的唯一字符，則代表結束輸入\n"
 
 "~?\t\t這訊息\n"
 ".\t\t如果是一行裏的唯一字符，則代表結束輸入\n"
 

-#: edit.c:188
+#: edit.c:187

 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr "%d：無效的信件號碼。\n"
 
 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr "%d：無效的信件號碼。\n"
 

-#: edit.c:330
+#: edit.c:329

 msgid "(End message with a . on a line by itself)\n"
 msgstr "（在一行裏輸入一個 . 符號來結束信件）\n"
 
 msgid "(End message with a . on a line by itself)\n"
 msgstr "（在一行裏輸入一個 . 符號來結束信件）\n"
 

-#: edit.c:389
+#: edit.c:388

 msgid "No mailbox.\n"
 msgstr "沒有信箱。\n"
 
 msgid "No mailbox.\n"
 msgstr "沒有信箱。\n"
 

-#: edit.c:393
+#: edit.c:392

 msgid "Message contains:\n"
 msgstr "信件包含：\n"
 
 msgid "Message contains:\n"
 msgstr "信件包含：\n"
 

-#: edit.c:397 edit.c:454
+#: edit.c:396 edit.c:453

 msgid "(continue)\n"
 msgstr "（繼續）\n"
 
 msgid "(continue)\n"
 msgstr "（繼續）\n"
 

-#: edit.c:410
+#: edit.c:409

 msgid "missing filename.\n"
 msgstr "沒有檔名。\n"
 
 msgid "missing filename.\n"
 msgstr "沒有檔名。\n"
 

-#: edit.c:430
+#: edit.c:429

 msgid "No lines in message.\n"
 msgstr "文章中沒有文字。\n"
 
 msgid "No lines in message.\n"
 msgstr "文章中沒有文字。\n"
 

-#: edit.c:447
+#: edit.c:446

 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr "%s 中含有無效的 IDN：「%s」\n"
 
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr "%s 中含有無效的 IDN：「%s」\n"
 

-#: edit.c:465
+#: edit.c:464

 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s：不明的編輯器指令（~? 求助）\n"
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s：不明的編輯器指令（~? 求助）\n"


@@ -1879,83 +1913,87 @@ msgstr "無法把資料加到檔案夾：%s"
 msgid "Error. Preserving temporary file: %s"
 msgstr "發生錯誤，保留暫存檔：%s"
 
 msgid "Error. Preserving temporary file: %s"
 msgstr "發生錯誤，保留暫存檔：%s"
 

-#: flags.c:329
+#: flags.c:325

 msgid "Set flag"
 msgstr "設定旗標"
 
 msgid "Set flag"
 msgstr "設定旗標"
 

-#: flags.c:329
+#: flags.c:325

 msgid "Clear flag"
 msgstr "清除旗標"
 
 msgid "Clear flag"
 msgstr "清除旗標"
 

-#: handler.c:1049
+#: handler.c:1058

 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- 錯誤： 無法顯示 Multipart/Alternative！ --]\n"
 
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- 錯誤： 無法顯示 Multipart/Alternative！ --]\n"
 

-#: handler.c:1166
+#: handler.c:1176

 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- 附件 #%d"
 
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- 附件 #%d"
 

-#: handler.c:1178
+#: handler.c:1188

 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- 種類：%s%s，編碼：%s，大小：%s --]\n"
 
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- 種類：%s%s，編碼：%s，大小：%s --]\n"
 

-#: handler.c:1250
+#: handler.c:1204
+msgid "One or more parts of this message could not be displayed"
+msgstr ""
+
+#: handler.c:1256

 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- 使用 %s 自動顯示 --]\n"
 
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- 使用 %s 自動顯示 --]\n"
 

-#: handler.c:1251
+#: handler.c:1257

 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "執行自動顯示指令：%s"
 
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "執行自動顯示指令：%s"
 

-#: handler.c:1283
+#: handler.c:1289

 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- 不能執行 %s 。 --]\n"
 
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- 不能執行 %s 。 --]\n"
 

-#: handler.c:1302 handler.c:1323
+#: handler.c:1308 handler.c:1329

 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- 自動顯示 %s 的 stderr 內容 --]\n"
 
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- 自動顯示 %s 的 stderr 內容 --]\n"
 

-#: handler.c:1362
+#: handler.c:1368

 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- 錯誤：message/external-body 沒有存取類型 (access-type) 的參數 --]\n"
 
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- 錯誤：message/external-body 沒有存取類型 (access-type) 的參數 --]\n"
 

-#: handler.c:1383
+#: handler.c:1389

 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- 這個 %s/%s 附件 "
 
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- 這個 %s/%s 附件 "
 

-#: handler.c:1390
+#: handler.c:1396

 #, c-format
 msgid "(size %s bytes) "
 msgstr "(%s 個位元組) "
 
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(%s 個位元組) "
 

-#: handler.c:1392
+#: handler.c:1398

 msgid "has been deleted --]\n"
 msgstr "已經被刪除了 --]\n"
 
 msgid "has been deleted --]\n"
 msgstr "已經被刪除了 --]\n"
 

-#: handler.c:1397
+#: handler.c:1403

 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- 在 %s --]\n"
 
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- 在 %s --]\n"
 

-#: handler.c:1402
+#: handler.c:1408

 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- 名稱：%s --]\n"
 
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- 名稱：%s --]\n"
 

-#: handler.c:1415 handler.c:1431
+#: handler.c:1421 handler.c:1437

 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- 這個 %s/%s 附件 "
 
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- 這個 %s/%s 附件 "
 

-#: handler.c:1417
+#: handler.c:1423

 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"


@@ -1965,40 +2003,45 @@ msgstr ""
 "[-- 並且被指示的外部原始檔已 --]\n"
 "[-- 過期。 --]\n"
 
 "[-- 並且被指示的外部原始檔已 --]\n"
 "[-- 過期。 --]\n"
 

-#: handler.c:1435
+#: handler.c:1441

 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- 這個 %s/%s 附件無法被附上, --]\n"
 "[-- 並且被指示的存取類型 (access-type) %s 不被支援 --]\n"
 
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- 這個 %s/%s 附件無法被附上, --]\n"
 "[-- 並且被指示的存取類型 (access-type) %s 不被支援 --]\n"
 

-#: handler.c:1550
+#: handler.c:1584

 msgid "Error: multipart/signed has no protocol."
 msgstr "錯誤：multipart/signed 沒有通訊協定。"
 
 msgid "Error: multipart/signed has no protocol."
 msgstr "錯誤：multipart/signed 沒有通訊協定。"
 

-#: handler.c:1560
+#: handler.c:1594

 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "錯誤：multipart/encrypted 沒有任何通訊協定參數！"
 
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "錯誤：multipart/encrypted 沒有任何通訊協定參數！"
 

-#: handler.c:1600
+#: handler.c:1651

 msgid "Unable to open temporary file!"
 msgstr "無法開啟暫存檔！"
 
 msgid "Unable to open temporary file!"
 msgstr "無法開啟暫存檔！"
 

-#: handler.c:1667
+#: handler.c:1724
+#, fuzzy
+msgid "[-- This is an attachment "
+msgstr "[-- 這個 %s/%s 附件 "
+
+#: handler.c:1726

 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s 尚未支援 "
 
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s 尚未支援 "
 

-#: handler.c:1672
+#: handler.c:1731

 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "（按 '%s' 來顯示這部份）"
 
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "（按 '%s' 來顯示這部份）"
 

-#: handler.c:1674
+#: handler.c:1733

 msgid "(need 'view-attachments' bound to key!)"
 msgstr "（需要定義一個鍵給 'view-attachments' 來瀏覽附件！)"
 
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "（需要定義一個鍵給 'view-attachments' 來瀏覽附件！)"
 

-#: headers.c:177
+#: headers.c:189

 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s：無法附帶檔案"
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s：無法附帶檔案"


@@ -2056,7 +2099,7 @@ msgstr "unhook：不明的 hook type %s"
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr "unhook：不能從 %2$s 刪除 %1$s。"
 
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr "unhook：不能從 %2$s 刪除 %1$s。"
 

-#: imap/auth.c:108 pop_auth.c:398 smtp.c:452
+#: imap/auth.c:108 pop_auth.c:398 smtp.c:521

 msgid "No authenticators available"
 msgstr "沒有認證方式"
 
 msgid "No authenticators available"
 msgstr "沒有認證方式"
 


@@ -2077,11 +2120,11 @@ msgid "CRAM-MD5 authentication failed."
 msgstr "CRAM-MD5 驗證失敗。"
 
 #. now begin login
 msgstr "CRAM-MD5 驗證失敗。"
 
 #. now begin login

-#: imap/auth_gss.c:142
+#: imap/auth_gss.c:144

 msgid "Authenticating (GSSAPI)..."
 msgstr "驗證中 (GSSAPI)…"
 
 msgid "Authenticating (GSSAPI)..."
 msgstr "驗證中 (GSSAPI)…"
 

-#: imap/auth_gss.c:307
+#: imap/auth_gss.c:309

 msgid "GSSAPI authentication failed."
 msgstr "GSSAPI 驗證失敗。"
 
 msgid "GSSAPI authentication failed."
 msgstr "GSSAPI 驗證失敗。"
 


@@ -2097,7 +2140,7 @@ msgstr "登入中…"
 msgid "Login failed."
 msgstr "登入失敗。"
 
 msgid "Login failed."
 msgstr "登入失敗。"
 

-#: imap/auth_sasl.c:97 smtp.c:487
+#: imap/auth_sasl.c:97 smtp.c:557

 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
 msgstr "驗證中 (APOP)…"
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
 msgstr "驗證中 (APOP)…"


@@ -2106,7 +2149,7 @@ msgstr "驗證中 (APOP)…"
 msgid "SASL authentication failed."
 msgstr "SASL 驗證失敗。"
 
 msgid "SASL authentication failed."
 msgstr "SASL 驗證失敗。"
 

-#: imap/browse.c:58 imap/imap.c:562
+#: imap/browse.c:58 imap/imap.c:569

 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""


@@ -2115,431 +2158,454 @@ msgstr ""
 msgid "Getting folder list..."
 msgstr "拿取目錄表中…"
 
 msgid "Getting folder list..."
 msgstr "拿取目錄表中…"
 

-#: imap/browse.c:189
+#: imap/browse.c:191

 #, fuzzy
 msgid "No such folder"
 msgstr "%s：沒有這種顏色"
 
 #, fuzzy
 msgid "No such folder"
 msgstr "%s：沒有這種顏色"
 

-#: imap/browse.c:276
+#: imap/browse.c:280

 msgid "Create mailbox: "
 msgstr "製作信箱："
 
 msgid "Create mailbox: "
 msgstr "製作信箱："
 

-#: imap/browse.c:281 imap/browse.c:327
+#: imap/browse.c:285 imap/browse.c:331

 msgid "Mailbox must have a name."
 msgstr "信箱一定要有名字。"
 
 msgid "Mailbox must have a name."
 msgstr "信箱一定要有名字。"
 

-#: imap/browse.c:289
+#: imap/browse.c:293

 msgid "Mailbox created."
 msgstr "已完成建立郵箱。"
 
 msgid "Mailbox created."
 msgstr "已完成建立郵箱。"
 

-#: imap/browse.c:320
+#: imap/browse.c:324

 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "製作信箱："
 
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "製作信箱："
 

-#: imap/browse.c:333
+#: imap/browse.c:339

 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "登入失敗： %s"
 
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "登入失敗： %s"
 

-#: imap/browse.c:338
+#: imap/browse.c:344

 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "已完成製造郵箱。"
 
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "已完成製造郵箱。"
 

-#: imap/command.c:372
+#: imap/command.c:448

 msgid "Mailbox closed"
 msgstr "郵箱已經關掉"
 
 msgid "Mailbox closed"
 msgstr "郵箱已經關掉"
 

-#: imap/imap.c:185
+#: imap/imap.c:126
+#, fuzzy, c-format
+msgid "CREATE failed: %s"
+msgstr "登入失敗： %s"
+
+#: imap/imap.c:190

 #, c-format
 msgid "Closing connection to %s..."
 msgstr "正在關閉與 %s 的連線…"
 
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "正在關閉與 %s 的連線…"
 

-#: imap/imap.c:306
+#: imap/imap.c:310

 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "這個 IMAP 伺服器已過時，Mutt 無法使用它。"
 
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "這個 IMAP 伺服器已過時，Mutt 無法使用它。"
 

-#: imap/imap.c:429 pop_lib.c:286 smtp.c:373
+#: imap/imap.c:433 pop_lib.c:292 smtp.c:424

 msgid "Secure connection with TLS?"
 msgstr "利用 TSL 來進行安全連接？"
 
 msgid "Secure connection with TLS?"
 msgstr "利用 TSL 來進行安全連接？"
 

-#: imap/imap.c:438 pop_lib.c:306 smtp.c:385
+#: imap/imap.c:442 pop_lib.c:312 smtp.c:436

 msgid "Could not negotiate TLS connection"
 msgstr "未能"
 
 msgid "Could not negotiate TLS connection"
 msgstr "未能"
 

-#: imap/imap.c:454 pop_lib.c:327
+#: imap/imap.c:458 pop_lib.c:333

 #, fuzzy
 msgid "Encrypted connection unavailable"
 msgstr "加密的鑰匙"
 
 #, fuzzy
 msgid "Encrypted connection unavailable"
 msgstr "加密的鑰匙"
 

-#: imap/imap.c:594
+#: imap/imap.c:603

 #, c-format
 msgid "Selecting %s..."
 msgstr "正在選擇 %s …"
 
 #, c-format
 msgid "Selecting %s..."
 msgstr "正在選擇 %s …"
 

-#: imap/imap.c:749
+#: imap/imap.c:758

 msgid "Error opening mailbox"
 msgstr "開啟信箱時發生錯誤"
 
 msgid "Error opening mailbox"
 msgstr "開啟信箱時發生錯誤"
 

-#: imap/imap.c:802 imap/message.c:792 muttlib.c:1466
+#: imap/imap.c:813 imap/message.c:842 muttlib.c:1493

 #, c-format
 msgid "Create %s?"
 msgstr "建立 %s？"
 
 #, c-format
 msgid "Create %s?"
 msgstr "建立 %s？"
 

-#: imap/imap.c:1132
+#: imap/imap.c:1186
+msgid "Expunge failed"
+msgstr "刪除 (expunge) 失敗"
+
+#: imap/imap.c:1198

 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "標簽了的 %d 封信件刪去了…"
 
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "標簽了的 %d 封信件刪去了…"
 

-#: imap/imap.c:1141
-msgid "Expunge failed"
-msgstr "刪除 (expunge) 失敗"
-
-#: imap/imap.c:1174
+#: imap/imap.c:1230

 #, fuzzy, c-format
 msgid "Saving changed messages... [%d/%d]"
 msgstr "正在儲存信件狀態旗標… [%d/%d]"
 
 #, fuzzy, c-format
 msgid "Saving changed messages... [%d/%d]"
 msgstr "正在儲存信件狀態旗標… [%d/%d]"
 

-#: imap/imap.c:1228
+#: imap/imap.c:1279

 msgid "Error saving flags. Close anyway?"
 msgstr ""
 
 msgid "Error saving flags. Close anyway?"
 msgstr ""
 

-#: imap/imap.c:1236
+#: imap/imap.c:1287

 #, fuzzy
 msgid "Error saving flags"
 msgstr "無法分析位址！"
 
 #, fuzzy
 msgid "Error saving flags"
 msgstr "無法分析位址！"
 

-#: imap/imap.c:1248
+#: imap/imap.c:1299

 msgid "Expunging messages from server..."
 msgstr "正在刪除伺服器上的信件…"
 
 msgid "Expunging messages from server..."
 msgstr "正在刪除伺服器上的信件…"
 

-#: imap/imap.c:1253
+#: imap/imap.c:1304

 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 

-#: imap/imap.c:1726
+#: imap/imap.c:1754

 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 
 #, c-format
 msgid "Header search without header name: %s"
 msgstr ""
 

-#: imap/imap.c:1798
+#: imap/imap.c:1826

 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "製作信箱："
 
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "製作信箱："
 

-#: imap/imap.c:1821
+#: imap/imap.c:1851

 #, c-format
 msgid "Subscribing to %s..."
 msgstr "訂閱 %s…"
 
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "訂閱 %s…"
 

-#: imap/imap.c:1823
+#: imap/imap.c:1853

 #, fuzzy, c-format
 msgid "Unsubscribing from %s..."
 msgstr "取消訂閱 %s…"
 
 #, fuzzy, c-format
 msgid "Unsubscribing from %s..."
 msgstr "取消訂閱 %s…"
 

-#: imap/imap.c:1833
+#: imap/imap.c:1863

 #, fuzzy, c-format
 msgid "Subscribed to %s"
 msgstr "訂閱 %s…"
 
 #, fuzzy, c-format
 msgid "Subscribed to %s"
 msgstr "訂閱 %s…"
 

-#: imap/imap.c:1835
+#: imap/imap.c:1865

 #, fuzzy, c-format
 msgid "Unsubscribed from %s"
 msgstr "取消訂閱 %s…"
 
 #. Unable to fetch headers for lower versions
 #, fuzzy, c-format
 msgid "Unsubscribed from %s"
 msgstr "取消訂閱 %s…"
 
 #. Unable to fetch headers for lower versions

-#: imap/message.c:97
+#: imap/message.c:98

 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "無法取回使用這個 IMAP 伺服器版本的郵件的標頭。"
 
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "無法取回使用這個 IMAP 伺服器版本的郵件的標頭。"
 

-#: imap/message.c:107
+#: imap/message.c:108

 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "無法建立暫存檔 %s"
 
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "無法建立暫存檔 %s"
 

-#: imap/message.c:137
+#: imap/message.c:140

 #, fuzzy
 msgid "Evaluating cache..."
 msgstr "正在取回信件標頭… [%d/%d]"
 
 #, fuzzy
 msgid "Evaluating cache..."
 msgstr "正在取回信件標頭… [%d/%d]"
 

-#: imap/message.c:221 pop.c:272
+#: imap/message.c:232 pop.c:272

 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "正在取回信件標頭… [%d/%d]"
 
 #, fuzzy
 msgid "Fetching message headers..."
 msgstr "正在取回信件標頭… [%d/%d]"
 

-#: imap/message.c:402 imap/message.c:459 pop.c:547
+#: imap/message.c:435 imap/message.c:492 pop.c:563

 msgid "Fetching message..."
 msgstr "拿取信件中…"
 
 msgid "Fetching message..."
 msgstr "拿取信件中…"
 

-#: imap/message.c:448 pop.c:542
+#: imap/message.c:481 pop.c:558

 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "信件的索引不正確。請再重新開啟信箱。"
 
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "信件的索引不正確。請再重新開啟信箱。"
 

-#: imap/message.c:599
+#: imap/message.c:634

 #, fuzzy
 msgid "Uploading message..."
 msgstr "正在上傳信件…"
 
 #, fuzzy
 msgid "Uploading message..."
 msgstr "正在上傳信件…"
 

-#: imap/message.c:758
+#: imap/message.c:806

 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "正在複制 %d 封信件到 %s …"
 
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "正在複制 %d 封信件到 %s …"
 

-#: imap/message.c:762
+#: imap/message.c:810

 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "正在複制 信件 %d 到 %s …"
 
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "正在複制 信件 %d 到 %s …"
 

-#: imap/util.c:335
+#: imap/util.c:356

 msgid "Continue?"
 msgstr "繼續？"
 
 msgid "Continue?"
 msgstr "繼續？"
 

-#: init.c:57 init.c:1755 pager.c:57
+#: init.c:58 init.c:1777 pager.c:50

 #, c-format
 msgid "Not available in this menu."
 msgstr "在這個菜單中沒有這個功能。"
 
 #, c-format
 msgid "Not available in this menu."
 msgstr "在這個菜單中沒有這個功能。"
 

-#: init.c:465
+#: init.c:466

 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 
 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 

-#: init.c:522
+#: init.c:523

 #, c-format
 msgid "Not enough subexpressions for spam template"
 msgstr ""
 
 #, c-format
 msgid "Not enough subexpressions for spam template"
 msgstr ""
 

-#: init.c:748
+#: init.c:749

 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "標記符合某個格式的信件"
 
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "標記符合某個格式的信件"
 

-#: init.c:750
+#: init.c:751

 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "反標記符合某個格式的信件"
 
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "反標記符合某個格式的信件"
 

-#: init.c:887
+#: init.c:888

 msgid "Missing -rx or -addr."
 msgstr ""
 
 msgid "Missing -rx or -addr."
 msgstr ""
 

-#: init.c:900
+#: init.c:901

 #, c-format
 msgid "Warning: Bad IDN '%s'.\n"
 msgstr ""
 
 #, c-format
 msgid "Warning: Bad IDN '%s'.\n"
 msgstr ""
 

-#: init.c:1108
+#: init.c:1109

 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "編輯附件的說明"
 
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "編輯附件的說明"
 

-#: init.c:1146
+#: init.c:1147

 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "編輯附件的說明"
 
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "編輯附件的說明"
 

-#: init.c:1160
+#: init.c:1161

 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "編輯附件的說明"
 
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "編輯附件的說明"
 

-#: init.c:1183
+#: init.c:1184

 msgid "unattachments: invalid disposition"
 msgstr ""
 
 msgid "unattachments: invalid disposition"
 msgstr ""
 

-#: init.c:1310
+#: init.c:1311

 msgid "alias: no address"
 msgstr "別名：沒有電子郵件位址"
 
 msgid "alias: no address"
 msgstr "別名：沒有電子郵件位址"
 

-#: init.c:1357
+#: init.c:1359

 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "警告：別名「%2$s」當中的「%1$s」為無效的 IDN。\n"
 
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "警告：別名「%2$s」當中的「%1$s」為無效的 IDN。\n"
 

-#: init.c:1445
+#: init.c:1447

 msgid "invalid header field"
 msgstr "無效的標頭欄位"
 
 msgid "invalid header field"
 msgstr "無效的標頭欄位"
 

-#: init.c:1498
+#: init.c:1500

 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s：不明的排序方式"
 
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s：不明的排序方式"
 

-#: init.c:1608
+#: init.c:1610

 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_defualt(%s)：錯誤的正規表示式：%s\n"
 
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_defualt(%s)：錯誤的正規表示式：%s\n"
 

-#: init.c:1732 init.c:1845
+#: init.c:1754 init.c:1867

 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s：不明的變數"
 
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s：不明的變數"
 

-#: init.c:1741
+#: init.c:1763

 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "重新設置後字首仍不合規定"
 
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "重新設置後字首仍不合規定"
 

-#: init.c:1747
+#: init.c:1769

 #, c-format
 msgid "value is illegal with reset"
 msgstr "重新設置後值仍不合規定"
 
 #, c-format
 msgid "value is illegal with reset"
 msgstr "重新設置後值仍不合規定"
 

-#: init.c:1783 init.c:1795
+#: init.c:1805 init.c:1817

 #, c-format
 msgid "Usage: set variable=yes|no"
 msgstr ""
 
 #, c-format
 msgid "Usage: set variable=yes|no"
 msgstr ""
 

-#: init.c:1803
+#: init.c:1825

 #, c-format
 msgid "%s is set"
 msgstr "%s 已被設定"
 
 #, c-format
 msgid "%s is set"
 msgstr "%s 已被設定"
 

-#: init.c:1803
+#: init.c:1825

 #, c-format
 msgid "%s is unset"
 msgstr "%s 沒有被設定"
 
 #, c-format
 msgid "%s is unset"
 msgstr "%s 沒有被設定"
 

-#: init.c:2033
+#: init.c:1926
+#, fuzzy, c-format
+msgid "Invalid value for option %s: \"%s\""
+msgstr "無效的日子：%s"
+
+#: init.c:2064

 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s：無效的信箱種類"
 
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s：無效的信箱種類"
 

-#: init.c:2064 init.c:2117
+#: init.c:2095
+#, fuzzy, c-format
+msgid "%s: invalid value (%s)"
+msgstr "%s：無效的值"
+
+#: init.c:2096
+msgid "format error"
+msgstr ""
+
+#: init.c:2096
+msgid "number overflow"
+msgstr ""
+
+#: init.c:2156

 #, c-format
 msgid "%s: invalid value"
 msgstr "%s：無效的值"
 
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s：無效的值"
 

-#: init.c:2158
+#: init.c:2197

 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s：不明的種類"
 
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s：不明的種類"
 

-#: init.c:2185
+#: init.c:2224

 #, c-format
 msgid "%s: unknown type"
 msgstr "%s：不明的種類"
 
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s：不明的種類"
 

-#: init.c:2247
+#: init.c:2286

 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s 發生錯誤，行號 %d：%s"
 
 #. the muttrc source keyword
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s 發生錯誤，行號 %d：%s"
 
 #. the muttrc source keyword

-#: init.c:2270
+#: init.c:2309

 #, c-format
 msgid "source: errors in %s"
 msgstr "source：錯誤發生在 %s"
 
 #, c-format
 msgid "source: errors in %s"
 msgstr "source：錯誤發生在 %s"
 

-#: init.c:2271
+#: init.c:2310

 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: 因 %s 發生太多錯誤，因此閱讀終止。"
 
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: 因 %s 發生太多錯誤，因此閱讀終止。"
 

-#: init.c:2285
+#: init.c:2324

 #, c-format
 msgid "source: error at %s"
 msgstr "source：錯誤發生在 %s"
 
 #, c-format
 msgid "source: error at %s"
 msgstr "source：錯誤發生在 %s"
 

-#: init.c:2290
+#: init.c:2329

 msgid "source: too many arguments"
 msgstr "source：太多引數"
 
 msgid "source: too many arguments"
 msgstr "source：太多引數"
 

-#: init.c:2341
+#: init.c:2383

 #, c-format
 msgid "%s: unknown command"
 msgstr "%s：不明的指令"
 
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s：不明的指令"
 

-#: init.c:2826
+#: init.c:2868

 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "指令行有錯：%s\n"
 
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "指令行有錯：%s\n"
 

-#: init.c:2878
+#: init.c:2923

 msgid "unable to determine home directory"
 msgstr "無法決定 home 目錄"
 
 msgid "unable to determine home directory"
 msgstr "無法決定 home 目錄"
 

-#: init.c:2886
+#: init.c:2931

 msgid "unable to determine username"
 msgstr "無法決定使用者名稱"
 
 msgid "unable to determine username"
 msgstr "無法決定使用者名稱"
 

-#: init.c:3122
+#: init.c:3167

 msgid "-group: no group name"
 msgstr ""
 
 msgid "-group: no group name"
 msgstr ""
 

-#: init.c:3132
+#: init.c:3177

 #, fuzzy
 msgid "out of arguments"
 msgstr "太少參數"
 
 #, fuzzy
 msgid "out of arguments"
 msgstr "太少參數"
 

-#: keymap.c:466
+#: keymap.c:491

 msgid "Macro loop detected."
 msgstr "檢測到巨集中有迴圈。"
 
 msgid "Macro loop detected."
 msgstr "檢測到巨集中有迴圈。"
 

-#: keymap.c:676 keymap.c:684
+#: keymap.c:701 keymap.c:709

 msgid "Key is not bound."
 msgstr "這個鍵還未被定義功能。"
 
 msgid "Key is not bound."
 msgstr "這個鍵還未被定義功能。"
 

-#: keymap.c:688
+#: keymap.c:713

 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "這個鍵還未被定義功能。 按 '%s' 以取得說明。"
 
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "這個鍵還未被定義功能。 按 '%s' 以取得說明。"
 

-#: keymap.c:699
+#: keymap.c:724

 msgid "push: too many arguments"
 msgstr "push：太多引數"
 
 msgid "push: too many arguments"
 msgstr "push：太多引數"
 

-#: keymap.c:729
+#: keymap.c:754

 #, c-format
 msgid "%s: no such menu"
 msgstr "%s：沒有這個選單"
 
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s：沒有這個選單"
 

-#: keymap.c:744
+#: keymap.c:769

 msgid "null key sequence"
 msgstr "空的鍵值序列"
 
 msgid "null key sequence"
 msgstr "空的鍵值序列"
 

-#: keymap.c:831
+#: keymap.c:856

 msgid "bind: too many arguments"
 msgstr "bind：太多引數"
 
 msgid "bind: too many arguments"
 msgstr "bind：太多引數"
 

-#: keymap.c:854
+#: keymap.c:879

 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s：在對映表中沒有這樣的功能"
 
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s：在對映表中沒有這樣的功能"
 

-#: keymap.c:878
+#: keymap.c:903

 msgid "macro: empty key sequence"
 msgstr "macro：空的鍵值序列"
 
 msgid "macro: empty key sequence"
 msgstr "macro：空的鍵值序列"
 

-#: keymap.c:889
+#: keymap.c:914

 msgid "macro: too many arguments"
 msgstr "macro：引數太多"
 
 msgid "macro: too many arguments"
 msgstr "macro：引數太多"
 

-#: keymap.c:925
+#: keymap.c:950

 msgid "exec: no arguments"
 msgstr "exec：沒有引數"
 
 msgid "exec: no arguments"
 msgstr "exec：沒有引數"
 

-#: keymap.c:945
+#: keymap.c:970

 #, c-format
 msgid "%s: no such function"
 msgstr "%s：沒有這個功能"
 
 #, c-format
 msgid "%s: no such function"
 msgstr "%s：沒有這個功能"
 

-#: keymap.c:966
+#: keymap.c:991

 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "請輸入 %s 的鑰匙 ID："
 
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "請輸入 %s 的鑰匙 ID："
 

-#: keymap.c:971
+#: keymap.c:996

 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
 
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
 

-#: lib.c:129
+#: lib.c:131

 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 
 msgid "Integer overflow -- can't allocate memory!"
 msgstr ""
 

-#: lib.c:136 lib.c:151 lib.c:183
+#: lib.c:138 lib.c:153 lib.c:185

 msgid "Out of memory!"
 msgstr "記憶體不足！"
 
 msgid "Out of memory!"
 msgstr "記憶體不足！"
 


@@ -2555,7 +2621,7 @@ msgstr ""
 #: main.c:67
 #, fuzzy
 msgid ""
 #: main.c:67
 #, fuzzy
 msgid ""

-"Copyright (C) 1996-2008 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2009 Michael R. Elkins and others.\n"

 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
 "Mutt is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type `mutt -vv' for details.\n"
 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
 "Mutt is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type `mutt -vv' for details.\n"


@@ -2569,17 +2635,18 @@ msgstr ""
 msgid ""
 "Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
 msgid ""
 "Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"

-"Copyright (C) 1997-2007 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1997-2008 Thomas Roessler <roessler@does-not-exist.org>\n"

 "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
 "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"

-"Copyright (C) 1999-2008 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2009 Brendan Cully <brendan@kublai.com>\n"

 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"

+"Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"

 "\n"
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"
 msgstr ""
 
 "\n"
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"
 msgstr ""
 

-#: main.c:85
+#: main.c:86

 msgid ""
 "    This program is free software; you can redistribute it and/or modify\n"
 "    it under the terms of the GNU General Public License as published by\n"
 msgid ""
 "    This program is free software; you can redistribute it and/or modify\n"
 "    it under the terms of the GNU General Public License as published by\n"


@@ -2592,7 +2659,7 @@ msgid ""
 "    GNU General Public License for more details.\n"
 msgstr ""
 
 "    GNU General Public License for more details.\n"
 msgstr ""
 

-#: main.c:95
+#: main.c:96

 msgid ""
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
 msgid ""
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"


@@ -2600,11 +2667,13 @@ msgid ""
 "1301, USA.\n"
 msgstr ""
 
 "1301, USA.\n"
 msgstr ""
 

-#: main.c:112
+#: main.c:113

 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
 "<file> [...]] [--] <addr> [...]\n"
 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
 "<file> [...]] [--] <addr> [...]\n"

+"       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...]] [--] "
+"<addr> [...] < message\n"

 "       mutt [<options>] -p\n"
 "       mutt [<options>] -A <alias> [...]\n"
 "       mutt [<options>] -Q <query> [...]\n"
 "       mutt [<options>] -p\n"
 "       mutt [<options>] -A <alias> [...]\n"
 "       mutt [<options>] -Q <query> [...]\n"


@@ -2612,7 +2681,7 @@ msgid ""
 "       mutt -v[v]\n"
 msgstr ""
 
 "       mutt -v[v]\n"
 msgstr ""
 

-#: main.c:120
+#: main.c:122

 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"
 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"


@@ -2622,11 +2691,11 @@ msgid ""
 "  -D\t\tprint the value of all variables to stdout"
 msgstr ""
 
 "  -D\t\tprint the value of all variables to stdout"
 msgstr ""
 

-#: main.c:128
+#: main.c:130

 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
 msgstr ""
 
 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
 msgstr ""
 

-#: main.c:131
+#: main.c:133

 #, fuzzy
 msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 #, fuzzy
 msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"


@@ -2666,7 +2735,7 @@ msgstr ""
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 

-#: main.c:140
+#: main.c:142

 #, fuzzy
 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"
 #, fuzzy
 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"


@@ -2713,13 +2782,13 @@ msgstr ""
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 

-#: main.c:150
+#: main.c:152

 msgid ""
 "  --\t\ttreat remaining arguments as addr even if starting with a dash\n"
 "\t\twhen using -a with multiple filenames using -- is mandatory"
 msgstr ""
 
 msgid ""
 "  --\t\ttreat remaining arguments as addr even if starting with a dash\n"
 "\t\twhen using -a with multiple filenames using -- is mandatory"
 msgstr ""
 

-#: main.c:195
+#: main.c:197

 msgid ""
 "\n"
 "Compile options:"
 msgid ""
 "\n"
 "Compile options:"


@@ -2727,55 +2796,60 @@ msgstr ""
 "\n"
 "編譯選項："
 
 "\n"
 "編譯選項："
 

-#: main.c:502
+#: main.c:501

 msgid "Error initializing terminal."
 msgstr "無法初始化終端機。"
 
 msgid "Error initializing terminal."
 msgstr "無法初始化終端機。"
 

-#: main.c:620
+#: main.c:636
+#, fuzzy, c-format
+msgid "Error: value '%s' is invalid for -d.\n"
+msgstr "錯誤：「%s」是無效的 IDN。"
+
+#: main.c:639

 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "除錯模式在第 %d 層。\n"
 
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "除錯模式在第 %d 層。\n"
 

-#: main.c:622
+#: main.c:641

 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "在編譯時候沒有定義 DEBUG。放棄執行。\n"
 
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "在編譯時候沒有定義 DEBUG。放棄執行。\n"
 

-#: main.c:785
+#: main.c:806

 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s 不存在。建立嗎？"
 
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s 不存在。建立嗎？"
 

-#: main.c:789
+#: main.c:810

 #, c-format
 msgid "Can't create %s: %s."
 msgstr "無法建立 %s: %s."
 
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "無法建立 %s: %s."
 

-#: main.c:831
+#: main.c:852

 msgid "Failed to parse mailto: link\n"
 msgstr ""
 
 msgid "Failed to parse mailto: link\n"
 msgstr ""
 

-#: main.c:843
+#: main.c:864

 msgid "No recipients specified.\n"
 msgstr "沒有指定收件人。\n"
 
 msgid "No recipients specified.\n"
 msgstr "沒有指定收件人。\n"
 

-#: main.c:929
+#: main.c:950

 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s：無法附帶檔案。\n"
 
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s：無法附帶檔案。\n"
 

-#: main.c:952
+#: main.c:973

 msgid "No mailbox with new mail."
 msgstr "沒有信箱有新信件。"
 
 msgid "No mailbox with new mail."
 msgstr "沒有信箱有新信件。"
 

-#: main.c:961
+#: main.c:982

 msgid "No incoming mailboxes defined."
 msgstr "沒有定義任何的收信郵箱"
 
 msgid "No incoming mailboxes defined."
 msgstr "沒有定義任何的收信郵箱"
 

-#: main.c:989
+#: main.c:1010

 msgid "Mailbox is empty."
 msgstr "信箱內空無一物。"
 
 msgid "Mailbox is empty."
 msgstr "信箱內空無一物。"
 

-#: mbox.c:123 mbox.c:277 mh.c:1137 mx.c:673
+#: mbox.c:123 mbox.c:277 mh.c:1151 mx.c:643

 #, c-format
 msgid "Reading %s..."
 msgstr "讀取 %s 中…"
 #, c-format
 msgid "Reading %s..."
 msgstr "讀取 %s 中…"


@@ -2788,11 +2862,11 @@ msgstr "信箱已損壞了！"
 msgid "Mailbox was corrupted!"
 msgstr "信箱已損壞!"
 
 msgid "Mailbox was corrupted!"
 msgstr "信箱已損壞!"
 

-#: mbox.c:719 mbox.c:975
+#: mbox.c:737 mbox.c:981

 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "嚴重錯誤！無法重新開啟信箱！"
 
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "嚴重錯誤！無法重新開啟信箱！"
 

-#: mbox.c:728
+#: mbox.c:746

 msgid "Unable to lock mailbox!"
 msgstr "無法鎖住信箱！"
 
 msgid "Unable to lock mailbox!"
 msgstr "無法鎖住信箱！"
 


@@ -2800,110 +2874,108 @@ msgstr "無法鎖住信箱！"
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.

-#: mbox.c:771
+#: mbox.c:789

 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "同步：信箱已被修改，但沒有被修改過的信件！（請回報這個錯誤）"
 
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "同步：信箱已被修改，但沒有被修改過的信件！（請回報這個錯誤）"
 

-#: mbox.c:795 mh.c:1636 mx.c:766
+#: mbox.c:813 mh.c:1657 mx.c:736

 #, c-format
 msgid "Writing %s..."
 msgstr "寫入 %s 中…"
 
 #, c-format
 msgid "Writing %s..."
 msgstr "寫入 %s 中…"
 

-#. copy the temp mailbox back into place starting at the first
-#. * change/deleted message
-#.
-#: mbox.c:928
+#: mbox.c:939

 msgid "Committing changes..."
 msgstr "正在寫入更改的資料…"
 
 msgid "Committing changes..."
 msgstr "正在寫入更改的資料…"
 

-#: mbox.c:959
+#: mbox.c:970

 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "寫入失敗！已把部分的信箱儲存至 %s"
 
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "寫入失敗！已把部分的信箱儲存至 %s"
 

-#: mbox.c:1023
+#: mbox.c:1034

 msgid "Could not reopen mailbox!"
 msgstr "無法重開信箱！"
 
 msgid "Could not reopen mailbox!"
 msgstr "無法重開信箱！"
 

-#: mbox.c:1058
+#: mbox.c:1070

 msgid "Reopening mailbox..."
 msgstr "重新開啟信箱中…"
 
 msgid "Reopening mailbox..."
 msgstr "重新開啟信箱中…"
 

-#: menu.c:425
+#: menu.c:423

 msgid "Jump to: "
 msgstr "跳到："
 
 msgid "Jump to: "
 msgstr "跳到："
 

-#: menu.c:434
+#: menu.c:432

 msgid "Invalid index number."
 msgstr "無效的索引編號。"
 
 msgid "Invalid index number."
 msgstr "無效的索引編號。"
 

-#: menu.c:438 menu.c:459 menu.c:524 menu.c:567 menu.c:583 menu.c:594
-#: menu.c:605 menu.c:616 menu.c:629 menu.c:642 menu.c:1043
+#: menu.c:436 menu.c:457 menu.c:522 menu.c:565 menu.c:581 menu.c:592
+#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1052

 msgid "No entries."
 msgstr "沒有資料。"
 
 msgid "No entries."
 msgstr "沒有資料。"
 

-#: menu.c:456
+#: menu.c:454

 msgid "You cannot scroll down farther."
 msgstr "您無法再向下捲動了。"
 
 msgid "You cannot scroll down farther."
 msgstr "您無法再向下捲動了。"
 

-#: menu.c:474
+#: menu.c:472

 msgid "You cannot scroll up farther."
 msgstr "您無法再向上捲動了。"
 
 msgid "You cannot scroll up farther."
 msgstr "您無法再向上捲動了。"
 

-#: menu.c:517
+#: menu.c:515

 msgid "You are on the first page."
 msgstr "您現在在第一頁。"
 
 msgid "You are on the first page."
 msgstr "您現在在第一頁。"
 

-#: menu.c:518
+#: menu.c:516

 msgid "You are on the last page."
 msgstr "您現在在最後一頁。"
 
 msgid "You are on the last page."
 msgstr "您現在在最後一頁。"
 

-#: menu.c:653
+#: menu.c:651

 msgid "You are on the last entry."
 msgstr "您現在在最後一項。"
 
 msgid "You are on the last entry."
 msgstr "您現在在最後一項。"
 

-#: menu.c:664
+#: menu.c:662

 msgid "You are on the first entry."
 msgstr "您現在在第一項。"
 
 msgid "You are on the first entry."
 msgstr "您現在在第一項。"
 

-#: menu.c:724 pattern.c:1417
+#: menu.c:733 pager.c:2058 pattern.c:1408

 msgid "Search for: "
 msgstr "搜尋："
 
 msgid "Search for: "
 msgstr "搜尋："
 

-#: menu.c:725 pattern.c:1418
+#: menu.c:733 pager.c:2058 pattern.c:1408

 msgid "Reverse search for: "
 msgstr "返向搜尋："
 
 msgid "Reverse search for: "
 msgstr "返向搜尋："
 

-#: menu.c:735 pattern.c:1450
-msgid "No search pattern."
-msgstr "沒有搜尋格式。"
-
-#: menu.c:765 pager.c:1987 pager.c:2003 pager.c:2111 pattern.c:1533
+#: menu.c:778 pager.c:2011 pager.c:2033 pager.c:2154 pattern.c:1519

 msgid "Not found."
 msgstr "沒有找到。"
 
 msgid "Not found."
 msgstr "沒有找到。"
 

-#: menu.c:895
+#: menu.c:904

 msgid "No tagged entries."
 msgstr "沒有已標記的記錄。"
 
 msgid "No tagged entries."
 msgstr "沒有已標記的記錄。"
 

-#: menu.c:1000
+#: menu.c:1009

 msgid "Search is not implemented for this menu."
 msgstr "這個選單中沒有搜尋功能。"
 
 msgid "Search is not implemented for this menu."
 msgstr "這個選單中沒有搜尋功能。"
 

-#: menu.c:1005
+#: menu.c:1014

 msgid "Jumping is not implemented for dialogs."
 msgstr "對話模式中不支援跳躍功能。"
 
 msgid "Jumping is not implemented for dialogs."
 msgstr "對話模式中不支援跳躍功能。"
 

-#: menu.c:1046
+#: menu.c:1055

 msgid "Tagging is not supported."
 msgstr "不支援標記功能。"
 
 msgid "Tagging is not supported."
 msgstr "不支援標記功能。"
 

-#: mh.c:1116
+#: mh.c:1130

 #, fuzzy, c-format
 msgid "Scanning %s..."
 msgstr "正在選擇 %s …"
 
 #, fuzzy, c-format
 msgid "Scanning %s..."
 msgstr "正在選擇 %s …"
 

-#: mh.c:1358
+#: mh.c:1331 mh.c:1409
+#, fuzzy
+msgid "Could not flush message to disk"
+msgstr "無法寄出信件。"
+
+#: mh.c:1376

 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 


@@ -2924,238 +2996,258 @@ msgstr ""
 msgid "Error setting SASL external security strength"
 msgstr ""
 
 msgid "Error setting SASL external security strength"
 msgstr ""
 

-#: mutt_sasl.c:252
+#: mutt_sasl.c:255

 msgid "Error setting SASL external user name"
 msgstr ""
 
 msgid "Error setting SASL external user name"
 msgstr ""
 

-#: mutt_socket.c:103 mutt_socket.c:174
+#: mutt_socket.c:103 mutt_socket.c:181

 #, c-format
 msgid "Connection to %s closed"
 msgstr "到 %s 的連線中斷了"
 
 #, c-format
 msgid "Connection to %s closed"
 msgstr "到 %s 的連線中斷了"
 

-#: mutt_socket.c:294
+#: mutt_socket.c:300

 msgid "SSL is unavailable."
 msgstr "沒有 SSL 功能"
 
 msgid "SSL is unavailable."
 msgstr "沒有 SSL 功能"
 

-#: mutt_socket.c:326
+#: mutt_socket.c:332

 msgid "Preconnect command failed."
 msgstr "預先連接指令失敗。"
 
 msgid "Preconnect command failed."
 msgstr "預先連接指令失敗。"
 

-#: mutt_socket.c:397 mutt_socket.c:411
+#: mutt_socket.c:403 mutt_socket.c:417

 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "連線到 %s (%s) 時失敗"
 
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "連線到 %s (%s) 時失敗"
 

-#: mutt_socket.c:464 mutt_socket.c:522
+#: mutt_socket.c:470 mutt_socket.c:529

 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "無效的 IDN「%s」。"
 
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "無效的 IDN「%s」。"
 

-#: mutt_socket.c:471 mutt_socket.c:529
+#: mutt_socket.c:478 mutt_socket.c:537

 #, c-format
 msgid "Looking up %s..."
 msgstr "正在尋找 %s…"
 
 #, c-format
 msgid "Looking up %s..."
 msgstr "正在尋找 %s…"
 

-#: mutt_socket.c:482 mutt_socket.c:536
+#: mutt_socket.c:488 mutt_socket.c:546

 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "找不到主機 \"%s\""
 
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "找不到主機 \"%s\""
 

-#: mutt_socket.c:487 mutt_socket.c:545
+#: mutt_socket.c:494 mutt_socket.c:552

 #, c-format
 msgid "Connecting to %s..."
 msgstr "正連接到 %s…"
 
 #, c-format
 msgid "Connecting to %s..."
 msgstr "正連接到 %s…"
 

-#: mutt_socket.c:569
+#: mutt_socket.c:576

 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "無法連線到 %s (%s)。"
 
 # Well, I don't know how to translate the word "entropy"
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "無法連線到 %s (%s)。"
 
 # Well, I don't know how to translate the word "entropy"

-#: mutt_ssl.c:175
+#: mutt_ssl.c:183

 msgid "Failed to find enough entropy on your system"
 msgstr ""
 
 msgid "Failed to find enough entropy on your system"
 msgstr ""
 

-#: mutt_ssl.c:199
+#: mutt_ssl.c:207

 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr ""
 

-#: mutt_ssl.c:207
+#: mutt_ssl.c:215

 #, c-format
 msgid "%s has insecure permissions!"
 msgstr "%s 的權限不安全！"
 
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr "%s 的權限不安全！"
 

-#: mutt_ssl.c:226
+#: mutt_ssl.c:234

 msgid "SSL disabled due the lack of entropy"
 msgstr ""
 
 msgid "SSL disabled due the lack of entropy"
 msgstr ""
 

-#: mutt_ssl.c:323
+#: mutt_ssl.c:331

 msgid "I/O error"
 msgstr ""
 
 msgid "I/O error"
 msgstr ""
 

-#: mutt_ssl.c:332
+#: mutt_ssl.c:340

 #, fuzzy, c-format
 msgid "SSL failed: %s"
 msgstr "登入失敗： %s"
 
 #, fuzzy, c-format
 msgid "SSL failed: %s"
 msgstr "登入失敗： %s"
 

-#: mutt_ssl.c:341 mutt_ssl_gnutls.c:504 mutt_ssl_gnutls.c:513
-#: mutt_ssl_gnutls.c:542
+#: mutt_ssl.c:349 mutt_ssl_gnutls.c:950 mutt_ssl_gnutls.c:984
+#: mutt_ssl_gnutls.c:994

 msgid "Unable to get certificate from peer"
 msgstr "無法從對方拿取驗証"
 
 msgid "Unable to get certificate from peer"
 msgstr "無法從對方拿取驗証"
 

-#: mutt_ssl.c:349
+#: mutt_ssl.c:357

 #, c-format
 msgid "SSL connection using %s (%s)"
 msgstr "利用 %s (%s) 來進行 SSL"
 
 #, c-format
 msgid "SSL connection using %s (%s)"
 msgstr "利用 %s (%s) 來進行 SSL"
 

-#: mutt_ssl.c:393
+#: mutt_ssl.c:401

 msgid "Unknown"
 msgstr "不明"
 
 msgid "Unknown"
 msgstr "不明"
 

-#: mutt_ssl.c:418 mutt_ssl_gnutls.c:392
+#: mutt_ssl.c:426 mutt_ssl_gnutls.c:473

 #, c-format
 msgid "[unable to calculate]"
 msgstr "【無法計算】"
 
 #, c-format
 msgid "[unable to calculate]"
 msgstr "【無法計算】"
 

-#: mutt_ssl.c:436 mutt_ssl_gnutls.c:415
+#: mutt_ssl.c:444 mutt_ssl_gnutls.c:496

 msgid "[invalid date]"
 msgstr "【無效的日期】"
 
 msgid "[invalid date]"
 msgstr "【無效的日期】"
 

-#: mutt_ssl.c:557
+#: mutt_ssl.c:572

 msgid "Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 
 msgid "Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 

-#: mutt_ssl.c:564
+#: mutt_ssl.c:579

 msgid "Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 
 msgid "Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 

-#: mutt_ssl.c:630 mutt_ssl_gnutls.c:645
+#: mutt_ssl.c:699
+#, fuzzy
+msgid "cannot get certificate subject"
+msgstr "無法從對方拿取驗証"
+
+#: mutt_ssl.c:711
+#, fuzzy
+msgid "cannot get certificate common name"
+msgstr "無法從對方拿取驗証"
+
+#: mutt_ssl.c:720
+#, c-format
+msgid "certificate owner does not match hostname %s"
+msgstr ""
+
+#: mutt_ssl.c:761
+#, fuzzy, c-format
+msgid "Certificate host check failed: %s"
+msgstr "驗証已儲存"
+
+#: mutt_ssl.c:839 mutt_ssl_gnutls.c:732

 msgid "This certificate belongs to:"
 msgstr "這個驗証屬於："
 
 msgid "This certificate belongs to:"
 msgstr "這個驗証屬於："
 

-#: mutt_ssl.c:641 mutt_ssl_gnutls.c:684
+#: mutt_ssl.c:852 mutt_ssl_gnutls.c:771

 msgid "This certificate was issued by:"
 msgstr "這個驗証的派發者："
 
 msgid "This certificate was issued by:"
 msgstr "這個驗証的派發者："
 

-#: mutt_ssl.c:652 mutt_ssl_gnutls.c:723
+#: mutt_ssl.c:863 mutt_ssl_gnutls.c:810

 #, c-format
 msgid "This certificate is valid"
 msgstr "這個驗証有效"
 
 #, c-format
 msgid "This certificate is valid"
 msgstr "這個驗証有效"
 

-#: mutt_ssl.c:653 mutt_ssl_gnutls.c:726
+#: mutt_ssl.c:864 mutt_ssl_gnutls.c:813

 #, c-format
 msgid "   from %s"
 msgstr "   由 %s"
 
 #, c-format
 msgid "   from %s"
 msgstr "   由 %s"
 

-#: mutt_ssl.c:655 mutt_ssl_gnutls.c:730
+#: mutt_ssl.c:866 mutt_ssl_gnutls.c:817

 #, c-format
 msgid "     to %s"
 msgstr "     至 %s"
 
 #, c-format
 msgid "     to %s"
 msgstr "     至 %s"
 

-#: mutt_ssl.c:661
+#: mutt_ssl.c:872

 #, c-format
 msgid "Fingerprint: %s"
 msgstr "指模：%s"
 
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "指模：%s"
 

-#: mutt_ssl.c:663
-msgid "SSL Certificate check"
-msgstr "SSL 驗証測試"
+#: mutt_ssl.c:875 mutt_ssl_gnutls.c:854
+#, c-format
+msgid "SSL Certificate check (certificate %d of %d in chain)"
+msgstr ""

 
 

-#: mutt_ssl.c:667 mutt_ssl_gnutls.c:771
+#: mutt_ssl.c:883 mutt_ssl_gnutls.c:863

 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(1)不接受，(2)只是這次接受，(3)永遠接受"
 
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(1)不接受，(2)只是這次接受，(3)永遠接受"
 

-#: mutt_ssl.c:668 mutt_ssl_gnutls.c:772
+#: mutt_ssl.c:884 mutt_ssl_gnutls.c:864

 msgid "roa"
 msgstr "123"
 
 msgid "roa"
 msgstr "123"
 

-#: mutt_ssl.c:672 mutt_ssl_gnutls.c:776
+#: mutt_ssl.c:888 mutt_ssl_gnutls.c:868

 msgid "(r)eject, accept (o)nce"
 msgstr "(1)不接受，(2)只是這次接受"
 
 msgid "(r)eject, accept (o)nce"
 msgstr "(1)不接受，(2)只是這次接受"
 

-#: mutt_ssl.c:673 mutt_ssl_gnutls.c:777
+#: mutt_ssl.c:889 mutt_ssl_gnutls.c:869

 msgid "ro"
 msgstr "12"
 
 msgid "ro"
 msgstr "12"
 

-#: mutt_ssl.c:704 mutt_ssl_gnutls.c:826
+#: mutt_ssl.c:920 mutt_ssl_gnutls.c:918

 msgid "Warning: Couldn't save certificate"
 msgstr "警告：未能儲存驗証"
 
 msgid "Warning: Couldn't save certificate"
 msgstr "警告：未能儲存驗証"
 

-#: mutt_ssl.c:709 mutt_ssl_gnutls.c:831
+#: mutt_ssl.c:925 mutt_ssl_gnutls.c:923

 msgid "Certificate saved"
 msgstr "驗証已儲存"
 
 msgid "Certificate saved"
 msgstr "驗証已儲存"
 

-#: mutt_ssl_gnutls.c:96 mutt_ssl_gnutls.c:119
+#: mutt_ssl_gnutls.c:106 mutt_ssl_gnutls.c:133

 msgid "Error: no TLS socket open"
 msgstr ""
 
 msgid "Error: no TLS socket open"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:215
+#: mutt_ssl_gnutls.c:292

 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:276
+#: mutt_ssl_gnutls.c:356

 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "利用 %s (%s) 來進行 SSL"
 
 #, fuzzy, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "利用 %s (%s) 來進行 SSL"
 

-#: mutt_ssl_gnutls.c:519
-#, c-format
-msgid "Certificate verification error (%s)"
-msgstr ""
-
-#: mutt_ssl_gnutls.c:527
-#, fuzzy
-msgid "Certificate is not X.509"
-msgstr "驗証已儲存"
-
-#: mutt_ssl_gnutls.c:534
+#: mutt_ssl_gnutls.c:563 mutt_ssl_gnutls.c:712

 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "無法初始化終端機。"
 
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "無法初始化終端機。"
 

-#: mutt_ssl_gnutls.c:550
+#: mutt_ssl_gnutls.c:570 mutt_ssl_gnutls.c:719

 msgid "Error processing certificate data"
 msgstr ""
 
 msgid "Error processing certificate data"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:735
+#: mutt_ssl_gnutls.c:703
+msgid "Warning: Server certificate was signed using an insecure algorithm"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:822

 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "指模：%s"
 
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "指模：%s"
 

-#: mutt_ssl_gnutls.c:738
+#: mutt_ssl_gnutls.c:825

 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "指模：%s"
 
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "指模：%s"
 

-#: mutt_ssl_gnutls.c:743
+#: mutt_ssl_gnutls.c:830

 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 

-#: mutt_ssl_gnutls.c:748
+#: mutt_ssl_gnutls.c:835

 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 

-#: mutt_ssl_gnutls.c:753
+#: mutt_ssl_gnutls.c:840

 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "伺服器的驗証已過期"
 
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "伺服器的驗証已過期"
 

-#: mutt_ssl_gnutls.c:758
+#: mutt_ssl_gnutls.c:845

 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:763
+#: mutt_ssl_gnutls.c:850

 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "伺服器的驗証還未有效"
 
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "伺服器的驗証還未有效"
 

-#: mutt_ssl_gnutls.c:766
+#: mutt_ssl_gnutls.c:956
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:965

 #, fuzzy
 #, fuzzy

-msgid "TLS/SSL Certificate check"
-msgstr "SSL 驗証測試"
+msgid "Certificate is not X.509"
+msgstr "驗証已儲存"

 
 #: mutt_tunnel.c:72
 #, fuzzy, c-format
 
 #: mutt_tunnel.c:72
 #, fuzzy, c-format


@@ -3172,41 +3264,41 @@ msgstr ""
 msgid "Tunnel error talking to %s: %s"
 msgstr "連線到 %s (%s) 時失敗"
 
 msgid "Tunnel error talking to %s: %s"
 msgstr "連線到 %s (%s) 時失敗"
 

-#: muttlib.c:911
+#: muttlib.c:938

 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "檔案是一個目錄, 儲存在它下面 ?"
 
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "檔案是一個目錄, 儲存在它下面 ?"
 

-#: muttlib.c:911
+#: muttlib.c:938

 msgid "yna"
 msgstr ""
 
 msgid "yna"
 msgstr ""
 

-#: muttlib.c:927
+#: muttlib.c:954

 msgid "File is a directory, save under it?"
 msgstr "檔案是一個目錄, 儲存在它下面 ?"
 
 msgid "File is a directory, save under it?"
 msgstr "檔案是一個目錄, 儲存在它下面 ?"
 

-#: muttlib.c:933
+#: muttlib.c:960

 msgid "File under directory: "
 msgstr "在目錄底下的檔案："
 
 msgid "File under directory: "
 msgstr "在目錄底下的檔案："
 

-#: muttlib.c:945
+#: muttlib.c:972

 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "檔案已經存在, (1)覆蓋, (2)附加, 或是 (3)取消 ?"
 
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "檔案已經存在, (1)覆蓋, (2)附加, 或是 (3)取消 ?"
 

-#: muttlib.c:945
+#: muttlib.c:972

 msgid "oac"
 msgstr "123"
 
 msgid "oac"
 msgstr "123"
 

-#: muttlib.c:1429
+#: muttlib.c:1456

 msgid "Can't save message to POP mailbox."
 msgstr "無法將信件存到信箱。"
 
 msgid "Can't save message to POP mailbox."
 msgstr "無法將信件存到信箱。"
 

-#: muttlib.c:1438
+#: muttlib.c:1465

 #, c-format
 msgid "Append messages to %s?"
 msgstr "附加信件到 %s ?"
 
 #, c-format
 msgid "Append messages to %s?"
 msgstr "附加信件到 %s ?"
 

-#: muttlib.c:1450
+#: muttlib.c:1477

 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s 不是信箱！"
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s 不是信箱！"


@@ -3239,221 +3331,213 @@ msgstr "嘗試 flock 時超過時間！"
 msgid "Waiting for flock attempt... %d"
 msgstr "正在等待 flock 執行成功… %d"
 
 msgid "Waiting for flock attempt... %d"
 msgstr "正在等待 flock 執行成功… %d"
 

-#: mx.c:586
+#: mx.c:556

 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr "無法鎖住 %s。\n"
 
 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr "無法鎖住 %s。\n"
 

-#: mx.c:798
+#: mx.c:768

 #, c-format
 msgid "Could not synchronize mailbox %s!"
 msgstr "無法與 %s 信箱同步！"
 
 #, c-format
 msgid "Could not synchronize mailbox %s!"
 msgstr "無法與 %s 信箱同步！"
 

-#: mx.c:862
+#: mx.c:832

 #, c-format
 msgid "Move read messages to %s?"
 msgstr "搬移已讀取的信件到 %s？"
 
 #, c-format
 msgid "Move read messages to %s?"
 msgstr "搬移已讀取的信件到 %s？"
 

-#: mx.c:878 mx.c:1130
+#: mx.c:848 mx.c:1106

 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "清除 %d 封已經被刪除的信件？"
 
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "清除 %d 封已經被刪除的信件？"
 

-#: mx.c:878 mx.c:1130
+#: mx.c:848 mx.c:1106

 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "清除 %d 封已被刪除的信件？"
 
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "清除 %d 封已被刪除的信件？"
 

-#: mx.c:898
+#: mx.c:869

 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "正在搬移已經讀取的信件到 %s …"
 
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "正在搬移已經讀取的信件到 %s …"
 

-#: mx.c:957 mx.c:1121
+#: mx.c:929 mx.c:1097

 msgid "Mailbox is unchanged."
 msgstr "信箱沒有變動。"
 
 msgid "Mailbox is unchanged."
 msgstr "信箱沒有變動。"
 

-#: mx.c:993
+#: mx.c:967

 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d 封信件被保留, %d 封信件被搬移, %d 封信件被刪除。"
 
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d 封信件被保留, %d 封信件被搬移, %d 封信件被刪除。"
 

-#: mx.c:996 mx.c:1170
+#: mx.c:970 mx.c:1151

 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d 封信件被保留, %d 封信件被刪除。"
 
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d 封信件被保留, %d 封信件被刪除。"
 

-#: mx.c:1106
+#: mx.c:1081

 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr " 請按下 '%s' 來切換寫入模式"
 
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr " 請按下 '%s' 來切換寫入模式"
 

-#: mx.c:1108
+#: mx.c:1083

 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "請使用 'toggle-write' 來重新啟動寫入功能!"
 
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "請使用 'toggle-write' 來重新啟動寫入功能!"
 

-#: mx.c:1110
+#: mx.c:1085

 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr "信箱被標記成為無法寫入的. %s"
 
 # How to translate?
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr "信箱被標記成為無法寫入的. %s"
 
 # How to translate?

-#: mx.c:1167
+#: mx.c:1145

 msgid "Mailbox checkpointed."
 msgstr ""
 
 msgid "Mailbox checkpointed."
 msgstr ""
 

-#: mx.c:1479
+#: mx.c:1461

 msgid "Can't write message"
 msgstr "無法寫信件"
 
 msgid "Can't write message"
 msgstr "無法寫信件"
 

-#: mx.c:1524
+#: mx.c:1506

 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 

-#: pager.c:1481
+#: pager.c:1503

 msgid "PrevPg"
 msgstr "上一頁"
 
 msgid "PrevPg"
 msgstr "上一頁"
 

-#: pager.c:1482
+#: pager.c:1504

 msgid "NextPg"
 msgstr "下一頁"
 
 msgid "NextPg"
 msgstr "下一頁"
 

-#: pager.c:1486
+#: pager.c:1508

 msgid "View Attachm."
 msgstr "顯示附件。"
 
 msgid "View Attachm."
 msgstr "顯示附件。"
 

-#: pager.c:1489
+#: pager.c:1511

 msgid "Next"
 msgstr "下一個"
 
 #. emulate "less -q" and don't go on to the next message.
 msgid "Next"
 msgstr "下一個"
 
 #. emulate "less -q" and don't go on to the next message.

-#: pager.c:1895 pager.c:1926 pager.c:1958 pager.c:2199
+#: pager.c:1912 pager.c:1943 pager.c:1975 pager.c:2252

 msgid "Bottom of message is shown."
 msgstr "現正顯示最下面的信件。"
 
 msgid "Bottom of message is shown."
 msgstr "現正顯示最下面的信件。"
 

-#: pager.c:1911 pager.c:1933 pager.c:1940 pager.c:1947
+#: pager.c:1928 pager.c:1950 pager.c:1957 pager.c:1964

 msgid "Top of message is shown."
 msgstr "現正顯示最上面的信件。"
 
 msgid "Top of message is shown."
 msgstr "現正顯示最上面的信件。"
 

-#: pager.c:2016
-msgid "Reverse search: "
-msgstr "反向搜尋："
-
-#: pager.c:2017
-msgid "Search: "
-msgstr "搜尋："
-
-#: pager.c:2137
+#: pager.c:2190

 msgid "Help is currently being shown."
 msgstr "現正顯示說明文件。"
 
 msgid "Help is currently being shown."
 msgstr "現正顯示說明文件。"
 

-#: pager.c:2166
+#: pager.c:2219

 msgid "No more quoted text."
 msgstr "不能有再多的引言。"
 
 msgid "No more quoted text."
 msgstr "不能有再多的引言。"
 

-#: pager.c:2179
+#: pager.c:2232

 msgid "No more unquoted text after quoted text."
 msgstr "在引言後有過多的非引言文字。"
 
 msgid "No more unquoted text after quoted text."
 msgstr "在引言後有過多的非引言文字。"
 

-#: parse.c:622
+#: parse.c:577

 msgid "multipart message has no boundary parameter!"
 msgstr "多部份郵件沒有分隔的參數!"
 
 msgid "multipart message has no boundary parameter!"
 msgstr "多部份郵件沒有分隔的參數!"
 

-#: pattern.c:275
+#: pattern.c:262

 #, c-format
 msgid "Error in expression: %s"
 msgstr "表達式有錯誤：%s"
 
 #, c-format
 msgid "Error in expression: %s"
 msgstr "表達式有錯誤：%s"
 

-#: pattern.c:280
+#: pattern.c:267

 #, fuzzy, c-format
 msgid "Empty expression"
 msgstr "表達式有錯誤"
 
 #, fuzzy, c-format
 msgid "Empty expression"
 msgstr "表達式有錯誤"
 

-#: pattern.c:411
+#: pattern.c:399

 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "無效的日子：%s"
 
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "無效的日子：%s"
 

-#: pattern.c:425
+#: pattern.c:413

 #, c-format
 msgid "Invalid month: %s"
 msgstr "無效的月份：%s"
 
 #. getDate has its own error message, don't overwrite it here
 #, c-format
 msgid "Invalid month: %s"
 msgstr "無效的月份：%s"
 
 #. getDate has its own error message, don't overwrite it here

-#: pattern.c:577
+#: pattern.c:565

 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "無效的相對日期：%s"
 
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "無效的相對日期：%s"
 

-#: pattern.c:591
+#: pattern.c:579

 msgid "error in expression"
 msgstr "表達式有錯誤"
 
 msgid "error in expression"
 msgstr "表達式有錯誤"
 

-#: pattern.c:812 pattern.c:958
+#: pattern.c:801 pattern.c:947

 #, c-format
 msgid "error in pattern at: %s"
 msgstr "在樣式上有錯誤：%s"
 
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "在樣式上有錯誤：%s"
 

-#: pattern.c:842
+#: pattern.c:831

 #, fuzzy, c-format
 msgid "mismatched brackets: %s"
 msgstr "不對稱的括弧：%s"
 
 #, fuzzy, c-format
 msgid "mismatched brackets: %s"
 msgstr "不對稱的括弧：%s"
 

-#: pattern.c:898
+#: pattern.c:887

 #, fuzzy, c-format
 msgid "%c: invalid pattern modifier"
 msgstr "%c：無效的指令"
 
 #, fuzzy, c-format
 msgid "%c: invalid pattern modifier"
 msgstr "%c：無效的指令"
 

-#: pattern.c:904
+#: pattern.c:893

 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c：在這個模式不支援"
 
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c：在這個模式不支援"
 

-#: pattern.c:917
+#: pattern.c:906

 #, c-format
 msgid "missing parameter"
 msgstr "錯失參數"
 
 #, c-format
 msgid "missing parameter"
 msgstr "錯失參數"
 

-#: pattern.c:933
+#: pattern.c:922

 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "不對稱的括弧：%s"
 
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "不對稱的括弧：%s"
 

-#: pattern.c:965
+#: pattern.c:954

 msgid "empty pattern"
 msgstr "空的格式"
 
 msgid "empty pattern"
 msgstr "空的格式"
 

-#: pattern.c:1218
+#: pattern.c:1208

 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "錯誤：不明的 op %d (請回報這個錯誤)。"
 
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "錯誤：不明的 op %d (請回報這個錯誤)。"
 

-#: pattern.c:1301 pattern.c:1436
+#: pattern.c:1291 pattern.c:1427

 msgid "Compiling search pattern..."
 msgstr "編譯搜尋樣式中…"
 
 msgid "Compiling search pattern..."
 msgstr "編譯搜尋樣式中…"
 

-#: pattern.c:1320
+#: pattern.c:1310

 msgid "Executing command on matching messages..."
 msgstr "正在對符合的郵件執行命令…"
 
 msgid "Executing command on matching messages..."
 msgstr "正在對符合的郵件執行命令…"
 

-#: pattern.c:1387
+#: pattern.c:1377

 msgid "No messages matched criteria."
 msgstr "沒有郵件符合要求。"
 
 msgid "No messages matched criteria."
 msgstr "沒有郵件符合要求。"
 

-#: pattern.c:1469
+#: pattern.c:1455

 #, fuzzy
 msgid "Searching..."
 msgstr "儲存中…"
 
 #, fuzzy
 msgid "Searching..."
 msgstr "儲存中…"
 

-#: pattern.c:1482
+#: pattern.c:1468

 msgid "Search hit bottom without finding match"
 msgstr "已搜尋至結尾，並沒有發現任何符合"
 
 msgid "Search hit bottom without finding match"
 msgstr "已搜尋至結尾，並沒有發現任何符合"
 

-#: pattern.c:1493
+#: pattern.c:1479

 msgid "Search hit top without finding match"
 msgstr "已搜尋至開頭，並沒有發現任何符合"
 
 msgid "Search hit top without finding match"
 msgstr "已搜尋至開頭，並沒有發現任何符合"
 

-#: pattern.c:1525
+#: pattern.c:1511

 msgid "Search interrupted."
 msgstr "搜尋已被中斷。"
 
 msgid "Search interrupted."
 msgstr "搜尋已被中斷。"
 


@@ -3465,11 +3549,11 @@ msgstr "請輸入 PGP 通行密碼："
 msgid "PGP passphrase forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 
 msgid "PGP passphrase forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 

-#: pgp.c:358
+#: pgp.c:368

 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 

-#: pgp.c:392 pgp.c:641 pgp.c:845
+#: pgp.c:402 pgp.c:661 pgp.c:865

 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"


@@ -3477,23 +3561,23 @@ msgstr ""
 "[-- PGP 輸出部份結束 --]\n"
 "\n"
 
 "[-- PGP 輸出部份結束 --]\n"
 "\n"
 

-#: pgp.c:412 pgp.c:460 pgp.c:977
+#: pgp.c:424 pgp.c:475 pgp.c:1000

 #, fuzzy
 msgid "Could not decrypt PGP message"
 msgstr "無法複制信件"
 
 #. clear 'Invoking...' message, since there's no error
 #, fuzzy
 msgid "Could not decrypt PGP message"
 msgstr "無法複制信件"
 
 #. clear 'Invoking...' message, since there's no error

-#: pgp.c:462 pgp.c:973
+#: pgp.c:477 pgp.c:996

 #, fuzzy
 msgid "PGP message successfully decrypted."
 msgstr "PGP 簽名驗證成功。"
 
 #, fuzzy
 msgid "PGP message successfully decrypted."
 msgstr "PGP 簽名驗證成功。"
 

-#: pgp.c:749
+#: pgp.c:769

 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "內部錯誤。聯絡 <roessler@does-not-exist.org>。"
 
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "內部錯誤。聯絡 <roessler@does-not-exist.org>。"
 

-#: pgp.c:810
+#: pgp.c:830

 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"


@@ -3501,33 +3585,33 @@ msgstr ""
 "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 "\n"
 
 "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 "\n"
 

-#: pgp.c:854
+#: pgp.c:877

 #, fuzzy
 msgid "Decryption failed"
 msgstr "登入失敗。"
 
 #, fuzzy
 msgid "Decryption failed"
 msgstr "登入失敗。"
 

-#: pgp.c:1029
+#: pgp.c:1052

 msgid "Can't open PGP subprocess!"
 msgstr "無法開啟 PGP 子程序！"
 
 msgid "Can't open PGP subprocess!"
 msgstr "無法開啟 PGP 子程序！"
 

-#: pgp.c:1466
+#: pgp.c:1489

 msgid "Can't invoke PGP"
 msgstr "不能執行 PGP"
 
 msgid "Can't invoke PGP"
 msgstr "不能執行 PGP"
 

-#: pgp.c:1567
+#: pgp.c:1590

 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 

-#: pgp.c:1568
+#: pgp.c:1591

 msgid "PGP/M(i)ME"
 msgstr ""
 
 msgid "PGP/M(i)ME"
 msgstr ""
 

-#: pgp.c:1568
+#: pgp.c:1591

 msgid "(i)nline"
 msgstr ""
 
 msgid "(i)nline"
 msgstr ""
 

-#: pgp.c:1570
+#: pgp.c:1593

 #, fuzzy
 msgid "esabifc"
 msgstr "1234i5"
 #, fuzzy
 msgid "esabifc"
 msgstr "1234i5"


@@ -3541,30 +3625,30 @@ msgstr "正在拿取 PGP 鑰匙 …"
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "所有符合的鑰匙經已過期或取消。"
 
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "所有符合的鑰匙經已過期或取消。"
 

-#: pgpkey.c:533
+#: pgpkey.c:532

 #, c-format
 msgid "PGP keys matching <%s>."
 msgstr "PGP 鑰匙符合 <%s>。"
 
 #, c-format
 msgid "PGP keys matching <%s>."
 msgstr "PGP 鑰匙符合 <%s>。"
 

-#: pgpkey.c:535
+#: pgpkey.c:534

 #, c-format
 msgid "PGP keys matching \"%s\"."
 msgstr "PGP 鑰匙符合 \"%s\"。"
 
 #, c-format
 msgid "PGP keys matching \"%s\"."
 msgstr "PGP 鑰匙符合 \"%s\"。"
 

-#: pgpkey.c:554 pgpkey.c:746
+#: pgpkey.c:553 pgpkey.c:745

 msgid "Can't open /dev/null"
 msgstr "無法開啟 /dev/null"
 
 msgid "Can't open /dev/null"
 msgstr "無法開啟 /dev/null"
 

-#: pgpkey.c:725
+#: pgpkey.c:724

 msgid "Please enter the key ID: "
 msgstr "請輸入這把鑰匙的 ID："
 
 msgid "Please enter the key ID: "
 msgstr "請輸入這把鑰匙的 ID："
 

-#: pgpkey.c:778
+#: pgpkey.c:777

 #, c-format
 msgid "PGP Key %s."
 msgstr "PGP 鑰匙 %s。"
 
 #, c-format
 msgid "PGP Key %s."
 msgstr "PGP 鑰匙 %s。"
 

-#: pop.c:101 pop_lib.c:201
+#: pop.c:101 pop_lib.c:207

 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr "伺服器不支援 TOP 指令。"
 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr "伺服器不支援 TOP 指令。"


@@ -3573,60 +3657,65 @@ msgstr "伺服器不支援 TOP 指令。"
 msgid "Can't write header to temporary file!"
 msgstr "無法把標頭寫到暫存檔！"
 
 msgid "Can't write header to temporary file!"
 msgstr "無法把標頭寫到暫存檔！"
 

-#: pop.c:267 pop_lib.c:203
+#: pop.c:267 pop_lib.c:209

 #, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "伺服器不支援 UIDL 指令。"
 
 #, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "伺服器不支援 UIDL 指令。"
 

-#: pop.c:391 pop.c:761
+#: pop.c:287
+#, fuzzy, c-format
+msgid "%d messages have been lost. Try reopening the mailbox."
+msgstr "信件的索引不正確。請再重新開啟信箱。"
+
+#: pop.c:402 pop.c:785

 #, c-format
 msgid "%s is an invalid POP path"
 msgstr ""
 
 #, c-format
 msgid "%s is an invalid POP path"
 msgstr ""
 

-#: pop.c:429
+#: pop.c:445

 msgid "Fetching list of messages..."
 msgstr "正在拿取信件…"
 
 msgid "Fetching list of messages..."
 msgstr "正在拿取信件…"
 

-#: pop.c:587
+#: pop.c:603

 msgid "Can't write message to temporary file!"
 msgstr "無法把信件寫到暫存檔！"
 
 msgid "Can't write message to temporary file!"
 msgstr "無法把信件寫到暫存檔！"
 

-#: pop.c:646
+#: pop.c:662

 #, fuzzy
 msgid "Marking messages deleted..."
 msgstr "標簽了的 %d 封信件刪去了…"
 
 #, fuzzy
 msgid "Marking messages deleted..."
 msgstr "標簽了的 %d 封信件刪去了…"
 

-#: pop.c:716 pop.c:781
+#: pop.c:740 pop.c:805

 msgid "Checking for new messages..."
 msgstr "看看有沒有新信件…"
 
 msgid "Checking for new messages..."
 msgstr "看看有沒有新信件…"
 

-#: pop.c:745
+#: pop.c:769

 msgid "POP host is not defined."
 msgstr "POP 主機沒有被定義。"
 
 msgid "POP host is not defined."
 msgstr "POP 主機沒有被定義。"
 

-#: pop.c:809
+#: pop.c:833

 msgid "No new mail in POP mailbox."
 msgstr "POP 信箱中沒有新的信件"
 
 msgid "No new mail in POP mailbox."
 msgstr "POP 信箱中沒有新的信件"
 

-#: pop.c:816
+#: pop.c:840

 msgid "Delete messages from server?"
 msgstr "刪除伺服器上的信件嗎？"
 
 msgid "Delete messages from server?"
 msgstr "刪除伺服器上的信件嗎？"
 

-#: pop.c:818
+#: pop.c:842

 #, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr "讀取新信件中 (%d 個位元組)…"
 
 #, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr "讀取新信件中 (%d 個位元組)…"
 

-#: pop.c:860
+#: pop.c:884

 msgid "Error while writing mailbox!"
 msgstr "寫入信箱時發生錯誤！"
 
 msgid "Error while writing mailbox!"
 msgstr "寫入信箱時發生錯誤！"
 

-#: pop.c:864
+#: pop.c:888

 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [已閱讀 %2d 封信件中的 %1d 封]"
 
 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [已閱讀 %2d 封信件中的 %1d 封]"
 

-#: pop.c:887 pop_lib.c:369
+#: pop.c:911 pop_lib.c:375

 msgid "Server closed connection!"
 msgstr "與伺服器的聯結中斷了!"
 
 msgid "Server closed connection!"
 msgstr "與伺服器的聯結中斷了!"
 


@@ -3651,207 +3740,216 @@ msgstr "APOP 驗證失敗。"
 msgid "Command USER is not supported by server."
 msgstr "伺服器不支援 USER 指令。"
 
 msgid "Command USER is not supported by server."
 msgstr "伺服器不支援 USER 指令。"
 

-#: pop_lib.c:199
+#: pop_lib.c:54
+#, fuzzy, c-format
+msgid "Invalid POP URL: %s\n"
+msgstr "無效的月份：%s"
+
+#: pop_lib.c:205

 msgid "Unable to leave messages on server."
 msgstr "無法把信件留在伺服器上。"
 
 msgid "Unable to leave messages on server."
 msgstr "無法把信件留在伺服器上。"
 

-#: pop_lib.c:229
+#: pop_lib.c:235

 #, c-format
 msgid "Error connecting to server: %s"
 msgstr "連線到 %s 時失敗"
 
 #, c-format
 msgid "Error connecting to server: %s"
 msgstr "連線到 %s 時失敗"
 

-#: pop_lib.c:383
+#: pop_lib.c:389

 msgid "Closing connection to POP server..."
 msgstr "正在關閉與 POP 伺服器的連線…"
 
 msgid "Closing connection to POP server..."
 msgstr "正在關閉與 POP 伺服器的連線…"
 

-#: pop_lib.c:553
+#: pop_lib.c:559

 msgid "Verifying message indexes..."
 msgstr "正在檢查信件的指引 …"
 
 msgid "Verifying message indexes..."
 msgstr "正在檢查信件的指引 …"
 

-#: pop_lib.c:575
+#: pop_lib.c:581

 msgid "Connection lost. Reconnect to POP server?"
 msgstr "連線中斷。再與 POP 伺服器連線嗎？"
 
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "連線中斷。再與 POP 伺服器連線嗎？"
 

-#: postpone.c:167
+#: postpone.c:164

 msgid "Postponed Messages"
 msgstr "信件已經被延遲寄出"
 
 msgid "Postponed Messages"
 msgstr "信件已經被延遲寄出"
 

-#: postpone.c:247 postpone.c:256
+#: postpone.c:244 postpone.c:253

 msgid "No postponed messages."
 msgstr "沒有被延遲寄出的信件。"
 
 msgid "No postponed messages."
 msgstr "沒有被延遲寄出的信件。"
 

-#: postpone.c:444 postpone.c:465 postpone.c:499
+#: postpone.c:441 postpone.c:462 postpone.c:496

 #, fuzzy
 msgid "Illegal crypto header"
 msgstr "不合規定的 PGP 標頭"
 
 #, fuzzy
 msgid "Illegal crypto header"
 msgstr "不合規定的 PGP 標頭"
 

-#: postpone.c:485
+#: postpone.c:482

 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "不合規定的 S/MIME 標頭"
 
 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "不合規定的 S/MIME 標頭"
 

-#: postpone.c:565
+#: postpone.c:562

 #, fuzzy
 msgid "Decrypting message..."
 msgstr "拿取信件中…"
 
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "拿取信件中…"
 

-#: postpone.c:574
+#: postpone.c:571

 #, fuzzy
 msgid "Decryption failed."
 msgstr "登入失敗。"
 
 #, fuzzy
 msgid "Decryption failed."
 msgstr "登入失敗。"
 

-#: query.c:51
+#: query.c:50

 msgid "New Query"
 msgstr "新的查詢"
 
 msgid "New Query"
 msgstr "新的查詢"
 

-#: query.c:52
+#: query.c:51

 msgid "Make Alias"
 msgstr "製作別名"
 
 msgid "Make Alias"
 msgstr "製作別名"
 

-#: query.c:53
+#: query.c:52

 msgid "Search"
 msgstr "搜尋"
 
 msgid "Search"
 msgstr "搜尋"
 

-#: query.c:101
+#: query.c:95

 msgid "Waiting for response..."
 msgstr "等待回應中…"
 
 msgid "Waiting for response..."
 msgstr "等待回應中…"
 

-#: query.c:263 query.c:291
+#: query.c:246 query.c:274

 msgid "Query command not defined."
 msgstr "查詢指令尚未定義。"
 
 msgid "Query command not defined."
 msgstr "查詢指令尚未定義。"
 

-#: query.c:318
+#: query.c:301

 #, c-format
 msgid "Query"
 msgstr "查詢"
 
 #. Prompt for Query
 #, c-format
 msgid "Query"
 msgstr "查詢"
 
 #. Prompt for Query

-#: query.c:331 query.c:356
+#: query.c:313 query.c:338

 msgid "Query: "
 msgstr "查詢："
 
 msgid "Query: "
 msgstr "查詢："
 

-#: query.c:339 query.c:365
+#: query.c:321 query.c:347

 #, c-format
 msgid "Query '%s'"
 msgstr "查詢 '%s'"
 
 #, c-format
 msgid "Query '%s'"
 msgstr "查詢 '%s'"
 

-#: recvattach.c:56
+#: recvattach.c:55

 msgid "Pipe"
 msgstr "管線"
 
 msgid "Pipe"
 msgstr "管線"
 

-#: recvattach.c:57
+#: recvattach.c:56

 msgid "Print"
 msgstr "顯示"
 
 msgid "Print"
 msgstr "顯示"
 

-#: recvattach.c:473
+#: recvattach.c:475

 msgid "Saving..."
 msgstr "儲存中…"
 
 msgid "Saving..."
 msgstr "儲存中…"
 

-#: recvattach.c:476 recvattach.c:567
+#: recvattach.c:478 recvattach.c:569

 msgid "Attachment saved."
 msgstr "附件已被儲存。"
 
 msgid "Attachment saved."
 msgstr "附件已被儲存。"
 

-#: recvattach.c:579
+#: recvattach.c:581

 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "警告! 您正在覆蓋 %s, 是否要繼續?"
 
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "警告! 您正在覆蓋 %s, 是否要繼續?"
 

-#: recvattach.c:597
+#: recvattach.c:599

 msgid "Attachment filtered."
 msgstr "附件被過濾掉。"
 
 msgid "Attachment filtered."
 msgstr "附件被過濾掉。"
 

-#: recvattach.c:664
+#: recvattach.c:666

 msgid "Filter through: "
 msgstr "經過過濾："
 
 msgid "Filter through: "
 msgstr "經過過濾："
 

-#: recvattach.c:664
+#: recvattach.c:666

 msgid "Pipe to: "
 msgstr "導引至："
 
 msgid "Pipe to: "
 msgstr "導引至："
 

-#: recvattach.c:699
+#: recvattach.c:701

 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "我不知道要怎麼列印 %s 附件!"
 
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "我不知道要怎麼列印 %s 附件!"
 

-#: recvattach.c:764
+#: recvattach.c:766

 msgid "Print tagged attachment(s)?"
 msgstr "是否要列印標記起來的附件?"
 
 msgid "Print tagged attachment(s)?"
 msgstr "是否要列印標記起來的附件?"
 

-#: recvattach.c:764
+#: recvattach.c:766

 msgid "Print attachment?"
 msgstr "是否要列印附件?"
 
 msgid "Print attachment?"
 msgstr "是否要列印附件?"
 

-#: recvattach.c:997
+#: recvattach.c:999

 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "找不到已標記的訊息"
 
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "找不到已標記的訊息"
 

-#: recvattach.c:1010
+#: recvattach.c:1011

 msgid "Attachments"
 msgstr "附件"
 
 msgid "Attachments"
 msgstr "附件"
 

-#: recvattach.c:1046
+#: recvattach.c:1047

 msgid "There are no subparts to show!"
 msgstr "沒有部件！"
 
 msgid "There are no subparts to show!"
 msgstr "沒有部件！"
 

-#: recvattach.c:1107
+#: recvattach.c:1108

 msgid "Can't delete attachment from POP server."
 msgstr "無法從 POP 伺服器刪除附件。"
 
 msgid "Can't delete attachment from POP server."
 msgstr "無法從 POP 伺服器刪除附件。"
 

-#: recvattach.c:1115
+#: recvattach.c:1116

 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "未支援刪除 PGP 信件所附帶的附件。"
 
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "未支援刪除 PGP 信件所附帶的附件。"
 

-#: recvattach.c:1134 recvattach.c:1151
+#: recvattach.c:1135 recvattach.c:1152

 msgid "Only deletion of multipart attachments is supported."
 msgstr "只支援刪除多重附件"
 
 msgid "Only deletion of multipart attachments is supported."
 msgstr "只支援刪除多重附件"
 

-#: recvcmd.c:47
+#: recvcmd.c:43

 msgid "You may only bounce message/rfc822 parts."
 msgstr "您只能直接傳送 message/rfc822 的部分。"
 
 msgid "You may only bounce message/rfc822 parts."
 msgstr "您只能直接傳送 message/rfc822 的部分。"
 

-#: recvcmd.c:217
+#: recvcmd.c:148 recvcmd.c:161
+msgid "Warning: message contains no From: header"
+msgstr ""
+
+#: recvcmd.c:241

 #, fuzzy
 msgid "Error bouncing message!"
 msgstr "寄信途中發生錯誤。"
 
 #, fuzzy
 msgid "Error bouncing message!"
 msgstr "寄信途中發生錯誤。"
 

-#: recvcmd.c:217
+#: recvcmd.c:241

 #, fuzzy
 msgid "Error bouncing messages!"
 msgstr "寄信途中發生錯誤。"
 
 #, fuzzy
 msgid "Error bouncing messages!"
 msgstr "寄信途中發生錯誤。"
 

-#: recvcmd.c:417
+#: recvcmd.c:441

 #, c-format
 msgid "Can't open temporary file %s."
 msgstr "無法開啟暫存檔 %s"
 
 #, c-format
 msgid "Can't open temporary file %s."
 msgstr "無法開啟暫存檔 %s"
 

-#: recvcmd.c:448
+#: recvcmd.c:472

 msgid "Forward as attachments?"
 msgstr "利用附件形式來轉寄？"
 
 msgid "Forward as attachments?"
 msgstr "利用附件形式來轉寄？"
 

-#: recvcmd.c:462
+#: recvcmd.c:486

 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "未能把所有已標簽的附件解碼。要用 MIME 轉寄其它的嗎？"
 
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "未能把所有已標簽的附件解碼。要用 MIME 轉寄其它的嗎？"
 

-#: recvcmd.c:587
+#: recvcmd.c:611

 msgid "Forward MIME encapsulated?"
 msgstr "用 MIME 的方式來轉寄？"
 
 msgid "Forward MIME encapsulated?"
 msgstr "用 MIME 的方式來轉寄？"
 

-#: recvcmd.c:595 recvcmd.c:845
+#: recvcmd.c:619 recvcmd.c:869

 #, c-format
 msgid "Can't create %s."
 msgstr "無法建立 %s."
 
 #, c-format
 msgid "Can't create %s."
 msgstr "無法建立 %s."
 

-#: recvcmd.c:728
+#: recvcmd.c:752

 msgid "Can't find any tagged messages."
 msgstr "找不到已標記的訊息"
 
 msgid "Can't find any tagged messages."
 msgstr "找不到已標記的訊息"
 

-#: recvcmd.c:749 send.c:728
+#: recvcmd.c:773 send.c:738

 msgid "No mailing lists found!"
 msgstr "沒有找到郵寄論壇！"
 
 msgid "No mailing lists found!"
 msgstr "沒有找到郵寄論壇！"
 

-#: recvcmd.c:824
+#: recvcmd.c:848

 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr "未能把所有已標簽的附件解碼。要用 MIME 包封其它的嗎？"
 
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr "未能把所有已標簽的附件解碼。要用 MIME 包封其它的嗎？"
 


@@ -3875,47 +3973,47 @@ msgstr "OK"
 msgid "Can't get mixmaster's type2.list!"
 msgstr "拿不到 mixmaster 的 type2.list！"
 
 msgid "Can't get mixmaster's type2.list!"
 msgstr "拿不到 mixmaster 的 type2.list！"
 

-#: remailer.c:543
+#: remailer.c:542

 msgid "Select a remailer chain."
 msgstr "選擇一個郵件轉接器的鏈結"
 
 msgid "Select a remailer chain."
 msgstr "選擇一個郵件轉接器的鏈結"
 

-#: remailer.c:603
+#: remailer.c:602

 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
 msgstr "錯誤：%s 不能用作鏈結的最後一個郵件轉接器"
 
 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
 msgstr "錯誤：%s 不能用作鏈結的最後一個郵件轉接器"
 

-#: remailer.c:633
+#: remailer.c:632

 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
 msgstr "Mixmaster 鏈結最多為 %d 個元件"
 
 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
 msgstr "Mixmaster 鏈結最多為 %d 個元件"
 

-#: remailer.c:656
+#: remailer.c:655

 msgid "The remailer chain is already empty."
 msgstr "郵件轉接器的鏈結已沒有東西了。"
 
 msgid "The remailer chain is already empty."
 msgstr "郵件轉接器的鏈結已沒有東西了。"
 

-#: remailer.c:666
+#: remailer.c:665

 msgid "You already have the first chain element selected."
 msgstr "你已經選擇了鏈結的第一個元件。"
 
 msgid "You already have the first chain element selected."
 msgstr "你已經選擇了鏈結的第一個元件。"
 

-#: remailer.c:676
+#: remailer.c:675

 msgid "You already have the last chain element selected."
 msgstr "你已經選擇了鏈結的最後一個元件。"
 
 msgid "You already have the last chain element selected."
 msgstr "你已經選擇了鏈結的最後一個元件。"
 

-#: remailer.c:715
+#: remailer.c:714

 msgid "Mixmaster doesn't accept Cc or Bcc headers."
 msgstr "Mixmaster 不接受 Cc 和 Bcc 的標頭。"
 
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
 msgstr "Mixmaster 不接受 Cc 和 Bcc 的標頭。"
 

-#: remailer.c:739
+#: remailer.c:738

 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
 msgstr "使用 mixmaster 時請先設定好 hostname 變數！"
 
 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
 msgstr "使用 mixmaster 時請先設定好 hostname 變數！"
 

-#: remailer.c:773
+#: remailer.c:772

 #, c-format
 msgid "Error sending message, child exited %d.\n"
 msgstr "寄送訊息時出現錯誤，子程序結束 %d。\n"
 
 #, c-format
 msgid "Error sending message, child exited %d.\n"
 msgstr "寄送訊息時出現錯誤，子程序結束 %d。\n"
 

-#: remailer.c:777
+#: remailer.c:776

 msgid "Error sending message."
 msgstr "寄信途中發生錯誤。"
 
 msgid "Error sending message."
 msgstr "寄信途中發生錯誤。"
 


@@ -3941,11 +4039,15 @@ msgstr "分數：太少的引數"
 msgid "score: too many arguments"
 msgstr "分數：太多的引數"
 
 msgid "score: too many arguments"
 msgstr "分數：太多的引數"
 

-#: send.c:253
+#: score.c:122
+msgid "Error: score: invalid number"
+msgstr ""
+
+#: send.c:252

 msgid "No subject, abort?"
 msgstr "沒有標題，要不要中斷？"
 
 msgid "No subject, abort?"
 msgstr "沒有標題，要不要中斷？"
 

-#: send.c:255
+#: send.c:254

 msgid "No subject, aborting."
 msgstr "沒有標題，正在中斷中。"
 
 msgid "No subject, aborting."
 msgstr "沒有標題，正在中斷中。"
 


@@ -3954,12 +4056,12 @@ msgstr "沒有標題，正在中斷中。"
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.

-#: send.c:497
+#: send.c:501

 #, c-format
 msgid "Reply to %s%s?"
 msgstr "要回覆給 %s%s?"
 
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "要回覆給 %s%s?"
 

-#: send.c:531
+#: send.c:535

 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "以後的回覆都寄至 %s%s?"
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "以後的回覆都寄至 %s%s?"


@@ -3967,115 +4069,121 @@ msgstr "以後的回覆都寄至 %s%s?"
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.
 #.
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.
 #.

-#: send.c:703
+#: send.c:713

 msgid "No tagged messages are visible!"
 msgstr "沒有被標記了的信件在顯示！"
 
 msgid "No tagged messages are visible!"
 msgstr "沒有被標記了的信件在顯示！"
 

-#: send.c:754
+#: send.c:764

 msgid "Include message in reply?"
 msgstr "回信時是否要包含原本的信件內容？"
 
 msgid "Include message in reply?"
 msgstr "回信時是否要包含原本的信件內容？"
 

-#: send.c:759
+#: send.c:769

 msgid "Including quoted message..."
 msgstr "正引入引言部分…"
 
 msgid "Including quoted message..."
 msgstr "正引入引言部分…"
 

-#: send.c:769
+#: send.c:779

 msgid "Could not include all requested messages!"
 msgstr "無法包含所有要求的信件！"
 
 msgid "Could not include all requested messages!"
 msgstr "無法包含所有要求的信件！"
 

-#: send.c:783
+#: send.c:793

 msgid "Forward as attachment?"
 msgstr "利用附件形式來轉寄？"
 
 msgid "Forward as attachment?"
 msgstr "利用附件形式來轉寄？"
 

-#: send.c:787
+#: send.c:797

 msgid "Preparing forwarded message..."
 msgstr "準備轉寄信件…"
 
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
 msgid "Preparing forwarded message..."
 msgstr "準備轉寄信件…"
 
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.

-#: send.c:1117
+#: send.c:1146

 msgid "Recall postponed message?"
 msgstr "要叫出被延遲的信件?"
 
 msgid "Recall postponed message?"
 msgstr "要叫出被延遲的信件?"
 

-#: send.c:1429
+#: send.c:1458

 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "準備轉寄信件…"
 
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "準備轉寄信件…"
 

-#: send.c:1469
+#: send.c:1498

 msgid "Abort unmodified message?"
 msgstr "是否要中斷未修改過的信件?"
 
 msgid "Abort unmodified message?"
 msgstr "是否要中斷未修改過的信件?"
 

-#: send.c:1471
+#: send.c:1500

 msgid "Aborted unmodified message."
 msgstr "中斷沒有修改過的信件"
 
 msgid "Aborted unmodified message."
 msgstr "中斷沒有修改過的信件"
 

-#: send.c:1540
+#: send.c:1569

 msgid "Message postponed."
 msgstr "信件被延遲寄出。"
 
 msgid "Message postponed."
 msgstr "信件被延遲寄出。"
 

-#: send.c:1549
+#: send.c:1579

 msgid "No recipients are specified!"
 msgstr "沒有指定接受者！"
 
 msgid "No recipients are specified!"
 msgstr "沒有指定接受者！"
 

-#: send.c:1554
+#: send.c:1584

 msgid "No recipients were specified."
 msgstr "沒有指定接受者。"
 
 msgid "No recipients were specified."
 msgstr "沒有指定接受者。"
 

-#: send.c:1570
+#: send.c:1600

 msgid "No subject, abort sending?"
 msgstr "沒有信件標題，要中斷寄信的工作?"
 
 msgid "No subject, abort sending?"
 msgstr "沒有信件標題，要中斷寄信的工作?"
 

-#: send.c:1574
+#: send.c:1604

 msgid "No subject specified."
 msgstr "沒有指定標題。"
 
 msgid "No subject specified."
 msgstr "沒有指定標題。"
 

-#: send.c:1636 smtp.c:158
+#: send.c:1666 smtp.c:185

 msgid "Sending message..."
 msgstr "正在寄出信件…"
 
 msgid "Sending message..."
 msgstr "正在寄出信件…"
 

-#: send.c:1777
+#. check to see if the user wants copies of all attachments
+#: send.c:1699
+#, fuzzy
+msgid "Save attachments in Fcc?"
+msgstr "用文字方式顯示附件內容"
+
+#: send.c:1808

 msgid "Could not send the message."
 msgstr "無法寄出信件。"
 
 msgid "Could not send the message."
 msgstr "無法寄出信件。"
 

-#: send.c:1782
+#: send.c:1813

 msgid "Mail sent."
 msgstr "信件已經寄出。"
 
 msgid "Mail sent."
 msgstr "信件已經寄出。"
 

-#: send.c:1782
+#: send.c:1813

 msgid "Sending in background."
 msgstr "正在背景作業中傳送。"
 
 msgid "Sending in background."
 msgstr "正在背景作業中傳送。"
 

-#: sendlib.c:410
+#: sendlib.c:411

 msgid "No boundary parameter found! [report this error]"
 msgstr "沒有發現分界變數！[回報錯誤]"
 
 msgid "No boundary parameter found! [report this error]"
 msgstr "沒有發現分界變數！[回報錯誤]"
 

-#: sendlib.c:440
+#: sendlib.c:441

 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s 已經不存在！"
 
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s 已經不存在！"
 

-#: sendlib.c:863
+#: sendlib.c:864

 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s 不是信箱。"
 
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s 不是信箱。"
 

-#: sendlib.c:1035
+#: sendlib.c:1036

 #, c-format
 msgid "Could not open %s"
 msgstr "無法開啟 %s"
 
 #, c-format
 msgid "Could not open %s"
 msgstr "無法開啟 %s"
 

-#: sendlib.c:2228
+#: sendlib.c:2320

 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "寄送訊息出現錯誤，子程序已結束 %d (%s)。"
 
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "寄送訊息出現錯誤，子程序已結束 %d (%s)。"
 

-#: sendlib.c:2234
+#: sendlib.c:2326

 msgid "Output of the delivery process"
 msgstr "Delivery process 的輸出"
 
 msgid "Output of the delivery process"
 msgstr "Delivery process 的輸出"
 

-#: sendlib.c:2448
+#: sendlib.c:2500

 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""


@@ -4141,66 +4249,70 @@ msgstr "請輸入 %s 的鑰匙 ID："
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME 鑰匙符合 \"%s\"。"
 
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME 鑰匙符合 \"%s\"。"
 

-#: smime.c:542 smime.c:612 smime.c:630
+#: smime.c:540 smime.c:610 smime.c:628

 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr ""
 
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr ""
 

-#: smime.c:546 smime.c:616
+#: smime.c:544 smime.c:614

 #, fuzzy, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 
 #, fuzzy, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 

-#: smime.c:549 smime.c:619
+#: smime.c:547 smime.c:617

 #, fuzzy, c-format
 msgid "Use ID %s for %s ?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 
 #, fuzzy, c-format
 msgid "Use ID %s for %s ?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 

-#: smime.c:638
+#: smime.c:636

 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 

-#: smime.c:797
+#: smime.c:795

 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 

-#: smime.c:852 smime.c:880 smime.c:945 smime.c:989 smime.c:1054 smime.c:1129
+#: smime.c:850 smime.c:878 smime.c:943 smime.c:987 smime.c:1052 smime.c:1127

 #, fuzzy
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "[-- 錯誤：無法建立 OpenSSL 子程序！ --]\n"
 
 #, fuzzy
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "[-- 錯誤：無法建立 OpenSSL 子程序！ --]\n"
 

-#: smime.c:1207
+#: smime.c:1205

 #, fuzzy
 msgid "no certfile"
 msgstr "無法建立過濾器"
 
 #, fuzzy
 msgid "no certfile"
 msgstr "無法建立過濾器"
 

-#: smime.c:1210
+#: smime.c:1208

 #, fuzzy
 msgid "no mbox"
 msgstr "（沒有信箱）"
 
 #. fatal error while trying to encrypt message
 #, fuzzy
 msgid "no mbox"
 msgstr "（沒有信箱）"
 
 #. fatal error while trying to encrypt message

-#: smime.c:1353
+#: smime.c:1351

 msgid "No output from OpenSSL.."
 msgstr ""
 
 msgid "No output from OpenSSL.."
 msgstr ""
 

-#: smime.c:1391
+#: smime.c:1389
+msgid "Can't sign: No key specified. Use Sign As."
+msgstr ""
+
+#: smime.c:1396

 #, fuzzy
 msgid "Warning: Intermediate certificate not found."
 msgstr "警告：未能儲存驗証"
 
 #, fuzzy
 msgid "Warning: Intermediate certificate not found."
 msgstr "警告：未能儲存驗証"
 

-#: smime.c:1434
+#: smime.c:1443

 #, fuzzy
 msgid "Can't open OpenSSL subprocess!"
 msgstr "無法開啟 OpenSSL 子程序！"
 
 #, fuzzy
 msgid "Can't open OpenSSL subprocess!"
 msgstr "無法開啟 OpenSSL 子程序！"
 

-#: smime.c:1472
+#: smime.c:1483

 msgid "No output from OpenSSL..."
 msgstr ""
 
 msgid "No output from OpenSSL..."
 msgstr ""
 

-#: smime.c:1637 smime.c:1762
+#: smime.c:1648 smime.c:1773

 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"


@@ -4209,26 +4321,26 @@ msgstr ""
 "[-- OpenSSL 輸出部份結束 --]\n"
 "\n"
 
 "[-- OpenSSL 輸出部份結束 --]\n"
 "\n"
 

-#: smime.c:1721 smime.c:1732
+#: smime.c:1732 smime.c:1743

 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- 錯誤：無法建立 OpenSSL 子程序！ --]\n"
 
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- 錯誤：無法建立 OpenSSL 子程序！ --]\n"
 

-#: smime.c:1766
+#: smime.c:1777

 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- 下面是 S/MIME 加密資料 --]\n"
 "\n"
 
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- 下面是 S/MIME 加密資料 --]\n"
 "\n"
 

-#: smime.c:1769
+#: smime.c:1780

 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 

-#: smime.c:1833
+#: smime.c:1844

 #, fuzzy
 msgid ""
 "\n"
 #, fuzzy
 msgid ""
 "\n"


@@ -4237,7 +4349,7 @@ msgstr ""
 "\n"
 "[-- S/MIME 加密資料結束 --]\n"
 
 "\n"
 "[-- S/MIME 加密資料結束 --]\n"
 

-#: smime.c:1835
+#: smime.c:1846

 #, fuzzy
 msgid ""
 "\n"
 #, fuzzy
 msgid ""
 "\n"


@@ -4246,87 +4358,100 @@ msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 
 "\n"
 "[-- 簽署的資料結束 --]\n"
 

-#: smime.c:1946
+#: smime.c:1957

 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
 #, fuzzy
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 

-#: smime.c:1947
+#: smime.c:1958

 #, fuzzy
 msgid "eswabfc"
 msgstr "12345"
 
 #. I use "dra" because "123" is recognized anyway
 #, fuzzy
 msgid "eswabfc"
 msgstr "12345"
 
 #. I use "dra" because "123" is recognized anyway

-#: smime.c:1962
+#: smime.c:1973

 msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
 msgstr ""
 
 msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
 msgstr ""
 

-#: smime.c:1965
+#: smime.c:1976

 msgid "drac"
 msgstr ""
 
 msgid "drac"
 msgstr ""
 

-#: smime.c:1968
+#: smime.c:1979

 msgid "1: DES, 2: Triple-DES "
 msgstr ""
 
 msgid "1: DES, 2: Triple-DES "
 msgstr ""
 

-#: smime.c:1969
+#: smime.c:1980

 msgid "dt"
 msgstr ""
 
 msgid "dt"
 msgstr ""
 

-#: smime.c:1981
+#: smime.c:1992

 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr ""
 
 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr ""
 

-#: smime.c:1982
+#: smime.c:1993

 msgid "468"
 msgstr ""
 
 msgid "468"
 msgstr ""
 

-#: smime.c:1997
+#: smime.c:2008

 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr ""
 
 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr ""
 

-#: smime.c:1998
+#: smime.c:2009

 msgid "895"
 msgstr ""
 
 msgid "895"
 msgstr ""
 

-#: smime.c:2026
-msgid "Can't sign: No key specified. Use Sign As."
-msgstr ""
-
-#: smtp.c:113
+#: smtp.c:134

 #, fuzzy, c-format
 msgid "SMTP session failed: %s"
 msgstr "登入失敗： %s"
 
 #, fuzzy, c-format
 msgid "SMTP session failed: %s"
 msgstr "登入失敗： %s"
 

-#: smtp.c:153
+#: smtp.c:180

 #, fuzzy, c-format
 msgid "SMTP session failed: unable to open %s"
 msgstr "登入失敗： %s"
 
 #, fuzzy, c-format
 msgid "SMTP session failed: unable to open %s"
 msgstr "登入失敗： %s"
 

-#: smtp.c:269
+#: smtp.c:258
+msgid "No from address given"
+msgstr ""
+
+#: smtp.c:314

 msgid "SMTP session failed: read error"
 msgstr ""
 
 msgid "SMTP session failed: read error"
 msgstr ""
 

-#: smtp.c:271
+#: smtp.c:316

 msgid "SMTP session failed: write error"
 msgstr ""
 
 msgid "SMTP session failed: write error"
 msgstr ""
 

-#: smtp.c:294
+#: smtp.c:318
+msgid "Invalid server response"
+msgstr ""
+
+#: smtp.c:341

 #, fuzzy, c-format
 msgid "Invalid SMTP URL: %s"
 msgstr "無效的月份：%s"
 
 #, fuzzy, c-format
 msgid "Invalid SMTP URL: %s"
 msgstr "無效的月份：%s"
 

-#: smtp.c:400
+#: smtp.c:451

 msgid "SMTP server does not support authentication"
 msgstr ""
 
 msgid "SMTP server does not support authentication"
 msgstr ""
 

-#: smtp.c:408
+#: smtp.c:459
+msgid "Interactive SMTP authentication not supported"
+msgstr ""
+
+#: smtp.c:465

 #, fuzzy
 msgid "SMTP authentication requires SASL"
 msgstr "GSSAPI 驗證失敗。"
 
 #, fuzzy
 msgid "SMTP authentication requires SASL"
 msgstr "GSSAPI 驗證失敗。"
 

-#: smtp.c:551
+#: smtp.c:499
+#, fuzzy, c-format
+msgid "%s authentication failed, trying next method"
+msgstr "SASL 驗證失敗。"
+
+#: smtp.c:516

 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "SASL 驗證失敗。"
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "SASL 驗證失敗。"


@@ -4970,7 +5095,8 @@ msgid "use the current message as a template for a new one"
 msgstr "用這封信件作為新信件的範本"
 
 #: ../keymap_alldefs.h:157
 msgstr "用這封信件作為新信件的範本"
 
 #: ../keymap_alldefs.h:157

-msgid "save message/attachment to a file"
+#, fuzzy
+msgid "save message/attachment to a mailbox/file"

 msgstr "儲存信件/附件到某個檔案"
 
 #: ../keymap_alldefs.h:158
 msgstr "儲存信件/附件到某個檔案"
 
 #: ../keymap_alldefs.h:158


@@ -5160,6 +5286,26 @@ msgstr "擷取 PGP 公共鑰匙"
 msgid "show S/MIME options"
 msgstr "顯示 S/MIME 選項"
 
 msgid "show S/MIME options"
 msgstr "顯示 S/MIME 選項"
 

+#~ msgid "No search pattern."
+#~ msgstr "沒有搜尋格式。"
+
+#~ msgid "Reverse search: "
+#~ msgstr "反向搜尋："
+
+#~ msgid "Search: "
+#~ msgstr "搜尋："
+
+#, fuzzy
+#~ msgid "Error checking signature"
+#~ msgstr "寄信途中發生錯誤。"
+
+#~ msgid "SSL Certificate check"
+#~ msgstr "SSL 驗証測試"
+
+#, fuzzy
+#~ msgid "TLS/SSL Certificate check"
+#~ msgstr "SSL 驗証測試"
+

 #~ msgid "Getting namespaces..."
 #~ msgstr "拿取 namespace 中…"
 
 #~ msgid "Getting namespaces..."
 #~ msgstr "拿取 namespace 中…"