584138-mx_update_context-segfault.patch: fix a segfault due to holes in IMAP headers...

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

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 46695c0f3abe651498d7a02088baad54c9601cc6..8cd0ee80f6c2b0cc65e72e7fc0065107e704894f 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: 2009-01-05 16:36-0800\n"
+"POT-Creation-Date: 2010-09-15 10:09-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,22 +14,22 @@ 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:161
+#: account.c:163

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

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

 #, 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:1479 postpone.c:41 query.c:48
+#: addrbook.c:37 browser.c:46 pager.c:1530 postpone.c:41 query.c:48

 #: recvattach.c:53
 msgid "Exit"
 msgstr "離開"
 
 #: recvattach.c:53
 msgid "Exit"
 msgstr "離開"
 

-#: addrbook.c:38 curs_main.c:406 pager.c:1486 postpone.c:42
+#: addrbook.c:38 curs_main.c:406 pager.c:1537 postpone.c:42

 msgid "Del"
 msgstr "刪除"
 
 msgid "Del"
 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:3832 curs_main.c:412
-#: mutt_ssl.c:899 mutt_ssl_gnutls.c:805 pager.c:1578 pgpkey.c:522
-#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:437
+#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3827 curs_main.c:412
+#: mutt_ssl.c:988 mutt_ssl_gnutls.c:875 pager.c:1629 pgpkey.c:522
+#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:425

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


@@ -87,8 +87,8 @@ msgstr "個人姓名："
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] 接受?"
 
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] 接受?"
 

-#: alias.c:347 recvattach.c:431 recvattach.c:454 recvattach.c:467
-#: recvattach.c:480 recvattach.c:510
+#: alias.c:347 recvattach.c:440 recvattach.c:466 recvattach.c:479
+#: recvattach.c:492 recvattach.c:522

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


@@ -97,16 +97,16 @@ msgstr "存到檔案："
 msgid "Error reading alias file"
 msgstr "讀取信件時發生錯誤！"
 
 msgid "Error reading alias file"
 msgstr "讀取信件時發生錯誤！"
 

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

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

-#: alias.c:390
+#: 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:969
+#: 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:1182 curs_lib.c:177
-#: curs_lib.c:543
+#: attach.c:134 attach.c:266 commands.c:223 compose.c:1179 curs_lib.c:180
+#: curs_lib.c:548

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


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

-#: attach.c:677 attach.c:709 attach.c:1002 attach.c:1060 handler.c:1304
+#: 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 "無法建立過濾器"
 
 #: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "無法建立過濾器"
 

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

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

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

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

-#: browser.c:46
+#: browser.c:47

 msgid "Chdir"
 msgstr "改變目錄"
 
 msgid "Chdir"
 msgstr "改變目錄"
 

-#: browser.c:47
+#: browser.c:48

 msgid "Mask"
 msgstr "遮罩"
 
 msgid "Mask"
 msgstr "遮罩"
 

-#: browser.c:383 browser.c:1023
+#: browser.c:400 browser.c:1055

 #, 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:539

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

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

 #, 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:550

 #, 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:562

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

-#: browser.c:669 browser.c:1092 browser.c:1190
+#: browser.c:701 browser.c:1123 browser.c:1221

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

-#: browser.c:873
+#: browser.c:905

 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:929

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

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

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

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

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

-#: browser.c:933
+#: browser.c:965

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

-#: browser.c:947
+#: browser.c:979

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

-#: browser.c:953
+#: browser.c:985

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

-#: browser.c:972
+#: browser.c:1004

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

-#: browser.c:1011 browser.c:1085
+#: browser.c:1043 browser.c:1116

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

-#: browser.c:1035
+#: browser.c:1067

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

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

 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:1109
+#: browser.c:1140

 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:1110
+#: browser.c:1141

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

-#: browser.c:1177
+#: browser.c:1208

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

-#: browser.c:1208
+#: browser.c:1239

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

-#: browser.c:1225
+#: browser.c:1256

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

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

 #, 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:776
+#: color.c:705 hook.c:69 hook.c:77 keymap.c:902

 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:787

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


@@ -381,92 +401,97 @@ msgstr "PGP 簽名驗證成功。"
 msgid "PGP signature could NOT be verified."
 msgstr "PGP 簽名無法驗證。"
 
 msgid "PGP signature could NOT be verified."
 msgstr "PGP 簽名無法驗證。"
 

-#: commands.c:230
+#: commands.c:231

 msgid "Command: "
 msgstr "指令："
 
 msgid "Command: "
 msgstr "指令："
 

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

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

-#: commands.c:252 recvcmd.c:145
+#: commands.c:276 recvcmd.c:173

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

-#: commands.c:267 recvcmd.c:154
+#: commands.c:291 recvcmd.c:182

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

-#: commands.c:275 recvcmd.c:162
+#: commands.c:299 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:176
+#: commands.c:310 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:176
+#: commands.c:310 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:192
+#: commands.c:326 recvcmd.c:220

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

-#: commands.c:302 recvcmd.c:192
+#: commands.c:326 recvcmd.c:220

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

-#: commands.c:312 recvcmd.c:211
+#: commands.c:336 recvcmd.c:239

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

-#: commands.c:312 recvcmd.c:211
+#: commands.c:336 recvcmd.c:239

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

-#: commands.c:389 commands.c:423 commands.c:440
+#: commands.c:413 commands.c:447 commands.c:464

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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:537

 #, 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:538

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

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

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

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

 #, 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:739

 #, 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:740

 #, 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:741

 #, 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:742

 #, 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:742

 #, 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:743

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

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

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

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

 #, 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:942

 #, 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:947

 #, 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:949

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

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

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


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

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

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


@@ -575,170 +600,179 @@ msgstr "附加檔案"
 msgid "Descrip"
 msgstr "敘述"
 
 msgid "Descrip"
 msgstr "敘述"
 

-#: compose.c:132
+#: compose.c:119
+#, fuzzy
+msgid "Not supported"
+msgstr "不支援標記功能。"
+
+#: compose.c:124

 msgid "Sign, Encrypt"
 msgstr "簽名，加密"
 
 msgid "Sign, Encrypt"
 msgstr "簽名，加密"
 

-#: compose.c:134
+#: compose.c:126

 msgid "Encrypt"
 msgstr "加密"
 
 msgid "Encrypt"
 msgstr "加密"
 

-#: compose.c:136
+#: compose.c:128

 msgid "Sign"
 msgstr "簽名"
 
 msgid "Sign"
 msgstr "簽名"
 

-#: compose.c:138
-msgid "Clear"
-msgstr "清除"
+#: compose.c:130
+msgid "None"
+msgstr ""

 
 

-#: compose.c:145
+#: compose.c:137

 #, fuzzy
 #, fuzzy

-msgid " (inline)"
+msgid " (inline PGP)"

 msgstr "（繼續）\n"
 
 msgstr "（繼續）\n"
 

-#: compose.c:147
+#: compose.c:139

 msgid " (PGP/MIME)"
 msgstr ""
 
 msgid " (PGP/MIME)"
 msgstr ""
 

-#: compose.c:155 compose.c:159
+#: compose.c:143
+msgid " (S/MIME)"
+msgstr ""
+
+#: compose.c:152 compose.c:156

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

-#: compose.c:155 compose.c:159
+#: compose.c:152 compose.c:156

 msgid "<default>"
 msgstr "<預設值>"
 
 msgid "<default>"
 msgstr "<預設值>"
 

-#: compose.c:167
+#: compose.c:164

 #, fuzzy
 msgid "Encrypt with: "
 msgstr "加密"
 
 #, fuzzy
 msgid "Encrypt with: "
 msgstr "加密"
 

-#: compose.c:221
+#: compose.c:218

 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] 已不存在!"
 
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] 已不存在!"
 

-#: compose.c:229
+#: compose.c:226

 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] 已修改。更新編碼？"
 
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] 已修改。更新編碼？"
 

-#: compose.c:272
+#: compose.c:269

 msgid "-- Attachments"
 msgstr "-- 附件"
 
 msgid "-- Attachments"
 msgstr "-- 附件"
 

-#: compose.c:302
+#: compose.c:299

 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "警告：「%s」為無效的 IDN。"
 
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "警告：「%s」為無效的 IDN。"
 

-#: compose.c:325
+#: compose.c:322

 msgid "You may not delete the only attachment."
 msgstr "您不可以刪除唯一的附件。"
 
 msgid "You may not delete the only attachment."
 msgstr "您不可以刪除唯一的附件。"
 

-#: compose.c:600 send.c:1560
+#: compose.c:597 send.c:1586

 #, 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:683
+#: compose.c:680

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: compose.c:1013 editmsg.c:96 editmsg.c:121 sendlib.c:857
+#: compose.c:1010 editmsg.c:96 editmsg.c:121 sendlib.c:872

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

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

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

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

 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:1059
+#: compose.c:1056

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

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

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

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

 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:1141
+#: compose.c:1138

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

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

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

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

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

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

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

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

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

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

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


@@ -853,7 +887,7 @@ msgstr ""
 msgid "PKA verified signer's address is: "
 msgstr ""
 
 msgid "PKA verified signer's address is: "
 msgstr ""
 

-#: crypt-gpgme.c:1185 crypt-gpgme.c:3299
+#: crypt-gpgme.c:1185 crypt-gpgme.c:3294

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


@@ -910,7 +944,7 @@ 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:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2290
+#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2287

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


@@ -928,7 +962,7 @@ msgstr ""
 msgid "*** End Notation ***\n"
 msgstr ""
 
 msgid "*** End Notation ***\n"
 msgstr ""
 

-#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2305
+#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2302

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


@@ -944,21 +978,21 @@ msgid ""
 "\n"
 msgstr "[-- 錯誤：突發的檔尾！ --]\n"
 
 "\n"
 msgstr "[-- 錯誤：突發的檔尾！ --]\n"
 

-#: crypt-gpgme.c:2082
+#: crypt-gpgme.c:2079

 #, fuzzy, c-format
 msgid "Error extracting key data!\n"
 msgstr "在樣式上有錯誤：%s"
 
 #, fuzzy, c-format
 msgid "Error extracting key data!\n"
 msgstr "在樣式上有錯誤：%s"
 

-#: crypt-gpgme.c:2265
+#: 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:2313
+#: crypt-gpgme.c:2310

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

-#: crypt-gpgme.c:2333 pgp.c:427
+#: crypt-gpgme.c:2330 pgp.c:438

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


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

-#: crypt-gpgme.c:2335 pgp.c:429
+#: 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:2338 pgp.c:431
+#: crypt-gpgme.c:2335 pgp.c:442

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


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

-#: crypt-gpgme.c:2365 pgp.c:457
+#: 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:2367 pgp.c:464
+#: 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:2369 pgp.c:466
+#: 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:2393 pgp.c:499
+#: crypt-gpgme.c:2388 pgp.c:515

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


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

-#: crypt-gpgme.c:2424 pgp.c:931
+#: crypt-gpgme.c:2419 pgp.c:947

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


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

-#: crypt-gpgme.c:2436 crypt-gpgme.c:2502 pgp.c:944
+#: crypt-gpgme.c:2431 crypt-gpgme.c:2497 pgp.c:960

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

-#: crypt-gpgme.c:2448
+#: crypt-gpgme.c:2443

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


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

-#: crypt-gpgme.c:2449 pgp.c:953
+#: crypt-gpgme.c:2444 pgp.c:969

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


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

-#: crypt-gpgme.c:2471
+#: crypt-gpgme.c:2466

 #, 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:2472 pgp.c:973
+#: crypt-gpgme.c:2467 pgp.c:989

 #, 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:2514
+#: crypt-gpgme.c:2509

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


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

-#: crypt-gpgme.c:2515
+#: crypt-gpgme.c:2510

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


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

-#: crypt-gpgme.c:2545
+#: crypt-gpgme.c:2540

 #, 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:2546
+#: crypt-gpgme.c:2541

 #, 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:3139
+#: crypt-gpgme.c:3134

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

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

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

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

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

-#: crypt-gpgme.c:3225
+#: crypt-gpgme.c:3220

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

-#: crypt-gpgme.c:3225
+#: crypt-gpgme.c:3220

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

-#: crypt-gpgme.c:3228 crypt-gpgme.c:3367
+#: crypt-gpgme.c:3223 crypt-gpgme.c:3362

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

-#: crypt-gpgme.c:3248 crypt-gpgme.c:3391
+#: crypt-gpgme.c:3243 crypt-gpgme.c:3386

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

-#: crypt-gpgme.c:3261 crypt-gpgme.c:3404
+#: crypt-gpgme.c:3256 crypt-gpgme.c:3399

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

-#: crypt-gpgme.c:3274 crypt-gpgme.c:3417
+#: crypt-gpgme.c:3269 crypt-gpgme.c:3412

 #, 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:3276 crypt-gpgme.c:3419
+#: crypt-gpgme.c:3271 crypt-gpgme.c:3414

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

-#: crypt-gpgme.c:3281 crypt-gpgme.c:3424
+#: crypt-gpgme.c:3276 crypt-gpgme.c:3419

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

-#: crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3292 crypt-gpgme.c:3425
-#: crypt-gpgme.c:3430 crypt-gpgme.c:3435
+#: crypt-gpgme.c:3277 crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3420
+#: crypt-gpgme.c:3425 crypt-gpgme.c:3430

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

-#: crypt-gpgme.c:3286 crypt-gpgme.c:3429
+#: crypt-gpgme.c:3281 crypt-gpgme.c:3424

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

-#: crypt-gpgme.c:3291 crypt-gpgme.c:3434
+#: crypt-gpgme.c:3286 crypt-gpgme.c:3429

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

-#: crypt-gpgme.c:3331
+#: crypt-gpgme.c:3326

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

-#: crypt-gpgme.c:3339
+#: crypt-gpgme.c:3334

 #, 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:3358
+#: crypt-gpgme.c:3353

 #, 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:3362
+#: crypt-gpgme.c:3357

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

-#: crypt-gpgme.c:3372
+#: crypt-gpgme.c:3367

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

-#: crypt-gpgme.c:3377
+#: crypt-gpgme.c:3372

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

-#: crypt-gpgme.c:3461 pgpkey.c:559 pgpkey.c:739
+#: crypt-gpgme.c:3456 pgpkey.c:559 pgpkey.c:739

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

-#: crypt-gpgme.c:3464
+#: crypt-gpgme.c:3459

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

-#: crypt-gpgme.c:3490
+#: crypt-gpgme.c:3485

 #, 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:3500
+#: crypt-gpgme.c:3495

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

-#: crypt-gpgme.c:3511 pgpkey.c:580
+#: crypt-gpgme.c:3506 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:3594
+#: crypt-gpgme.c:3589

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

-#: crypt-gpgme.c:3633 crypt-gpgme.c:3696
+#: crypt-gpgme.c:3628 crypt-gpgme.c:3691

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

-#: crypt-gpgme.c:3683 crypt-gpgme.c:3724
+#: crypt-gpgme.c:3678 crypt-gpgme.c:3719

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

-#: crypt-gpgme.c:3795
+#: crypt-gpgme.c:3790

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

-#: crypt-gpgme.c:3824 mutt_ssl.c:897 mutt_ssl_gnutls.c:803 pgpkey.c:515
-#: smime.c:432
+#: crypt-gpgme.c:3819 mutt_ssl.c:986 mutt_ssl_gnutls.c:873 pgpkey.c:515
+#: smime.c:420

 msgid "Exit  "
 msgstr "離開  "
 
 #. __STRCAT_CHECKED__
 msgid "Exit  "
 msgstr "離開  "
 
 #. __STRCAT_CHECKED__

-#: crypt-gpgme.c:3826 pgpkey.c:517 smime.c:434
+#: crypt-gpgme.c:3821 pgpkey.c:517 smime.c:422

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

-#: crypt-gpgme.c:3829 pgpkey.c:520
+#: crypt-gpgme.c:3824 pgpkey.c:520

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

-#: crypt-gpgme.c:3845
+#: crypt-gpgme.c:3840

 #, 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:3847
+#: crypt-gpgme.c:3842

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

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

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

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

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

-#: crypt-gpgme.c:3854
+#: crypt-gpgme.c:3849

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

-#: crypt-gpgme.c:3856
+#: 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:3883 pgpkey.c:600
+#: crypt-gpgme.c:3878 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:3897 pgpkey.c:612
+#: crypt-gpgme.c:3892 pgpkey.c:612

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

-#: crypt-gpgme.c:3917 pgpkey.c:616
+#: crypt-gpgme.c:3912 pgpkey.c:616

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

-#: crypt-gpgme.c:3920 pgpkey.c:619
+#: crypt-gpgme.c:3915 pgpkey.c:619

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

-#: crypt-gpgme.c:3923 pgpkey.c:622
+#: crypt-gpgme.c:3918 pgpkey.c:622

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

-#: crypt-gpgme.c:3931 pgpkey.c:626
+#: crypt-gpgme.c:3926 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:3988 crypt-gpgme.c:4101 pgpkey.c:834 pgpkey.c:935
+#: crypt-gpgme.c:3983 crypt-gpgme.c:4096 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:4264 pgp.c:1180
+#: crypt-gpgme.c:4259 pgp.c:1196

 #, 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:4300 pgp.c:1214 smime.c:664 smime.c:789
+#: crypt-gpgme.c:4295 pgp.c:1230 smime.c:650 smime.c:775

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

-#: crypt-gpgme.c:4365
+#: crypt-gpgme.c:4360

 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:4393
+#: crypt-gpgme.c:4388

 #, 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:4394
+#: crypt-gpgme.c:4389

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

-#: crypt-gpgme.c:4397
+#: crypt-gpgme.c:4392

 #, 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:4398
+#: crypt-gpgme.c:4393

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


@@ -1332,15 +1366,15 @@ msgstr "12345"
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s

-#: crypt-gpgme.c:4414 pgp.c:1590 smime.c:2033 smime.c:2045
+#: crypt-gpgme.c:4409 pgp.c:1629 smime.c:2026 smime.c:2038

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

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

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

-#: crypt-gpgme.c:4514
+#: crypt-gpgme.c:4538

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


@@ -1371,7 +1405,7 @@ msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
 #. abort
 msgstr ""
 
 #. abort

-#: crypt.c:157 send.c:1512
+#: crypt.c:157 send.c:1537

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


@@ -1450,33 +1484,33 @@ msgid "Invoking S/MIME..."
 msgstr "啟動 S/MIME…"
 
 # Don't translate this!!
 msgstr "啟動 S/MIME…"
 
 # Don't translate this!!

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

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

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

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

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

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

-#: curs_lib.c:495 mutt_socket.c:577 mutt_ssl.c:337
+#: curs_lib.c:500 mutt_socket.c:577 mutt_ssl.c:358

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

-#: curs_lib.c:515
+#: curs_lib.c:520

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

-#: curs_lib.c:559
+#: curs_lib.c:564

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

-#: curs_main.c:52 curs_main.c:617 curs_main.c:647
+#: curs_main.c:52 curs_main.c:613 curs_main.c:643

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


@@ -1484,11 +1518,11 @@ msgstr "沒有已開啟的信箱。"
 msgid "There are no messages."
 msgstr "沒有信件。"
 
 msgid "There are no messages."
 msgstr "沒有信件。"
 

-#: curs_main.c:54 mx.c:1115 pager.c:51 recvattach.c:43
+#: curs_main.c:54 mx.c:1095 pager.c:51 recvattach.c:43

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

-#: curs_main.c:55 pager.c:52 recvattach.c:912
+#: curs_main.c:55 pager.c:52 recvattach.c:924

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


@@ -1525,7 +1559,7 @@ msgstr "儲存"
 msgid "Mail"
 msgstr "信件"
 
 msgid "Mail"
 msgstr "信件"
 

-#: curs_main.c:410 pager.c:1487
+#: curs_main.c:410 pager.c:1538

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


@@ -1533,212 +1567,221 @@ msgstr "回覆"
 msgid "Group"
 msgstr "群組"
 
 msgid "Group"
 msgstr "群組"
 

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

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

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

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

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

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

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

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

-#: curs_main.c:659 menu.c:921
+#: curs_main.c:655 menu.c:914

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

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

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

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

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

-#: curs_main.c:788
+#: curs_main.c:779

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

-#: curs_main.c:791
+#: curs_main.c:782

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

-#: curs_main.c:804 curs_main.c:1845 pager.c:2288
+#: curs_main.c:795 curs_main.c:1872 pager.c:2373

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

-#: curs_main.c:807
+#: curs_main.c:798

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

-#: curs_main.c:829
+#: curs_main.c:820

 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:834
+#: curs_main.c:825

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

-#: curs_main.c:844
+#: curs_main.c:835

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

-#: curs_main.c:866
+#: curs_main.c:857

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

-#: curs_main.c:878
+#: curs_main.c:869

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

-#: curs_main.c:963
+#: curs_main.c:959

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

-#: curs_main.c:972 curs_main.c:2134 pager.c:2598
+#: curs_main.c:968 curs_main.c:2166 pager.c:2683

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

-#: curs_main.c:974
+#: curs_main.c:970

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

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

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

-#: curs_main.c:1062
+#: curs_main.c:1004
+#, fuzzy
+msgid "Logged out of IMAP servers."
+msgstr "正在關閉與 IMAP 伺服器的連線…"
+
+#: curs_main.c:1083

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

-#: curs_main.c:1064
+#: curs_main.c:1085

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

-#: curs_main.c:1074
+#: curs_main.c:1095

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

-#: curs_main.c:1102 mx.c:503 mx.c:652
+#: curs_main.c:1123 mx.c:472 mx.c:621

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

-#: curs_main.c:1197
+#: curs_main.c:1222

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

-#: curs_main.c:1215 curs_main.c:1248 curs_main.c:1692 curs_main.c:1724
-#: flags.c:282 thread.c:1026 thread.c:1081 thread.c:1136
+#: curs_main.c:1240 curs_main.c:1275 curs_main.c:1719 curs_main.c:1751
+#: flags.c:282 thread.c:1029 thread.c:1084 thread.c:1139

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

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

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

-#: curs_main.c:1245
+#: curs_main.c:1263
+msgid "Thread cannot be broken, message is not part of a thread"
+msgstr ""
+
+#: curs_main.c:1272

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

-#: curs_main.c:1250
+#: curs_main.c:1277

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

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

 #, 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:1264
+#: curs_main.c:1291

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

-#: curs_main.c:1267
+#: curs_main.c:1294

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

-#: curs_main.c:1303 curs_main.c:1328
+#: curs_main.c:1330 curs_main.c:1355

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

-#: curs_main.c:1310 curs_main.c:1354
+#: curs_main.c:1337 curs_main.c:1381

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

-#: curs_main.c:1347 curs_main.c:1371
+#: curs_main.c:1374 curs_main.c:1398

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

-#: curs_main.c:1446 menu.c:766 pager.c:1986 pattern.c:1466
+#: curs_main.c:1473 menu.c:759 pager.c:2042 pattern.c:1477

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

-#: curs_main.c:1455 pager.c:2008 pattern.c:1477
+#: curs_main.c:1482 pager.c:2064 pattern.c:1488

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

-#: curs_main.c:1496
+#: curs_main.c:1523

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

-#: curs_main.c:1496
+#: curs_main.c:1523

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

-#: curs_main.c:1497
+#: curs_main.c:1524

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

-#: curs_main.c:1513
+#: curs_main.c:1540

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

-#: curs_main.c:1550 pager.c:2564
+#: curs_main.c:1577 pager.c:2649

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

-#: curs_main.c:1627
+#: curs_main.c:1654

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

-#: curs_main.c:1629
+#: curs_main.c:1656

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

-#: curs_main.c:1710
+#: curs_main.c:1737

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

-#: curs_main.c:1804 pager.c:2271
+#: curs_main.c:1831 pager.c:2342

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

-#: curs_main.c:1886
+#: curs_main.c:1913

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

-#: curs_main.c:2017
+#: curs_main.c:2044

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

-#: curs_main.c:2107 pager.c:2583
+#: curs_main.c:2139 pager.c:2668

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


@@ -1811,41 +1854,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"


@@ -1896,79 +1939,79 @@ msgstr "設定旗標"
 msgid "Clear flag"
 msgstr "清除旗標"
 
 msgid "Clear flag"
 msgstr "清除旗標"
 

-#: handler.c:1070
+#: 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:1187
+#: handler.c:1176

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

-#: handler.c:1199
+#: 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:1223
+#: handler.c:1204

 msgid "One or more parts of this message could not be displayed"
 msgstr ""
 
 msgid "One or more parts of this message could not be displayed"
 msgstr ""
 

-#: handler.c:1275
+#: 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:1276
+#: handler.c:1257

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

-#: handler.c:1308
+#: 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:1327 handler.c:1348
+#: 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:1387
+#: 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:1408
+#: 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:1415
+#: handler.c:1396

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

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

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

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

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

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

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

-#: handler.c:1440 handler.c:1456
+#: 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:1442
+#: handler.c:1423

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


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

-#: handler.c:1460
+#: 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:1575
+#: handler.c:1583

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

-#: handler.c:1585
+#: handler.c:1593

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

-#: handler.c:1639
+#: handler.c:1650

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

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

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

-#: handler.c:1711
+#: handler.c:1730

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

-#: handler.c:1713
+#: handler.c:1732

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

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

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


@@ -2054,22 +2102,22 @@ msgstr "%s 的求助"
 msgid "Bad history file format (line %d)"
 msgstr ""
 
 msgid "Bad history file format (line %d)"
 msgstr ""
 

-#: hook.c:251
+#: hook.c:250

 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "unhook: 在 hook 裡面不能做 unhook *"
 
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "unhook: 在 hook 裡面不能做 unhook *"
 

-#: hook.c:263
+#: hook.c:262

 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook：不明的 hook type %s"
 
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook：不明的 hook type %s"
 

-#: hook.c:269
+#: hook.c:268

 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr "unhook：不能從 %2$s 刪除 %1$s。"
 
 #, c-format
 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:483
+#: imap/auth.c:108 pop_auth.c:398 smtp.c:515

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


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

-#: imap/auth_sasl.c:97 smtp.c:519
+#: imap/auth_sasl.c:97 smtp.c:551

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


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

-#: imap/browse.c:58 imap/imap.c:567
+#: 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 ""


@@ -2128,39 +2176,39 @@ 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:278
+#: imap/browse.c:280

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

-#: imap/browse.c:283 imap/browse.c:329
+#: 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:291
+#: imap/browse.c:293

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

-#: imap/browse.c:322
+#: 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:337
+#: 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:342
+#: imap/browse.c:344

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

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

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


@@ -2174,109 +2222,109 @@ msgstr "登入失敗： %s"
 msgid "Closing connection to %s..."
 msgstr "正在關閉與 %s 的連線…"
 
 msgid "Closing connection to %s..."
 msgstr "正在關閉與 %s 的連線…"
 

-#: imap/imap.c:311
+#: 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:434 pop_lib.c:286 smtp.c:392
+#: imap/imap.c:433 pop_lib.c:295 smtp.c:424

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

-#: imap/imap.c:443 pop_lib.c:306 smtp.c:404
+#: imap/imap.c:442 pop_lib.c:315 smtp.c:436

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

-#: imap/imap.c:459 pop_lib.c:327
+#: imap/imap.c:458 pop_lib.c:336

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

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

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

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

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

-#: imap/imap.c:811 imap/message.c:834 muttlib.c:1478
+#: imap/imap.c:813 imap/message.c:851 muttlib.c:1545

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

-#: imap/imap.c:1183
+#: imap/imap.c:1186

 msgid "Expunge failed"
 msgstr "刪除 (expunge) 失敗"
 
 msgid "Expunge failed"
 msgstr "刪除 (expunge) 失敗"
 

-#: imap/imap.c:1195
+#: 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:1224
+#: 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:1273
+#: imap/imap.c:1279

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

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

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

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

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

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

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

-#: imap/imap.c:1746
+#: 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:1818
+#: imap/imap.c:1826

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

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

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

-#: imap/imap.c:1845
+#: 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:1855
+#: 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:1857
+#: 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:98
+#: imap/message.c:99

 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:108
+#: imap/message.c:109

 #, 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:140
+#: imap/message.c:141

 #, fuzzy
 msgid "Evaluating cache..."
 msgstr "正在取回信件標頭… [%d/%d]"
 #, fuzzy
 msgid "Evaluating cache..."
 msgstr "正在取回信件標頭… [%d/%d]"


@@ -2286,274 +2334,288 @@ msgstr "正在取回信件標頭… [%d/%d]"
 msgid "Fetching message headers..."
 msgstr "正在取回信件標頭… [%d/%d]"
 
 msgid "Fetching message headers..."
 msgstr "正在取回信件標頭… [%d/%d]"
 

-#: imap/message.c:428 imap/message.c:485 pop.c:547
+#: imap/message.c:441 imap/message.c:498 pop.c:563

 msgid "Fetching message..."
 msgstr "拿取信件中…"
 
 msgid "Fetching message..."
 msgstr "拿取信件中…"
 

-#: imap/message.c:474 pop.c:542
+#: imap/message.c:487 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:627
+#: imap/message.c:641

 #, fuzzy
 msgid "Uploading message..."
 msgstr "正在上傳信件…"
 
 #, fuzzy
 msgid "Uploading message..."
 msgstr "正在上傳信件…"
 

-#: imap/message.c:798
+#: imap/message.c:815

 #, 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:802
+#: imap/message.c:819

 #, 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:336
+#: imap/util.c:358

 msgid "Continue?"
 msgstr "繼續？"
 
 msgid "Continue?"
 msgstr "繼續？"
 

-#: init.c:58 init.c:1777 pager.c:50
+#: init.c:60 init.c:1758 pager.c:50

 #, c-format
 msgid "Not available in this menu."
 msgstr "在這個菜單中沒有這個功能。"
 
 #, c-format
 msgid "Not available in this menu."
 msgstr "在這個菜單中沒有這個功能。"
 

-#: init.c:466
+#: init.c:468

 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 
 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 

-#: init.c:523
+#: init.c:525

 #, c-format
 msgid "Not enough subexpressions for spam template"
 msgstr ""
 
 #, c-format
 msgid "Not enough subexpressions for spam template"
 msgstr ""
 

-#: init.c:749
+#: init.c:715

 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "標記符合某個格式的信件"
 
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "標記符合某個格式的信件"
 

-#: init.c:751
+#: init.c:717

 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "反標記符合某個格式的信件"
 
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "反標記符合某個格式的信件"
 

-#: init.c:888
-msgid "Missing -rx or -addr."
-msgstr ""
-
-#: init.c:901
+#: init.c:861

 #, c-format
 #, c-format

-msgid "Warning: Bad IDN '%s'.\n"
+msgid "%sgroup: missing -rx or -addr."

 msgstr ""
 
 msgstr ""
 

-#: init.c:1109
+#: init.c:879
+#, fuzzy, c-format
+msgid "%sgroup: warning: bad IDN '%s'.\n"
+msgstr "警告：別名「%2$s」當中的「%1$s」為無效的 IDN。\n"
+
+#: init.c:1094

 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "編輯附件的說明"
 
 #, fuzzy
 msgid "attachments: no disposition"
 msgstr "編輯附件的說明"
 

-#: init.c:1147
+#: init.c:1132

 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "編輯附件的說明"
 
 #, fuzzy
 msgid "attachments: invalid disposition"
 msgstr "編輯附件的說明"
 

-#: init.c:1161
+#: init.c:1146

 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "編輯附件的說明"
 
 #, fuzzy
 msgid "unattachments: no disposition"
 msgstr "編輯附件的說明"
 

-#: init.c:1184
+#: init.c:1169

 msgid "unattachments: invalid disposition"
 msgstr ""
 
 msgid "unattachments: invalid disposition"
 msgstr ""
 

-#: init.c:1311
+#: init.c:1296

 msgid "alias: no address"
 msgstr "別名：沒有電子郵件位址"
 
 msgid "alias: no address"
 msgstr "別名：沒有電子郵件位址"
 

-#: init.c:1359
+#: init.c:1344

 #, 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:1447
+#: init.c:1432

 msgid "invalid header field"
 msgstr "無效的標頭欄位"
 
 msgid "invalid header field"
 msgstr "無效的標頭欄位"
 

-#: init.c:1500
+#: init.c:1485

 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s：不明的排序方式"
 
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s：不明的排序方式"
 

-#: init.c:1610
+#: init.c:1592

 #, 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:1754 init.c:1867
+#: init.c:1735 init.c:1848

 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s：不明的變數"
 
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s：不明的變數"
 

-#: init.c:1763
+#: init.c:1744

 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "重新設置後字首仍不合規定"
 
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "重新設置後字首仍不合規定"
 

-#: init.c:1769
+#: init.c:1750

 #, c-format
 msgid "value is illegal with reset"
 msgstr "重新設置後值仍不合規定"
 
 #, c-format
 msgid "value is illegal with reset"
 msgstr "重新設置後值仍不合規定"
 

-#: init.c:1805 init.c:1817
+#: init.c:1786 init.c:1798

 #, c-format
 msgid "Usage: set variable=yes|no"
 msgstr ""
 
 #, c-format
 msgid "Usage: set variable=yes|no"
 msgstr ""
 

-#: init.c:1825
+#: init.c:1806

 #, c-format
 msgid "%s is set"
 msgstr "%s 已被設定"
 
 #, c-format
 msgid "%s is set"
 msgstr "%s 已被設定"
 

-#: init.c:1825
+#: init.c:1806

 #, c-format
 msgid "%s is unset"
 msgstr "%s 沒有被設定"
 
 #, c-format
 msgid "%s is unset"
 msgstr "%s 沒有被設定"
 

-#: init.c:1926
+#: init.c:1909

 #, fuzzy, c-format
 msgid "Invalid value for option %s: \"%s\""
 msgstr "無效的日子：%s"
 
 #, fuzzy, c-format
 msgid "Invalid value for option %s: \"%s\""
 msgstr "無效的日子：%s"
 

-#: init.c:2064
+#: init.c:2046

 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s：無效的信箱種類"
 
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s：無效的信箱種類"
 

-#: init.c:2095 init.c:2155
+#: init.c:2077
+#, fuzzy, c-format
+msgid "%s: invalid value (%s)"
+msgstr "%s：無效的值"
+
+#: init.c:2078
+msgid "format error"
+msgstr ""
+
+#: init.c:2078
+msgid "number overflow"
+msgstr ""
+
+#: init.c:2138

 #, c-format
 msgid "%s: invalid value"
 msgstr "%s：無效的值"
 
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s：無效的值"
 

-#: init.c:2196
+#: init.c:2179

 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s：不明的種類"
 
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s：不明的種類"
 

-#: init.c:2223
+#: init.c:2206

 #, c-format
 msgid "%s: unknown type"
 msgstr "%s：不明的種類"
 
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s：不明的種類"
 

-#: init.c:2285
+#: init.c:2268

 #, 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:2308
+#: init.c:2291

 #, c-format
 msgid "source: errors in %s"
 msgstr "source：錯誤發生在 %s"
 
 #, c-format
 msgid "source: errors in %s"
 msgstr "source：錯誤發生在 %s"
 

-#: init.c:2309
+#: init.c:2292

 #, 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:2323
+#: init.c:2306

 #, c-format
 msgid "source: error at %s"
 msgstr "source：錯誤發生在 %s"
 
 #, c-format
 msgid "source: error at %s"
 msgstr "source：錯誤發生在 %s"
 

-#: init.c:2328
+#: init.c:2311

 msgid "source: too many arguments"
 msgstr "source：太多引數"
 
 msgid "source: too many arguments"
 msgstr "source：太多引數"
 

-#: init.c:2382
+#: init.c:2365

 #, c-format
 msgid "%s: unknown command"
 msgstr "%s：不明的指令"
 
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s：不明的指令"
 

-#: init.c:2867
+#: init.c:2850

 #, 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:2922
+#: init.c:2923

 msgid "unable to determine home directory"
 msgstr "無法決定 home 目錄"
 
 msgid "unable to determine home directory"
 msgstr "無法決定 home 目錄"
 

-#: init.c:2930
+#: init.c:2931

 msgid "unable to determine username"
 msgstr "無法決定使用者名稱"
 
 msgid "unable to determine username"
 msgstr "無法決定使用者名稱"
 

-#: init.c:3166
+#: init.c:3167

 msgid "-group: no group name"
 msgstr ""
 
 msgid "-group: no group name"
 msgstr ""
 

-#: init.c:3176
+#: init.c:3177

 #, fuzzy
 msgid "out of arguments"
 msgstr "太少參數"
 
 #, fuzzy
 msgid "out of arguments"
 msgstr "太少參數"
 

-#: keymap.c:491
+#: keymap.c:526

 msgid "Macro loop detected."
 msgstr "檢測到巨集中有迴圈。"
 
 msgid "Macro loop detected."
 msgstr "檢測到巨集中有迴圈。"
 

-#: keymap.c:701 keymap.c:709
+#: keymap.c:827 keymap.c:835

 msgid "Key is not bound."
 msgstr "這個鍵還未被定義功能。"
 
 msgid "Key is not bound."
 msgstr "這個鍵還未被定義功能。"
 

-#: keymap.c:713
+#: keymap.c:839

 #, 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:724
+#: keymap.c:850

 msgid "push: too many arguments"
 msgstr "push：太多引數"
 
 msgid "push: too many arguments"
 msgstr "push：太多引數"
 

-#: keymap.c:754
+#: keymap.c:880

 #, c-format
 msgid "%s: no such menu"
 msgstr "%s：沒有這個選單"
 
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s：沒有這個選單"
 

-#: keymap.c:769
+#: keymap.c:895

 msgid "null key sequence"
 msgstr "空的鍵值序列"
 
 msgid "null key sequence"
 msgstr "空的鍵值序列"
 

-#: keymap.c:856
+#: keymap.c:982

 msgid "bind: too many arguments"
 msgstr "bind：太多引數"
 
 msgid "bind: too many arguments"
 msgstr "bind：太多引數"
 

-#: keymap.c:879
+#: keymap.c:1005

 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s：在對映表中沒有這樣的功能"
 
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s：在對映表中沒有這樣的功能"
 

-#: keymap.c:903
+#: keymap.c:1029

 msgid "macro: empty key sequence"
 msgstr "macro：空的鍵值序列"
 
 msgid "macro: empty key sequence"
 msgstr "macro：空的鍵值序列"
 

-#: keymap.c:914
+#: keymap.c:1040

 msgid "macro: too many arguments"
 msgstr "macro：引數太多"
 
 msgid "macro: too many arguments"
 msgstr "macro：引數太多"
 

-#: keymap.c:950
+#: keymap.c:1076

 msgid "exec: no arguments"
 msgstr "exec：沒有引數"
 
 msgid "exec: no arguments"
 msgstr "exec：沒有引數"
 

-#: keymap.c:970
+#: keymap.c:1096

 #, c-format
 msgid "%s: no such function"
 msgstr "%s：沒有這個功能"
 
 #, c-format
 msgid "%s: no such function"
 msgstr "%s：沒有這個功能"
 

-#: keymap.c:991
+#: keymap.c:1117

 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "請輸入 %s 的鑰匙 ID："
 
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "請輸入 %s 的鑰匙 ID："
 

-#: keymap.c:996
+#: keymap.c:1122

 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""


@@ -2597,7 +2659,7 @@ msgid ""
 "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-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) 2006-2008 Rocco Rutte <pdmef@gmx.net>\n"
+"Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"

 "\n"
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"
 "\n"
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"


@@ -2628,8 +2690,8 @@ msgstr ""
 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
 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> [...]] [--] "
+"<file> [...] --] <addr> [...]\n"
+"       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...] --] "

 "<addr> [...] < message\n"
 "       mutt [<options>] -p\n"
 "       mutt [<options>] -A <alias> [...]\n"
 "<addr> [...] < message\n"
 "       mutt [<options>] -p\n"
 "       mutt [<options>] -A <alias> [...]\n"


@@ -2642,17 +2704,18 @@ msgstr ""
 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"
 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"

-"  -a <file>\tattach a file to the message\n"
+"  -a <file> [...] --\tattach file(s) to the message\n"
+"\t\tthe list of files must be terminated with the \"--\" sequence\n"

 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -D\t\tprint the value of all variables to stdout"
 msgstr ""
 
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -D\t\tprint the value of all variables to stdout"
 msgstr ""
 

-#: main.c:130
+#: main.c:131

 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
 msgstr ""
 
 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
 msgstr ""
 

-#: main.c:133
+#: main.c:134

 #, 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"


@@ -2692,7 +2755,7 @@ msgstr ""
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 

-#: main.c:142
+#: main.c:143

 #, fuzzy
 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"
 #, fuzzy
 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"


@@ -2739,13 +2802,7 @@ msgstr ""
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 

-#: 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 ""
-
-#: main.c:197
+#: main.c:196

 msgid ""
 "\n"
 "Compile options:"
 msgid ""
 "\n"
 "Compile options:"


@@ -2753,72 +2810,77 @@ msgstr ""
 "\n"
 "編譯選項："
 
 "\n"
 "編譯選項："
 

-#: main.c:501
+#: main.c:500

 msgid "Error initializing terminal."
 msgstr "無法初始化終端機。"
 
 msgid "Error initializing terminal."
 msgstr "無法初始化終端機。"
 

-#: main.c:635
+#: 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:637
+#: 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:802
+#: 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:806
+#: 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:848
+#: main.c:852

 msgid "Failed to parse mailto: link\n"
 msgstr ""
 
 msgid "Failed to parse mailto: link\n"
 msgstr ""
 

-#: main.c:860
+#: main.c:864

 msgid "No recipients specified.\n"
 msgstr "沒有指定收件人。\n"
 
 msgid "No recipients specified.\n"
 msgstr "沒有指定收件人。\n"
 

-#: main.c:946
+#: 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:969
+#: main.c:973

 msgid "No mailbox with new mail."
 msgstr "沒有信箱有新信件。"
 
 msgid "No mailbox with new mail."
 msgstr "沒有信箱有新信件。"
 

-#: main.c:978
+#: main.c:982

 msgid "No incoming mailboxes defined."
 msgstr "沒有定義任何的收信郵箱"
 
 msgid "No incoming mailboxes defined."
 msgstr "沒有定義任何的收信郵箱"
 

-#: main.c:1006
+#: main.c:1010

 msgid "Mailbox is empty."
 msgstr "信箱內空無一物。"
 
 msgid "Mailbox is empty."
 msgstr "信箱內空無一物。"
 

-#: mbox.c:123 mbox.c:277 mh.c:1135 mx.c:673
+#: mbox.c:119 mbox.c:269 mh.c:1152 mx.c:642

 #, c-format
 msgid "Reading %s..."
 msgstr "讀取 %s 中…"
 
 #, c-format
 msgid "Reading %s..."
 msgstr "讀取 %s 中…"
 

-#: mbox.c:161 mbox.c:218
+#: mbox.c:157 mbox.c:214

 msgid "Mailbox is corrupt!"
 msgstr "信箱已損壞了！"
 
 msgid "Mailbox is corrupt!"
 msgstr "信箱已損壞了！"
 

-#: mbox.c:678
+#: mbox.c:670

 msgid "Mailbox was corrupted!"
 msgstr "信箱已損壞!"
 
 msgid "Mailbox was corrupted!"
 msgstr "信箱已損壞!"
 

-#: mbox.c:719 mbox.c:976
+#: mbox.c:752 mbox.c:1008

 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "嚴重錯誤！無法重新開啟信箱！"
 
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "嚴重錯誤！無法重新開啟信箱！"
 

-#: mbox.c:728
+#: mbox.c:761

 msgid "Unable to lock mailbox!"
 msgstr "無法鎖住信箱！"
 
 msgid "Unable to lock mailbox!"
 msgstr "無法鎖住信箱！"
 


@@ -2826,32 +2888,29 @@ 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:804

 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:1640 mx.c:766
+#: mbox.c:828 mh.c:1658 mx.c:739

 #, 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:929
+#: mbox.c:963

 msgid "Committing changes..."
 msgstr "正在寫入更改的資料…"
 
 msgid "Committing changes..."
 msgstr "正在寫入更改的資料…"
 

-#: mbox.c:960
+#: mbox.c:994

 #, 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:1024
+#: mbox.c:1056

 msgid "Could not reopen mailbox!"
 msgstr "無法重開信箱！"
 
 msgid "Could not reopen mailbox!"
 msgstr "無法重開信箱！"
 

-#: mbox.c:1059
+#: mbox.c:1092

 msgid "Reopening mailbox..."
 msgstr "重新開啟信箱中…"
 
 msgid "Reopening mailbox..."
 msgstr "重新開啟信箱中…"
 


@@ -2864,7 +2923,7 @@ msgid "Invalid index number."
 msgstr "無效的索引編號。"
 
 #: menu.c:436 menu.c:457 menu.c:522 menu.c:565 menu.c:581 menu.c:592
 msgstr "無效的索引編號。"
 
 #: 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:1058
+#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1051

 msgid "No entries."
 msgstr "沒有資料。"
 
 msgid "No entries."
 msgstr "沒有資料。"
 


@@ -2892,49 +2951,45 @@ msgstr "您現在在最後一項。"
 msgid "You are on the first entry."
 msgstr "您現在在第一項。"
 
 msgid "You are on the first entry."
 msgstr "您現在在第一項。"
 

-#: menu.c:731 pattern.c:1404
+#: menu.c:733 pager.c:2086 pattern.c:1417

 msgid "Search for: "
 msgstr "搜尋："
 
 msgid "Search for: "
 msgstr "搜尋："
 

-#: menu.c:732 pattern.c:1405
+#: menu.c:733 pager.c:2086 pattern.c:1417

 msgid "Reverse search for: "
 msgstr "返向搜尋："
 
 msgid "Reverse search for: "
 msgstr "返向搜尋："
 

-#: menu.c:746 pattern.c:1437
-msgid "No search pattern."
-msgstr "沒有搜尋格式。"
-
-#: menu.c:784 pager.c:1983 pager.c:2005 pager.c:2120 pattern.c:1520
+#: menu.c:777 pager.c:2039 pager.c:2061 pager.c:2181 pattern.c:1531

 msgid "Not found."
 msgstr "沒有找到。"
 
 msgid "Not found."
 msgstr "沒有找到。"
 

-#: menu.c:910
+#: menu.c:903

 msgid "No tagged entries."
 msgstr "沒有已標記的記錄。"
 
 msgid "No tagged entries."
 msgstr "沒有已標記的記錄。"
 

-#: menu.c:1015
+#: menu.c:1008

 msgid "Search is not implemented for this menu."
 msgstr "這個選單中沒有搜尋功能。"
 
 msgid "Search is not implemented for this menu."
 msgstr "這個選單中沒有搜尋功能。"
 

-#: menu.c:1020
+#: menu.c:1013

 msgid "Jumping is not implemented for dialogs."
 msgstr "對話模式中不支援跳躍功能。"
 
 msgid "Jumping is not implemented for dialogs."
 msgstr "對話模式中不支援跳躍功能。"
 

-#: menu.c:1061
+#: menu.c:1054

 msgid "Tagging is not supported."
 msgstr "不支援標記功能。"
 
 msgid "Tagging is not supported."
 msgstr "不支援標記功能。"
 

-#: mh.c:1114
+#: mh.c:1131

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

-#: mh.c:1314 mh.c:1392
+#: mh.c:1332 mh.c:1410

 #, fuzzy
 msgid "Could not flush message to disk"
 msgstr "無法寄出信件。"
 
 #, fuzzy
 msgid "Could not flush message to disk"
 msgstr "無法寄出信件。"
 

-#: mh.c:1359
+#: mh.c:1377

 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 


@@ -3003,203 +3058,207 @@ msgid "Could not connect to %s (%s)."
 msgstr "無法連線到 %s (%s)。"
 
 # Well, I don't know how to translate the word "entropy"
 msgstr "無法連線到 %s (%s)。"
 
 # Well, I don't know how to translate the word "entropy"

-#: mutt_ssl.c:183
+#: mutt_ssl.c:187

 msgid "Failed to find enough entropy on your system"
 msgstr ""
 
 msgid "Failed to find enough entropy on your system"
 msgstr ""
 

-#: mutt_ssl.c:207
+#: mutt_ssl.c:211

 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr ""
 
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr ""
 

-#: mutt_ssl.c:215
+#: mutt_ssl.c:219

 #, c-format
 msgid "%s has insecure permissions!"
 msgstr "%s 的權限不安全！"
 
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr "%s 的權限不安全！"
 

-#: mutt_ssl.c:234
+#: mutt_ssl.c:238

 msgid "SSL disabled due the lack of entropy"
 msgstr ""
 
 msgid "SSL disabled due the lack of entropy"
 msgstr ""
 

-#: mutt_ssl.c:331
+#: mutt_ssl.c:352

 msgid "I/O error"
 msgstr ""
 
 msgid "I/O error"
 msgstr ""
 

-#: mutt_ssl.c:340
+#: mutt_ssl.c:361

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

-#: mutt_ssl.c:349 mutt_ssl_gnutls.c:880 mutt_ssl_gnutls.c:889
-#: mutt_ssl_gnutls.c:912
+#: mutt_ssl.c:370 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:357
+#: mutt_ssl.c:378

 #, 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:401
+#: mutt_ssl.c:480

 msgid "Unknown"
 msgstr "不明"
 
 msgid "Unknown"
 msgstr "不明"
 

-#: mutt_ssl.c:426 mutt_ssl_gnutls.c:457
+#: mutt_ssl.c:505 mutt_ssl_gnutls.c:473

 #, c-format
 msgid "[unable to calculate]"
 msgstr "【無法計算】"
 
 #, c-format
 msgid "[unable to calculate]"
 msgstr "【無法計算】"
 

-#: mutt_ssl.c:444 mutt_ssl_gnutls.c:480
+#: mutt_ssl.c:523 mutt_ssl_gnutls.c:496

 msgid "[invalid date]"
 msgstr "【無效的日期】"
 
 msgid "[invalid date]"
 msgstr "【無效的日期】"
 

-#: mutt_ssl.c:570
+#: mutt_ssl.c:651

 msgid "Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 
 msgid "Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 

-#: mutt_ssl.c:577
+#: mutt_ssl.c:658

 msgid "Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 
 msgid "Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 

-#: mutt_ssl.c:696
+#: mutt_ssl.c:780

 #, fuzzy
 msgid "cannot get certificate subject"
 msgstr "無法從對方拿取驗証"
 
 #, fuzzy
 msgid "cannot get certificate subject"
 msgstr "無法從對方拿取驗証"
 

-#: mutt_ssl.c:708
+#: mutt_ssl.c:790 mutt_ssl.c:799

 #, fuzzy
 msgid "cannot get certificate common name"
 msgstr "無法從對方拿取驗証"
 
 #, fuzzy
 msgid "cannot get certificate common name"
 msgstr "無法從對方拿取驗証"
 

-#: mutt_ssl.c:717
+#: mutt_ssl.c:813

 #, c-format
 msgid "certificate owner does not match hostname %s"
 msgstr ""
 
 #, c-format
 msgid "certificate owner does not match hostname %s"
 msgstr ""
 

-#: mutt_ssl.c:754
+#: mutt_ssl.c:854

 #, fuzzy, c-format
 msgid "Certificate host check failed: %s"
 msgstr "驗証已儲存"
 
 #, fuzzy, c-format
 msgid "Certificate host check failed: %s"
 msgstr "驗証已儲存"
 

-#: mutt_ssl.c:845 mutt_ssl_gnutls.c:664
+#: mutt_ssl.c:932 mutt_ssl_gnutls.c:732

 msgid "This certificate belongs to:"
 msgstr "這個驗証屬於："
 
 msgid "This certificate belongs to:"
 msgstr "這個驗証屬於："
 

-#: mutt_ssl.c:858 mutt_ssl_gnutls.c:703
+#: mutt_ssl.c:945 mutt_ssl_gnutls.c:771

 msgid "This certificate was issued by:"
 msgstr "這個驗証的派發者："
 
 msgid "This certificate was issued by:"
 msgstr "這個驗証的派發者："
 

-#: mutt_ssl.c:869 mutt_ssl_gnutls.c:742
+#: mutt_ssl.c:956 mutt_ssl_gnutls.c:810

 #, c-format
 msgid "This certificate is valid"
 msgstr "這個驗証有效"
 
 #, c-format
 msgid "This certificate is valid"
 msgstr "這個驗証有效"
 

-#: mutt_ssl.c:870 mutt_ssl_gnutls.c:745
+#: mutt_ssl.c:957 mutt_ssl_gnutls.c:813

 #, c-format
 msgid "   from %s"
 msgstr "   由 %s"
 
 #, c-format
 msgid "   from %s"
 msgstr "   由 %s"
 

-#: mutt_ssl.c:872 mutt_ssl_gnutls.c:749
+#: mutt_ssl.c:959 mutt_ssl_gnutls.c:817

 #, c-format
 msgid "     to %s"
 msgstr "     至 %s"
 
 #, c-format
 msgid "     to %s"
 msgstr "     至 %s"
 

-#: mutt_ssl.c:878
+#: mutt_ssl.c:965

 #, c-format
 msgid "Fingerprint: %s"
 msgstr "指模：%s"
 
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "指模：%s"
 

-#: mutt_ssl.c:881 mutt_ssl_gnutls.c:786
+#: mutt_ssl.c:968 mutt_ssl_gnutls.c:854

 #, c-format
 msgid "SSL Certificate check (certificate %d of %d in chain)"
 msgstr ""
 
 #, c-format
 msgid "SSL Certificate check (certificate %d of %d in chain)"
 msgstr ""
 

-#: mutt_ssl.c:887 mutt_ssl_gnutls.c:793
+#: mutt_ssl.c:976 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:888 mutt_ssl_gnutls.c:794
+#: mutt_ssl.c:977 mutt_ssl_gnutls.c:864

 msgid "roa"
 msgstr "123"
 
 msgid "roa"
 msgstr "123"
 

-#: mutt_ssl.c:892 mutt_ssl_gnutls.c:798
+#: mutt_ssl.c:981 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:893 mutt_ssl_gnutls.c:799
+#: mutt_ssl.c:982 mutt_ssl_gnutls.c:869

 msgid "ro"
 msgstr "12"
 
 msgid "ro"
 msgstr "12"
 

-#: mutt_ssl.c:924 mutt_ssl_gnutls.c:848
+#: mutt_ssl.c:1013 mutt_ssl_gnutls.c:918

 msgid "Warning: Couldn't save certificate"
 msgstr "警告：未能儲存驗証"
 
 msgid "Warning: Couldn't save certificate"
 msgstr "警告：未能儲存驗証"
 

-#: mutt_ssl.c:929 mutt_ssl_gnutls.c:853
+#: mutt_ssl.c:1018 mutt_ssl_gnutls.c:923

 msgid "Certificate saved"
 msgstr "驗証已儲存"
 
 msgid "Certificate saved"
 msgstr "驗証已儲存"
 

-#: mutt_ssl_gnutls.c:96 mutt_ssl_gnutls.c:123
+#: 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:276
+#: 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:340
+#: 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:567
+#: 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:574
+#: 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:754
+#: 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:757
+#: 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:762
+#: 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:767
+#: 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:772
+#: 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:777
+#: 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:782
+#: 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:895
+#: mutt_ssl_gnutls.c:956

 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 

-#: mutt_ssl_gnutls.c:904
+#: mutt_ssl_gnutls.c:965

 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "驗証已儲存"
 #, fuzzy
 msgid "Certificate is not X.509"
 msgstr "驗証已儲存"


@@ -3219,41 +3278,41 @@ msgstr ""
 msgid "Tunnel error talking to %s: %s"
 msgstr "連線到 %s (%s) 時失敗"
 
 msgid "Tunnel error talking to %s: %s"
 msgstr "連線到 %s (%s) 時失敗"
 

-#: muttlib.c:923
+#: muttlib.c:976

 #, 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:923
+#: muttlib.c:976

 msgid "yna"
 msgstr ""
 
 msgid "yna"
 msgstr ""
 

-#: muttlib.c:939
+#: muttlib.c:992

 msgid "File is a directory, save under it?"
 msgstr "檔案是一個目錄, 儲存在它下面 ?"
 
 msgid "File is a directory, save under it?"
 msgstr "檔案是一個目錄, 儲存在它下面 ?"
 

-#: muttlib.c:945
+#: muttlib.c:998

 msgid "File under directory: "
 msgstr "在目錄底下的檔案："
 
 msgid "File under directory: "
 msgstr "在目錄底下的檔案："
 

-#: muttlib.c:957
+#: muttlib.c:1010

 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:957
+#: muttlib.c:1010

 msgid "oac"
 msgstr "123"
 
 msgid "oac"
 msgstr "123"
 

-#: muttlib.c:1441
+#: muttlib.c:1511

 msgid "Can't save message to POP mailbox."
 msgstr "無法將信件存到信箱。"
 
 msgid "Can't save message to POP mailbox."
 msgstr "無法將信件存到信箱。"
 

-#: muttlib.c:1450
+#: muttlib.c:1520

 #, c-format
 msgid "Append messages to %s?"
 msgstr "附加信件到 %s ?"
 
 #, c-format
 msgid "Append messages to %s?"
 msgstr "附加信件到 %s ?"
 

-#: muttlib.c:1462
+#: muttlib.c:1532

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


@@ -3286,119 +3345,111 @@ 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:555

 #, 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:771

 #, 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:835

 #, 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:851 mx.c:1111

 #, 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:851 mx.c:1111

 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "清除 %d 封已被刪除的信件？"
 
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "清除 %d 封已被刪除的信件？"
 

-#: mx.c:898
+#: mx.c:872

 #, 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:932 mx.c:1102

 msgid "Mailbox is unchanged."
 msgstr "信箱沒有變動。"
 
 msgid "Mailbox is unchanged."
 msgstr "信箱沒有變動。"
 

-#: mx.c:993
+#: mx.c:972

 #, 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:975 mx.c:1154

 #, 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:1086

 #, 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:1088

 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:1090

 #, 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:1148

 msgid "Mailbox checkpointed."
 msgstr ""
 
 msgid "Mailbox checkpointed."
 msgstr ""
 

-#: mx.c:1479
+#: mx.c:1466

 msgid "Can't write message"
 msgstr "無法寫信件"
 
 msgid "Can't write message"
 msgstr "無法寫信件"
 

-#: mx.c:1524
+#: mx.c:1505

 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 

-#: pager.c:1480
+#: pager.c:1531

 msgid "PrevPg"
 msgstr "上一頁"
 
 msgid "PrevPg"
 msgstr "上一頁"
 

-#: pager.c:1481
+#: pager.c:1532

 msgid "NextPg"
 msgstr "下一頁"
 
 msgid "NextPg"
 msgstr "下一頁"
 

-#: pager.c:1485
+#: pager.c:1536

 msgid "View Attachm."
 msgstr "顯示附件。"
 
 msgid "View Attachm."
 msgstr "顯示附件。"
 

-#: pager.c:1488
+#: pager.c:1539

 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:1889 pager.c:1920 pager.c:1952 pager.c:2208
+#: pager.c:1940 pager.c:1971 pager.c:2003 pager.c:2279

 msgid "Bottom of message is shown."
 msgstr "現正顯示最下面的信件。"
 
 msgid "Bottom of message is shown."
 msgstr "現正顯示最下面的信件。"
 

-#: pager.c:1905 pager.c:1927 pager.c:1934 pager.c:1941
+#: pager.c:1956 pager.c:1978 pager.c:1985 pager.c:1992

 msgid "Top of message is shown."
 msgstr "現正顯示最上面的信件。"
 
 msgid "Top of message is shown."
 msgstr "現正顯示最上面的信件。"
 

-#: pager.c:2024
-msgid "Reverse search: "
-msgstr "反向搜尋："
-
-#: pager.c:2025
-msgid "Search: "
-msgstr "搜尋："
-
-#: pager.c:2146
+#: pager.c:2217

 msgid "Help is currently being shown."
 msgstr "現正顯示說明文件。"
 
 msgid "Help is currently being shown."
 msgstr "現正顯示說明文件。"
 

-#: pager.c:2175
+#: pager.c:2246

 msgid "No more quoted text."
 msgstr "不能有再多的引言。"
 
 msgid "No more quoted text."
 msgstr "不能有再多的引言。"
 

-#: pager.c:2188
+#: pager.c:2259

 msgid "No more unquoted text after quoted text."
 msgstr "在引言後有過多的非引言文字。"
 
 msgid "No more unquoted text after quoted text."
 msgstr "在引言後有過多的非引言文字。"
 


@@ -3406,101 +3457,106 @@ msgstr "在引言後有過多的非引言文字。"
 msgid "multipart message has no boundary parameter!"
 msgstr "多部份郵件沒有分隔的參數!"
 
 msgid "multipart message has no boundary parameter!"
 msgstr "多部份郵件沒有分隔的參數!"
 

-#: pattern.c:262
+#: pattern.c:264

 #, c-format
 msgid "Error in expression: %s"
 msgstr "表達式有錯誤：%s"
 
 #, c-format
 msgid "Error in expression: %s"
 msgstr "表達式有錯誤：%s"
 

-#: pattern.c:267
+#: pattern.c:269

 #, fuzzy, c-format
 msgid "Empty expression"
 msgstr "表達式有錯誤"
 
 #, fuzzy, c-format
 msgid "Empty expression"
 msgstr "表達式有錯誤"
 

-#: pattern.c:398
+#: pattern.c:402

 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "無效的日子：%s"
 
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "無效的日子：%s"
 

-#: pattern.c:412
+#: pattern.c:416

 #, 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:564
+#: pattern.c:568

 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "無效的相對日期：%s"
 
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "無效的相對日期：%s"
 

-#: pattern.c:578
+#: pattern.c:582

 msgid "error in expression"
 msgstr "表達式有錯誤"
 
 msgid "error in expression"
 msgstr "表達式有錯誤"
 

-#: pattern.c:799 pattern.c:945
+#: pattern.c:804 pattern.c:956

 #, c-format
 msgid "error in pattern at: %s"
 msgstr "在樣式上有錯誤：%s"
 
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "在樣式上有錯誤：%s"
 

-#: pattern.c:829
+#: pattern.c:830
+#, fuzzy, c-format
+msgid "missing pattern: %s"
+msgstr "錯失參數"
+
+#: pattern.c:840

 #, fuzzy, c-format
 msgid "mismatched brackets: %s"
 msgstr "不對稱的括弧：%s"
 
 #, fuzzy, c-format
 msgid "mismatched brackets: %s"
 msgstr "不對稱的括弧：%s"
 

-#: pattern.c:885
+#: pattern.c:896

 #, fuzzy, c-format
 msgid "%c: invalid pattern modifier"
 msgstr "%c：無效的指令"
 
 #, fuzzy, c-format
 msgid "%c: invalid pattern modifier"
 msgstr "%c：無效的指令"
 

-#: pattern.c:891
+#: pattern.c:902

 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c：在這個模式不支援"
 
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c：在這個模式不支援"
 

-#: pattern.c:904
+#: pattern.c:915

 #, c-format
 msgid "missing parameter"
 msgstr "錯失參數"
 
 #, c-format
 msgid "missing parameter"
 msgstr "錯失參數"
 

-#: pattern.c:920
+#: pattern.c:931

 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "不對稱的括弧：%s"
 
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "不對稱的括弧：%s"
 

-#: pattern.c:952
+#: pattern.c:963

 msgid "empty pattern"
 msgstr "空的格式"
 
 msgid "empty pattern"
 msgstr "空的格式"
 

-#: pattern.c:1205
+#: pattern.c:1217

 #, 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:1288 pattern.c:1423
+#: pattern.c:1300 pattern.c:1438

 msgid "Compiling search pattern..."
 msgstr "編譯搜尋樣式中…"
 
 msgid "Compiling search pattern..."
 msgstr "編譯搜尋樣式中…"
 

-#: pattern.c:1307
+#: pattern.c:1320

 msgid "Executing command on matching messages..."
 msgstr "正在對符合的郵件執行命令…"
 
 msgid "Executing command on matching messages..."
 msgstr "正在對符合的郵件執行命令…"
 

-#: pattern.c:1374
+#: pattern.c:1387

 msgid "No messages matched criteria."
 msgstr "沒有郵件符合要求。"
 
 msgid "No messages matched criteria."
 msgstr "沒有郵件符合要求。"
 

-#: pattern.c:1456
+#: pattern.c:1467

 #, fuzzy
 msgid "Searching..."
 msgstr "儲存中…"
 
 #, fuzzy
 msgid "Searching..."
 msgstr "儲存中…"
 

-#: pattern.c:1469
+#: pattern.c:1480

 msgid "Search hit bottom without finding match"
 msgstr "已搜尋至結尾，並沒有發現任何符合"
 
 msgid "Search hit bottom without finding match"
 msgstr "已搜尋至結尾，並沒有發現任何符合"
 

-#: pattern.c:1480
+#: pattern.c:1491

 msgid "Search hit top without finding match"
 msgstr "已搜尋至開頭，並沒有發現任何符合"
 
 msgid "Search hit top without finding match"
 msgstr "已搜尋至開頭，並沒有發現任何符合"
 

-#: pattern.c:1512
+#: pattern.c:1523

 msgid "Search interrupted."
 msgstr "搜尋已被中斷。"
 
 msgid "Search interrupted."
 msgstr "搜尋已被中斷。"
 


@@ -3512,11 +3568,11 @@ msgstr "請輸入 PGP 通行密碼："
 msgid "PGP passphrase forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 
 msgid "PGP passphrase forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 

-#: pgp.c:357
+#: 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:391 pgp.c:643 pgp.c:847
+#: pgp.c:402 pgp.c:659 pgp.c:863

 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"


@@ -3524,23 +3580,23 @@ msgstr ""
 "[-- PGP 輸出部份結束 --]\n"
 "\n"
 
 "[-- PGP 輸出部份結束 --]\n"
 "\n"
 

-#: pgp.c:411 pgp.c:459 pgp.c:982
+#: pgp.c:424 pgp.c:475 pgp.c:998

 #, 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:461 pgp.c:978
+#: pgp.c:477 pgp.c:994

 #, fuzzy
 msgid "PGP message successfully decrypted."
 msgstr "PGP 簽名驗證成功。"
 
 #, fuzzy
 msgid "PGP message successfully decrypted."
 msgstr "PGP 簽名驗證成功。"
 

-#: pgp.c:751
+#: pgp.c:767

 #, 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:812
+#: pgp.c:828

 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"


@@ -3548,36 +3604,53 @@ msgstr ""
 "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 "\n"
 
 "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 "\n"
 

-#: pgp.c:859
+#: pgp.c:875

 #, fuzzy
 msgid "Decryption failed"
 msgstr "登入失敗。"
 
 #, fuzzy
 msgid "Decryption failed"
 msgstr "登入失敗。"
 

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

 msgid "Can't open PGP subprocess!"
 msgstr "無法開啟 PGP 子程序！"
 
 msgid "Can't open PGP subprocess!"
 msgstr "無法開啟 PGP 子程序！"
 

-#: pgp.c:1471
+#: pgp.c:1487

 msgid "Can't invoke PGP"
 msgstr "不能執行 PGP"
 
 msgid "Can't invoke PGP"
 msgstr "不能執行 PGP"
 

-#: pgp.c:1572
+#: pgp.c:1592

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? "

 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 

-#: pgp.c:1573
+#: pgp.c:1593

 msgid "PGP/M(i)ME"
 msgstr ""
 
 msgid "PGP/M(i)ME"
 msgstr ""
 

-#: pgp.c:1573
+#: pgp.c:1593

 msgid "(i)nline"
 msgstr ""
 
 msgid "(i)nline"
 msgstr ""
 

-#: pgp.c:1575
+#. The keys accepted for this prompt *must* match the order in the second
+#. * version in the else clause since the switch statement below depends on
+#. * it.  The 'i' key is appended in this version.
+#.
+#: pgp.c:1599
+#, fuzzy
+msgid "esabfci"
+msgstr "12345"
+
+#. The keys accepted *must* be a prefix of the accepted keys in the "if"
+#. * clause above since the switch statement below depends on it.
+#.
+#: pgp.c:1606

 #, fuzzy
 #, fuzzy

-msgid "esabifc"
-msgstr "1234i5"
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? "
+msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
+
+#: pgp.c:1607
+#, fuzzy
+msgid "esabfc"
+msgstr "12345"

 
 #: pgpinvoke.c:308
 msgid "Fetching PGP key..."
 
 #: pgpinvoke.c:308
 msgid "Fetching PGP key..."


@@ -3611,7 +3684,7 @@ msgstr "請輸入這把鑰匙的 ID："
 msgid "PGP Key %s."
 msgstr "PGP 鑰匙 %s。"
 
 msgid "PGP Key %s."
 msgstr "PGP 鑰匙 %s。"
 

-#: pop.c:101 pop_lib.c:201
+#: pop.c:101 pop_lib.c:210

 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr "伺服器不支援 TOP 指令。"
 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr "伺服器不支援 TOP 指令。"


@@ -3620,60 +3693,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:212

 #, 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:378

 msgid "Server closed connection!"
 msgstr "與伺服器的聯結中斷了!"
 
 msgid "Server closed connection!"
 msgstr "與伺服器的聯結中斷了!"
 


@@ -3698,51 +3776,56 @@ 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:55
+#, fuzzy, c-format
+msgid "Invalid POP URL: %s\n"
+msgstr "無效的月份：%s"
+
+#: pop_lib.c:208

 msgid "Unable to leave messages on server."
 msgstr "無法把信件留在伺服器上。"
 
 msgid "Unable to leave messages on server."
 msgstr "無法把信件留在伺服器上。"
 

-#: pop_lib.c:229
+#: pop_lib.c:238

 #, 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:392

 msgid "Closing connection to POP server..."
 msgstr "正在關閉與 POP 伺服器的連線…"
 
 msgid "Closing connection to POP server..."
 msgstr "正在關閉與 POP 伺服器的連線…"
 

-#: pop_lib.c:553
+#: pop_lib.c:563

 msgid "Verifying message indexes..."
 msgstr "正在檢查信件的指引 …"
 
 msgid "Verifying message indexes..."
 msgstr "正在檢查信件的指引 …"
 

-#: pop_lib.c:575
+#: pop_lib.c:585

 msgid "Connection lost. Reconnect to POP server?"
 msgstr "連線中斷。再與 POP 伺服器連線嗎？"
 
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "連線中斷。再與 POP 伺服器連線嗎？"
 

-#: postpone.c:164
+#: postpone.c:165

 msgid "Postponed Messages"
 msgstr "信件已經被延遲寄出"
 
 msgid "Postponed Messages"
 msgstr "信件已經被延遲寄出"
 

-#: postpone.c:244 postpone.c:253
+#: postpone.c:245 postpone.c:254

 msgid "No postponed messages."
 msgstr "沒有被延遲寄出的信件。"
 
 msgid "No postponed messages."
 msgstr "沒有被延遲寄出的信件。"
 

-#: postpone.c:441 postpone.c:462 postpone.c:496
+#: postpone.c:442 postpone.c:463 postpone.c:497

 #, fuzzy
 msgid "Illegal crypto header"
 msgstr "不合規定的 PGP 標頭"
 
 #, fuzzy
 msgid "Illegal crypto header"
 msgstr "不合規定的 PGP 標頭"
 

-#: postpone.c:482
+#: postpone.c:483

 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "不合規定的 S/MIME 標頭"
 
 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "不合規定的 S/MIME 標頭"
 

-#: postpone.c:562
+#: postpone.c:563

 #, fuzzy
 msgid "Decrypting message..."
 msgstr "拿取信件中…"
 
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "拿取信件中…"
 

-#: postpone.c:571
+#: postpone.c:572

 #, fuzzy
 msgid "Decryption failed."
 msgstr "登入失敗。"
 #, fuzzy
 msgid "Decryption failed."
 msgstr "登入失敗。"


@@ -3790,67 +3873,67 @@ msgstr "管線"
 msgid "Print"
 msgstr "顯示"
 
 msgid "Print"
 msgstr "顯示"
 

-#: recvattach.c:472
+#: recvattach.c:484

 msgid "Saving..."
 msgstr "儲存中…"
 
 msgid "Saving..."
 msgstr "儲存中…"
 

-#: recvattach.c:475 recvattach.c:566
+#: recvattach.c:487 recvattach.c:578

 msgid "Attachment saved."
 msgstr "附件已被儲存。"
 
 msgid "Attachment saved."
 msgstr "附件已被儲存。"
 

-#: recvattach.c:578
+#: recvattach.c:590

 #, 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:596
+#: recvattach.c:608

 msgid "Attachment filtered."
 msgstr "附件被過濾掉。"
 
 msgid "Attachment filtered."
 msgstr "附件被過濾掉。"
 

-#: recvattach.c:663
+#: recvattach.c:675

 msgid "Filter through: "
 msgstr "經過過濾："
 
 msgid "Filter through: "
 msgstr "經過過濾："
 

-#: recvattach.c:663
+#: recvattach.c:675

 msgid "Pipe to: "
 msgstr "導引至："
 
 msgid "Pipe to: "
 msgstr "導引至："
 

-#: recvattach.c:698
+#: recvattach.c:710

 #, 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:763
+#: recvattach.c:775

 msgid "Print tagged attachment(s)?"
 msgstr "是否要列印標記起來的附件?"
 
 msgid "Print tagged attachment(s)?"
 msgstr "是否要列印標記起來的附件?"
 

-#: recvattach.c:763
+#: recvattach.c:775

 msgid "Print attachment?"
 msgstr "是否要列印附件?"
 
 msgid "Print attachment?"
 msgstr "是否要列印附件?"
 

-#: recvattach.c:996
+#: recvattach.c:1008

 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "找不到已標記的訊息"
 
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "找不到已標記的訊息"
 

-#: recvattach.c:1008
+#: recvattach.c:1020

 msgid "Attachments"
 msgstr "附件"
 
 msgid "Attachments"
 msgstr "附件"
 

-#: recvattach.c:1044
+#: recvattach.c:1056

 msgid "There are no subparts to show!"
 msgstr "沒有部件！"
 
 msgid "There are no subparts to show!"
 msgstr "沒有部件！"
 

-#: recvattach.c:1105
+#: recvattach.c:1117

 msgid "Can't delete attachment from POP server."
 msgstr "無法從 POP 伺服器刪除附件。"
 
 msgid "Can't delete attachment from POP server."
 msgstr "無法從 POP 伺服器刪除附件。"
 

-#: recvattach.c:1113
+#: recvattach.c:1125

 #, 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:1132 recvattach.c:1149
+#: recvattach.c:1144 recvattach.c:1161

 msgid "Only deletion of multipart attachments is supported."
 msgstr "只支援刪除多重附件"
 
 msgid "Only deletion of multipart attachments is supported."
 msgstr "只支援刪除多重附件"
 


@@ -3858,47 +3941,51 @@ msgstr "只支援刪除多重附件"
 msgid "You may only bounce message/rfc822 parts."
 msgstr "您只能直接傳送 message/rfc822 的部分。"
 
 msgid "You may only bounce message/rfc822 parts."
 msgstr "您只能直接傳送 message/rfc822 的部分。"
 

-#: recvcmd.c:213
+#: 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:213
+#: recvcmd.c:241

 #, fuzzy
 msgid "Error bouncing messages!"
 msgstr "寄信途中發生錯誤。"
 
 #, fuzzy
 msgid "Error bouncing messages!"
 msgstr "寄信途中發生錯誤。"
 

-#: recvcmd.c:413
+#: 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:444
+#: recvcmd.c:472

 msgid "Forward as attachments?"
 msgstr "利用附件形式來轉寄？"
 
 msgid "Forward as attachments?"
 msgstr "利用附件形式來轉寄？"
 

-#: recvcmd.c:458
+#: 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:583
+#: recvcmd.c:611

 msgid "Forward MIME encapsulated?"
 msgstr "用 MIME 的方式來轉寄？"
 
 msgid "Forward MIME encapsulated?"
 msgstr "用 MIME 的方式來轉寄？"
 

-#: recvcmd.c:591 recvcmd.c:841
+#: 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:724
+#: recvcmd.c:752

 msgid "Can't find any tagged messages."
 msgstr "找不到已標記的訊息"
 
 msgid "Can't find any tagged messages."
 msgstr "找不到已標記的訊息"
 

-#: recvcmd.c:745 send.c:727
+#: recvcmd.c:773 send.c:738

 msgid "No mailing lists found!"
 msgstr "沒有找到郵寄論壇！"
 
 msgid "No mailing lists found!"
 msgstr "沒有找到郵寄論壇！"
 

-#: recvcmd.c:820
+#: 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 包封其它的嗎？"
 


@@ -3966,16 +4053,16 @@ msgstr "寄送訊息時出現錯誤，子程序結束 %d。\n"
 msgid "Error sending message."
 msgstr "寄信途中發生錯誤。"
 
 msgid "Error sending message."
 msgstr "寄信途中發生錯誤。"
 

-#: rfc1524.c:163
+#: rfc1524.c:164

 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "在 \"%2$s\" 的第 %3$d 行發現類別 %1$s 為錯誤的格式紀錄"
 
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "在 \"%2$s\" 的第 %3$d 行發現類別 %1$s 為錯誤的格式紀錄"
 

-#: rfc1524.c:395
+#: rfc1524.c:396

 msgid "No mailcap path specified"
 msgstr "沒有指定 mailcap 路徑"
 
 msgid "No mailcap path specified"
 msgstr "沒有指定 mailcap 路徑"
 

-#: rfc1524.c:423
+#: rfc1524.c:424

 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "沒有發現類型 %s 的 mailcap 紀錄"
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "沒有發現類型 %s 的 mailcap 紀錄"


@@ -3988,6 +4075,10 @@ msgstr "分數：太少的引數"
 msgid "score: too many arguments"
 msgstr "分數：太多的引數"
 
 msgid "score: too many arguments"
 msgstr "分數：太多的引數"
 

+#: score.c:122
+msgid "Error: score: invalid number"
+msgstr ""
+

 #: send.c:252
 msgid "No subject, abort?"
 msgstr "沒有標題，要不要中斷？"
 #: send.c:252
 msgid "No subject, abort?"
 msgstr "沒有標題，要不要中斷？"


@@ -4001,12 +4092,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:496
+#: 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:530
+#: 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?"


@@ -4014,115 +4105,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:702
+#: send.c:713

 msgid "No tagged messages are visible!"
 msgstr "沒有被標記了的信件在顯示！"
 
 msgid "No tagged messages are visible!"
 msgstr "沒有被標記了的信件在顯示！"
 

-#: send.c:753
+#: send.c:764

 msgid "Include message in reply?"
 msgstr "回信時是否要包含原本的信件內容？"
 
 msgid "Include message in reply?"
 msgstr "回信時是否要包含原本的信件內容？"
 

-#: send.c:758
+#: send.c:769

 msgid "Including quoted message..."
 msgstr "正引入引言部分…"
 
 msgid "Including quoted message..."
 msgstr "正引入引言部分…"
 

-#: send.c:768
+#: send.c:779

 msgid "Could not include all requested messages!"
 msgstr "無法包含所有要求的信件！"
 
 msgid "Could not include all requested messages!"
 msgstr "無法包含所有要求的信件！"
 

-#: send.c:782
+#: send.c:793

 msgid "Forward as attachment?"
 msgstr "利用附件形式來轉寄？"
 
 msgid "Forward as attachment?"
 msgstr "利用附件形式來轉寄？"
 

-#: send.c:786
+#: 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:1116
+#: send.c:1147

 msgid "Recall postponed message?"
 msgstr "要叫出被延遲的信件?"
 
 msgid "Recall postponed message?"
 msgstr "要叫出被延遲的信件?"
 

-#: send.c:1428
+#: send.c:1379

 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "準備轉寄信件…"
 
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "準備轉寄信件…"
 

-#: send.c:1468
+#: send.c:1419

 msgid "Abort unmodified message?"
 msgstr "是否要中斷未修改過的信件?"
 
 msgid "Abort unmodified message?"
 msgstr "是否要中斷未修改過的信件?"
 

-#: send.c:1470
+#: send.c:1421

 msgid "Aborted unmodified message."
 msgstr "中斷沒有修改過的信件"
 
 msgid "Aborted unmodified message."
 msgstr "中斷沒有修改過的信件"
 

-#: send.c:1539
+#: send.c:1564

 msgid "Message postponed."
 msgstr "信件被延遲寄出。"
 
 msgid "Message postponed."
 msgstr "信件被延遲寄出。"
 

-#: send.c:1548
+#: send.c:1574

 msgid "No recipients are specified!"
 msgstr "沒有指定接受者！"
 
 msgid "No recipients are specified!"
 msgstr "沒有指定接受者！"
 

-#: send.c:1553
+#: send.c:1579

 msgid "No recipients were specified."
 msgstr "沒有指定接受者。"
 
 msgid "No recipients were specified."
 msgstr "沒有指定接受者。"
 

-#: send.c:1569
+#: send.c:1595

 msgid "No subject, abort sending?"
 msgstr "沒有信件標題，要中斷寄信的工作?"
 
 msgid "No subject, abort sending?"
 msgstr "沒有信件標題，要中斷寄信的工作?"
 

-#: send.c:1573
+#: send.c:1599

 msgid "No subject specified."
 msgstr "沒有指定標題。"
 
 msgid "No subject specified."
 msgstr "沒有指定標題。"
 

-#: send.c:1635 smtp.c:161
+#: send.c:1661 smtp.c:185

 msgid "Sending message..."
 msgstr "正在寄出信件…"
 
 msgid "Sending message..."
 msgstr "正在寄出信件…"
 

-#: send.c:1776
+#. check to see if the user wants copies of all attachments
+#: send.c:1694
+#, fuzzy
+msgid "Save attachments in Fcc?"
+msgstr "用文字方式顯示附件內容"
+
+#: send.c:1803

 msgid "Could not send the message."
 msgstr "無法寄出信件。"
 
 msgid "Could not send the message."
 msgstr "無法寄出信件。"
 

-#: send.c:1781
+#: send.c:1808

 msgid "Mail sent."
 msgstr "信件已經寄出。"
 
 msgid "Mail sent."
 msgstr "信件已經寄出。"
 

-#: send.c:1781
+#: send.c:1808

 msgid "Sending in background."
 msgstr "正在背景作業中傳送。"
 
 msgid "Sending in background."
 msgstr "正在背景作業中傳送。"
 

-#: sendlib.c:410
+#: sendlib.c:425

 msgid "No boundary parameter found! [report this error]"
 msgstr "沒有發現分界變數！[回報錯誤]"
 
 msgid "No boundary parameter found! [report this error]"
 msgstr "沒有發現分界變數！[回報錯誤]"
 

-#: sendlib.c:440
+#: sendlib.c:455

 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s 已經不存在！"
 
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s 已經不存在！"
 

-#: sendlib.c:863
+#: sendlib.c:878

 #, 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:1050

 #, c-format
 msgid "Could not open %s"
 msgstr "無法開啟 %s"
 
 #, c-format
 msgid "Could not open %s"
 msgstr "無法開啟 %s"
 

-#: sendlib.c:2226
+#: sendlib.c:2414

 #, 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:2232
+#: sendlib.c:2420

 msgid "Output of the delivery process"
 msgstr "Delivery process 的輸出"
 
 msgid "Output of the delivery process"
 msgstr "Delivery process 的輸出"
 

-#: sendlib.c:2396
+#: sendlib.c:2594

 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""


@@ -4178,80 +4275,80 @@ msgstr "無效的月份：%s"
 msgid "Unknown   "
 msgstr "不清楚"
 
 msgid "Unknown   "
 msgstr "不清楚"
 

-#: smime.c:369
+#: smime.c:368

 #, fuzzy
 msgid "Enter keyID: "
 msgstr "請輸入 %s 的鑰匙 ID："
 
 #, fuzzy
 msgid "Enter keyID: "
 msgstr "請輸入 %s 的鑰匙 ID："
 

-#: smime.c:392
+#: smime.c:378

 #, fuzzy, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME 鑰匙符合 \"%s\"。"
 
 #, fuzzy, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME 鑰匙符合 \"%s\"。"
 

-#: smime.c:540 smime.c:610 smime.c:628
+#: smime.c:526 smime.c:596 smime.c:614

 #, 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:544 smime.c:614
+#: smime.c:530 smime.c:600

 #, 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:547 smime.c:617
+#: smime.c:533 smime.c:603

 #, 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:636
+#: smime.c:622

 #, 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:795
+#: smime.c:781

 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 

-#: smime.c:850 smime.c:878 smime.c:943 smime.c:987 smime.c:1052 smime.c:1127
+#: smime.c:836 smime.c:864 smime.c:929 smime.c:973 smime.c:1038 smime.c:1113

 #, fuzzy
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "[-- 錯誤：無法建立 OpenSSL 子程序！ --]\n"
 
 #, fuzzy
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "[-- 錯誤：無法建立 OpenSSL 子程序！ --]\n"
 

-#: smime.c:1205
+#: smime.c:1191

 #, fuzzy
 msgid "no certfile"
 msgstr "無法建立過濾器"
 
 #, fuzzy
 msgid "no certfile"
 msgstr "無法建立過濾器"
 

-#: smime.c:1208
+#: smime.c:1194

 #, 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:1351
+#: smime.c:1337

 msgid "No output from OpenSSL.."
 msgstr ""
 
 msgid "No output from OpenSSL.."
 msgstr ""
 

-#: smime.c:1389
+#: smime.c:1375

 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 

-#: smime.c:1395
+#: smime.c:1382

 #, fuzzy
 msgid "Warning: Intermediate certificate not found."
 msgstr "警告：未能儲存驗証"
 
 #, fuzzy
 msgid "Warning: Intermediate certificate not found."
 msgstr "警告：未能儲存驗証"
 

-#: smime.c:1438
+#: smime.c:1429

 #, fuzzy
 msgid "Can't open OpenSSL subprocess!"
 msgstr "無法開啟 OpenSSL 子程序！"
 
 #, fuzzy
 msgid "Can't open OpenSSL subprocess!"
 msgstr "無法開啟 OpenSSL 子程序！"
 

-#: smime.c:1476
+#: smime.c:1469

 msgid "No output from OpenSSL..."
 msgstr ""
 
 msgid "No output from OpenSSL..."
 msgstr ""
 

-#: smime.c:1641 smime.c:1766
+#: smime.c:1634 smime.c:1759

 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"


@@ -4260,26 +4357,26 @@ msgstr ""
 "[-- OpenSSL 輸出部份結束 --]\n"
 "\n"
 
 "[-- OpenSSL 輸出部份結束 --]\n"
 "\n"
 

-#: smime.c:1725 smime.c:1736
+#: smime.c:1718 smime.c:1729

 #, 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:1770
+#: smime.c:1763

 #, 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:1773
+#: smime.c:1766

 #, 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:1837
+#: smime.c:1830

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


@@ -4288,7 +4385,7 @@ msgstr ""
 "\n"
 "[-- S/MIME 加密資料結束 --]\n"
 
 "\n"
 "[-- S/MIME 加密資料結束 --]\n"
 

-#: smime.c:1839
+#: smime.c:1832

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


@@ -4297,92 +4394,96 @@ msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 
 "\n"
 "[-- 簽署的資料結束 --]\n"
 

-#: smime.c:1950
+#: smime.c:1943

 #, 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:1951
+#: smime.c:1944

 #, 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:1966
+#: smime.c:1959

 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:1969
+#: smime.c:1962

 msgid "drac"
 msgstr ""
 
 msgid "drac"
 msgstr ""
 

-#: smime.c:1972
+#: smime.c:1965

 msgid "1: DES, 2: Triple-DES "
 msgstr ""
 
 msgid "1: DES, 2: Triple-DES "
 msgstr ""
 

-#: smime.c:1973
+#: smime.c:1966

 msgid "dt"
 msgstr ""
 
 msgid "dt"
 msgstr ""
 

-#: smime.c:1985
+#: smime.c:1978

 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr ""
 
 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr ""
 

-#: smime.c:1986
+#: smime.c:1979

 msgid "468"
 msgstr ""
 
 msgid "468"
 msgstr ""
 

-#: smime.c:2001
+#: smime.c:1994

 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr ""
 
 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr ""
 

-#: smime.c:2002
+#: smime.c:1995

 msgid "895"
 msgstr ""
 
 msgid "895"
 msgstr ""
 

-#: smtp.c:116
+#: 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:156
+#: 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:228
+#: smtp.c:258

 msgid "No from address given"
 msgstr ""
 
 msgid "No from address given"
 msgstr ""
 

-#: smtp.c:284
+#: smtp.c:314

 msgid "SMTP session failed: read error"
 msgstr ""
 
 msgid "SMTP session failed: read error"
 msgstr ""
 

-#: smtp.c:286
+#: smtp.c:316

 msgid "SMTP session failed: write error"
 msgstr ""
 
 msgid "SMTP session failed: write error"
 msgstr ""
 

-#: smtp.c:309
+#: 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:419
+#: smtp.c:451

 msgid "SMTP server does not support authentication"
 msgstr ""
 
 msgid "SMTP server does not support authentication"
 msgstr ""
 

-#: smtp.c:427
+#: smtp.c:459

 #, fuzzy
 msgid "SMTP authentication requires SASL"
 msgstr "GSSAPI 驗證失敗。"
 
 #, fuzzy
 msgid "SMTP authentication requires SASL"
 msgstr "GSSAPI 驗證失敗。"
 

-#: smtp.c:461
+#: smtp.c:493

 #, fuzzy, c-format
 msgid "%s authentication failed, trying next method"
 msgstr "SASL 驗證失敗。"
 
 #, fuzzy, c-format
 msgid "%s authentication failed, trying next method"
 msgstr "SASL 驗證失敗。"
 

-#: smtp.c:478
+#: smtp.c:510

 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "SASL 驗證失敗。"
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "SASL 驗證失敗。"


@@ -4399,12 +4500,12 @@ msgstr "找不到排序的功能！[請回報這個問題]"
 msgid "(no mailbox)"
 msgstr "（沒有信箱）"
 
 msgid "(no mailbox)"
 msgstr "（沒有信箱）"
 

-#: thread.c:1093
+#: thread.c:1096

 #, fuzzy
 msgid "Parent message is not visible in this limited view."
 msgstr "在限制閱覽模式下無法顯示主信件。"
 
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
 msgstr "在限制閱覽模式下無法顯示主信件。"
 

-#: thread.c:1099
+#: thread.c:1102

 msgid "Parent message is not available."
 msgstr "主信件不存在。"
 
 msgid "Parent message is not available."
 msgstr "主信件不存在。"
 


@@ -4829,393 +4930,414 @@ msgid "force retrieval of mail from IMAP server"
 msgstr "強行取回 IMAP 伺服器上的信件"
 
 #: ../keymap_alldefs.h:109
 msgstr "強行取回 IMAP 伺服器上的信件"
 
 #: ../keymap_alldefs.h:109

+msgid "logout from all IMAP servers"
+msgstr ""
+
+#: ../keymap_alldefs.h:110

 msgid "retrieve mail from POP server"
 msgstr "取回 POP 伺服器上的信件"
 
 msgid "retrieve mail from POP server"
 msgstr "取回 POP 伺服器上的信件"
 

-#: ../keymap_alldefs.h:110
+#: ../keymap_alldefs.h:111

 msgid "move to the first message"
 msgstr "移動到第一封信件"
 
 msgid "move to the first message"
 msgstr "移動到第一封信件"
 

-#: ../keymap_alldefs.h:111
+#: ../keymap_alldefs.h:112

 msgid "move to the last message"
 msgstr "移動到最後一封信件"
 
 msgid "move to the last message"
 msgstr "移動到最後一封信件"
 

-#: ../keymap_alldefs.h:112
+#: ../keymap_alldefs.h:113

 msgid "show only messages matching a pattern"
 msgstr "只顯示符合某個格式的信件"
 
 msgid "show only messages matching a pattern"
 msgstr "只顯示符合某個格式的信件"
 

-#: ../keymap_alldefs.h:113
+#: ../keymap_alldefs.h:114

 #, fuzzy
 msgid "link tagged message to the current one"
 msgstr "無法傳送已標記的郵件至："
 
 #, fuzzy
 msgid "link tagged message to the current one"
 msgstr "無法傳送已標記的郵件至："
 

-#: ../keymap_alldefs.h:114
+#: ../keymap_alldefs.h:115

 #, fuzzy
 msgid "open next mailbox with new mail"
 msgstr "沒有信箱有新信件。"
 
 #, fuzzy
 msgid "open next mailbox with new mail"
 msgstr "沒有信箱有新信件。"
 

-#: ../keymap_alldefs.h:115
+#: ../keymap_alldefs.h:116

 msgid "jump to the next new message"
 msgstr "跳到下一封新的信件"
 
 msgid "jump to the next new message"
 msgstr "跳到下一封新的信件"
 

-#: ../keymap_alldefs.h:116
+#: ../keymap_alldefs.h:117

 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "跳到下一個未讀取的信件"
 
 #, fuzzy
 msgid "jump to the next new or unread message"
 msgstr "跳到下一個未讀取的信件"
 

-#: ../keymap_alldefs.h:117
+#: ../keymap_alldefs.h:118

 msgid "jump to the next subthread"
 msgstr "跳到下一個子序列"
 
 msgid "jump to the next subthread"
 msgstr "跳到下一個子序列"
 

-#: ../keymap_alldefs.h:118
+#: ../keymap_alldefs.h:119

 msgid "jump to the next thread"
 msgstr "跳到下一個序列"
 
 msgid "jump to the next thread"
 msgstr "跳到下一個序列"
 

-#: ../keymap_alldefs.h:119
+#: ../keymap_alldefs.h:120

 msgid "move to the next undeleted message"
 msgstr "移動到下一個未刪除的信件"
 
 msgid "move to the next undeleted message"
 msgstr "移動到下一個未刪除的信件"
 

-#: ../keymap_alldefs.h:120
+#: ../keymap_alldefs.h:121

 msgid "jump to the next unread message"
 msgstr "跳到下一個未讀取的信件"
 
 msgid "jump to the next unread message"
 msgstr "跳到下一個未讀取的信件"
 

-#: ../keymap_alldefs.h:121
+#: ../keymap_alldefs.h:122

 msgid "jump to parent message in thread"
 msgstr "跳到這個序列的主信件"
 
 msgid "jump to parent message in thread"
 msgstr "跳到這個序列的主信件"
 

-#: ../keymap_alldefs.h:122
+#: ../keymap_alldefs.h:123

 msgid "jump to previous thread"
 msgstr "跳到上一個序列"
 
 msgid "jump to previous thread"
 msgstr "跳到上一個序列"
 

-#: ../keymap_alldefs.h:123
+#: ../keymap_alldefs.h:124

 msgid "jump to previous subthread"
 msgstr "跳到上一個子序列"
 
 msgid "jump to previous subthread"
 msgstr "跳到上一個子序列"
 

-#: ../keymap_alldefs.h:124
+#: ../keymap_alldefs.h:125

 msgid "move to the previous undeleted message"
 msgstr "移動到上一個未刪除的信件"
 
 msgid "move to the previous undeleted message"
 msgstr "移動到上一個未刪除的信件"
 

-#: ../keymap_alldefs.h:125
+#: ../keymap_alldefs.h:126

 msgid "jump to the previous new message"
 msgstr "跳到上一個新的信件"
 
 msgid "jump to the previous new message"
 msgstr "跳到上一個新的信件"
 

-#: ../keymap_alldefs.h:126
+#: ../keymap_alldefs.h:127

 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "跳到上一個未讀取的信件"
 
 #, fuzzy
 msgid "jump to the previous new or unread message"
 msgstr "跳到上一個未讀取的信件"
 

-#: ../keymap_alldefs.h:127
+#: ../keymap_alldefs.h:128

 msgid "jump to the previous unread message"
 msgstr "跳到上一個未讀取的信件"
 
 msgid "jump to the previous unread message"
 msgstr "跳到上一個未讀取的信件"
 

-#: ../keymap_alldefs.h:128
+#: ../keymap_alldefs.h:129

 msgid "mark the current thread as read"
 msgstr "標記現在的序列為已讀取"
 
 msgid "mark the current thread as read"
 msgstr "標記現在的序列為已讀取"
 

-#: ../keymap_alldefs.h:129
+#: ../keymap_alldefs.h:130

 msgid "mark the current subthread as read"
 msgstr "標記現在的子序列為已讀取"
 
 msgid "mark the current subthread as read"
 msgstr "標記現在的子序列為已讀取"
 

-#: ../keymap_alldefs.h:130
+#: ../keymap_alldefs.h:131

 msgid "set a status flag on a message"
 msgstr "設定某一封信件的狀態旗標"
 
 msgid "set a status flag on a message"
 msgstr "設定某一封信件的狀態旗標"
 

-#: ../keymap_alldefs.h:131
+#: ../keymap_alldefs.h:132

 msgid "save changes to mailbox"
 msgstr "儲存變動到信箱"
 
 msgid "save changes to mailbox"
 msgstr "儲存變動到信箱"
 

-#: ../keymap_alldefs.h:132
+#: ../keymap_alldefs.h:133

 msgid "tag messages matching a pattern"
 msgstr "標記符合某個格式的信件"
 
 msgid "tag messages matching a pattern"
 msgstr "標記符合某個格式的信件"
 

-#: ../keymap_alldefs.h:133
+#: ../keymap_alldefs.h:134

 msgid "undelete messages matching a pattern"
 msgstr "反刪除符合某個格式的信件"
 
 msgid "undelete messages matching a pattern"
 msgstr "反刪除符合某個格式的信件"
 

-#: ../keymap_alldefs.h:134
+#: ../keymap_alldefs.h:135

 msgid "untag messages matching a pattern"
 msgstr "反標記符合某個格式的信件"
 
 msgid "untag messages matching a pattern"
 msgstr "反標記符合某個格式的信件"
 

-#: ../keymap_alldefs.h:135
+#: ../keymap_alldefs.h:136

 msgid "move to the middle of the page"
 msgstr "移動到本頁的中間"
 
 msgid "move to the middle of the page"
 msgstr "移動到本頁的中間"
 

-#: ../keymap_alldefs.h:136
+#: ../keymap_alldefs.h:137

 msgid "move to the next entry"
 msgstr "移動到下一項資料"
 
 msgid "move to the next entry"
 msgstr "移動到下一項資料"
 

-#: ../keymap_alldefs.h:137
+#: ../keymap_alldefs.h:138

 msgid "scroll down one line"
 msgstr "向下捲動一行"
 
 msgid "scroll down one line"
 msgstr "向下捲動一行"
 

-#: ../keymap_alldefs.h:138
+#: ../keymap_alldefs.h:139

 msgid "move to the next page"
 msgstr "移到下一頁"
 
 msgid "move to the next page"
 msgstr "移到下一頁"
 

-#: ../keymap_alldefs.h:139
+#: ../keymap_alldefs.h:140

 msgid "jump to the bottom of the message"
 msgstr "跳到信件的最後面"
 
 msgid "jump to the bottom of the message"
 msgstr "跳到信件的最後面"
 

-#: ../keymap_alldefs.h:140
+#: ../keymap_alldefs.h:141

 msgid "toggle display of quoted text"
 msgstr "切換引言顯示"
 
 msgid "toggle display of quoted text"
 msgstr "切換引言顯示"
 

-#: ../keymap_alldefs.h:141
+#: ../keymap_alldefs.h:142

 msgid "skip beyond quoted text"
 msgstr "跳過引言"
 
 msgid "skip beyond quoted text"
 msgstr "跳過引言"
 

-#: ../keymap_alldefs.h:142
+#: ../keymap_alldefs.h:143

 msgid "jump to the top of the message"
 msgstr "跳到信件的最上面"
 
 msgid "jump to the top of the message"
 msgstr "跳到信件的最上面"
 

-#: ../keymap_alldefs.h:143
+#: ../keymap_alldefs.h:144

 msgid "pipe message/attachment to a shell command"
 msgstr "輸出導向 訊息/附件 至命令解譯器"
 
 msgid "pipe message/attachment to a shell command"
 msgstr "輸出導向 訊息/附件 至命令解譯器"
 

-#: ../keymap_alldefs.h:144
+#: ../keymap_alldefs.h:145

 msgid "move to the previous entry"
 msgstr "移到上一項資料"
 
 msgid "move to the previous entry"
 msgstr "移到上一項資料"
 

-#: ../keymap_alldefs.h:145
+#: ../keymap_alldefs.h:146

 msgid "scroll up one line"
 msgstr "向上捲動一行"
 
 msgid "scroll up one line"
 msgstr "向上捲動一行"
 

-#: ../keymap_alldefs.h:146
+#: ../keymap_alldefs.h:147

 msgid "move to the previous page"
 msgstr "移到上一頁"
 
 msgid "move to the previous page"
 msgstr "移到上一頁"
 

-#: ../keymap_alldefs.h:147
+#: ../keymap_alldefs.h:148

 msgid "print the current entry"
 msgstr "列印現在的資料"
 
 msgid "print the current entry"
 msgstr "列印現在的資料"
 

-#: ../keymap_alldefs.h:148
+#: ../keymap_alldefs.h:149

 msgid "query external program for addresses"
 msgstr "利用外部應用程式查詢地址"
 
 msgid "query external program for addresses"
 msgstr "利用外部應用程式查詢地址"
 

-#: ../keymap_alldefs.h:149
+#: ../keymap_alldefs.h:150

 msgid "append new query results to current results"
 msgstr "附加新的查詢結果至現今的查詢結果"
 
 msgid "append new query results to current results"
 msgstr "附加新的查詢結果至現今的查詢結果"
 

-#: ../keymap_alldefs.h:150
+#: ../keymap_alldefs.h:151

 msgid "save changes to mailbox and quit"
 msgstr "儲存變動過的資料到信箱並且離開"
 
 msgid "save changes to mailbox and quit"
 msgstr "儲存變動過的資料到信箱並且離開"
 

-#: ../keymap_alldefs.h:151
+#: ../keymap_alldefs.h:152

 msgid "recall a postponed message"
 msgstr "重新叫出一封被延遲寄出的信件"
 
 msgid "recall a postponed message"
 msgstr "重新叫出一封被延遲寄出的信件"
 

-#: ../keymap_alldefs.h:152
+#: ../keymap_alldefs.h:153

 msgid "clear and redraw the screen"
 msgstr "清除並重新繪製畫面"
 
 msgid "clear and redraw the screen"
 msgstr "清除並重新繪製畫面"
 

-#: ../keymap_alldefs.h:153
+#: ../keymap_alldefs.h:154

 msgid "{internal}"
 msgstr "{內部的}"
 
 msgid "{internal}"
 msgstr "{內部的}"
 

-#: ../keymap_alldefs.h:154
+#: ../keymap_alldefs.h:155

 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "刪除所在的郵箱 (只適用於 IMAP)"
 
 #, fuzzy
 msgid "rename the current mailbox (IMAP only)"
 msgstr "刪除所在的郵箱 (只適用於 IMAP)"
 

-#: ../keymap_alldefs.h:155
+#: ../keymap_alldefs.h:156

 msgid "reply to a message"
 msgstr "回覆一封信件"
 
 msgid "reply to a message"
 msgstr "回覆一封信件"
 

-#: ../keymap_alldefs.h:156
+#: ../keymap_alldefs.h:157

 msgid "use the current message as a template for a new one"
 msgstr "用這封信件作為新信件的範本"
 
 msgid "use the current message as a template for a new one"
 msgstr "用這封信件作為新信件的範本"
 

-#: ../keymap_alldefs.h:157
-msgid "save message/attachment to a file"
+#: ../keymap_alldefs.h:158
+#, fuzzy
+msgid "save message/attachment to a mailbox/file"

 msgstr "儲存信件/附件到某個檔案"
 
 msgstr "儲存信件/附件到某個檔案"
 

-#: ../keymap_alldefs.h:158
+#: ../keymap_alldefs.h:159

 msgid "search for a regular expression"
 msgstr "用正規表示式尋找"
 
 msgid "search for a regular expression"
 msgstr "用正規表示式尋找"
 

-#: ../keymap_alldefs.h:159
+#: ../keymap_alldefs.h:160

 msgid "search backwards for a regular expression"
 msgstr "向後搜尋一個正規表示式"
 
 msgid "search backwards for a regular expression"
 msgstr "向後搜尋一個正規表示式"
 

-#: ../keymap_alldefs.h:160
+#: ../keymap_alldefs.h:161

 msgid "search for next match"
 msgstr "尋找下一個符合的資料"
 
 msgid "search for next match"
 msgstr "尋找下一個符合的資料"
 

-#: ../keymap_alldefs.h:161
+#: ../keymap_alldefs.h:162

 msgid "search for next match in opposite direction"
 msgstr "返方向搜尋下一個符合的資料"
 
 msgid "search for next match in opposite direction"
 msgstr "返方向搜尋下一個符合的資料"
 

-#: ../keymap_alldefs.h:162
+#: ../keymap_alldefs.h:163

 msgid "toggle search pattern coloring"
 msgstr "切換搜尋格式的顏色"
 
 msgid "toggle search pattern coloring"
 msgstr "切換搜尋格式的顏色"
 

-#: ../keymap_alldefs.h:163
+#: ../keymap_alldefs.h:164

 msgid "invoke a command in a subshell"
 msgstr "在子 shell 執行指令"
 
 msgid "invoke a command in a subshell"
 msgstr "在子 shell 執行指令"
 

-#: ../keymap_alldefs.h:164
+#: ../keymap_alldefs.h:165

 msgid "sort messages"
 msgstr "信件排序"
 
 msgid "sort messages"
 msgstr "信件排序"
 

-#: ../keymap_alldefs.h:165
+#: ../keymap_alldefs.h:166

 msgid "sort messages in reverse order"
 msgstr "以相反的次序來做訊息排序"
 
 msgid "sort messages in reverse order"
 msgstr "以相反的次序來做訊息排序"
 

-#: ../keymap_alldefs.h:166
+#: ../keymap_alldefs.h:167

 msgid "tag the current entry"
 msgstr "標記現在的記錄"
 
 msgid "tag the current entry"
 msgstr "標記現在的記錄"
 

-#: ../keymap_alldefs.h:167
+#: ../keymap_alldefs.h:168

 msgid "apply next function to tagged messages"
 msgstr "應用下一個功能到已標記的訊息"
 
 msgid "apply next function to tagged messages"
 msgstr "應用下一個功能到已標記的訊息"
 

-#: ../keymap_alldefs.h:168
+#: ../keymap_alldefs.h:169

 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "應用下一個功能到已標記的訊息"
 
 #, fuzzy
 msgid "apply next function ONLY to tagged messages"
 msgstr "應用下一個功能到已標記的訊息"
 

-#: ../keymap_alldefs.h:169
+#: ../keymap_alldefs.h:170

 msgid "tag the current subthread"
 msgstr "標記目前的子序列"
 
 msgid "tag the current subthread"
 msgstr "標記目前的子序列"
 

-#: ../keymap_alldefs.h:170
+#: ../keymap_alldefs.h:171

 msgid "tag the current thread"
 msgstr "標記目前的序列"
 
 msgid "tag the current thread"
 msgstr "標記目前的序列"
 

-#: ../keymap_alldefs.h:171
+#: ../keymap_alldefs.h:172

 msgid "toggle a message's 'new' flag"
 msgstr "切換信件的 'new' 旗標"
 
 msgid "toggle a message's 'new' flag"
 msgstr "切換信件的 'new' 旗標"
 

-#: ../keymap_alldefs.h:172
+#: ../keymap_alldefs.h:173

 msgid "toggle whether the mailbox will be rewritten"
 msgstr "切換是否重新寫入郵箱中"
 
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "切換是否重新寫入郵箱中"
 

-#: ../keymap_alldefs.h:173
+#: ../keymap_alldefs.h:174

 msgid "toggle whether to browse mailboxes or all files"
 msgstr "切換瀏覽郵箱抑或所有的檔案"
 
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "切換瀏覽郵箱抑或所有的檔案"
 

-#: ../keymap_alldefs.h:174
+#: ../keymap_alldefs.h:175

 msgid "move to the top of the page"
 msgstr "移到頁首"
 
 msgid "move to the top of the page"
 msgstr "移到頁首"
 

-#: ../keymap_alldefs.h:175
+#: ../keymap_alldefs.h:176

 msgid "undelete the current entry"
 msgstr "取消刪除所在的記錄"
 
 msgid "undelete the current entry"
 msgstr "取消刪除所在的記錄"
 

-#: ../keymap_alldefs.h:176
+#: ../keymap_alldefs.h:177

 msgid "undelete all messages in thread"
 msgstr "取消刪除序列中的所有信件"
 
 # XXX weird translation
 msgid "undelete all messages in thread"
 msgstr "取消刪除序列中的所有信件"
 
 # XXX weird translation

-#: ../keymap_alldefs.h:177
+#: ../keymap_alldefs.h:178

 msgid "undelete all messages in subthread"
 msgstr "取消刪除子序列中的所有信件"
 
 msgid "undelete all messages in subthread"
 msgstr "取消刪除子序列中的所有信件"
 

-#: ../keymap_alldefs.h:178
+#: ../keymap_alldefs.h:179

 msgid "show the Mutt version number and date"
 msgstr "顯示 Mutt 的版本號碼與日期"
 
 msgid "show the Mutt version number and date"
 msgstr "顯示 Mutt 的版本號碼與日期"
 

-#: ../keymap_alldefs.h:179
+#: ../keymap_alldefs.h:180

 msgid "view attachment using mailcap entry if necessary"
 msgstr "如果需要的話使用 mailcap 瀏覽附件"
 
 msgid "view attachment using mailcap entry if necessary"
 msgstr "如果需要的話使用 mailcap 瀏覽附件"
 

-#: ../keymap_alldefs.h:180
+#: ../keymap_alldefs.h:181

 msgid "show MIME attachments"
 msgstr "顯示 MIME 附件"
 
 msgid "show MIME attachments"
 msgstr "顯示 MIME 附件"
 

-#: ../keymap_alldefs.h:181
+#: ../keymap_alldefs.h:182

 msgid "display the keycode for a key press"
 msgstr ""
 
 msgid "display the keycode for a key press"
 msgstr ""
 

-#: ../keymap_alldefs.h:182
+#: ../keymap_alldefs.h:183

 msgid "show currently active limit pattern"
 msgstr "顯示目前有作用的限制樣式"
 
 msgid "show currently active limit pattern"
 msgstr "顯示目前有作用的限制樣式"
 

-#: ../keymap_alldefs.h:183
+#: ../keymap_alldefs.h:184

 msgid "collapse/uncollapse current thread"
 msgstr "打開/關閉 目前的序列"
 
 msgid "collapse/uncollapse current thread"
 msgstr "打開/關閉 目前的序列"
 

-#: ../keymap_alldefs.h:184
+#: ../keymap_alldefs.h:185

 msgid "collapse/uncollapse all threads"
 msgstr "打開/關閉 所有的序列"
 
 # XXX strange translation
 msgid "collapse/uncollapse all threads"
 msgstr "打開/關閉 所有的序列"
 
 # XXX strange translation

-#: ../keymap_alldefs.h:185
+#: ../keymap_alldefs.h:186

 msgid "attach a PGP public key"
 msgstr "附帶一把 PGP 公共鑰匙"
 
 msgid "attach a PGP public key"
 msgstr "附帶一把 PGP 公共鑰匙"
 

-#: ../keymap_alldefs.h:186
+#: ../keymap_alldefs.h:187

 msgid "show PGP options"
 msgstr "顯示 PGP 選項"
 
 msgid "show PGP options"
 msgstr "顯示 PGP 選項"
 

-#: ../keymap_alldefs.h:187
+#: ../keymap_alldefs.h:188

 msgid "mail a PGP public key"
 msgstr "寄出 PGP 公共鑰匙"
 
 msgid "mail a PGP public key"
 msgstr "寄出 PGP 公共鑰匙"
 

-#: ../keymap_alldefs.h:188
+#: ../keymap_alldefs.h:189

 msgid "verify a PGP public key"
 msgstr "檢驗 PGP 公共鑰匙"
 
 msgid "verify a PGP public key"
 msgstr "檢驗 PGP 公共鑰匙"
 

-#: ../keymap_alldefs.h:189
+#: ../keymap_alldefs.h:190

 msgid "view the key's user id"
 msgstr "檢閱這把鑰匙的使用者 id"
 
 msgid "view the key's user id"
 msgstr "檢閱這把鑰匙的使用者 id"
 

-#: ../keymap_alldefs.h:190
+#: ../keymap_alldefs.h:191

 #, fuzzy
 msgid "check for classic PGP"
 msgstr "檢查古老的pgp格式"
 
 #, fuzzy
 msgid "check for classic PGP"
 msgstr "檢查古老的pgp格式"
 

-#: ../keymap_alldefs.h:191
+#: ../keymap_alldefs.h:192

 msgid "Accept the chain constructed"
 msgstr "同意已建好的鏈結"
 
 msgid "Accept the chain constructed"
 msgstr "同意已建好的鏈結"
 

-#: ../keymap_alldefs.h:192
+#: ../keymap_alldefs.h:193

 msgid "Append a remailer to the chain"
 msgstr "在鏈結的後面加上郵件轉接器"
 
 msgid "Append a remailer to the chain"
 msgstr "在鏈結的後面加上郵件轉接器"
 

-#: ../keymap_alldefs.h:193
+#: ../keymap_alldefs.h:194

 msgid "Insert a remailer into the chain"
 msgstr "在鏈結中加入郵件轉接器"
 
 msgid "Insert a remailer into the chain"
 msgstr "在鏈結中加入郵件轉接器"
 

-#: ../keymap_alldefs.h:194
+#: ../keymap_alldefs.h:195

 msgid "Delete a remailer from the chain"
 msgstr "從鏈結中刪除郵件轉接器"
 
 msgid "Delete a remailer from the chain"
 msgstr "從鏈結中刪除郵件轉接器"
 

-#: ../keymap_alldefs.h:195
+#: ../keymap_alldefs.h:196

 msgid "Select the previous element of the chain"
 msgstr "選擇鏈結裏對上一個部份"
 
 msgid "Select the previous element of the chain"
 msgstr "選擇鏈結裏對上一個部份"
 

-#: ../keymap_alldefs.h:196
+#: ../keymap_alldefs.h:197

 msgid "Select the next element of the chain"
 msgstr "選擇鏈結裏跟著的一個部份"
 
 msgid "Select the next element of the chain"
 msgstr "選擇鏈結裏跟著的一個部份"
 

-#: ../keymap_alldefs.h:197
+#: ../keymap_alldefs.h:198

 msgid "send the message through a mixmaster remailer chain"
 msgstr "利用 mixmaster 郵件轉接器把郵件寄出"
 
 msgid "send the message through a mixmaster remailer chain"
 msgstr "利用 mixmaster 郵件轉接器把郵件寄出"
 

-#: ../keymap_alldefs.h:198
+#: ../keymap_alldefs.h:199

 msgid "make decrypted copy and delete"
 msgstr "製作解密的拷貝並且刪除之"
 
 msgid "make decrypted copy and delete"
 msgstr "製作解密的拷貝並且刪除之"
 

-#: ../keymap_alldefs.h:199
+#: ../keymap_alldefs.h:200

 msgid "make decrypted copy"
 msgstr "製作一份解密的拷貝"
 
 msgid "make decrypted copy"
 msgstr "製作一份解密的拷貝"
 

-#: ../keymap_alldefs.h:200
+#: ../keymap_alldefs.h:201

 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "清除記憶體中的 PGP 通行密碼"
 
 #, fuzzy
 msgid "wipe passphrase(s) from memory"
 msgstr "清除記憶體中的 PGP 通行密碼"
 

-#: ../keymap_alldefs.h:201
+#: ../keymap_alldefs.h:202

 #, fuzzy
 msgid "extract supported public keys"
 msgstr "擷取 PGP 公共鑰匙"
 
 #, fuzzy
 msgid "extract supported public keys"
 msgstr "擷取 PGP 公共鑰匙"
 

-#: ../keymap_alldefs.h:202
+#: ../keymap_alldefs.h:203

 #, fuzzy
 msgid "show S/MIME options"
 msgstr "顯示 S/MIME 選項"
 
 #, fuzzy
 msgid "show S/MIME options"
 msgstr "顯示 S/MIME 選項"
 

+#~ msgid "Clear"
+#~ msgstr "清除"
+
+#, fuzzy
+#~ msgid "esabifc"
+#~ msgstr "1234i5"
+
+#~ msgid "No search pattern."
+#~ msgstr "沒有搜尋格式。"
+
+#~ msgid "Reverse search: "
+#~ msgstr "反向搜尋："
+
+#~ msgid "Search: "
+#~ msgstr "搜尋："
+

 #, fuzzy
 #~ msgid "Error checking signature"
 #~ msgstr "寄信途中發生錯誤。"
 #, fuzzy
 #~ msgid "Error checking signature"
 #~ msgstr "寄信途中發生錯誤。"


@@ -5362,9 +5484,6 @@ msgstr "顯示 S/MIME 選項"
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "建立一封 application/pgp 的信件？"
 
 #~ msgid "Create a traditional (inline) PGP message?"
 #~ msgstr "建立一封 application/pgp 的信件？"
 

-#~ msgid "Closing connection to IMAP server..."
-#~ msgstr "正在關閉與 IMAP 伺服器的連線…"
-

 #, fuzzy
 #~ msgid "%s: stat: %s"
 #~ msgstr "無法讀取：%s"
 #, fuzzy
 #~ msgid "%s: stat: %s"
 #~ msgstr "無法讀取：%s"