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_CN.po b/po/zh_CN.po
index 2958565d..1261b18d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\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-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -1237,7 +1237,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:737
+#: src/alertpanel.c:168 src/inc.c:746
 msgid "Error"
 msgstr "错误"
 
@@ -2865,156 +2865,161 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Attributes"
 msgstr "属性"
 
-#: src/inc.c:160
+#: src/inc.c:163
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%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
 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 "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:951
+#: src/inc.c:960
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:955
+#: src/inc.c:964
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:959
+#: src/inc.c:968
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: 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"
@@ -3023,29 +3028,29 @@ 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"
@@ -3054,11 +3059,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%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"