X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=po%2Fzh_TW.po;h=2a8a4ad990d6052c64ba6467a9565f2495036052;hp=52d8c183af7f3280c15ca36476dc5e53aa484412;hb=e83dbdbc6200a71981d06773869cd0492f81f16c;hpb=3ea753c6005292b3e3153ac7e1f7b7d2363955c9

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 52d8c18..2a8a4ad 100644
--- 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"
-"POT-Creation-Date: 2005-07-27 03:09+0000\n"
+"POT-Creation-Date: 2005-08-13 09:41+0000\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,487 +14,487 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: account.c:160
+#: account.c:162
 #, c-format
 msgid "Username at %s: "
 msgstr "用戶名在 %s："
 
-#: account.c:213
+#: account.c:219
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s 的密碼："
 
-#: addrbook.c:32 browser.c:45 browser.c:54 pager.c:1343 postpone.c:39
-#: query.c:42 recvattach.c:49
+#: alias.c:35 browser.c:48 browser.c:57 pager.c:1372 postpone.c:43 query.c:42
+#: recvattach.c:53
 msgid "Exit"
 msgstr "離開"
 
-#: addrbook.c:33 curs_main.c:372 curs_main.c:385 pager.c:1350 pager.c:1360
-#: postpone.c:40
+#: alias.c:36 curs_main.c:374 curs_main.c:387 pager.c:1379 pager.c:1389
+#: postpone.c:44
 msgid "Del"
 msgstr "刪除"
 
-#: addrbook.c:34 curs_main.c:373 curs_main.c:386 postpone.c:41
+#: alias.c:37 curs_main.c:375 curs_main.c:388 postpone.c:45
 msgid "Undel"
 msgstr "反刪除"
 
-#: addrbook.c:35
+#: alias.c:38
 msgid "Select"
 msgstr "選擇"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:36 browser.c:48 browser.c:60 compose.c:114 compose.c:126
-#: crypt-gpgme.c:3304 curs_main.c:378 curs_main.c:391 mutt_ssl.c:607
-#: mutt_ssl_gnutls.c:746 pager.c:1455 pgpkey.c:493 postpone.c:42 query.c:47
-#: recvattach.c:53 smime.c:425
+#: alias.c:39 browser.c:51 browser.c:63 compose.c:116 compose.c:128
+#: crypt-gpgme.c:3307 curs_main.c:380 curs_main.c:393 mutt_ssl.c:639
+#: mutt_ssl_gnutls.c:745 pager.c:1484 pgpkey.c:496 postpone.c:46 query.c:47
+#: recvattach.c:57 smime.c:427
 msgid "Help"
 msgstr "求助"
 
-#: addrbook.c:140
-msgid "You have no aliases!"
-msgstr "您沒有別名資料！"
-
-#: addrbook.c:152
-msgid "Aliases"
-msgstr "別名"
-
 #. add a new alias
-#: alias.c:220
+#: alias.c:236
 msgid "Alias as: "
 msgstr "取別名為："
 
-#: alias.c:225
+#: alias.c:241
 msgid "You already have an alias defined with that name!"
 msgstr "您已經為這個名字定義了別名啦！"
 
-#: alias.c:232
+#: alias.c:248
 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr ""
 
-#: alias.c:255
+#: alias.c:271
 msgid "Address: "
 msgstr "地址："
 
-#: alias.c:263 send.c:192
+#: alias.c:279 send.c:195
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr ""
 
-#: alias.c:275
+#: alias.c:291
 msgid "Personal name: "
 msgstr "個人姓名："
 
-#: alias.c:283
+#: alias.c:299
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] 接受?"
 
-#: alias.c:298 recvattach.c:413 recvattach.c:437 recvattach.c:450
-#: recvattach.c:465 recvattach.c:490
+#: alias.c:314 recvattach.c:417 recvattach.c:441 recvattach.c:454
+#: recvattach.c:469 recvattach.c:494
 msgid "Save to file: "
 msgstr "存到檔案："
 
-#: alias.c:312
+#: alias.c:328
 msgid "Alias added."
 msgstr "別名已經增加。"
 
-#: attach.c:103 attach.c:224 attach.c:434 attach.c:900
+#: alias.c:642
+msgid "You have no aliases!"
+msgstr "您沒有別名資料！"
+
+#: alias.c:654
+msgid "Aliases"
+msgstr "別名"
+
+#: attach.c:106 attach.c:227 attach.c:437 attach.c:903
 msgid "Can't match nametemplate, continue?"
 msgstr "無法配合二個同樣名稱，繼續？"
 
 #. For now, editing requires a file, no piping
-#: attach.c:116
+#: attach.c:119
 #, c-format
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap 編輯項目需要 %%s"
 
-#: attach.c:123 attach.c:242 commands.c:215 compose.c:1313 curs_lib.c:180
-#: curs_lib.c:414
+#: attach.c:126 attach.c:245 commands.c:219 compose.c:1320 curs_lib.c:179
+#: curs_lib.c:413
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "執行 \"%s\" 時發生錯誤！"
 
-#: attach.c:131
+#: attach.c:134
 msgid "Failure to open file to parse headers."
 msgstr "開啟檔案來分析檔頭失敗。"
 
-#: attach.c:159
+#: attach.c:162
 msgid "Failure to open file to strip headers."
 msgstr "開啟檔案時去除檔案標頭失敗。"
 
-#: attach.c:168
+#: attach.c:171
 #, fuzzy
 msgid "Failure to rename file."
 msgstr "開啟檔案來分析檔頭失敗。"
 
-#: attach.c:181
+#: attach.c:184
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
 msgstr "沒有 %s 的 mailcap 組成登錄，正在建立空的檔案。"
 
 #. For now, editing requires a file, no piping
-#: attach.c:237
+#: attach.c:240
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
 msgstr "編輯 Mailcap 項目時需要 %%s"
 
-#: attach.c:252
+#: attach.c:255
 #, c-format
 msgid "No mailcap edit entry for %s"
 msgstr "沒有 %s 的 mailcap 編輯登錄"
 
-#: attach.c:404
+#: attach.c:407
 msgid "No matching mailcap entry found.  Viewing as text."
 msgstr "沒有發現配合 mailcap 的登錄。將以文字檔方式瀏覽。"
 
-#: attach.c:416
+#: attach.c:419
 msgid "MIME type not defined.  Cannot view attachment."
 msgstr "MIME 形式未被定義. 無法顯示附件內容。"
 
-#: attach.c:500
+#: attach.c:503
 msgid "Cannot create filter"
 msgstr "無法建立過濾器"
 
-#: attach.c:624 attach.c:653 attach.c:931 attach.c:985 handler.c:1629
-#: pgpkey.c:542 pgpkey.c:727
+#: attach.c:627 attach.c:656 attach.c:934 attach.c:988 handler.c:1308
+#: pgpkey.c:545 pgpkey.c:730
 msgid "Can't create filter"
 msgstr "無法建立過濾"
 
-#: attach.c:782
+#: attach.c:785
 msgid "Write fault!"
 msgstr "寫入失敗！"
 
-#: attach.c:1008
+#: attach.c:1011
 msgid "I don't know how to print that!"
 msgstr "我不知道要如何列印它！"
 
-#: browser.c:46
+#: browser.c:49
 msgid "Chdir"
 msgstr "改變目錄"
 
-#: browser.c:47 browser.c:59
+#: browser.c:50 browser.c:62
 msgid "Mask"
 msgstr "遮罩"
 
-#: browser.c:55
+#: browser.c:58
 msgid "List"
 msgstr ""
 
-#: browser.c:56
+#: browser.c:59
 msgid "Subscribe"
 msgstr ""
 
-#: browser.c:57
+#: browser.c:60
 #, fuzzy
 msgid "Unsubscribe"
 msgstr "取消訂閱 %s…"
 
-#: browser.c:58 curs_main.c:390
+#: browser.c:61 curs_main.c:392
 msgid "Catchup"
 msgstr ""
 
-#: browser.c:519 browser.c:1170
+#: browser.c:522 browser.c:1173
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s 不是一個目錄"
 
-#: browser.c:682
+#: browser.c:685
 msgid "Subscribed newsgroups"
 msgstr ""
 
-#: browser.c:684
+#: browser.c:687
 #, c-format
 msgid "Newsgroups on server [%s]"
 msgstr ""
 
-#: browser.c:690
+#: browser.c:693
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "ä¿¡ç®± [%d]"
 
-#: browser.c:696
+#: browser.c:699
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "已訂閱 [%s], 檔案遮罩: %s"
 
-#: browser.c:700
+#: browser.c:703
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "目錄 [%s], 檔案遮罩: %s"
 
-#: browser.c:713
+#: browser.c:716
 msgid "Can't attach a directory!"
 msgstr "無法附帶目錄！"
 
-#: browser.c:858 browser.c:1231 browser.c:1327
+#: browser.c:861 browser.c:1234 browser.c:1330
 msgid "No files match the file mask"
 msgstr "沒有檔案與檔案遮罩相符"
 
-#: browser.c:1043
+#: browser.c:1046
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
 
-#: browser.c:1062
+#: browser.c:1065
 #, fuzzy
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援製造功能"
 
-#: browser.c:1082
+#: browser.c:1085
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 郵箱才支援刪除功能"
 
-#: browser.c:1089
+#: browser.c:1092
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "真的要刪除 \"%s\" 郵箱？"
 
-#: browser.c:1102
+#: browser.c:1105
 msgid "Mailbox deleted."
 msgstr "郵箱已刪除。"
 
-#: browser.c:1109
+#: browser.c:1112
 msgid "Mailbox not deleted."
 msgstr "郵箱未被刪除。"
 
-#: browser.c:1134
+#: browser.c:1137
 msgid "Chdir to: "
 msgstr "改變目錄到："
 
-#: browser.c:1158 browser.c:1224
+#: browser.c:1161 browser.c:1227
 msgid "Error scanning directory."
 msgstr "無法掃描目錄。"
 
-#: browser.c:1181
+#: browser.c:1184
 msgid "File Mask: "
 msgstr "檔案遮罩："
 
-#: browser.c:1249
+#: browser.c:1252
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "反向排序 (1)日期, (2)字元, (3)大小 或 (4)不排序 ? "
 
-#: browser.c:1252
+#: browser.c:1255
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
 msgstr "依照 (1)日期 (2)字元 (3)大小 來排序，或(4)不排序 ? "
 
-#: browser.c:1253
+#: browser.c:1256
 msgid "dazn"
 msgstr "1234"
 
-#: browser.c:1315
+#: browser.c:1318
 msgid "New file name: "
 msgstr "新檔名："
 
-#: browser.c:1344
+#: browser.c:1347
 msgid "Can't view a directory"
 msgstr "無法顯示目錄"
 
-#: browser.c:1361
+#: browser.c:1364
 msgid "Error trying to view file"
 msgstr "無法試著顯示檔案"
 
-#: browser.c:1443
+#: browser.c:1446
 #, c-format
 msgid "Subscribe pattern: "
 msgstr ""
 
-#: browser.c:1445
+#: browser.c:1448
 #, fuzzy, c-format
 msgid "Unsubscribe pattern: "
 msgstr "取消訂閱 %s…"
 
-#: browser.c:1462
+#: browser.c:1465
 #, fuzzy
 msgid "No newsgroups match the mask"
 msgstr "沒有檔案與檔案遮罩相符"
 
-#: buffy.c:514
+#: buffy.c:515
 #, fuzzy
 msgid "New mail in "
 msgstr "在 %s 有新信件。"
 
-#: color.c:309
+#: color.c:311
 #, c-format
 msgid "%s: color not supported by term"
 msgstr "%s：終端機無法顯示色彩"
 
-#: color.c:315
+#: color.c:317
 #, c-format
 msgid "%s: no such color"
 msgstr "%s：沒有這種顏色"
 
-#: color.c:360 color.c:541 color.c:551
+#: color.c:362 color.c:543 color.c:553
 #, c-format
 msgid "%s: no such object"
 msgstr "%s：沒有這個物件"
 
-#: color.c:366
+#: color.c:368
 #, c-format
 msgid "%s: command valid only for index object"
 msgstr "%s：命令只提供索引物件"
 
-#: color.c:373
+#: color.c:375
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s：太少參數"
 
-#: color.c:532
+#: color.c:534
 msgid "Missing arguments."
 msgstr "缺少參數。"
 
-#: color.c:568 color.c:578
+#: color.c:570 color.c:580
 msgid "color: too few arguments"
 msgstr "色彩：太少引數"
 
-#: color.c:603
+#: color.c:605
 msgid "mono: too few arguments"
 msgstr "單色：太少引數"
 
-#: color.c:622
+#: color.c:624
 #, c-format
 msgid "%s: no such attribute"
 msgstr "%s：沒有這個屬性"
 
-#: color.c:661 hook.c:67 hook.c:77 keymap.c:707
+#: color.c:663 hook.c:68 hook.c:78 keymap.c:709
 msgid "too few arguments"
 msgstr "太少參數"
 
-#: color.c:669 hook.c:82
+#: color.c:671 hook.c:83
 msgid "too many arguments"
 msgstr "太多參數"
 
-#: color.c:685
+#: color.c:687
 msgid "default colors not supported"
 msgstr "不支援預設的色彩"
 
-#: commands.c:76 mbox.c:610
+#: commands.c:79 mbox.c:611
 msgid "Could not create temporary file!"
 msgstr "無法建立暫存檔！"
 
-#: commands.c:88
+#: commands.c:91
 msgid "Cannot create display filter"
 msgstr "無法建立顯示過濾器"
 
 #. find out whether or not the verify signature
-#: commands.c:119
+#: commands.c:122
 msgid "Verify PGP signature?"
 msgstr "檢查 PGP 簽名?"
 
-#: commands.c:150
+#: commands.c:153
 msgid "Could not copy message"
 msgstr "無法複制信件"
 
-#: commands.c:181
+#: commands.c:185
 #, fuzzy
 msgid "S/MIME signature successfully verified."
 msgstr "PGP 簽名驗證成功。"
 
-#: commands.c:183
+#: commands.c:187
 msgid "S/MIME certificate owner does not match sender."
 msgstr ""
 
-#: commands.c:187 commands.c:198
+#: commands.c:191 commands.c:202
 msgid "Warning: Part of this message has not been signed."
 msgstr ""
 
-#: commands.c:189
+#: commands.c:193
 #, fuzzy
 msgid "S/MIME signature could NOT be verified."
 msgstr "PGP 簽名無法驗證。"
 
-#: commands.c:195
+#: commands.c:199
 msgid "PGP signature successfully verified."
 msgstr "PGP 簽名驗證成功。"
 
-#: commands.c:200
+#: commands.c:204
 msgid "PGP signature could NOT be verified."
 msgstr "PGP 簽名無法驗證。"
 
-#: commands.c:221
+#: commands.c:225
 msgid "Command: "
 msgstr "指令："
 
-#: commands.c:240 recvcmd.c:133
+#: commands.c:244 recvcmd.c:137
 msgid "Bounce message to: "
 msgstr "直接傳送郵件到："
 
-#: commands.c:242 recvcmd.c:135
+#: commands.c:246 recvcmd.c:139
 msgid "Bounce tagged messages to: "
 msgstr "無法傳送已標記的郵件至："
 
-#: commands.c:255 recvcmd.c:143
+#: commands.c:259 recvcmd.c:147
 msgid "Error parsing address!"
 msgstr "無法分析位址！"
 
-#: commands.c:263 recvcmd.c:151
+#: commands.c:267 recvcmd.c:155
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr ""
 
-#: commands.c:274 recvcmd.c:165
+#: commands.c:278 recvcmd.c:169
 #, c-format
 msgid "Bounce message to %s"
 msgstr "把郵件直接傳送至 %s"
 
-#: commands.c:274 recvcmd.c:165
+#: commands.c:278 recvcmd.c:169
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "把郵件直接傳送至 %s"
 
-#: commands.c:289 recvcmd.c:180
+#: commands.c:293 recvcmd.c:184
 #, fuzzy
 msgid "Message not bounced."
 msgstr "郵件已被傳送。"
 
-#: commands.c:289 recvcmd.c:180
+#: commands.c:293 recvcmd.c:184
 #, fuzzy
 msgid "Messages not bounced."
 msgstr "郵件已傳送。"
 
-#: commands.c:299 recvcmd.c:197
+#: commands.c:303 recvcmd.c:201
 msgid "Message bounced."
 msgstr "郵件已被傳送。"
 
-#: commands.c:299 recvcmd.c:197
+#: commands.c:303 recvcmd.c:201
 msgid "Messages bounced."
 msgstr "郵件已傳送。"
 
-#: commands.c:367 commands.c:398 commands.c:415
+#: commands.c:371 commands.c:402 commands.c:419
 msgid "Can't create filter process"
 msgstr "無法啟動過濾程序"
 
-#: commands.c:445
+#: commands.c:449
 msgid "Pipe to command: "
 msgstr "用管道輸出至命令："
 
-#: commands.c:459
+#: commands.c:463
 msgid "No printing command has been defined."
 msgstr "沒有定義列印指令。"
 
-#: commands.c:464
+#: commands.c:468
 msgid "Print message?"
 msgstr "列印信件？"
 
-#: commands.c:464
+#: commands.c:468
 msgid "Print tagged messages?"
 msgstr "列印已標記的信件？"
 
-#: commands.c:471
+#: commands.c:475
 msgid "Message printed"
 msgstr "信件已印出"
 
-#: commands.c:471
+#: commands.c:475
 msgid "Messages printed"
 msgstr "信件已印出"
 
-#: commands.c:473
+#: commands.c:477
 msgid "Message could not be printed"
 msgstr "信件未能列印出來"
 
-#: commands.c:474
+#: commands.c:478
 msgid "Messages could not be printed"
 msgstr "信件未能列印出來"
 
-#: commands.c:484
+#: commands.c:488
 #, 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"
@@ -503,7 +503,7 @@ msgstr ""
 "反方向 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排 8)大小 9)分"
 "數:"
 
-#: commands.c:487
+#: commands.c:491
 #, 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)"
@@ -512,296 +512,296 @@ msgstr ""
 "排序 1)日期 2)發信人 3)收信時間 4)標題 5)收信人 6)序列 7)不排序 8)大小 9)分"
 "數:"
 
-#: commands.c:488
+#: commands.c:492
 #, fuzzy
 msgid "dfrsotuzcp"
 msgstr "123456789"
 
-#: commands.c:544
+#: commands.c:548
 msgid "Shell command: "
 msgstr "Shell 指令："
 
-#: commands.c:684
+#: commands.c:689
 #, fuzzy, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:685
+#: commands.c:690
 #, fuzzy, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:686
+#: commands.c:691
 #, fuzzy, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:687
+#: commands.c:692
 #, fuzzy, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:688
+#: commands.c:693
 #, fuzzy, c-format
 msgid "Save%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:688
+#: commands.c:693
 #, fuzzy, c-format
 msgid "Copy%s to mailbox"
 msgstr "%s%s 到信箱"
 
-#: commands.c:689
+#: commands.c:694
 msgid " tagged"
 msgstr " 已標記"
 
-#: commands.c:754
+#: commands.c:759
 #, c-format
 msgid "Copying to %s..."
 msgstr "拷貝到 %s…"
 
-#: commands.c:832
+#: commands.c:843
 #, fuzzy
 msgid "Unable to create backup file"
 msgstr "%s：無法附帶檔案"
 
-#: commands.c:838
+#: commands.c:849
 #, fuzzy
 msgid "Unable to open backup file for reading"
 msgstr "無法開啟暫存檔！"
 
-#: commands.c:845
+#: commands.c:856
 #, fuzzy
 msgid "Unable to open new file for writing"
 msgstr "無法開啟暫存檔！"
 
-#: commands.c:852
+#: commands.c:863
 #, c-format
 msgid "Unable to lock %s, old file saved as %s"
 msgstr ""
 
-#: commands.c:929
+#: commands.c:940
 #, c-format
 msgid "Cannot write new %s, old file saved as %s"
 msgstr ""
 
-#: commands.c:990
+#: commands.c:1001
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "送出的時候轉換字符集為 %s ？"
 
-#: commands.c:1000
+#: commands.c:1011
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Content-Type 被改為 %s。"
 
-#: commands.c:1004
+#: commands.c:1015
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "字符集已換為 %s; %s。"
 
-#: commands.c:1006
+#: commands.c:1017
 msgid "not converting"
 msgstr "沒有轉換"
 
-#: commands.c:1006
+#: commands.c:1017
 msgid "converting"
 msgstr "轉換中"
 
-#: compose.c:51
+#: compose.c:53
 msgid "There are no attachments."
 msgstr "沒有附件。"
 
-#: compose.c:107 compose.c:120
+#: compose.c:109 compose.c:122
 msgid "Send"
 msgstr "寄出"
 
-#: compose.c:108 compose.c:121 remailer.c:458
+#: compose.c:110 compose.c:123 remailer.c:458
 msgid "Abort"
 msgstr "中斷"
 
-#: compose.c:112 compose.c:124 compose.c:781
+#: compose.c:114 compose.c:126 compose.c:783
 msgid "Attach file"
 msgstr "附加檔案"
 
-#: compose.c:113 compose.c:125
+#: compose.c:115 compose.c:127
 msgid "Descrip"
 msgstr "敘述"
 
-#: compose.c:162
+#: compose.c:164
 msgid "Sign, Encrypt"
 msgstr "簽名，加密"
 
-#: compose.c:164
+#: compose.c:166
 msgid "Encrypt"
 msgstr "加密"
 
-#: compose.c:166
+#: compose.c:168
 msgid "Sign"
 msgstr "簽名"
 
-#: compose.c:168
+#: compose.c:170
 msgid "Clear"
 msgstr "清除"
 
-#: compose.c:174
+#: compose.c:176
 #, fuzzy
 msgid " (inline)"
 msgstr "（繼續）\n"
 
-#: compose.c:176
+#: compose.c:178
 msgid " (PGP/MIME)"
 msgstr ""
 
-#: compose.c:184 compose.c:189
+#: compose.c:186 compose.c:191
 #, fuzzy
 msgid "     sign as: "
 msgstr " 簽名的身份是： "
 
-#: compose.c:185 compose.c:190
+#: compose.c:187 compose.c:192
 msgid "<default>"
 msgstr "<預設值>"
 
-#: compose.c:197
+#: compose.c:199
 #, fuzzy
 msgid "Encrypt with: "
 msgstr "加密"
 
-#: compose.c:246
+#: compose.c:248
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] 已不存在!"
 
-#: compose.c:252
+#: compose.c:254
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] 已修改。更新編碼？"
 
-#: compose.c:311
+#: compose.c:313
 msgid "-- Attachments"
 msgstr "-- 附件"
 
-#: compose.c:338
+#: compose.c:340
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr ""
 
-#: compose.c:360
+#: compose.c:362
 msgid "You may not delete the only attachment."
 msgstr "您不可以刪除唯一的附件。"
 
-#: compose.c:716 send.c:1558
+#: compose.c:718 send.c:1543
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr ""
 
-#: compose.c:798
+#: compose.c:800
 msgid "Attaching selected files..."
 msgstr "正在附加選取了的檔案…"
 
-#: compose.c:809
+#: compose.c:812
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "無法附加 %s！"
 
-#: compose.c:832
+#: compose.c:835
 msgid "Open mailbox to attach message from"
 msgstr "開啟信箱並從它選擇附加的信件"
 
-#: compose.c:840
+#: compose.c:843
 #, fuzzy
 msgid "Open newsgroup to attach message from"
 msgstr "開啟信箱並從它選擇附加的信件"
 
-#: compose.c:891
+#: compose.c:894
 msgid "No messages in that folder."
 msgstr "檔案夾中沒有信件。"
 
-#: compose.c:902
+#: compose.c:905
 msgid "Tag the messages you want to attach!"
 msgstr "請標記您要附加的信件！"
 
-#: compose.c:932
+#: compose.c:935
 msgid "Unable to attach!"
 msgstr "無法附加！"
 
-#: compose.c:980
+#: compose.c:985
 msgid "Recoding only affects text attachments."
 msgstr "只重新編碼受影響的文字附件"
 
-#: compose.c:985
+#: compose.c:990
 msgid "The current attachment won't be converted."
 msgstr "這個附件不會被轉換。"
 
-#: compose.c:987
+#: compose.c:992
 msgid "The current attachment will be converted."
 msgstr "這個附件會被轉換。"
 
-#: compose.c:1058
+#: compose.c:1063
 msgid "Invalid encoding."
 msgstr "無效的編碼。"
 
-#: compose.c:1082
+#: compose.c:1087
 msgid "Save a copy of this message?"
 msgstr "儲存這封信件的拷貝嗎？"
 
-#: compose.c:1138
+#: compose.c:1143
 msgid "Rename to: "
 msgstr "更改名稱為："
 
-#: compose.c:1141 editmsg.c:107 sendlib.c:888
+#: compose.c:1146 editmsg.c:107 sendlib.c:820
 #, fuzzy, c-format
 msgid "Can't stat %s: %s"
 msgstr "無法讀取：%s"
 
-#: compose.c:1168
+#: compose.c:1173
 msgid "New file: "
 msgstr "建立新檔："
 
-#: compose.c:1180
+#: compose.c:1185
 msgid "Content-Type is of the form base/sub"
 msgstr "Content-Type 的格式是 base/sub"
 
-#: compose.c:1186
+#: compose.c:1191
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "不明的 Content-Type %s"
 
-#: compose.c:1197
+#: compose.c:1202
 #, c-format
 msgid "Can't create file %s"
 msgstr "無法建立檔案 %s"
 
-#: compose.c:1205
+#: compose.c:1210
 msgid "What we have here is a failure to make an attachment"
 msgstr "我們無法加上附件"
 
-#: compose.c:1276
+#: compose.c:1281
 msgid "Postpone this message?"
 msgstr "延遲寄出這封信件？"
 
-#: compose.c:1330
+#: compose.c:1337
 msgid "Write message to mailbox"
 msgstr "將信件寫入到信箱"
 
-#: compose.c:1332
+#: compose.c:1339
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "寫入信件到 %s …"
 
-#: compose.c:1341
+#: compose.c:1348
 msgid "Message written."
 msgstr "信件已寫入。"
 
-#: compose.c:1352
+#: compose.c:1359
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr ""
 
-#: compose.c:1376
+#: compose.c:1383
 msgid "PGP already selected. Clear & continue ? "
 msgstr ""
 
-#: compress.c:202 mbox.c:518
+#: compress.c:202 mbox.c:519
 msgid "Mailbox was corrupted!"
 msgstr "信箱已損壞!"
 
@@ -810,7 +810,7 @@ msgstr "信箱已損壞!"
 msgid "Decompressing %s..."
 msgstr "正在選擇 %s …"
 
-#: compress.c:245 compress.c:363 compress.c:438 mbox.c:583
+#: compress.c:245 compress.c:363 compress.c:438 mbox.c:586
 msgid "Unable to lock mailbox!"
 msgstr "無法鎖住信箱！"
 
@@ -856,47 +856,47 @@ msgstr ""
 msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 msgstr ""
 
-#: crypt.c:63
+#: crypt.c:65
 #, c-format
 msgid " (current time: %c)"
 msgstr ""
 
-#: crypt.c:69
+#: crypt.c:71
 #, fuzzy, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr "[-- 以下為 PGP 輸出的資料（現在時間：%c) --]\n"
 
-#: crypt.c:85
+#: crypt.c:87
 #, fuzzy
 msgid "Passphrase(s) forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 
-#: crypt.c:142 cryptglue.c:102 pgpkey.c:533
+#: crypt.c:144 cryptglue.c:102 pgpkey.c:536
 msgid "Invoking PGP..."
 msgstr "啟動 PGP…"
 
-#: crypt.c:154
+#: crypt.c:156
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr ""
 
-#: crypt.c:156 send.c:1505
+#: crypt.c:158 send.c:1490
 msgid "Mail not sent."
 msgstr "信件沒有寄出。"
 
-#: crypt.c:383
+#: crypt.c:385
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr ""
 
-#: crypt.c:586 crypt.c:625
+#: crypt.c:588 crypt.c:627
 msgid "Trying to extract PGP keys...\n"
 msgstr ""
 
 #. else ?
-#: crypt.c:608 crypt.c:644
+#: crypt.c:610 crypt.c:646
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr ""
 
-#: crypt.c:759
+#: crypt.c:762
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -904,7 +904,7 @@ msgstr ""
 "[-- 錯誤：不一致的 multipart/signed 結構！ --]\n"
 "\n"
 
-#: crypt.c:777
+#: crypt.c:779
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -913,7 +913,7 @@ msgstr ""
 "[-- 錯誤：不明的 multipart/signed 協定 %s！ --]\n"
 "\n"
 
-#: crypt.c:813
+#: crypt.c:814
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -923,7 +923,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:825
+#: crypt.c:826
 #, fuzzy
 msgid ""
 "[-- The following data is signed --]\n"
@@ -932,7 +932,7 @@ msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 
-#: crypt.c:831
+#: crypt.c:832
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -940,7 +940,7 @@ msgstr ""
 "[-- 警告：找不到任何的簽名。 --]\n"
 "\n"
 
-#: crypt.c:838
+#: crypt.c:839
 #, fuzzy
 msgid ""
 "\n"
@@ -958,126 +958,126 @@ msgstr ""
 msgid "Invoking SMIME..."
 msgstr "啟動 PGP…"
 
-#: crypt-gpgme.c:322
+#: crypt-gpgme.c:326
 #, fuzzy, c-format
 msgid "error creating gpgme context: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
-#: crypt-gpgme.c:330
+#: crypt-gpgme.c:334
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:348
+#: crypt-gpgme.c:352
 #, c-format
 msgid "error creating gpgme data object: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:407 crypt-gpgme.c:424 crypt-gpgme.c:1241
+#: crypt-gpgme.c:411 crypt-gpgme.c:428 crypt-gpgme.c:1245
 #, fuzzy, c-format
 msgid "error allocating data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
-#: crypt-gpgme.c:441
+#: crypt-gpgme.c:445
 #, fuzzy, c-format
 msgid "error rewinding data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
-#: crypt-gpgme.c:459 crypt-gpgme.c:501
+#: crypt-gpgme.c:463 crypt-gpgme.c:505
 #, fuzzy, c-format
 msgid "error reading data object: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
-#: crypt-gpgme.c:557
+#: crypt-gpgme.c:561
 #, fuzzy, c-format
 msgid "error adding recipient `%s': %s\n"
 msgstr "在樣式上有錯誤：%s"
 
-#: crypt-gpgme.c:594
+#: crypt-gpgme.c:598
 #, c-format
 msgid "secret key `%s' not found: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:603
+#: crypt-gpgme.c:607
 #, c-format
-msgid "ambiguous specfication of secret key `%s'\n"
+msgid "ambiguous specification of secret key `%s'\n"
 msgstr ""
 
-#: crypt-gpgme.c:613
+#: crypt-gpgme.c:617
 #, c-format
 msgid "error setting secret key `%s': %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:654
+#: crypt-gpgme.c:658
 #, fuzzy, c-format
 msgid "error encrypting data: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
-#: crypt-gpgme.c:747
+#: crypt-gpgme.c:751
 #, fuzzy, c-format
 msgid "error signing data: %s\n"
 msgstr "在樣式上有錯誤：%s"
 
-#: crypt-gpgme.c:935
+#: crypt-gpgme.c:939
 msgid "Warning: One of the keys has been revoked\n"
 msgstr ""
 
-#: crypt-gpgme.c:943
+#: crypt-gpgme.c:947
 msgid "Warning: The key used to create the signature expired at: "
 msgstr ""
 
-#: crypt-gpgme.c:949
+#: crypt-gpgme.c:953
 #, fuzzy
 msgid "Warning: At least one certification key has expired\n"
 msgstr "伺服器的驗証已過期"
 
-#: crypt-gpgme.c:963
+#: crypt-gpgme.c:967
 msgid "Warning: The signature expired at: "
 msgstr ""
 
-#: crypt-gpgme.c:969
+#: crypt-gpgme.c:973
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr ""
 
-#: crypt-gpgme.c:973
+#: crypt-gpgme.c:977
 #, fuzzy
 msgid "The CRL is not available\n"
 msgstr "沒有 SSL 功能"
 
-#: crypt-gpgme.c:978
+#: crypt-gpgme.c:982
 msgid "Available CRL is too old\n"
 msgstr ""
 
-#: crypt-gpgme.c:983
+#: crypt-gpgme.c:987
 msgid "A policy requirement was not met\n"
 msgstr ""
 
-#: crypt-gpgme.c:991
-msgid "A system error occured"
+#: crypt-gpgme.c:995
+msgid "A system error occurred"
 msgstr ""
 
-#: crypt-gpgme.c:1024 crypt-gpgme.c:2823
+#: crypt-gpgme.c:1028 crypt-gpgme.c:2826
 #, fuzzy
 msgid "Fingerprint: "
 msgstr "指模：%s"
 
-#: crypt-gpgme.c:1079
+#: crypt-gpgme.c:1083
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr ""
 
-#: crypt-gpgme.c:1085
+#: crypt-gpgme.c:1089
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
 msgstr ""
 
-#: crypt-gpgme.c:1089
+#: crypt-gpgme.c:1093
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
 msgstr ""
 
-#: crypt-gpgme.c:1157
+#: crypt-gpgme.c:1161
 msgid "Error getting key information: "
 msgstr ""
 
@@ -1085,24 +1085,24 @@ msgstr ""
 #. signature, so we display what a PGP user expects: The name,
 #. fingerprint and the key validity (which is neither fully or
 #. ultimate).
-#: crypt-gpgme.c:1163 crypt-gpgme.c:1193
+#: crypt-gpgme.c:1167 crypt-gpgme.c:1197
 msgid "Good signature from: "
 msgstr ""
 
-#: crypt-gpgme.c:1172
+#: crypt-gpgme.c:1176
 msgid "                aka: "
 msgstr ""
 
-#: crypt-gpgme.c:1176 crypt-gpgme.c:1196
+#: crypt-gpgme.c:1180 crypt-gpgme.c:1200
 msgid "            created: "
 msgstr ""
 
-#: crypt-gpgme.c:1184
+#: crypt-gpgme.c:1188
 msgid "*BAD* signature claimed to be from: "
 msgstr ""
 
 #. can't decide (yellow)
-#: crypt-gpgme.c:1206
+#: crypt-gpgme.c:1210
 #, fuzzy
 msgid "Error checking signature"
 msgstr "寄信途中發生錯誤。"
@@ -1110,16 +1110,16 @@ msgstr "寄信途中發生錯誤。"
 #. 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:1249 crypt-gpgme.c:1433 crypt-gpgme.c:1896
+#: crypt-gpgme.c:1253 crypt-gpgme.c:1437 crypt-gpgme.c:1900
 msgid "[-- Begin signature information --]\n"
 msgstr ""
 
-#: crypt-gpgme.c:1257
+#: crypt-gpgme.c:1261
 #, fuzzy, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "指令行有錯：%s\n"
 
-#: crypt-gpgme.c:1314 crypt-gpgme.c:1444 crypt-gpgme.c:1909
+#: crypt-gpgme.c:1318 crypt-gpgme.c:1448 crypt-gpgme.c:1913
 #, fuzzy
 msgid ""
 "[-- End signature information --]\n"
@@ -1128,23 +1128,23 @@ msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 
-#: crypt-gpgme.c:1403
+#: crypt-gpgme.c:1407
 #, fuzzy, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr "[-- 錯誤：突發的檔尾！ --]\n"
 
-#: crypt-gpgme.c:1873
+#: crypt-gpgme.c:1877
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr ""
 
-#: crypt-gpgme.c:1916
+#: crypt-gpgme.c:1920
 msgid "Error: copy data failed\n"
 msgstr ""
 
-#: crypt-gpgme.c:1934 pgp.c:376
+#: crypt-gpgme.c:1938 pgp.c:390
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -1152,11 +1152,11 @@ msgstr ""
 "[-- PGP 信件開始 --]\n"
 "\n"
 
-#: crypt-gpgme.c:1936 pgp.c:378
+#: crypt-gpgme.c:1940 pgp.c:392
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共鑰匙區段開始 --]\n"
 
-#: crypt-gpgme.c:1938 pgp.c:380
+#: crypt-gpgme.c:1942 pgp.c:394
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -1164,25 +1164,25 @@ msgstr ""
 "[-- PGP 簽名的信件開始 --]\n"
 "\n"
 
-#: crypt-gpgme.c:1961 pgp.c:403
+#: crypt-gpgme.c:1965 pgp.c:417
 #, fuzzy
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP 信件結束 --]\n"
 
-#: crypt-gpgme.c:1963 pgp.c:405
+#: crypt-gpgme.c:1967 pgp.c:421
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共鑰匙區段結束 --]\n"
 
-#: crypt-gpgme.c:1965 pgp.c:407
+#: crypt-gpgme.c:1969 pgp.c:423
 #, fuzzy
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr ""
 "\n"
 "[-- PGP 簽名的信件結束 --]\n"
 
-#: crypt-gpgme.c:1983 pgp.c:431
+#: crypt-gpgme.c:1987 pgp.c:451
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -1190,7 +1190,7 @@ msgstr ""
 "[-- 錯誤：找不到 PGP 信件的開頭！ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2010 pgp.c:828
+#: crypt-gpgme.c:2016 pgp.c:857
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -1198,11 +1198,11 @@ msgstr ""
 "[-- 錯誤：不正確的 PGP/MIME 信件！ --]\n"
 "\n"
 
-#: crypt-gpgme.c:2021 crypt-gpgme.c:2086 pgp.c:842
+#: crypt-gpgme.c:2027 crypt-gpgme.c:2090 pgp.c:871
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- 錯誤：無法建立暫存檔！ --]\n"
 
-#: crypt-gpgme.c:2033
+#: crypt-gpgme.c:2039
 #, fuzzy
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
@@ -1211,7 +1211,7 @@ msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2036 pgp.c:853
+#: crypt-gpgme.c:2040 pgp.c:882
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -1219,21 +1219,21 @@ msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2059
+#: crypt-gpgme.c:2062
 #, fuzzy
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
-#: crypt-gpgme.c:2060 pgp.c:873
+#: crypt-gpgme.c:2063 pgp.c:902
 #, fuzzy
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
-#: crypt-gpgme.c:2097
+#: crypt-gpgme.c:2101
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
@@ -1242,7 +1242,7 @@ msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2100
+#: crypt-gpgme.c:2102
 #, fuzzy
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
@@ -1251,542 +1251,588 @@ msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2128
+#: crypt-gpgme.c:2129
 #, fuzzy
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr ""
 "\n"
 "[-- 簽署的資料結束 --]\n"
 
-#: crypt-gpgme.c:2129
+#: crypt-gpgme.c:2130
 #, fuzzy
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
-#: crypt-gpgme.c:2677
+#: crypt-gpgme.c:2679
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr ""
 
-#: crypt-gpgme.c:2679
+#: crypt-gpgme.c:2681
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr ""
 
-#: crypt-gpgme.c:2684
+#: crypt-gpgme.c:2686
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr ""
 
-#: crypt-gpgme.c:2756
-msgid " aka"
+#: crypt-gpgme.c:2758
+msgid " aka ......: "
 msgstr ""
 
-#: crypt-gpgme.c:2756
-msgid "Name"
+#: crypt-gpgme.c:2758
+msgid "Name ......: "
 msgstr ""
 
-#: crypt-gpgme.c:2758 crypt-gpgme.c:2879
+#: crypt-gpgme.c:2761 crypt-gpgme.c:2882
 #, fuzzy
 msgid "[Invalid]"
 msgstr "無效的月份：%s"
 
-#: crypt-gpgme.c:2808 crypt-gpgme.c:2931
+#: crypt-gpgme.c:2780 crypt-gpgme.c:2903
+#, fuzzy, c-format
+msgid "Valid From : %s\n"
+msgstr "無效的月份：%s"
+
+#: crypt-gpgme.c:2792 crypt-gpgme.c:2915
+#, fuzzy, c-format
+msgid "Valid To ..: %s\n"
+msgstr "無效的月份：%s"
+
+#: crypt-gpgme.c:2805 crypt-gpgme.c:2928
+#, c-format
+msgid "Key Type ..: %s, %lu bit %s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2807 crypt-gpgme.c:2930
+#, c-format
+msgid "Key Usage .: "
+msgstr ""
+
+#: crypt-gpgme.c:2811 crypt-gpgme.c:2934
 #, fuzzy
 msgid "encryption"
 msgstr "加密"
 
-#: crypt-gpgme.c:2812 crypt-gpgme.c:2935
+#: crypt-gpgme.c:2812 crypt-gpgme.c:2816 crypt-gpgme.c:2820 crypt-gpgme.c:2935
+#: crypt-gpgme.c:2939 crypt-gpgme.c:2943
+msgid ", "
+msgstr ""
+
+#: crypt-gpgme.c:2815 crypt-gpgme.c:2938
 msgid "signing"
 msgstr ""
 
-#: crypt-gpgme.c:2816 crypt-gpgme.c:2939
+#: crypt-gpgme.c:2819 crypt-gpgme.c:2942
 msgid "certification"
 msgstr ""
 
+#: crypt-gpgme.c:2853
+#, c-format
+msgid "Serial-No .: 0x%s\n"
+msgstr ""
+
+#: crypt-gpgme.c:2859
+#, c-format
+msgid "Issued By .: "
+msgstr ""
+
+#. display only the short keyID
 #: crypt-gpgme.c:2875
+#, fuzzy, c-format
+msgid "Subkey ....: 0x%s"
+msgstr "鑰匙 ID：0x%s"
+
+#: crypt-gpgme.c:2878
 msgid "[Revoked]"
 msgstr ""
 
-#: crypt-gpgme.c:2883
+#: crypt-gpgme.c:2886
 #, fuzzy
 msgid "[Expired]"
 msgstr "離開  "
 
-#: crypt-gpgme.c:2887
+#: crypt-gpgme.c:2890
 msgid "[Disabled]"
 msgstr ""
 
-#: crypt-gpgme.c:2964 pgpkey.c:528 pgpkey.c:707
+#: crypt-gpgme.c:2967 pgpkey.c:531 pgpkey.c:710
 msgid "Can't create temporary file"
 msgstr "無法建立暫存檔"
 
-#: crypt-gpgme.c:2968
+#: crypt-gpgme.c:2971
 #, fuzzy
 msgid "Collecting data..."
 msgstr "正連接到 %s…"
 
-#: crypt-gpgme.c:2991
+#: crypt-gpgme.c:2994
 #, fuzzy, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "連線到 %s 時失敗"
 
-#: crypt-gpgme.c:2999
+#: crypt-gpgme.c:3002
 msgid "Error: certification chain to long - stopping here\n"
 msgstr ""
 
-#: crypt-gpgme.c:3009 pgpkey.c:553
+#: crypt-gpgme.c:3012 pgpkey.c:556
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "鑰匙 ID：0x%s"
 
-#: crypt-gpgme.c:3085
+#: crypt-gpgme.c:3088
 #, fuzzy, c-format
 msgid "gpgme_new failed: %s"
 msgstr "登入失敗： %s"
 
-#: crypt-gpgme.c:3120 crypt-gpgme.c:3176
+#: crypt-gpgme.c:3123 crypt-gpgme.c:3179
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr ""
 
-#: crypt-gpgme.c:3165 crypt-gpgme.c:3201
+#: crypt-gpgme.c:3168 crypt-gpgme.c:3204
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr ""
 
-#: crypt-gpgme.c:3267
+#: crypt-gpgme.c:3270
 #, fuzzy
 msgid "All matching keys are marked expired/revoked."
 msgstr "所有符合的鑰匙經已過期或取消。"
 
-#: crypt-gpgme.c:3296 mutt_ssl.c:605 mutt_ssl_gnutls.c:744 pgpkey.c:485
-#: smime.c:420
+#: crypt-gpgme.c:3299 mutt_ssl.c:637 mutt_ssl_gnutls.c:743 pgpkey.c:488
+#: smime.c:422
 msgid "Exit  "
 msgstr "離開  "
 
 #. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3298 pgpkey.c:487 smime.c:422
+#: crypt-gpgme.c:3301 pgpkey.c:490 smime.c:424
 msgid "Select  "
 msgstr "選擇    "
 
 #. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3301 pgpkey.c:490
+#: crypt-gpgme.c:3304 pgpkey.c:493
 msgid "Check key  "
 msgstr "檢查鑰匙   "
 
-#: crypt-gpgme.c:3318
+#: crypt-gpgme.c:3321
 #, fuzzy
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 
-#: crypt-gpgme.c:3320
+#: crypt-gpgme.c:3323
 #, fuzzy
 msgid "PGP keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 
-#: crypt-gpgme.c:3322
+#: crypt-gpgme.c:3325
 #, fuzzy
 msgid "S/MIME keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 
-#: crypt-gpgme.c:3324
+#: crypt-gpgme.c:3327
 #, fuzzy
 msgid "keys matching"
 msgstr "PGP 鑰匙符合 <%s>。"
 
-#: crypt-gpgme.c:3327
+#: crypt-gpgme.c:3330
 #, fuzzy, c-format
 msgid "%s <%s>."
 msgstr "%s 【%s】\n"
 
-#: crypt-gpgme.c:3329
+#: crypt-gpgme.c:3332
 #, fuzzy, c-format
 msgid "%s \"%s\"."
 msgstr "%s 【%s】\n"
 
-#: crypt-gpgme.c:3352 pgpkey.c:573
+#: crypt-gpgme.c:3355 pgpkey.c:576
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "這個鑰匙不能使用：過期/停用/已取消。"
 
-#: crypt-gpgme.c:3365 pgpkey.c:585
+#: crypt-gpgme.c:3368 pgpkey.c:588
 #, fuzzy
 msgid "ID is expired/disabled/revoked."
 msgstr "這個 ID 已過期/停用/取消。"
 
-#: crypt-gpgme.c:3382 pgpkey.c:589
+#: crypt-gpgme.c:3385 pgpkey.c:592
 msgid "ID has undefined validity."
 msgstr ""
 
-#: crypt-gpgme.c:3385 pgpkey.c:592
+#: crypt-gpgme.c:3388 pgpkey.c:595
 #, fuzzy
 msgid "ID is not valid."
 msgstr "這個 ID 不可接受。"
 
-#: crypt-gpgme.c:3388 pgpkey.c:595
+#: crypt-gpgme.c:3391 pgpkey.c:598
 #, fuzzy
 msgid "ID is only marginally valid."
 msgstr "此 ID 只是勉強可接受。"
 
-#: crypt-gpgme.c:3396 pgpkey.c:600
+#: crypt-gpgme.c:3399 pgpkey.c:603
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s 您真的要使用這個鑰匙？"
 
-#: crypt-gpgme.c:3451 crypt-gpgme.c:3553 pgpkey.c:807 pgpkey.c:912
+#: crypt-gpgme.c:3454 crypt-gpgme.c:3556 pgpkey.c:810 pgpkey.c:915
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "正找尋匹配 \"%s\" 的鑰匙…"
 
-#: crypt-gpgme.c:3709 pgp.c:1068
+#: crypt-gpgme.c:3712 pgp.c:1105
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 
-#: crypt-gpgme.c:3740 pgp.c:1101 smime.c:642 smime.c:762
+#: crypt-gpgme.c:3743 pgp.c:1138 smime.c:644 smime.c:764
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "請輸入 %s 的鑰匙 ID："
 
-#: crypt-gpgme.c:3830
+#: crypt-gpgme.c:3833
 #, fuzzy
-msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"
+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:3831 crypt-gpgme.c:3836
+#: crypt-gpgme.c:3834
 #, fuzzy
-msgid "esabtf"
-msgstr "12345"
+msgid "esabpfc"
+msgstr "1234i5"
 
-#: crypt-gpgme.c:3835
+#: crypt-gpgme.c:3838
 #, fuzzy
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"
+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:3839
+#, fuzzy
+msgid "esabmfc"
+msgstr "1234i5"
+
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s
-#: crypt-gpgme.c:3849 pgp.c:1457 smime.c:1923
+#: crypt-gpgme.c:3854 pgp.c:1498 smime.c:1923
 msgid "Sign as: "
 msgstr "簽名的身份是："
 
 # Don't translate this!!
-#: curs_lib.c:189
+#: curs_lib.c:188
 msgid "yes"
 msgstr ""
 
 # Don't translate this!!
-#: curs_lib.c:190
+#: curs_lib.c:189
 msgid "no"
 msgstr ""
 
 #. restore blocking operation
-#: curs_lib.c:279
+#: curs_lib.c:278
 #, fuzzy
 msgid "Exit Mutt-ng?"
 msgstr "離開 Mutt？"
 
-#: curs_lib.c:370 mutt_socket.c:492 mutt_ssl.c:313
+#: curs_lib.c:369 mutt_socket.c:491 mutt_ssl.c:313
 msgid "unknown error"
 msgstr "不明的錯誤"
 
-#: curs_lib.c:390
+#: curs_lib.c:389
 msgid "Press any key to continue..."
 msgstr "按下任何鍵繼續…"
 
-#: curs_lib.c:432
+#: curs_lib.c:431
 msgid " ('?' for list): "
 msgstr " (用 '?' 顯示列表)："
 
-#: curs_main.c:55 curs_main.c:615 curs_main.c:643 imap/command.c:172
+#: curs_main.c:57 curs_main.c:619 curs_main.c:647 imap/command.c:174
 msgid "No mailbox is open."
 msgstr "沒有已開啟信箱。"
 
-#: curs_main.c:56 curs_main.c:2144
+#: curs_main.c:58 curs_main.c:2166
 msgid "There are no messages."
 msgstr "沒有信件。"
 
-#: curs_main.c:57 mx.c:1009 pager.c:61 recvattach.c:38
+#: curs_main.c:59 mx.c:1011 pager.c:63 recvattach.c:42
 msgid "Mailbox is read-only."
 msgstr "信箱是唯讀的。"
 
-#: curs_main.c:59 pager.c:63 recvattach.c:870
+#: curs_main.c:61 pager.c:65 recvattach.c:874
 msgid "Function not permitted in attach-message mode."
 msgstr "功能在 attach-message 模式下不被支援。"
 
-#: curs_main.c:60
+#: curs_main.c:62
 msgid "No visible messages."
 msgstr "沒有要被顯示的信件。"
 
-#: curs_main.c:233
+#: curs_main.c:235
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "無法寫入到一個唯讀的信箱！"
 
-#: curs_main.c:240
+#: curs_main.c:242
 msgid "Changes to folder will be written on folder exit."
 msgstr "在離開之後將會把改變寫入資料夾。"
 
-#: curs_main.c:244
+#: curs_main.c:246
 msgid "Changes to folder will not be written."
 msgstr "將不會把改變寫入資料夾。"
 
-#: curs_main.c:371 curs_main.c:384
+#: curs_main.c:373 curs_main.c:386
 msgid "Quit"
 msgstr "離開"
 
-#: curs_main.c:374 curs_main.c:387 recvattach.c:50
+#: curs_main.c:376 curs_main.c:389 recvattach.c:54
 msgid "Save"
 msgstr "儲存"
 
-#: curs_main.c:375 query.c:43
+#: curs_main.c:377 query.c:43
 msgid "Mail"
 msgstr "信件"
 
-#: curs_main.c:376 pager.c:1351
+#: curs_main.c:378 pager.c:1380
 msgid "Reply"
 msgstr "回覆"
 
-#: curs_main.c:377
+#: curs_main.c:379
 msgid "Group"
 msgstr "群組"
 
-#: curs_main.c:388 pager.c:1358
+#: curs_main.c:390 pager.c:1387
 msgid "Post"
 msgstr ""
 
-#: curs_main.c:389 pager.c:1359
+#: curs_main.c:391 pager.c:1388
 #, fuzzy
 msgid "Followup"
 msgstr "以後的回覆都寄至 %s%s?"
 
-#: curs_main.c:488
+#: curs_main.c:490
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "信箱已被其他途徑改變過。旗標可能有錯誤。"
 
-#: curs_main.c:492
+#: curs_main.c:494
 msgid "New mail in this mailbox."
 msgstr "這個信箱中有新信件。"
 
-#: curs_main.c:498
+#: curs_main.c:500
 msgid "Mailbox was externally modified."
 msgstr "信箱已被其他途徑更改過。"
 
-#: curs_main.c:621
+#: curs_main.c:625
 msgid "No tagged messages."
 msgstr "沒有標記了的信件。"
 
-#: curs_main.c:656 menu.c:871
+#: curs_main.c:660 menu.c:872
 #, fuzzy
 msgid "Nothing to do."
 msgstr "正連接到 %s…"
 
-#: curs_main.c:747
+#: curs_main.c:751
 #, fuzzy
 msgid "Enter Message-Id: "
 msgstr "請輸入 %s 的鑰匙 ID："
 
-#: curs_main.c:755
+#: curs_main.c:759
 msgid "Article has no parent reference!"
 msgstr ""
 
-#: curs_main.c:775
+#: curs_main.c:779
 #, fuzzy
 msgid "Message not visible in limited view."
 msgstr "在限制閱覽模式下無法顯示主信件。"
 
-#: curs_main.c:785
+#: curs_main.c:789
 #, c-format
 msgid "Article %s not found on server"
 msgstr ""
 
-#: curs_main.c:798
+#: curs_main.c:802
 msgid "No Message-Id. Unable to perform operation"
 msgstr ""
 
-#: curs_main.c:818
+#: curs_main.c:822
 #, fuzzy
 msgid "Check for children of message..."
 msgstr "看看有沒有新信件…"
 
-#: curs_main.c:849
+#: curs_main.c:853
 msgid "Jump to message: "
 msgstr "跳到信件："
 
-#: curs_main.c:854
+#: curs_main.c:858
 msgid "Argument must be a message number."
 msgstr "需要一個信件編號的參數。"
 
-#: curs_main.c:882
+#: curs_main.c:886
 msgid "That message is not visible."
 msgstr "這封信件無法顯示。"
 
-#: curs_main.c:885
+#: curs_main.c:889
 msgid "Invalid message number."
 msgstr "無效的信件編號。"
 
-#: curs_main.c:899 curs_main.c:1897 curs_main.c:1937 pager.c:2093 pager.c:2112
+#: curs_main.c:903 curs_main.c:1905 curs_main.c:1945 pager.c:2124 pager.c:2143
 #, fuzzy
 msgid "Deletion"
 msgstr "刪除"
 
-#: curs_main.c:902
+#: curs_main.c:906
 msgid "Delete messages matching: "
 msgstr "刪除符合這樣式的信件："
 
-#: curs_main.c:924
+#: curs_main.c:928
 msgid "No limit pattern is in effect."
 msgstr "沒有限制樣式是有效的。"
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:930
+#: curs_main.c:934
 #, c-format
 msgid "Limit: %s"
 msgstr "限制: %s"
 
-#: curs_main.c:961
+#: curs_main.c:965
 msgid "Limit to messages matching: "
 msgstr "限制只符合這樣式的信件："
 
-#: curs_main.c:991
+#: curs_main.c:995
 #, fuzzy
 msgid "Quit Mutt-ng?"
 msgstr "離開 Mutt？"
 
-#: curs_main.c:1067
+#: curs_main.c:1071
 msgid "Tag messages matching: "
 msgstr "標記信件的條件："
 
-#: curs_main.c:1077 curs_main.c:2215 curs_main.c:2242 pager.c:2460
-#: pager.c:2476
+#: curs_main.c:1081 curs_main.c:2242 curs_main.c:2269 pager.c:2491
+#: pager.c:2507
 #, fuzzy
 msgid "Undeletion"
 msgstr "反刪除"
 
-#: curs_main.c:1079
+#: curs_main.c:1083
 msgid "Undelete messages matching: "
 msgstr "反刪除信件的條件："
 
-#: curs_main.c:1088
+#: curs_main.c:1092
 msgid "Untag messages matching: "
 msgstr "反標記信件的條件："
 
-#: curs_main.c:1171
+#: curs_main.c:1175
 msgid "Open mailbox in read-only mode"
 msgstr "用唯讀模式開啟信箱"
 
-#: curs_main.c:1173
+#: curs_main.c:1177
 msgid "Open mailbox"
 msgstr "開啟信箱"
 
-#: curs_main.c:1183
+#: curs_main.c:1187
 #, fuzzy
 msgid "Open newsgroup in read-only mode"
 msgstr "用唯讀模式開啟信箱"
 
-#: curs_main.c:1185
+#: curs_main.c:1189
 msgid "Open newsgroup"
 msgstr ""
 
-#: curs_main.c:1217 mx.c:414 mx.c:554
+#: curs_main.c:1221 mx.c:416 mx.c:556
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s 不是信箱。"
 
-#: curs_main.c:1317
+#: curs_main.c:1325
 #, fuzzy
 msgid "Exit Mutt-ng without saving?"
 msgstr "不儲存便離開 Mutt 嗎？"
 
-#: curs_main.c:1349 curs_main.c:1379 curs_main.c:1787 curs_main.c:1817
-#: flags.c:293 thread.c:930 thread.c:977 thread.c:1032
+#: curs_main.c:1357 curs_main.c:1387 curs_main.c:1795 curs_main.c:1825
+#: flags.c:293 thread.c:931 thread.c:978 thread.c:1033
 msgid "Threading is not enabled."
 msgstr "序列功能尚未啟動。"
 
-#: curs_main.c:1361
+#: curs_main.c:1369
 msgid "Thread broken"
 msgstr ""
 
-#: curs_main.c:1382
+#: curs_main.c:1390
 msgid "No Message-ID: header available to link thread"
 msgstr ""
 
-#: curs_main.c:1385
+#: curs_main.c:1393
 #, fuzzy
 msgid "First, please tag a message to be linked here"
 msgstr "儲存信件以便稍後寄出"
 
-#: curs_main.c:1396
+#: curs_main.c:1404
 msgid "Threads linked"
 msgstr ""
 
-#: curs_main.c:1399
+#: curs_main.c:1407
 msgid "No thread linked"
 msgstr ""
 
-#: curs_main.c:1416 curs_main.c:1439
+#: curs_main.c:1424 curs_main.c:1447
 msgid "You are on the last message."
 msgstr "您已經在最後一封信了。"
 
-#: curs_main.c:1423 curs_main.c:1464
+#: curs_main.c:1431 curs_main.c:1472
 msgid "No undeleted messages."
 msgstr "沒有要反刪除的信件。"
 
-#: curs_main.c:1457 curs_main.c:1480
+#: curs_main.c:1465 curs_main.c:1488
 msgid "You are on the first message."
 msgstr "您已經在第一封信了。"
 
-#: curs_main.c:1553 pattern.c:1300
+#: curs_main.c:1561 pattern.c:1304
 msgid "Search wrapped to top."
 msgstr "搜尋至開頭。"
 
-#: curs_main.c:1561 pattern.c:1311
+#: curs_main.c:1569 pattern.c:1315
 msgid "Search wrapped to bottom."
 msgstr "搜尋至結尾。"
 
-#: curs_main.c:1606
+#: curs_main.c:1614
 msgid "No new messages"
 msgstr "沒有新信件"
 
-#: curs_main.c:1607
+#: curs_main.c:1615
 msgid "No unread messages"
 msgstr "沒有尚未讀取的信件"
 
-#: curs_main.c:1608
+#: curs_main.c:1616
 msgid " in this limited view"
 msgstr " 在這限定的瀏覽中"
 
-#: curs_main.c:1624 pager.c:2224
+#: curs_main.c:1632 pager.c:2255
 msgid "Flagging"
 msgstr ""
 
-#: curs_main.c:1657 pager.c:2441
+#: curs_main.c:1665 pager.c:2472
 msgid "Toggling"
 msgstr ""
 
-#: curs_main.c:1728
+#: curs_main.c:1736
 msgid "No more threads."
 msgstr "沒有更多的序列"
 
-#: curs_main.c:1731
+#: curs_main.c:1739
 msgid "You are on the first thread."
 msgstr "您已經在第一個序列上。"
 
-#: curs_main.c:1803
+#: curs_main.c:1811
 msgid "Thread contains unread messages."
 msgstr "序列中有尚未讀取的信件。"
 
-#: curs_main.c:1988
+#: curs_main.c:1996
 msgid "Editing"
 msgstr ""
 
-#: curs_main.c:2094
+#: curs_main.c:2116
 msgid "Marking as read"
 msgstr ""
 
-#: curs_main.c:2150 pager.c:2303 recvattach.c:1181
+#: curs_main.c:2172 pager.c:2334 recvattach.c:1185
 msgid "Reply by mail as poster prefers?"
 msgstr ""
 
-#: curs_main.c:2156 pager.c:2266 pager.c:2280 pager.c:2308
+#: curs_main.c:2178 pager.c:2297 pager.c:2311 pager.c:2339
 msgid "Posting to this group not allowed, may be moderated. Continue?"
 msgstr ""
 
@@ -1794,7 +1840,7 @@ msgstr ""
 #. * SLcurses_waddnstr() can't take a "const char *", so this is only
 #. * declared "static" (sigh)
 #.
-#: edit.c:36
+#: edit.c:38
 msgid ""
 "~~\t\tinsert a line begining with a single ~\n"
 "~b users\tadd users to the Bcc: field\n"
@@ -1834,41 +1880,41 @@ msgstr ""
 "~?\t\t這訊息\n"
 ".\t\t如果是一行裏的唯一字符，則代表結束輸入\n"
 
-#: edit.c:175
+#: edit.c:177
 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr "%d：無效的信件號碼。\n"
 
-#: edit.c:305
+#: edit.c:307
 msgid "(End message with a . on a line by itself)\n"
 msgstr "（在一行裏輸入一個 . 符號來結束信件）\n"
 
-#: edit.c:359
+#: edit.c:361
 msgid "No mailbox.\n"
 msgstr "沒有信箱。\n"
 
-#: edit.c:363
+#: edit.c:365
 msgid "Message contains:\n"
 msgstr "信件包含：\n"
 
-#: edit.c:367 edit.c:421
+#: edit.c:369 edit.c:423
 msgid "(continue)\n"
 msgstr "（繼續）\n"
 
-#: edit.c:379
+#: edit.c:381
 msgid "missing filename.\n"
 msgstr "遺失了檔名。\n"
 
-#: edit.c:398
+#: edit.c:400
 msgid "No lines in message.\n"
 msgstr "文章中沒有文字。\n"
 
-#: edit.c:414
+#: edit.c:416
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr ""
 
-#: edit.c:432
+#: edit.c:434
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s：不明的編輯器指令（~? 求助）\n"
@@ -1919,75 +1965,75 @@ msgstr "設定旗標"
 msgid "Clear flag"
 msgstr "清除旗標"
 
-#: handler.c:1424
+#: handler.c:1094
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- 錯誤： 無法顯示 Multipart/Alternative！ --]\n"
 
-#: handler.c:1532
+#: handler.c:1208
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- 附件 #%d"
 
-#: handler.c:1543
+#: handler.c:1219
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- 種類：%s%s，編碼：%s，大小：%s --]\n"
 
-#: handler.c:1604
+#: handler.c:1283
 #, c-format
 msgid "[-- Autoview using %s --]\n"
 msgstr "[-- 使用 %s 自動顯示 --]\n"
 
-#: handler.c:1605
+#: handler.c:1284
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "執行自動顯示指令：%s"
 
-#: handler.c:1633
+#: handler.c:1312
 #, c-format
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- 不能執行 %s 。 --]\n"
 
-#: handler.c:1647 handler.c:1664
+#: handler.c:1327 handler.c:1344
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- 自動顯示 %s 的 stderr 內容 --]\n"
 
-#: handler.c:1699
+#: handler.c:1379
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- 錯誤：message/external-body 沒有存取類型 (access-type) 的參數 --]\n"
 
-#: handler.c:1717
+#: handler.c:1396
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- 這個 %s/%s 附件 "
 
-#: handler.c:1723
+#: handler.c:1402
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(%s 個位元組) "
 
-#: handler.c:1725
+#: handler.c:1404
 msgid "has been deleted --]\n"
 msgstr "已經被刪除了 --]\n"
 
-#: handler.c:1729
+#: handler.c:1408
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- 在 %s --]\n"
 
-#: handler.c:1733
+#: handler.c:1412
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- 名稱：%s --]\n"
 
-#: handler.c:1744 handler.c:1758
+#: handler.c:1423 handler.c:1437
 #, fuzzy, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- 這個 %s/%s 附件 "
 
-#: handler.c:1746
+#: handler.c:1425
 #, fuzzy
 msgid ""
 "[-- and the indicated external source has --]\n"
@@ -1997,40 +2043,40 @@ msgstr ""
 "[-- 並且被指示的外部原始檔已 --]\n"
 "[-- 過期。 --]\n"
 
-#: handler.c:1763
+#: handler.c:1442
 #, fuzzy, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr ""
 "[-- 這個 %s/%s 附件無法被附上, --]\n"
 "[-- 並且被指示的存取類型 (access-type) %s 不被支援 --]\n"
 
-#: handler.c:1875
+#: handler.c:1556
 msgid "Error: multipart/signed has no protocol."
 msgstr "錯誤：multipart/signed 沒有通訊協定。"
 
-#: handler.c:1886
+#: handler.c:1567
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "錯誤：multipart/encrypted 沒有任何通訊協定參數！"
 
-#: handler.c:1920
+#: handler.c:1601
 msgid "Unable to open temporary file!"
 msgstr "無法開啟暫存檔！"
 
-#: handler.c:1978
+#: handler.c:1659
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s 尚未支援 "
 
-#: handler.c:1983
+#: handler.c:1664
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "（按 '%s' 來顯示這部份）"
 
-#: handler.c:1985
+#: handler.c:1666
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "（需要定義一個鍵給 'view-attachments' 來瀏覽附件！)"
 
-#: headers.c:159
+#: headers.c:160
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s：無法附帶檔案"
@@ -2068,26 +2114,26 @@ msgstr ""
 msgid "Help for %s"
 msgstr "%s 的求助"
 
-#: hook.c:96
+#: hook.c:97
 msgid "bad formatted command string"
 msgstr ""
 
-#: hook.c:246
+#: hook.c:247
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "unhook: 在 hook 裡面不能做 unhook *"
 
-#: hook.c:256
+#: hook.c:257
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook：不明的 hook type %s"
 
-#: hook.c:261
+#: hook.c:262
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr "unhook：不能從 %2$s 刪除 %1s$。"
 
-#: imap/auth.c:97 pop/pop_auth.c:390
+#: imap/auth.c:98 pop/pop_auth.c:391
 msgid "No authenticators available"
 msgstr "沒有認證方式"
 
@@ -2120,407 +2166,411 @@ msgstr "GSSAPI 驗證失敗。"
 msgid "LOGIN disabled on this server."
 msgstr "伺服器禁止了登入。"
 
-#: imap/auth_login.c:41 nntp/nntp.c:56 pop/pop_auth.c:237
+#: imap/auth_login.c:41 nntp/nntp.c:56 pop/pop_auth.c:238
 msgid "Logging in..."
 msgstr "登入中…"
 
-#: imap/auth_login.c:61 nntp/nntp.c:79 nntp/nntp.c:151 pop/pop_auth.c:275
+#: imap/auth_login.c:61 nntp/nntp.c:79 nntp/nntp.c:151 pop/pop_auth.c:276
 msgid "Login failed."
 msgstr "登入失敗。"
 
-#: imap/auth_sasl.c:108
+#: imap/auth_sasl.c:109
 #, fuzzy, c-format
 msgid "Authenticating (%s)..."
 msgstr "驗證中 (APOP)…"
 
-#: imap/auth_sasl.c:195 pop/pop_auth.c:164
+#: imap/auth_sasl.c:199 pop/pop_auth.c:165
 msgid "SASL authentication failed."
 msgstr "SASL 驗證失敗。"
 
-#: imap/browse.c:66 imap/imap.c:529
+#: imap/browse.c:69 imap/imap.c:544
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr ""
 
-#: imap/browse.c:82
+#: imap/browse.c:86
 msgid "Getting namespaces..."
 msgstr "拿取 namespace 中…"
 
-#: imap/browse.c:92
+#: imap/browse.c:96
 msgid "Getting folder list..."
 msgstr "拿取目錄表中…"
 
-#: imap/browse.c:208
+#: imap/browse.c:212
 #, fuzzy
 msgid "No such folder"
 msgstr "%s：沒有這種顏色"
 
-#: imap/browse.c:262
+#: imap/browse.c:271
 msgid "Create mailbox: "
 msgstr "製作信箱："
 
-#: imap/browse.c:266 imap/browse.c:309
+#: imap/browse.c:275 imap/browse.c:318
 msgid "Mailbox must have a name."
 msgstr "信箱一定要有名字。"
 
-#: imap/browse.c:274
+#: imap/browse.c:283
 msgid "Mailbox created."
 msgstr "已完成製造郵箱。"
 
-#: imap/browse.c:303
+#: imap/browse.c:312
 #, fuzzy, c-format
 msgid "Rename mailbox %s to: "
 msgstr "製作信箱："
 
-#: imap/browse.c:315
+#: imap/browse.c:324
 #, fuzzy, c-format
 msgid "Rename failed: %s"
 msgstr "登入失敗： %s"
 
-#: imap/browse.c:320
+#: imap/browse.c:329
 #, fuzzy
 msgid "Mailbox renamed."
 msgstr "已完成製造郵箱。"
 
 #. mx_fastclose_mailbox (idata->ctx);
-#: imap/command.c:284
+#: imap/command.c:286
 msgid "Mailbox closed"
 msgstr "郵箱已經關掉"
 
 #. something is wrong because the server reported fewer messages
 #. * than we previously saw
 #.
-#: imap/command.c:325
+#: imap/command.c:327
 msgid "Fatal error.  Message count is out of sync!"
 msgstr "嚴重錯誤。信件數量不協調！"
 
-#: imap/imap.c:169 nntp/nntp.c:1045
+#: imap/imap.c:172 nntp/nntp.c:1045
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "正在關閉與 %s 的連線…"
 
-#: imap/imap.c:318
+#: imap/imap.c:321
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "這個 IMAP 伺服器已過時，Mutt 無法使用它。"
 
-#: imap/imap.c:402
-#, c-format
-msgid "Unexpected response received from server: %s"
+#: imap/imap.c:394
+msgid "Checking mailbox subscriptions"
 msgstr ""
 
-#: imap/imap.c:421 pop/pop_lib.c:268
+#: imap/imap.c:430 pop/pop_lib.c:271
 msgid "Secure connection with TLS?"
 msgstr "利用 TSL 來進行安全連接？"
 
-#: imap/imap.c:433 pop/pop_lib.c:290
+#: imap/imap.c:442 pop/pop_lib.c:293
 msgid "Could not negotiate TLS connection"
 msgstr "未能"
 
-#: imap/imap.c:560 nntp/nntp.c:826
+#: imap/imap.c:456 pop/pop_lib.c:311
+#, fuzzy
+msgid "Encrypted connection unavailable"
+msgstr "加密的鑰匙"
+
+#: imap/imap.c:575 nntp/nntp.c:826
 #, c-format
 msgid "Selecting %s..."
 msgstr "正在選擇 %s …"
 
-#: imap/imap.c:683
+#: imap/imap.c:698
 msgid "Error opening mailbox"
 msgstr "開啟信箱時發生錯誤"
 
-#: imap/imap.c:732 imap/message.c:692 muttlib.c:1256
+#: imap/imap.c:747 imap/message.c:695 muttlib.c:1229
 #, c-format
 msgid "Create %s?"
 msgstr "建立 %s？"
 
-#: imap/imap.c:973 pop/pop.c:438
+#: imap/imap.c:988 pop/pop.c:438
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "標簽了的 %d 封信件刪去了…"
 
-#: imap/imap.c:981
+#: imap/imap.c:996
 msgid "Expunge failed"
 msgstr "刪除 (expunge) 失敗"
 
-#: imap/imap.c:993
+#: imap/imap.c:1008
 #, c-format
 msgid "Saving message status flags... [%d/%d]"
 msgstr "正在儲存信件狀態旗標… [%d/%d]"
 
-#: imap/imap.c:1022
+#: imap/imap.c:1037
 msgid "Expunging messages from server..."
 msgstr "正在刪除伺服器上的信件…"
 
-#: imap/imap.c:1027
+#: imap/imap.c:1042
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr ""
 
-#: imap/imap.c:1035 imap/imap.c:1066
+#: imap/imap.c:1050 imap/imap.c:1081
 msgid "CLOSE failed"
 msgstr "CLOSE 失敗"
 
-#: imap/imap.c:1297
+#: imap/imap.c:1314
 #, fuzzy
 msgid "Bad mailbox name"
 msgstr "製作信箱："
 
-#: imap/imap.c:1309
+#: imap/imap.c:1337
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "訂閱 %s…"
 
-#: imap/imap.c:1311
+#: imap/imap.c:1339
 #, c-format
 msgid "Unsubscribing to %s..."
 msgstr "取消訂閱 %s…"
 
-#: imap/imap.c:1438
+#: imap/imap.c:1518
 #, fuzzy
 msgid "Connection lost. Reconnect to IMAP server?"
 msgstr "連線中斷。再與 POP 伺服器連線嗎？"
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:92
+#: imap/message.c:95
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "無法取回使用這個 IMAP 伺服器版本的郵件的標頭。"
 
-#: imap/message.c:102
+#: imap/message.c:105
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "無法建立暫存檔 %s"
 
-#: imap/message.c:127
+#: imap/message.c:130
 #, fuzzy, c-format
 msgid "Evaluating cache... [%d/%d]"
 msgstr "正在取回信件標頭… [%d/%d]"
 
-#: imap/message.c:193 pop/pop.c:196
+#: imap/message.c:196 pop/pop.c:196
 #, c-format
 msgid "Fetching message headers... [%d/%d]"
 msgstr "正在取回信件標頭… [%d/%d]"
 
-#: imap/message.c:354 nntp/nntp.c:889 pop/pop.c:324
+#: imap/message.c:351 nntp/nntp.c:889 pop/pop.c:324
 msgid "Fetching message..."
 msgstr "拿取信件中…"
 
-#: imap/message.c:392 pop/pop.c:357
+#: imap/message.c:389 pop/pop.c:357
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "信件的索引不正確。請再重新開啟信箱。"
 
-#: imap/message.c:548
+#: imap/message.c:551
 msgid "Uploading message ..."
 msgstr "正在上傳信件…"
 
-#: imap/message.c:660
+#: imap/message.c:663
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "正在複制 %d 封信件到 %s …"
 
-#: imap/message.c:663
+#: imap/message.c:666
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "正在複制 信件 %d 到 %s …"
 
-#: imap/util.c:182
+#: imap/util.c:178
 msgid "Continue?"
 msgstr "繼續？"
 
-#: init.c:371
+#: init.c:203
 #, c-format
 msgid "Bad regexp: %s"
 msgstr ""
 
-#: init.c:550
+#: init.c:384
 #, fuzzy, c-format
 msgid "ifdef: too few arguments"
 msgstr "%s：太少參數"
 
-#: init.c:552
+#: init.c:386
 #, fuzzy, c-format
 msgid "ifndef: too few arguments"
 msgstr "單色：太少引數"
 
-#: init.c:664
+#: init.c:498
 #, fuzzy
 msgid "spam: no matching pattern"
 msgstr "標記符合某個格式的信件"
 
-#: init.c:666
+#: init.c:500
 #, fuzzy
 msgid "nospam: no matching pattern"
 msgstr "反標記符合某個格式的信件"
 
-#: init.c:857
+#: init.c:691
 msgid "alias: no address"
 msgstr "別名：沒有電子郵件位址"
 
-#: init.c:898
+#: init.c:732
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr ""
 
-#: init.c:968
+#: init.c:802
 msgid "invalid header field"
 msgstr "無效的標頭欄位"
 
-#: init.c:1015
+#: init.c:849
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s：不明的排序方式"
 
-#: init.c:1118
+#: init.c:952
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_defualt(%s)：錯誤的正規表示式：%s\n"
 
-#: init.c:1180
+#: init.c:1014
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s：不明的變數"
 
-#: init.c:1187
+#: init.c:1021
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "重新設置後字首仍不合規定"
 
-#: init.c:1192
+#: init.c:1026
 #, c-format
 msgid "value is illegal with reset"
 msgstr "重新設置後值仍不合規定"
 
-#: init.c:1225
+#: init.c:1059
 #, c-format
 msgid "%s is set"
 msgstr "%s 已被設定"
 
-#: init.c:1225
+#: init.c:1059
 #, c-format
 msgid "%s is unset"
 msgstr "%s 沒有被設定"
 
-#: init.c:1396
+#: init.c:1230
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s：無效的信箱種類"
 
-#: init.c:1419 init.c:1458
+#: init.c:1253 init.c:1292
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s：無效的值"
 
-#: init.c:1495
+#: init.c:1329
 #, fuzzy, c-format
 msgid "%s: Unknown type."
 msgstr "%s：不明的種類"
 
-#: init.c:1523
+#: init.c:1357
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s：不明的種類"
 
-#: init.c:1582
+#: init.c:1416
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s 發生錯誤，行號 %d：%s"
 
-#: init.c:1604
+#: init.c:1438
 #, c-format
 msgid "source: errors in %s"
 msgstr "source：錯誤發生在 %s"
 
-#: init.c:1605
+#: init.c:1439
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "source: 因 %s 發生太多錯誤，因此閱讀終止。"
 
-#: init.c:1622
+#: init.c:1456
 #, c-format
 msgid "source: error at %s"
 msgstr "source：錯誤發生在 %s"
 
-#: init.c:1674
+#: init.c:1508
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s：不明的指令"
 
-#: init.c:2025
+#: init.c:1879
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "指令行有錯：%s\n"
 
-#: init.c:2071
+#: init.c:1925
 msgid "unable to determine home directory"
 msgstr "無法決定 home 目錄"
 
-#: init.c:2078
+#: init.c:1932
 msgid "unable to determine username"
 msgstr "無法決定使用者名稱"
 
-#: init.c:2296
+#: init.c:2150
 #, c-format
 msgid "Warning: the following synonym variables were found:\n"
 msgstr ""
 
-#: init.c:2303
+#: init.c:2157
 #, c-format
 msgid "Warning: Synonym variables are scheduled for removal.\n"
 msgstr ""
 
-#: keymap.c:429
+#: keymap.c:431
 msgid "Macro loop detected."
 msgstr "檢測到巨集中有迴圈。"
 
-#: keymap.c:635 keymap.c:643
+#: keymap.c:637 keymap.c:645
 msgid "Key is not bound."
 msgstr "這個鍵還未被定義功能。"
 
-#: keymap.c:648
+#: keymap.c:650
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "這個鍵還未被定義功能。 按 '%s' 以取得說明。"
 
-#: keymap.c:659
+#: keymap.c:661
 msgid "push: too many arguments"
 msgstr "push：太多引數"
 
-#: keymap.c:687
+#: keymap.c:689
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s：沒有這個選單"
 
-#: keymap.c:701
+#: keymap.c:703
 msgid "null key sequence"
 msgstr "空的鍵值序列"
 
-#: keymap.c:786
+#: keymap.c:788
 msgid "bind: too many arguments"
 msgstr "bind：太多引數"
 
-#: keymap.c:803
+#: keymap.c:805
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s：在對映表中沒有這樣的功能"
 
-#: keymap.c:831
+#: keymap.c:833
 msgid "macro: empty key sequence"
 msgstr "macro：空的鍵值序列"
 
-#: keymap.c:839
+#: keymap.c:841
 msgid "macro: too many arguments"
 msgstr "macro：引數太多"
 
-#: keymap.c:871
+#: keymap.c:873
 msgid "exec: no arguments"
 msgstr "exec：沒有引數"
 
-#: keymap.c:889
+#: keymap.c:891
 #, c-format
 msgid "%s: no such function"
 msgstr "%s：沒有這個功能"
 
-#: keymap.c:910
+#: keymap.c:912
 #, fuzzy
 msgid "Enter keys (^G to abort): "
 msgstr "請輸入 %s 的鑰匙 ID："
 
-#: keymap.c:914
+#: keymap.c:916
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
 msgstr ""
@@ -3554,7 +3604,43 @@ msgid ""
 "  -a <file>\tattach a file to the message\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\n"
+"  -D\t\tprint the value of all variables to stdout"
+msgstr ""
+"用法: mutt [ -nRzZ ] [ -e <命令> ] [ -F <檔案> ] [ -m <類型> ] [ -f <檔案"
+"> ]\n"
+"        mutt [ -nx ] [ -e <命令> ] [ -a <檔案> ] [ -F <檔案> ] [ -H <檔案> ] "
+"[ -i <檔案> ] [ -s <主題> ] [ -b <地址> ] [ -c <地址> ] <地址> [ ... ]\n"
+"        mutt [ -n ] [ -e <命令> ] [ -F <檔案> ] -p\n"
+"        mutt -v[v]\n"
+"\n"
+"參數：\n"
+"  -a <檔案>\t\t將檔案附在信件中\n"
+"  -b <地址>\t\t指定一個 秘密複製 (BCC) 的地址\n"
+"  -c <地址>\t\t指定一個 複製 (CC) 的地址\n"
+"  -e <命令>\t\t指定一個初始化後要被執行的命令\n"
+"  -f <檔案>\t\t指定要閱讀那一個郵筒\n"
+"  -F <檔案>\t\t指定另一個 muttrc 檔案\n"
+"  -H <檔案>\t\t指定一個範本檔案以讀取標題來源\n"
+"  -i <檔案>\t\t指定一個包括在回覆中的檔案\n"
+"  -m <類型>\t\t指定一個預設的郵筒類型\n"
+"  -n\t\t使 Mutt 不去讀取系統的 Muttrc 檔\n"
+"  -p\t\t叫回一個延後寄送的信件\n"
+"  -R\t\t以唯讀模式開啟郵筒\n"
+"  -s <主題>\t\t指定一個主題 (如果有空白的話必須被包括在引言中)\n"
+"  -v\t\t顯示版本和編譯時所定義的參數\n"
+"  -x\t\t模擬 mailx 寄送模式\n"
+"  -y\t\t選擇一個被指定在您郵筒清單中的郵筒\n"
+"  -z\t\t如果沒有訊息在郵筒中的話，立即離開\n"
+"  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
+"  -h\t\t這個說明訊息"
+
+#: main.c:125
+msgid "  -d <level>\tlog debugging output to ~/.muttngdebug0"
+msgstr ""
+
+#: main.c:127
+#, fuzzy
+msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
 "  -F <file>\tspecify an alternate muttrc file\n"
@@ -3562,6 +3648,7 @@ msgid ""
 "  -G\t\tselect a newsgroup (if compiled with NNTP)\n"
 "  -H <file>\tspecify a draft file to read header and body from\n"
 "  -i <file>\tspecify a file which Mutt-ng should include in the body\n"
+"  -d <level>\t specify debugging level of Mutt-ng\n"
 "  -m <type>\tspecify a default mailbox type\n"
 "  -n\t\tcauses Mutt-ng not to read the system Muttngrc\n"
 "  -p\t\trecall a postponed message\n"
@@ -3603,7 +3690,7 @@ msgstr ""
 "  -Z\t\t開啟第一個附有新郵件的資料夾，如果沒有的話立即離開\n"
 "  -h\t\t這個說明訊息"
 
-#: main.c:182
+#: main.c:187
 msgid ""
 "\n"
 "Compile options:"
@@ -3611,72 +3698,87 @@ msgstr ""
 "\n"
 "編譯選項："
 
-#: main.c:441
+#: main.c:446
 msgid "Mutt-ng is based on the following patches written for mutt:\n"
 msgstr ""
 
-#: main.c:461
+#: main.c:466
 msgid "Error initializing terminal."
 msgstr "無法初始化終端機。"
 
-#: main.c:583
+#: main.c:589
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "除錯模式在第 %d 層。\n"
 
-#: main.c:585
+#: main.c:591
+#, c-format
+msgid "Please specify a valid debugging level ("
+msgstr ""
+
+#: main.c:592
+#, c-format
+msgid "-"
+msgstr ""
+
+#: main.c:592
+#, c-format
+msgid ").\n"
+msgstr ""
+
+#: main.c:596
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "在編譯時候沒有定義 DEBUG。放棄執行。\n"
 
-#: main.c:746
+#: main.c:757
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s 不存在。製造嗎？"
 
-#: main.c:750
+#: main.c:761
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "無法建立 %s: %s."
 
-#: main.c:790
+#: main.c:801
 msgid "No recipients specified.\n"
 msgstr "沒有指定接受者。\n"
 
-#: main.c:866
+#: main.c:877
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s：無法附帶檔案。\n"
 
-#: main.c:883
+#: main.c:894
 msgid "No mailbox with new mail."
 msgstr "沒有信箱有新信件。"
 
-#: main.c:902
+#: main.c:913
 msgid "No incoming mailboxes defined."
 msgstr "沒有定義任何的收信郵箱"
 
-#: main.c:937
+#: main.c:948
 msgid "Mailbox is empty."
 msgstr "信箱內空無一物。"
 
-#: mbox.c:134 mbox.c:283
+#: mbox.c:135 mbox.c:284
 #, c-format
 msgid "Reading %s... %d (%d%%)"
 msgstr "讀取 %s 中… %d (%d%%)"
 
-#: mbox.c:155 mbox.c:209
+#: mbox.c:156 mbox.c:210
 msgid "Mailbox is corrupt!"
 msgstr "信箱已損壞了！"
 
-#: mbox.c:574 mbox.c:813
+#: mbox.c:577 mbox.c:814
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "嚴重錯誤！無法重新開啟信箱！"
 
-#: mbox.c:627
+#: mbox.c:628
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr "同步：信箱已被修改，但沒有被修改過的信件！（請回報這個錯誤）"
 
-#: mbox.c:664
+#: mbox.c:665
 #, c-format
 msgid "Writing messages... %d (%d%%)"
 msgstr "寫入信件中… %d (%d%%)"
@@ -3684,154 +3786,154 @@ msgstr "寫入信件中… %d (%d%%)"
 #. copy the temp mailbox back into place starting at the first
 #. * change/deleted message
 #.
-#: mbox.c:767
+#: mbox.c:768
 msgid "Committing changes..."
 msgstr "正在寫入更改的資料…"
 
-#: mbox.c:798
+#: mbox.c:799
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "寫入失敗！已把部分的信箱儲存至 %s"
 
-#: mbox.c:859
+#: mbox.c:857
 msgid "Could not reopen mailbox!"
 msgstr "無法重開信箱！"
 
-#: mbox.c:916
+#: mbox.c:912
 msgid "Reopening mailbox..."
 msgstr "重新開啟信箱中…"
 
-#: mbox.c:1130
+#: mbox.c:1126
 msgid "Can't write message"
 msgstr "無法寫信件"
 
-#: menu.c:410
+#: menu.c:411
 msgid "Jump to: "
 msgstr "跳到："
 
-#: menu.c:417
+#: menu.c:418
 msgid "Invalid index number."
 msgstr "無效的索引編號。"
 
-#: menu.c:421 menu.c:442 menu.c:476 menu.c:515 menu.c:530 menu.c:540
-#: menu.c:550 menu.c:587 menu.c:597 menu.c:609 menu.c:621 menu.c:1003
+#: menu.c:422 menu.c:443 menu.c:477 menu.c:516 menu.c:531 menu.c:541
+#: menu.c:551 menu.c:588 menu.c:598 menu.c:610 menu.c:622 menu.c:1004
 msgid "No entries."
 msgstr "沒有資料。"
 
-#: menu.c:439
+#: menu.c:440
 msgid "You cannot scroll down farther."
 msgstr "您無法再向下捲動了。"
 
-#: menu.c:456
+#: menu.c:457
 msgid "You cannot scroll up farther."
 msgstr "您無法再向上捲動了。"
 
-#: menu.c:473
+#: menu.c:474
 msgid "You are on the last page."
 msgstr "您現在在最後一頁。"
 
-#: menu.c:495
+#: menu.c:496
 msgid "You are on the first page."
 msgstr "您現在在第一頁。"
 
-#: menu.c:567
+#: menu.c:568
 msgid "First entry is shown."
 msgstr "正在顯示第一項。"
 
-#: menu.c:584
+#: menu.c:585
 msgid "Last entry is shown."
 msgstr "正在顯示最後一項。"
 
-#: menu.c:631
+#: menu.c:632
 msgid "You are on the last entry."
 msgstr "您現在在最後一項。"
 
-#: menu.c:641
+#: menu.c:642
 msgid "You are on the first entry."
 msgstr "您現在在第一項。"
 
-#: menu.c:699 pattern.c:1249
+#: menu.c:700 pattern.c:1253
 msgid "Search for: "
 msgstr "搜尋："
 
-#: menu.c:700 pattern.c:1250
+#: menu.c:701 pattern.c:1254
 msgid "Reverse search for: "
 msgstr "返向搜尋："
 
-#: menu.c:708 pattern.c:1281
+#: menu.c:709 pattern.c:1285
 msgid "No search pattern."
 msgstr "沒有搜尋格式。"
 
-#: menu.c:738 pager.c:1822 pager.c:1836 pager.c:1938 pattern.c:1345
+#: menu.c:739 pager.c:1853 pager.c:1867 pager.c:1969 pattern.c:1349
 msgid "Not found."
 msgstr "沒有找到。"
 
-#: menu.c:858
+#: menu.c:859
 msgid "No tagged entries."
 msgstr "沒有已標記的記錄。"
 
-#: menu.c:963
+#: menu.c:964
 msgid "Search is not implemented for this menu."
 msgstr "這個選單中沒有搜尋功能。"
 
-#: menu.c:968
+#: menu.c:969
 msgid "Jumping is not implemented for dialogs."
 msgstr "對話模式中不支援跳躍功能。"
 
-#: menu.c:1006
+#: menu.c:1007
 msgid "Tagging is not supported."
 msgstr "不支援標記功能。"
 
-#: mh.c:635 mh.c:872
+#: mh.c:637 mh.c:874
 #, c-format
 msgid "Reading %s... %d"
 msgstr "讀取 %s… %d"
 
-#: mh.c:1144
+#: mh.c:1146
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr ""
 
-#: muttlib.c:851
+#: muttlib.c:824
 #, fuzzy
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "檔案是一個目錄, 儲存在它下面 ?"
 
-#: muttlib.c:852
+#: muttlib.c:825
 msgid "yna"
 msgstr ""
 
-#: muttlib.c:869
+#: muttlib.c:842
 msgid "File is a directory, save under it?"
 msgstr "檔案是一個目錄, 儲存在它下面 ?"
 
-#: muttlib.c:875
+#: muttlib.c:848
 msgid "File under directory: "
 msgstr "在目錄底下的檔案："
 
-#: muttlib.c:886
+#: muttlib.c:859
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "檔案已經存在, (1)覆蓋, (2)附加, 或是 (3)取消 ?"
 
-#: muttlib.c:886
+#: muttlib.c:859
 msgid "oac"
 msgstr "123"
 
-#: muttlib.c:1214
+#: muttlib.c:1187
 msgid "Can't save message to POP mailbox."
 msgstr "無法將信件存到信箱。"
 
-#: muttlib.c:1222
+#: muttlib.c:1195
 #, fuzzy
 msgid "Can't save message to newsserver."
 msgstr "無法編輯 POP 伺服器上的信件。"
 
 #. if we're appending to the trash, there's no point in asking
-#: muttlib.c:1232
+#: muttlib.c:1205
 #, c-format
 msgid "Append messages to %s?"
 msgstr "附加信件到 %s ?"
 
-#: muttlib.c:1242
+#: muttlib.c:1215
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s 不是信箱！"
@@ -3841,40 +3943,40 @@ msgstr "%s 不是信箱！"
 msgid "Connection to %s closed"
 msgstr "到 %s 的連線中斷了"
 
-#: mutt_socket.c:250
+#: mutt_socket.c:248
 msgid "SSL is unavailable."
 msgstr "沒有 SSL 功能"
 
-#: mutt_socket.c:279
+#: mutt_socket.c:277
 msgid "Preconnect command failed."
 msgstr "預先連接指令失敗。"
 
-#: mutt_socket.c:347 mutt_socket.c:360
+#: mutt_socket.c:345 mutt_socket.c:358
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "連線到 %s (%s) 時失敗"
 
-#: mutt_socket.c:398 mutt_socket.c:450
+#: mutt_socket.c:396 mutt_socket.c:449
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr ""
 
-#: mutt_socket.c:405 mutt_socket.c:457
+#: mutt_socket.c:403 mutt_socket.c:456
 #, c-format
 msgid "Looking up %s..."
 msgstr "正在尋找 %s…"
 
-#: mutt_socket.c:415 mutt_socket.c:463
+#: mutt_socket.c:413 mutt_socket.c:462
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "找不到主機 \"%s\""
 
-#: mutt_socket.c:419 mutt_socket.c:472
+#: mutt_socket.c:418 mutt_socket.c:471
 #, c-format
 msgid "Connecting to %s..."
 msgstr "正連接到 %s…"
 
-#: mutt_socket.c:491
+#: mutt_socket.c:490
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "無法連線到 %s (%s)。"
@@ -3907,8 +4009,8 @@ msgstr ""
 msgid "SSL failed: %s"
 msgstr "登入失敗： %s"
 
-#: mutt_ssl.c:324 mutt_ssl_gnutls.c:468 mutt_ssl_gnutls.c:476
-#: mutt_ssl_gnutls.c:502
+#: mutt_ssl.c:324 mutt_ssl_gnutls.c:467 mutt_ssl_gnutls.c:475
+#: mutt_ssl_gnutls.c:501
 msgid "Unable to get certificate from peer"
 msgstr "無法從對方拿取驗証"
 
@@ -3917,80 +4019,80 @@ msgstr "無法從對方拿取驗証"
 msgid "SSL connection using %s (%s)"
 msgstr "利用 %s (%s) 來進行 SSL"
 
-#: mutt_ssl.c:373
+#: mutt_ssl.c:414
 msgid "Unknown"
 msgstr "不清楚"
 
-#: mutt_ssl.c:396 mutt_ssl_gnutls.c:359
+#: mutt_ssl.c:437 mutt_ssl_gnutls.c:359
 #, c-format
 msgid "[unable to calculate]"
 msgstr "【無法計算】"
 
-#: mutt_ssl.c:413 mutt_ssl_gnutls.c:381
+#: mutt_ssl.c:454 mutt_ssl_gnutls.c:381
 msgid "[invalid date]"
 msgstr "【無效的日期】"
 
-#: mutt_ssl.c:484
+#: mutt_ssl.c:525
 msgid "Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 
-#: mutt_ssl.c:490
+#: mutt_ssl.c:531
 msgid "Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 
-#: mutt_ssl.c:558 mutt_ssl_gnutls.c:592
+#: mutt_ssl.c:590 mutt_ssl_gnutls.c:591
 msgid "This certificate belongs to:"
 msgstr "這個驗証屬於："
 
-#: mutt_ssl.c:569 mutt_ssl_gnutls.c:637
+#: mutt_ssl.c:601 mutt_ssl_gnutls.c:636
 msgid "This certificate was issued by:"
 msgstr "這個驗証的派發者："
 
-#: mutt_ssl.c:581 mutt_ssl_gnutls.c:683
+#: mutt_ssl.c:613 mutt_ssl_gnutls.c:682
 #, c-format
 msgid "This certificate is valid"
 msgstr "這個驗証有效"
 
-#: mutt_ssl.c:582 mutt_ssl_gnutls.c:686
+#: mutt_ssl.c:614 mutt_ssl_gnutls.c:685
 #, c-format
 msgid "   from %s"
 msgstr "   由 %s"
 
-#: mutt_ssl.c:584 mutt_ssl_gnutls.c:690
+#: mutt_ssl.c:616 mutt_ssl_gnutls.c:689
 #, c-format
 msgid "     to %s"
 msgstr "     至 %s"
 
-#: mutt_ssl.c:590
+#: mutt_ssl.c:622
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "指模：%s"
 
-#: mutt_ssl.c:592
+#: mutt_ssl.c:624
 msgid "SSL Certificate check"
 msgstr "SSL 驗証測試"
 
-#: mutt_ssl.c:596 mutt_ssl_gnutls.c:735
+#: mutt_ssl.c:628 mutt_ssl_gnutls.c:734
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(1)不接受，(2)只是這次接受，(3)永遠接受"
 
-#: mutt_ssl.c:597 mutt_ssl_gnutls.c:736
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:735
 msgid "roa"
 msgstr "123"
 
-#: mutt_ssl.c:600 mutt_ssl_gnutls.c:739
+#: mutt_ssl.c:632 mutt_ssl_gnutls.c:738
 msgid "(r)eject, accept (o)nce"
 msgstr "(1)不接受，(2)只是這次接受"
 
-#: mutt_ssl.c:601 mutt_ssl_gnutls.c:740
+#: mutt_ssl.c:633 mutt_ssl_gnutls.c:739
 msgid "ro"
 msgstr "12"
 
-#: mutt_ssl.c:628 mutt_ssl_gnutls.c:780
+#: mutt_ssl.c:660 mutt_ssl_gnutls.c:780
 msgid "Warning: Couldn't save certificate"
 msgstr "警告：未能儲存驗証"
 
-#: mutt_ssl.c:632 mutt_ssl_gnutls.c:784
+#: mutt_ssl.c:664 mutt_ssl_gnutls.c:784
 msgid "Certificate saved"
 msgstr "驗証已儲存"
 
@@ -4037,205 +4139,186 @@ msgstr ""
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "利用 %s (%s) 來進行 SSL"
 
-#: mutt_ssl_gnutls.c:481
+#: mutt_ssl_gnutls.c:480
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:489
+#: mutt_ssl_gnutls.c:488
 #, fuzzy
-msgid "Error certificate is not X.509"
+msgid "Certificate is not X.509"
 msgstr "伺服器的驗証還未有效"
 
-#: mutt_ssl_gnutls.c:495
+#: mutt_ssl_gnutls.c:494
 #, fuzzy
 msgid "Error initialising gnutls certificate data"
 msgstr "無法初始化終端機。"
 
-#: mutt_ssl_gnutls.c:509
+#: mutt_ssl_gnutls.c:508
 msgid "Error processing certificate data"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:695
+#: mutt_ssl_gnutls.c:694
 #, fuzzy, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "指模：%s"
 
-#: mutt_ssl_gnutls.c:699
+#: mutt_ssl_gnutls.c:698
 #, fuzzy, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "指模：%s"
 
-#: mutt_ssl_gnutls.c:705
+#: mutt_ssl_gnutls.c:704
 #, fuzzy
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "伺服器的驗証還未有效"
 
-#: mutt_ssl_gnutls.c:709
+#: mutt_ssl_gnutls.c:708
 #, fuzzy
 msgid "WARNING: Server certificate has expired"
 msgstr "伺服器的驗証已過期"
 
-#: mutt_ssl_gnutls.c:715
+#: mutt_ssl_gnutls.c:714
 #, fuzzy
 msgid "WARNING: Server certificate has been revoked"
 msgstr "伺服器的驗証已過期"
 
-#: mutt_ssl_gnutls.c:720
+#: mutt_ssl_gnutls.c:719
 msgid "WARNING: Server hostname does not match certificate"
 msgstr ""
 
-#: mutt_ssl_gnutls.c:726
+#: mutt_ssl_gnutls.c:725
 #, fuzzy
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "伺服器的驗証還未有效"
 
-#: mutt_ssl_gnutls.c:730
+#: mutt_ssl_gnutls.c:729
 #, fuzzy
 msgid "TLS/SSL Certificate check"
 msgstr "SSL 驗証測試"
 
-#: mutt_ssl_nss.c:51
-#, c-format
-msgid "%s failed (error %d)"
-msgstr ""
-
-#: mutt_ssl_nss.c:121
-#, c-format
-msgid "SSL_AuthCertificate failed (error %d)"
-msgstr ""
-
-#: mutt_ssl_nss.c:234
-#, c-format
-msgid "Unable to find ip for host %s"
-msgstr ""
-
-#: mutt_ssl_nss.c:244
-msgid "PR_NewTCPSocket failed."
-msgstr ""
-
-#: mutt_ssl_nss.c:287
-#, fuzzy, c-format
-msgid "Unable to connect to host %s"
-msgstr "無法附加 %s！"
-
 #: mutt_tunnel.c:65
 #, fuzzy, c-format
 msgid "Connecting with \"%s\"..."
 msgstr "正連接到 %s…"
 
-#: mutt_tunnel.c:137 mutt_tunnel.c:153
+#: mutt_tunnel.c:127
+#, c-format
+msgid "Tunnel to %s returned error %d (%s)"
+msgstr ""
+
+#: mutt_tunnel.c:143 mutt_tunnel.c:159
 #, fuzzy, c-format
 msgid "Tunnel error talking to %s: %s"
 msgstr "連線到 %s (%s) 時失敗"
 
-#: mx.c:130
+#: mx.c:132
 #, c-format
 msgid "Lock count exceeded, remove lock for %s?"
 msgstr "鎖進數量超過限額，將 %s 的鎖移除？"
 
-#: mx.c:139
+#: mx.c:141
 #, c-format
 msgid "Can't dotlock %s.\n"
 msgstr "無法用 dotlock 鎖住 %s。\n"
 
-#: mx.c:221
+#: mx.c:223
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "嘗試 fcntl 的鎖定時超過時間!"
 
-#: mx.c:228
+#: mx.c:230
 #, c-format
 msgid "Waiting for fcntl lock... %d"
 msgstr "正在等待 fcntl 的鎖定… %d"
 
-#: mx.c:255
+#: mx.c:257
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "嘗試 flock 時超過時間！"
 
-#: mx.c:263
+#: mx.c:265
 #, c-format
 msgid "Waiting for flock attempt... %d"
 msgstr "正在等待 flock 執行成功… %d"
 
-#: mx.c:485
+#: mx.c:487
 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr "無法鎖住 %s。\n"
 
-#: mx.c:574
+#: mx.c:576
 #, c-format
 msgid "Reading %s..."
 msgstr "讀取 %s 中…"
 
-#: mx.c:636
+#: mx.c:638
 #, c-format
 msgid "Writing %s..."
 msgstr "寫入 %s 中…"
 
-#: mx.c:667
+#: mx.c:669
 #, fuzzy
 msgid "message(s) not deleted"
 msgstr "郵件已傳送。"
 
-#: mx.c:688
+#: mx.c:690
 #, fuzzy
 msgid "Can't open trash folder"
 msgstr "無法把資料加到檔案夾：%s"
 
-#: mx.c:755
+#: mx.c:757
 #, c-format
 msgid "Move read messages to %s?"
 msgstr "搬移已讀取的信件到 %s？"
 
-#: mx.c:769 mx.c:1024
+#: mx.c:771 mx.c:1026
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "清除 %d 封已經被刪除的信件？"
 
-#: mx.c:770 mx.c:1025
+#: mx.c:772 mx.c:1027
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "清除 %d 封已被刪除的信件？"
 
-#: mx.c:789
+#: mx.c:791
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "正在搬移已經讀取的信件到 %s …"
 
-#: mx.c:842 mx.c:1015
+#: mx.c:844 mx.c:1017
 msgid "Mailbox is unchanged."
 msgstr "信箱沒有變動。"
 
-#: mx.c:881
+#: mx.c:883
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
 msgstr "%d 封信件被保留, %d 封信件被搬移, %d 封信件被刪除。"
 
-#: mx.c:884 mx.c:1068
+#: mx.c:886 mx.c:1070
 #, c-format
 msgid "%d kept, %d deleted."
 msgstr "%d 封信件被保留, %d 封信件被刪除。"
 
-#: mx.c:1000
+#: mx.c:1002
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr " 請按下 '%s' 來切換寫入模式"
 
-#: mx.c:1002
+#: mx.c:1004
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "請使用 'toggle-write' 來重新啟動寫入功能!"
 
-#: mx.c:1005
+#: mx.c:1007
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr "信箱被標記成為無法寫入的. %s"
 
 # How to translate?
-#: mx.c:1064
+#: mx.c:1066
 msgid "Mailbox checkpointed."
 msgstr ""
 
-#: mx.c:1293
+#: mx.c:1295
 msgid "Integer overflow -- can't allocate memory."
 msgstr ""
 
@@ -4258,7 +4341,7 @@ msgstr "沒有被定義的 POP 使用者名稱。"
 msgid "%s is an invalid newsserver specification!"
 msgstr ""
 
-#: nntp/nntp.c:92 pop/pop.c:648 pop/pop_lib.c:342
+#: nntp/nntp.c:92 pop/pop.c:648 pop/pop_lib.c:351
 msgid "Server closed connection!"
 msgstr "與伺服器的聯結中斷了!"
 
@@ -4395,155 +4478,155 @@ msgstr "正在刪除伺服器上的信件…"
 msgid "Server %s does not support this operation!"
 msgstr ""
 
-#: pager.c:60
+#: pager.c:62
 msgid "Not available in this menu."
 msgstr "在這個菜單中沒有這個功能。"
 
-#: pager.c:1344
+#: pager.c:1373
 msgid "PrevPg"
 msgstr "上一頁"
 
-#: pager.c:1345
+#: pager.c:1374
 msgid "NextPg"
 msgstr "下一頁"
 
-#: pager.c:1349
+#: pager.c:1378
 msgid "View Attachm."
 msgstr "顯示附件。"
 
-#: pager.c:1352 pager.c:1361
+#: pager.c:1381 pager.c:1390
 msgid "Next"
 msgstr "下一個"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1739 pager.c:1767 pager.c:1797 pager.c:2031
+#: pager.c:1770 pager.c:1798 pager.c:1828 pager.c:2062
 msgid "Bottom of message is shown."
 msgstr "現正顯示最下面的信件。"
 
-#: pager.c:1754 pager.c:1774 pager.c:1781 pager.c:1788
+#: pager.c:1785 pager.c:1805 pager.c:1812 pager.c:1819
 msgid "Top of message is shown."
 msgstr "現正顯示最上面的信件。"
 
-#: pager.c:1849
+#: pager.c:1880
 msgid "Reverse search: "
 msgstr "反向搜尋："
 
-#: pager.c:1850
+#: pager.c:1881
 msgid "Search: "
 msgstr "搜尋："
 
-#: pager.c:1962
+#: pager.c:1993
 msgid "Help is currently being shown."
 msgstr "現正顯示說明文件。"
 
-#: pager.c:1992
+#: pager.c:2023
 msgid "No more quoted text."
 msgstr "不能有再多的引言。"
 
-#: pager.c:2009
+#: pager.c:2040
 msgid "No more unquoted text after quoted text."
 msgstr "在引言後有過多的非引言文字。"
 
-#: parse.c:580
+#: parse.c:584
 msgid "multipart message has no boundary parameter!"
 msgstr "多部份郵件沒有分隔的參數!"
 
-#: pattern.c:229
+#: pattern.c:233
 #, c-format
 msgid "Error in expression: %s"
 msgstr "表達式有錯誤：%s"
 
-#: pattern.c:328
+#: pattern.c:332
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "無效的日子：%s"
 
-#: pattern.c:340
+#: pattern.c:344
 #, c-format
 msgid "Invalid month: %s"
 msgstr "無效的月份：%s"
 
 #. getDate has its own error message, don't overwrite it here
-#: pattern.c:483
+#: pattern.c:487
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "無效的相對日期：%s"
 
-#: pattern.c:496
+#: pattern.c:500
 msgid "error in expression"
 msgstr "表達式有錯誤"
 
-#: pattern.c:686 pattern.c:788
+#: pattern.c:690 pattern.c:792
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "在樣式上有錯誤：%s"
 
-#: pattern.c:732
+#: pattern.c:736
 #, c-format
 msgid "%c: invalid command"
 msgstr "%c：無效的指令"
 
-#: pattern.c:737
+#: pattern.c:741
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c：在這個模式不支援"
 
-#: pattern.c:749
+#: pattern.c:753
 #, c-format
 msgid "missing parameter"
 msgstr "錯失參數"
 
-#: pattern.c:763
+#: pattern.c:767
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "不對稱的括弧：%s"
 
-#: pattern.c:794
+#: pattern.c:798
 msgid "empty pattern"
 msgstr "空的格式"
 
-#: pattern.c:1072
+#: pattern.c:1076
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "錯誤：不明的 op %d (請回報這個錯誤)。"
 
-#: pattern.c:1144 pattern.c:1267
+#: pattern.c:1148 pattern.c:1271
 msgid "Compiling search pattern..."
 msgstr "編譯搜尋樣式中…"
 
-#: pattern.c:1157
+#: pattern.c:1161
 msgid "Executing command on matching messages..."
 msgstr "正在對符合的郵件執行命令…"
 
-#: pattern.c:1215
+#: pattern.c:1219
 msgid "No messages matched criteria."
 msgstr "沒有郵件符合要求。"
 
-#: pattern.c:1303
+#: pattern.c:1307
 msgid "Search hit bottom without finding match"
 msgstr "已搜尋至結尾，並沒有發現任何符合"
 
-#: pattern.c:1314
+#: pattern.c:1318
 msgid "Search hit top without finding match"
 msgstr "已搜尋至開頭，並沒有發現任何符合"
 
-#: pattern.c:1336
+#: pattern.c:1340
 msgid "Search interrupted."
 msgstr "搜尋已被中斷。"
 
-#: pgp.c:86
+#: pgp.c:89
 msgid "Enter PGP passphrase:"
 msgstr "請輸入 PGP 通行密碼："
 
-#: pgp.c:99
+#: pgp.c:103
 msgid "PGP passphrase forgotten."
 msgstr "已忘記 PGP 通行密碼。"
 
-#: pgp.c:326
+#: pgp.c:331
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 
-#: pgp.c:362 pgp.c:567 pgp.c:755
+#: pgp.c:367 pgp.c:589 pgp.c:780
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -4551,12 +4634,23 @@ msgstr ""
 "[-- PGP 輸出部份結束 --]\n"
 "\n"
 
-#: pgp.c:665
+#: pgp.c:374 pgp.c:909
+#, fuzzy
+msgid "Could not decrypt PGP message"
+msgstr "無法複制信件"
+
+#. clear 'Invoking...' message, since there's no error
+#: pgp.c:418 pgp.c:907
+#, fuzzy
+msgid "PGP message successfully decrypted."
+msgstr "PGP 簽名驗證成功。"
+
+#: pgp.c:687
 #, fuzzy
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "內部錯誤。聯絡 <rosessler@guug.de>。"
 
-#: pgp.c:723
+#: pgp.c:746
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -4564,28 +4658,33 @@ msgstr ""
 "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 "\n"
 
-#: pgp.c:920
+#: pgp.c:788 postpone.c:555
+#, fuzzy
+msgid "Decryption failed."
+msgstr "登入失敗。"
+
+#: pgp.c:957
 msgid "Can't open PGP subprocess!"
 msgstr "無法開啟 PGP 子程序！"
 
-#: pgp.c:1340
+#: pgp.c:1379
 msgid "Can't invoke PGP"
 msgstr "不能執行 PGP"
 
-#: pgp.c:1439
+#: pgp.c:1480
 #, fuzzy, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
 msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
 
-#: pgp.c:1440
+#: pgp.c:1481
 msgid "PGP/M(i)ME"
 msgstr ""
 
-#: pgp.c:1440
+#: pgp.c:1481
 msgid "(i)nline"
 msgstr ""
 
-#: pgp.c:1442
+#: pgp.c:1483
 #, fuzzy
 msgid "esabifc"
 msgstr "1234i5"
@@ -4594,40 +4693,40 @@ msgstr "1234i5"
 msgid "Fetching PGP key..."
 msgstr "正在拿取 PGP 鑰匙 …"
 
-#: pgpkey.c:461
+#: pgpkey.c:464
 #, fuzzy
 msgid "All matching keys are expired, revoked, or disabled."
 msgstr "所有符合的鑰匙經已過期或取消。"
 
-#: pgpkey.c:504
+#: pgpkey.c:507
 #, c-format
 msgid "PGP keys matching <%s>."
 msgstr "PGP 鑰匙符合 <%s>。"
 
-#: pgpkey.c:506
+#: pgpkey.c:509
 #, c-format
 msgid "PGP keys matching \"%s\"."
 msgstr "PGP 鑰匙符合 \"%s\"。"
 
 #. __FOPEN_CHECKED__
-#: pgpkey.c:522 pgpkey.c:713
+#: pgpkey.c:525 pgpkey.c:716
 msgid "Can't open /dev/null"
 msgstr "無法開啟 /dev/null"
 
-#: pgpkey.c:693
+#: pgpkey.c:696
 msgid "Please enter the key ID: "
 msgstr "請輸入這把鑰匙的 ID："
 
-#: pgpkey.c:721
+#: pgpkey.c:724
 msgid "Invoking pgp..."
 msgstr "啟動 pgp…"
 
-#: pgpkey.c:746
+#: pgpkey.c:749
 #, c-format
 msgid "PGP Key %s."
 msgstr "PGP 鑰匙 %s。"
 
-#: pop/pop.c:82 pop/pop_lib.c:191
+#: pop/pop.c:82 pop/pop_lib.c:192
 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr "伺服器不支援 TOP 指令。"
@@ -4636,7 +4735,7 @@ msgstr "伺服器不支援 TOP 指令。"
 msgid "Can't write header to temporary file!"
 msgstr "無法把標頭寫到暫存檔！"
 
-#: pop/pop.c:186 pop/pop_lib.c:193
+#: pop/pop.c:186 pop/pop_lib.c:194
 #, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "伺服器不支援 UIDL 指令。"
@@ -4681,71 +4780,66 @@ msgstr "寫入信箱時發生錯誤！"
 msgid "%s [%d of %d messages read]"
 msgstr "%s [已閱讀 %2d 封信件中的 %1d 封]"
 
-#: pop/pop_auth.c:87
+#: pop/pop_auth.c:88
 msgid "Authenticating (SASL)..."
 msgstr "驗證中 (SASL)…"
 
-#: pop/pop_auth.c:197
+#: pop/pop_auth.c:198
 msgid "Authenticating (APOP)..."
 msgstr "驗證中 (APOP)…"
 
-#: pop/pop_auth.c:221
+#: pop/pop_auth.c:222
 msgid "APOP authentication failed."
 msgstr "APOP 驗證失敗。"
 
-#: pop/pop_auth.c:254
+#: pop/pop_auth.c:255
 #, c-format
 msgid "Command USER is not supported by server."
 msgstr "伺服器不支援 USER 指令。"
 
-#: pop/pop_lib.c:189
+#: pop/pop_lib.c:190
 msgid "Unable to leave messages on server."
 msgstr "無法把信件留在伺服器上。"
 
-#: pop/pop_lib.c:217
+#: pop/pop_lib.c:218
 #, c-format
 msgid "Error connecting to server: %s"
 msgstr "連線到 %s 時失敗"
 
-#: pop/pop_lib.c:356
+#: pop/pop_lib.c:365
 msgid "Closing connection to POP server..."
 msgstr "正在關閉與 POP 伺服器的連線…"
 
-#: pop/pop_lib.c:512
+#: pop/pop_lib.c:521
 msgid "Verifying message indexes..."
 msgstr "正在檢查信件的指引 …"
 
-#: pop/pop_lib.c:535
+#: pop/pop_lib.c:544
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "連線中斷。再與 POP 伺服器連線嗎？"
 
-#: postpone.c:165
+#: postpone.c:169
 msgid "Postponed Messages"
 msgstr "信件已經被延遲寄出"
 
-#: postpone.c:243 postpone.c:252
+#: postpone.c:247 postpone.c:256
 msgid "No postponed messages."
 msgstr "沒有被延遲寄出的信件。"
 
-#: postpone.c:426 postpone.c:445 postpone.c:480
+#: postpone.c:430 postpone.c:449 postpone.c:484
 msgid "Illegal PGP header"
 msgstr "不合規定的 PGP 標頭"
 
-#: postpone.c:465
+#: postpone.c:469
 #, fuzzy
 msgid "Illegal S/MIME header"
 msgstr "不合規定的 PGP 標頭"
 
-#: postpone.c:540
+#: postpone.c:544
 #, fuzzy
 msgid "Decrypting message..."
 msgstr "拿取信件中…"
 
-#: postpone.c:551
-#, fuzzy
-msgid "Decryption failed."
-msgstr "登入失敗。"
-
 #: query.c:44
 msgid "New Query"
 msgstr "新的查詢"
@@ -4781,132 +4875,132 @@ msgstr "查詢："
 msgid "Query '%s'"
 msgstr "查詢 '%s'"
 
-#: recvattach.c:51
+#: recvattach.c:55
 msgid "Pipe"
 msgstr "管線"
 
-#: recvattach.c:52
+#: recvattach.c:56
 msgid "Print"
 msgstr "顯示"
 
-#: recvattach.c:400
+#: recvattach.c:404
 msgid "Save to file ('#' for last used folder): "
 msgstr ""
 
-#: recvattach.c:455
+#: recvattach.c:459
 msgid "Saving..."
 msgstr "儲存中…"
 
-#: recvattach.c:460 recvattach.c:540
+#: recvattach.c:464 recvattach.c:544
 msgid "Attachment saved."
 msgstr "附件已被儲存。"
 
-#: recvattach.c:551
+#: recvattach.c:555
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "警告! 您正在覆蓋 %s, 是否要繼續?"
 
-#: recvattach.c:567
+#: recvattach.c:571
 msgid "Attachment filtered."
 msgstr "附件被過濾掉。"
 
-#: recvattach.c:628
+#: recvattach.c:632
 msgid "Filter through: "
 msgstr "經過過濾："
 
-#: recvattach.c:628
+#: recvattach.c:632
 msgid "Pipe to: "
 msgstr "導引至："
 
-#: recvattach.c:657
+#: recvattach.c:661
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "我不知道要怎麼列印 %s 附件!"
 
-#: recvattach.c:722
+#: recvattach.c:726
 msgid "Print tagged attachment(s)?"
 msgstr "是否要列印標記起來的附件?"
 
-#: recvattach.c:722
+#: recvattach.c:726
 msgid "Print attachment?"
 msgstr "是否要列印附件?"
 
-#: recvattach.c:950
+#: recvattach.c:954
 #, fuzzy
 msgid "Can't decrypt encrypted message!"
 msgstr "找不到已標記的訊息"
 
-#: recvattach.c:963
+#: recvattach.c:967
 msgid "Attachments"
 msgstr "附件"
 
-#: recvattach.c:999
+#: recvattach.c:1003
 msgid "There are no subparts to show!"
 msgstr "沒有部件！"
 
-#: recvattach.c:1065
+#: recvattach.c:1069
 msgid "Can't delete attachment from POP server."
 msgstr "無法從 POP 伺服器刪除附件。"
 
-#: recvattach.c:1074
+#: recvattach.c:1078
 #, fuzzy
 msgid "Can't delete attachment from newsserver."
 msgstr "無法從 POP 伺服器刪除附件。"
 
-#: recvattach.c:1083
+#: recvattach.c:1087
 #, fuzzy
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "未支援刪除 PGP 信件所附帶的附件。"
 
-#: recvattach.c:1098 recvattach.c:1111
+#: recvattach.c:1102 recvattach.c:1115
 msgid "Only deletion of multipart attachments is supported."
 msgstr "只支援刪除多重附件"
 
-#: recvcmd.c:37
+#: recvcmd.c:41
 msgid "You may only bounce message/rfc822 parts."
 msgstr "您只能直接傳送 message/rfc822 的部分。"
 
-#: recvcmd.c:199
+#: recvcmd.c:203
 #, fuzzy
 msgid "Error bouncing message!"
 msgstr "寄信途中發生錯誤。"
 
-#: recvcmd.c:200
+#: recvcmd.c:204
 #, fuzzy
 msgid "Error bouncing messages!"
 msgstr "寄信途中發生錯誤。"
 
-#: recvcmd.c:390
+#: recvcmd.c:394
 #, c-format
 msgid "Can't open temporary file %s."
 msgstr "無法開啟暫存檔 %s"
 
-#: recvcmd.c:419
+#: recvcmd.c:423
 msgid "Forward as attachments?"
 msgstr "利用附件形式來轉寄？"
 
-#: recvcmd.c:433
+#: recvcmd.c:437
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "未能把所有已標簽的附件解碼。要用 MIME 轉寄其它的嗎？"
 
-#: recvcmd.c:552
+#: recvcmd.c:556
 msgid "Forward MIME encapsulated?"
 msgstr "用 MIME 的方式來轉寄？"
 
-#: recvcmd.c:558 recvcmd.c:809
+#: recvcmd.c:562 recvcmd.c:813
 #, c-format
 msgid "Can't create %s."
 msgstr "無法建立 %s."
 
-#: recvcmd.c:677
+#: recvcmd.c:681
 msgid "Can't find any tagged messages."
 msgstr "找不到已標記的訊息"
 
-#: recvcmd.c:706 send.c:780
+#: recvcmd.c:710 send.c:765
 msgid "No mailing lists found!"
 msgstr "沒有找到郵寄論壇！"
 
-#: recvcmd.c:787
+#: recvcmd.c:791
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr "未能把所有已標簽的附件解碼。要用 MIME 包封其它的嗎？"
 
@@ -4974,41 +5068,41 @@ msgstr "寄送訊息時出現錯誤，子程序結束 %d。\n"
 msgid "Error sending message."
 msgstr "寄信途中發生錯誤。"
 
-#: rfc1524.c:148
+#: rfc1524.c:150
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
 msgstr "在 \"%2$s\" 的第 %3$d 行發現類別 %1$s 為錯誤的格式紀錄"
 
-#: rfc1524.c:358
+#: rfc1524.c:360
 msgid "No mailcap path specified"
 msgstr "沒有指定 mailcap 路徑"
 
-#: rfc1524.c:385
+#: rfc1524.c:387
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "沒有發現類型 %s 的 mailcap 紀錄"
 
-#: score.c:66
+#: score.c:67
 msgid "score: too few arguments"
 msgstr "分數：太少的引數"
 
-#: score.c:74
+#: score.c:75
 msgid "score: too many arguments"
 msgstr "分數：太多的引數"
 
-#: send.c:279
+#: send.c:282
 msgid "Ignoring $strip_was: Subject would be empty."
 msgstr ""
 
-#: send.c:288
+#: send.c:291
 msgid "No subject, abort?"
 msgstr "沒有標題，要不要中斷？"
 
-#: send.c:290
+#: send.c:293
 msgid "No subject, aborting."
 msgstr "沒有標題，正在中斷中。"
 
-#: send.c:508
+#: send.c:493
 msgid "Message came from a mailing list. Reply to author only?"
 msgstr ""
 
@@ -5017,12 +5111,12 @@ msgstr ""
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.
-#: send.c:547
+#: send.c:532
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "要回覆給 %s%s?"
 
-#: send.c:578
+#: send.c:563
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "以後的回覆都寄至 %s%s?"
@@ -5030,126 +5124,126 @@ 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.
 #.
-#: send.c:749
+#: send.c:734
 msgid "No tagged messages are visible!"
 msgstr "沒有被標記了的信件在顯示！"
 
-#: send.c:807
+#: send.c:792
 msgid "Include message in reply?"
 msgstr "回信時是否要包含原本的信件內容？"
 
-#: send.c:811
+#: send.c:796
 msgid "Including quoted message..."
 msgstr "正引入引言部分…"
 
-#: send.c:818
+#: send.c:803
 msgid "Could not include all requested messages!"
 msgstr "無法包含所有要求的信件！"
 
-#: send.c:834
+#: send.c:819
 msgid "Forward as attachment?"
 msgstr "利用附件形式來轉寄？"
 
-#: send.c:837
+#: send.c:822
 msgid "Preparing forwarded message..."
 msgstr "準備轉寄信件…"
 
-#: send.c:1129
+#: send.c:1114
 msgid "Recall postponed message?"
 msgstr "要叫出被延遲的信件?"
 
-#: send.c:1436
+#: send.c:1421
 #, fuzzy
 msgid "Edit forwarded message?"
 msgstr "準備轉寄信件…"
 
-#: send.c:1459
+#: send.c:1444
 msgid "Abort unmodified message?"
 msgstr "是否要中斷未修改過的信件?"
 
-#: send.c:1460
+#: send.c:1445
 msgid "Aborted unmodified message."
 msgstr "中斷沒有修改過的信件"
 
-#: send.c:1501
+#: send.c:1486
 #, fuzzy
 msgid "Article not posted."
 msgstr "附件已被儲存。"
 
-#: send.c:1535
+#: send.c:1520
 msgid "Message postponed."
 msgstr "信件被延遲寄出。"
 
-#: send.c:1546
+#: send.c:1531
 msgid "No recipients are specified!"
 msgstr "沒有指定接受者！"
 
-#: send.c:1551
+#: send.c:1536
 msgid "No recipients were specified."
 msgstr "沒有指定接受者。"
 
-#: send.c:1569
+#: send.c:1554
 msgid "No subject, abort sending?"
 msgstr "沒有信件標題，要中斷寄信的工作?"
 
-#: send.c:1572 send.c:1578
+#: send.c:1557 send.c:1563
 msgid "No subject specified."
 msgstr "沒有指定標題。"
 
-#: send.c:1584
+#: send.c:1569
 #, fuzzy
 msgid "No newsgroup specified."
 msgstr "沒有指定標題。"
 
-#: send.c:1645
+#: send.c:1630
 msgid "Sending message..."
 msgstr "正在寄出信件…"
 
-#: send.c:1769
+#: send.c:1754
 msgid "Could not send the message."
 msgstr "無法寄出信件。"
 
-#: send.c:1775
+#: send.c:1760
 msgid "Sending in background."
 msgstr "正在背景作業中傳送。"
 
-#: send.c:1777
+#: send.c:1762
 msgid "Article posted."
 msgstr ""
 
-#: send.c:1778 send.c:1780
+#: send.c:1763 send.c:1765
 msgid "Mail sent."
 msgstr "信件已經寄出。"
 
-#: sendlib.c:461
+#: sendlib.c:393
 msgid "No boundary parameter found! [report this error]"
 msgstr "沒有發現分界變數！[回報錯誤]"
 
-#: sendlib.c:489
+#: sendlib.c:421
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s 已經不存在！"
 
-#: sendlib.c:893
+#: sendlib.c:825
 #, fuzzy, c-format
 msgid "%s isn't a regular file."
 msgstr "%s 不是信箱。"
 
-#: sendlib.c:1057
+#: sendlib.c:989
 #, c-format
 msgid "Could not open %s"
 msgstr "無法開啟 %s"
 
-#: sendlib.c:2128
+#: sendlib.c:2047
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "寄送訊息出現錯誤，子程序已結束 %d (%s)。"
 
-#: sendlib.c:2134
+#: sendlib.c:2053
 msgid "Output of the delivery process"
 msgstr "Delivery process 的輸出"
 
-#: sendlib.c:2355
+#: sendlib.c:2274
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr ""
@@ -5169,111 +5263,111 @@ msgstr "捕抓到 %s… 正在離開。\n"
 msgid "Caught signal %d...  Exiting.\n"
 msgstr "捕抓到 signal %d… 正在離開.\n"
 
-#: smime.c:108
+#: smime.c:109
 #, fuzzy
 msgid "Enter SMIME passphrase:"
 msgstr "請輸入 PGP 通行密碼："
 
-#: smime.c:308
+#: smime.c:310
 msgid "Trusted   "
 msgstr ""
 
-#: smime.c:311
+#: smime.c:313
 msgid "Verified  "
 msgstr ""
 
-#: smime.c:314
+#: smime.c:316
 msgid "Unverified"
 msgstr ""
 
-#: smime.c:317
+#: smime.c:319
 #, fuzzy
 msgid "Expired   "
 msgstr "離開  "
 
-#: smime.c:320
+#: smime.c:322
 msgid "Revoked   "
 msgstr ""
 
-#: smime.c:323
+#: smime.c:325
 #, fuzzy
 msgid "Invalid   "
 msgstr "無效的月份：%s"
 
-#: smime.c:326
+#: smime.c:328
 #, fuzzy
 msgid "Unknown   "
 msgstr "不清楚"
 
-#: smime.c:358
+#: smime.c:360
 #, fuzzy
 msgid "Enter keyID: "
 msgstr "請輸入 %s 的鑰匙 ID："
 
-#: smime.c:380
+#: smime.c:382
 #, fuzzy, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "PGP 鑰匙符合 \"%s\"。"
 
-#: smime.c:530 smime.c:591 smime.c:606
+#: smime.c:532 smime.c:593 smime.c:608
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
 msgstr ""
 
-#: smime.c:534 smime.c:595
+#: smime.c:536 smime.c:597
 #, fuzzy, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 
-#: smime.c:537 smime.c:597
+#: smime.c:539 smime.c:599
 #, fuzzy, c-format
 msgid "Use ID %s for %s ?"
 msgstr "要為 %2$s 使用鑰匙 ID = \"%1$s\"？"
 
-#: smime.c:614
+#: smime.c:616
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 
-#: smime.c:766
+#: smime.c:768
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr ""
 
-#: smime.c:818 smime.c:845 smime.c:908 smime.c:950 smime.c:1012 smime.c:1082
+#: smime.c:820 smime.c:847 smime.c:910 smime.c:952 smime.c:1014 smime.c:1084
 #, fuzzy
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 
-#: smime.c:1154
+#: smime.c:1156
 #, fuzzy
 msgid "no certfile"
 msgstr "無法建立過濾器"
 
-#: smime.c:1157
+#: smime.c:1159
 #, fuzzy
 msgid "no mbox"
 msgstr "（沒有信箱）"
 
-#: smime.c:1297
+#: smime.c:1299
 msgid "No output from OpenSSL.."
 msgstr ""
 
-#: smime.c:1335
+#: smime.c:1337
 #, fuzzy
 msgid "Warning: Intermediate certificate not found."
 msgstr "警告：未能儲存驗証"
 
-#: smime.c:1376
+#: smime.c:1378
 #, fuzzy
 msgid "Can't open OpenSSL subprocess!"
 msgstr "無法開啟 PGP 子程序！"
 
-#: smime.c:1413
+#: smime.c:1415
 msgid "No output from OpenSSL..."
 msgstr ""
 
-#: smime.c:1577 smime.c:1701
+#: smime.c:1579 smime.c:1703
 #, fuzzy
 msgid ""
 "[-- End of OpenSSL output --]\n"
@@ -5282,26 +5376,26 @@ msgstr ""
 "[-- PGP 輸出部份結束 --]\n"
 "\n"
 
-#: smime.c:1663 smime.c:1675
+#: smime.c:1665 smime.c:1677
 #, fuzzy
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- 錯誤：無法建立 PGP 子程序！ --]\n"
 
-#: smime.c:1705
+#: smime.c:1707
 #, fuzzy
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr ""
 "[-- 下面是 PGP/MIME 加密資料 --]\n"
 "\n"
 
-#: smime.c:1708
+#: smime.c:1710
 #, fuzzy
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr ""
 "[-- 以下的資料已被簽署 --]\n"
 "\n"
 
-#: smime.c:1766
+#: smime.c:1768
 #, fuzzy
 msgid ""
 "\n"
@@ -5310,7 +5404,7 @@ msgstr ""
 "\n"
 "[-- PGP/MIME 加密資料結束 --]\n"
 
-#: smime.c:1768
+#: smime.c:1770
 #, fuzzy
 msgid ""
 "\n"
@@ -5343,11 +5437,11 @@ msgstr ""
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr ""
 
-#: sort.c:280
+#: sort.c:281
 msgid "Sorting mailbox..."
 msgstr "信箱排序中…"
 
-#: sort.c:312
+#: sort.c:313
 msgid "Could not find sorting function! [report this bug]"
 msgstr "找不到排序的功能！[請回報這個問題]"
 
@@ -5360,12 +5454,12 @@ msgstr "（沒有信箱）"
 msgid "(no mailbox)"
 msgstr "（沒有信箱）"
 
-#: thread.c:987
+#: thread.c:988
 #, fuzzy
 msgid "Parent message is not visible in this limited view."
 msgstr "在限制閱覽模式下無法顯示主信件。"
 
-#: thread.c:994
+#: thread.c:995
 msgid "Parent message is not available."
 msgstr "主信件不存在。"
 
@@ -5386,6 +5480,18 @@ msgstr ""
 msgid "Out of memory!"
 msgstr "記憶體不足！"
 
+#, fuzzy
+#~ msgid "esabtf"
+#~ msgstr "12345"
+
+#, fuzzy
+#~ msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"
+#~ msgstr "(1)加密, (2)簽名, (3)用別的身份簽, (4)兩者皆要, 或 (5)放棄？"
+
+#, fuzzy
+#~ msgid "Unable to connect to host %s"
+#~ msgstr "無法附加 %s！"
+
 #, fuzzy
 #~ msgid "Can't change 'important' flag on POP server."
 #~ msgstr "無法編輯 POP 伺服器上的信件。"
@@ -5623,9 +5729,6 @@ msgstr "記憶體不足！"
 #~ msgid "reserved"
 #~ msgstr "保留的"
 
-#~ msgid "Encrypted Session Key"
-#~ msgstr "加密的鑰匙"
-
 #~ msgid "Signature Packet"
 #~ msgstr "簽名封包"