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/ko.po b/po/ko.po
index 518aa77a..7723e122 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\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: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -1236,7 +1236,7 @@ msgstr "알림"
 msgid "Warning"
 msgstr "경고"
 
-#: src/alertpanel.c:168 src/inc.c:737
+#: src/alertpanel.c:168 src/inc.c:746
 msgid "Error"
 msgstr "에러"
 
@@ -2899,214 +2899,219 @@ 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
 #, 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
 #, fuzzy, 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 "%s:%d POP3 서버에 연결할 수가 없습니다\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
 #, fuzzy, c-format
 msgid "Retrieving messages from %s..."
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr "메일을 처리하는 도중 에러"
 
-#: 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 "소켓 에러."
 
 #. 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
 #, fuzzy, c-format
 msgid ""
 "Mailbox is locked:\n"
 "%s"
 msgstr "메일박스가 잠겨있습니다."
 
-#: 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
 #, fuzzy
 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
 #, fuzzy, c-format
 msgid ""
 "Authentication failed:\n"
 "%s"
 msgstr "인증 방법"
 
-#: 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"