2005-10-29 [paul] 1.9.15cvs126

	* src/crash.c
	* src/foldersel.c
	* src/main.c
	* src/messageview.c
	* src/toolbar.c
	* src/gtk/authors.h
		corrections to text items

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index df529955d58cbb501f63deede1bdc41dcd65adbb..3ceb399d970c99543432ba192a16d02f7df718ce 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,13 @@
+2005-10-29 [paul]      1.9.15cvs126
+
+       * src/crash.c
+       * src/foldersel.c
+       * src/main.c
+       * src/messageview.c
+       * src/toolbar.c
+       * src/gtk/authors.h
+               corrections to text items
+

 2005-10-28 [colin]     1.9.15cvs125
 
        * src/messageview.c
 2005-10-28 [colin]     1.9.15cvs125
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 664ec0cb8ebf48f503bf367de5448ababac378aa..0efab9f507e48599474e1cca02a01777da336904 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -962,3 +962,4 @@
 ( cvs diff -u -r 1.3.2.31 -r 1.3.2.32 src/prefs_themes.c;  ) > 1.9.15cvs123.patchset
 ( cvs diff -u -r 1.395.2.144 -r 1.395.2.145 src/summaryview.c;  ) > 1.9.15cvs124.patchset
 ( cvs diff -u -r 1.94.2.67 -r 1.94.2.68 src/messageview.c;  ) > 1.9.15cvs125.patchset
 ( cvs diff -u -r 1.3.2.31 -r 1.3.2.32 src/prefs_themes.c;  ) > 1.9.15cvs123.patchset
 ( cvs diff -u -r 1.395.2.144 -r 1.395.2.145 src/summaryview.c;  ) > 1.9.15cvs124.patchset
 ( cvs diff -u -r 1.94.2.67 -r 1.94.2.68 src/messageview.c;  ) > 1.9.15cvs125.patchset

+( cvs diff -u -r 1.23.2.15 -r 1.23.2.16 src/crash.c;  cvs diff -u -r 1.26.2.20 -r 1.26.2.21 src/foldersel.c;  cvs diff -u -r 1.115.2.64 -r 1.115.2.65 src/main.c;  cvs diff -u -r 1.94.2.68 -r 1.94.2.69 src/messageview.c;  cvs diff -u -r 1.43.2.32 -r 1.43.2.33 src/toolbar.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/authors.h;  ) > 1.9.15cvs126.patchset

diff --git a/configure.ac b/configure.ac
index e79b1318226a5eeaf60b161657bb4333e2cc3119..f0beb8fa93ab7c58be7f6b940c0867cd53a7c086 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=125
+EXTRA_VERSION=126

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/crash.c b/src/crash.c
index ba57ff136f62380a37f6eb0e77a8feae54b35e0a..b2012558b804c18b4529afe11bb5c9bfb3af3044 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -139,7 +139,7 @@ void crash_main(const char *arg)
        tokens = g_strsplit(arg, ",", 0);
 
        pid = atol(tokens[0]);
        tokens = g_strsplit(arg, ",", 0);
 
        pid = atol(tokens[0]);

-       text = g_strdup_printf(_("Sylpheed process (%ld) received signal %ld"),
+       text = g_strdup_printf(_("Sylpheed-Claws process (%ld) received signal %ld"),

                               pid, atol(tokens[1]));
 
        output = g_string_new("");     
                               pid, atol(tokens[1]));
 
        output = g_string_new("");     


@@ -185,7 +185,7 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
 
        window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width(GTK_CONTAINER(window1), 5);
 
        window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width(GTK_CONTAINER(window1), 5);

-       gtk_window_set_title(GTK_WINDOW(window1), _("Sylpheed has crashed"));
+       gtk_window_set_title(GTK_WINDOW(window1), _("Sylpheed-Claws has crashed"));

        gtk_window_set_position(GTK_WINDOW(window1), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window1), TRUE);
        gtk_window_set_default_size(GTK_WINDOW(window1), 460, 272);
        gtk_window_set_position(GTK_WINDOW(window1), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window1), TRUE);
        gtk_window_set_default_size(GTK_WINDOW(window1), 460, 272);


@@ -223,7 +223,7 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
        gtk_container_add(GTK_CONTAINER(scrolledwindow1), text1);
        
        crash_report = g_strdup_printf(
        gtk_container_add(GTK_CONTAINER(scrolledwindow1), text1);
        
        crash_report = g_strdup_printf(

-               "Sylpheed version %s\nGTK+ version %d.%d.%d\nFeatures:%s\nOperating system: %s\nC Library: %s\n--\n%s",
+               "Sylpheed-Claws version %s\nGTK+ version %d.%d.%d\nFeatures:%s\nOperating system: %s\nC Library: %s\n--\n%s",

                VERSION,
                gtk_major_version, gtk_minor_version, gtk_micro_version,
                get_compiled_in_features(),
                VERSION,
                gtk_major_version, gtk_minor_version, gtk_micro_version,
                get_compiled_in_features(),

diff --git a/src/foldersel.c b/src/foldersel.c
index 05fd39f2ff80ce63f16ed539836499cdce642d5b..1af72d5c58cfbb60e0a2bcad150c519cf5cfdb25 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -221,7 +221,7 @@ static void foldersel_create(void)
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
        gtk_window_set_wmclass
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
        gtk_window_set_wmclass

-               (GTK_WINDOW(window), "folder_selection", "Sylpheed");
+               (GTK_WINDOW(window), "folder_selection", "Sylpheed-Claws");

        gtk_widget_realize(window);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);
        gtk_widget_realize(window);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 6300b830f9892ffa0d36000a38f9d8fe9035915c..738d5db382b6e92e93313a2097b7b8bee3485cec 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -1,13 +1,13 @@
 static char *TEAM_LIST[] = {
 static char *TEAM_LIST[] = {

-"Holger Berndt <berndth@users.sourceforge.net>",
-"Hoà Viêt Dinh <hoa@users.sourceforge.net>",
-"Darko Koruga <darko@users.sourceforge.net>",
-"Ricardo Mones Lastra <mones@users.sourceforge.net>",
-"Colin Leroy <colinleroy@users.sourceforge.net>",
-"Thorsten Maerz <netztorte@users.sourceforge.net>",
-"Paul Mangan <twb@users.sourceforge.net>",
-"Martin Schaaf <mascha1@users.sourceforge.net>",
-"wwp <wwp@users.sourceforge.net>",
+"Holger Berndt <berndth@users.sf.net>",
+"Hoà Viêt Dinh <hoa@users.sf.net>",
+"Darko Koruga <darko@users.sf.net>",
+"Ricardo Mones Lastra <mones@users.sf.net>",
+"Colin Leroy <colinleroy@users.sf.net>",
+"Thorsten Maerz <netztorte@users.sf.net>",
+"Paul Mangan <twb@users.sf.net>",
+"Martin Schaaf <mascha1@users.sf.net>",
+"wwp <wwp@users.sf.net>",

 NULL
 };
 
 NULL
 };
 


@@ -31,28 +31,29 @@ static char *TRANS_TEAM_LIST[] = {
 "[bg] George Danchev <danchev@spnet.net>",
 "[ca] Miquel Oliete <miqueloliete@softhome.net>",
 "[de] Thomas Gilgin <thg1@karate-muellheim.de>",
 "[bg] George Danchev <danchev@spnet.net>",
 "[ca] Miquel Oliete <miqueloliete@softhome.net>",
 "[de] Thomas Gilgin <thg1@karate-muellheim.de>",

-"[en_GB] Paul Mangan <claws@thewildbeast.co.uk>",
-"[es] Ricardo Mones Lastra <mones@aic.uniovi.es>",
+"[en_GB] Paul Mangan <twb@users.sf.net>",
+"[es] Ricardo Mones Lastra <mones@users.sf.net>",

 "[fi] Flammie Pirinen <flammie@iki.fi>",
 "[fr] Fabien Vantard <fzzzzz@gmail.com>",
 "[hr] Dragan <drleskov@inet.hr>",
 "[it] Andrea Spadaccini <a.spadaccini@catania.linux.it>",
 "[ja] Rui Hirokawa <rui_hirokawa@ybb.ne.jp>",
 "[ko] SungHyun Nam <namsh@kldp.org>",
 "[fi] Flammie Pirinen <flammie@iki.fi>",
 "[fr] Fabien Vantard <fzzzzz@gmail.com>",
 "[hr] Dragan <drleskov@inet.hr>",
 "[it] Andrea Spadaccini <a.spadaccini@catania.linux.it>",
 "[ja] Rui Hirokawa <rui_hirokawa@ybb.ne.jp>",
 "[ko] SungHyun Nam <namsh@kldp.org>",

-"[nb] Geir Helland <pjallabais@users.sourceforge.net>",
+"[nb] Geir Helland <pjallabais@users.sf.net>",

 "[pl] Emilian Nowak <eminowbl@posejdon.wpk.p.lodz.pl>",
 "[pt_BR] Frederico Goncalves Guimaraes <fggdebian@yahoo.com.br>",
 "[ru] Pavlo Bohmat <bohm@ukr.net>",
 "[sk] Andrej Kacian <andrej@kacian.sk>",
 "[pl] Emilian Nowak <eminowbl@posejdon.wpk.p.lodz.pl>",
 "[pt_BR] Frederico Goncalves Guimaraes <fggdebian@yahoo.com.br>",
 "[ru] Pavlo Bohmat <bohm@ukr.net>",
 "[sk] Andrej Kacian <andrej@kacian.sk>",

-"[sr] Urke MMI <urke@users.sourceforge.net>",
+"[sr] Aleksandar Urosevic <urke@users.sf.net>",

 "[zh_CN] Hansom Young <hyoung@operamail.com>",
 "[zh_TW] Wei-Lun Chao <chaoweilun@pcmail.com.tw>",
 NULL
 };
 
 static char *DOC_TEAM_LIST[] = {
 "[zh_CN] Hansom Young <hyoung@operamail.com>",
 "[zh_TW] Wei-Lun Chao <chaoweilun@pcmail.com.tw>",
 NULL
 };
 
 static char *DOC_TEAM_LIST[] = {

-"Ricardo Mones Lastra <mones@users.sourceforge.net>",
-"Paul Mangan <twb@users.sourceforge.net>",
+"Ricardo Mones Lastra <mones@users.sf.net>",
+"Colin Leroy <colinleroy@users.sf.net>",
+"Paul Mangan <twb@users.sf.net>",

 NULL
 };
 
 NULL
 };
 


@@ -194,7 +195,7 @@ static char *CONTRIBS_LIST[] = {
 "Takahashi",
 "Tanaka",
 "shigeri",
 "Takahashi",
 "Tanaka",
 "shigeri",

-"Shimamoto \"Neko\"Tatsuya",
+"Shimamoto \"Neko\" Tatsuya",

 "Thorsten Thielen",
 "Edgar Toernig",
 "Masahiro Tomita",
 "Thorsten Thielen",
 "Edgar Toernig",
 "Masahiro Tomita",

diff --git a/src/main.c b/src/main.c
index 99bb0b222714dec9540aeaec78bbbcc0d2d461b2..a778dea282803a09207cc24cf3d70478638c42a4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -675,7 +675,7 @@ static void parse_cmd_opt(int argc, char *argv[])
                } else if (!strncmp(argv[i], "--send", 6)) {
                        cmd.send = TRUE;
                } else if (!strncmp(argv[i], "--version", 9)) {
                } else if (!strncmp(argv[i], "--send", 6)) {
                        cmd.send = TRUE;
                } else if (!strncmp(argv[i], "--version", 9)) {

-                       puts("Sylpheed version " VERSION);
+                       puts("Sylpheed-Claws version " VERSION);

                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
                        const gchar *p = argv[i + 1];
                        exit(0);
                } else if (!strncmp(argv[i], "--status-full", 13)) {
                        const gchar *p = argv[i + 1];

diff --git a/src/messageview.c b/src/messageview.c
index 2ae84f9490055ba40b0d7c5d34c06264758e43cf..5774e2f4e8fb95792947b66d377882e41fb8b071 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -775,7 +775,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        
        if (messageview->window)
                gtk_window_set_title(GTK_WINDOW(messageview->window), 
        
        if (messageview->window)
                gtk_window_set_title(GTK_WINDOW(messageview->window), 

-                               _("Sylpheed - Message View"));
+                               _("Sylpheed-Claws - Message View"));

        if (messageview->window && msginfo->subject) {
                subject = g_strdup(msginfo->subject);
                if (!g_utf8_validate(subject, -1, NULL)) {
        if (messageview->window && msginfo->subject) {
                subject = g_strdup(msginfo->subject);
                if (!g_utf8_validate(subject, -1, NULL)) {

diff --git a/src/toolbar.c b/src/toolbar.c
index 5c1fb447d4f409b3c6d57a0909730c15f7c8add4..4ac5e12dce62df629215877eee75547b7fbf044b 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -187,7 +187,7 @@ struct {
 #ifdef USE_ASPELL
        { "A_CHECK_SPELLING",   N_("Check spelling")                       },
 #endif
 #ifdef USE_ASPELL
        { "A_CHECK_SPELLING",   N_("Check spelling")                       },
 #endif

-       { "A_SYL_ACTIONS",      N_("Sylpheed Actions Feature")             }, 
+       { "A_SYL_ACTIONS",      N_("Sylpheed-Claws Actions Feature")       }, 

        { "A_SEPARATOR",        "Separator"                             }
 };
 
        { "A_SEPARATOR",        "Separator"                             }
 };