added tooltip for search entry.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@913 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 215 insertions, 211 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index f78ba761..28f5363d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -21,194 +21,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "讀取所有帳號的設定中...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "到 %s 的 IMAP4 連線被中斷了。重新連線中...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 伺服器停用登入。\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在產生 IMAP4 連線到 %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "無法開啟 TLS 連線\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "擷取第 %d 號郵件"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "附加郵件至 %s (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "正在移動郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在複製郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "正在移除郵件 %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "無法設定刪除的旗標：%s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "無法刪除\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "正在移除 %s 中的所有郵件"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "無法設定刪除的旗標：1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "無法選擇資料夾\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根資料夾 %s 不存在。\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "取得 LIST 時發生錯誤。\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "無法產生 %s\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "無法在收件夾下產生 %s\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法產生信箱：LIST 失敗\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "無法產生信箱\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "信箱 %s 無法更名為 %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "無法刪除信箱\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "取得信封時發生錯誤。\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "無法解析信封：%s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾：%s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 msgid "error on imap command: STATUS\n"
 msgstr "發生錯誤的 imap 命令： STATUS\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 認證失敗\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "（送出檔案 ...）"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加訊息到 %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將郵件 %s 移到 %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -711,7 +711,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "名稱"
@@ -965,9 +965,9 @@ msgstr "/新增資料夾(_F)"
 #: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
 #: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
 #: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -976,7 +976,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
@@ -989,7 +989,7 @@ msgid "Address book"
 msgstr "通訊錄"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "姓名："
 
@@ -1012,16 +1012,16 @@ msgstr "新增"
 msgid "Lookup"
 msgstr "尋找"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "密件副本"
 
@@ -1043,7 +1043,7 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -1246,7 +1246,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "無"
 
@@ -1337,7 +1337,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動折列(_O)"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/顯示(_V)"
 
@@ -1567,7 +1567,7 @@ msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
@@ -1688,7 +1688,7 @@ msgstr "MIME 型態"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "大小"
 
@@ -1777,7 +1777,7 @@ msgstr "內容"
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
@@ -1998,12 +1998,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2170,42 +2170,42 @@ msgstr "選擇目錄"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法建立資料夾「%s」。"
@@ -2273,7 +2273,7 @@ msgstr "新的"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "未讀的"
 
@@ -2323,22 +2323,22 @@ msgstr "檢查每個資料夾中的新郵件..."
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載郵件時出現錯誤。"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2348,26 +2348,26 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上「/'）"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入「%s」的新名稱："
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2376,12 +2376,12 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2394,20 +2394,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2416,34 +2416,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -2459,7 +2459,7 @@ msgstr "主旨："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -3231,7 +3231,7 @@ msgstr "/顯示(_V)/字元編碼(_E)/中文 (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_W)"
 
@@ -3511,8 +3511,8 @@ msgstr "建立主視窗...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3585,7 +3585,7 @@ msgstr "Sylpheed - 資料夾檢視"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
@@ -3601,15 +3601,15 @@ msgstr "/回覆給原作者(_S)"
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
@@ -3694,8 +3694,8 @@ msgstr "設定"
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "帳號"
 
@@ -3727,7 +3727,7 @@ msgstr "在目前郵件中尋找"
 msgid "Find text:"
 msgstr "尋找文字："
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "區分大小寫"
@@ -3772,25 +3772,25 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "正在學習命令:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4160,7 +4160,7 @@ msgstr "送信前先做 POP3 認證"
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
@@ -5429,7 +5429,7 @@ msgstr "執行結果"
 msgid "Age"
 msgstr "時效"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "標記"
@@ -5594,35 +5594,35 @@ msgstr "指定的指令不存在。"
 msgid "Folder properties"
 msgstr "資料夾屬性"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 msgid "Identifier"
 msgstr "識別符號"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "MIME 型態"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "正常"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "在郵件列表中不要顯示郵件主旨前面的中括號 [] 或小括號 ()"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "回覆時刪除郵件主旨前面的中括號 [] 或小括號 ()"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "套用到子資料夾"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "回覆郵件時也使用"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "回信地址："
 
@@ -5631,20 +5631,20 @@ msgstr "回信地址："
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "下列任一條件符合"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "下列所有條件均符合"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "資料夾"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "搜尋失敗"
@@ -5660,19 +5660,19 @@ msgstr "附加檔案"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "日期"
 
@@ -6065,7 +6065,7 @@ msgstr "無法取得收件人或收件新聞群組名單。"
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "完成"
 
@@ -6093,7 +6093,7 @@ msgstr "掃描資料夾 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6111,346 +6111,350 @@ msgstr ""
 msgid "Folder name:"
 msgstr "檔名"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/回覆給(_Y)"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/回覆給(_Y)/所有收件人(_A)"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/回覆給(_Y)/原作者(_S)"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/回覆給(_Y)/郵遞論壇(_L)"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/移動(_O)..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/複製(_C)..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/標記(_M)"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/標記(_M)/標記(_M)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/標記(_M)/去除標記(_U)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/標記(_M)/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/標記(_M)/標記成未讀(_E)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/標記(_M)/標記成已讀(_D)"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/標記(_M)/標記所有郵件成已讀(_R)"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/以顏色做標記(_B)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/重新編輯(_E)"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/將寄信人加入通訊錄(_K)..."
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/產生郵件過濾規則(_I)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/產生郵件過濾規則(_I)/自動產生(_A)"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/產生郵件過濾規則(_I)/依來源(_F)"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/產生郵件過濾規則(_I)/依收信人(_T)"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/產生郵件過濾規則(_I)/依主旨(_S)"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/顯示(_V)/觀看郵件原始碼(_S)"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/顯示(_V)/顯示所有的標頭(_H)"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/列印(_P)..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "正在建立彙總檢視...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/以顏色做標記(_B)"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "附加檔案"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "尋找"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "郵件標記"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "某些郵件已被標記。要繼續嗎？"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "再次搜尋(_S)"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "沒有其他未讀郵件"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "沒有找到未讀郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "沒有未讀郵件。"
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "沒有未讀郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "沒有其他新郵件"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "沒有找到新郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "沒有新郵件。"
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "沒有新郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "沒有其他已標記郵件"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "沒有找到已標記郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "沒有已標記郵件。"
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "沒有找到已標記郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "沒有找到已標記顏色之郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "沒有已標記顏色之郵件。"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "沒有找到已標記顏色之郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "依主旨展開郵件中..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr "， "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " 封已選擇"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封(%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "郵件排序中..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\t產生郵件列表中..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "No."
 
@@ -6522,12 +6526,12 @@ msgstr "/郵件(_M)/接收(_V)/從所有帳號中接收新郵件(_A)"
 msgid "_Send queued messages"
 msgstr "將暫存資料夾中的郵件送出"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "關於"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "離開"