added 'Cancel all' button to the incorporation dialog.

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

1 files changed, 52 insertions, 47 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2f25c19f..564ec45d 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: 2010-07-30 13:04+0900\n"
+"POT-Creation-Date: 2010-07-30 13:37+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"
@@ -1242,7 +1242,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:737
+#: src/alertpanel.c:168 src/inc.c:746
 msgid "Error"
 msgstr "錯誤"
 
@@ -2866,157 +2866,162 @@ msgstr "將 LDIF 檔匯入通訊錄"
 msgid "Attributes"
 msgstr "屬性"
 
-#: src/inc.c:160
+#: src/inc.c:163
 #, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "Sylpheed: %d 封新郵件"
 
-#: src/inc.c:481
+#: src/inc.c:484
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:507
+#: src/inc.c:511
 msgid "Retrieving new messages"
 msgstr "取得新郵件中"
 
-#: src/inc.c:550
+#: src/inc.c:513
+#, fuzzy
+msgid "Cancel _all"
+msgstr "取消"
+
+#: src/inc.c:559
 msgid "Standby"
 msgstr "等待處理中"
 
-#: src/inc.c:693 src/inc.c:743
+#: src/inc.c:702 src/inc.c:752
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:704
+#: src/inc.c:713
 msgid "Retrieving"
 msgstr "讀取中"
 
-#: src/inc.c:713 src/inc.c:1022
+#: src/inc.c:722 src/inc.c:1031
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "完成 （已接收 %d 封郵件 (%s)）"
 
-#: src/inc.c:717
+#: src/inc.c:726
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "沒有新郵件。"
 
-#: src/inc.c:718
+#: src/inc.c:727
 #, fuzzy
 msgid "Done"
 msgstr "完成"
 
-#: src/inc.c:723
+#: src/inc.c:732
 msgid "Connection failed"
 msgstr "連線失敗。"
 
-#: src/inc.c:726
+#: src/inc.c:735
 msgid "Auth failed"
 msgstr "認證失敗"
 
-#: src/inc.c:730
+#: src/inc.c:739
 msgid "Locked"
 msgstr "已鎖定"
 
-#: src/inc.c:740
+#: src/inc.c:749
 msgid "Timeout"
 msgstr "逾時"
 
-#: src/inc.c:787
+#: src/inc.c:796
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成（%d 封新郵件）"
 
-#: src/inc.c:790
+#: src/inc.c:799
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完成（無新郵件）"
 
-#: src/inc.c:799
+#: src/inc.c:808
 msgid "Some errors occurred while getting mail."
 msgstr "取得郵件時發生錯誤。"
 
-#: src/inc.c:833
+#: src/inc.c:842
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "取得 %s 的新郵件中, 請稍候...\n"
 
-#: src/inc.c:837
+#: src/inc.c:846
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "認證中..."
 
-#: src/inc.c:840
+#: src/inc.c:849
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: 取得新郵件中, 請稍候..."
 
-#: src/inc.c:845
+#: src/inc.c:854
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "連線到 POP3 伺服器 %s 中..."
 
-#: src/inc.c:859
+#: src/inc.c:868
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "無法連線到 POP3 伺服器：%s:%d\n"
 
-#: src/inc.c:941 src/rpop3.c:827 src/send_message.c:817
+#: src/inc.c:950 src/rpop3.c:827 src/send_message.c:817
 #, c-format
 msgid "Authenticating..."
 msgstr "認證"
 
-#: src/inc.c:942
+#: src/inc.c:951
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "從 %s 中取得郵件中..."
 
-#: src/inc.c:947
+#: src/inc.c:956
 msgid "Getting the number of new messages (STAT)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:951
+#: src/inc.c:960
 msgid "Getting the number of new messages (LAST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:955
+#: src/inc.c:964
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:959
+#: src/inc.c:968
 msgid "Getting the size of messages (LIST)..."
 msgstr "取得新郵件的數量中"
 
-#: src/inc.c:969
+#: src/inc.c:978
 #, c-format
 msgid "Deleting message %d"
 msgstr "刪除第 %d 號郵件"
 
-#: src/inc.c:976 src/send_message.c:835
+#: src/inc.c:985 src/send_message.c:835
 msgid "Quitting"
 msgstr "離開"
 
-#: src/inc.c:1001
+#: src/inc.c:1010
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
+#: src/inc.c:1250 src/inc.c:1273 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1323
+#: src/inc.c:1332
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/inc.c:1329
+#: src/inc.c:1338
 msgid "Error occurred while processing mail."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/inc.c:1334
+#: src/inc.c:1343
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3025,40 +3030,40 @@ msgstr ""
 "處理郵件時發生錯誤：\n"
 "%s"
 
-#: src/inc.c:1340
+#: src/inc.c:1349
 msgid "No disk space left."
 msgstr "磁碟空間已滿。"
 
-#: src/inc.c:1345
+#: src/inc.c:1354
 msgid "Can't write file."
 msgstr "無法寫入檔案。"
 
-#: src/inc.c:1350
+#: src/inc.c:1359
 msgid "Socket error."
 msgstr "Socket 有錯誤"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1356 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
+#: src/inc.c:1365 src/rpop3.c:544 src/rpop3.c:545 src/send_message.c:761
 #: src/send_message.c:978
 msgid "Connection closed by the remote host."
 msgstr "遠端主機關閉連線。"
 
-#: src/inc.c:1362
+#: src/inc.c:1371
 msgid "Mailbox is locked."
 msgstr "信箱已被鎖定，可能前一次擷取未完成。"
 
-#: src/inc.c:1366
+#: src/inc.c:1375
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "信箱已被鎖定：%s"
 
-#: src/inc.c:1372 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
+#: src/inc.c:1381 src/rpop3.c:519 src/rpop3.c:524 src/send_message.c:958
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: src/inc.c:1377 src/rpop3.c:521 src/send_message.c:961
+#: src/inc.c:1386 src/rpop3.c:521 src/send_message.c:961
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3067,15 +3072,15 @@ msgstr ""
 "認證失敗：\n"
 "%s"
 
-#: src/inc.c:1382 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
+#: src/inc.c:1391 src/rpop3.c:549 src/rpop3.c:550 src/send_message.c:982
 msgid "Session timed out."
 msgstr "作業逾時"
 
-#: src/inc.c:1423
+#: src/inc.c:1432
 msgid "Incorporation cancelled\n"
 msgstr "動作已取消\n"
 
-#: src/inc.c:1525
+#: src/inc.c:1541
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "從 %s 中取得郵件放入 %s...\n"