2006-11-06 [wwp] 2.6.0cvs4

	* src/prefs_msg_colors.c
		more uses of Q_ macro for contextual translations, thanks
		to Fabien (fzzzzz).

diff --git a/ChangeLog b/ChangeLog
index 233b768141a70dd1817cb82a00358af6ff135991..80ca31287b50604fb7c1d1a669fa886dd6a14ac1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-06 [wwp]       2.6.0cvs4
+
+       * src/prefs_msg_colors.c
+               more uses of Q_ macro for contextual translations, thanks
+               to Fabien (fzzzzz).
+
 2006-11-06 [wwp]       2.6.0cvs3
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 0aedf5d2dfc45e35a86668883b646a2a6b392411..a415d6cfb82e6b4e90728216dfabd4ee9ff7bb01 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2028,3 +2028,4 @@
 ( cvs diff -u -r 1.12.2.33 -r 1.12.2.34 src/prefs_template.c;  ) > 2.6.0cvs1.patchset
 ( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_quote.c;  cvs diff -u -r 1.12.2.34 -r 1.12.2.35 src/prefs_template.c;  cvs diff -u -r 1.1.16.2 -r 1.1.16.3 src/prefs_template.h;  ) > 2.6.0cvs2.patchset
 ( cvs diff -u -r 1.382.2.321 -r 1.382.2.322 src/compose.c;  cvs diff -u -r 1.36.2.86 -r 1.36.2.87 src/common/utils.c;  cvs diff -u -r 1.20.2.40 -r 1.20.2.41 src/common/utils.h;  ) > 2.6.0cvs3.patchset
+( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_msg_colors.c;  ) > 2.6.0cvs4.patchset

diff --git a/configure.ac b/configure.ac
index b896f1424ecec13cb0ddcc344ab0ede7f9734263..34a96a2bdfd77ae7671aee8aa941dfad4e4b15f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index 1eb4814684d0a1e7638ce45b2ad0d1390199e262..3cf8a4e74410991545ce65447558ee0bd3ebdefe 100644 (file)
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -445,7 +445,7 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        for (c = 0; c < 4; c++) {
                /* TRANSLATORS: 'color %d' refers to the filtering/processing 
                   rule name and should not be translated */
-               tooltip_btn_text = g_strdup_printf(_("Pick color for 'color %d'"), c+1);
+               tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
 
                /* TRANSLATORS: 'color %d' refers to the filtering/processing 
                   rule name and should not be translated */
@@ -477,7 +477,7 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        for (c = 4; c < COLORLABELS; c++) {
                /* TRANSLATORS: 'color %d' refers to the filtering/processing 
                   rule name and should not be translated */
-               tooltip_btn_text = g_strdup_printf(_("Pick color for 'color %d'"), c+1);
+               tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
 
                /* TRANSLATORS: 'color %d' refers to the filtering/processing 
                   rule name and should not be translated */
@@ -609,7 +609,7 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
                if (GPOINTER_TO_INT(type) == c) {
                        /* TRANSLATORS: 'color %d' refers to the filtering/processing 
                           rule name and should not be translated */
-                       title = g_strdup_printf(_("Pick color for 'color %d' "), c+1);
+                       title = g_strdup_printf(Q_("Dialog title|Pick color for 'color %d'"), c+1);
                        rgbvalue = prefs_common.custom_colorlabel[c].color;
                        break;
                }