new icon plus sync and English improvements
authorPaul Mangan <paul@claws-mail.org>
Mon, 18 Jun 2001 08:51:02 +0000 (08:51 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 18 Jun 2001 08:51:02 +0000 (08:51 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
src/Makefile.am
src/mainwindow.c
src/pixmaps/stock_news_compose.xpm [new file with mode: 0644]
src/summaryview.c

index 944ca44..ee9c07f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-18
+
+       * src/mainwindow.c
+         src/summaryview.c
+         src/prefs_common.c: improvements to the English (thanks to Paul
+         Mangan).
+
 2001-06-17
 
        * src/procmsg.c: procmsg_msg_list_free(): fixed a bug that didn't
index f23cd4f..e523a21 100644 (file)
@@ -1,3 +1,18 @@
+2001-06-18 [paul]
+
+        * src/pixmaps/stock_news_compose.xpm: new file
+        * src/Makefile.am
+        * src/mainwindow.c
+        * src/summaryview.c
+                Added new icon for Hoa's 'compose a news
+                message', plus minor improvements to the
+                English
+
+        * po/ja.po
+        * ChangeLog
+        * ChangeLog.jp
+                more sync with sylpheed 0.5.0pre1
+
 2001-06-18 [hoa]
 
        * src/compose.[ch]
index f991807..aee57ae 100644 (file)
@@ -1,3 +1,9 @@
+2001-06-18
+
+       * src/mainwindow.c
+         src/summaryview.c
+         src/prefs_common.c: ±Ñ¸ìɽ¸½¤Î²þÁ±(Paul Mangan ¤µ¤ó thanks)¡£
+
 2001-06-17
 
        * src/procmsg.c: procmsg_msg_list_free(): ¥ê¥¹¥È¤òÀµ¤·¤¯²òÊü¤·¤Æ
index 85dfd0e..9fa0c10 100644 (file)
@@ -117,6 +117,7 @@ EXTRA_DIST = \
        pixmaps/stock_mail_receive_all.xpm \
        pixmaps/stock_mail_send.xpm \
        pixmaps/stock_mail_compose.xpm \
+        pixmaps/stock_news_compose.xpm \
        pixmaps/stock_mail_reply.xpm \
        pixmaps/stock_mail_reply_to_all.xpm \
        pixmaps/stock_mail_reply_to_author.xpm \
index b46419b..527669a 100644 (file)
@@ -480,7 +480,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/Send queued messa_ges"),
                                                NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Compose a _new mail"),   "<alt>N", compose_mail_cb, 0, NULL},
+       {N_("/_Message/Compose a_n email message"),     "<alt>N", compose_mail_cb, 0, NULL},
        {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},
        {N_("/_Message/_Reply"),                "<alt>R",       reply_cb, COMPOSE_REPLY, NULL},
        {N_("/_Message/Repl_y to sender"),      "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
@@ -1413,6 +1413,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
 #include "pixmaps/stock_mail_receive.xpm"
 #include "pixmaps/stock_mail_receive_all.xpm"
 #include "pixmaps/stock_mail_compose.xpm"
+#include "pixmaps/stock_news_compose.xpm"
 #include "pixmaps/stock_mail_reply.xpm"
 #include "pixmaps/stock_mail_reply_to_all.xpm"
 #include "pixmaps/stock_mail_reply_to_author.xpm"
@@ -1466,13 +1467,13 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        CREATE_TOOLBAR_ICON(stock_mail_receive_xpm);
        get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                          _("Get"),
-                                         _("Incorporate new mail"),
+                                         _("Get new mail from current account"),
                                          "Get",
                                          icon_wid, toolbar_inc_cb, mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_receive_all_xpm);
        getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                             _("Get all"),
-                                            _("Incorporate new mail of all accounts"),
+                                            _("Get new mail from all accounts"),
                                             "Get all",
                                             icon_wid,
                                             toolbar_inc_all_cb,
@@ -1493,15 +1494,15 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 
        CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
        compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                             _("New mail"),
-                                             _("Compose a new mail"),
+                                             _("Compose email"),
+                                             _("Compose an email message"),
                                              "New",
                                              icon_wid,
                                              toolbar_compose_mail_cb,
                                              mainwin);
-       CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
+       CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
        compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                             _("New news"),
+                                             _("Compose news"),
                                              _("Compose a news message"),
                                              "New",
                                              icon_wid,
diff --git a/src/pixmaps/stock_news_compose.xpm b/src/pixmaps/stock_news_compose.xpm
new file mode 100644 (file)
index 0000000..0ccc3c0
--- /dev/null
@@ -0,0 +1,146 @@
+/* XPM */
+static char * stock_news_compose_xpm[] = {
+"24 24 119 2",
+"      c None",
+".     c #000000",
+"+     c #7B7B78",
+"@     c #C7C7C3",
+"#     c #F1F0EB",
+"$     c #BFBFBC",
+"%     c #5F5E5E",
+"&     c #E3E3DF",
+"*     c #F3F3EF",
+"=     c #F2F2EE",
+"-     c #F1F1EC",
+";     c #F0EFEB",
+">     c #D2D2CD",
+",     c #969592",
+"'     c #616060",
+")     c #B5B5B4",
+"!     c #F8F8F6",
+"~     c #F7F7F5",
+"{     c #F6F6F3",
+"]     c #F5F5F2",
+"^     c #F4F4F0",
+"/     c #F2F1ED",
+"(     c #F1F0EC",
+"_     c #F0EFEA",
+":     c #EFEEE9",
+"<     c #4F4F4D",
+"[     c #BDBCB8",
+"}     c #A7A6A3",
+"|     c #C6C6C4",
+"1     c #7C7C7B",
+"2     c #525251",
+"3     c #DBDBD9",
+"4     c #F5F4F1",
+"5     c #F4F3F0",
+"6     c #F3F2EE",
+"7     c #999894",
+"8     c #62625F",
+"9     c #BCBCB6",
+"0     c #EBE9E3",
+"a     c #838381",
+"b     c #D7D6D4",
+"c     c #A8A8A6",
+"d     c #515150",
+"e     c #7E7D7C",
+"f     c #DAD9D5",
+"g     c #EFEEE8",
+"h     c #EEEDE7",
+"i     c #4F4E4C",
+"j     c #BCBBB6",
+"k     c #EBE9E2",
+"l     c #EAE8E1",
+"m     c #F6F5F2",
+"n     c #F4F3EF",
+"o     c #B5B4B1",
+"p     c #9B9A97",
+"q     c #646361",
+"r     c #92918E",
+"s     c #EEEDE8",
+"t     c #EDECE6",
+"u     c #4E4E4C",
+"v     c #797976",
+"w     c #797874",
+"x     c #E9E8E1",
+"y     c #E8E7DF",
+"z     c #B4B3AF",
+"A     c #D0D0CD",
+"B     c #F2F2ED",
+"C     c #BFBEBA",
+"D     c #BEBDB9",
+"E     c #7A7A77",
+"F     c #979691",
+"G     c #EAE9E2",
+"H     c #959590",
+"I     c #787773",
+"J     c #B8B7B0",
+"K     c #E6E4DC",
+"L     c #D8BE6A",
+"M     c #A9A9A6",
+"N     c #626260",
+"O     c #ECEBE4",
+"P     c #EBEAE3",
+"Q     c #E9E7E0",
+"R     c #E8E6DF",
+"S     c #E7E5DD",
+"T     c #777671",
+"U     c #93918C",
+"V     c #8E7D45",
+"W     c #BEBDB8",
+"X     c #989793",
+"Y     c #ECEAE4",
+"Z     c #E8E6DE",
+"`     c #E6E4DB",
+" .    c #E4E3DA",
+"..    c #EEECE7",
+"+.    c #62615F",
+"@.    c #EBEAE4",
+"#.    c #E7E6DE",
+"$.    c #E6E5DC",
+"%.    c #E5E4DB",
+"&.    c #E4E2DA",
+"*.    c #B6B5B2",
+"=.    c #BCBCB7",
+"-.    c #CDCCC6",
+";.    c #959490",
+">.    c #B8B7B2",
+",.    c #61615E",
+"'.    c #9C9B96",
+").    c #B5B5AE",
+"!.    c #CECDC7",
+"~.    c #848480",
+"{.    c #907E46",
+"].    c #5E532E",
+"^.    c #282827",
+"/.    c #969590",
+"(.    c #483F23",
+"_.    c #1D1D1C",
+":.    c #7B7A76",
+"<.    c #261F0A",
+"[.    c #4E4015",
+"                                                ",
+"                                                ",
+"                          . . . .               ",
+"                . . . . . + @ # $ .             ",
+"      . . . . . % $ & * = - ; > , .             ",
+"    . ' ) ! ~ { ] ^ * / ( _ : < [ } .           ",
+"    . | 1 2 3 4 5 6 / # _ : 7 8 9 0 .           ",
+"    . a b c d e f / # _ g h i j k l .           ",
+"      . m 4 n o p q r s t u v w x y z .   .     ",
+"      . A * B ( ; C D E u F G H I J K . . L .   ",
+"      . M / ( _ : N t O P l Q R S T U . L V .   ",
+"        . # _ g W X Y 0 l Q Z S `  .. L V .     ",
+"        . ; g ..+.@.G x y #.$.%.&.. L V .       ",
+"        . *.t =.F G x y #.K -.;.. L V .         ",
+"          . >.,.'.).R !.~.. . . {.]..           ",
+"  . .     . ^./.. . . . . . . (.. . .   . . . . ",
+"  . .     . _.:.. . .     . L V .       .     . ",
+"  . . .   . . . . . .   . . V . .       .     . ",
+"  .   .   . .   .   . <.[.. .   .       . . . . ",
+"  .     . . .   .     . . .     .       .       ",
+"  .     . . .   .       . .     .       .       ",
+"  .       . .   .       . .     .       .       ",
+"                                                ",
+"                                                "};
index 8fc4e6e..ed8fc8d 100644 (file)
@@ -2125,7 +2125,7 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
                CHANGE_FLAGS(msginfo);
                
                summary_set_row_marks(summaryview, row);
-               debug_print(_("Message %d is marked as being read\n"),
+               debug_print(_("Message %d is marked as read\n"),
                            msginfo->msgnum);
        }
 }