+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
( 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
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=36
+EXTRA_VERSION=37
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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);
}
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;
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) {
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"));
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"));