[Commits] account.c 1.61.2.106 1.61.2.107 addrcustomattr.c 1.1.2.13 1.1.2.14 edittags.c 1.1.2.30 1.1.2.31 prefs_filtering.c 1.59.2.93 1.59.2.94 prefs_matcher.c 1.43.2.98 1.43.2.99 prefs_msg_colors.c 1.1.2.49 1.1.2.50 toolbar.c 1.43.2.131 1.43.2.132 uri_opener.c 1.1.2.18 1.1.2.19 wizard.c 1.1.2.88 1.1.2.89

ticho at claws-mail.org ticho at claws-mail.org
Sat Nov 17 00:42:17 CET 2012


Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv14523/src

Modified Files:
      Tag: gtk2
	account.c addrcustomattr.c edittags.c prefs_filtering.c 
	prefs_matcher.c prefs_msg_colors.c toolbar.c uri_opener.c 
	wizard.c 
Log Message:
2012-11-16 [ticho]	3.9.0cvs11

	* src/account.c
	* src/addrcustomattr.c
	* src/edittags.c
	* src/prefs_filtering.c
	* src/prefs_matcher.c
	* src/prefs_msg_colors.c
	* src/toolbar.c
	* src/uri_opener.c
	* src/wizard.c
	* src/common/utils.c
	* src/gtk/about.c
		Use pgettext() and friends for i18n context strings, instead of
		having a pipe character in msgid for context separation. This uses
		glib's C_ macro, instead of Q_.

Index: edittags.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/edittags.c,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -d -r1.1.2.30 -r1.1.2.31
--- edittags.c	16 Sep 2012 21:56:20 -0000	1.1.2.30
+++ edittags.c	16 Nov 2012 23:42:14 -0000	1.1.2.31
@@ -526,7 +526,7 @@
 
 	window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "tag_apply_window");
 	gtk_window_set_title (GTK_WINDOW(window),
-			      Q_("Dialog title|Apply tags"));
+			      C_("Dialog title", "Apply tags"));
 
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 	gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);

Index: addrcustomattr.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/addrcustomattr.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- addrcustomattr.c	19 Sep 2012 12:22:24 -0000	1.1.2.13
+++ addrcustomattr.c	16 Nov 2012 23:42:14 -0000	1.1.2.14
@@ -466,7 +466,7 @@
 
 	window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "custom_attr_edit_window");
 	gtk_window_set_title (GTK_WINDOW(window),
-			      Q_("Dialog title|Edit attribute names"));
+			      C_("Dialog title", "Edit attribute names"));
 
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 	gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);

Index: uri_opener.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/uri_opener.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- uri_opener.c	8 Sep 2012 20:23:11 -0000	1.1.2.18
+++ uri_opener.c	16 Nov 2012 23:42:14 -0000	1.1.2.19
@@ -178,7 +178,7 @@
 
 	window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "uri_opener");
 	gtk_window_set_title (GTK_WINDOW(window),
-			      Q_("Dialog title|Open URLs"));
+			      C_("Dialog title", "Open URLs"));
 
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 	gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);

Index: account.c
===================================================================
RCS file: /home/claws-mail/claws/src/account.c,v
retrieving revision 1.61.2.106
retrieving revision 1.61.2.107
diff -u -d -r1.61.2.106 -r1.61.2.107
--- account.c	7 Jul 2012 07:09:26 -0000	1.61.2.106
+++ account.c	16 Nov 2012 23:42:14 -0000	1.61.2.107
@@ -1534,7 +1534,7 @@
 		     "activatable", TRUE,
 		      NULL);
 	column = gtk_tree_view_column_new_with_attributes
-		(Q_("Accounts List Get Column Name|G"), renderer,
+		(C_("Accounts List Get Column Name", "G"), renderer,
 		 "active", ACCOUNT_ENABLE_GET_ALL,
 		 NULL);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);		

Index: prefs_matcher.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_matcher.c,v
retrieving revision 1.43.2.98
retrieving revision 1.43.2.99
diff -u -d -r1.43.2.98 -r1.43.2.99
--- prefs_matcher.c	16 Nov 2012 16:10:08 -0000	1.43.2.98
+++ prefs_matcher.c	16 Nov 2012 23:42:14 -0000	1.43.2.99
@@ -695,7 +695,7 @@
 	
 	/* address header name */
 	header_addr_combo = combobox_text_new(TRUE,
-			      Q_("Filtering Matcher Menu|All"), _("Any"),
+			      C_("Filtering Matcher Menu", "All"), _("Any"),
 			      "From", "To", "Cc", "Reply-To", "Sender", NULL);
 	gtk_box_pack_start(GTK_BOX(match_hbox), header_addr_combo, FALSE, FALSE, 0);
 	header_addr_entry = gtk_bin_get_child(GTK_BIN((header_addr_combo)));
@@ -1578,7 +1578,7 @@
 		if (*expr == '\0') {
 			gchar *tmp;
 
-			if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
+			if (g_utf8_collate(header, C_("Filtering Matcher Menu", "All")) == 0)
 				tmp = g_strdup(_("all addresses in all headers"));
 			else
 			if (g_utf8_collate(header, _("Any")) == 0)
@@ -1593,7 +1593,7 @@
 		    return NULL;
 		}
 		/* store UNtranslated "Any"/"All" in matcher expressions */
-		if (g_utf8_collate(header, Q_("Filtering Matcher Menu|All")) == 0)
+		if (g_utf8_collate(header, C_("Filtering Matcher Menu", "All")) == 0)
 			header = "All";
 		else
 			if (g_utf8_collate(header, _("Any")) == 0)
@@ -2466,7 +2466,7 @@
 		/* matcher expressions contain UNtranslated "Any"/"All",
 		  select the relevant translated combo item */
 		if (strcasecmp(prop->header, "All") == 0)
-			header = (gchar*)Q_("Filtering Matcher Menu|All");
+			header = (gchar*)C_("Filtering Matcher Menu", "All");
 		else
 			if (strcasecmp(prop->header, "Any") == 0)
 				header = _("Any");

Index: wizard.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/wizard.c,v
retrieving revision 1.1.2.88
retrieving revision 1.1.2.89
diff -u -d -r1.1.2.88 -r1.1.2.89
--- wizard.c	7 Jul 2012 07:09:30 -0000	1.1.2.88
+++ wizard.c	16 Nov 2012 23:42:14 -0000	1.1.2.89
@@ -536,7 +536,7 @@
 	get_rfc822_date(buf_date, sizeof(buf_date));
 
 	conv_encode_header_full(enc_subject, sizeof(enc_subject), 
-			Q_("Welcome Mail Subject|Welcome to Claws Mail"),
+			C_("Welcome Mail Subject", "Welcome to Claws Mail"),
 			strlen("Subject: "), FALSE, CS_INTERNAL);
 	conv_encode_header_full(enc_to_name, sizeof(enc_to_name), 
 			gtk_entry_get_text(GTK_ENTRY(wizard->full_name)),

Index: prefs_filtering.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering.c,v
retrieving revision 1.59.2.93
retrieving revision 1.59.2.94
diff -u -d -r1.59.2.93 -r1.59.2.94
--- prefs_filtering.c	16 Sep 2012 21:56:20 -0000	1.59.2.93
+++ prefs_filtering.c	16 Nov 2012 23:42:14 -0000	1.59.2.94
@@ -263,7 +263,7 @@
 
 	cm_return_if_fail(accounts != NULL);
 
-	COMBOBOX_ADD(filtering.account_combobox_list, Q_("Filtering Account Menu|All"), 0);
+	COMBOBOX_ADD(filtering.account_combobox_list, C_("Filtering Account Menu", "All"), 0);
 	COMBOBOX_ADD(filtering.account_combobox_list, NULL, 0);
 	for (; accounts != NULL; accounts = accounts->next) {
 		PrefsAccount *ac = (PrefsAccount *)accounts->data;
@@ -861,7 +861,7 @@
 				account_name = ac_prefs->account_name;
 		}
 		if (account_name == NULL)
-			account_name = (gchar *)Q_("Filtering Account Menu|All");
+			account_name = (gchar *)C_("Filtering Account Menu", "All");
 
 		cond_str = filteringprop_to_string(prop);
 		subst_char(cond_str, '\t', ':');
@@ -975,7 +975,7 @@
 	GtkListStore *list_store;
 	gchar *name = NULL;
 	gint account_id = 0;
-	gchar *account_name = (gchar *)Q_("Filtering Account Menu|All");
+	gchar *account_name = (gchar *)C_("Filtering Account Menu", "All");
 	gboolean enabled = TRUE;
 
 	if (prop)

Index: prefs_msg_colors.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_msg_colors.c,v
retrieving revision 1.1.2.49
retrieving revision 1.1.2.50
diff -u -d -r1.1.2.49 -r1.1.2.50
--- prefs_msg_colors.c	19 Sep 2012 14:48:46 -0000	1.1.2.49
+++ prefs_msg_colors.c	16 Nov 2012 23:42:14 -0000	1.1.2.50
@@ -201,7 +201,7 @@
 	SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level1);
 
 	CLAWS_SET_TIP(color_buttons.btn_quote_level1,
-			     Q_("Tooltip|Pick color for 1st level text"));
+			     C_("Tooltip", "Pick color for 1st level text"));
 
 	hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
 	gtk_widget_show (hbox);
@@ -227,7 +227,7 @@
 	SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level2);
 
 	CLAWS_SET_TIP(color_buttons.btn_quote_level2,
-			     Q_("Tooltip|Pick color for 2nd level text"));
+			     C_("Tooltip", "Pick color for 2nd level text"));
 
 	hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
 	gtk_widget_show (hbox);
@@ -253,7 +253,7 @@
 	SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level3);
 
 	CLAWS_SET_TIP(color_buttons.btn_quote_level3,
-			     Q_("Tooltip|Pick color for 3rd level text"));
+			     C_("Tooltip", "Pick color for 3rd level text"));
 
 	hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
 	gtk_widget_show (hbox);
@@ -276,7 +276,7 @@
 	SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level1_bg);
 
 	CLAWS_SET_TIP(color_buttons.btn_quote_level1_bg,
-			     Q_("Tooltip|Pick color for 1st level text background"));
+			     C_("Tooltip", "Pick color for 1st level text background"));
 
 	label_quote_bgcolor1 = gtk_label_new (_("Background"));
 	gtk_widget_show(label_quote_bgcolor1);
@@ -297,7 +297,7 @@
 	SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level2_bg);
 
 	CLAWS_SET_TIP(color_buttons.btn_quote_level2_bg,
-			     Q_("Tooltip|Pick color for 2nd level text background"));
+			     C_("Tooltip", "Pick color for 2nd level text background"));
 
 	label_quote_bgcolor2 = gtk_label_new (_("Background"));
 	gtk_widget_show(label_quote_bgcolor2);
@@ -318,7 +318,7 @@
 	SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level3_bg);
 
 	CLAWS_SET_TIP(color_buttons.btn_quote_level3_bg,
-			     Q_("Tooltip|Pick color for 3rd level text background"));
+			     C_("Tooltip", "Pick color for 3rd level text background"));
 
 	label_quote_bgcolor3 = gtk_label_new (_("Background"));
 	gtk_widget_show(label_quote_bgcolor3);
@@ -338,7 +338,7 @@
 	SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_uri);
 
 	CLAWS_SET_TIP(color_buttons.btn_uri,
-			     Q_("Tooltip|Pick color for links"));
+			     C_("Tooltip", "Pick color for links"));
 
 	lable_uri = gtk_label_new (_("URI link"));
 	gtk_widget_show(lable_uri);
@@ -357,7 +357,7 @@
 	SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_signature);
 
 	CLAWS_SET_TIP(color_buttons.btn_signature,
-			     Q_("Tooltip|Pick color for signatures"));
+			     C_("Tooltip", "Pick color for signatures"));
 
 	label_signature = gtk_label_new (_("Signatures"));
 	gtk_widget_show(label_signature);
@@ -425,7 +425,7 @@
 	for (c = 0; c < (COLORLABELS>>1)+(COLORLABELS&1); c++) {
 		/* TRANSLATORS: 'color %d' refers to the filtering/processing 
 		   rule name and should not be translated */
-		tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
+		tooltip_btn_text = g_strdup_printf(C_("Tooltip", "Pick color for 'color %d'"), c+1);
 
 		/* TRANSLATORS: 'color %d' refers to the filtering/processing 
 		   rule name and should not be translated */
@@ -456,7 +456,7 @@
 	for (c = (COLORLABELS>>1)+(COLORLABELS&1); c < COLORLABELS; c++) {
 		/* TRANSLATORS: 'color %d' refers to the filtering/processing 
 		   rule name and should not be translated */
-		tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
+		tooltip_btn_text = g_strdup_printf(C_("Tooltip", "Pick color for 'color %d'"), c+1);
 
 		/* TRANSLATORS: 'color %d' refers to the filtering/processing 
 		   rule name and should not be translated */
@@ -589,7 +589,7 @@
 		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(Q_("Dialog title|Pick color for 'color %d'"), c+1);
+			title = g_strdup_printf(C_("Dialog title", "Pick color for 'color %d'"), c+1);
 			rgbvalue = prefs_common.custom_colorlabel[c].color;
 			break;
 		}
@@ -597,34 +597,34 @@
 	/* other colors */
 	if (c == COLORLABELS) {
 		if(g_ascii_strcasecmp(type, "LEVEL1") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for 1st level text"));
+			title = g_strdup(C_("Dialog title", "Pick color for 1st level text"));
 			rgbvalue = prefs_common.quote_level1_col;
 		} else if(g_ascii_strcasecmp(type, "LEVEL2") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for 2nd level text"));
+			title = g_strdup(C_("Dialog title", "Pick color for 2nd level text"));
 			rgbvalue = prefs_common.quote_level2_col;
 		} else if(g_ascii_strcasecmp(type, "LEVEL3") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for 3rd level text"));
+			title = g_strdup(C_("Dialog title", "Pick color for 3rd level text"));
 			rgbvalue = prefs_common.quote_level3_col;
 		} else if(g_ascii_strcasecmp(type, "LEVEL1BG") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for 1st level text background"));
+			title = g_strdup(C_("Dialog title", "Pick color for 1st level text background"));
 			rgbvalue = prefs_common.quote_level1_bgcol;
 		} else if(g_ascii_strcasecmp(type, "LEVEL2BG") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for 2nd level text background"));
+			title = g_strdup(C_("Dialog title", "Pick color for 2nd level text background"));
 			rgbvalue = prefs_common.quote_level2_bgcol;
 		} else if(g_ascii_strcasecmp(type, "LEVEL3BG") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for 3rd level text background"));
+			title = g_strdup(C_("Dialog title", "Pick color for 3rd level text background"));
 			rgbvalue = prefs_common.quote_level3_bgcol;
 		} else if(g_ascii_strcasecmp(type, "URI") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for links"));
+			title = g_strdup(C_("Dialog title", "Pick color for links"));
 			rgbvalue = prefs_common.uri_col;
 		} else if(g_ascii_strcasecmp(type, "TGTFLD") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for target folder"));
+			title = g_strdup(C_("Dialog title", "Pick color for target folder"));
 			rgbvalue = prefs_common.tgt_folder_col;
 		} else if(g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for signatures"));
+			title = g_strdup(C_("Dialog title", "Pick color for signatures"));
 			rgbvalue = prefs_common.signature_col;
 		} else if(g_ascii_strcasecmp(type, "NEW") == 0) {
-			title = g_strdup(Q_("Dialog title|Pick color for folder"));
+			title = g_strdup(C_("Dialog title", "Pick color for folder"));
 			rgbvalue = prefs_common.color_new;
 		} else {
 			/* Should never be called */

Index: toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/toolbar.c,v
retrieving revision 1.43.2.131
retrieving revision 1.43.2.132
diff -u -d -r1.43.2.131 -r1.43.2.132
--- toolbar.c	19 Sep 2012 12:22:24 -0000	1.43.2.131
+++ toolbar.c	16 Nov 2012 23:42:14 -0000	1.43.2.132
@@ -368,7 +368,7 @@
 			g_free(item->file);
 			item->file = g_strdup("trash_btn");
 			g_free(item->text);
-			item->text = g_strdup(Q_("Toolbar|Trash"));
+			item->text = g_strdup(C_("Toolbar", "Trash"));
 			rewrite = TRUE;
 		}
 		if (item->index == -1 && !strcmp(value, "A_SYL_ACTIONS")) {
@@ -396,14 +396,14 @@
 	case A_RECEIVE_ALL: 	return _("Get Mail");
 	case A_RECEIVE_CUR: 	return _("Get");
 	case A_SEND_QUEUED: 	return _("Send");
-	case A_COMPOSE_EMAIL: 	return Q_("Toolbar|Compose");
-	case A_COMPOSE_NEWS: 	return Q_("Toolbar|Compose");
+	case A_COMPOSE_EMAIL: 	return C_("Toolbar", "Compose");
+	case A_COMPOSE_NEWS: 	return C_("Toolbar", "Compose");
 	case A_REPLY_MESSAGE: 	return _("Reply");
 	case A_REPLY_ALL: 	return _("All");
-	case A_REPLY_SENDER: 	return Q_("Toolbar|Sender");
+	case A_REPLY_SENDER: 	return C_("Toolbar", "Sender");
 	case A_REPLY_ML: 	return _("List");
 	case A_FORWARD: 	return _("Forward");
-	case A_TRASH: 		return Q_("Toolbar|Trash");
+	case A_TRASH: 		return C_("Toolbar", "Trash");
 	case A_DELETE_REAL:	return _("Delete");
 	case A_LEARN_SPAM: 	return _("Spam");
 	case A_GOTO_PREV: 	return _("Prev");



More information about the Commits mailing list