CVS: sylpheed-claws/src prefs_account.c,1.105.2.54,1.105.2.55 prefs_msg_colors.c,1.1.2.24,1.1.2.25

Update of /cvsroot/sylpheed-claws/sylpheed-claws/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17694/src

Modified Files:
      Tag: gtk2
	prefs_account.c prefs_msg_colors.c 
Log Message:
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 

Index: prefs_account.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/prefs_account.c,v
retrieving revision 1.105.2.54
retrieving revision 1.105.2.55
diff -u -r1.105.2.54 -r1.105.2.55
--- prefs_account.c	20 Apr 2006 16:46:32 -0000	1.105.2.54
+++ prefs_account.c	27 Apr 2006 09:13:40 -0000	1.105.2.55
@@ -2046,15 +2046,15 @@
 	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"));
 

Index: prefs_msg_colors.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/prefs_msg_colors.c,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- prefs_msg_colors.c	25 Apr 2006 16:59:46 -0000	1.1.2.24
+++ prefs_msg_colors.c	27 Apr 2006 09:13:40 -0000	1.1.2.25
@@ -604,43 +604,45 @@
 	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"));



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642