2006-04-12 [wwp] 2.1.0cvs34

	* src/prefs_common.c
	* src/prefs_msg_colors.c
		make default color labels translatable,
		patch from Fabien Vantard <fzzzzz@gmail.com>,
		thanks to Tim <timbrain@post.cz> for reporting.

diff --git a/ChangeLog b/ChangeLog
index 3dc249eeeaf496b5983bda050a4cf8b684fa2960..5155f332c82d8cde05df141e044c7cb58c19e7c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-12 [wwp]       2.1.0cvs34
+
+       * src/prefs_common.c
+       * src/prefs_msg_colors.c
+               make default color labels translatable,
+               patch from Fabien Vantard <fzzzzz@gmail.com>,
+               thanks to Tim <timbrain@post.cz> for reporting.
+

 2006-04-12 [wwp]       2.1.0cvs33
 
        * manual/glossary.xml
 2006-04-12 [wwp]       2.1.0cvs33
 
        * manual/glossary.xml

diff --git a/PATCHSETS b/PATCHSETS
index bdc02830b069f973bbd21e0ff889389481ef675b..bc2f3b68d3785f7cbdd05edea51d4817cab1c3e9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1405,3 +1405,4 @@
 ( cvs diff -u -r 1.382.2.262 -r 1.382.2.263 src/compose.c;  ) > 2.1.0cvs31.patchset
 ( cvs diff -u -r 1.10.2.18 -r 1.10.2.19 src/prefs_gtk.c;  ) > 2.1.0cvs32.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/glossary.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/intro.xml;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/plugins.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/starting.xml;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/sylpheed-claws-manual.xml;  diff -u /dev/null manual/fr/.cvsignore;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/account.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/ack.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/addrbook.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/advanced.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/faq.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/glossary.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/handling.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/intro.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/keyboard.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/plugins.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/starting.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/sylpheed-claws-manual.xml;  ) > 2.1.0cvs33.patchset
 ( cvs diff -u -r 1.382.2.262 -r 1.382.2.263 src/compose.c;  ) > 2.1.0cvs31.patchset
 ( cvs diff -u -r 1.10.2.18 -r 1.10.2.19 src/prefs_gtk.c;  ) > 2.1.0cvs32.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/glossary.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/intro.xml;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 manual/plugins.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/starting.xml;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/sylpheed-claws-manual.xml;  diff -u /dev/null manual/fr/.cvsignore;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/account.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/ack.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/addrbook.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/advanced.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/faq.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/glossary.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/handling.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/intro.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/keyboard.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/fr/plugins.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/starting.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/fr/sylpheed-claws-manual.xml;  ) > 2.1.0cvs33.patchset

+( cvs diff -u -r 1.204.2.84 -r 1.204.2.85 src/prefs_common.c;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/prefs_msg_colors.c;  ) > 2.1.0cvs34.patchset

diff --git a/configure.ac b/configure.ac
index d323d0b9b9744daec380de410b199ae67dd87db9..10b21ad5b52c5752d444de6d609637c269a2b806 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=33
+EXTRA_VERSION=34

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index b77e3b581000137f97651e0bcdb199cad61ba977..df782f806830c3f6e0ad0d89fd560e0acd74227b 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -288,31 +288,31 @@ static PrefParam param[] = {
        /* custom colors */
        {"custom_color1", "#ff9900", &prefs_common.custom_colorlabel[0].color, P_COLOR,
         NULL, NULL, NULL},
        /* custom colors */
        {"custom_color1", "#ff9900", &prefs_common.custom_colorlabel[0].color, P_COLOR,
         NULL, NULL, NULL},

-       {"custom_colorlabel1", "Orange", &prefs_common.custom_colorlabel[0].label, P_STRING,
+       {"custom_colorlabel1", N_("Orange"), &prefs_common.custom_colorlabel[0].label, P_STRING,

         NULL, NULL, NULL},
        {"custom_color2", "#ff0000", &prefs_common.custom_colorlabel[1].color, P_COLOR,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"custom_color2", "#ff0000", &prefs_common.custom_colorlabel[1].color, P_COLOR,
         NULL, NULL, NULL},

-       {"custom_colorlabel2", "Red", &prefs_common.custom_colorlabel[1].label, P_STRING,
+       {"custom_colorlabel2", N_("Red"), &prefs_common.custom_colorlabel[1].label, P_STRING,

         NULL, NULL, NULL},
        {"custom_color3", "#ff66ff", &prefs_common.custom_colorlabel[2].color, P_COLOR,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"custom_color3", "#ff66ff", &prefs_common.custom_colorlabel[2].color, P_COLOR,
         NULL, NULL, NULL},

-       {"custom_colorlabel3", "Pink", &prefs_common.custom_colorlabel[2].label, P_STRING,
+       {"custom_colorlabel3", N_("Pink"), &prefs_common.custom_colorlabel[2].label, P_STRING,

         NULL, NULL, NULL},
        {"custom_color4", "#00ccff", &prefs_common.custom_colorlabel[3].color, P_COLOR,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"custom_color4", "#00ccff", &prefs_common.custom_colorlabel[3].color, P_COLOR,
         NULL, NULL, NULL},

-       {"custom_colorlabel4", "Sky blue", &prefs_common.custom_colorlabel[3].label, P_STRING,
+       {"custom_colorlabel4", N_("Sky blue"), &prefs_common.custom_colorlabel[3].label, P_STRING,

         NULL, NULL, NULL},
        {"custom_color5", "#0000ff", &prefs_common.custom_colorlabel[4].color, P_COLOR,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"custom_color5", "#0000ff", &prefs_common.custom_colorlabel[4].color, P_COLOR,
         NULL, NULL, NULL},

-       {"custom_colorlabel5", "Blue", &prefs_common.custom_colorlabel[4].label, P_STRING,
+       {"custom_colorlabel5", N_("Blue"), &prefs_common.custom_colorlabel[4].label, P_STRING,

         NULL, NULL, NULL},
        {"custom_color6", "#009900", &prefs_common.custom_colorlabel[5].color, P_COLOR,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"custom_color6", "#009900", &prefs_common.custom_colorlabel[5].color, P_COLOR,
         NULL, NULL, NULL},

-       {"custom_colorlabel6", "Green", &prefs_common.custom_colorlabel[5].label, P_STRING,
+       {"custom_colorlabel6", N_("Green"), &prefs_common.custom_colorlabel[5].label, P_STRING,

         NULL, NULL, NULL},
        {"custom_color7", "#663366", &prefs_common.custom_colorlabel[6].color, P_COLOR,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"custom_color7", "#663366", &prefs_common.custom_colorlabel[6].color, P_COLOR,
         NULL, NULL, NULL},

-       {"custom_colorlabel7", "Brown", &prefs_common.custom_colorlabel[6].label, P_STRING,
+       {"custom_colorlabel7", N_("Brown"), &prefs_common.custom_colorlabel[6].label, P_STRING,

         NULL, NULL, NULL},
 
        /* image viewer */
         NULL, NULL, NULL},
 
        /* image viewer */

diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index b7cf2f2660037e54dca4521292bf5cb8ef8df8e7..d3b2471b70971614a9331f507060acd8bd6ab52e 100644 (file)
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -429,7 +429,7 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
                set_button_bg_color(color_buttons.custom_color[c],
                                    prefs_common.custom_colorlabel[c].color);
                gtk_entry_set_text(GTK_ENTRY (custom_colorlabel_entry[c]), 
                set_button_bg_color(color_buttons.custom_color[c],
                                    prefs_common.custom_colorlabel[c].color);
                gtk_entry_set_text(GTK_ENTRY (custom_colorlabel_entry[c]), 

-                                  SAFE_STRING (prefs_common.custom_colorlabel[c].label));
+                                  gettext(SAFE_STRING (prefs_common.custom_colorlabel[c].label)));

        }
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_enablecol),
        }
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_enablecol),


@@ -686,7 +686,7 @@ static void prefs_msg_colors_reset_custom_colors(GtkWidget *widget, gpointer dat
                set_button_bg_color(color_buttons.custom_color[c],
                                                        prefs_common.custom_colorlabel[c].color);
                gtk_entry_set_text(GTK_ENTRY (page->custom_colorlabel_entry[c]),
                set_button_bg_color(color_buttons.custom_color[c],
                                                        prefs_common.custom_colorlabel[c].color);
                gtk_entry_set_text(GTK_ENTRY (page->custom_colorlabel_entry[c]),

-                                                       SAFE_STRING (colorlabel_get_color_default_text(c)));
+                                                       gettext(SAFE_STRING (colorlabel_get_color_default_text(c))));

        }
 
 #undef CR
        }
 
 #undef CR