completed sync of sylpheed cvs2

diff --git a/ChangeLog b/ChangeLog
index 785be9dbd8bad21e7f4ba1774029f587161b266f..d540e7b78b63bba16edca8c39014b4b856bfa977 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
          src/pop.c
          src/recv.c: removed non-blocking socket mode support since it
          does nothing.
+       * src/pop.c
+         src/inc.c: modified the messages of incorporation dialog.
 
 2001-05-02
 

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0e8bd3c76ef311b607c22d0e2741fbedbbbc8931..a169e82b437bae2bf0f7d2b0961a70bba37ed175 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -23,6 +23,7 @@
 
 2001-05-03 [alfons]
 
+       * completed sync of sylpheed cvs2
        * src/gtkstext.c: updated row up / down cursor navigation
        * src/textview.c: re-edited, prepared for fixing the email address
                scanner.

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 196a502195bdf16f908053492905366e44d3e6cb..6078094fcf2716cf7699dcd05176939849b2caa2 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -4,6 +4,8 @@
          src/pop.c
          src/recv.c: ¥Î¥ó¥Ö¥í¥Ã¥­¥ó¥°¥½¥±¥Ã¥È¥â¡¼¥É¤ÎÂбþ¤òºï½ü(Ìò¤Ë
          Ω¤Ã¤Æ¤¤¤Ê¤¤¤Î¤Ç)¡£
+       * src/pop.c
+         src/inc.c: ¼õ¿®¥À¥¤¥¢¥í¥°¤Î¥á¥Ã¥»¡¼¥¸¤ò½¤Àµ¡£
 
 2001-05-02
 

diff --git a/po/ja.po b/po/ja.po
index bb46c1986b18697d18ae6f952a4b4158cac87777..c673af3fbb167e71f027f2871ef2e14727fdf264 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
-"POT-Creation-Date: 2001-05-01 18:07+0900\n"
+"POT-Creation-Date: 2001-05-03 13:29+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -1323,44 +1323,56 @@ msgstr "POP3
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "POP3¥µ¡¼¥Ð: %s:%d ¤ËÀܳ¤Ç¤­¤Þ¤»¤ó"
 
-#: src/inc.c:683 src/inc.c:722
+#: src/inc.c:683 src/inc.c:733
 #, c-format
 msgid "Retrieving message (%d / %d) (%d / %d bytes)"
 msgstr "¥á¥Ã¥»¡¼¥¸¤ò¼õ¿®Ãæ (%d / %d) (%d / %d bytes)"
 
 #: src/inc.c:708
-msgid "Authorizing"
-msgstr "ǧ¾ÚÃæ"
+msgid "Authorizing..."
+msgstr "ǧ¾ÚÃæ..."
 
-#: src/inc.c:717
-msgid "Getting number of new messages"
-msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ò¼èÆÀÃæ"
+#: src/inc.c:713
+msgid "Getting the number of new messages (STAT)..."
+msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ò¼èÆÀÃæ (STAT)..."
 
-#: src/inc.c:733
+#: src/inc.c:718
+msgid "Getting the number of new messages (LAST)..."
+msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ò¼èÆÀÃæ (LAST)..."
+
+#: src/inc.c:723
+msgid "Getting the number of new messages (UIDL)..."
+msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¤Î¿ô¤ò¼èÆÀÃæ (UIDL)..."
+
+#: src/inc.c:728
+msgid "Getting the size of messages (LIST)..."
+msgstr "¥á¥Ã¥»¡¼¥¸¤Î¥µ¥¤¥º¤ò¼èÆÀÃæ (LIST)..."
+
+#: src/inc.c:744
 msgid "Deleting message"
 msgstr "¥á¥Ã¥»¡¼¥¸¤òºï½üÃæ"
 
-#: src/inc.c:737
+#: src/inc.c:748
 msgid "Quitting"
 msgstr "ÀÚÃÇÃæ"
 
-#: src/inc.c:765
+#: src/inc.c:776
 msgid "a message won't be received\n"
 msgstr "¥á¥Ã¥»¡¼¥¸¤Ï¼õ¿®¤µ¤ì¤Þ¤»¤ó\n"
 
-#: src/inc.c:792
+#: src/inc.c:803
 msgid "Error occurred while processing mail."
 msgstr "¥á¡¼¥ë¤Î½èÍýÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
-#: src/inc.c:795
+#: src/inc.c:806
 msgid "No disk space left."
 msgstr "¥Ç¥£¥¹¥¯¤Î¶õ¤­ÍÆÎ̤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: src/inc.c:846
+#: src/inc.c:857
 msgid "no messages in local mailbox.\n"
 msgstr "¥í¡¼¥«¥ë¤Î¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ë¤Ï¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/inc.c:857
+#: src/inc.c:868
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "¿·¤·¤¤¥á¥Ã¥»¡¼¥¸¤ò %s ¤«¤é %s ¤Ë¼è¤ê¹þ¤ó¤Ç¤¤¤Þ¤¹...\n"
@@ -2342,7 +2354,7 @@ msgstr "ɬ
 msgid "Timestamp syntax error in greeting\n"
 msgstr "±þÅú¥á¥Ã¥»¡¼¥¸¤Î¥¿¥¤¥à¥¹¥¿¥ó¥×¤Îʸˡ¥¨¥é¡¼\n"
 
-#: src/pop.c:171 src/pop.c:208
+#: src/pop.c:171 src/pop.c:212
 msgid "POP3 protocol error\n"
 msgstr "POP3 ¥×¥í¥È¥³¥ë¥¨¥é¡¼\n"
 
@@ -3302,11 +3314,11 @@ msgstr "
 msgid "Creating progress dialog...\n"
 msgstr "¿Ê¹Ô¾õ¶·¥À¥¤¥¢¥í¥°¤òºîÀ®Ãæ...\n"
 
-#: src/recv.c:110
+#: src/recv.c:106
 msgid "error occurred while retrieving data.\n"
 msgstr "¥Ç¡¼¥¿¤Î¼èÆÀÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
 
-#: src/recv.c:135 src/recv.c:180 src/recv.c:196
+#: src/recv.c:130 src/recv.c:167 src/recv.c:182
 msgid "Can't write to file.\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó¡£\n"
 

diff --git a/src/inc.c b/src/inc.c
index 14f00ba9f6146004df6561317361bd5edda20d8c..324ebf518b61f1728c0578e24644897d1586495b 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -708,16 +708,27 @@ void inc_progress_update(Pop3State *state, Pop3Phase phase)
        case POP3_GETAUTH_PASS_RECV:
        case POP3_GETAUTH_APOP_SEND:
        case POP3_GETAUTH_APOP_RECV:
-               progress_dialog_set_label(dialog, _("Authorizing"));
+               progress_dialog_set_label(dialog, _("Authorizing..."));         
                break;
        case POP3_GETRANGE_STAT_SEND:
        case POP3_GETRANGE_STAT_RECV:
+               progress_dialog_set_label
+                       (dialog, _("Getting the number of new messages (STAT)..."));
+               break;
        case POP3_GETRANGE_LAST_SEND:
        case POP3_GETRANGE_LAST_RECV:
+               progress_dialog_set_label
+                       (dialog, _("Getting the number of new messages (LAST)..."));
+               break;
        case POP3_GETRANGE_UIDL_SEND:
        case POP3_GETRANGE_UIDL_RECV:
-               progress_dialog_set_label(dialog,
-                                         _("Getting number of new messages"));
+               progress_dialog_set_label
+                       (dialog, _("Getting the number of new messages (UIDL)..."));
+               break;
+       case POP3_GETSIZE_LIST_SEND:
+       case POP3_GETSIZE_LIST_RECV:
+               progress_dialog_set_label
+                       (dialog, _("Getting the size of messages (LIST)..."));
                break;
        case POP3_RETR_SEND:
        case POP3_RETR_RECV:

diff --git a/src/pop.c b/src/pop.c
index fe36191363e59fbcf1a38400ba0abd1d5eb81b6f..7ae10d5db0baa0bf68b73ddc9342b92b5ddd0742 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -191,6 +191,10 @@ gint pop3_getrange_stat_recv(SockInfo *sock, gpointer data)
 
 gint pop3_getrange_last_send(SockInfo *sock, gpointer data)
 {
+       Pop3State *state = (Pop3State *)data;
+
+       inc_progress_update(state, POP3_GETRANGE_LAST_SEND);
+
        pop3_gen_send(sock, "LAST");
 
        return POP3_GETRANGE_LAST_RECV;
@@ -222,6 +226,10 @@ gint pop3_getrange_last_recv(SockInfo *sock, gpointer data)
 
 gint pop3_getrange_uidl_send(SockInfo *sock, gpointer data)
 {
+       Pop3State *state = (Pop3State *)data;
+
+       inc_progress_update(state, POP3_GETRANGE_UIDL_SEND);
+
        pop3_gen_send(sock, "UIDL");
 
        return POP3_GETRANGE_UIDL_RECV;
@@ -268,6 +276,10 @@ gint pop3_getrange_uidl_recv(SockInfo *sock, gpointer data)
 
 gint pop3_getsize_list_send(SockInfo *sock, gpointer data)
 {
+       Pop3State *state = (Pop3State *)data;
+
+       inc_progress_update(state, POP3_GETSIZE_LIST_SEND);
+
        pop3_gen_send(sock, "LIST");
 
        return POP3_GETSIZE_LIST_RECV;