added progress column to the progress dialog.

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

1 files changed, 163 insertions, 145 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 94414b16..ba99ce73 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: 2008-09-19 15:53+0900\n"
+"POT-Creation-Date: 2008-09-26 16:20+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"
@@ -991,7 +991,7 @@ msgstr "E-Mail 地址"
 msgid "Address book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:636 src/prefs_filter_edit.c:249
+#: src/addressbook.c:636 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
@@ -1022,7 +1022,7 @@ msgstr "刪除"
 #: src/addressbook.c:705 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
-#: src/prefs_filter_edit.c:1554
+#: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "新增"
 
@@ -1218,7 +1218,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:724
+#: src/alertpanel.c:168 src/inc.c:729
 msgid "Error"
 msgstr "錯誤"
 
@@ -1602,7 +1602,7 @@ msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
 #: src/compose.c:2730 src/headerview.c:233 src/query_search.c:687
-#: src/rpop3.c:519 src/summaryview.c:2271
+#: src/rpop3.c:564 src/summaryview.c:2271
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
@@ -1791,8 +1791,8 @@ msgid "MIME type"
 msgstr "MIME 型態"
 
 #. S_COL_DATE
-#: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:78 src/rpop3.c:321 src/select-keys.c:320
+#: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
+#: src/prefs_summary_column.c:78 src/rpop3.c:333 src/select-keys.c:320
 #: src/summaryview.c:5089
 msgid "Size"
 msgstr "大小"
@@ -2316,7 +2316,7 @@ msgid "New"
 msgstr "新的"
 
 #. S_COL_MARK
-#: src/folderview.c:424 src/prefs_filter_edit.c:501
+#: src/folderview.c:424 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:73 src/quick_search.c:96
 msgid "Unread"
 msgstr "未讀的"
@@ -2509,7 +2509,7 @@ msgstr "新聞群組："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:520
+#: src/headerview.c:212 src/query_search.c:688 src/rpop3.c:565
 #: src/summaryview.c:2274
 msgid "(No From)"
 msgstr "（沒有來源）"
@@ -2717,136 +2717,137 @@ msgstr "取得新郵件中"
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:681 src/inc.c:730
+#: src/inc.c:685 src/inc.c:735
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:692
+#: src/inc.c:696
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:701
-#, c-format
-msgid "Done (%d message(s) (%s) received)"
+#: src/inc.c:705 src/inc.c:1015
+#, fuzzy, c-format
+msgid "%d message(s) (%s) received"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:705
-msgid "Done (no new messages)"
-msgstr "完成（無新郵件）"
+#: src/inc.c:709
+#, fuzzy
+msgid "no new messages"
+msgstr "沒有新郵件。"
+
+#: src/inc.c:710
+#, fuzzy
+msgid "Done"
+msgstr "完成"
 
-#: src/inc.c:711
+#: src/inc.c:715
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:714
+#: src/inc.c:718
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:717
+#: src/inc.c:722
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:727
+#: src/inc.c:732
 msgid "Timeout"
 msgstr "逾時"
 
-#: src/inc.c:777
+#: src/inc.c:782
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:780
+#: src/inc.c:785
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:789
+#: src/inc.c:794
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:823
+#: src/inc.c:828
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:827
+#: src/inc.c:832
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:830
+#: src/inc.c:835
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:835
+#: src/inc.c:840
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:849
+#: src/inc.c:854
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:929 src/rpop3.c:674 src/send_message.c:813
+#: src/inc.c:934 src/rpop3.c:721 src/send_message.c:813
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:930
+#: src/inc.c:935
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:935
+#: src/inc.c:940
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:939
+#: src/inc.c:944
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:943
+#: src/inc.c:948
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:947
+#: src/inc.c:952
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:957
+#: src/inc.c:962
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:964 src/send_message.c:831
+#: src/inc.c:969 src/send_message.c:831
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:989
+#: src/inc.c:994
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1010
-#, c-format
-msgid "Retrieving (%d message(s) (%s) received)"
-msgstr "取得新郵件 (共 %d 封新郵件, %s 已接收）"
-
-#: src/inc.c:1198 src/inc.c:1218 src/summaryview.c:4501
+#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4501
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1271
+#: src/inc.c:1276
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1277
+#: src/inc.c:1282
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1282
+#: src/inc.c:1287
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -2855,40 +2856,40 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1288
+#: src/inc.c:1293
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1293
+#: src/inc.c:1298
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1298
+#: src/inc.c:1303
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1304 src/rpop3.c:435 src/rpop3.c:436 src/send_message.c:760
-#: src/send_message.c:963
+#: src/inc.c:1309 src/rpop3.c:447 src/rpop3.c:448 src/send_message.c:760
+#: src/send_message.c:966
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1310
+#: src/inc.c:1315
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次擷取未完成。"
 
-#: src/inc.c:1314
+#: src/inc.c:1319
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1320 src/rpop3.c:410 src/rpop3.c:415 src/send_message.c:943
+#: src/inc.c:1325 src/rpop3.c:422 src/rpop3.c:427 src/send_message.c:946
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1325 src/rpop3.c:412 src/send_message.c:946
+#: src/inc.c:1330 src/rpop3.c:424 src/send_message.c:949
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2897,15 +2898,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1330 src/rpop3.c:440 src/rpop3.c:441 src/send_message.c:967
+#: src/inc.c:1335 src/rpop3.c:452 src/rpop3.c:453 src/send_message.c:970
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1371
+#: src/inc.c:1376
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1473
+#: src/inc.c:1478
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"
@@ -4243,8 +4244,8 @@ msgstr "接收伺服器上所有的郵件。"
 msgid "Receive size limit"
 msgstr "接收郵件大小限制"
 
-#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:575
-#: src/prefs_filter_edit.c:1004
+#: src/prefs_account_dialog.c:931 src/prefs_filter_edit.c:581
+#: src/prefs_filter_edit.c:1010
 msgid "KB"
 msgstr "KB"
 
@@ -5597,7 +5598,7 @@ msgstr "舊設定"
 msgid "Custom header setting"
 msgstr "使用者自定標頭"
 
-#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1557
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1563
 msgid " Delete "
 msgstr "刪除"
 
@@ -5688,208 +5689,208 @@ msgstr "您確定要刪除這項規則「%s」嗎？"
 msgid "Delete rule"
 msgstr "刪除規則"
 
-#: src/prefs_filter_edit.c:234
+#: src/prefs_filter_edit.c:236
 msgid "Filter rule"
 msgstr "郵件過濾規則"
 
-#: src/prefs_filter_edit.c:268
+#: src/prefs_filter_edit.c:270
 msgid "If any of the following condition matches"
 msgstr "下列任一條件符合"
 
-#: src/prefs_filter_edit.c:270
+#: src/prefs_filter_edit.c:272
 msgid "If all of the following conditions match"
 msgstr "下列所有條件均符合"
 
-#: src/prefs_filter_edit.c:291
+#: src/prefs_filter_edit.c:293
 msgid "Perform the following actions:"
 msgstr "執行下列動作："
 
-#: src/prefs_filter_edit.c:490
+#: src/prefs_filter_edit.c:496
 msgid "To or Cc"
 msgstr "To 或 Cc"
 
-#: src/prefs_filter_edit.c:491
+#: src/prefs_filter_edit.c:497
 msgid "Any header"
 msgstr "任一個標頭"
 
-#: src/prefs_filter_edit.c:492
+#: src/prefs_filter_edit.c:498
 msgid "Edit header..."
 msgstr "編輯郵件標頭..."
 
-#: src/prefs_filter_edit.c:495
+#: src/prefs_filter_edit.c:501
 msgid "Message body"
 msgstr "郵件內容"
 
-#: src/prefs_filter_edit.c:496
+#: src/prefs_filter_edit.c:502
 msgid "Result of command"
 msgstr "執行結果"
 
-#: src/prefs_filter_edit.c:498
+#: src/prefs_filter_edit.c:504
 msgid "Age"
 msgstr "時效"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:508 src/quick_search.c:97
 #, fuzzy
 msgid "Marked"
 msgstr "標記"
 
-#: src/prefs_filter_edit.c:503
+#: src/prefs_filter_edit.c:509
 #, fuzzy
 msgid "Has color label"
 msgstr "/以顏色做標記(_B)"
 
-#: src/prefs_filter_edit.c:504
+#: src/prefs_filter_edit.c:510
 #, fuzzy
 msgid "Has attachment"
 msgstr "附加檔案"
 
-#: src/prefs_filter_edit.c:517
+#: src/prefs_filter_edit.c:523
 msgid "contains"
 msgstr "包含"
 
-#: src/prefs_filter_edit.c:519
+#: src/prefs_filter_edit.c:525
 msgid "doesn't contain"
 msgstr "不包含"
 
-#: src/prefs_filter_edit.c:521
+#: src/prefs_filter_edit.c:527
 msgid "is"
 msgstr "是"
 
-#: src/prefs_filter_edit.c:523
+#: src/prefs_filter_edit.c:529
 msgid "is not"
 msgstr "不是"
 
-#: src/prefs_filter_edit.c:526
+#: src/prefs_filter_edit.c:532
 msgid "match to regex"
 msgstr "符合正規表示式"
 
-#: src/prefs_filter_edit.c:528
+#: src/prefs_filter_edit.c:534
 msgid "doesn't match to regex"
 msgstr "不符合正規表示式"
 
-#: src/prefs_filter_edit.c:539
+#: src/prefs_filter_edit.c:545
 msgid "is larger than"
 msgstr "大於"
 
-#: src/prefs_filter_edit.c:540
+#: src/prefs_filter_edit.c:546
 msgid "is smaller than"
 msgstr "小於"
 
-#: src/prefs_filter_edit.c:549
+#: src/prefs_filter_edit.c:555
 msgid "is longer than"
 msgstr "長於"
 
-#: src/prefs_filter_edit.c:550
+#: src/prefs_filter_edit.c:556
 msgid "is shorter than"
 msgstr "短於"
 
-#: src/prefs_filter_edit.c:560
+#: src/prefs_filter_edit.c:566
 msgid "matches to status"
 msgstr ""
 
-#: src/prefs_filter_edit.c:561
+#: src/prefs_filter_edit.c:567
 #, fuzzy
 msgid "doesn't match to status"
 msgstr "不符合正規表示式"
 
-#: src/prefs_filter_edit.c:663
+#: src/prefs_filter_edit.c:669
 msgid "Move to"
 msgstr "移動到"
 
-#: src/prefs_filter_edit.c:664
+#: src/prefs_filter_edit.c:670
 msgid "Copy to"
 msgstr "複製到"
 
-#: src/prefs_filter_edit.c:665
+#: src/prefs_filter_edit.c:671
 msgid "Don't receive"
 msgstr "拒絕接收此郵件"
 
-#: src/prefs_filter_edit.c:666
+#: src/prefs_filter_edit.c:672
 msgid "Delete from server"
 msgstr "自伺服器上刪除"
 
-#: src/prefs_filter_edit.c:669
+#: src/prefs_filter_edit.c:675
 msgid "Set mark"
 msgstr "設定標記"
 
-#: src/prefs_filter_edit.c:670
+#: src/prefs_filter_edit.c:676
 msgid "Set color"
 msgstr "設定顏色"
 
-#: src/prefs_filter_edit.c:671
+#: src/prefs_filter_edit.c:677
 msgid "Mark as read"
 msgstr "標記成已讀"
 
-#: src/prefs_filter_edit.c:675 src/prefs_toolbar.c:59
+#: src/prefs_filter_edit.c:681 src/prefs_toolbar.c:59
 msgid "Forward"
 msgstr "轉寄"
 
-#: src/prefs_filter_edit.c:676
+#: src/prefs_filter_edit.c:682
 msgid "Forward as attachment"
 msgstr "將郵件當成附加檔轉寄"
 
-#: src/prefs_filter_edit.c:677
+#: src/prefs_filter_edit.c:683
 msgid "Redirect"
 msgstr "郵件導向"
 
-#: src/prefs_filter_edit.c:681
+#: src/prefs_filter_edit.c:687
 msgid "Execute command"
 msgstr "執行命令"
 
-#: src/prefs_filter_edit.c:684
+#: src/prefs_filter_edit.c:690
 msgid "Stop rule evaluation"
 msgstr "停止檢查規則"
 
-#: src/prefs_filter_edit.c:690 src/prefs_filter_edit.c:1053
+#: src/prefs_filter_edit.c:696 src/prefs_filter_edit.c:1059
 msgid "folder:"
 msgstr "資料夾："
 
-#: src/prefs_filter_edit.c:1014
+#: src/prefs_filter_edit.c:1020
 msgid "day(s)"
 msgstr "天"
 
-#: src/prefs_filter_edit.c:1093
+#: src/prefs_filter_edit.c:1099
 msgid "address:"
 msgstr "地址："
 
-#: src/prefs_filter_edit.c:1510
+#: src/prefs_filter_edit.c:1516
 msgid "Edit header list"
 msgstr "編輯郵件標頭清單"
 
-#: src/prefs_filter_edit.c:1533
+#: src/prefs_filter_edit.c:1539
 msgid "Headers"
 msgstr "郵件標頭"
 
-#: src/prefs_filter_edit.c:1545
+#: src/prefs_filter_edit.c:1551
 msgid "Header:"
 msgstr "郵件標頭："
 
-#: src/prefs_filter_edit.c:1732 src/prefs_filter_edit.c:1830
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1738 src/prefs_filter_edit.c:1836
+#: src/prefs_filter_edit.c:1843
 msgid "Command is not specified."
 msgstr "未設定執行指令。"
 
-#: src/prefs_filter_edit.c:1810 src/prefs_filter_edit.c:1817
+#: src/prefs_filter_edit.c:1816 src/prefs_filter_edit.c:1823
 msgid "Destination folder is not specified."
 msgstr "目的資料夾未設定。"
 
-#: src/prefs_filter_edit.c:1887
+#: src/prefs_filter_edit.c:1893
 msgid "Invalid condition exists."
 msgstr "有不合法的條件。"
 
-#: src/prefs_filter_edit.c:1910
+#: src/prefs_filter_edit.c:1916
 msgid "Rule name is not specified."
 msgstr "沒有指定規則名稱。"
 
-#: src/prefs_filter_edit.c:1936
+#: src/prefs_filter_edit.c:1942
 msgid "Invalid action exists."
 msgstr "有不合法的執行指令。"
 
-#: src/prefs_filter_edit.c:1945
+#: src/prefs_filter_edit.c:1951
 msgid "Condition not exist."
 msgstr "未設定條件。"
 
-#: src/prefs_filter_edit.c:1947
+#: src/prefs_filter_edit.c:1953
 msgid "Action not exist."
 msgstr "指定的指令不存在。"
 
@@ -5918,7 +5919,7 @@ msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "回覆時刪除郵件主旨前面的中括號 [] 或小括號 ()"
 
 #: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
-#: src/prefs_toolbar.c:95 src/progressdialog.c:128
+#: src/prefs_toolbar.c:95 src/progressdialog.c:129
 msgid "Account"
 msgstr "帳號"
 
@@ -5967,19 +5968,19 @@ msgid "Attachment"
 msgstr "附加檔案"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:318
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/rpop3.c:330
 #: src/summaryview.c:5082
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:319
+#: src/prefs_summary_column.c:76 src/query_search.c:402 src/rpop3.c:331
 #: src/summaryview.c:5085
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:320
+#: src/prefs_summary_column.c:77 src/query_search.c:403 src/rpop3.c:332
 #: src/summaryview.c:5087
 msgid "Date"
 msgstr "日期"
@@ -6257,10 +6258,15 @@ msgstr ""
 msgid "Creating progress dialog...\n"
 msgstr "正在建立進度對話框...\n"
 
-#: src/progressdialog.c:136
+#: src/progressdialog.c:137
 msgid "Status"
 msgstr "狀態"
 
+#: src/progressdialog.c:145
+#, fuzzy
+msgid "Progress"
+msgstr "內容"
+
 #: src/query_search.c:425
 #, fuzzy
 msgid "_Save as search folder"
@@ -6291,7 +6297,7 @@ msgstr "掃描資料夾 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/query_search.c:696 src/rpop3.c:528 src/summaryview.c:2195
+#: src/query_search.c:696 src/rpop3.c:573 src/summaryview.c:2195
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6359,88 +6365,93 @@ msgstr "產生簽章於 %s\n"
 msgid "Error verifying the signature"
 msgstr "檢查簽章時發生錯誤"
 
-#: src/rpop3.c:267
+#: src/rpop3.c:277
 #, fuzzy, c-format
 msgid "%s - Remote POP3 mailbox"
 msgstr "移除信箱"
 
-#: src/rpop3.c:317 src/summaryview.c:5091
+#: src/rpop3.c:329 src/summaryview.c:5091
 msgid "No."
 msgstr "No."
 
-#: src/rpop3.c:339
+#: src/rpop3.c:351
 #, fuzzy
 msgid "_Get"
 msgstr "檢查郵件"
 
-#: src/rpop3.c:388
+#: src/rpop3.c:400
 #, fuzzy, c-format
 msgid "Connecting to %s:%d ..."
 msgstr "連線到 SMTP 伺服器 %s..."
 
-#: src/rpop3.c:393 src/rpop3.c:447 src/rpop3.c:450
+#: src/rpop3.c:405 src/rpop3.c:459 src/rpop3.c:462
 #, fuzzy, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/rpop3.c:421 src/rpop3.c:427 src/rpop3.c:454 src/rpop3.c:456
+#: src/rpop3.c:433 src/rpop3.c:439 src/rpop3.c:466 src/rpop3.c:468
 #, fuzzy
 msgid "Error occurred during POP3 session."
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
-#: src/rpop3.c:424
+#: src/rpop3.c:436
 #, fuzzy, c-format
 msgid ""
 "Error occurred during POP3 session:\n"
 "%s"
 msgstr "使用 POP3 通訊協定時發生錯誤\n"
 
-#: src/rpop3.c:542
+#: src/rpop3.c:587
 #, fuzzy, c-format
 msgid "Retrieving message headers (%d / %d) ..."
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: src/rpop3.c:700
+#: src/rpop3.c:747
 #, fuzzy
 msgid "Getting the number of messages..."
 msgstr "取得新郵件的數量中"
 
-#: src/rpop3.c:709 src/rpop3.c:722
+#: src/rpop3.c:756 src/rpop3.c:769
 #, fuzzy
 msgid "No message"
 msgstr "沒有新郵件。"
 
-#: src/rpop3.c:755
+#: src/rpop3.c:802
 #, fuzzy, c-format
 msgid "Deleted %d messages"
 msgstr "刪除郵件"
 
-#: src/rpop3.c:832
+#: src/rpop3.c:840 src/rpop3.c:852 src/rpop3.c:900 src/rpop3.c:1087
+#: src/send_message.c:830
+msgid "Quitting..."
+msgstr "離開中..."
+
+#: src/rpop3.c:885
 #, fuzzy, c-format
 msgid "Retrieved %d messages"
 msgstr "取得新郵件中"
 
-#: src/rpop3.c:839
+#: src/rpop3.c:892
 #, fuzzy, c-format
 msgid "Opened message %d"
 msgstr "送出郵件"
 
-#: src/rpop3.c:854
+#: src/rpop3.c:908
 #, fuzzy, c-format
 msgid "Retrieved %d message headers"
 msgstr "取得新郵件中"
 
-#: src/rpop3.c:959
+#: src/rpop3.c:1013
 #, fuzzy, c-format
 msgid "Retrieving message %d ..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/rpop3.c:985
+#: src/rpop3.c:1039
 #, fuzzy
 msgid "Delete messages"
 msgstr "刪除郵件"
 
-#: src/rpop3.c:986
+#: src/rpop3.c:1040
 msgid ""
 "Really delete selected messages from server?\n"
 "This operation cannot be reverted."
@@ -6558,24 +6569,25 @@ msgstr "送出 RCPT TO 標頭..."
 msgid "Sending DATA..."
 msgstr "送出郵件資料 DATA..."
 
-#: src/send_message.c:830
-msgid "Quitting..."
-msgstr "離開中..."
-
 #: src/send_message.c:858
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "送出新郵件 (%d / %d 位元組)"
 
-#: src/send_message.c:889
+#: src/send_message.c:863
+#, c-format
+msgid "%d / %d bytes"
+msgstr ""
+
+#: src/send_message.c:892
 msgid "Sending message"
 msgstr "送出郵件"
 
-#: src/send_message.c:934 src/send_message.c:958
+#: src/send_message.c:937 src/send_message.c:961
 msgid "Error occurred while sending the message."
 msgstr "送信時發生錯誤。"
 
-#: src/send_message.c:937
+#: src/send_message.c:940
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6584,12 +6596,12 @@ msgstr ""
 "送信時發生錯誤：\n"
 "%s"
 
-#: src/send_message.c:954
+#: src/send_message.c:957
 #, fuzzy
 msgid "Can't connect to SMTP server."
 msgstr "無法連線到新聞伺服器：%s:%d\n"
 
-#: src/send_message.c:956
+#: src/send_message.c:959
 #, fuzzy, c-format
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "無法連線到新聞伺服器：%s:%d\n"
@@ -7199,6 +7211,12 @@ msgstr "離開"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Done (no new messages)"
+#~ msgstr "完成（無新郵件）"
+
+#~ msgid "Retrieving (%d message(s) (%s) received)"
+#~ msgstr "取得新郵件 (共 %d 封新郵件, %s 已接收）"
+
 #, fuzzy
 #~ msgid "Can't sign the message"
 #~ msgstr "無法放進暫存資料夾。"