2006-04-27 [paul] 2.1.1cvs37

	* src/prefs_account.c
		improve privacy labels
	* src/prefs_msg_colors.c
		change some strings for translators' convenience
	* src/gtk/gtkutils.c
		don't underline the link button text

diff --git a/ChangeLog b/ChangeLog
index 63abee88dcf93dc7fa750faf832cb13c4646e307..a95f18834155542f76286cf3c80d03e78f5851f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-27 [paul]      2.1.1cvs37
+
+       * src/prefs_account.c
+               improve privacy labels
+       * src/prefs_msg_colors.c
+               change some strings for translators' convenience
+       * src/gtk/gtkutils.c
+               don't underline the link button text
+
 2006-04-25 [colin]     2.1.1cvs36
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index fdc4d7b3555fa5747f45264efc5ed5378fa374a6..88eadd7207db86b3a65c696b188ae1f392510bcb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1458,3 +1458,4 @@
 ( cvs diff -u -r 1.53.2.16 -r 1.53.2.17 po/POTFILES.in;  cvs diff -u -r 1.382.2.268 -r 1.382.2.269 src/compose.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/image_viewer.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_msg_colors.c;  cvs diff -u -r 1.13.2.20 -r 1.13.2.21 src/common/socket.c;  cvs diff -u -r 1.9.2.39 -r 1.9.2.40 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.29 -r 1.5.2.30 src/gtk/pluginwindow.c;  cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/gtk/prefswindow.c;  cvs diff -u -r 1.18.2.33 -r 1.18.2.34 src/plugins/spamassassin/spamassassin.c;  ) > 2.1.1cvs34.patchset
 ( cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/editldap.c;  ) > 2.1.1cvs35.patchset
 ( cvs diff -u -r 1.213.2.90 -r 1.213.2.91 src/folder.c;  ) > 2.1.1cvs36.patchset
+( cvs diff -u -r 1.105.2.54 -r 1.105.2.55 src/prefs_account.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_msg_colors.c;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/gtk/gtkutils.c;  ) > 2.1.1cvs37.patchset

diff --git a/configure.ac b/configure.ac
index c5e56e7801c8e7fab5bfd8362046602b6c8353f3..2ed119f7ea118dd7f16f31de81ea604c391a1783 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=36
+EXTRA_VERSION=37
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 9231a9bcc6585faba0a2777a6f48bdb05c8151cb..94552fc41f98d3d848d67754544c190f3698bf89 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1186,7 +1186,7 @@ static void link_btn_enter(GtkButton *button, gpointer data)
                gdk_window_set_cursor(window->window, hand_cursor);
 
        gtk_button_set_relief(button, GTK_RELIEF_NONE);
-       gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_NORMAL);
+       gtk_widget_set_state(GTK_WIDGET(button), GTK_STATE_PRELIGHT);
        
 }
 
@@ -1236,7 +1236,6 @@ GtkWidget *gtkut_get_link_btn(GtkWidget *window, const gchar *url, const gchar *
        GdkColormap *cmap;
        GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
        gboolean success[2];
-       gchar *underlined = NULL;
        gchar *local_url = NULL;
        if (!url)
                return NULL;
@@ -1246,12 +1245,9 @@ GtkWidget *gtkut_get_link_btn(GtkWidget *window, const gchar *url, const gchar *
        gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
                                               &uri_color[1]);
 
-       underlined = g_markup_printf_escaped("<u>%s</u>", label?label:url);
-       btn = gtk_button_new_with_label(underlined);
-       g_free(underlined);
+       btn = gtk_button_new_with_label(label?label:url);
        gtk_button_set_relief(GTK_BUTTON(btn), GTK_RELIEF_NONE);
        btn_label = GTK_BIN(btn)->child;
-       gtk_label_set_use_markup(GTK_LABEL(btn_label), TRUE);
        cmap = gdk_drawable_get_colormap(window->window);
        gdk_colormap_alloc_colors(cmap, uri_color, 2, FALSE, TRUE, success);
        if (success[0] == TRUE && success[1] == TRUE) {

diff --git a/src/prefs_account.c b/src/prefs_account.c
index db38949db016e7604e31a504e4d15fa94daf02fc..fefb173304c81ccb2120c2f70d0c7b56108323db 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2046,15 +2046,15 @@ static void prefs_account_privacy_create(void)
        gtk_widget_show (default_privacy_system);
        gtk_box_pack_start (GTK_BOX(hbox1), default_privacy_system, FALSE, TRUE, 0);
 
+       PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
+                          _("Always sign messages"));
        PACK_CHECK_BUTTON (vbox2, default_encrypt_chkbtn,
-                          _("Encrypt message by default"));
+                          _("Always encrypt messages"));
        PACK_CHECK_BUTTON (vbox2, default_encrypt_reply_chkbtn,
-                          _("Encrypt message by default when replying to an "
+                          _("Always encrypt messages when replying to an "
                             "encrypted message"));
-       PACK_CHECK_BUTTON (vbox2, default_sign_chkbtn,
-                          _("Sign message by default"));
        PACK_CHECK_BUTTON (vbox2, encrypt_to_self_chkbtn,
-                          _("Encrypt sent messages to myself too"));
+                          _("Encrypt sent messages with your own key in addition to recipient's"));
        PACK_CHECK_BUTTON (vbox2, save_clear_text_chkbtn,
                           _("Save sent encrypted messages as clear text"));
 

diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index 9d9343b1d3b7e60ceda5d5e368d07a51bad17295..1eb4814684d0a1e7638ce45b2ad0d1390199e262 100644 (file)
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -604,43 +604,45 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
        gint c;
 
        /* custom colors */
+       /* leave the extra space at the end of the title, this is for translators' convenience */
        for (c = 0; c < COLORLABELS; c++) {
                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(_("Pick color for 'color %d' "), c+1);
                        rgbvalue = prefs_common.custom_colorlabel[c].color;
                        break;
                }
        }
        /* other colors */
+       /* leave the extra space at the end of the titles, this is for translators' convenience */
        if (c == COLORLABELS) {
                if(g_ascii_strcasecmp(type, "LEVEL1") == 0) {
-                       title = g_strdup(_("Pick color for quotation level 1"));
+                       title = g_strdup(_("Pick color for 1st level text "));
                        rgbvalue = prefs_common.quote_level1_col;
                } else if(g_ascii_strcasecmp(type, "LEVEL2") == 0) {
-                       title = g_strdup(_("Pick color for quotation level 2"));
+                       title = g_strdup(_("Pick color for 2nd level text "));
                        rgbvalue = prefs_common.quote_level2_col;
                } else if(g_ascii_strcasecmp(type, "LEVEL3") == 0) {
-                       title = g_strdup(_("Pick color for quotation level 3"));
+                       title = g_strdup(_("Pick color for 3rd level text "));
                        rgbvalue = prefs_common.quote_level3_col;
                } else if(g_ascii_strcasecmp(type, "LEVEL1BG") == 0) {
-                       title = g_strdup(_("Pick color for quotation level 1 background"));
+                       title = g_strdup(_("Pick color for 1st level text background "));
                        rgbvalue = prefs_common.quote_level1_bgcol;
                } else if(g_ascii_strcasecmp(type, "LEVEL2BG") == 0) {
-                       title = g_strdup(_("Pick color for quotation level 2 background"));
+                       title = g_strdup(_("Pick color for 2nd level text background "));
                        rgbvalue = prefs_common.quote_level2_bgcol;
                } else if(g_ascii_strcasecmp(type, "LEVEL3BG") == 0) {
-                       title = g_strdup(_("Pick color for quotation level 3 background"));
+                       title = g_strdup(_("Pick color for 3rd level text background "));
                        rgbvalue = prefs_common.quote_level3_bgcol;
                } else if(g_ascii_strcasecmp(type, "URI") == 0) {
-                       title = g_strdup(_("Pick color for URI"));
+                       title = g_strdup(_("Pick color for links "));
                        rgbvalue = prefs_common.uri_col;
                } else if(g_ascii_strcasecmp(type, "TGTFLD") == 0) {
                        title = g_strdup(_("Pick color for target folder"));
                        rgbvalue = prefs_common.tgt_folder_col;
                } else if(g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
-                       title = g_strdup(_("Pick color for signatures"));
+                       title = g_strdup(_("Pick color for signatures "));
                        rgbvalue = prefs_common.signature_col;
                } else if(g_ascii_strcasecmp(type, "NEW") == 0) {
                        title = g_strdup(_("Pick color for folder"));